Add alternative menubar icons

39 files changed, 4 insertions, 11 deletions

diff --git a/app/app.js b/app/app.js
index 5ac598c1b3..9412a88f1c 100644
--- a/app/app.js
+++ b/app/app.js
@@ -82,13 +82,11 @@ const updateTrayIcon = () => {
 ipcRenderer.on('showWindow', () => {
   isWindowVisible = true;
   updateTrayIcon();
-  console.log('showWindow');
 });
 
 ipcRenderer.on('hideWindow', () => {
   isWindowVisible = false;
   updateTrayIcon();
-  console.log('hideWindow');
 });
 
 // patch backend
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-1-dark.png b/app/assets/images/menubar icons/dark ui/lock/lock-1-dark.png
index 1723ee998c..55099989c9 100644
--- a/app/assets/images/menubar icons/dark ui/lock/lock-1-dark.png
+++ b/app/assets/images/menubar icons/dark ui/lock/lock-1-dark.png
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-1-dark@2x.png b/app/assets/images/menubar icons/dark ui/lock/lock-1-dark@2x.png
index 61b2e295c7..e5fa386af2 100644
--- a/app/assets/images/menubar icons/dark ui/lock/lock-1-dark@2x.png
+++ b/app/assets/images/menubar icons/dark ui/lock/lock-1-dark@2x.png
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-2-dark.png b/app/assets/images/menubar icons/dark ui/lock/lock-2-dark.png
index 9156a48bc8..ccad3578af 100644
--- a/app/assets/images/menubar icons/dark ui/lock/lock-2-dark.png
+++ b/app/assets/images/menubar icons/dark ui/lock/lock-2-dark.png
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-2-dark@2x.png b/app/assets/images/menubar icons/dark ui/lock/lock-2-dark@2x.png
index 46bb16c23f..b1f7d1f981 100644
--- a/app/assets/images/menubar icons/dark ui/lock/lock-2-dark@2x.png
+++ b/app/assets/images/menubar icons/dark ui/lock/lock-2-dark@2x.png
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-3-dark.png b/app/assets/images/menubar icons/dark ui/lock/lock-3-dark.png
index d1e74a8e76..784392b578 100644
--- a/app/assets/images/menubar icons/dark ui/lock/lock-3-dark.png
+++ b/app/assets/images/menubar icons/dark ui/lock/lock-3-dark.png
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-3-dark@2x.png b/app/assets/images/menubar icons/dark ui/lock/lock-3-dark@2x.png
index 1877a14681..bca3b67dbf 100644
--- a/app/assets/images/menubar icons/dark ui/lock/lock-3-dark@2x.png
+++ b/app/assets/images/menubar icons/dark ui/lock/lock-3-dark@2x.png
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-4-dark.png b/app/assets/images/menubar icons/dark ui/lock/lock-4-dark.png
index 7e12450935..097891101f 100644
--- a/app/assets/images/menubar icons/dark ui/lock/lock-4-dark.png
+++ b/app/assets/images/menubar icons/dark ui/lock/lock-4-dark.png
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-4-dark@2x.png b/app/assets/images/menubar icons/dark ui/lock/lock-4-dark@2x.png
index 53e3df70a0..527c332433 100644
--- a/app/assets/images/menubar icons/dark ui/lock/lock-4-dark@2x.png
+++ b/app/assets/images/menubar icons/dark ui/lock/lock-4-dark@2x.png
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-5-dark.png b/app/assets/images/menubar icons/dark ui/lock/lock-5-dark.png
index e75fb69bc2..31428bd6fc 100644
--- a/app/assets/images/menubar icons/dark ui/lock/lock-5-dark.png
+++ b/app/assets/images/menubar icons/dark ui/lock/lock-5-dark.png
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-5-dark@2x.png b/app/assets/images/menubar icons/dark ui/lock/lock-5-dark@2x.png
index 0ef78a8ece..949c8c6a42 100644
--- a/app/assets/images/menubar icons/dark ui/lock/lock-5-dark@2x.png
+++ b/app/assets/images/menubar icons/dark ui/lock/lock-5-dark@2x.png
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-6-dark.png b/app/assets/images/menubar icons/dark ui/lock/lock-6-dark.png
index 17e2c699cc..e583594059 100644
--- a/app/assets/images/menubar icons/dark ui/lock/lock-6-dark.png
+++ b/app/assets/images/menubar icons/dark ui/lock/lock-6-dark.png
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-6-dark@2x.png b/app/assets/images/menubar icons/dark ui/lock/lock-6-dark@2x.png
index e9c25388c6..146d949ae7 100644
--- a/app/assets/images/menubar icons/dark ui/lock/lock-6-dark@2x.png
+++ b/app/assets/images/menubar icons/dark ui/lock/lock-6-dark@2x.png
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-7-dark.png b/app/assets/images/menubar icons/dark ui/lock/lock-7-dark.png
index 6b6c129018..9799b21827 100644
--- a/app/assets/images/menubar icons/dark ui/lock/lock-7-dark.png
+++ b/app/assets/images/menubar icons/dark ui/lock/lock-7-dark.png
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-7-dark@2x.png b/app/assets/images/menubar icons/dark ui/lock/lock-7-dark@2x.png
index e4dae6ac15..1a6f24d2f3 100644
--- a/app/assets/images/menubar icons/dark ui/lock/lock-7-dark@2x.png
+++ b/app/assets/images/menubar icons/dark ui/lock/lock-7-dark@2x.png
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-8-dark.png b/app/assets/images/menubar icons/dark ui/lock/lock-8-dark.png
index 31407842d2..3dd6a8842f 100644
--- a/app/assets/images/menubar icons/dark ui/lock/lock-8-dark.png
+++ b/app/assets/images/menubar icons/dark ui/lock/lock-8-dark.png
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-8-dark@2x.png b/app/assets/images/menubar icons/dark ui/lock/lock-8-dark@2x.png
index 2dcb3a9293..449879d34d 100644
--- a/app/assets/images/menubar icons/dark ui/lock/lock-8-dark@2x.png
+++ b/app/assets/images/menubar icons/dark ui/lock/lock-8-dark@2x.png
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-9-dark.png b/app/assets/images/menubar icons/dark ui/lock/lock-9-dark.png
index 3d0e7cbebe..0c47b8b2a6 100644
--- a/app/assets/images/menubar icons/dark ui/lock/lock-9-dark.png
+++ b/app/assets/images/menubar icons/dark ui/lock/lock-9-dark.png
diff --git a/app/assets/images/menubar icons/dark ui/lock/lock-9-dark@2x.png b/app/assets/images/menubar icons/dark ui/lock/lock-9-dark@2x.png
index 4c37a80b69..7b512d3398 100644
--- a/app/assets/images/menubar icons/dark ui/lock/lock-9-dark@2x.png
+++ b/app/assets/images/menubar icons/dark ui/lock/lock-9-dark@2x.png
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-1-light.png b/app/assets/images/menubar icons/light ui/lock/lock-1-light.png
index 054bde16f7..55099989c9 100644
--- a/app/assets/images/menubar icons/light ui/lock/lock-1-light.png
+++ b/app/assets/images/menubar icons/light ui/lock/lock-1-light.png
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-1-light@2x.png b/app/assets/images/menubar icons/light ui/lock/lock-1-light@2x.png
index 566bc576b9..e5fa386af2 100644
--- a/app/assets/images/menubar icons/light ui/lock/lock-1-light@2x.png
+++ b/app/assets/images/menubar icons/light ui/lock/lock-1-light@2x.png
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-2-light.png b/app/assets/images/menubar icons/light ui/lock/lock-2-light.png
index 01dc73ea65..ccad3578af 100644
--- a/app/assets/images/menubar icons/light ui/lock/lock-2-light.png
+++ b/app/assets/images/menubar icons/light ui/lock/lock-2-light.png
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-2-light@2x.png b/app/assets/images/menubar icons/light ui/lock/lock-2-light@2x.png
index 78a0cb2d21..b1f7d1f981 100644
--- a/app/assets/images/menubar icons/light ui/lock/lock-2-light@2x.png
+++ b/app/assets/images/menubar icons/light ui/lock/lock-2-light@2x.png
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-3-light.png b/app/assets/images/menubar icons/light ui/lock/lock-3-light.png
index c90a1b8eb6..784392b578 100644
--- a/app/assets/images/menubar icons/light ui/lock/lock-3-light.png
+++ b/app/assets/images/menubar icons/light ui/lock/lock-3-light.png
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-3-light@2x.png b/app/assets/images/menubar icons/light ui/lock/lock-3-light@2x.png
index 58a82c5c96..bca3b67dbf 100644
--- a/app/assets/images/menubar icons/light ui/lock/lock-3-light@2x.png
+++ b/app/assets/images/menubar icons/light ui/lock/lock-3-light@2x.png
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-4-light.png b/app/assets/images/menubar icons/light ui/lock/lock-4-light.png
index 7cd03273d7..097891101f 100644
--- a/app/assets/images/menubar icons/light ui/lock/lock-4-light.png
+++ b/app/assets/images/menubar icons/light ui/lock/lock-4-light.png
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-4-light@2x.png b/app/assets/images/menubar icons/light ui/lock/lock-4-light@2x.png
index c57439377f..527c332433 100644
--- a/app/assets/images/menubar icons/light ui/lock/lock-4-light@2x.png
+++ b/app/assets/images/menubar icons/light ui/lock/lock-4-light@2x.png
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-5-light.png b/app/assets/images/menubar icons/light ui/lock/lock-5-light.png
index 8b080a1f5d..31428bd6fc 100644
--- a/app/assets/images/menubar icons/light ui/lock/lock-5-light.png
+++ b/app/assets/images/menubar icons/light ui/lock/lock-5-light.png
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-5-light@2x.png b/app/assets/images/menubar icons/light ui/lock/lock-5-light@2x.png
index ea4b209a04..949c8c6a42 100644
--- a/app/assets/images/menubar icons/light ui/lock/lock-5-light@2x.png
+++ b/app/assets/images/menubar icons/light ui/lock/lock-5-light@2x.png
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-6-light.png b/app/assets/images/menubar icons/light ui/lock/lock-6-light.png
index c45d8fb4ac..e583594059 100644
--- a/app/assets/images/menubar icons/light ui/lock/lock-6-light.png
+++ b/app/assets/images/menubar icons/light ui/lock/lock-6-light.png
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-6-light@2x.png b/app/assets/images/menubar icons/light ui/lock/lock-6-light@2x.png
index b9adddac5f..146d949ae7 100644
--- a/app/assets/images/menubar icons/light ui/lock/lock-6-light@2x.png
+++ b/app/assets/images/menubar icons/light ui/lock/lock-6-light@2x.png
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-7-light.png b/app/assets/images/menubar icons/light ui/lock/lock-7-light.png
index 009d2581df..9799b21827 100644
--- a/app/assets/images/menubar icons/light ui/lock/lock-7-light.png
+++ b/app/assets/images/menubar icons/light ui/lock/lock-7-light.png
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-7-light@2x.png b/app/assets/images/menubar icons/light ui/lock/lock-7-light@2x.png
index d8e07a425d..1a6f24d2f3 100644
--- a/app/assets/images/menubar icons/light ui/lock/lock-7-light@2x.png
+++ b/app/assets/images/menubar icons/light ui/lock/lock-7-light@2x.png
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-8-light.png b/app/assets/images/menubar icons/light ui/lock/lock-8-light.png
index 8802dccb62..3dd6a8842f 100644
--- a/app/assets/images/menubar icons/light ui/lock/lock-8-light.png
+++ b/app/assets/images/menubar icons/light ui/lock/lock-8-light.png
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-8-light@2x.png b/app/assets/images/menubar icons/light ui/lock/lock-8-light@2x.png
index b20caa2c5c..449879d34d 100644
--- a/app/assets/images/menubar icons/light ui/lock/lock-8-light@2x.png
+++ b/app/assets/images/menubar icons/light ui/lock/lock-8-light@2x.png
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-9-light.png b/app/assets/images/menubar icons/light ui/lock/lock-9-light.png
index 8c89be3bba..0c47b8b2a6 100644
--- a/app/assets/images/menubar icons/light ui/lock/lock-9-light.png
+++ b/app/assets/images/menubar icons/light ui/lock/lock-9-light.png
diff --git a/app/assets/images/menubar icons/light ui/lock/lock-9-light@2x.png b/app/assets/images/menubar icons/light ui/lock/lock-9-light@2x.png
index d8b7b266a2..7b512d3398 100644
--- a/app/assets/images/menubar icons/light ui/lock/lock-9-light@2x.png
+++ b/app/assets/images/menubar icons/light ui/lock/lock-9-light@2x.png
diff --git a/app/main.js b/app/main.js
index 80cc626e4d..568d1b0599 100644
--- a/app/main.js
+++ b/app/main.js
@@ -132,17 +132,11 @@ const createWindow = () => {
 
   window.on('show', () => {
     startTrayEventMonitor(window);
-
-    tray.setHighlightMode('always');
-
     window.webContents.send('showWindow');
   });
 
   window.on('hide', () => {
     stopTrayEventMonitor();
-    
-    tray.setHighlightMode('never');
-
     window.webContents.send('hideWindow');
   });
 
@@ -165,9 +159,10 @@ const showWindow = () => {
 
 const createTray = () => {
   tray = new Tray(nativeImage.createEmpty());
-  tray.on('right-click', toggleWindow);
-  tray.on('double-click', toggleWindow);
+  // tray.on('right-click', toggleWindow);
+  // tray.on('double-click', toggleWindow);
   tray.on('click', toggleWindow);
+  tray.setHighlightMode('selection');
   
   trayIconManager = new TrayIconManager(tray, new TrayIconProvider());
 };
diff --git a/distribution.yml b/distribution.yml
index 5fc2f9e8d4..0851eabd6b 100644
--- a/distribution.yml
+++ b/distribution.yml
@@ -2,7 +2,7 @@ appId: net.mullvad.vpn
 copyright: Amagicom AB
 productName: MullvadNeue
 
-asar: true
+asar: false
 
 directories:
   buildResources: build-assets/