diff options
author | Vijay A <vraravam@users.noreply.github.com> | 2021-10-07 09:02:32 +0530 |
---|---|---|
committer | Vijay Aravamudhan <vraravam@users.noreply.github.com> | 2021-10-07 12:56:36 +0530 |
commit | a94e6c69b5d409e219a0e5e62b045716f0f9c577 (patch) | |
tree | 14d8bc587ffbca64d609e6589dde7248cd40ce67 /src/containers/settings | |
parent | refactor: locale selection cleanup (#2031) (diff) | |
download | ferdium-app-a94e6c69b5d409e219a0e5e62b045716f0f9c577.tar.gz ferdium-app-a94e6c69b5d409e219a0e5e62b045716f0f9c577.tar.zst ferdium-app-a94e6c69b5d409e219a0e5e62b045716f0f9c577.zip |
fix: Control the global shortcut (for hiding Ferdi) via a preference (default: off)
Diffstat (limited to 'src/containers/settings')
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 4b59442cb..8c37d2692 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -209,6 +209,10 @@ const messages = defineMessages({ | |||
209 | id: 'settings.app.form.enableGPUAcceleration', | 209 | id: 'settings.app.form.enableGPUAcceleration', |
210 | defaultMessage: 'Enable GPU Acceleration', | 210 | defaultMessage: 'Enable GPU Acceleration', |
211 | }, | 211 | }, |
212 | enableGlobalHideShortcut: { | ||
213 | id: 'settings.app.form.enableGlobalHideShortcut', | ||
214 | defaultMessage: 'Enable Global shortcut to hide Ferdi', | ||
215 | }, | ||
212 | beta: { | 216 | beta: { |
213 | id: 'settings.app.form.beta', | 217 | id: 'settings.app.form.beta', |
214 | defaultMessage: 'Include beta versions', | 218 | defaultMessage: 'Include beta versions', |
@@ -289,6 +293,7 @@ class EditSettingsScreen extends Component { | |||
289 | scheduledDNDStart: settingsData.scheduledDNDStart, | 293 | scheduledDNDStart: settingsData.scheduledDNDStart, |
290 | scheduledDNDEnd: settingsData.scheduledDNDEnd, | 294 | scheduledDNDEnd: settingsData.scheduledDNDEnd, |
291 | enableGPUAcceleration: Boolean(settingsData.enableGPUAcceleration), | 295 | enableGPUAcceleration: Boolean(settingsData.enableGPUAcceleration), |
296 | enableGlobalHideShortcut: Boolean(settingsData.enableGlobalHideShortcut), | ||
292 | showDisabledServices: Boolean(settingsData.showDisabledServices), | 297 | showDisabledServices: Boolean(settingsData.showDisabledServices), |
293 | darkMode: Boolean(settingsData.darkMode), | 298 | darkMode: Boolean(settingsData.darkMode), |
294 | adaptableDarkMode: Boolean(settingsData.adaptableDarkMode), | 299 | adaptableDarkMode: Boolean(settingsData.adaptableDarkMode), |
@@ -623,6 +628,11 @@ class EditSettingsScreen extends Component { | |||
623 | value: settings.all.app.enableGPUAcceleration, | 628 | value: settings.all.app.enableGPUAcceleration, |
624 | default: DEFAULT_APP_SETTINGS.enableGPUAcceleration, | 629 | default: DEFAULT_APP_SETTINGS.enableGPUAcceleration, |
625 | }, | 630 | }, |
631 | enableGlobalHideShortcut: { | ||
632 | label: intl.formatMessage(messages.enableGlobalHideShortcut), | ||
633 | value: settings.all.app.enableGlobalHideShortcut, | ||
634 | default: DEFAULT_APP_SETTINGS.enableGlobalHideShortcut, | ||
635 | }, | ||
626 | locale: { | 636 | locale: { |
627 | label: intl.formatMessage(messages.language), | 637 | label: intl.formatMessage(messages.language), |
628 | value: app.locale, | 638 | value: app.locale, |