diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 12 | ||||
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 6 | ||||
-rw-r--r-- | src/electron/ipc-api/index.ts | 2 | ||||
-rw-r--r-- | src/electron/ipc-api/processManager.ts | 8 |
4 files changed, 28 insertions, 0 deletions
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 1abd86f59..a42df869a 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -210,6 +210,7 @@ class EditSettingsForm extends Component { | |||
210 | automaticUpdates: PropTypes.bool.isRequired, | 210 | automaticUpdates: PropTypes.bool.isRequired, |
211 | isDarkmodeEnabled: PropTypes.bool.isRequired, | 211 | isDarkmodeEnabled: PropTypes.bool.isRequired, |
212 | isAdaptableDarkModeEnabled: PropTypes.bool.isRequired, | 212 | isAdaptableDarkModeEnabled: PropTypes.bool.isRequired, |
213 | openProcessManager: PropTypes.func.isRequired, | ||
213 | isSplitModeEnabled: PropTypes.bool.isRequired, | 214 | isSplitModeEnabled: PropTypes.bool.isRequired, |
214 | hasAddedTodosAsService: PropTypes.bool.isRequired, | 215 | hasAddedTodosAsService: PropTypes.bool.isRequired, |
215 | isOnline: PropTypes.bool.isRequired, | 216 | isOnline: PropTypes.bool.isRequired, |
@@ -259,6 +260,7 @@ class EditSettingsForm extends Component { | |||
259 | automaticUpdates, | 260 | automaticUpdates, |
260 | isDarkmodeEnabled, | 261 | isDarkmodeEnabled, |
261 | isSplitModeEnabled, | 262 | isSplitModeEnabled, |
263 | openProcessManager, | ||
262 | isTodosActivated, | 264 | isTodosActivated, |
263 | hasAddedTodosAsService, | 265 | hasAddedTodosAsService, |
264 | isOnline, | 266 | isOnline, |
@@ -743,6 +745,16 @@ class EditSettingsForm extends Component { | |||
743 | loaded={!isClearingAllCache} | 745 | loaded={!isClearingAllCache} |
744 | /> | 746 | /> |
745 | </p> | 747 | </p> |
748 | <div style={{ | ||
749 | marginTop: 20, | ||
750 | }} | ||
751 | > | ||
752 | <Button | ||
753 | buttonType="secondary" | ||
754 | label="Open Process Manager" | ||
755 | onClick={openProcessManager} | ||
756 | /> | ||
757 | </div> | ||
746 | </div> | 758 | </div> |
747 | 759 | ||
748 | <Hr /> | 760 | <Hr /> |
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index e4f7c13f1..c3f2b4415 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -1,3 +1,4 @@ | |||
1 | import { ipcRenderer } from 'electron'; | ||
1 | import { Component } from 'react'; | 2 | import { Component } from 'react'; |
2 | import PropTypes from 'prop-types'; | 3 | import PropTypes from 'prop-types'; |
3 | import { inject, observer } from 'mobx-react'; | 4 | import { inject, observer } from 'mobx-react'; |
@@ -373,6 +374,10 @@ class EditSettingsScreen extends Component { | |||
373 | } | 374 | } |
374 | } | 375 | } |
375 | 376 | ||
377 | openProcessManager() { | ||
378 | ipcRenderer.send('openProcessManager'); | ||
379 | } | ||
380 | |||
376 | prepareForm() { | 381 | prepareForm() { |
377 | const { app, settings, user, todos, workspaces } = this.props.stores; | 382 | const { app, settings, user, todos, workspaces } = this.props.stores; |
378 | const { intl } = this.props; | 383 | const { intl } = this.props; |
@@ -771,6 +776,7 @@ class EditSettingsScreen extends Component { | |||
771 | isUsingCustomTodoService={ | 776 | isUsingCustomTodoService={ |
772 | this.props.stores.todos.isUsingCustomTodoService | 777 | this.props.stores.todos.isUsingCustomTodoService |
773 | } | 778 | } |
779 | openProcessManager={() => this.openProcessManager()} | ||
774 | hasAddedTodosAsService={services.isTodosServiceAdded} | 780 | hasAddedTodosAsService={services.isTodosServiceAdded} |
775 | isOnline={app.isOnline} | 781 | isOnline={app.isOnline} |
776 | /> | 782 | /> |
diff --git a/src/electron/ipc-api/index.ts b/src/electron/ipc-api/index.ts index f8306d591..1a8838c4e 100644 --- a/src/electron/ipc-api/index.ts +++ b/src/electron/ipc-api/index.ts | |||
@@ -4,6 +4,7 @@ import settings from './settings'; | |||
4 | import sessionStorage from './sessionStorage'; | 4 | import sessionStorage from './sessionStorage'; |
5 | import appIndicator from './appIndicator'; | 5 | import appIndicator from './appIndicator'; |
6 | import download from './download'; | 6 | import download from './download'; |
7 | import processManager from './processManager'; | ||
7 | import localServer from './localServer'; | 8 | import localServer from './localServer'; |
8 | import languageDetect from './languageDetect'; | 9 | import languageDetect from './languageDetect'; |
9 | import dnd from './dnd'; | 10 | import dnd from './dnd'; |
@@ -19,6 +20,7 @@ export default (params: { | |||
19 | autoUpdate(params); | 20 | autoUpdate(params); |
20 | appIndicator(params); | 21 | appIndicator(params); |
21 | download(params); | 22 | download(params); |
23 | processManager(); | ||
22 | localServer(params); | 24 | localServer(params); |
23 | languageDetect(); | 25 | languageDetect(); |
24 | dnd(); | 26 | dnd(); |
diff --git a/src/electron/ipc-api/processManager.ts b/src/electron/ipc-api/processManager.ts new file mode 100644 index 000000000..96501eeaa --- /dev/null +++ b/src/electron/ipc-api/processManager.ts | |||
@@ -0,0 +1,8 @@ | |||
1 | import { ipcMain } from 'electron'; | ||
2 | import { openProcessManager } from '@krisdages/electron-process-manager'; | ||
3 | |||
4 | export default () => { | ||
5 | ipcMain.on('openProcessManager', () => { | ||
6 | openProcessManager(); | ||
7 | }); | ||
8 | }; | ||