aboutsummaryrefslogtreecommitdiffstats
path: root/src/containers
diff options
context:
space:
mode:
authorLibravatar James Andariese <jandarie@uaa.alaska.edu>2022-02-27 02:17:48 -0600
committerLibravatar GitHub <noreply@github.com>2022-02-27 09:17:48 +0100
commitdeb5b3d025ee42a78816b5a57489722239bbbbeb (patch)
treec9a8a82c95efdb3cb6a510e3911fb2bb2625439b /src/containers
parent5.7.1-nightly.16 [skip ci] (diff)
downloadferdium-app-deb5b3d025ee42a78816b5a57489722239bbbbeb.tar.gz
ferdium-app-deb5b3d025ee42a78816b5a57489722239bbbbeb.tar.zst
ferdium-app-deb5b3d025ee42a78816b5a57489722239bbbbeb.zip
Add configurable hibernation interval after auto-wakeup (#2422)
Diffstat (limited to 'src/containers')
-rw-r--r--src/containers/settings/EditSettingsScreen.js27
1 files changed, 27 insertions, 0 deletions
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index eff5f20ff..6e405cd92 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -20,6 +20,7 @@ import {
20 DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED, 20 DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED,
21 DEFAULT_IS_FEATURE_ENABLED_BY_USER, 21 DEFAULT_IS_FEATURE_ENABLED_BY_USER,
22 WAKE_UP_STRATEGIES, 22 WAKE_UP_STRATEGIES,
23 WAKE_UP_HIBERNATION_STRATEGIES,
23 SPLIT_COLUMNS_MIN, 24 SPLIT_COLUMNS_MIN,
24 SPLIT_COLUMNS_MAX, 25 SPLIT_COLUMNS_MAX,
25} from '../../config'; 26} from '../../config';
@@ -115,6 +116,14 @@ const messages = defineMessages({
115 id: 'settings.app.form.wakeUpStrategy', 116 id: 'settings.app.form.wakeUpStrategy',
116 defaultMessage: 'Wake up strategy', 117 defaultMessage: 'Wake up strategy',
117 }, 118 },
119 wakeUpHibernationStrategy: {
120 id: 'settings.app.form.wakeUpHibernationStrategy',
121 defaultMessage: 'Hibernation strategy after automatic wake up',
122 },
123 wakeUpHibernationSplay: {
124 id: 'settings.app.form.wakeUpHibernationSplay',
125 defaultMessage: 'Splay hibernate/wake cycles to reduce load',
126 },
118 predefinedTodoServer: { 127 predefinedTodoServer: {
119 id: 'settings.app.form.predefinedTodoServer', 128 id: 'settings.app.form.predefinedTodoServer',
120 defaultMessage: 'Todo Server', 129 defaultMessage: 'Todo Server',
@@ -295,6 +304,8 @@ class EditSettingsScreen extends Component {
295 hibernateOnStartup: Boolean(settingsData.hibernateOnStartup), 304 hibernateOnStartup: Boolean(settingsData.hibernateOnStartup),
296 hibernationStrategy: Number(settingsData.hibernationStrategy), 305 hibernationStrategy: Number(settingsData.hibernationStrategy),
297 wakeUpStrategy: Number(settingsData.wakeUpStrategy), 306 wakeUpStrategy: Number(settingsData.wakeUpStrategy),
307 wakeUpHibernationStrategy: Number(settingsData.wakeUpHibernationStrategy),
308 wakeUpHibernationSplay: Boolean(settingsData.wakeUpHibernationSplay),
298 predefinedTodoServer: settingsData.predefinedTodoServer, 309 predefinedTodoServer: settingsData.predefinedTodoServer,
299 customTodoServer: settingsData.customTodoServer, 310 customTodoServer: settingsData.customTodoServer,
300 lockingFeatureEnabled: Boolean(settingsData.lockingFeatureEnabled), 311 lockingFeatureEnabled: Boolean(settingsData.lockingFeatureEnabled),
@@ -391,6 +402,11 @@ class EditSettingsScreen extends Component {
391 sort: false, 402 sort: false,
392 }); 403 });
393 404
405 const wakeUpHibernationStrategies = getSelectOptions({
406 locales: WAKE_UP_HIBERNATION_STRATEGIES,
407 sort: false,
408 });
409
394 const todoApp = getSelectOptions({ 410 const todoApp = getSelectOptions({
395 locales: TODO_APPS, 411 locales: TODO_APPS,
396 sort: false, 412 sort: false,
@@ -511,6 +527,17 @@ class EditSettingsScreen extends Component {
511 options: wakeUpStrategies, 527 options: wakeUpStrategies,
512 default: DEFAULT_APP_SETTINGS.wakeUpStrategy, 528 default: DEFAULT_APP_SETTINGS.wakeUpStrategy,
513 }, 529 },
530 wakeUpHibernationStrategy: {
531 label: intl.formatMessage(messages.wakeUpHibernationStrategy),
532 value: settings.all.app.wakeUpHibernationStrategy,
533 options: wakeUpHibernationStrategies,
534 default: DEFAULT_APP_SETTINGS.wakeUpHibernationStrategy,
535 },
536 wakeUpHibernationSplay: {
537 label: intl.formatMessage(messages.wakeUpHibernationSplay),
538 value: settings.all.app.wakeUpHibernationSplay,
539 default: DEFAULT_APP_SETTINGS.wakeUpHibernationSplay,
540 },
514 predefinedTodoServer: { 541 predefinedTodoServer: {
515 label: intl.formatMessage(messages.predefinedTodoServer), 542 label: intl.formatMessage(messages.predefinedTodoServer),
516 value: settings.all.app.predefinedTodoServer, 543 value: settings.all.app.predefinedTodoServer,