From ef6fbfbd0821a98ff167aaa5f31f522877cf94b1 Mon Sep 17 00:00:00 2001
From: vantezzen
Date: Sun, 6 Oct 2019 15:36:01 +0200
Subject: Add Electron Process Manager
---
package-lock.json | 102 ++++++++++++++++++---
package.json | 1 +
.../settings/settings/EditSettingsForm.js | 12 +++
src/containers/settings/EditSettingsScreen.js | 6 ++
src/electron/ipc-api/index.js | 2 +
src/electron/ipc-api/processManager.js | 8 ++
src/i18n/locales/defaultMessages.json | 100 ++++++++++----------
.../containers/settings/EditSettingsScreen.json | 100 ++++++++++----------
8 files changed, 220 insertions(+), 111 deletions(-)
create mode 100644 src/electron/ipc-api/processManager.js
diff --git a/package-lock.json b/package-lock.json
index b2622361b..8ce1efc58 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6424,7 +6424,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
"integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
- "dev": true,
"requires": {
"es5-ext": "^0.10.50",
"type": "^1.0.1"
@@ -7417,6 +7416,40 @@
}
}
},
+ "electron-process-manager": {
+ "version": "0.7.1",
+ "resolved": "https://registry.npmjs.org/electron-process-manager/-/electron-process-manager-0.7.1.tgz",
+ "integrity": "sha512-GE7Sok7IfObhVPqx7n+wVBpdFxVvR/ySa56sLsTT4rnYKBFDWtdrVMiXgKjhHjxsxO59Y+piXT6QonamrQFWeA==",
+ "requires": {
+ "electron-process-reporter": "^1.4.0"
+ }
+ },
+ "electron-process-reporter": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/electron-process-reporter/-/electron-process-reporter-1.4.0.tgz",
+ "integrity": "sha512-zI5IV7zplV2eHznNbeYtMwATVqXO+g9i2ChpurvGTvExA/rpi7BdSrp38bsTz5tjJLLTz9LmzeSt85uIZ051Qw==",
+ "requires": {
+ "memoizee": "^0.4.14",
+ "pidtree": "^0.3.0",
+ "pidusage": "2.0.16",
+ "rxjs": "^5.5.6"
+ },
+ "dependencies": {
+ "rxjs": {
+ "version": "5.5.12",
+ "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz",
+ "integrity": "sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==",
+ "requires": {
+ "symbol-observable": "1.0.1"
+ }
+ },
+ "symbol-observable": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
+ "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ="
+ }
+ }
+ },
"electron-publish": {
"version": "21.2.0",
"resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-21.2.0.tgz",
@@ -7908,7 +7941,6 @@
"version": "0.10.51",
"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.51.tgz",
"integrity": "sha512-oRpWzM2WcLHVKpnrcyB7OW8j/s67Ba04JCm0WnNv3RiABSvs7mrQlutB8DBv793gKcp0XENR8Il8WxGTlZ73gQ==",
- "dev": true,
"requires": {
"es6-iterator": "~2.0.3",
"es6-symbol": "~3.1.1",
@@ -7919,7 +7951,6 @@
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
"integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
- "dev": true,
"requires": {
"d": "1",
"es5-ext": "^0.10.35",
@@ -7945,7 +7976,6 @@
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.2.tgz",
"integrity": "sha512-/ZypxQsArlv+KHpGvng52/Iz8by3EQPxhmbuz8yFG89N/caTFBSbcXONDw0aMjy827gQg26XAjP4uXFvnfINmQ==",
- "dev": true,
"requires": {
"d": "^1.0.1",
"es5-ext": "^0.10.51"
@@ -7955,7 +7985,6 @@
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
"integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
- "dev": true,
"requires": {
"d": "1",
"es5-ext": "^0.10.46",
@@ -8407,6 +8436,15 @@
"integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
"dev": true
},
+ "event-emitter": {
+ "version": "0.3.5",
+ "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+ "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
+ "requires": {
+ "d": "1",
+ "es5-ext": "~0.10.14"
+ }
+ },
"eventemitter3": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz",
@@ -13281,8 +13319,7 @@
"is-promise": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
- "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
- "dev": true
+ "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
},
"is-regex": {
"version": "1.0.4",
@@ -15087,6 +15124,14 @@
}
}
},
+ "lru-queue": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
+ "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
+ "requires": {
+ "es5-ext": "~0.10.2"
+ }
+ },
"macos-notification-state": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/macos-notification-state/-/macos-notification-state-1.3.1.tgz",
@@ -15279,6 +15324,21 @@
"p-is-promise": "^2.0.0"
}
},
+ "memoizee": {
+ "version": "0.4.14",
+ "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz",
+ "integrity": "sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==",
+ "requires": {
+ "d": "1",
+ "es5-ext": "^0.10.45",
+ "es6-weak-map": "^2.0.2",
+ "event-emitter": "^0.3.5",
+ "is-promise": "^2.1",
+ "lru-queue": "0.1",
+ "next-tick": "1",
+ "timers-ext": "^0.1.5"
+ }
+ },
"memory-fs": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
@@ -15900,8 +15960,7 @@
"next-tick": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
- "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
- "dev": true
+ "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
},
"nice-try": {
"version": "1.0.5",
@@ -17609,6 +17668,19 @@
"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
"dev": true
},
+ "pidtree": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.0.tgz",
+ "integrity": "sha512-9CT4NFlDcosssyg8KVFltgokyKZIFjoBxw8CTGy+5F38Y1eQWrt8tRayiUOXE+zVKQnYu5BR8JjCtvK3BcnBhg=="
+ },
+ "pidusage": {
+ "version": "2.0.16",
+ "resolved": "https://registry.npmjs.org/pidusage/-/pidusage-2.0.16.tgz",
+ "integrity": "sha512-9dhSBxpGvvpyycCukU8CqTqJ+YT8aVZ/AI1/hGWhU5nAAOs0zYBYMyIYBU/grKeCYuTS26TVllIRvf5vAfsgvw==",
+ "requires": {
+ "safe-buffer": "^5.1.2"
+ }
+ },
"pify": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
@@ -21257,6 +21329,15 @@
"setimmediate": "^1.0.4"
}
},
+ "timers-ext": {
+ "version": "0.1.7",
+ "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
+ "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
+ "requires": {
+ "es5-ext": "~0.10.46",
+ "next-tick": "1"
+ }
+ },
"tmp": {
"version": "0.0.33",
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@@ -21642,8 +21723,7 @@
"type": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/type/-/type-1.0.3.tgz",
- "integrity": "sha512-51IMtNfVcee8+9GJvj0spSuFcZHe9vSib6Xtgsny1Km9ugyz2mbS08I3rsUIRYgJohFRFU1160sgRodYz378Hg==",
- "dev": true
+ "integrity": "sha512-51IMtNfVcee8+9GJvj0spSuFcZHe9vSib6Xtgsny1Km9ugyz2mbS08I3rsUIRYgJohFRFU1160sgRodYz378Hg=="
},
"type-check": {
"version": "0.3.2",
diff --git a/package.json b/package.json
index 5b0a0bcdb..9d8297d26 100644
--- a/package.json
+++ b/package.json
@@ -53,6 +53,7 @@
"electron-fetch": "1.3.0",
"electron-hunspell": "1.0.0",
"electron-is-dev": "1.1.0",
+ "electron-process-manager": "0.7.1",
"electron-react-titlebar": "0.8.1",
"electron-updater": "4.1.2",
"electron-window-state": "5.0.3",
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index a15b4c255..1030f3164 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -152,6 +152,7 @@ export default @observer class EditSettingsForm extends Component {
server: PropTypes.string.isRequired,
noUpdates: PropTypes.bool.isRequired,
hibernationEnabled: PropTypes.bool.isRequired,
+ openProcessManager: PropTypes.func.isRequired,
};
static contextTypes = {
@@ -187,6 +188,7 @@ export default @observer class EditSettingsForm extends Component {
server,
noUpdates,
hibernationEnabled,
+ openProcessManager,
} = this.props;
const { intl } = this.context;
@@ -419,6 +421,16 @@ export default @observer class EditSettingsForm extends Component {
loaded={!isClearingAllCache}
/>
+
+
+
{/* Updates */}
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 8b9d21b87..5fa90acd5 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -1,3 +1,4 @@
+import { ipcRenderer } from 'electron';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { inject, observer } from 'mobx-react';
@@ -198,6 +199,10 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
}
}
+ openProcessManager() {
+ ipcRenderer.send('openProcessManager');
+ }
+
prepareForm() {
const {
app, settings, user, todos, workspaces,
@@ -410,6 +415,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
lockingFeatureEnabled={lockingFeatureEnabled}
noUpdates={this.props.stores.settings.app.noUpdates}
hibernationEnabled={this.props.stores.settings.app.hibernate}
+ openProcessManager={() => this.openProcessManager()}
/>
);
diff --git a/src/electron/ipc-api/index.js b/src/electron/ipc-api/index.js
index be8e0815a..3b7f31e4b 100644
--- a/src/electron/ipc-api/index.js
+++ b/src/electron/ipc-api/index.js
@@ -2,10 +2,12 @@ import autoUpdate from './autoUpdate';
import settings from './settings';
import appIndicator from './appIndicator';
import download from './download';
+import processManager from './processManager';
export default (params) => {
settings(params);
autoUpdate(params);
appIndicator(params);
download(params);
+ processManager(params);
};
diff --git a/src/electron/ipc-api/processManager.js b/src/electron/ipc-api/processManager.js
new file mode 100644
index 000000000..7197a2708
--- /dev/null
+++ b/src/electron/ipc-api/processManager.js
@@ -0,0 +1,8 @@
+import { ipcMain } from 'electron';
+import { openProcessManager } from 'electron-process-manager';
+
+export default () => {
+ ipcMain.on('openProcessManager', () => {
+ openProcessManager();
+ });
+};
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 52c4e74c1..e4e596b0c 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -3775,325 +3775,325 @@
"defaultMessage": "!!!Launch Ferdi on start",
"end": {
"column": 3,
- "line": 31
+ "line": 32
},
"file": "src/containers/settings/EditSettingsScreen.js",
"id": "settings.app.form.autoLaunchOnStart",
"start": {
"column": 21,
- "line": 28
+ "line": 29
}
},
{
"defaultMessage": "!!!Open in background",
"end": {
"column": 3,
- "line": 35
+ "line": 36
},
"file": "src/containers/settings/EditSettingsScreen.js",
"id": "settings.app.form.autoLaunchInBackground",
"start": {
"column": 26,
- "line": 32
+ "line": 33
}
},
{
"defaultMessage": "!!!Keep Ferdi in background when closing the window",
"end": {
"column": 3,
- "line": 39
+ "line": 40
},
"file": "src/containers/settings/EditSettingsScreen.js",
"id": "settings.app.form.runInBackground",
"start": {
"column": 19,
- "line": 36
+ "line": 37
}
},
{
"defaultMessage": "!!!Show Ferdi in system tray",
"end": {
"column": 3,
- "line": 43
+ "line": 44
},
"file": "src/containers/settings/EditSettingsScreen.js",
"id": "settings.app.form.enableSystemTray",
"start": {
"column": 20,
- "line": 40
+ "line": 41
}
},
{
"defaultMessage": "!!!Minimize Ferdi to system tray",
"end": {
"column": 3,
- "line": 47
+ "line": 48
},
"file": "src/containers/settings/EditSettingsScreen.js",
"id": "settings.app.form.minimizeToSystemTray",
"start": {
"column": 24,
- "line": 44
+ "line": 45
}
},
{
"defaultMessage": "!!!Don't show message content in notifications",
"end": {
"column": 3,
- "line": 51
+ "line": 52
},
"file": "src/containers/settings/EditSettingsScreen.js",
"id": "settings.app.form.privateNotifications",
"start": {
"column": 24,
- "line": 48
+ "line": 49
}
},
{
"defaultMessage": "!!!Enable service hibernation",
"end": {
"column": 3,
- "line": 55
+ "line": 56
},
"file": "src/containers/settings/EditSettingsScreen.js",
"id": "settings.app.form.hibernate",
"start": {
"column": 13,
- "line": 52
+ "line": 53
}
},
{
"defaultMessage": "!!!Hibernation strategy",
"end": {
"column": 3,
- "line": 59
+ "line": 60
},
"file": "src/containers/settings/EditSettingsScreen.js",
"id": "settings.app.form.hibernationStrategy",
"start": {
"column": 23,
- "line": 56
+ "line": 57
}
},
{
"defaultMessage": "!!!Server",
"end": {
"column": 3,
- "line": 63
+ "line": 64
},
"file": "src/containers/settings/EditSettingsScreen.js",
"id": "settings.app.form.server",
"start": {
"column": 10,
- "line": 60
+ "line": 61
}
},
{
"defaultMessage": "!!!Todo Server",
"end": {
"column": 3,
- "line": 67
+ "line": 68
},
"file": "src/containers/settings/EditSettingsScreen.js",
"id": "settings.app.form.todoServer",
"start": {
"column": 14,
- "line": 64
+ "line": 65
}
},
{
"defaultMessage": "!!!Enable Ferdi password lock",
"end": {
"column": 3,
- "line": 71
+ "line": 72
},
"file": "src/containers/settings/EditSettingsScreen.js",
"id": "settings.app.form.enableLock",
"start": {
"column": 14,
- "line": 68
+ "line": 69
}
},
{
"defaultMessage": "!!!Ferdi Lock password",
"end": {
"column": 3,
- "line": 75
+ "line": 76
},
"file": "src/containers/settings/EditSettingsScreen.js",
"id": "settings.app.form.lockPassword",
"start": {
"column": 16,
- "line": 72
+ "line": 73
}
},
{
"defaultMessage": "!!!Enable scheduled Do-not-Disturb",
"end": {
"column": 3,
- "line": 79
+ "line": 80
},
"file": "src/containers/settings/EditSettingsScreen.js",
"id": "settings.app.form.scheduledDNDEnabled",
"start": {
"column": 23,
- "line": 76
+ "line": 77
}
},
{
"defaultMessage": "!!!From",
"end": {
"column": 3,
- "line": 83
+ "line": 84
},
"file": "src/containers/settings/EditSettingsScreen.js",
"id": "settings.app.form.scheduledDNDStart",
"start": {
"column": 21,
- "line": 80
+ "line": 81
}
},
{
"defaultMessage": "!!!To",
"end": {
"column": 3,
- "line": 87
+ "line": 88
},
"file": "src/containers/settings/EditSettingsScreen.js",
"id": "settings.app.form.scheduledDNDEnd",
"start": {
"column": 19,
- "line": 84
+ "line": 85
}
},
{
"defaultMessage": "!!!Language",
"end": {
"column": 3,
- "line": 91
+ "line": 92
},
"file": "src/containers/settings/EditSettingsScreen.js",
"id": "settings.app.form.language",
"start": {
"column": 12,
- "line": 88
+ "line": 89
}
},
{
"defaultMessage": "!!!Dark Mode",
"end": {
"column": 3,
- "line": 95
+ "line": 96
},
"file": "src/containers/settings/EditSettingsScreen.js",
"id": "settings.app.form.darkMode",
"start": {
"column": 12,
- "line": 92
+ "line": 93
}
},
{
"defaultMessage": "!!!Display disabled services tabs",
"end": {
"column": 3,
- "line": 99
+ "line": 100
},
"file": "src/containers/settings/EditSettingsScreen.js",
"id": "settings.app.form.showDisabledServices",
"start": {
"column": 24,
- "line": 96
+ "line": 97
}
},
{
"defaultMessage": "!!!Show unread message badge when notifications are disabled",
"end": {
"column": 3,
- "line": 103
+ "line": 104
},
"file": "src/containers/settings/EditSettingsScreen.js",
"id": "settings.app.form.showMessagesBadgesWhenMuted",
"start": {
"column": 29,
- "line": 100
+ "line": 101
}
},
{
"defaultMessage": "!!!Enable spell checking",
"end": {
"column": 3,
- "line": 107
+ "line": 108
},
"file": "src/containers/settings/EditSettingsScreen.js",
"id": "settings.app.form.enableSpellchecking",
"start": {
"column": 23,
- "line": 104
+ "line": 105
}
},
{
"defaultMessage": "!!!Enable GPU Acceleration",
"end": {
"column": 3,
- "line": 111
+ "line": 112
},
"file": "src/containers/settings/EditSettingsScreen.js",
"id": "settings.app.form.enableGPUAcceleration",
"start": {
"column": 25,
- "line": 108
+ "line": 109
}
},
{
"defaultMessage": "!!!Include beta versions",
"end": {
"column": 3,
- "line": 115
+ "line": 116
},
"file": "src/containers/settings/EditSettingsScreen.js",
"id": "settings.app.form.beta",
"start": {
"column": 8,
- "line": 112
+ "line": 113
}
},
{
"defaultMessage": "!!!Disable updates",
"end": {
"column": 3,
- "line": 119
+ "line": 120
},
"file": "src/containers/settings/EditSettingsScreen.js",
"id": "settings.app.form.noUpdates",
"start": {
"column": 13,
- "line": 116
+ "line": 117
}
},
{
"defaultMessage": "!!!Enable Franz Todos",
"end": {
"column": 3,
- "line": 123
+ "line": 124
},
"file": "src/containers/settings/EditSettingsScreen.js",
"id": "settings.app.form.enableTodos",
"start": {
"column": 15,
- "line": 120
+ "line": 121
}
},
{
"defaultMessage": "!!!Keep all workspaces loaded",
"end": {
"column": 3,
- "line": 127
+ "line": 128
},
"file": "src/containers/settings/EditSettingsScreen.js",
"id": "settings.app.form.keepAllWorkspacesLoaded",
"start": {
"column": 27,
- "line": 124
+ "line": 125
}
}
],
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index de4660303..d40d5ba97 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -4,11 +4,11 @@
"defaultMessage": "!!!Launch Ferdi on start",
"file": "src/containers/settings/EditSettingsScreen.js",
"start": {
- "line": 28,
+ "line": 29,
"column": 21
},
"end": {
- "line": 31,
+ "line": 32,
"column": 3
}
},
@@ -17,11 +17,11 @@
"defaultMessage": "!!!Open in background",
"file": "src/containers/settings/EditSettingsScreen.js",
"start": {
- "line": 32,
+ "line": 33,
"column": 26
},
"end": {
- "line": 35,
+ "line": 36,
"column": 3
}
},
@@ -30,11 +30,11 @@
"defaultMessage": "!!!Keep Ferdi in background when closing the window",
"file": "src/containers/settings/EditSettingsScreen.js",
"start": {
- "line": 36,
+ "line": 37,
"column": 19
},
"end": {
- "line": 39,
+ "line": 40,
"column": 3
}
},
@@ -43,11 +43,11 @@
"defaultMessage": "!!!Show Ferdi in system tray",
"file": "src/containers/settings/EditSettingsScreen.js",
"start": {
- "line": 40,
+ "line": 41,
"column": 20
},
"end": {
- "line": 43,
+ "line": 44,
"column": 3
}
},
@@ -56,11 +56,11 @@
"defaultMessage": "!!!Minimize Ferdi to system tray",
"file": "src/containers/settings/EditSettingsScreen.js",
"start": {
- "line": 44,
+ "line": 45,
"column": 24
},
"end": {
- "line": 47,
+ "line": 48,
"column": 3
}
},
@@ -69,11 +69,11 @@
"defaultMessage": "!!!Don't show message content in notifications",
"file": "src/containers/settings/EditSettingsScreen.js",
"start": {
- "line": 48,
+ "line": 49,
"column": 24
},
"end": {
- "line": 51,
+ "line": 52,
"column": 3
}
},
@@ -82,11 +82,11 @@
"defaultMessage": "!!!Enable service hibernation",
"file": "src/containers/settings/EditSettingsScreen.js",
"start": {
- "line": 52,
+ "line": 53,
"column": 13
},
"end": {
- "line": 55,
+ "line": 56,
"column": 3
}
},
@@ -95,11 +95,11 @@
"defaultMessage": "!!!Hibernation strategy",
"file": "src/containers/settings/EditSettingsScreen.js",
"start": {
- "line": 56,
+ "line": 57,
"column": 23
},
"end": {
- "line": 59,
+ "line": 60,
"column": 3
}
},
@@ -108,11 +108,11 @@
"defaultMessage": "!!!Server",
"file": "src/containers/settings/EditSettingsScreen.js",
"start": {
- "line": 60,
+ "line": 61,
"column": 10
},
"end": {
- "line": 63,
+ "line": 64,
"column": 3
}
},
@@ -121,11 +121,11 @@
"defaultMessage": "!!!Todo Server",
"file": "src/containers/settings/EditSettingsScreen.js",
"start": {
- "line": 64,
+ "line": 65,
"column": 14
},
"end": {
- "line": 67,
+ "line": 68,
"column": 3
}
},
@@ -134,11 +134,11 @@
"defaultMessage": "!!!Enable Ferdi password lock",
"file": "src/containers/settings/EditSettingsScreen.js",
"start": {
- "line": 68,
+ "line": 69,
"column": 14
},
"end": {
- "line": 71,
+ "line": 72,
"column": 3
}
},
@@ -147,11 +147,11 @@
"defaultMessage": "!!!Ferdi Lock password",
"file": "src/containers/settings/EditSettingsScreen.js",
"start": {
- "line": 72,
+ "line": 73,
"column": 16
},
"end": {
- "line": 75,
+ "line": 76,
"column": 3
}
},
@@ -160,11 +160,11 @@
"defaultMessage": "!!!Enable scheduled Do-not-Disturb",
"file": "src/containers/settings/EditSettingsScreen.js",
"start": {
- "line": 76,
+ "line": 77,
"column": 23
},
"end": {
- "line": 79,
+ "line": 80,
"column": 3
}
},
@@ -173,11 +173,11 @@
"defaultMessage": "!!!From",
"file": "src/containers/settings/EditSettingsScreen.js",
"start": {
- "line": 80,
+ "line": 81,
"column": 21
},
"end": {
- "line": 83,
+ "line": 84,
"column": 3
}
},
@@ -186,11 +186,11 @@
"defaultMessage": "!!!To",
"file": "src/containers/settings/EditSettingsScreen.js",
"start": {
- "line": 84,
+ "line": 85,
"column": 19
},
"end": {
- "line": 87,
+ "line": 88,
"column": 3
}
},
@@ -199,11 +199,11 @@
"defaultMessage": "!!!Language",
"file": "src/containers/settings/EditSettingsScreen.js",
"start": {
- "line": 88,
+ "line": 89,
"column": 12
},
"end": {
- "line": 91,
+ "line": 92,
"column": 3
}
},
@@ -212,11 +212,11 @@
"defaultMessage": "!!!Dark Mode",
"file": "src/containers/settings/EditSettingsScreen.js",
"start": {
- "line": 92,
+ "line": 93,
"column": 12
},
"end": {
- "line": 95,
+ "line": 96,
"column": 3
}
},
@@ -225,11 +225,11 @@
"defaultMessage": "!!!Display disabled services tabs",
"file": "src/containers/settings/EditSettingsScreen.js",
"start": {
- "line": 96,
+ "line": 97,
"column": 24
},
"end": {
- "line": 99,
+ "line": 100,
"column": 3
}
},
@@ -238,11 +238,11 @@
"defaultMessage": "!!!Show unread message badge when notifications are disabled",
"file": "src/containers/settings/EditSettingsScreen.js",
"start": {
- "line": 100,
+ "line": 101,
"column": 29
},
"end": {
- "line": 103,
+ "line": 104,
"column": 3
}
},
@@ -251,11 +251,11 @@
"defaultMessage": "!!!Enable spell checking",
"file": "src/containers/settings/EditSettingsScreen.js",
"start": {
- "line": 104,
+ "line": 105,
"column": 23
},
"end": {
- "line": 107,
+ "line": 108,
"column": 3
}
},
@@ -264,11 +264,11 @@
"defaultMessage": "!!!Enable GPU Acceleration",
"file": "src/containers/settings/EditSettingsScreen.js",
"start": {
- "line": 108,
+ "line": 109,
"column": 25
},
"end": {
- "line": 111,
+ "line": 112,
"column": 3
}
},
@@ -277,11 +277,11 @@
"defaultMessage": "!!!Include beta versions",
"file": "src/containers/settings/EditSettingsScreen.js",
"start": {
- "line": 112,
+ "line": 113,
"column": 8
},
"end": {
- "line": 115,
+ "line": 116,
"column": 3
}
},
@@ -290,11 +290,11 @@
"defaultMessage": "!!!Disable updates",
"file": "src/containers/settings/EditSettingsScreen.js",
"start": {
- "line": 116,
+ "line": 117,
"column": 13
},
"end": {
- "line": 119,
+ "line": 120,
"column": 3
}
},
@@ -303,11 +303,11 @@
"defaultMessage": "!!!Enable Franz Todos",
"file": "src/containers/settings/EditSettingsScreen.js",
"start": {
- "line": 120,
+ "line": 121,
"column": 15
},
"end": {
- "line": 123,
+ "line": 124,
"column": 3
}
},
@@ -316,11 +316,11 @@
"defaultMessage": "!!!Keep all workspaces loaded",
"file": "src/containers/settings/EditSettingsScreen.js",
"start": {
- "line": 124,
+ "line": 125,
"column": 27
},
"end": {
- "line": 127,
+ "line": 128,
"column": 3
}
}
--
cgit v1.2.3-70-g09d2