diff options
Diffstat (limited to 'src/containers/settings/EditSettingsScreen.js')
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 1b05644f9..de0714870 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -1,4 +1,4 @@ | |||
1 | import React, { Component } from 'react'; | 1 | import { Component } from 'react'; |
2 | import PropTypes from 'prop-types'; | 2 | import PropTypes from 'prop-types'; |
3 | import { inject, observer } from 'mobx-react'; | 3 | import { inject, observer } from 'mobx-react'; |
4 | import { defineMessages, injectIntl } from 'react-intl'; | 4 | import { defineMessages, injectIntl } from 'react-intl'; |
@@ -177,6 +177,10 @@ const messages = defineMessages({ | |||
177 | id: 'settings.app.form.iconSize', | 177 | id: 'settings.app.form.iconSize', |
178 | defaultMessage: 'Service icon size', | 178 | defaultMessage: 'Service icon size', |
179 | }, | 179 | }, |
180 | enableLongPressServiceHint: { | ||
181 | id: 'settings.app.form.enableLongPressServiceHint', | ||
182 | defaultMessage: 'Enable service shortcut hint on long press', | ||
183 | }, | ||
180 | useVerticalStyle: { | 184 | useVerticalStyle: { |
181 | id: 'settings.app.form.useVerticalStyle', | 185 | id: 'settings.app.form.useVerticalStyle', |
182 | defaultMessage: 'Use horizontal style', | 186 | defaultMessage: 'Use horizontal style', |
@@ -209,6 +213,10 @@ const messages = defineMessages({ | |||
209 | id: 'settings.app.form.enableGPUAcceleration', | 213 | id: 'settings.app.form.enableGPUAcceleration', |
210 | defaultMessage: 'Enable GPU Acceleration', | 214 | defaultMessage: 'Enable GPU Acceleration', |
211 | }, | 215 | }, |
216 | enableGlobalHideShortcut: { | ||
217 | id: 'settings.app.form.enableGlobalHideShortcut', | ||
218 | defaultMessage: 'Enable Global shortcut to hide Ferdi', | ||
219 | }, | ||
212 | beta: { | 220 | beta: { |
213 | id: 'settings.app.form.beta', | 221 | id: 'settings.app.form.beta', |
214 | defaultMessage: 'Include beta versions', | 222 | defaultMessage: 'Include beta versions', |
@@ -289,6 +297,9 @@ class EditSettingsScreen extends Component { | |||
289 | scheduledDNDStart: settingsData.scheduledDNDStart, | 297 | scheduledDNDStart: settingsData.scheduledDNDStart, |
290 | scheduledDNDEnd: settingsData.scheduledDNDEnd, | 298 | scheduledDNDEnd: settingsData.scheduledDNDEnd, |
291 | enableGPUAcceleration: Boolean(settingsData.enableGPUAcceleration), | 299 | enableGPUAcceleration: Boolean(settingsData.enableGPUAcceleration), |
300 | enableGlobalHideShortcut: Boolean( | ||
301 | settingsData.enableGlobalHideShortcut, | ||
302 | ), | ||
292 | showDisabledServices: Boolean(settingsData.showDisabledServices), | 303 | showDisabledServices: Boolean(settingsData.showDisabledServices), |
293 | darkMode: Boolean(settingsData.darkMode), | 304 | darkMode: Boolean(settingsData.darkMode), |
294 | adaptableDarkMode: Boolean(settingsData.adaptableDarkMode), | 305 | adaptableDarkMode: Boolean(settingsData.adaptableDarkMode), |
@@ -296,6 +307,9 @@ class EditSettingsScreen extends Component { | |||
296 | splitMode: Boolean(settingsData.splitMode), | 307 | splitMode: Boolean(settingsData.splitMode), |
297 | serviceRibbonWidth: Number(settingsData.serviceRibbonWidth), | 308 | serviceRibbonWidth: Number(settingsData.serviceRibbonWidth), |
298 | iconSize: Number(settingsData.iconSize), | 309 | iconSize: Number(settingsData.iconSize), |
310 | enableLongPressServiceHint: Boolean( | ||
311 | settingsData.enableLongPressServiceHint, | ||
312 | ), | ||
299 | useVerticalStyle: Boolean(settingsData.useVerticalStyle), | 313 | useVerticalStyle: Boolean(settingsData.useVerticalStyle), |
300 | alwaysShowWorkspaces: Boolean(settingsData.alwaysShowWorkspaces), | 314 | alwaysShowWorkspaces: Boolean(settingsData.alwaysShowWorkspaces), |
301 | accentColor: settingsData.accentColor, | 315 | accentColor: settingsData.accentColor, |
@@ -503,7 +517,7 @@ class EditSettingsScreen extends Component { | |||
503 | lockingFeatureEnabled: { | 517 | lockingFeatureEnabled: { |
504 | label: intl.formatMessage(messages.enableLock), | 518 | label: intl.formatMessage(messages.enableLock), |
505 | value: settings.all.app.lockingFeatureEnabled || false, | 519 | value: settings.all.app.lockingFeatureEnabled || false, |
506 | default: false, | 520 | default: DEFAULT_APP_SETTINGS.lockingFeatureEnabled, |
507 | }, | 521 | }, |
508 | lockedPassword: { | 522 | lockedPassword: { |
509 | label: intl.formatMessage(messages.lockPassword), | 523 | label: intl.formatMessage(messages.lockPassword), |
@@ -525,7 +539,7 @@ class EditSettingsScreen extends Component { | |||
525 | scheduledDNDEnabled: { | 539 | scheduledDNDEnabled: { |
526 | label: intl.formatMessage(messages.scheduledDNDEnabled), | 540 | label: intl.formatMessage(messages.scheduledDNDEnabled), |
527 | value: settings.all.app.scheduledDNDEnabled || false, | 541 | value: settings.all.app.scheduledDNDEnabled || false, |
528 | default: false, | 542 | default: DEFAULT_APP_SETTINGS.scheduledDNDEnabled, |
529 | }, | 543 | }, |
530 | scheduledDNDStart: { | 544 | scheduledDNDStart: { |
531 | label: intl.formatMessage(messages.scheduledDNDStart), | 545 | label: intl.formatMessage(messages.scheduledDNDStart), |
@@ -603,6 +617,11 @@ class EditSettingsScreen extends Component { | |||
603 | default: DEFAULT_APP_SETTINGS.iconSize, | 617 | default: DEFAULT_APP_SETTINGS.iconSize, |
604 | options: iconSizes, | 618 | options: iconSizes, |
605 | }, | 619 | }, |
620 | enableLongPressServiceHint: { | ||
621 | label: intl.formatMessage(messages.enableLongPressServiceHint), | ||
622 | value: settings.all.app.enableLongPressServiceHint, | ||
623 | default: DEFAULT_APP_SETTINGS.enableLongPressServiceHint, | ||
624 | }, | ||
606 | useVerticalStyle: { | 625 | useVerticalStyle: { |
607 | label: intl.formatMessage(messages.useVerticalStyle), | 626 | label: intl.formatMessage(messages.useVerticalStyle), |
608 | value: settings.all.app.useVerticalStyle, | 627 | value: settings.all.app.useVerticalStyle, |
@@ -623,6 +642,11 @@ class EditSettingsScreen extends Component { | |||
623 | value: settings.all.app.enableGPUAcceleration, | 642 | value: settings.all.app.enableGPUAcceleration, |
624 | default: DEFAULT_APP_SETTINGS.enableGPUAcceleration, | 643 | default: DEFAULT_APP_SETTINGS.enableGPUAcceleration, |
625 | }, | 644 | }, |
645 | enableGlobalHideShortcut: { | ||
646 | label: intl.formatMessage(messages.enableGlobalHideShortcut), | ||
647 | value: settings.all.app.enableGlobalHideShortcut, | ||
648 | default: DEFAULT_APP_SETTINGS.enableGlobalHideShortcut, | ||
649 | }, | ||
626 | locale: { | 650 | locale: { |
627 | label: intl.formatMessage(messages.language), | 651 | label: intl.formatMessage(messages.language), |
628 | value: app.locale, | 652 | value: app.locale, |