fix(Service) shortcuts for activating prev/next service fixes #1298

5 files changed, 92 insertions, 29 deletions

diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 065398dc6..d3a97de78 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -3875,6 +3875,32 @@
           "column": 17,
           "line": 178
         }
+      },
+      {
+        "defaultMessage": "!!!Activate next service...",
+        "end": {
+          "column": 3,
+          "line": 185
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.services.setNextServiceActive",
+        "start": {
+          "column": 23,
+          "line": 182
+        }
+      },
+      {
+        "defaultMessage": "!!!Activate previous service...",
+        "end": {
+          "column": 3,
+          "line": 189
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.services.activatePreviousService",
+        "start": {
+          "column": 27,
+          "line": 186
+        }
       }
     ],
     "path": "src/lib/Menu.json"
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index af6edd2df..a9ac92a3a 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -70,7 +70,9 @@
   "menu.help.support": "Support",
   "menu.help.tos": "Terms of Service",
   "menu.services": "Services",
+  "menu.services.activatePreviousService": "Activate previous service",
   "menu.services.addNewService": "Add New Service...",
+  "menu.services.setNextServiceActive": "Activate next service",
   "menu.view": "View",
   "menu.view.enterFullScreen": "Enter Full Screen",
   "menu.view.exitFullScreen": "Exit Full Screen",
@@ -280,4 +282,4 @@
   "validation.url": "{field} is not a valid URL",
   "welcome.loginButton": "Login to your account",
   "welcome.signupButton": "Create a free account"
-}
\ No newline at end of file
+}
diff --git a/src/i18n/messages/src/lib/Menu.json b/src/i18n/messages/src/lib/Menu.json
index 6958f0219..a131851aa 100644
--- a/src/i18n/messages/src/lib/Menu.json
+++ b/src/i18n/messages/src/lib/Menu.json
@@ -557,5 +557,31 @@
       "line": 181,
       "column": 3
     }
+  },
+  {
+    "id": "menu.services.setNextServiceActive",
+    "defaultMessage": "!!!Activate next service...",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 182,
+      "column": 23
+    },
+    "end": {
+      "line": 185,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.services.activatePreviousService",
+    "defaultMessage": "!!!Activate previous service...",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 186,
+      "column": 27
+    },
+    "end": {
+      "line": 189,
+      "column": 3
+    }
   }
 ]
\ No newline at end of file
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index dce8ab969..7bdbd9159 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -179,6 +179,14 @@ const menuItems = defineMessages({
     id: 'menu.services.addNewService',
     defaultMessage: '!!!Add New Service...',
   },
+  activateNextService: {
+    id: 'menu.services.setNextServiceActive',
+    defaultMessage: '!!!Activate next service...',
+  },
+  activatePreviousService: {
+    id: 'menu.services.activatePreviousService',
+    defaultMessage: '!!!Activate previous service...',
+  },
 });
 
 function getActiveWebview() {
@@ -525,7 +533,7 @@ export default class FranzMenu {
       return;
     }
 
-    const intl = window.franz.intl;
+    const { intl } = window.franz;
     const tpl = isMac ? _templateFactory(intl) : _titleBarTemplateFactory(intl);
 
     tpl[1].submenu.push({
@@ -683,17 +691,6 @@ export default class FranzMenu {
       }, about);
     }
 
-    serviceTpl.unshift({
-      label: intl.formatMessage(menuItems.addNewService),
-      accelerator: `${cmdKey}+N`,
-      click: () => {
-        this.actions.ui.openSettings({ path: 'recipes' });
-      },
-      enabled: this.stores.user.isLoggedIn,
-    }, {
-      type: 'separator',
-    });
-
     if (serviceTpl.length > 0) {
       tpl[3].submenu = serviceTpl;
     }
@@ -704,10 +701,35 @@ export default class FranzMenu {
   }
 
   @computed get serviceTpl() {
+    const { intl } = window.franz;
     const services = this.stores.services.allDisplayed;
+    const menu = [{
+      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,
+    }, {
+      type: 'separator',
+    }];
+
+    menu.push();
 
     if (this.stores.user.isLoggedIn) {
-      return services.map((service, i) => ({
+      services.forEach((service, i) => (menu.push({
         label: this._getServiceName(service),
         accelerator: i < 9 ? `${cmdKey}+${i + 1}` : null,
         type: 'radio',
@@ -715,10 +737,10 @@ export default class FranzMenu {
         click: () => {
           this.actions.service.setActive({ serviceId: service.id });
         },
-      }));
+      })));
     }
 
-    return [];
+    return menu;
   }
 
   _getServiceName(service) {
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index d933ca407..1db61a64e 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -157,19 +157,6 @@ export default class AppStore extends Store {
       this.stores.router.push(url);
     });
 
-    // Set active the next service
-    key(
-      '⌘+pagedown, ctrl+pagedown, ⌘+alt+right, ctrl+tab', () => {
-        this.actions.service.setActiveNext();
-      },
-    );
-
-    // Set active the prev service
-    key(
-      '⌘+pageup, ctrl+pageup, ⌘+alt+left, ctrl+shift+tab', () => {
-        this.actions.service.setActivePrev();
-      },
-    );
 
     // Global Mute
     key(