diff options
Diffstat (limited to 'src/containers/settings/EditSettingsScreen.js')
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 65b5a45df..954f64dc6 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -17,13 +17,15 @@ import { getSelectOptions } from '../../helpers/i18n-helpers'; | |||
17 | import EditSettingsForm from '../../components/settings/settings/EditSettingsForm'; | 17 | import EditSettingsForm from '../../components/settings/settings/EditSettingsForm'; |
18 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 18 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |
19 | 19 | ||
20 | import { API } from '../../environment'; | ||
21 | |||
20 | import globalMessages from '../../i18n/globalMessages'; | 22 | import globalMessages from '../../i18n/globalMessages'; |
21 | import { DEFAULT_IS_FEATURE_ENABLED_BY_USER } from '../../features/todos'; | 23 | import { DEFAULT_IS_FEATURE_ENABLED_BY_USER } from '../../features/todos'; |
22 | 24 | ||
23 | const messages = defineMessages({ | 25 | const messages = defineMessages({ |
24 | autoLaunchOnStart: { | 26 | autoLaunchOnStart: { |
25 | id: 'settings.app.form.autoLaunchOnStart', | 27 | id: 'settings.app.form.autoLaunchOnStart', |
26 | defaultMessage: '!!!Launch Franz on start', | 28 | defaultMessage: '!!!Launch Ferdi on start', |
27 | }, | 29 | }, |
28 | autoLaunchInBackground: { | 30 | autoLaunchInBackground: { |
29 | id: 'settings.app.form.autoLaunchInBackground', | 31 | id: 'settings.app.form.autoLaunchInBackground', |
@@ -31,15 +33,19 @@ const messages = defineMessages({ | |||
31 | }, | 33 | }, |
32 | runInBackground: { | 34 | runInBackground: { |
33 | id: 'settings.app.form.runInBackground', | 35 | id: 'settings.app.form.runInBackground', |
34 | defaultMessage: '!!!Keep Franz in background when closing the window', | 36 | defaultMessage: '!!!Keep Ferdi in background when closing the window', |
35 | }, | 37 | }, |
36 | enableSystemTray: { | 38 | enableSystemTray: { |
37 | id: 'settings.app.form.enableSystemTray', | 39 | id: 'settings.app.form.enableSystemTray', |
38 | defaultMessage: '!!!Show Franz in system tray', | 40 | defaultMessage: '!!!Show Ferdi in system tray', |
39 | }, | 41 | }, |
40 | minimizeToSystemTray: { | 42 | minimizeToSystemTray: { |
41 | id: 'settings.app.form.minimizeToSystemTray', | 43 | id: 'settings.app.form.minimizeToSystemTray', |
42 | defaultMessage: '!!!Minimize Franz to system tray', | 44 | defaultMessage: '!!!Minimize Ferdi to system tray', |
45 | }, | ||
46 | server: { | ||
47 | id: 'settings.app.form.server', | ||
48 | defaultMessage: '!!!Server', | ||
43 | }, | 49 | }, |
44 | language: { | 50 | language: { |
45 | id: 'settings.app.form.language', | 51 | id: 'settings.app.form.language', |
@@ -100,6 +106,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
100 | runInBackground: settingsData.runInBackground, | 106 | runInBackground: settingsData.runInBackground, |
101 | enableSystemTray: settingsData.enableSystemTray, | 107 | enableSystemTray: settingsData.enableSystemTray, |
102 | minimizeToSystemTray: settingsData.minimizeToSystemTray, | 108 | minimizeToSystemTray: settingsData.minimizeToSystemTray, |
109 | server: settingsData.server, | ||
103 | enableGPUAcceleration: settingsData.enableGPUAcceleration, | 110 | enableGPUAcceleration: settingsData.enableGPUAcceleration, |
104 | showDisabledServices: settingsData.showDisabledServices, | 111 | showDisabledServices: settingsData.showDisabledServices, |
105 | darkMode: settingsData.darkMode, | 112 | darkMode: settingsData.darkMode, |
@@ -165,6 +172,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
165 | value: settings.all.app.minimizeToSystemTray, | 172 | value: settings.all.app.minimizeToSystemTray, |
166 | default: DEFAULT_APP_SETTINGS.minimizeToSystemTray, | 173 | default: DEFAULT_APP_SETTINGS.minimizeToSystemTray, |
167 | }, | 174 | }, |
175 | server: { | ||
176 | label: intl.formatMessage(messages.server), | ||
177 | value: settings.all.app.server || API, | ||
178 | default: API, | ||
179 | }, | ||
168 | showDisabledServices: { | 180 | showDisabledServices: { |
169 | label: intl.formatMessage(messages.showDisabledServices), | 181 | label: intl.formatMessage(messages.showDisabledServices), |
170 | value: settings.all.app.showDisabledServices, | 182 | value: settings.all.app.showDisabledServices, |