GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-06-20 11:29:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

electron 6 wip

Browse Source
This commit is contained in:
Eugene Pankov 2019-08-27 11:52:52 +02:00
parent 1d8a71fbc0
commit 31ad686545
5 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/lib/app.ts
View File

@ -124,7 +124,7 @@ export class Application {
{ role: 'services', submenu: [] }, { role: 'services', submenu: [] },
{ type: 'separator' }, { type: 'separator' },
{ role: 'hide' }, { role: 'hide' },
{ role: 'hideothers' }, { role: 'hideOthers' },
{ role: 'unhide' }, { role: 'unhide' },
{ type: 'separator' }, { type: 'separator' },
{ {
@ -145,21 +145,21 @@ export class Application {
{ role: 'cut' }, { role: 'cut' },
{ role: 'copy' }, { role: 'copy' },
{ role: 'paste' }, { role: 'paste' },
{ role: 'pasteandmatchstyle' }, { role: 'pasteAndMatchStyle' },
{ role: 'delete' }, { role: 'delete' },
{ role: 'selectall' }, { role: 'selectAll' },
], ],
}, },
{ {
label: 'View', label: 'View',
submenu: [ submenu: [
{ role: 'reload' }, { role: 'reload' },
{ role: 'forcereload' }, { role: 'forceReload' },
{ role: 'toggledevtools' }, { role: 'toggleDevTools' },
{ type: 'separator' }, { type: 'separator' },
{ role: 'resetzoom' }, { role: 'resetZoom' },
{ role: 'zoomin' }, { role: 'zoomIn' },
{ role: 'zoomout' }, { role: 'zoomOut' },
{ type: 'separator' }, { type: 'separator' },
{ role: 'togglefullscreen' }, { role: 'togglefullscreen' },
], ],

2
app/package.json
View File

@ -22,11 +22,11 @@
"@angular/platform-browser-dynamic": "7.2.8", "@angular/platform-browser-dynamic": "7.2.8",
"@ng-bootstrap/ng-bootstrap": "^4.2.0", "@ng-bootstrap/ng-bootstrap": "^4.2.0",
"devtron": "1.4.0", "devtron": "1.4.0",
"fontmanager-redux": "0.3.2",
"electron-config": "2.0.0", "electron-config": "2.0.0",
"electron-debug": "^3.0.1", "electron-debug": "^3.0.1",
"electron-is-dev": "1.1.0", "electron-is-dev": "1.1.0",
"electron-updater": "^4.0.6", "electron-updater": "^4.0.6",
"fontmanager-redux": "0.3.3",
"js-yaml": "3.13.1", "js-yaml": "3.13.1",
"keytar": "^4.13.0", "keytar": "^4.13.0",
"mz": "^2.7.0", "mz": "^2.7.0",

8
app/yarn.lock
View File

@ -944,10 +944,10 @@ flush-write-stream@^1.0.0:
inherits "^2.0.3" inherits "^2.0.3"
readable-stream "^2.3.6" readable-stream "^2.3.6"
fontmanager-redux@0.3.2: fontmanager-redux@0.3.3:
version "0.3.2" version "0.3.3"
resolved "https://registry.yarnpkg.com/fontmanager-redux/-/fontmanager-redux-0.3.2.tgz#e5c8d8dc8fda98629eaef4201a27df9e56a122f4" resolved "https://registry.yarnpkg.com/fontmanager-redux/-/fontmanager-redux-0.3.3.tgz#39f3493332d1694ef3bd1652ee11d66ae3e4f495"
integrity sha512-NWmTbYfDijrx8qLJ2+O2VgYKhdfsMy/ec+Qf2DGxoLJDZHaRhBKd2Eufh4fFmfJUAwhzrkIgbKJsNT/IYJDbaA== integrity sha512-n7bz3J+8gHn1+bEsIwdNlZ+wYsof3JPijHW/HQ+0oYA/zVTAuryXYgBrIKboNymJmYnabACoLB0p4tv/vMPGMA==
forever-agent@~0.6.1: forever-agent@~0.6.1:
version "0.6.1" version "0.6.1"

25
scripts/build-native.js
View File

@ -3,21 +3,24 @@ const rebuild = require('electron-rebuild').default
const path = require('path') const path = require('path')
const vars = require('./vars') const vars = require('./vars')
lifecycles = [] let lifecycles = []
for (let dir of ['app', 'terminus-core', 'terminus-ssh', 'terminus-terminal']) { for (let dir of ['app', 'terminus-core', 'terminus-ssh', 'terminus-terminal']) {
build = rebuild({ const build = rebuild({
buildPath: path.resolve(__dirname, '../' + dir), buildPath: path.resolve(__dirname, '../' + dir),
electronVersion: vars.electronVersion, electronVersion: vars.electronVersion,
force: true, force: true,
}) })
build.catch(() => process.exit(1)) build.catch(e => {
lifecycles.push([build.lifecycle, dir]) console.error(e)
process.exit(1)
})
lifecycles.push([build.lifecycle, dir])
} }
console.info('Building against Electron', vars.electronVersion) console.info('Building against Electron', vars.electronVersion)
for (let [lc, dir] of lifecycles) { for (let [lc, dir] of lifecycles) {
lc.on('module-found', name => { lc.on('module-found', name => {
console.info('Rebuilding', dir + '/' + name) console.info('Rebuilding', dir + '/' + name)
}) })
} }

6
terminus-core/src/services/electron.service.ts
View File

@ -56,10 +56,6 @@ export class ElectronService {
browserWindow: Electron.BrowserWindow, browserWindow: Electron.BrowserWindow,
options: Electron.MessageBoxOptions options: Electron.MessageBoxOptions
): Promise<MessageBoxResponse> { ): Promise<MessageBoxResponse> {
return new Promise(resolve => { return this.dialog.showMessageBox(browserWindow, options)
this.dialog.showMessageBox(browserWindow, options, (response, checkboxChecked) => {
resolve({ response, checkboxChecked })
})
})
} }
} }