From 729f9175dacec47d0131d325c7313b4bd0a87f7c Mon Sep 17 00:00:00 2001 From: Conor Anderson Date: Wed, 2 Nov 2016 20:38:45 -0400 Subject: [PATCH 1/7] Add option to start minimized --- electron/js/menu/system.js | 12 +++++++++++- electron/locale/strings-en.js | 1 + electron/locale/strings.js | 1 + electron/main.js | 3 ++- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/electron/js/menu/system.js b/electron/js/menu/system.js index c6e2f66472f..7233fed3c0a 100644 --- a/electron/js/menu/system.js +++ b/electron/js/menu/system.js @@ -202,6 +202,13 @@ var toggleFullScreenTemplate = { }, }; +var toggleStartInTrayTemplate = { + i18n: 'menuStartInTray', + type: 'checkbox', + click: function() { + init.save('startInTray', !init.restore('startInTray')); + }, +}; var editTemplate = { i18n: 'menuEdit', @@ -349,6 +356,7 @@ if (process.platform === 'darwin') { toggleFullScreenTemplate ); toggleFullScreenTemplate.checked = init.restore('fullscreen', false); + toggleStartInTrayTemplate.checked = init.restore('startInTray', false); } if (process.platform === 'win32') { @@ -372,9 +380,11 @@ if (process.platform === 'linux') { }); windowTemplate.submenu.push( separatorTemplate, - toggleFullScreenTemplate + toggleFullScreenTemplate, + toggleStartInTrayTemplate ); toggleFullScreenTemplate.checked = init.restore('fullscreen', false); + toggleStartInTrayTemplate.checked = init.restore('startInTray', false); } if (process.platform !== 'darwin') { diff --git a/electron/locale/strings-en.js b/electron/locale/strings-en.js index edab03fb984..690defde25d 100644 --- a/electron/locale/strings-en.js +++ b/electron/locale/strings-en.js @@ -49,6 +49,7 @@ string.menuSettings = 'Settings'; string.menuQuit = 'Quit Wire'; string.menuShowHide = 'Show/Hide Menu'; string.menuSavePictureAs = 'Save Picture As...'; +string.menuStartInTray = 'Start App in Tray' string.restartNeeded = 'Restart Needed'; string.restartLocale = 'Please restart the app for this setting to take effect.'; diff --git a/electron/locale/strings.js b/electron/locale/strings.js index 456960eb2d0..b40c73d4616 100644 --- a/electron/locale/strings.js +++ b/electron/locale/strings.js @@ -47,6 +47,7 @@ string.menuSettings = 'Settings'; string.menuQuit = 'Quit Wire'; string.menuShowHide = 'Show/Hide Menu'; string.menuSavePictureAs = 'Save Picture As...'; +string.menuStartInTray = 'Start App in Tray' string.restartNeeded = 'Restart Needed'; string.restartLocale = 'Please restart the app for this setting to take effect.'; diff --git a/electron/main.js b/electron/main.js index bdc7313a210..373bc27067b 100644 --- a/electron/main.js +++ b/electron/main.js @@ -53,6 +53,7 @@ let isUpdate = false; let shouldQuit = false; let argv = minimist(process.argv.slice(1)); let baseURL = argv.env || (config.PRODUCTION ? config.PRODUCTION_URL : config.INTERNAL_URL); +let startInTray = init.restore('startInTray') /////////////////////////////////////////////////////////////////////////////// // Misc @@ -163,7 +164,7 @@ function showMainWindow() { if (!argv.startup) { setTimeout(function() { - main.show(); + if (!startInTray) main.show(); }, 800); } From 20c5fcc643976a81e3e5c6c9735bcbcd383f071c Mon Sep 17 00:00:00 2001 From: Conor Anderson Date: Wed, 2 Nov 2016 20:45:35 -0400 Subject: [PATCH 2/7] lint --- electron/locale/strings-en.js | 2 +- electron/locale/strings.js | 2 +- electron/main.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/electron/locale/strings-en.js b/electron/locale/strings-en.js index 690defde25d..a3dc7178fa4 100644 --- a/electron/locale/strings-en.js +++ b/electron/locale/strings-en.js @@ -49,7 +49,7 @@ string.menuSettings = 'Settings'; string.menuQuit = 'Quit Wire'; string.menuShowHide = 'Show/Hide Menu'; string.menuSavePictureAs = 'Save Picture As...'; -string.menuStartInTray = 'Start App in Tray' +string.menuStartInTray = 'Start App in Tray'; string.restartNeeded = 'Restart Needed'; string.restartLocale = 'Please restart the app for this setting to take effect.'; diff --git a/electron/locale/strings.js b/electron/locale/strings.js index b40c73d4616..a8ef1974a47 100644 --- a/electron/locale/strings.js +++ b/electron/locale/strings.js @@ -47,7 +47,7 @@ string.menuSettings = 'Settings'; string.menuQuit = 'Quit Wire'; string.menuShowHide = 'Show/Hide Menu'; string.menuSavePictureAs = 'Save Picture As...'; -string.menuStartInTray = 'Start App in Tray' +string.menuStartInTray = 'Start App in Tray'; string.restartNeeded = 'Restart Needed'; string.restartLocale = 'Please restart the app for this setting to take effect.'; diff --git a/electron/main.js b/electron/main.js index 373bc27067b..a69d3364c65 100644 --- a/electron/main.js +++ b/electron/main.js @@ -53,7 +53,7 @@ let isUpdate = false; let shouldQuit = false; let argv = minimist(process.argv.slice(1)); let baseURL = argv.env || (config.PRODUCTION ? config.PRODUCTION_URL : config.INTERNAL_URL); -let startInTray = init.restore('startInTray') +let startInTray = init.restore('startInTray'); /////////////////////////////////////////////////////////////////////////////// // Misc From 953ef095d4acb5653a7e3fe08c9b3fa92af9e9e3 Mon Sep 17 00:00:00 2001 From: Conor Anderson Date: Fri, 4 Nov 2016 18:34:22 -0400 Subject: [PATCH 3/7] Check both --startup flag and startInTray setting at once --- electron/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/electron/main.js b/electron/main.js index a69d3364c65..32708b7d6c4 100644 --- a/electron/main.js +++ b/electron/main.js @@ -162,9 +162,9 @@ function showMainWindow() { main.webContents.openDevTools(); } - if (!argv.startup) { + if (!argv.startup && !startInTray) { setTimeout(function() { - if (!startInTray) main.show(); + main.show(); }, 800); } From fff40e40cdfc270b421f3c21aeb6fb2b1a5f87e9 Mon Sep 17 00:00:00 2001 From: Conor Anderson Date: Fri, 4 Nov 2016 18:36:47 -0400 Subject: [PATCH 4/7] Query setting directly --- electron/main.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/electron/main.js b/electron/main.js index 32708b7d6c4..526083159e0 100644 --- a/electron/main.js +++ b/electron/main.js @@ -53,7 +53,6 @@ let isUpdate = false; let shouldQuit = false; let argv = minimist(process.argv.slice(1)); let baseURL = argv.env || (config.PRODUCTION ? config.PRODUCTION_URL : config.INTERNAL_URL); -let startInTray = init.restore('startInTray'); /////////////////////////////////////////////////////////////////////////////// // Misc @@ -162,7 +161,7 @@ function showMainWindow() { main.webContents.openDevTools(); } - if (!argv.startup && !startInTray) { + if (!argv.startup && !init.restore('startInTray')) { setTimeout(function() { main.show(); }, 800); From 3092177d5e532b66b09f5bf280cc07b8152b8281 Mon Sep 17 00:00:00 2001 From: Conor Anderson Date: Sun, 18 Dec 2016 22:04:50 -0500 Subject: [PATCH 5/7] Replace deleted \n --- electron/main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/electron/main.js b/electron/main.js index 6cc35dd198c..53e84851139 100644 --- a/electron/main.js +++ b/electron/main.js @@ -160,6 +160,7 @@ function showMainWindow() { if (!util.isInView(main)) { main.center(); } + setTimeout(function() { main.show(); }, 800); From 3f66051bba4c1e3b0df3f8d73ca99230f30dd37f Mon Sep 17 00:00:00 2001 From: Conor Anderson Date: Sun, 18 Dec 2016 22:05:18 -0500 Subject: [PATCH 6/7] Remove excess whitespace --- electron/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron/main.js b/electron/main.js index 53e84851139..9c9aff93473 100644 --- a/electron/main.js +++ b/electron/main.js @@ -160,7 +160,7 @@ function showMainWindow() { if (!util.isInView(main)) { main.center(); } - + setTimeout(function() { main.show(); }, 800); From 21ae543caa22937c3844da082c93a4acc57813d2 Mon Sep 17 00:00:00 2001 From: Conor Anderson Date: Mon, 19 Dec 2016 08:56:56 -0500 Subject: [PATCH 7/7] Move checkbox status --- electron/js/menu/system.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/electron/js/menu/system.js b/electron/js/menu/system.js index 2770f15c57b..42b553b99d7 100644 --- a/electron/js/menu/system.js +++ b/electron/js/menu/system.js @@ -229,6 +229,7 @@ var toggleFullScreenTemplate = { var toggleStartInTrayTemplate = { i18n: 'menuStartInTray', type: 'checkbox', + checked: init.restore('startInTray', false), click: function() { init.save('startInTray', !init.restore('startInTray')); }, @@ -422,7 +423,6 @@ module.exports = { toggleFullScreenTemplate ); toggleFullScreenTemplate.checked = init.restore('fullscreen', false); - toggleStartInTrayTemplate.checked = init.restore('startInTray', false); } if (process.platform === 'win32') { @@ -450,7 +450,6 @@ module.exports = { toggleStartInTrayTemplate ); toggleFullScreenTemplate.checked = init.restore('fullscreen', false); - toggleStartInTrayTemplate.checked = init.restore('startInTray', false); } if (process.platform !== 'darwin') {