From b09a04b4fec023a5b8293eaae8c77ebb50bf64be Mon Sep 17 00:00:00 2001 From: Bennett Date: Sun, 5 Apr 2020 08:00:30 +0200 Subject: #490 Add option to start Ferdi minimized (#534) --- .../settings/settings/EditSettingsForm.js | 4 +- src/containers/settings/EditSettingsScreen.js | 3 +- src/i18n/locales/defaultMessages.json | 152 ++++++++++---------- src/i18n/locales/en-US.json | 4 +- src/i18n/locales/whitelist_en-US.json | 3 +- .../containers/settings/EditSettingsScreen.json | 154 ++++++++++----------- src/index.js | 4 +- 7 files changed, 161 insertions(+), 163 deletions(-) (limited to 'src') diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index f76378a3e..1a36cedb5 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -161,7 +161,6 @@ export default @observer class EditSettingsForm extends Component { noUpdates: PropTypes.bool.isRequired, hibernationEnabled: PropTypes.bool.isRequired, isDarkmodeEnabled: PropTypes.bool.isRequired, - isTrayEnabled: PropTypes.bool.isRequired, isAdaptableDarkModeEnabled: PropTypes.bool.isRequired, openProcessManager: PropTypes.func.isRequired, }; @@ -200,7 +199,6 @@ export default @observer class EditSettingsForm extends Component { noUpdates, hibernationEnabled, isDarkmodeEnabled, - isTrayEnabled, openProcessManager, isTodosActivated, } = this.props; @@ -237,7 +235,7 @@ export default @observer class EditSettingsForm extends Component { - {isTrayEnabled && } + {process.platform === 'win32' && ( )} diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 64303e54f..7bf721bb0 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js @@ -40,7 +40,7 @@ const messages = defineMessages({ }, startMinimized: { id: 'settings.app.form.startMinimized', - defaultMessage: '!!!Start minimized in tray', + defaultMessage: '!!!Start minimized', }, enableSystemTray: { id: 'settings.app.form.enableSystemTray', @@ -549,7 +549,6 @@ 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} isAdaptableDarkModeEnabled={this.props.stores.settings.app.adaptableDarkMode} isTodosActivated={this.props.stores.todos.isFeatureEnabledByUser} isUsingCustomTodoService={this.props.stores.todos.isUsingCustomTodoService} diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index 906172221..e6b457515 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -4183,468 +4183,468 @@ "defaultMessage": "!!!Launch Ferdi on start", "end": { "column": 3, - "line": 34 + "line": 32 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.autoLaunchOnStart", "start": { "column": 21, - "line": 31 + "line": 29 } }, { "defaultMessage": "!!!Open in background", "end": { "column": 3, - "line": 38 + "line": 36 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.autoLaunchInBackground", "start": { "column": 26, - "line": 35 + "line": 33 } }, { "defaultMessage": "!!!Keep Ferdi in background when closing the window", "end": { "column": 3, - "line": 42 + "line": 40 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.runInBackground", "start": { "column": 19, - "line": 39 + "line": 37 } }, { - "defaultMessage": "!!!Start minimized in tray", + "defaultMessage": "!!!Start minimized", "end": { "column": 3, - "line": 46 + "line": 44 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.startMinimized", "start": { "column": 18, - "line": 43 + "line": 41 } }, { "defaultMessage": "!!!Always show Ferdi in system tray", "end": { "column": 3, - "line": 50 + "line": 48 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableSystemTray", "start": { "column": 20, - "line": 47 + "line": 45 } }, { "defaultMessage": "!!!Reload Ferdi after system resume", "end": { "column": 3, - "line": 54 + "line": 52 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.reloadAfterResume", "start": { "column": 21, - "line": 51 + "line": 49 } }, { "defaultMessage": "!!!Minimize Ferdi to system tray", "end": { "column": 3, - "line": 58 + "line": 56 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.minimizeToSystemTray", "start": { "column": 24, - "line": 55 + "line": 53 } }, { "defaultMessage": "!!!Don't show message content in notifications", "end": { "column": 3, - "line": 62 + "line": 60 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.privateNotifications", "start": { "column": 24, - "line": 59 + "line": 57 } }, { "defaultMessage": "!!!Navigation bar behaviour", "end": { "column": 3, - "line": 66 + "line": 64 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.navigationBarBehaviour", "start": { "column": 26, - "line": 63 + "line": 61 } }, { "defaultMessage": "!!!Send telemetry data", "end": { "column": 3, - "line": 70 + "line": 68 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.sentry", "start": { "column": 10, - "line": 67 + "line": 65 } }, { "defaultMessage": "!!!Enable service hibernation", "end": { "column": 3, - "line": 74 + "line": 72 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.hibernate", "start": { "column": 13, - "line": 71 + "line": 69 } }, { "defaultMessage": "!!!Hibernation strategy", "end": { "column": 3, - "line": 78 + "line": 76 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.hibernationStrategy", "start": { "column": 23, - "line": 75 + "line": 73 } }, { "defaultMessage": "!!!Todo Server", "end": { "column": 3, - "line": 82 + "line": 80 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.predefinedTodoServer", "start": { - "column": 14, - "line": 79 + "column": 24, + "line": 77 } }, { - "defaultMessage": "!!!Custom Todo Server", + "defaultMessage": "!!!Custom TodoServer", "end": { "column": 3, - "line": 82 + "line": 84 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.customTodoServer", "start": { - "column": 14, - "line": 79 + "column": 20, + "line": 81 } }, { "defaultMessage": "!!!Enable Password Lock", "end": { "column": 3, - "line": 86 + "line": 88 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableLock", "start": { "column": 14, - "line": 83 + "line": 85 } }, { "defaultMessage": "!!!Password", "end": { "column": 3, - "line": 90 + "line": 92 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.lockPassword", "start": { "column": 16, - "line": 87 + "line": 89 } }, { "defaultMessage": "!!!Allow using Touch ID to unlock", "end": { "column": 3, - "line": 94 + "line": 96 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.useTouchIdToUnlock", "start": { "column": 22, - "line": 91 + "line": 93 } }, { "defaultMessage": "!!!Lock after inactivity", "end": { "column": 3, - "line": 98 + "line": 100 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.inactivityLock", "start": { "column": 18, - "line": 95 + "line": 97 } }, { "defaultMessage": "!!!Enable scheduled Do-not-Disturb", "end": { "column": 3, - "line": 102 + "line": 104 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.scheduledDNDEnabled", "start": { "column": 23, - "line": 99 + "line": 101 } }, { "defaultMessage": "!!!From", "end": { "column": 3, - "line": 106 + "line": 108 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.scheduledDNDStart", "start": { "column": 21, - "line": 103 + "line": 105 } }, { "defaultMessage": "!!!To", "end": { "column": 3, - "line": 110 + "line": 112 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.scheduledDNDEnd", "start": { "column": 19, - "line": 107 + "line": 109 } }, { "defaultMessage": "!!!Language", "end": { "column": 3, - "line": 114 + "line": 116 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.language", "start": { "column": 12, - "line": 111 + "line": 113 } }, { "defaultMessage": "!!!Dark Mode", "end": { "column": 3, - "line": 118 + "line": 120 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.darkMode", "start": { "column": 12, - "line": 115 + "line": 117 } }, { "defaultMessage": "!!!Synchronize dark mode with my Mac's dark mode setting", "end": { "column": 3, - "line": 122 + "line": 124 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.adaptableDarkMode", "start": { "column": 21, - "line": 119 + "line": 121 } }, { "defaultMessage": "!!!Enable universal Dark Mode", "end": { "column": 3, - "line": 126 + "line": 128 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.universalDarkMode", "start": { "column": 21, - "line": 123 + "line": 125 } }, { "defaultMessage": "!!!Sidebar width", "end": { "column": 3, - "line": 130 + "line": 132 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.serviceRibbonWidth", "start": { "column": 22, - "line": 127 + "line": 129 } }, { "defaultMessage": "!!!Service icon size", "end": { "column": 3, - "line": 134 + "line": 136 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.iconSize", "start": { "column": 12, - "line": 131 + "line": 133 } }, { "defaultMessage": "!!!Accent color", "end": { "column": 3, - "line": 138 + "line": 140 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.accentColor", "start": { "column": 15, - "line": 135 + "line": 137 } }, { "defaultMessage": "!!!Display disabled services tabs", "end": { "column": 3, - "line": 142 + "line": 144 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.showDisabledServices", "start": { "column": 24, - "line": 139 + "line": 141 } }, { "defaultMessage": "!!!Show unread message badge when notifications are disabled", "end": { "column": 3, - "line": 146 + "line": 148 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.showMessagesBadgesWhenMuted", "start": { "column": 29, - "line": 143 + "line": 145 } }, { "defaultMessage": "!!!Enable spell checking", "end": { "column": 3, - "line": 150 + "line": 152 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableSpellchecking", "start": { "column": 23, - "line": 147 + "line": 149 } }, { "defaultMessage": "!!!Enable GPU Acceleration", "end": { "column": 3, - "line": 154 + "line": 156 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableGPUAcceleration", "start": { "column": 25, - "line": 151 + "line": 153 } }, { "defaultMessage": "!!!Include beta versions", "end": { "column": 3, - "line": 158 + "line": 160 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.beta", "start": { "column": 8, - "line": 155 + "line": 157 } }, { "defaultMessage": "!!!Disable updates", "end": { "column": 3, - "line": 162 + "line": 164 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.noUpdates", "start": { "column": 13, - "line": 159 + "line": 161 } }, { "defaultMessage": "!!!Enable Franz Todos", "end": { "column": 3, - "line": 166 + "line": 168 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableTodos", "start": { "column": 15, - "line": 163 + "line": 165 } }, { "defaultMessage": "!!!Keep all workspaces loaded", "end": { "column": 3, - "line": 170 + "line": 172 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.keepAllWorkspacesLoaded", "start": { "column": 27, - "line": 167 + "line": 169 } } ], diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index d9a191982..feb6ef124 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -306,7 +306,7 @@ "settings.app.form.serviceRibbonWidth": "Sidebar width", "settings.app.form.showDisabledServices": "Display disabled services tabs", "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled", - "settings.app.form.startMinimized": "Start minimized in tray", + "settings.app.form.startMinimized": "Start minimized", "settings.app.form.universalDarkMode": "Enable universal Dark Mode", "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", "settings.app.headline": "Settings", @@ -512,4 +512,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/locales/whitelist_en-US.json b/src/i18n/locales/whitelist_en-US.json index 32960f8ce..fe51488c7 100644 --- a/src/i18n/locales/whitelist_en-US.json +++ b/src/i18n/locales/whitelist_en-US.json @@ -1,2 +1 @@ -[ -] \ No newline at end of file +[] diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json index 4293c93b4..267fa08cd 100644 --- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json +++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json @@ -4,11 +4,11 @@ "defaultMessage": "!!!Launch Ferdi on start", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 31, + "line": 29, "column": 21 }, "end": { - "line": 34, + "line": 32, "column": 3 } }, @@ -17,11 +17,11 @@ "defaultMessage": "!!!Open in background", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 35, + "line": 33, "column": 26 }, "end": { - "line": 38, + "line": 36, "column": 3 } }, @@ -30,24 +30,24 @@ "defaultMessage": "!!!Keep Ferdi in background when closing the window", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 39, + "line": 37, "column": 19 }, "end": { - "line": 42, + "line": 40, "column": 3 } }, { "id": "settings.app.form.startMinimized", - "defaultMessage": "!!!Start minimized in tray", + "defaultMessage": "!!!Start minimized", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 43, + "line": 41, "column": 18 }, "end": { - "line": 46, + "line": 44, "column": 3 } }, @@ -56,11 +56,11 @@ "defaultMessage": "!!!Always show Ferdi in system tray", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 47, + "line": 45, "column": 20 }, "end": { - "line": 50, + "line": 48, "column": 3 } }, @@ -69,11 +69,11 @@ "defaultMessage": "!!!Reload Ferdi after system resume", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 51, + "line": 49, "column": 21 }, "end": { - "line": 54, + "line": 52, "column": 3 } }, @@ -82,11 +82,11 @@ "defaultMessage": "!!!Minimize Ferdi to system tray", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 55, + "line": 53, "column": 24 }, "end": { - "line": 58, + "line": 56, "column": 3 } }, @@ -95,11 +95,11 @@ "defaultMessage": "!!!Don't show message content in notifications", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 59, + "line": 57, "column": 24 }, "end": { - "line": 62, + "line": 60, "column": 3 } }, @@ -108,11 +108,11 @@ "defaultMessage": "!!!Navigation bar behaviour", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 63, + "line": 61, "column": 26 }, "end": { - "line": 66, + "line": 64, "column": 3 } }, @@ -121,11 +121,11 @@ "defaultMessage": "!!!Send telemetry data", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 67, + "line": 65, "column": 10 }, "end": { - "line": 70, + "line": 68, "column": 3 } }, @@ -134,11 +134,11 @@ "defaultMessage": "!!!Enable service hibernation", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 71, + "line": 69, "column": 13 }, "end": { - "line": 74, + "line": 72, "column": 3 } }, @@ -147,11 +147,11 @@ "defaultMessage": "!!!Hibernation strategy", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 75, + "line": 73, "column": 23 }, "end": { - "line": 78, + "line": 76, "column": 3 } }, @@ -160,24 +160,24 @@ "defaultMessage": "!!!Todo Server", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 79, - "column": 14 + "line": 77, + "column": 24 }, "end": { - "line": 82, + "line": 80, "column": 3 } }, { "id": "settings.app.form.customTodoServer", - "defaultMessage": "!!!Custom Todo Server", + "defaultMessage": "!!!Custom TodoServer", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 79, - "column": 14 + "line": 81, + "column": 20 }, "end": { - "line": 82, + "line": 84, "column": 3 } }, @@ -186,11 +186,11 @@ "defaultMessage": "!!!Enable Password Lock", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 83, + "line": 85, "column": 14 }, "end": { - "line": 86, + "line": 88, "column": 3 } }, @@ -199,11 +199,11 @@ "defaultMessage": "!!!Password", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 87, + "line": 89, "column": 16 }, "end": { - "line": 90, + "line": 92, "column": 3 } }, @@ -212,11 +212,11 @@ "defaultMessage": "!!!Allow using Touch ID to unlock", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 91, + "line": 93, "column": 22 }, "end": { - "line": 94, + "line": 96, "column": 3 } }, @@ -225,11 +225,11 @@ "defaultMessage": "!!!Lock after inactivity", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 95, + "line": 97, "column": 18 }, "end": { - "line": 98, + "line": 100, "column": 3 } }, @@ -238,11 +238,11 @@ "defaultMessage": "!!!Enable scheduled Do-not-Disturb", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 99, + "line": 101, "column": 23 }, "end": { - "line": 102, + "line": 104, "column": 3 } }, @@ -251,11 +251,11 @@ "defaultMessage": "!!!From", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 103, + "line": 105, "column": 21 }, "end": { - "line": 106, + "line": 108, "column": 3 } }, @@ -264,11 +264,11 @@ "defaultMessage": "!!!To", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 107, + "line": 109, "column": 19 }, "end": { - "line": 110, + "line": 112, "column": 3 } }, @@ -277,11 +277,11 @@ "defaultMessage": "!!!Language", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 111, + "line": 113, "column": 12 }, "end": { - "line": 114, + "line": 116, "column": 3 } }, @@ -290,11 +290,11 @@ "defaultMessage": "!!!Dark Mode", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 115, + "line": 117, "column": 12 }, "end": { - "line": 118, + "line": 120, "column": 3 } }, @@ -303,11 +303,11 @@ "defaultMessage": "!!!Synchronize dark mode with my Mac's dark mode setting", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 119, + "line": 121, "column": 21 }, "end": { - "line": 122, + "line": 124, "column": 3 } }, @@ -316,11 +316,11 @@ "defaultMessage": "!!!Enable universal Dark Mode", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 123, + "line": 125, "column": 21 }, "end": { - "line": 126, + "line": 128, "column": 3 } }, @@ -329,11 +329,11 @@ "defaultMessage": "!!!Sidebar width", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 127, + "line": 129, "column": 22 }, "end": { - "line": 130, + "line": 132, "column": 3 } }, @@ -342,11 +342,11 @@ "defaultMessage": "!!!Service icon size", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 131, + "line": 133, "column": 12 }, "end": { - "line": 134, + "line": 136, "column": 3 } }, @@ -355,11 +355,11 @@ "defaultMessage": "!!!Accent color", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 135, + "line": 137, "column": 15 }, "end": { - "line": 138, + "line": 140, "column": 3 } }, @@ -368,11 +368,11 @@ "defaultMessage": "!!!Display disabled services tabs", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 139, + "line": 141, "column": 24 }, "end": { - "line": 142, + "line": 144, "column": 3 } }, @@ -381,11 +381,11 @@ "defaultMessage": "!!!Show unread message badge when notifications are disabled", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 143, + "line": 145, "column": 29 }, "end": { - "line": 146, + "line": 148, "column": 3 } }, @@ -394,11 +394,11 @@ "defaultMessage": "!!!Enable spell checking", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 147, + "line": 149, "column": 23 }, "end": { - "line": 150, + "line": 152, "column": 3 } }, @@ -407,11 +407,11 @@ "defaultMessage": "!!!Enable GPU Acceleration", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 151, + "line": 153, "column": 25 }, "end": { - "line": 154, + "line": 156, "column": 3 } }, @@ -420,11 +420,11 @@ "defaultMessage": "!!!Include beta versions", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 155, + "line": 157, "column": 8 }, "end": { - "line": 158, + "line": 160, "column": 3 } }, @@ -433,11 +433,11 @@ "defaultMessage": "!!!Disable updates", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 159, + "line": 161, "column": 13 }, "end": { - "line": 162, + "line": 164, "column": 3 } }, @@ -446,11 +446,11 @@ "defaultMessage": "!!!Enable Franz Todos", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 163, + "line": 165, "column": 15 }, "end": { - "line": 166, + "line": 168, "column": 3 } }, @@ -459,12 +459,12 @@ "defaultMessage": "!!!Keep all workspaces loaded", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 167, + "line": 169, "column": 27 }, "end": { - "line": 170, + "line": 172, "column": 3 } } -] +] \ No newline at end of file diff --git a/src/index.js b/src/index.js index 167d3897a..4da000f69 100644 --- a/src/index.js +++ b/src/index.js @@ -308,7 +308,9 @@ const createWindow = () => { } }); - if (!(settings.get('enableSystemTray') && settings.get('startMinimized'))) { + if (settings.get('startMinimized')) { + mainWindow.hide(); + } else { mainWindow.show(); } }; -- cgit v1.2.3-70-g09d2