From 1df3342534ae100d732ad57c9eae7401e5e97a83 Mon Sep 17 00:00:00 2001
From: Dominik Guzei <dominik.guzei@gmail.com>
Date: Thu, 7 Mar 2019 17:18:44 +0100
Subject: fix(Service): Fix shortcut for (un)muting notifications & audio

---
 src/lib/Menu.js | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

(limited to 'src/lib/Menu.js')

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 7bdbd9159..fb92644d0 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -187,6 +187,14 @@ const menuItems = defineMessages({
     id: 'menu.services.activatePreviousService',
     defaultMessage: '!!!Activate previous service...',
   },
+  muteApp: {
+    id: 'sidebar.muteApp',
+    defaultMessage: '!!!Disable notifications & audio',
+  },
+  unmuteApp: {
+    id: 'sidebar.unmuteApp',
+    defaultMessage: '!!!Enable notifications & audio',
+  },
 });
 
 function getActiveWebview() {
@@ -416,7 +424,7 @@ const _titleBarTemplateFactory = intl => [
       },
       {
         label: intl.formatMessage(menuItems.zoomIn),
-        accelerator: `${ctrlKey}+Plus`,
+        accelerator: `${ctrlKey}+=`,
         click() {
           const activeService = getActiveWebview();
           activeService.getZoomLevel((level) => {
@@ -702,34 +710,38 @@ export default class FranzMenu {
 
   @computed get serviceTpl() {
     const { intl } = window.franz;
-    const services = this.stores.services.allDisplayed;
-    const menu = [{
+    const { user, services, settings } = this.stores;
+    if (!user.isLoggedIn) return [];
+    const menu = [];
+
+    menu.push({
       label: intl.formatMessage(menuItems.addNewService),
       accelerator: `${cmdKey}+N`,
       click: () => {
         this.actions.ui.openSettings({ path: 'recipes' });
       },
-      enabled: this.stores.user.isLoggedIn,
     }, {
       type: 'separator',
     }, {
       label: intl.formatMessage(menuItems.activateNextService),
       accelerator: `${cmdKey}+alt+right`,
       click: () => this.actions.service.setActiveNext(),
-      enabled: this.stores.user.isLoggedIn,
     }, {
       label: intl.formatMessage(menuItems.activatePreviousService),
       accelerator: `${cmdKey}+alt+left`,
       click: () => this.actions.service.setActivePrev(),
-      enabled: this.stores.user.isLoggedIn,
+    }, {
+      label: intl.formatMessage(
+        settings.all.app.isAppMuted ? menuItems.unmuteApp : menuItems.muteApp,
+      ).replace('&', '&&'),
+      accelerator: `${cmdKey}+shift+m`,
+      click: () => this.actions.app.toggleMuteApp(),
     }, {
       type: 'separator',
-    }];
-
-    menu.push();
+    });
 
     if (this.stores.user.isLoggedIn) {
-      services.forEach((service, i) => (menu.push({
+      services.allDisplayed.forEach((service, i) => (menu.push({
         label: this._getServiceName(service),
         accelerator: i < 9 ? `${cmdKey}+${i + 1}` : null,
         type: 'radio',
-- 
cgit v1.2.3-54-g00ecf