diff options
author | 2022-05-01 17:32:30 -0500 | |
---|---|---|
committer | 2022-05-01 22:32:30 +0000 | |
commit | 0bcf603bbb39d984b1ebea9ce73741b524434c5c (patch) | |
tree | 17d9e7acb4182d2445bf7b18d3ea46cc514ca61a | |
parent | 6.0.0-nightly.22 [skip ci] (diff) | |
download | ferdium-app-0bcf603bbb39d984b1ebea9ce73741b524434c5c.tar.gz ferdium-app-0bcf603bbb39d984b1ebea9ce73741b524434c5c.tar.zst ferdium-app-0bcf603bbb39d984b1ebea9ce73741b524434c5c.zip |
Resurrect the electron-process-manager for Ferdium (#80)
-rw-r--r-- | package-lock.json | 223 | ||||
-rw-r--r-- | package.json | 1 | ||||
-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 |
6 files changed, 228 insertions, 24 deletions
diff --git a/package-lock.json b/package-lock.json index 3c4c91e33..a81e4412d 100644 --- a/package-lock.json +++ b/package-lock.json | |||
@@ -22,6 +22,7 @@ | |||
22 | "@adonisjs/shield": "^1.1.0", | 22 | "@adonisjs/shield": "^1.1.0", |
23 | "@adonisjs/validator": "^5.1.0", | 23 | "@adonisjs/validator": "^5.1.0", |
24 | "@electron/remote": "2.0.8", | 24 | "@electron/remote": "2.0.8", |
25 | "@krisdages/electron-process-manager": "3.0.0", | ||
25 | "@mdi/js": "^6.6.96", | 26 | "@mdi/js": "^6.6.96", |
26 | "@mdi/react": "^1.6.0", | 27 | "@mdi/react": "^1.6.0", |
27 | "@sentry/electron": "^2.5.4", | 28 | "@sentry/electron": "^2.5.4", |
@@ -4106,6 +4107,42 @@ | |||
4106 | "@jridgewell/sourcemap-codec": "^1.4.10" | 4107 | "@jridgewell/sourcemap-codec": "^1.4.10" |
4107 | } | 4108 | } |
4108 | }, | 4109 | }, |
4110 | "node_modules/@krisdages/electron-process-manager": { | ||
4111 | "version": "3.0.0", | ||
4112 | "resolved": "https://registry.npmjs.org/@krisdages/electron-process-manager/-/electron-process-manager-3.0.0.tgz", | ||
4113 | "integrity": "sha512-Gs8McOVC6BVdfP4SeF+l5nx85eFooarm37K5mxs1PESI59a7oLwRf5Yd2tsZ6Ye14bCG0eTJGDv3yPuixBg3OQ==", | ||
4114 | "dependencies": { | ||
4115 | "electron-process-reporter": "npm:@krisdages/electron-process-reporter@^2.0.0-rxjs7-1.4.0" | ||
4116 | }, | ||
4117 | "peerDependencies": { | ||
4118 | "@electron/remote": ">= 1.2.0", | ||
4119 | "electron": ">= 10", | ||
4120 | "rxjs": ">= 7" | ||
4121 | } | ||
4122 | }, | ||
4123 | "node_modules/@krisdages/electron-process-manager/node_modules/electron-process-reporter": { | ||
4124 | "name": "@krisdages/electron-process-reporter", | ||
4125 | "version": "2.0.0-rxjs7-1.4.0", | ||
4126 | "resolved": "https://registry.npmjs.org/@krisdages/electron-process-reporter/-/electron-process-reporter-2.0.0-rxjs7-1.4.0.tgz", | ||
4127 | "integrity": "sha512-xcHTmzgMuKsdcP3X61FZ3XAw/5vc3LFgbumKKnswmV0P9k810MMBBeVt5GS9sTSrFju0NYGSBDjn3/X/I2UN/A==", | ||
4128 | "dependencies": { | ||
4129 | "memoizee": "^0.4.14", | ||
4130 | "pidtree": "^0.3.0", | ||
4131 | "pidusage": "2.0.16", | ||
4132 | "rxjs": "^7.5.5" | ||
4133 | }, | ||
4134 | "peerDependencies": { | ||
4135 | "rxjs": ">= 7" | ||
4136 | } | ||
4137 | }, | ||
4138 | "node_modules/@krisdages/electron-process-manager/node_modules/rxjs": { | ||
4139 | "version": "7.5.5", | ||
4140 | "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz", | ||
4141 | "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==", | ||
4142 | "dependencies": { | ||
4143 | "tslib": "^2.1.0" | ||
4144 | } | ||
4145 | }, | ||
4109 | "node_modules/@kwsites/file-exists": { | 4146 | "node_modules/@kwsites/file-exists": { |
4110 | "version": "1.1.1", | 4147 | "version": "1.1.1", |
4111 | "resolved": "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz", | 4148 | "resolved": "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz", |
@@ -9883,7 +9920,6 @@ | |||
9883 | "version": "1.0.1", | 9920 | "version": "1.0.1", |
9884 | "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz", | 9921 | "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz", |
9885 | "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", | 9922 | "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", |
9886 | "dev": true, | ||
9887 | "dependencies": { | 9923 | "dependencies": { |
9888 | "es5-ext": "^0.10.50", | 9924 | "es5-ext": "^0.10.50", |
9889 | "type": "^1.0.1" | 9925 | "type": "^1.0.1" |
@@ -11505,7 +11541,6 @@ | |||
11505 | "version": "0.10.61", | 11541 | "version": "0.10.61", |
11506 | "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.61.tgz", | 11542 | "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.61.tgz", |
11507 | "integrity": "sha512-yFhIqQAzu2Ca2I4SE2Au3rxVfmohU9Y7wqGR+s7+H7krk26NXhIRAZDgqd6xqjCEFUomDEA3/Bo/7fKmIkW1kA==", | 11543 | "integrity": "sha512-yFhIqQAzu2Ca2I4SE2Au3rxVfmohU9Y7wqGR+s7+H7krk26NXhIRAZDgqd6xqjCEFUomDEA3/Bo/7fKmIkW1kA==", |
11508 | "dev": true, | ||
11509 | "hasInstallScript": true, | 11544 | "hasInstallScript": true, |
11510 | "dependencies": { | 11545 | "dependencies": { |
11511 | "es6-iterator": "^2.0.3", | 11546 | "es6-iterator": "^2.0.3", |
@@ -11527,7 +11562,6 @@ | |||
11527 | "version": "2.0.3", | 11562 | "version": "2.0.3", |
11528 | "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", | 11563 | "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", |
11529 | "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", | 11564 | "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", |
11530 | "dev": true, | ||
11531 | "dependencies": { | 11565 | "dependencies": { |
11532 | "d": "1", | 11566 | "d": "1", |
11533 | "es5-ext": "^0.10.35", | 11567 | "es5-ext": "^0.10.35", |
@@ -11538,7 +11572,6 @@ | |||
11538 | "version": "3.1.3", | 11572 | "version": "3.1.3", |
11539 | "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz", | 11573 | "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz", |
11540 | "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==", | 11574 | "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==", |
11541 | "dev": true, | ||
11542 | "dependencies": { | 11575 | "dependencies": { |
11543 | "d": "^1.0.1", | 11576 | "d": "^1.0.1", |
11544 | "ext": "^1.1.2" | 11577 | "ext": "^1.1.2" |
@@ -11548,7 +11581,6 @@ | |||
11548 | "version": "2.0.3", | 11581 | "version": "2.0.3", |
11549 | "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz", | 11582 | "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz", |
11550 | "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==", | 11583 | "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==", |
11551 | "dev": true, | ||
11552 | "dependencies": { | 11584 | "dependencies": { |
11553 | "d": "1", | 11585 | "d": "1", |
11554 | "es5-ext": "^0.10.46", | 11586 | "es5-ext": "^0.10.46", |
@@ -12447,6 +12479,15 @@ | |||
12447 | "node": ">= 0.6" | 12479 | "node": ">= 0.6" |
12448 | } | 12480 | } |
12449 | }, | 12481 | }, |
12482 | "node_modules/event-emitter": { | ||
12483 | "version": "0.3.5", | ||
12484 | "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", | ||
12485 | "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", | ||
12486 | "dependencies": { | ||
12487 | "d": "1", | ||
12488 | "es5-ext": "~0.10.14" | ||
12489 | } | ||
12490 | }, | ||
12450 | "node_modules/event-stream": { | 12491 | "node_modules/event-stream": { |
12451 | "version": "3.3.4", | 12492 | "version": "3.3.4", |
12452 | "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", | 12493 | "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", |
@@ -12839,7 +12880,6 @@ | |||
12839 | "version": "1.6.0", | 12880 | "version": "1.6.0", |
12840 | "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz", | 12881 | "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz", |
12841 | "integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==", | 12882 | "integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==", |
12842 | "dev": true, | ||
12843 | "dependencies": { | 12883 | "dependencies": { |
12844 | "type": "^2.5.0" | 12884 | "type": "^2.5.0" |
12845 | } | 12885 | } |
@@ -12870,8 +12910,7 @@ | |||
12870 | "node_modules/ext/node_modules/type": { | 12910 | "node_modules/ext/node_modules/type": { |
12871 | "version": "2.6.0", | 12911 | "version": "2.6.0", |
12872 | "resolved": "https://registry.npmjs.org/type/-/type-2.6.0.tgz", | 12912 | "resolved": "https://registry.npmjs.org/type/-/type-2.6.0.tgz", |
12873 | "integrity": "sha512-eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ==", | 12913 | "integrity": "sha512-eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ==" |
12874 | "dev": true | ||
12875 | }, | 12914 | }, |
12876 | "node_modules/extend": { | 12915 | "node_modules/extend": { |
12877 | "version": "3.0.2", | 12916 | "version": "3.0.2", |
@@ -16314,6 +16353,11 @@ | |||
16314 | "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", | 16353 | "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", |
16315 | "dev": true | 16354 | "dev": true |
16316 | }, | 16355 | }, |
16356 | "node_modules/is-promise": { | ||
16357 | "version": "2.2.2", | ||
16358 | "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz", | ||
16359 | "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==" | ||
16360 | }, | ||
16317 | "node_modules/is-regex": { | 16361 | "node_modules/is-regex": { |
16318 | "version": "1.1.4", | 16362 | "version": "1.1.4", |
16319 | "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", | 16363 | "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", |
@@ -19760,6 +19804,14 @@ | |||
19760 | "node": ">=10" | 19804 | "node": ">=10" |
19761 | } | 19805 | } |
19762 | }, | 19806 | }, |
19807 | "node_modules/lru-queue": { | ||
19808 | "version": "0.1.0", | ||
19809 | "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz", | ||
19810 | "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=", | ||
19811 | "dependencies": { | ||
19812 | "es5-ext": "~0.10.2" | ||
19813 | } | ||
19814 | }, | ||
19763 | "node_modules/macos-notification-state": { | 19815 | "node_modules/macos-notification-state": { |
19764 | "version": "1.3.6", | 19816 | "version": "1.3.6", |
19765 | "resolved": "git+ssh://git@github.com/nbashkankov/macos-notification-state.git#c7959ecf657020a70b2720d1051fc5a3e4ecb118", | 19817 | "resolved": "git+ssh://git@github.com/nbashkankov/macos-notification-state.git#c7959ecf657020a70b2720d1051fc5a3e4ecb118", |
@@ -20073,6 +20125,21 @@ | |||
20073 | "node": ">= 0.8" | 20125 | "node": ">= 0.8" |
20074 | } | 20126 | } |
20075 | }, | 20127 | }, |
20128 | "node_modules/memoizee": { | ||
20129 | "version": "0.4.15", | ||
20130 | "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz", | ||
20131 | "integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==", | ||
20132 | "dependencies": { | ||
20133 | "d": "^1.0.1", | ||
20134 | "es5-ext": "^0.10.53", | ||
20135 | "es6-weak-map": "^2.0.3", | ||
20136 | "event-emitter": "^0.3.5", | ||
20137 | "is-promise": "^2.2.2", | ||
20138 | "lru-queue": "^0.1.0", | ||
20139 | "next-tick": "^1.1.0", | ||
20140 | "timers-ext": "^0.1.7" | ||
20141 | } | ||
20142 | }, | ||
20076 | "node_modules/memory-fs": { | 20143 | "node_modules/memory-fs": { |
20077 | "version": "0.5.0", | 20144 | "version": "0.5.0", |
20078 | "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz", | 20145 | "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz", |
@@ -21102,8 +21169,7 @@ | |||
21102 | "node_modules/next-tick": { | 21169 | "node_modules/next-tick": { |
21103 | "version": "1.1.0", | 21170 | "version": "1.1.0", |
21104 | "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz", | 21171 | "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz", |
21105 | "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==", | 21172 | "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==" |
21106 | "dev": true | ||
21107 | }, | 21173 | }, |
21108 | "node_modules/nice-try": { | 21174 | "node_modules/nice-try": { |
21109 | "version": "1.0.5", | 21175 | "version": "1.0.5", |
@@ -22290,6 +22356,28 @@ | |||
22290 | "url": "https://github.com/sponsors/jonschlinkert" | 22356 | "url": "https://github.com/sponsors/jonschlinkert" |
22291 | } | 22357 | } |
22292 | }, | 22358 | }, |
22359 | "node_modules/pidtree": { | ||
22360 | "version": "0.3.1", | ||
22361 | "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.1.tgz", | ||
22362 | "integrity": "sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==", | ||
22363 | "bin": { | ||
22364 | "pidtree": "bin/pidtree.js" | ||
22365 | }, | ||
22366 | "engines": { | ||
22367 | "node": ">=0.10" | ||
22368 | } | ||
22369 | }, | ||
22370 | "node_modules/pidusage": { | ||
22371 | "version": "2.0.16", | ||
22372 | "resolved": "https://registry.npmjs.org/pidusage/-/pidusage-2.0.16.tgz", | ||
22373 | "integrity": "sha512-9dhSBxpGvvpyycCukU8CqTqJ+YT8aVZ/AI1/hGWhU5nAAOs0zYBYMyIYBU/grKeCYuTS26TVllIRvf5vAfsgvw==", | ||
22374 | "dependencies": { | ||
22375 | "safe-buffer": "^5.1.2" | ||
22376 | }, | ||
22377 | "engines": { | ||
22378 | "node": ">=4" | ||
22379 | } | ||
22380 | }, | ||
22293 | "node_modules/pify": { | 22381 | "node_modules/pify": { |
22294 | "version": "4.0.1", | 22382 | "version": "4.0.1", |
22295 | "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", | 22383 | "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", |
@@ -27444,6 +27532,15 @@ | |||
27444 | "node": ">=0.6.0" | 27532 | "node": ">=0.6.0" |
27445 | } | 27533 | } |
27446 | }, | 27534 | }, |
27535 | "node_modules/timers-ext": { | ||
27536 | "version": "0.1.7", | ||
27537 | "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz", | ||
27538 | "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==", | ||
27539 | "dependencies": { | ||
27540 | "es5-ext": "~0.10.46", | ||
27541 | "next-tick": "1" | ||
27542 | } | ||
27543 | }, | ||
27447 | "node_modules/tiny-lr": { | 27544 | "node_modules/tiny-lr": { |
27448 | "version": "1.1.1", | 27545 | "version": "1.1.1", |
27449 | "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz", | 27546 | "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz", |
@@ -28075,8 +28172,7 @@ | |||
28075 | "node_modules/type": { | 28172 | "node_modules/type": { |
28076 | "version": "1.2.0", | 28173 | "version": "1.2.0", |
28077 | "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz", | 28174 | "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz", |
28078 | "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==", | 28175 | "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==" |
28079 | "dev": true | ||
28080 | }, | 28176 | }, |
28081 | "node_modules/type-check": { | 28177 | "node_modules/type-check": { |
28082 | "version": "0.4.0", | 28178 | "version": "0.4.0", |
@@ -33924,6 +34020,35 @@ | |||
33924 | "@jridgewell/sourcemap-codec": "^1.4.10" | 34020 | "@jridgewell/sourcemap-codec": "^1.4.10" |
33925 | } | 34021 | } |
33926 | }, | 34022 | }, |
34023 | "@krisdages/electron-process-manager": { | ||
34024 | "version": "3.0.0", | ||
34025 | "resolved": "https://registry.npmjs.org/@krisdages/electron-process-manager/-/electron-process-manager-3.0.0.tgz", | ||
34026 | "integrity": "sha512-Gs8McOVC6BVdfP4SeF+l5nx85eFooarm37K5mxs1PESI59a7oLwRf5Yd2tsZ6Ye14bCG0eTJGDv3yPuixBg3OQ==", | ||
34027 | "requires": { | ||
34028 | "electron-process-reporter": "npm:@krisdages/electron-process-reporter@^2.0.0-rxjs7-1.4.0" | ||
34029 | }, | ||
34030 | "dependencies": { | ||
34031 | "electron-process-reporter": { | ||
34032 | "version": "npm:@krisdages/electron-process-reporter@2.0.0-rxjs7-1.4.0", | ||
34033 | "resolved": "https://registry.npmjs.org/@krisdages/electron-process-reporter/-/electron-process-reporter-2.0.0-rxjs7-1.4.0.tgz", | ||
34034 | "integrity": "sha512-xcHTmzgMuKsdcP3X61FZ3XAw/5vc3LFgbumKKnswmV0P9k810MMBBeVt5GS9sTSrFju0NYGSBDjn3/X/I2UN/A==", | ||
34035 | "requires": { | ||
34036 | "memoizee": "^0.4.14", | ||
34037 | "pidtree": "^0.3.0", | ||
34038 | "pidusage": "2.0.16", | ||
34039 | "rxjs": "^7.5.5" | ||
34040 | } | ||
34041 | }, | ||
34042 | "rxjs": { | ||
34043 | "version": "7.5.5", | ||
34044 | "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz", | ||
34045 | "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==", | ||
34046 | "requires": { | ||
34047 | "tslib": "^2.1.0" | ||
34048 | } | ||
34049 | } | ||
34050 | } | ||
34051 | }, | ||
33927 | "@kwsites/file-exists": { | 34052 | "@kwsites/file-exists": { |
33928 | "version": "1.1.1", | 34053 | "version": "1.1.1", |
33929 | "resolved": "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz", | 34054 | "resolved": "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz", |
@@ -38639,7 +38764,6 @@ | |||
38639 | "version": "1.0.1", | 38764 | "version": "1.0.1", |
38640 | "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz", | 38765 | "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz", |
38641 | "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", | 38766 | "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", |
38642 | "dev": true, | ||
38643 | "requires": { | 38767 | "requires": { |
38644 | "es5-ext": "^0.10.50", | 38768 | "es5-ext": "^0.10.50", |
38645 | "type": "^1.0.1" | 38769 | "type": "^1.0.1" |
@@ -39960,7 +40084,6 @@ | |||
39960 | "version": "0.10.61", | 40084 | "version": "0.10.61", |
39961 | "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.61.tgz", | 40085 | "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.61.tgz", |
39962 | "integrity": "sha512-yFhIqQAzu2Ca2I4SE2Au3rxVfmohU9Y7wqGR+s7+H7krk26NXhIRAZDgqd6xqjCEFUomDEA3/Bo/7fKmIkW1kA==", | 40086 | "integrity": "sha512-yFhIqQAzu2Ca2I4SE2Au3rxVfmohU9Y7wqGR+s7+H7krk26NXhIRAZDgqd6xqjCEFUomDEA3/Bo/7fKmIkW1kA==", |
39963 | "dev": true, | ||
39964 | "requires": { | 40087 | "requires": { |
39965 | "es6-iterator": "^2.0.3", | 40088 | "es6-iterator": "^2.0.3", |
39966 | "es6-symbol": "^3.1.3", | 40089 | "es6-symbol": "^3.1.3", |
@@ -39978,7 +40101,6 @@ | |||
39978 | "version": "2.0.3", | 40101 | "version": "2.0.3", |
39979 | "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", | 40102 | "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", |
39980 | "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", | 40103 | "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", |
39981 | "dev": true, | ||
39982 | "requires": { | 40104 | "requires": { |
39983 | "d": "1", | 40105 | "d": "1", |
39984 | "es5-ext": "^0.10.35", | 40106 | "es5-ext": "^0.10.35", |
@@ -39989,7 +40111,6 @@ | |||
39989 | "version": "3.1.3", | 40111 | "version": "3.1.3", |
39990 | "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz", | 40112 | "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz", |
39991 | "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==", | 40113 | "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==", |
39992 | "dev": true, | ||
39993 | "requires": { | 40114 | "requires": { |
39994 | "d": "^1.0.1", | 40115 | "d": "^1.0.1", |
39995 | "ext": "^1.1.2" | 40116 | "ext": "^1.1.2" |
@@ -39999,7 +40120,6 @@ | |||
39999 | "version": "2.0.3", | 40120 | "version": "2.0.3", |
40000 | "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz", | 40121 | "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz", |
40001 | "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==", | 40122 | "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==", |
40002 | "dev": true, | ||
40003 | "requires": { | 40123 | "requires": { |
40004 | "d": "1", | 40124 | "d": "1", |
40005 | "es5-ext": "^0.10.46", | 40125 | "es5-ext": "^0.10.46", |
@@ -40651,6 +40771,15 @@ | |||
40651 | "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", | 40771 | "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", |
40652 | "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" | 40772 | "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" |
40653 | }, | 40773 | }, |
40774 | "event-emitter": { | ||
40775 | "version": "0.3.5", | ||
40776 | "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", | ||
40777 | "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", | ||
40778 | "requires": { | ||
40779 | "d": "1", | ||
40780 | "es5-ext": "~0.10.14" | ||
40781 | } | ||
40782 | }, | ||
40654 | "event-stream": { | 40783 | "event-stream": { |
40655 | "version": "3.3.4", | 40784 | "version": "3.3.4", |
40656 | "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", | 40785 | "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", |
@@ -40973,7 +41102,6 @@ | |||
40973 | "version": "1.6.0", | 41102 | "version": "1.6.0", |
40974 | "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz", | 41103 | "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz", |
40975 | "integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==", | 41104 | "integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==", |
40976 | "dev": true, | ||
40977 | "requires": { | 41105 | "requires": { |
40978 | "type": "^2.5.0" | 41106 | "type": "^2.5.0" |
40979 | }, | 41107 | }, |
@@ -40981,8 +41109,7 @@ | |||
40981 | "type": { | 41109 | "type": { |
40982 | "version": "2.6.0", | 41110 | "version": "2.6.0", |
40983 | "resolved": "https://registry.npmjs.org/type/-/type-2.6.0.tgz", | 41111 | "resolved": "https://registry.npmjs.org/type/-/type-2.6.0.tgz", |
40984 | "integrity": "sha512-eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ==", | 41112 | "integrity": "sha512-eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ==" |
40985 | "dev": true | ||
40986 | } | 41113 | } |
40987 | } | 41114 | } |
40988 | }, | 41115 | }, |
@@ -43727,6 +43854,11 @@ | |||
43727 | "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", | 43854 | "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", |
43728 | "dev": true | 43855 | "dev": true |
43729 | }, | 43856 | }, |
43857 | "is-promise": { | ||
43858 | "version": "2.2.2", | ||
43859 | "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz", | ||
43860 | "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==" | ||
43861 | }, | ||
43730 | "is-regex": { | 43862 | "is-regex": { |
43731 | "version": "1.1.4", | 43863 | "version": "1.1.4", |
43732 | "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", | 43864 | "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", |
@@ -46365,6 +46497,14 @@ | |||
46365 | "yallist": "^4.0.0" | 46497 | "yallist": "^4.0.0" |
46366 | } | 46498 | } |
46367 | }, | 46499 | }, |
46500 | "lru-queue": { | ||
46501 | "version": "0.1.0", | ||
46502 | "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz", | ||
46503 | "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=", | ||
46504 | "requires": { | ||
46505 | "es5-ext": "~0.10.2" | ||
46506 | } | ||
46507 | }, | ||
46368 | "macos-notification-state": { | 46508 | "macos-notification-state": { |
46369 | "version": "git+ssh://git@github.com/nbashkankov/macos-notification-state.git#c7959ecf657020a70b2720d1051fc5a3e4ecb118", | 46509 | "version": "git+ssh://git@github.com/nbashkankov/macos-notification-state.git#c7959ecf657020a70b2720d1051fc5a3e4ecb118", |
46370 | "from": "macos-notification-state@github:nbashkankov/macos-notification-state#fix-monterey-detect", | 46510 | "from": "macos-notification-state@github:nbashkankov/macos-notification-state#fix-monterey-detect", |
@@ -46617,6 +46757,21 @@ | |||
46617 | "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz", | 46757 | "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz", |
46618 | "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==" | 46758 | "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==" |
46619 | }, | 46759 | }, |
46760 | "memoizee": { | ||
46761 | "version": "0.4.15", | ||
46762 | "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz", | ||
46763 | "integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==", | ||
46764 | "requires": { | ||
46765 | "d": "^1.0.1", | ||
46766 | "es5-ext": "^0.10.53", | ||
46767 | "es6-weak-map": "^2.0.3", | ||
46768 | "event-emitter": "^0.3.5", | ||
46769 | "is-promise": "^2.2.2", | ||
46770 | "lru-queue": "^0.1.0", | ||
46771 | "next-tick": "^1.1.0", | ||
46772 | "timers-ext": "^0.1.7" | ||
46773 | } | ||
46774 | }, | ||
46620 | "memory-fs": { | 46775 | "memory-fs": { |
46621 | "version": "0.5.0", | 46776 | "version": "0.5.0", |
46622 | "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz", | 46777 | "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz", |
@@ -47386,8 +47541,7 @@ | |||
47386 | "next-tick": { | 47541 | "next-tick": { |
47387 | "version": "1.1.0", | 47542 | "version": "1.1.0", |
47388 | "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz", | 47543 | "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz", |
47389 | "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==", | 47544 | "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==" |
47390 | "dev": true | ||
47391 | }, | 47545 | }, |
47392 | "nice-try": { | 47546 | "nice-try": { |
47393 | "version": "1.0.5", | 47547 | "version": "1.0.5", |
@@ -48330,6 +48484,19 @@ | |||
48330 | "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", | 48484 | "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", |
48331 | "dev": true | 48485 | "dev": true |
48332 | }, | 48486 | }, |
48487 | "pidtree": { | ||
48488 | "version": "0.3.1", | ||
48489 | "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.1.tgz", | ||
48490 | "integrity": "sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==" | ||
48491 | }, | ||
48492 | "pidusage": { | ||
48493 | "version": "2.0.16", | ||
48494 | "resolved": "https://registry.npmjs.org/pidusage/-/pidusage-2.0.16.tgz", | ||
48495 | "integrity": "sha512-9dhSBxpGvvpyycCukU8CqTqJ+YT8aVZ/AI1/hGWhU5nAAOs0zYBYMyIYBU/grKeCYuTS26TVllIRvf5vAfsgvw==", | ||
48496 | "requires": { | ||
48497 | "safe-buffer": "^5.1.2" | ||
48498 | } | ||
48499 | }, | ||
48333 | "pify": { | 48500 | "pify": { |
48334 | "version": "4.0.1", | 48501 | "version": "4.0.1", |
48335 | "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", | 48502 | "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", |
@@ -52494,6 +52661,15 @@ | |||
52494 | "setimmediate": "^1.0.4" | 52661 | "setimmediate": "^1.0.4" |
52495 | } | 52662 | } |
52496 | }, | 52663 | }, |
52664 | "timers-ext": { | ||
52665 | "version": "0.1.7", | ||
52666 | "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz", | ||
52667 | "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==", | ||
52668 | "requires": { | ||
52669 | "es5-ext": "~0.10.46", | ||
52670 | "next-tick": "1" | ||
52671 | } | ||
52672 | }, | ||
52497 | "tiny-lr": { | 52673 | "tiny-lr": { |
52498 | "version": "1.1.1", | 52674 | "version": "1.1.1", |
52499 | "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz", | 52675 | "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz", |
@@ -52991,8 +53167,7 @@ | |||
52991 | "type": { | 53167 | "type": { |
52992 | "version": "1.2.0", | 53168 | "version": "1.2.0", |
52993 | "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz", | 53169 | "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz", |
52994 | "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==", | 53170 | "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==" |
52995 | "dev": true | ||
52996 | }, | 53171 | }, |
52997 | "type-check": { | 53172 | "type-check": { |
52998 | "version": "0.4.0", | 53173 | "version": "0.4.0", |
diff --git a/package.json b/package.json index af6713866..012588140 100644 --- a/package.json +++ b/package.json | |||
@@ -56,6 +56,7 @@ | |||
56 | "@adonisjs/shield": "^1.1.0", | 56 | "@adonisjs/shield": "^1.1.0", |
57 | "@adonisjs/validator": "^5.1.0", | 57 | "@adonisjs/validator": "^5.1.0", |
58 | "@electron/remote": "2.0.8", | 58 | "@electron/remote": "2.0.8", |
59 | "@krisdages/electron-process-manager": "3.0.0", | ||
59 | "@mdi/js": "^6.6.96", | 60 | "@mdi/js": "^6.6.96", |
60 | "@mdi/react": "^1.6.0", | 61 | "@mdi/react": "^1.6.0", |
61 | "@sentry/electron": "^2.5.4", | 62 | "@sentry/electron": "^2.5.4", |
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 | }; | ||