diff options
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 6 | ||||
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 32 |
2 files changed, 13 insertions, 25 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index 075bd5e34..0931738fd 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -77,7 +77,7 @@ export default class AppLayoutContainer extends Component { | |||
77 | <Sidebar | 77 | <Sidebar |
78 | services={services.allDisplayed} | 78 | services={services.allDisplayed} |
79 | setActive={setActive} | 79 | setActive={setActive} |
80 | isAppMuted={settings.all.isAppMuted} | 80 | isAppMuted={settings.all.app.isAppMuted} |
81 | openSettings={openSettings} | 81 | openSettings={openSettings} |
82 | closeSettings={closeSettings} | 82 | closeSettings={closeSettings} |
83 | reorder={reorder} | 83 | reorder={reorder} |
@@ -87,7 +87,7 @@ export default class AppLayoutContainer extends Component { | |||
87 | deleteService={deleteService} | 87 | deleteService={deleteService} |
88 | updateService={updateService} | 88 | updateService={updateService} |
89 | toggleMuteApp={toggleMuteApp} | 89 | toggleMuteApp={toggleMuteApp} |
90 | showMessageBadgeWhenMutedSetting={settings.all.showMessageBadgeWhenMuted} | 90 | showMessageBadgeWhenMutedSetting={settings.all.app.showMessageBadgeWhenMuted} |
91 | showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted} | 91 | showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted} |
92 | /> | 92 | /> |
93 | ); | 93 | ); |
@@ -99,7 +99,7 @@ export default class AppLayoutContainer extends Component { | |||
99 | setWebviewReference={setWebviewReference} | 99 | setWebviewReference={setWebviewReference} |
100 | openWindow={openWindow} | 100 | openWindow={openWindow} |
101 | reload={reload} | 101 | reload={reload} |
102 | isAppMuted={settings.all.isAppMuted} | 102 | isAppMuted={settings.all.app.isAppMuted} |
103 | update={updateService} | 103 | update={updateService} |
104 | /> | 104 | /> |
105 | ); | 105 | ); |
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index e67c2964b..1bd147099 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -55,10 +55,6 @@ const messages = defineMessages({ | |||
55 | id: 'settings.app.form.spellcheckingLanguage', | 55 | id: 'settings.app.form.spellcheckingLanguage', |
56 | defaultMessage: '!!!Language for spell checking', | 56 | defaultMessage: '!!!Language for spell checking', |
57 | }, | 57 | }, |
58 | // spellcheckingAutomaticDetection: { | ||
59 | // id: 'settings.app.form.spellcheckingAutomaticDetection', | ||
60 | // defaultMessage: '!!!Detect language automatically', | ||
61 | // }, | ||
62 | beta: { | 58 | beta: { |
63 | id: 'settings.app.form.beta', | 59 | id: 'settings.app.form.beta', |
64 | defaultMessage: '!!!Include beta versions', | 60 | defaultMessage: '!!!Include beta versions', |
@@ -84,13 +80,16 @@ export default class EditSettingsScreen extends Component { | |||
84 | }); | 80 | }); |
85 | 81 | ||
86 | settings.update({ | 82 | settings.update({ |
87 | settings: { | 83 | type: 'app', |
84 | data: { | ||
88 | runInBackground: settingsData.runInBackground, | 85 | runInBackground: settingsData.runInBackground, |
89 | enableSystemTray: settingsData.enableSystemTray, | 86 | enableSystemTray: settingsData.enableSystemTray, |
90 | minimizeToSystemTray: settingsData.minimizeToSystemTray, | 87 | minimizeToSystemTray: settingsData.minimizeToSystemTray, |
91 | showDisabledServices: settingsData.showDisabledServices, | 88 | showDisabledServices: settingsData.showDisabledServices, |
92 | showMessageBadgeWhenMuted: settingsData.showMessageBadgeWhenMuted, | 89 | showMessageBadgeWhenMuted: settingsData.showMessageBadgeWhenMuted, |
93 | enableSpellchecking: settingsData.enableSpellchecking, | 90 | enableSpellchecking: settingsData.enableSpellchecking, |
91 | beta: settingsData.beta, // we need this info in the main process as well | ||
92 | locale: settingsData.locale, // we need this info in the main process as well | ||
94 | }, | 93 | }, |
95 | }); | 94 | }); |
96 | 95 | ||
@@ -114,17 +113,6 @@ export default class EditSettingsScreen extends Component { | |||
114 | }); | 113 | }); |
115 | }); | 114 | }); |
116 | 115 | ||
117 | // const spellcheckerLocales = [{ | ||
118 | // value: 'auto', | ||
119 | // label: intl.formatMessage(messages.spellcheckingAutomaticDetection), | ||
120 | // }]; | ||
121 | // Object.keys(SPELLCHECKER_LOCALES).forEach((key) => { | ||
122 | // spellcheckerLocales.push({ | ||
123 | // value: key, | ||
124 | // label: SPELLCHECKER_LOCALES[key], | ||
125 | // }); | ||
126 | // }); | ||
127 | |||
128 | const config = { | 116 | const config = { |
129 | fields: { | 117 | fields: { |
130 | autoLaunchOnStart: { | 118 | autoLaunchOnStart: { |
@@ -139,32 +127,32 @@ export default class EditSettingsScreen extends Component { | |||
139 | }, | 127 | }, |
140 | runInBackground: { | 128 | runInBackground: { |
141 | label: intl.formatMessage(messages.runInBackground), | 129 | label: intl.formatMessage(messages.runInBackground), |
142 | value: settings.all.runInBackground, | 130 | value: settings.all.app.runInBackground, |
143 | default: DEFAULT_APP_SETTINGS.runInBackground, | 131 | default: DEFAULT_APP_SETTINGS.runInBackground, |
144 | }, | 132 | }, |
145 | enableSystemTray: { | 133 | enableSystemTray: { |
146 | label: intl.formatMessage(messages.enableSystemTray), | 134 | label: intl.formatMessage(messages.enableSystemTray), |
147 | value: settings.all.enableSystemTray, | 135 | value: settings.all.app.enableSystemTray, |
148 | default: DEFAULT_APP_SETTINGS.enableSystemTray, | 136 | default: DEFAULT_APP_SETTINGS.enableSystemTray, |
149 | }, | 137 | }, |
150 | minimizeToSystemTray: { | 138 | minimizeToSystemTray: { |
151 | label: intl.formatMessage(messages.minimizeToSystemTray), | 139 | label: intl.formatMessage(messages.minimizeToSystemTray), |
152 | value: settings.all.minimizeToSystemTray, | 140 | value: settings.all.app.minimizeToSystemTray, |
153 | default: DEFAULT_APP_SETTINGS.minimizeToSystemTray, | 141 | default: DEFAULT_APP_SETTINGS.minimizeToSystemTray, |
154 | }, | 142 | }, |
155 | showDisabledServices: { | 143 | showDisabledServices: { |
156 | label: intl.formatMessage(messages.showDisabledServices), | 144 | label: intl.formatMessage(messages.showDisabledServices), |
157 | value: settings.all.showDisabledServices, | 145 | value: settings.all.app.showDisabledServices, |
158 | default: DEFAULT_APP_SETTINGS.showDisabledServices, | 146 | default: DEFAULT_APP_SETTINGS.showDisabledServices, |
159 | }, | 147 | }, |
160 | showMessageBadgeWhenMuted: { | 148 | showMessageBadgeWhenMuted: { |
161 | label: intl.formatMessage(messages.showMessageBadgeWhenMuted), | 149 | label: intl.formatMessage(messages.showMessageBadgeWhenMuted), |
162 | value: settings.all.showMessageBadgeWhenMuted, | 150 | value: settings.all.app.showMessageBadgeWhenMuted, |
163 | default: DEFAULT_APP_SETTINGS.showMessageBadgeWhenMuted, | 151 | default: DEFAULT_APP_SETTINGS.showMessageBadgeWhenMuted, |
164 | }, | 152 | }, |
165 | enableSpellchecking: { | 153 | enableSpellchecking: { |
166 | label: intl.formatMessage(messages.enableSpellchecking), | 154 | label: intl.formatMessage(messages.enableSpellchecking), |
167 | value: settings.all.enableSpellchecking, | 155 | value: settings.all.app.enableSpellchecking, |
168 | default: DEFAULT_APP_SETTINGS.enableSpellchecking, | 156 | default: DEFAULT_APP_SETTINGS.enableSpellchecking, |
169 | }, | 157 | }, |
170 | locale: { | 158 | locale: { |