diff options
| author | Pliable Pixels <pliablepixels@users.noreply.github.com> | 2018-10-02 12:16:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-02 12:16:52 -0400 |
| commit | ffbacb34a6a654eb1124c627320bc75131636ff7 (patch) | |
| tree | 4099d15e9314a8e980b31938898509cec039294d /electron_js | |
| parent | fcb74d996161f47a63ef5232098358872b288593 (diff) | |
| parent | 81f65eacefed7e2bcd36481ddef06f45e7b2e3f6 (diff) | |
Merge pull request #712 from CorySanin/master
use corrent icon path
Diffstat (limited to 'electron_js')
| -rw-r--r-- | electron_js/main.js | 12 |
1 files changed, 6 insertions, 6 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 = [ { |