fix panel render error && fix .desktop for linux

the0cp · Apr 1, 2023 · c788ffb · c788ffb
1 parent a851c39
commit c788ffb
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 7 deletions.
diff --git a/build/icons/icon.icns b/build/icons/icon.icns
diff --git a/electron-builder.yml b/electron-builder.yml
@@ -0,0 +1,26 @@
+appId: ssrn
+productName: ShadowsocksR-Native
+copyright: Copyright © 2023 the0pc
+extraResources:
+  - ssr-n
+linux:
+  synopsis: ShadowsocksR-Native
+  description: SSR-N Electron GUI Client
+  target:
+    - AppImage
+    - deb
+    - pacman
+  maintainer: the0pc
+  category: Network
+  artifactName: ${productName}-${arch}-${version}.${ext}
+  desktop:
+    Name: SSR-N
+    Icon: shadowsocksr-native.png
+
+pacman:
+  packageCategory: Network
+  compression: xz
+  maintainer: the0pc
+deb:
+  packageCategory: Network
+  maintainer: the0pc
diff --git a/src/main/tray.js b/src/main/tray.js
@@ -58,9 +58,9 @@ function generateConfigSubmenus (configs, selectedIndex) {
  */
 function generateMenus (appConfig) {
   const base = [
-    { label: 'Main', click: handler.showManagePanel },
+    { label: 'Main Window', click: handler.showManagePanel },
     {
-      label: 'Open App',
+      label: 'Run Service',
       type: 'checkbox',
       checked: appConfig.enable,
       click: handler.toggleEnable,
@@ -84,7 +84,7 @@ function generateMenus (appConfig) {
           label: 'Import from Clipboard',
           click: handler.importConfigFromClipboard,
         },
-        { label: 'Open coonfig', click: handler.openConfigFile },
+        { label: 'Open config', click: handler.openConfigFile },
       ],
     },
     { label: 'Copy http config', click: handler.copyHttpProxyCode },
@@ -108,7 +108,7 @@ function generateMenus (appConfig) {
       label: 'Proxy Mode',
       submenu: [
         {
-          label: 'No Proxy',
+          label: 'No System Proxy',
           type: 'checkbox',
           checked: appConfig.sysProxyMode === 0,
           click: e => changeProxy(e, 0, appConfig),
@@ -149,7 +149,7 @@ function getTooltip (appConfig) {
   }
   arr.push('Proxy Mode')
   if (appConfig.sysProxyMode === 0) {
-    arr.push('No Proxy')
+    arr.push('No System Proxy')
   } else if (appConfig.sysProxyMode === 1) {
     arr.push('PAC')
   } else if (appConfig.sysProxyMode === 2) {

diff --git a/src/render/views/panel/SsrGroup.vue b/src/render/views/panel/SsrGroup.vue
@@ -4,7 +4,7 @@
       <Input type="text" v-model="form.group" />
     </FormItem>
     <span>
-      <Button :disabled="form.group === editingGroup.title" @click="form.group = editingGroup.title">重置</Button>
+      <Button :disabled="form.group === editingGroup.title" @click="form.group = editingGroup.title">Reset</Button>
       <Button class="ml-1" type="primary" @click="rename">Save</Button>
     </span>
   </Form>

diff --git a/src/shared/utils.js b/src/shared/utils.js
@@ -241,7 +241,7 @@ export function groupConfigs (configs, selectedIndex) {
     }
   })
   if (ungrouped.length) {
-    groups['未分组'] = ungrouped
+    groups['Ungrouped'] = ungrouped
   }
   return groups
 }