diff options
author | 2018-04-02 19:53:15 +0200 | |
---|---|---|
committer | 2018-04-02 19:53:15 +0200 | |
commit | 5ef6630d8a1998d611ca94850878aec18ec13166 (patch) | |
tree | eed15c06c7a24bd379f8f45f224f9928d84fa6ed /src/containers | |
parent | minor style fix (diff) | |
parent | Merge pull request #856 from meetfranz/feature/disable-gpu-acceleration (diff) | |
download | ferdium-app-5ef6630d8a1998d611ca94850878aec18ec13166.tar.gz ferdium-app-5ef6630d8a1998d611ca94850878aec18ec13166.tar.zst ferdium-app-5ef6630d8a1998d611ca94850878aec18ec13166.zip |
Merge branch 'develop' of github.com:meetfranz/franz into develop
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 6 | ||||
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 52 |
2 files changed, 24 insertions, 34 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index 222ffdc1a..9212f809f 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 1fa7ce8bc..018ce663f 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -51,14 +51,14 @@ const messages = defineMessages({ | |||
51 | id: 'settings.app.form.enableSpellchecking', | 51 | id: 'settings.app.form.enableSpellchecking', |
52 | defaultMessage: '!!!Enable spell checking', | 52 | defaultMessage: '!!!Enable spell checking', |
53 | }, | 53 | }, |
54 | enableGPUAcceleration: { | ||
55 | id: 'settings.app.form.enableGPUAcceleration', | ||
56 | defaultMessage: '!!!Enable GPU Acceleration', | ||
57 | }, | ||
54 | spellcheckingLanguage: { | 58 | spellcheckingLanguage: { |
55 | id: 'settings.app.form.spellcheckingLanguage', | 59 | id: 'settings.app.form.spellcheckingLanguage', |
56 | defaultMessage: '!!!Language for spell checking', | 60 | defaultMessage: '!!!Language for spell checking', |
57 | }, | 61 | }, |
58 | // spellcheckingAutomaticDetection: { | ||
59 | // id: 'settings.app.form.spellcheckingAutomaticDetection', | ||
60 | // defaultMessage: '!!!Detect language automatically', | ||
61 | // }, | ||
62 | beta: { | 62 | beta: { |
63 | id: 'settings.app.form.beta', | 63 | id: 'settings.app.form.beta', |
64 | defaultMessage: '!!!Include beta versions', | 64 | defaultMessage: '!!!Include beta versions', |
@@ -84,22 +84,24 @@ export default class EditSettingsScreen extends Component { | |||
84 | }); | 84 | }); |
85 | 85 | ||
86 | settings.update({ | 86 | settings.update({ |
87 | settings: { | 87 | type: 'app', |
88 | data: { | ||
88 | runInBackground: settingsData.runInBackground, | 89 | runInBackground: settingsData.runInBackground, |
89 | enableSystemTray: settingsData.enableSystemTray, | 90 | enableSystemTray: settingsData.enableSystemTray, |
90 | minimizeToSystemTray: settingsData.minimizeToSystemTray, | 91 | minimizeToSystemTray: settingsData.minimizeToSystemTray, |
92 | enableGPUAcceleration: settingsData.enableGPUAcceleration, | ||
91 | showDisabledServices: settingsData.showDisabledServices, | 93 | showDisabledServices: settingsData.showDisabledServices, |
92 | showMessageBadgeWhenMuted: settingsData.showMessageBadgeWhenMuted, | 94 | showMessageBadgeWhenMuted: settingsData.showMessageBadgeWhenMuted, |
93 | enableSpellchecking: settingsData.enableSpellchecking, | 95 | enableSpellchecking: settingsData.enableSpellchecking, |
94 | // spellcheckingLanguage: settingsData.spellcheckingLanguage, | 96 | beta: settingsData.beta, // we need this info in the main process as well |
95 | locale: settingsData.locale, | 97 | locale: settingsData.locale, // we need this info in the main process as well |
96 | beta: settingsData.beta, | ||
97 | }, | 98 | }, |
98 | }); | 99 | }); |
99 | 100 | ||
100 | user.update({ | 101 | user.update({ |
101 | userData: { | 102 | userData: { |
102 | beta: settingsData.beta, | 103 | beta: settingsData.beta, |
104 | locale: settingsData.locale, | ||
103 | }, | 105 | }, |
104 | }); | 106 | }); |
105 | } | 107 | } |
@@ -116,17 +118,6 @@ export default class EditSettingsScreen extends Component { | |||
116 | }); | 118 | }); |
117 | }); | 119 | }); |
118 | 120 | ||
119 | // const spellcheckerLocales = [{ | ||
120 | // value: 'auto', | ||
121 | // label: intl.formatMessage(messages.spellcheckingAutomaticDetection), | ||
122 | // }]; | ||
123 | // Object.keys(SPELLCHECKER_LOCALES).forEach((key) => { | ||
124 | // spellcheckerLocales.push({ | ||
125 | // value: key, | ||
126 | // label: SPELLCHECKER_LOCALES[key], | ||
127 | // }); | ||
128 | // }); | ||
129 | |||
130 | const config = { | 121 | const config = { |
131 | fields: { | 122 | fields: { |
132 | autoLaunchOnStart: { | 123 | autoLaunchOnStart: { |
@@ -141,40 +132,39 @@ export default class EditSettingsScreen extends Component { | |||
141 | }, | 132 | }, |
142 | runInBackground: { | 133 | runInBackground: { |
143 | label: intl.formatMessage(messages.runInBackground), | 134 | label: intl.formatMessage(messages.runInBackground), |
144 | value: settings.all.runInBackground, | 135 | value: settings.all.app.runInBackground, |
145 | default: DEFAULT_APP_SETTINGS.runInBackground, | 136 | default: DEFAULT_APP_SETTINGS.runInBackground, |
146 | }, | 137 | }, |
147 | enableSystemTray: { | 138 | enableSystemTray: { |
148 | label: intl.formatMessage(messages.enableSystemTray), | 139 | label: intl.formatMessage(messages.enableSystemTray), |
149 | value: settings.all.enableSystemTray, | 140 | value: settings.all.app.enableSystemTray, |
150 | default: DEFAULT_APP_SETTINGS.enableSystemTray, | 141 | default: DEFAULT_APP_SETTINGS.enableSystemTray, |
151 | }, | 142 | }, |
152 | minimizeToSystemTray: { | 143 | minimizeToSystemTray: { |
153 | label: intl.formatMessage(messages.minimizeToSystemTray), | 144 | label: intl.formatMessage(messages.minimizeToSystemTray), |
154 | value: settings.all.minimizeToSystemTray, | 145 | value: settings.all.app.minimizeToSystemTray, |
155 | default: DEFAULT_APP_SETTINGS.minimizeToSystemTray, | 146 | default: DEFAULT_APP_SETTINGS.minimizeToSystemTray, |
156 | }, | 147 | }, |
157 | showDisabledServices: { | 148 | showDisabledServices: { |
158 | label: intl.formatMessage(messages.showDisabledServices), | 149 | label: intl.formatMessage(messages.showDisabledServices), |
159 | value: settings.all.showDisabledServices, | 150 | value: settings.all.app.showDisabledServices, |
160 | default: DEFAULT_APP_SETTINGS.showDisabledServices, | 151 | default: DEFAULT_APP_SETTINGS.showDisabledServices, |
161 | }, | 152 | }, |
162 | showMessageBadgeWhenMuted: { | 153 | showMessageBadgeWhenMuted: { |
163 | label: intl.formatMessage(messages.showMessageBadgeWhenMuted), | 154 | label: intl.formatMessage(messages.showMessageBadgeWhenMuted), |
164 | value: settings.all.showMessageBadgeWhenMuted, | 155 | value: settings.all.app.showMessageBadgeWhenMuted, |
165 | default: DEFAULT_APP_SETTINGS.showMessageBadgeWhenMuted, | 156 | default: DEFAULT_APP_SETTINGS.showMessageBadgeWhenMuted, |
166 | }, | 157 | }, |
167 | enableSpellchecking: { | 158 | enableSpellchecking: { |
168 | label: intl.formatMessage(messages.enableSpellchecking), | 159 | label: intl.formatMessage(messages.enableSpellchecking), |
169 | value: settings.all.enableSpellchecking, | 160 | value: settings.all.app.enableSpellchecking, |
170 | default: DEFAULT_APP_SETTINGS.enableSpellchecking, | 161 | default: DEFAULT_APP_SETTINGS.enableSpellchecking, |
171 | }, | 162 | }, |
172 | // spellcheckingLanguage: { | 163 | enableGPUAcceleration: { |
173 | // label: intl.formatMessage(messages.spellcheckingLanguage), | 164 | label: intl.formatMessage(messages.enableGPUAcceleration), |
174 | // value: settings.all.spellcheckingLanguage, | 165 | value: settings.all.app.enableGPUAcceleration, |
175 | // options: spellcheckerLocales, | 166 | default: DEFAULT_APP_SETTINGS.enableGPUAcceleration, |
176 | // default: DEFAULT_APP_SETTINGS.spellcheckingLanguage, | 167 | }, |
177 | // }, | ||
178 | locale: { | 168 | locale: { |
179 | label: intl.formatMessage(messages.language), | 169 | label: intl.formatMessage(messages.language), |
180 | value: app.locale, | 170 | value: app.locale, |