diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 3 | ||||
-rw-r--r-- | src/config.js | 1 | ||||
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 11 | ||||
-rw-r--r-- | src/i18n/locales/defaultMessages.json | 55 | ||||
-rw-r--r-- | src/i18n/locales/en-US.json | 1 | ||||
-rw-r--r-- | src/i18n/messages/src/containers/settings/EditSettingsScreen.json | 53 | ||||
-rw-r--r-- | src/index.js | 7 |
7 files changed, 90 insertions, 41 deletions
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 61c31ac93..efb6eaa18 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -170,6 +170,7 @@ export default @observer class EditSettingsForm extends Component { | |||
170 | noUpdates: PropTypes.bool.isRequired, | 170 | noUpdates: PropTypes.bool.isRequired, |
171 | hibernationEnabled: PropTypes.bool.isRequired, | 171 | hibernationEnabled: PropTypes.bool.isRequired, |
172 | isDarkmodeEnabled: PropTypes.bool.isRequired, | 172 | isDarkmodeEnabled: PropTypes.bool.isRequired, |
173 | isTrayEnabled: PropTypes.bool.isRequired, | ||
173 | isAdaptableDarkModeEnabled: PropTypes.bool.isRequired, | 174 | isAdaptableDarkModeEnabled: PropTypes.bool.isRequired, |
174 | openProcessManager: PropTypes.func.isRequired, | 175 | openProcessManager: PropTypes.func.isRequired, |
175 | }; | 176 | }; |
@@ -209,6 +210,7 @@ export default @observer class EditSettingsForm extends Component { | |||
209 | noUpdates, | 210 | noUpdates, |
210 | hibernationEnabled, | 211 | hibernationEnabled, |
211 | isDarkmodeEnabled, | 212 | isDarkmodeEnabled, |
213 | isTrayEnabled, | ||
212 | openProcessManager, | 214 | openProcessManager, |
213 | } = this.props; | 215 | } = this.props; |
214 | const { intl } = this.context; | 216 | const { intl } = this.context; |
@@ -245,6 +247,7 @@ export default @observer class EditSettingsForm extends Component { | |||
245 | <Toggle field={form.$('autoLaunchOnStart')} /> | 247 | <Toggle field={form.$('autoLaunchOnStart')} /> |
246 | <Toggle field={form.$('runInBackground')} /> | 248 | <Toggle field={form.$('runInBackground')} /> |
247 | <Toggle field={form.$('enableSystemTray')} /> | 249 | <Toggle field={form.$('enableSystemTray')} /> |
250 | {isTrayEnabled && <Toggle field={form.$('startMinimized')} />} | ||
248 | <Toggle field={form.$('privateNotifications')} /> | 251 | <Toggle field={form.$('privateNotifications')} /> |
249 | <Toggle field={form.$('showServiceNavigationBar')} /> | 252 | <Toggle field={form.$('showServiceNavigationBar')} /> |
250 | 253 | ||
diff --git a/src/config.js b/src/config.js index a788f0f54..8868d7c41 100644 --- a/src/config.js +++ b/src/config.js | |||
@@ -47,6 +47,7 @@ export const DEFAULT_APP_SETTINGS = { | |||
47 | autoLaunchInBackground: false, | 47 | autoLaunchInBackground: false, |
48 | runInBackground: true, | 48 | runInBackground: true, |
49 | enableSystemTray: true, | 49 | enableSystemTray: true, |
50 | startMinimized: false, | ||
50 | minimizeToSystemTray: false, | 51 | minimizeToSystemTray: false, |
51 | privateNotifications: false, | 52 | privateNotifications: false, |
52 | showDisabledServices: true, | 53 | showDisabledServices: true, |
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index a7c2b428f..665444f50 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -38,6 +38,10 @@ const messages = defineMessages({ | |||
38 | id: 'settings.app.form.runInBackground', | 38 | id: 'settings.app.form.runInBackground', |
39 | defaultMessage: '!!!Keep Ferdi in background when closing the window', | 39 | defaultMessage: '!!!Keep Ferdi in background when closing the window', |
40 | }, | 40 | }, |
41 | startMinimized: { | ||
42 | id: 'settings.app.form.startMinimized', | ||
43 | defaultMessage: '!!!Start minimized in tray', | ||
44 | }, | ||
41 | enableSystemTray: { | 45 | enableSystemTray: { |
42 | id: 'settings.app.form.enableSystemTray', | 46 | id: 'settings.app.form.enableSystemTray', |
43 | defaultMessage: '!!!Show Ferdi in system tray', | 47 | defaultMessage: '!!!Show Ferdi in system tray', |
@@ -173,6 +177,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
173 | data: { | 177 | data: { |
174 | runInBackground: settingsData.runInBackground, | 178 | runInBackground: settingsData.runInBackground, |
175 | enableSystemTray: settingsData.enableSystemTray, | 179 | enableSystemTray: settingsData.enableSystemTray, |
180 | startMinimized: settingsData.startMinimized, | ||
176 | minimizeToSystemTray: settingsData.minimizeToSystemTray, | 181 | minimizeToSystemTray: settingsData.minimizeToSystemTray, |
177 | privateNotifications: settingsData.privateNotifications, | 182 | privateNotifications: settingsData.privateNotifications, |
178 | showServiceNavigationBar: settingsData.showServiceNavigationBar, | 183 | showServiceNavigationBar: settingsData.showServiceNavigationBar, |
@@ -265,6 +270,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
265 | value: settings.all.app.runInBackground, | 270 | value: settings.all.app.runInBackground, |
266 | default: DEFAULT_APP_SETTINGS.runInBackground, | 271 | default: DEFAULT_APP_SETTINGS.runInBackground, |
267 | }, | 272 | }, |
273 | startMinimized: { | ||
274 | label: intl.formatMessage(messages.startMinimized), | ||
275 | value: settings.all.app.startMinimized, | ||
276 | default: DEFAULT_APP_SETTINGS.startMinimized, | ||
277 | }, | ||
268 | enableSystemTray: { | 278 | enableSystemTray: { |
269 | label: intl.formatMessage(messages.enableSystemTray), | 279 | label: intl.formatMessage(messages.enableSystemTray), |
270 | value: settings.all.app.enableSystemTray, | 280 | value: settings.all.app.enableSystemTray, |
@@ -466,6 +476,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
466 | noUpdates={this.props.stores.settings.app.noUpdates} | 476 | noUpdates={this.props.stores.settings.app.noUpdates} |
467 | hibernationEnabled={this.props.stores.settings.app.hibernate} | 477 | hibernationEnabled={this.props.stores.settings.app.hibernate} |
468 | isDarkmodeEnabled={this.props.stores.settings.app.darkMode} | 478 | isDarkmodeEnabled={this.props.stores.settings.app.darkMode} |
479 | isTrayEnabled={this.props.stores.settings.app.enableSystemTray} | ||
469 | isAdaptableDarkModeEnabled={this.props.stores.settings.app.adaptableDarkMode} | 480 | isAdaptableDarkModeEnabled={this.props.stores.settings.app.adaptableDarkMode} |
470 | openProcessManager={() => this.openProcessManager()} | 481 | openProcessManager={() => this.openProcessManager()} |
471 | /> | 482 | /> |
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index 62203d5e8..083148c3d 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json | |||
@@ -4110,140 +4110,153 @@ | |||
4110 | } | 4110 | } |
4111 | }, | 4111 | }, |
4112 | { | 4112 | { |
4113 | "defaultMessage": "!!!Show Ferdi in system tray", | 4113 | "defaultMessage": "!!!Start minimized in tray", |
4114 | "end": { | 4114 | "end": { |
4115 | "column": 3, | 4115 | "column": 3, |
4116 | "line": 44 | 4116 | "line": 44 |
4117 | }, | 4117 | }, |
4118 | "file": "src/containers/settings/EditSettingsScreen.js", | 4118 | "file": "src/containers/settings/EditSettingsScreen.js", |
4119 | "id": "settings.app.form.startMinimized", | ||
4120 | "start": { | ||
4121 | "column": 18, | ||
4122 | "line": 41 | ||
4123 | } | ||
4124 | }, | ||
4125 | { | ||
4126 | "defaultMessage": "!!!Show Ferdi in system tray", | ||
4127 | "end": { | ||
4128 | "column": 3, | ||
4129 | "line": 48 | ||
4130 | }, | ||
4131 | "file": "src/containers/settings/EditSettingsScreen.js", | ||
4119 | "id": "settings.app.form.enableSystemTray", | 4132 | "id": "settings.app.form.enableSystemTray", |
4120 | "start": { | 4133 | "start": { |
4121 | "column": 20, | 4134 | "column": 20, |
4122 | "line": 41 | 4135 | "line": 45 |
4123 | } | 4136 | } |
4124 | }, | 4137 | }, |
4125 | { | 4138 | { |
4126 | "defaultMessage": "!!!Minimize Ferdi to system tray", | 4139 | "defaultMessage": "!!!Minimize Ferdi to system tray", |
4127 | "end": { | 4140 | "end": { |
4128 | "column": 3, | 4141 | "column": 3, |
4129 | "line": 48 | 4142 | "line": 52 |
4130 | }, | 4143 | }, |
4131 | "file": "src/containers/settings/EditSettingsScreen.js", | 4144 | "file": "src/containers/settings/EditSettingsScreen.js", |
4132 | "id": "settings.app.form.minimizeToSystemTray", | 4145 | "id": "settings.app.form.minimizeToSystemTray", |
4133 | "start": { | 4146 | "start": { |
4134 | "column": 24, | 4147 | "column": 24, |
4135 | "line": 45 | 4148 | "line": 49 |
4136 | } | 4149 | } |
4137 | }, | 4150 | }, |
4138 | { | 4151 | { |
4139 | "defaultMessage": "!!!Don't show message content in notifications", | 4152 | "defaultMessage": "!!!Don't show message content in notifications", |
4140 | "end": { | 4153 | "end": { |
4141 | "column": 3, | 4154 | "column": 3, |
4142 | "line": 52 | 4155 | "line": 56 |
4143 | }, | 4156 | }, |
4144 | "file": "src/containers/settings/EditSettingsScreen.js", | 4157 | "file": "src/containers/settings/EditSettingsScreen.js", |
4145 | "id": "settings.app.form.privateNotifications", | 4158 | "id": "settings.app.form.privateNotifications", |
4146 | "start": { | 4159 | "start": { |
4147 | "column": 24, | 4160 | "column": 24, |
4148 | "line": 49 | 4161 | "line": 53 |
4149 | } | 4162 | } |
4150 | }, | 4163 | }, |
4151 | { | 4164 | { |
4152 | "defaultMessage": "!!!Always show service navigation bar", | 4165 | "defaultMessage": "!!!Always show service navigation bar", |
4153 | "end": { | 4166 | "end": { |
4154 | "column": 3, | 4167 | "column": 3, |
4155 | "line": 56 | 4168 | "line": 60 |
4156 | }, | 4169 | }, |
4157 | "file": "src/containers/settings/EditSettingsScreen.js", | 4170 | "file": "src/containers/settings/EditSettingsScreen.js", |
4158 | "id": "settings.app.form.showServiceNavigationBar", | 4171 | "id": "settings.app.form.showServiceNavigationBar", |
4159 | "start": { | 4172 | "start": { |
4160 | "column": 28, | 4173 | "column": 28, |
4161 | "line": 53 | 4174 | "line": 57 |
4162 | } | 4175 | } |
4163 | }, | 4176 | }, |
4164 | { | 4177 | { |
4165 | "defaultMessage": "!!!Enable service hibernation", | 4178 | "defaultMessage": "!!!Enable service hibernation", |
4166 | "end": { | 4179 | "end": { |
4167 | "column": 3, | 4180 | "column": 3, |
4168 | "line": 60 | 4181 | "line": 64 |
4169 | }, | 4182 | }, |
4170 | "file": "src/containers/settings/EditSettingsScreen.js", | 4183 | "file": "src/containers/settings/EditSettingsScreen.js", |
4171 | "id": "settings.app.form.hibernate", | 4184 | "id": "settings.app.form.hibernate", |
4172 | "start": { | 4185 | "start": { |
4173 | "column": 13, | 4186 | "column": 13, |
4174 | "line": 57 | 4187 | "line": 61 |
4175 | } | 4188 | } |
4176 | }, | 4189 | }, |
4177 | { | 4190 | { |
4178 | "defaultMessage": "!!!Hibernation strategy", | 4191 | "defaultMessage": "!!!Hibernation strategy", |
4179 | "end": { | 4192 | "end": { |
4180 | "column": 3, | 4193 | "column": 3, |
4181 | "line": 64 | 4194 | "line": 68 |
4182 | }, | 4195 | }, |
4183 | "file": "src/containers/settings/EditSettingsScreen.js", | 4196 | "file": "src/containers/settings/EditSettingsScreen.js", |
4184 | "id": "settings.app.form.hibernationStrategy", | 4197 | "id": "settings.app.form.hibernationStrategy", |
4185 | "start": { | 4198 | "start": { |
4186 | "column": 23, | 4199 | "column": 23, |
4187 | "line": 61 | 4200 | "line": 65 |
4188 | } | 4201 | } |
4189 | }, | 4202 | }, |
4190 | { | 4203 | { |
4191 | "defaultMessage": "!!!Server", | 4204 | "defaultMessage": "!!!Server", |
4192 | "end": { | 4205 | "end": { |
4193 | "column": 3, | 4206 | "column": 3, |
4194 | "line": 68 | 4207 | "line": 72 |
4195 | }, | 4208 | }, |
4196 | "file": "src/containers/settings/EditSettingsScreen.js", | 4209 | "file": "src/containers/settings/EditSettingsScreen.js", |
4197 | "id": "settings.app.form.server", | 4210 | "id": "settings.app.form.server", |
4198 | "start": { | 4211 | "start": { |
4199 | "column": 10, | 4212 | "column": 10, |
4200 | "line": 65 | 4213 | "line": 69 |
4201 | } | 4214 | } |
4202 | }, | 4215 | }, |
4203 | { | 4216 | { |
4204 | "defaultMessage": "!!!Todo Server", | 4217 | "defaultMessage": "!!!Todo Server", |
4205 | "end": { | 4218 | "end": { |
4206 | "column": 3, | 4219 | "column": 3, |
4207 | "line": 72 | 4220 | "line": 76 |
4208 | }, | 4221 | }, |
4209 | "file": "src/containers/settings/EditSettingsScreen.js", | 4222 | "file": "src/containers/settings/EditSettingsScreen.js", |
4210 | "id": "settings.app.form.todoServer", | 4223 | "id": "settings.app.form.todoServer", |
4211 | "start": { | 4224 | "start": { |
4212 | "column": 14, | 4225 | "column": 14, |
4213 | "line": 69 | 4226 | "line": 73 |
4214 | } | 4227 | } |
4215 | }, | 4228 | }, |
4216 | { | 4229 | { |
4217 | "defaultMessage": "!!!Enable Password Lock", | 4230 | "defaultMessage": "!!!Enable Password Lock", |
4218 | "end": { | 4231 | "end": { |
4219 | "column": 3, | 4232 | "column": 3, |
4220 | "line": 76 | 4233 | "line": 80 |
4221 | }, | 4234 | }, |
4222 | "file": "src/containers/settings/EditSettingsScreen.js", | 4235 | "file": "src/containers/settings/EditSettingsScreen.js", |
4223 | "id": "settings.app.form.enableLock", | 4236 | "id": "settings.app.form.enableLock", |
4224 | "start": { | 4237 | "start": { |
4225 | "column": 14, | 4238 | "column": 14, |
4226 | "line": 73 | 4239 | "line": 77 |
4227 | } | 4240 | } |
4228 | }, | 4241 | }, |
4229 | { | 4242 | { |
4230 | "defaultMessage": "!!!Password", | 4243 | "defaultMessage": "!!!Password", |
4231 | "end": { | 4244 | "end": { |
4232 | "column": 3, | 4245 | "column": 3, |
4233 | "line": 80 | 4246 | "line": 84 |
4234 | }, | 4247 | }, |
4235 | "file": "src/containers/settings/EditSettingsScreen.js", | 4248 | "file": "src/containers/settings/EditSettingsScreen.js", |
4236 | "id": "settings.app.form.lockPassword", | 4249 | "id": "settings.app.form.lockPassword", |
4237 | "start": { | 4250 | "start": { |
4238 | "column": 16, | 4251 | "column": 16, |
4239 | "line": 77 | 4252 | "line": 81 |
4240 | } | 4253 | } |
4241 | }, | 4254 | }, |
4242 | { | 4255 | { |
4243 | "defaultMessage": "!!!Lock after inactivity", | 4256 | "defaultMessage": "!!!Lock after inactivity", |
4244 | "end": { | 4257 | "end": { |
4245 | "column": 3, | 4258 | "column": 3, |
4246 | "line": 84 | 4259 | "line": 88 |
4247 | }, | 4260 | }, |
4248 | "file": "src/containers/settings/EditSettingsScreen.js", | 4261 | "file": "src/containers/settings/EditSettingsScreen.js", |
4249 | "id": "settings.app.form.inactivityLock", | 4262 | "id": "settings.app.form.inactivityLock", |
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index f1acf9904..f077f23bc 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -284,6 +284,7 @@ | |||
284 | "settings.app.form.showDisabledServices": "Display disabled services tabs", | 284 | "settings.app.form.showDisabledServices": "Display disabled services tabs", |
285 | "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled", | 285 | "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled", |
286 | "settings.app.form.showServiceNavigationBar": "Always show service navigation bar", | 286 | "settings.app.form.showServiceNavigationBar": "Always show service navigation bar", |
287 | "settings.app.form.startMinimized": "Start minimized in tray", | ||
287 | "settings.app.form.todoServer": "Todo Server", | 288 | "settings.app.form.todoServer": "Todo Server", |
288 | "settings.app.form.universalDarkMode": "Enable universal Dark Mode", | 289 | "settings.app.form.universalDarkMode": "Enable universal Dark Mode", |
289 | "settings.app.headline": "Settings", | 290 | "settings.app.headline": "Settings", |
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json index 82a9a7cd5..0a0291037 100644 --- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json +++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json | |||
@@ -39,15 +39,28 @@ | |||
39 | } | 39 | } |
40 | }, | 40 | }, |
41 | { | 41 | { |
42 | "id": "settings.app.form.startMinimized", | ||
43 | "defaultMessage": "!!!Start minimized in tray", | ||
44 | "file": "src/containers/settings/EditSettingsScreen.js", | ||
45 | "start": { | ||
46 | "line": 41, | ||
47 | "column": 18 | ||
48 | }, | ||
49 | "end": { | ||
50 | "line": 44, | ||
51 | "column": 3 | ||
52 | } | ||
53 | }, | ||
54 | { | ||
42 | "id": "settings.app.form.enableSystemTray", | 55 | "id": "settings.app.form.enableSystemTray", |
43 | "defaultMessage": "!!!Show Ferdi in system tray", | 56 | "defaultMessage": "!!!Show Ferdi in system tray", |
44 | "file": "src/containers/settings/EditSettingsScreen.js", | 57 | "file": "src/containers/settings/EditSettingsScreen.js", |
45 | "start": { | 58 | "start": { |
46 | "line": 41, | 59 | "line": 45, |
47 | "column": 20 | 60 | "column": 20 |
48 | }, | 61 | }, |
49 | "end": { | 62 | "end": { |
50 | "line": 44, | 63 | "line": 48, |
51 | "column": 3 | 64 | "column": 3 |
52 | } | 65 | } |
53 | }, | 66 | }, |
@@ -56,11 +69,11 @@ | |||
56 | "defaultMessage": "!!!Minimize Ferdi to system tray", | 69 | "defaultMessage": "!!!Minimize Ferdi to system tray", |
57 | "file": "src/containers/settings/EditSettingsScreen.js", | 70 | "file": "src/containers/settings/EditSettingsScreen.js", |
58 | "start": { | 71 | "start": { |
59 | "line": 45, | 72 | "line": 49, |
60 | "column": 24 | 73 | "column": 24 |
61 | }, | 74 | }, |
62 | "end": { | 75 | "end": { |
63 | "line": 48, | 76 | "line": 52, |
64 | "column": 3 | 77 | "column": 3 |
65 | } | 78 | } |
66 | }, | 79 | }, |
@@ -69,11 +82,11 @@ | |||
69 | "defaultMessage": "!!!Don't show message content in notifications", | 82 | "defaultMessage": "!!!Don't show message content in notifications", |
70 | "file": "src/containers/settings/EditSettingsScreen.js", | 83 | "file": "src/containers/settings/EditSettingsScreen.js", |
71 | "start": { | 84 | "start": { |
72 | "line": 49, | 85 | "line": 53, |
73 | "column": 24 | 86 | "column": 24 |
74 | }, | 87 | }, |
75 | "end": { | 88 | "end": { |
76 | "line": 52, | 89 | "line": 56, |
77 | "column": 3 | 90 | "column": 3 |
78 | } | 91 | } |
79 | }, | 92 | }, |
@@ -82,11 +95,11 @@ | |||
82 | "defaultMessage": "!!!Always show service navigation bar", | 95 | "defaultMessage": "!!!Always show service navigation bar", |
83 | "file": "src/containers/settings/EditSettingsScreen.js", | 96 | "file": "src/containers/settings/EditSettingsScreen.js", |
84 | "start": { | 97 | "start": { |
85 | "line": 53, | 98 | "line": 57, |
86 | "column": 28 | 99 | "column": 28 |
87 | }, | 100 | }, |
88 | "end": { | 101 | "end": { |
89 | "line": 56, | 102 | "line": 60, |
90 | "column": 3 | 103 | "column": 3 |
91 | } | 104 | } |
92 | }, | 105 | }, |
@@ -95,11 +108,11 @@ | |||
95 | "defaultMessage": "!!!Enable service hibernation", | 108 | "defaultMessage": "!!!Enable service hibernation", |
96 | "file": "src/containers/settings/EditSettingsScreen.js", | 109 | "file": "src/containers/settings/EditSettingsScreen.js", |
97 | "start": { | 110 | "start": { |
98 | "line": 57, | 111 | "line": 61, |
99 | "column": 13 | 112 | "column": 13 |
100 | }, | 113 | }, |
101 | "end": { | 114 | "end": { |
102 | "line": 60, | 115 | "line": 64, |
103 | "column": 3 | 116 | "column": 3 |
104 | } | 117 | } |
105 | }, | 118 | }, |
@@ -108,11 +121,11 @@ | |||
108 | "defaultMessage": "!!!Hibernation strategy", | 121 | "defaultMessage": "!!!Hibernation strategy", |
109 | "file": "src/containers/settings/EditSettingsScreen.js", | 122 | "file": "src/containers/settings/EditSettingsScreen.js", |
110 | "start": { | 123 | "start": { |
111 | "line": 61, | 124 | "line": 65, |
112 | "column": 23 | 125 | "column": 23 |
113 | }, | 126 | }, |
114 | "end": { | 127 | "end": { |
115 | "line": 64, | 128 | "line": 68, |
116 | "column": 3 | 129 | "column": 3 |
117 | } | 130 | } |
118 | }, | 131 | }, |
@@ -121,11 +134,11 @@ | |||
121 | "defaultMessage": "!!!Server", | 134 | "defaultMessage": "!!!Server", |
122 | "file": "src/containers/settings/EditSettingsScreen.js", | 135 | "file": "src/containers/settings/EditSettingsScreen.js", |
123 | "start": { | 136 | "start": { |
124 | "line": 65, | 137 | "line": 69, |
125 | "column": 10 | 138 | "column": 10 |
126 | }, | 139 | }, |
127 | "end": { | 140 | "end": { |
128 | "line": 68, | 141 | "line": 72, |
129 | "column": 3 | 142 | "column": 3 |
130 | } | 143 | } |
131 | }, | 144 | }, |
@@ -134,11 +147,11 @@ | |||
134 | "defaultMessage": "!!!Todo Server", | 147 | "defaultMessage": "!!!Todo Server", |
135 | "file": "src/containers/settings/EditSettingsScreen.js", | 148 | "file": "src/containers/settings/EditSettingsScreen.js", |
136 | "start": { | 149 | "start": { |
137 | "line": 69, | 150 | "line": 73, |
138 | "column": 14 | 151 | "column": 14 |
139 | }, | 152 | }, |
140 | "end": { | 153 | "end": { |
141 | "line": 72, | 154 | "line": 76, |
142 | "column": 3 | 155 | "column": 3 |
143 | } | 156 | } |
144 | }, | 157 | }, |
@@ -147,11 +160,11 @@ | |||
147 | "defaultMessage": "!!!Enable Password Lock", | 160 | "defaultMessage": "!!!Enable Password Lock", |
148 | "file": "src/containers/settings/EditSettingsScreen.js", | 161 | "file": "src/containers/settings/EditSettingsScreen.js", |
149 | "start": { | 162 | "start": { |
150 | "line": 73, | 163 | "line": 77, |
151 | "column": 14 | 164 | "column": 14 |
152 | }, | 165 | }, |
153 | "end": { | 166 | "end": { |
154 | "line": 76, | 167 | "line": 80, |
155 | "column": 3 | 168 | "column": 3 |
156 | } | 169 | } |
157 | }, | 170 | }, |
@@ -160,11 +173,11 @@ | |||
160 | "defaultMessage": "!!!Password", | 173 | "defaultMessage": "!!!Password", |
161 | "file": "src/containers/settings/EditSettingsScreen.js", | 174 | "file": "src/containers/settings/EditSettingsScreen.js", |
162 | "start": { | 175 | "start": { |
163 | "line": 77, | 176 | "line": 81, |
164 | "column": 16 | 177 | "column": 16 |
165 | }, | 178 | }, |
166 | "end": { | 179 | "end": { |
167 | "line": 80, | 180 | "line": 84, |
168 | "column": 3 | 181 | "column": 3 |
169 | } | 182 | } |
170 | }, | 183 | }, |
diff --git a/src/index.js b/src/index.js index 6cc547d33..7bc0be0ea 100644 --- a/src/index.js +++ b/src/index.js | |||
@@ -142,6 +142,8 @@ const createWindow = () => { | |||
142 | const mainWindowState = windowStateKeeper({ | 142 | const mainWindowState = windowStateKeeper({ |
143 | defaultWidth: DEFAULT_WINDOW_OPTIONS.width, | 143 | defaultWidth: DEFAULT_WINDOW_OPTIONS.width, |
144 | defaultHeight: DEFAULT_WINDOW_OPTIONS.height, | 144 | defaultHeight: DEFAULT_WINDOW_OPTIONS.height, |
145 | maximize: false, | ||
146 | fullScreen: false, | ||
145 | }); | 147 | }); |
146 | 148 | ||
147 | let posX = mainWindowState.x || DEFAULT_WINDOW_OPTIONS.x; | 149 | let posX = mainWindowState.x || DEFAULT_WINDOW_OPTIONS.x; |
@@ -168,6 +170,7 @@ const createWindow = () => { | |||
168 | height: mainWindowState.height, | 170 | height: mainWindowState.height, |
169 | minWidth: 600, | 171 | minWidth: 600, |
170 | minHeight: 500, | 172 | minHeight: 500, |
173 | show: false, | ||
171 | titleBarStyle: isMac ? 'hidden' : '', | 174 | titleBarStyle: isMac ? 'hidden' : '', |
172 | frame: isLinux, | 175 | frame: isLinux, |
173 | backgroundColor, | 176 | backgroundColor, |
@@ -300,6 +303,10 @@ const createWindow = () => { | |||
300 | shell.openExternal(url); | 303 | shell.openExternal(url); |
301 | } | 304 | } |
302 | }); | 305 | }); |
306 | |||
307 | if (!(settings.get('enableSystemTray') && settings.get('startMinimized'))) { | ||
308 | mainWindow.show(); | ||
309 | } | ||
303 | }; | 310 | }; |
304 | 311 | ||
305 | // Allow passing command line parameters/switches to electron | 312 | // Allow passing command line parameters/switches to electron |