Merge pull request #70 from xVanTuring/v0.3.0

0.3.0-alpha.4

Author: xVanTuring

package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron-ssr",
-  "version": "0.3.0-alpha.3",
+  "version": "0.3.0-alpha.4",
   "description": "Cross platform ShadowsocksR GUI client built with electron",
   "author": {
     "name": "The Electron-SSR Authors",
@@ -43,7 +43,7 @@
     "chalk": "^3.0.0",
     "cli-progress": "^3.6.0",
     "devtron": "^1.4.0",
-    "electron": "^6.1.7",
+    "electron": "^6.1.9",
     "eslint": "^5.16.0",
     "eslint-plugin-vue": "^5.0.0",
     "request": "^2.88.2",

src/main/index.js

@@ -55,7 +55,7 @@ if (!isPrimaryInstance) {
       if (changed.length === 0) {
         // if there is no config, or ssrPath is not set, show window
         // 初始化时没有配置则打开页面，有配置则不显示主页面
-        if (appConfig.configs.length === 0 || !appConfig.ssrPath) {
+        if (!appConfig.hideWindow || appConfig.configs.length === 0 || !appConfig.ssrPath) {
           showWindow()
         }
       } else if (changed.indexOf('autoLaunch') > -1) {

src/main/tray.js

@@ -72,6 +72,7 @@ async function generateMenus (appConfig) {
         handler.toggleProxy(appConfig.sysProxyMode)
       }
     },
+    { label: $t('MENU_SUB_COPY_HTTP_PROXY'), click: handler.copyHttpProxyCode },
     {
       label: $t('MENU_PAC'),
       submenu: [

src/main/window.js

@@ -4,7 +4,6 @@ import logger from './logger'
 import {
   createProtocol
 } from 'vue-cli-plugin-electron-builder/lib'
-import { isLinux } from '@/shared/env'
 
 let mainWindow
 let readyPromise
@@ -19,7 +18,7 @@ export function createWindow () {
     resizable: false,
     minimizable: false,
     maximizable: false,
-    show: isLinux,
+    show: false,
     webPreferences: { webSecurity: process.env.NODE_ENV === 'production', nodeIntegration: true }
   })
   if (process.platform === 'darwin') { app.dock.show() }

src/renderer/views/panel/SSRGroupForm.vue renamed to src/renderer/components/form/SSRGroupForm.vue

@@ -1,12 +1,7 @@
 <template>
-  <div
-    class="node-root"
-    :class="{selected:selected,activated:activated}"
-  >
-    <span class="active-indicator"/>
-    <div class="node-selection-area"
-      @click="click"
-      @dblclick="dblclick">
+  <div class="node-root" :class="{selected:selected,activated:activated,disabled:disabled}">
+    <span class="active-indicator" />
+    <div class="node-selection-area" @click="click" @dblclick="dblclick">
       <span class="node-name">{{trimmedTitle}}</span>
       <span class="latency-block">
         <span class="latency-value" :class="latencyClass">{{latencyText}}</span>
@@ -32,6 +27,10 @@ export default {
       type: Boolean,
       required: true
     },
+    disabled: {
+      type: Boolean,
+      require: true
+    },
     latency: {
       type: Number,
       default: 0
@@ -45,10 +44,6 @@ export default {
       default: 23
     }
   },
-  data () {
-    return {
-    }
-  },
   computed: {
     latencyText () {
       if (this.latency > 0) {
@@ -67,7 +62,9 @@ export default {
       }
     },
     trimmedTitle () {
-      if (this.name.length <= this.maxNameCount) { return this.name }
+      if (this.name.length <= this.maxNameCount) {
+        return this.name
+      }
       // eslint-disable-next-line no-useless-escape
       let letterRegex = /[a-zA-Z0-9\[\]\-\/. ]/
       let titleArr = []
@@ -76,7 +73,10 @@ export default {
       while (maxCount > 0 && rawIndex < this.name.length) {
         titleArr.push(this.name[rawIndex])
         rawIndex++
-        if (rawIndex + 1 < this.name.length && this.name[rawIndex].match(letterRegex)) {
+        if (
+          rawIndex + 1 < this.name.length &&
+          this.name[rawIndex].match(letterRegex)
+        ) {
           titleArr.push(this.name[rawIndex])
           rawIndex++
         }
@@ -129,10 +129,13 @@ export default {
 .node-root.activated .active-indicator {
   background-color: #34c3f0;
 }
+.node-root.activated.disabled .active-indicator {
+  background-color: #929292;
+}
 
 .node-root.selected .node-selection-area {
-  background-color: #CDE8F0;
-  border-color: #34C3F0;
+  background-color: #cde8f0;
+  border-color: #34c3f0;
 }
 .latency-block {
   line-height: 28px;
@@ -152,13 +155,13 @@ export default {
   transition: all 200ms linear;
 }
 .latency-value.low {
-  color: #67C23A;
+  color: #67c23a;
 }
 .latency-value.med {
-  color: #E6A23C;
+  color: #e6a23c;
 }
 .latency-value.high {
-  color: #F56C6C;
+  color: #f56c6c;
 }
 .latency-value.no-data {
   color: #909399;

src/renderer/views/panel/SSRNodeForm.vue renamed to src/renderer/components/form/SSRNodeForm.vue

@@ -14,6 +14,7 @@
          :id="node.id"
          :activated="node.id===activatedConfigId"
          :name="node.title"
+         :disabled="disabled"
          @nodeSelected="nodeSelected"
          @nodeActivated="nodeActivated"/>
      </div>
@@ -31,7 +32,8 @@ export default {
     node: Object,
     selectedConfigId: String,
     activatedConfigId: String,
-    selectedGroupName: String
+    selectedGroupName: String,
+    disabled: Boolean
   },
   data () {
     return {

src/renderer/views/panel/SSRNode.vue renamed to src/renderer/components/node/SSRNode.vue

@@ -25,6 +25,7 @@
   "UI_SETTING_SSR_PYTHON_DIR": "SSR python Dir",
   "UI_SETTING_SELECT_SSR_PYTHON_DIR": "Select SSR Dir",
   "UI_SETTING_AUTO_START": "Auto Start",
+  "UI_SETTING_HIDE_WINDOW": "Hide Window",
   "UI_SETTING_PAC_PORT": "Pac Port",
   "UI_SETTING_SHARE_LAN": "Share LAN",
   "UI_SETTING_LOCAL_LISTEN_PORT": "Local Listen Port",