aboutsummaryrefslogtreecommitdiffstats
path: root/src/containers/settings
diff options
context:
space:
mode:
authorLibravatar Andrzej Ressel <jereksel@gmail.com>2020-01-30 00:03:02 +0100
committerLibravatar Andrzej Ressel <jereksel@gmail.com>2020-01-30 00:03:02 +0100
commitd4ba692994467ca2c28cf27bb63b9a4c67f04195 (patch)
tree12c45d568abf03f409b5654fc364aa81c39a1a6c /src/containers/settings
parentMerge branch 'develop' (diff)
downloadferdium-app-d4ba692994467ca2c28cf27bb63b9a4c67f04195.tar.gz
ferdium-app-d4ba692994467ca2c28cf27bb63b9a4c67f04195.tar.zst
ferdium-app-d4ba692994467ca2c28cf27bb63b9a4c67f04195.zip
Start in tray
Diffstat (limited to 'src/containers/settings')
-rw-r--r--src/containers/settings/EditSettingsScreen.js11
1 files changed, 11 insertions, 0 deletions
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({
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'
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',
@@ -169,6 +173,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
169 data: { 173 data: {
170 runInBackground: settingsData.runInBackground, 174 runInBackground: settingsData.runInBackground,
171 enableSystemTray: settingsData.enableSystemTray, 175 enableSystemTray: settingsData.enableSystemTray,
176 startMinimized: settingsData.startMinimized,
172 minimizeToSystemTray: settingsData.minimizeToSystemTray, 177 minimizeToSystemTray: settingsData.minimizeToSystemTray,
173 privateNotifications: settingsData.privateNotifications, 178 privateNotifications: settingsData.privateNotifications,
174 showServiceNavigationBar: settingsData.showServiceNavigationBar, 179 showServiceNavigationBar: settingsData.showServiceNavigationBar,
@@ -260,6 +265,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
260 value: settings.all.app.runInBackground, 265 value: settings.all.app.runInBackground,
261 default: DEFAULT_APP_SETTINGS.runInBackground, 266 default: DEFAULT_APP_SETTINGS.runInBackground,
262 }, 267 },
268 startMinimized: {
269 label: intl.formatMessage(messages.startMinimized),
270 value: settings.all.app.startMinimized,
271 default: DEFAULT_APP_SETTINGS.startMinimized,
272 },
263 enableSystemTray: { 273 enableSystemTray: {
264 label: intl.formatMessage(messages.enableSystemTray), 274 label: intl.formatMessage(messages.enableSystemTray),
265 value: settings.all.app.enableSystemTray, 275 value: settings.all.app.enableSystemTray,
@@ -455,6 +465,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
455 noUpdates={this.props.stores.settings.app.noUpdates} 465 noUpdates={this.props.stores.settings.app.noUpdates}
456 hibernationEnabled={this.props.stores.settings.app.hibernate} 466 hibernationEnabled={this.props.stores.settings.app.hibernate}
457 isDarkmodeEnabled={this.props.stores.settings.app.darkMode} 467 isDarkmodeEnabled={this.props.stores.settings.app.darkMode}
468 isTrayEnabled={this.props.stores.settings.app.enableSystemTray}
458 openProcessManager={() => this.openProcessManager()} 469 openProcessManager={() => this.openProcessManager()}
459 /> 470 />
460 </ErrorBoundary> 471 </ErrorBoundary>