diff options
| author | Andrej Mihajlov <and@codeispoetry.ru> | 2017-02-22 19:20:52 +0000 |
|---|---|---|
| committer | Andrej Mihajlov <and@codeispoetry.ru> | 2017-02-22 19:20:52 +0000 |
| commit | 5cbfddab9874c163f7ea697d45eeccb8116ce161 (patch) | |
| tree | 09097270e9956b6aca2642d9d8b7e82d27831c5a /app/main.js | |
| parent | b357e668d82d9f002d8145c394b72bc593db3582 (diff) | |
| download | mullvadvpn-5cbfddab9874c163f7ea697d45eeccb8116ce161.tar.xz mullvadvpn-5cbfddab9874c163f7ea697d45eeccb8116ce161.zip | |
- Switch tray icon when connected
- Fix ESLint issues
Diffstat (limited to 'app/main.js')
| -rw-r--r-- | app/main.js | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/app/main.js b/app/main.js index 1843fcf115..c6a2de0b11 100644 --- a/app/main.js +++ b/app/main.js @@ -1,5 +1,5 @@ import path from 'path'; -import { app, crashReporter, BrowserWindow, ipcMain, Tray, Menu } from 'electron'; +import { app, crashReporter, BrowserWindow, ipcMain, Tray, Menu, nativeImage } from 'electron'; import NSEventMonitor from 'nseventmonitor'; const isDevelopment = (process.env.NODE_ENV === 'development'); @@ -8,6 +8,14 @@ let window = null; let tray = null; let macEventMonitor = new NSEventMonitor(); +ipcMain.on('changeTrayIcon', (event, name) => { + const iconPath = path.join(__dirname, './assets/images/tray-icon-' + name + '.png'); + const image = nativeImage.createFromPath(iconPath); + if(image) { + tray.setImage(image); + } +}); + // hide dock icon app.dock.hide(); @@ -130,7 +138,7 @@ ipcMain.on('show-window', () => { }); const createTray = () => { - tray = new Tray(path.join(__dirname, 'assets/images/trayIconTemplate.png')); + tray = new Tray(path.join(__dirname, 'assets/images/tray-icon-default.png')); tray.on('right-click', toggleWindow); tray.on('double-click', toggleWindow); tray.on('click', toggleWindow); |
