diff options
| author | Pliable Pixels <pliablepixels@users.noreply.github.com> | 2018-10-14 14:59:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-14 14:59:36 -0400 |
| commit | 863e507613e33cc66022ba3639f7e1a5b8eb7c96 (patch) | |
| tree | b256e275147ee495721bedeaaafb1a65f8aef98c | |
| parent | f6be92a7c14d600fa1345a55de76bda706b84380 (diff) | |
| parent | ffbacb34a6a654eb1124c627320bc75131636ff7 (diff) | |
Merge branch 'master' into webview
| -rw-r--r-- | electron_js/main.js | 12 | ||||
| -rw-r--r-- | package.json | 5 |
2 files changed, 9 insertions, 8 deletions
diff --git a/electron_js/main.js b/electron_js/main.js index 86546de1..ecd5151a 100644 --- a/electron_js/main.js +++ b/electron_js/main.js @@ -56,7 +56,7 @@ function createAlternateWindow() { y: 10, width: 800, height: 800, - icon: path.join(__dirname, '/../icon.png'), + icon: path.join(__dirname, '/../resources/icon.png'), webPreferences:{nodeIntegration:false}}); const startUrl = process.env.ELECTRON_START_URL || url.format({ @@ -64,7 +64,7 @@ function createAlternateWindow() { protocol: 'file:', slashes: true }); - + newWin.loadURL(startUrl); } @@ -106,12 +106,12 @@ const mx = globalShortcut.register('CommandOrControl+Alt+F', () => { y: mainWindowState.y, width: mainWindowState.width, height: mainWindowState.height, - icon: path.join(__dirname, '/../icon.png'), + icon: path.join(__dirname, '/../resources/icon.png'), webPreferences:{nodeIntegration:false}}); // - console.log (__dirname+'/../icon.png'); + console.log (path.join(__dirname, '/../resources/icon.png')); + - win.webContents.session.webRequest.onHeadersReceived({}, (d, c) => { @@ -151,7 +151,7 @@ const mx = globalShortcut.register('CommandOrControl+Alt+F', () => { // const menu = Menu.buildFromTemplate(template) // Menu.setApplicationMenu(menu) - + const template = [ { diff --git a/package.json b/package.json index e8a2e8e3..95216464 100644 --- a/package.json +++ b/package.json @@ -131,7 +131,8 @@ "files": [ "electron_js/main.js", "www/**/*", - "!node_modules/**/*" + "!node_modules/**/*", + "resources/icon.png" ], "extraResources": [ "node_modules/electron-window-state/**/*", @@ -174,4 +175,4 @@ ] } } -}
\ No newline at end of file +} |