feat: option to use Alt to activate service

closes ferdium#1971
dxrcy · Nov 18, 2024 · b6eb290 · b6eb290
1 parent efc6680
commit b6eb290
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 22 deletions.
diff --git a/src/components/settings/settings/EditSettingsForm.tsx b/src/components/settings/settings/EditSettingsForm.tsx
@@ -624,25 +624,25 @@ class EditSettingsForm extends Component<IProps, IState> {
                     <Select field={form.$('predefinedTodoServer')} />
                     {form.$('predefinedTodoServer').value ===
                       'isUsingCustomTodoService' && (
-                      <div>
-                        <Input
-                          placeholder="Todo Server"
-                          onChange={e => this.submit(e)}
-                          {...form.$('customTodoServer').bind()}
-                        />
-                        <p
-                          className="settings__message"
-                          style={{
-                            borderTop: 0,
-                            marginTop: 0,
-                            paddingTop: 0,
-                            marginBottom: '2rem',
-                          }}
-                        >
-                          {intl.formatMessage(messages.todoServerInfo)}
-                        </p>
-                      </div>
-                    )}
+                        <div>
+                          <Input
+                            placeholder="Todo Server"
+                            onChange={e => this.submit(e)}
+                            {...form.$('customTodoServer').bind()}
+                          />
+                          <p
+                            className="settings__message"
+                            style={{
+                              borderTop: 0,
+                              marginTop: 0,
+                              paddingTop: 0,
+                              marginBottom: '2rem',
+                            }}
+                          >
+                            {intl.formatMessage(messages.todoServerInfo)}
+                          </p>
+                        </div>
+                      )}
                   </div>
                 )}
                 {isTodosActivated && <Hr />}
@@ -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
@@ -375,7 +375,7 @@ const messages = defineMessages({
   },
 });
 
-interface EditSettingsScreenProps extends StoresProps, WrappedComponentProps {}
+interface EditSettingsScreenProps extends StoresProps, WrappedComponentProps { }
 
 interface EditSettingsScreenState {
   lockedPassword: string;
@@ -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/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',
@@ -746,7 +750,7 @@ class FranzMenu implements StoresProps {
     if (locked) {
       const touchIdEnabled = isMac
         ? this.stores.settings.app.useTouchIdToUnlock &&
-          systemPreferences.canPromptTouchID()
+        systemPreferences.canPromptTouchID()
         : false;
 
       (tpl[0].submenu as MenuItemConstructorOptions[]).unshift(
@@ -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: '',
         }),