feat: option to use Alt+[0-9] to switch between services (#1972)

closes #1971
ferdium · Nov 29, 2024 · 57e41c5 · 57e41c5
1 parent 1951662
commit 57e41c5
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 2 deletions.
diff --git a/src/components/services/tabs/TabItem.tsx b/src/components/services/tabs/TabItem.tsx
@@ -366,7 +366,10 @@ class TabItem extends Component<IProps, IState> {
         data-tooltip-id="tooltip-sidebar-button"
         data-tooltip-content={`${service.name} ${acceleratorString({
           index: shortcutIndex,
-          keyCombo: cmdOrCtrlShortcutKey(false),
+          keyCombo: this.props.stores!.settings.all.shortcuts
+            .activateServiceUsesAlt
+            ? altKey()
+            : cmdOrCtrlShortcutKey(false),
         })}`}
       >
         <img src={service.icon} className="tab-item__icon" alt="" />

diff --git a/src/components/settings/settings/EditSettingsForm.tsx b/src/components/settings/settings/EditSettingsForm.tsx
@@ -1235,6 +1235,8 @@ class EditSettingsForm extends Component<IProps, IState> {
                     onChange={e => this.submit(e)}
                     {...form.$('shortcutActivatePreviousService').bind()}
                   />
+
+                  <Toggle {...form.$('activateServiceUsesAlt').bind()} />
                 </div>
               </div>
             )}

diff --git a/src/config.ts b/src/config.ts
@@ -476,4 +476,5 @@ export const DEFAULT_SERVICE_SETTINGS = {
 export const DEFAULT_SHORTCUTS = {
   activateNextService: 'Ctrl+tab',
   activatePreviousService: `Ctrl+${shiftKey()}+tab`,
+  activateServiceUsesAlt: false,
 };
diff --git a/src/containers/settings/EditSettingsScreen.tsx b/src/containers/settings/EditSettingsScreen.tsx
@@ -509,6 +509,7 @@ class EditSettingsScreen extends Component<
     const newShortcuts = {
       activateNextService: settingsData.shortcutActivateNextService,
       activatePreviousService: settingsData.shortcutActivatePreviousService,
+      activateServiceUsesAlt: Boolean(settingsData.activateServiceUsesAlt),
     };
 
     const requiredRestartKeys = [
@@ -1342,6 +1343,15 @@ class EditSettingsScreen extends Component<
           default: DEFAULT_SHORTCUTS.activatePreviousService,
           placeholder: DEFAULT_SHORTCUTS.activatePreviousService,
         },
+        activateServiceUsesAlt: {
+          label: intl.formatMessage(menuItems.activateServiceUsesAlt),
+          value: ifUndefined<boolean>(
+            settings.all.shortcuts.activateServiceUsesAlt,
+            DEFAULT_SHORTCUTS.activateServiceUsesAlt,
+          ),
+          default: DEFAULT_SHORTCUTS.activateServiceUsesAlt,
+          type: 'checkbox',
+        },
       },
     };
 

diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
@@ -113,6 +113,7 @@
   "menu.help.tos": "Terms of Service",
   "menu.services": "Services",
   "menu.services.activatePreviousService": "Activate previous service",
+  "menu.services.activateServiceUsesAlt": "Use Alt key to activate service",
   "menu.services.addNewService": "Add New Service...",
   "menu.services.copyToClipboard": "Copy to clipboard",
   "menu.services.goHome": "Home",

diff --git a/src/lib/Menu.ts b/src/lib/Menu.ts
@@ -304,6 +304,10 @@ export const menuItems = defineMessages({
     id: 'menu.services.activatePreviousService',
     defaultMessage: 'Activate previous service',
   },
+  activateServiceUsesAlt: {
+    id: 'menu.services.activateServiceUsesAlt',
+    defaultMessage: 'Use Alt key to activate service',
+  },
   muteApp: {
     id: 'sidebar.muteApp',
     defaultMessage: 'Disable notifications & audio',
@@ -1145,7 +1149,9 @@ class FranzMenu implements StoresProps {
         label: this._getServiceName(service),
         accelerator: acceleratorString({
           index: i + 1,
-          keyCombo: cmdOrCtrlShortcutKey(),
+          keyCombo: this.stores.settings.shortcuts.activateServiceUsesAlt
+            ? altKey()
+            : cmdOrCtrlShortcutKey(),
           prefix: '',
           suffix: '',
         }),
-Original file line number
+Diff line change
@@ Expand Up @@
                         onChange={e => this.submit(e)}
                         {...form.$('shortcutActivatePreviousService').bind()}
                       />
+                      <Toggle {...form.$('activateServiceUsesAlt').bind()} />
                     </div>
                   </div>
                 )}
@@ Expand Down @@