Start in tray

6 files changed, 90 insertions, 54 deletions

diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index d567a47d1..0badd3b98 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -162,6 +162,7 @@ export default @observer class EditSettingsForm extends Component {
     noUpdates: PropTypes.bool.isRequired,
     hibernationEnabled: PropTypes.bool.isRequired,
     isDarkmodeEnabled: PropTypes.bool.isRequired,
+    isTrayEnabled: PropTypes.bool.isRequired,
     openProcessManager: PropTypes.func.isRequired,
   };
 
@@ -199,6 +200,7 @@ export default @observer class EditSettingsForm extends Component {
       noUpdates,
       hibernationEnabled,
       isDarkmodeEnabled,
+      isTrayEnabled,
       openProcessManager,
     } = this.props;
     const { intl } = this.context;
@@ -235,6 +237,7 @@ export default @observer class EditSettingsForm extends Component {
             <Toggle field={form.$('autoLaunchOnStart')} />
             <Toggle field={form.$('runInBackground')} />
             <Toggle field={form.$('enableSystemTray')} />
+            {isTrayEnabled && <Toggle field={form.$('startMinimized')} />}
             <Toggle field={form.$('privateNotifications')} />
             <Toggle field={form.$('showServiceNavigationBar')} />
             <Toggle field={form.$('hibernate')} />
diff --git a/src/config.js b/src/config.js
index bd67aee6b..f877f4f2e 100644
--- a/src/config.js
+++ b/src/config.js
@@ -48,6 +48,7 @@ export const DEFAULT_APP_SETTINGS = {
   autoLaunchInBackground: false,
   runInBackground: true,
   enableSystemTray: true,
+  startMinimized: false,
   minimizeToSystemTray: false,
   privateNotifications: false,
   showDisabledServices: true,
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 07efbb881..c961d7541 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -38,6 +38,10 @@ const messages = defineMessages({
     id: 'settings.app.form.runInBackground',
     defaultMessage: '!!!Keep Ferdi in background when closing the window',
   },
+  startMinimized: {
+    id: 'settings.app.form.startMinimized',
+    defaultMessage: '!!!Start minimized'
+  },
   enableSystemTray: {
     id: 'settings.app.form.enableSystemTray',
     defaultMessage: '!!!Show Ferdi in system tray',
@@ -169,6 +173,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
       data: {
         runInBackground: settingsData.runInBackground,
         enableSystemTray: settingsData.enableSystemTray,
+        startMinimized: settingsData.startMinimized,
         minimizeToSystemTray: settingsData.minimizeToSystemTray,
         privateNotifications: settingsData.privateNotifications,
         showServiceNavigationBar: settingsData.showServiceNavigationBar,
@@ -260,6 +265,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           value: settings.all.app.runInBackground,
           default: DEFAULT_APP_SETTINGS.runInBackground,
         },
+        startMinimized: {
+          label: intl.formatMessage(messages.startMinimized),
+          value: settings.all.app.startMinimized,
+          default: DEFAULT_APP_SETTINGS.startMinimized,
+        },
         enableSystemTray: {
           label: intl.formatMessage(messages.enableSystemTray),
           value: settings.all.app.enableSystemTray,
@@ -455,6 +465,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           noUpdates={this.props.stores.settings.app.noUpdates}
           hibernationEnabled={this.props.stores.settings.app.hibernate}
           isDarkmodeEnabled={this.props.stores.settings.app.darkMode}
+          isTrayEnabled={this.props.stores.settings.app.enableSystemTray}
           openProcessManager={() => this.openProcessManager()}
         />
       </ErrorBoundary>
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index 411e35dab..6a723ceca 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -39,15 +39,28 @@
     }
   },
   {
+    "id": "settings.app.form.startMinimized",
+    "defaultMessage": "!!!Start minimized",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 41,
+      "column": 18
+    },
+    "end": {
+      "line": 44,
+      "column": 3
+    }
+  },
+  {
     "id": "settings.app.form.enableSystemTray",
     "defaultMessage": "!!!Show Ferdi in system tray",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 41,
+      "line": 45,
       "column": 20
     },
     "end": {
-      "line": 44,
+      "line": 48,
       "column": 3
     }
   },
@@ -56,11 +69,11 @@
     "defaultMessage": "!!!Minimize Ferdi to system tray",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 45,
+      "line": 49,
       "column": 24
     },
     "end": {
-      "line": 48,
+      "line": 52,
       "column": 3
     }
   },
@@ -69,11 +82,11 @@
     "defaultMessage": "!!!Don't show message content in notifications",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 49,
+      "line": 53,
       "column": 24
     },
     "end": {
-      "line": 52,
+      "line": 56,
       "column": 3
     }
   },
@@ -82,11 +95,11 @@
     "defaultMessage": "!!!Always show service navigation bar",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 53,
+      "line": 57,
       "column": 28
     },
     "end": {
-      "line": 56,
+      "line": 60,
       "column": 3
     }
   },
@@ -95,11 +108,11 @@
     "defaultMessage": "!!!Enable service hibernation",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 57,
+      "line": 61,
       "column": 13
     },
     "end": {
-      "line": 60,
+      "line": 64,
       "column": 3
     }
   },
@@ -108,11 +121,11 @@
     "defaultMessage": "!!!Hibernation strategy",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 61,
+      "line": 65,
       "column": 23
     },
     "end": {
-      "line": 64,
+      "line": 68,
       "column": 3
     }
   },
@@ -121,11 +134,11 @@
     "defaultMessage": "!!!Server",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 65,
+      "line": 69,
       "column": 10
     },
     "end": {
-      "line": 68,
+      "line": 72,
       "column": 3
     }
   },
@@ -134,11 +147,11 @@
     "defaultMessage": "!!!Todo Server",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 69,
+      "line": 73,
       "column": 14
     },
     "end": {
-      "line": 72,
+      "line": 76,
       "column": 3
     }
   },
@@ -147,11 +160,11 @@
     "defaultMessage": "!!!Enable Ferdi password lock",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 73,
+      "line": 77,
       "column": 14
     },
     "end": {
-      "line": 76,
+      "line": 80,
       "column": 3
     }
   },
@@ -160,11 +173,11 @@
     "defaultMessage": "!!!Ferdi Lock password",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 77,
+      "line": 81,
       "column": 16
     },
     "end": {
-      "line": 80,
+      "line": 84,
       "column": 3
     }
   },
@@ -173,11 +186,11 @@
     "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 81,
+      "line": 85,
       "column": 23
     },
     "end": {
-      "line": 84,
+      "line": 88,
       "column": 3
     }
   },
@@ -186,11 +199,11 @@
     "defaultMessage": "!!!From",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 85,
+      "line": 89,
       "column": 21
     },
     "end": {
-      "line": 88,
+      "line": 92,
       "column": 3
     }
   },
@@ -199,11 +212,11 @@
     "defaultMessage": "!!!To",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 89,
+      "line": 93,
       "column": 19
     },
     "end": {
-      "line": 92,
+      "line": 96,
       "column": 3
     }
   },
@@ -212,11 +225,11 @@
     "defaultMessage": "!!!Language",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 93,
+      "line": 97,
       "column": 12
     },
     "end": {
-      "line": 96,
+      "line": 100,
       "column": 3
     }
   },
@@ -225,11 +238,11 @@
     "defaultMessage": "!!!Dark Mode",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 97,
+      "line": 101,
       "column": 12
     },
     "end": {
-      "line": 100,
+      "line": 104,
       "column": 3
     }
   },
@@ -238,11 +251,11 @@
     "defaultMessage": "!!!Enable adaptable Dark Mode",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 101,
+      "line": 105,
       "column": 21
     },
     "end": {
-      "line": 104,
+      "line": 108,
       "column": 3
     }
   },
@@ -251,11 +264,11 @@
     "defaultMessage": "!!!Enable universal Dark Mode",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 105,
+      "line": 109,
       "column": 21
     },
     "end": {
-      "line": 108,
+      "line": 112,
       "column": 3
     }
   },
@@ -264,11 +277,11 @@
     "defaultMessage": "!!!Accent color",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 109,
+      "line": 113,
       "column": 15
     },
     "end": {
-      "line": 112,
+      "line": 116,
       "column": 3
     }
   },
@@ -277,11 +290,11 @@
     "defaultMessage": "!!!Display disabled services tabs",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 113,
+      "line": 117,
       "column": 24
     },
     "end": {
-      "line": 116,
+      "line": 120,
       "column": 3
     }
   },
@@ -290,11 +303,11 @@
     "defaultMessage": "!!!Show unread message badge when notifications are disabled",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 117,
+      "line": 121,
       "column": 29
     },
     "end": {
-      "line": 120,
+      "line": 124,
       "column": 3
     }
   },
@@ -303,11 +316,11 @@
     "defaultMessage": "!!!Enable spell checking",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 121,
+      "line": 125,
       "column": 23
     },
     "end": {
-      "line": 124,
+      "line": 128,
       "column": 3
     }
   },
@@ -316,11 +329,11 @@
     "defaultMessage": "!!!Enable GPU Acceleration",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 125,
+      "line": 129,
       "column": 25
     },
     "end": {
-      "line": 128,
+      "line": 132,
       "column": 3
     }
   },
@@ -329,11 +342,11 @@
     "defaultMessage": "!!!Include beta versions",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 129,
+      "line": 133,
       "column": 8
     },
     "end": {
-      "line": 132,
+      "line": 136,
       "column": 3
     }
   },
@@ -342,11 +355,11 @@
     "defaultMessage": "!!!Disable updates",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 133,
+      "line": 137,
       "column": 13
     },
     "end": {
-      "line": 136,
+      "line": 140,
       "column": 3
     }
   },
@@ -355,11 +368,11 @@
     "defaultMessage": "!!!Enable Franz Todos",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 137,
+      "line": 141,
       "column": 15
     },
     "end": {
-      "line": 140,
+      "line": 144,
       "column": 3
     }
   },
@@ -368,11 +381,11 @@
     "defaultMessage": "!!!Keep all workspaces loaded",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 141,
+      "line": 145,
       "column": 27
     },
     "end": {
-      "line": 144,
+      "line": 148,
       "column": 3
     }
   }
diff --git a/src/index.html b/src/index.html
index 31e8aa553..6b67cc248 100644
--- a/src/index.html
+++ b/src/index.html
@@ -56,5 +56,5 @@
       })();
     }
   </script>
-</body
+</body>
 </html>
diff --git a/src/index.js b/src/index.js
index 12ea7f646..4c61c5c8e 100644
--- a/src/index.js
+++ b/src/index.js
@@ -91,7 +91,7 @@ if (!gotTheLock) {
   app.on('second-instance', (event, argv) => {
     // Someone tried to run a second instance, we should focus our window.
     if (mainWindow) {
-      mainWindow.show();
+      //mainWindow.show();
       if (mainWindow.isMinimized()) {
         mainWindow.restore();
       }
@@ -142,6 +142,8 @@ const createWindow = () => {
   const mainWindowState = windowStateKeeper({
     defaultWidth: DEFAULT_WINDOW_OPTIONS.width,
     defaultHeight: DEFAULT_WINDOW_OPTIONS.height,
+    maximize: false,
+    fullScreen: false
   });
 
   let posX = mainWindowState.x || DEFAULT_WINDOW_OPTIONS.x;
@@ -168,6 +170,7 @@ const createWindow = () => {
     height: mainWindowState.height,
     minWidth: 600,
     minHeight: 500,
+    show: false,
     titleBarStyle: isMac ? 'hidden' : '',
     frame: isLinux,
     backgroundColor,
@@ -298,6 +301,11 @@ const createWindow = () => {
       shell.openExternal(url);
     }
   });
+
+  if (!(settings.get('enableSystemTray') && settings.get('startMinimized'))) {
+    mainWindow.show();
+  }
+
 };
 
 // Allow passing command line parameters/switches to electron