Browse Source

小调整。

oldj 9 years ago
parent
commit
618dc0402f

File diff suppressed because it is too large
+ 26 - 79
app/electron/build/bundle.js


+ 3 - 3
app/electron/gulpfile.js

@@ -10,7 +10,7 @@ const path = require('path');
 const gulp = require('gulp');
 const beautify = require('js-beautify').js_beautify;
 
-gulp.task('update_version', () => {
+gulp.task('ver', () => {
     let fn = path.join(__dirname, 'src', 'version.js');
     let version = require('./src/version').version;
     version[3]++;
@@ -30,12 +30,12 @@ gulp.task('update_version', () => {
 });
 
 gulp.task('default', () => {
-    gulp.start('update_version');
+    gulp.start('ver');
 
     gulp.watch([
         './main.js',
         './index.html',
         './src/**/*.*',
         '!./src/version.js'
-    ], ['update_version']);
+    ], ['ver']);
 });

+ 1 - 0
app/electron/index.html

@@ -10,6 +10,7 @@
 	const SH_event = require('./src/event').event;
 	const SH_Agent = require('./src/agent');
 	const {ipcRenderer} = require('electron');
+	const platform = process.platform;
 </script>
 <!--<script src="build/bundle.js"></script>-->
 <script>require('./build/bundle');</script>

+ 1 - 0
app/electron/package.json

@@ -38,6 +38,7 @@
     "electron-packager": "^7.7.0",
     "electron-prebuilt": "^1.2.0",
     "file-loader": "^0.9.0",
+    "gulp": "^3.9.1",
     "js-beautify": "^1.6.3",
     "less": "^2.7.1",
     "less-loader": "^2.2.3",

+ 1 - 1
app/electron/src/components/app.js

@@ -112,7 +112,7 @@ class App extends React.Component {
     render() {
         let current = this.state.current;
         return (
-            <div id="app">
+            <div id="app" className={'platform-' + platform}>
                 <Panel hosts={this.state.hosts} current={current} setCurrent={this.setCurrent.bind(this)}/>
                 <Content current={current} readonly={App.isReadOnly(current)}
                          setHostContent={this.setHostContent.bind(this)}/>

+ 8 - 0
app/electron/src/components/content/content.less

@@ -33,3 +33,11 @@
     }
   }
 }
+
+.platform-win32 {
+  #sh-content {
+    .inform {
+      right: 20px;
+    }
+  }
+}

+ 15 - 9
app/electron/src/modules/tray.js

@@ -11,6 +11,7 @@ const path = require('path');
 const {Menu, Tray, ipcMain, shell} = require('electron');
 const m_lang = require('../lang');
 const pref = require('./../libs/pref');
+const os = process.platform;
 
 let tray = null;
 
@@ -41,15 +42,20 @@ function makeMenu(app, list, contents, sys_lang) {
         shell.openExternal('https://github.com/oldj/SwitchHosts/issues');
     }});
 
-    menu.push({label: lang.toggle_dock_icon, type: 'normal', click: () => {
-        let is_dock_visible = app.dock.isVisible();
-        if (is_dock_visible) {
-            app.dock.hide();
-        } else {
-            app.dock.show();
-        }
-        pref.set('is_dock_icon_hidden', is_dock_visible);
-    }});
+    if (os === 'darwin') {
+        menu.push({
+            label: lang.toggle_dock_icon, type: 'normal', click: () => {
+                let is_dock_visible = app.dock.isVisible();
+                if (is_dock_visible) {
+                    app.dock.hide();
+                } else {
+                    app.dock.show();
+                }
+                pref.set('is_dock_icon_hidden', is_dock_visible);
+            }
+        });
+    }
+
     menu.push({type: 'separator'});
     menu.push({label: lang.quit, type: 'normal', accelerator: 'CommandOrControl+Q', click: () => {
         app.quit();

+ 1 - 1
app/electron/src/version.js

@@ -1 +1 @@
-exports.version = [3,2,0,4139];
+exports.version = [3,2,0,4140];

Some files were not shown because too many files changed in this diff