From e696e456fb89b9de53e2dc5e7e1feb6091fa1f3b Mon Sep 17 00:00:00 2001 From: Cory Date: Sat, 29 Sep 2018 03:23:34 -0500 Subject: use corrent icon path now works on Linux. --- electron_js/main.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/electron_js/main.js b/electron_js/main.js index 86546de1..910d5cc6 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'); - + 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 = [ { -- cgit v1.2.3