Merge branch 'develop' into start-in-tray

2 files changed, 21 insertions, 20 deletions

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 826fe843f..303845e55 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -392,10 +392,10 @@ const _templateFactory = intl => [
         accelerator: 'Cmd+plus',
         click() {
           const activeService = getActiveWebview();
-          activeService.getZoomLevel((level) => {
-            // level 9 =~ +300% and setZoomLevel wouldnt zoom in further
-            if (level < 9) activeService.setZoomLevel(level + 1);
-          });
+          const level = activeService.getZoomLevel();
+
+          // level 9 =~ +300% and setZoomLevel wouldnt zoom in further
+          if (level < 9) activeService.setZoomLevel(level + 1);
         },
       },
       {
@@ -403,10 +403,10 @@ const _templateFactory = intl => [
         accelerator: 'Cmd+-',
         click() {
           const activeService = getActiveWebview();
-          activeService.getZoomLevel((level) => {
-            // level -9 =~ -50% and setZoomLevel wouldnt zoom out further
-            if (level > -9) activeService.setZoomLevel(level - 1);
-          });
+          const level = activeService.getZoomLevel();
+
+          // level -9 =~ -50% and setZoomLevel wouldnt zoom out further
+          if (level > -9) activeService.setZoomLevel(level - 1);
         },
       },
       {
@@ -598,10 +598,10 @@ const _titleBarTemplateFactory = intl => [
         accelerator: `${ctrlKey}+=`,
         click() {
           const activeService = getActiveWebview();
-          activeService.getZoomLevel((level) => {
-            // level 9 =~ +300% and setZoomLevel wouldnt zoom in further
-            if (level < 9) activeService.setZoomLevel(level + 1);
-          });
+          const level = activeService.getZoomLevel();
+
+          // level 9 =~ +300% and setZoomLevel wouldnt zoom in further
+          if (level < 9) activeService.setZoomLevel(level + 1);
         },
       },
       {
@@ -609,10 +609,10 @@ const _titleBarTemplateFactory = intl => [
         accelerator: `${ctrlKey}+-`,
         click() {
           const activeService = getActiveWebview();
-          activeService.getZoomLevel((level) => {
-            // level -9 =~ -50% and setZoomLevel wouldnt zoom out further
-            if (level > -9) activeService.setZoomLevel(level - 1);
-          });
+          const level = activeService.getZoomLevel();
+
+          // level -9 =~ -50% and setZoomLevel wouldnt zoom out further
+          if (level > -9) activeService.setZoomLevel(level - 1);
         },
       },
       {
@@ -800,7 +800,7 @@ export default class FranzMenu {
     }, {
       label: intl.formatMessage(menuItems.lockFerdi),
       accelerator: 'CmdOrCtrl+Shift+L',
-      enabled: this.stores.settings.app.lockingFeatureEnabled,
+      enabled: this.stores.user.isLoggedIn && this.stores.settings.app.lockingFeatureEnabled,
       click() {
         // Disable lock first - otherwise the application might not update correctly
         actions.settings.update({
@@ -963,7 +963,8 @@ export default class FranzMenu {
 
     this.currentTemplate = tpl;
     const menu = Menu.buildFromTemplate(tpl);
-    Menu.setApplicationMenu(menu);
+    const lockedMenu = Menu.buildFromTemplate([]);
+    Menu.setApplicationMenu(this.stores.user.isLoggedIn && this.stores.settings.app.locked ? lockedMenu : menu);
   }
 
   serviceTpl() {
diff --git a/src/lib/Tray.js b/src/lib/Tray.js
index 90974de3f..c0d936599 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -1,5 +1,5 @@
 import {
-  app, Tray, Menu, systemPreferences, nativeImage,
+  app, Tray, Menu, systemPreferences, nativeTheme, nativeImage,
 } from 'electron';
 import path from 'path';
 
@@ -86,7 +86,7 @@ export default class TrayIcon {
   _getAsset(type, asset) {
     let { platform } = process;
 
-    if (platform === 'darwin' && systemPreferences.isDarkMode()) {
+    if (platform === 'darwin' && nativeTheme.shouldUseDarkColors) {
       platform = `${platform}-dark`;
     }