feat(shortcuts): update keyboard shortcuts and menu accelerators

- Update keyboard shortcut mappings for consistency across platforms
- Add CommandOrControl modifier support for shortcut manager
- Disable menu accelerators to prevent conflicts with shortcuts
- Improve shortcut display in settings UI

Author: OXOYO

src/common/publicData.js

@@ -709,8 +709,8 @@ export const keyboardShortcuts = [
     visible: true,
     shortcuts: {
       mac: 'Command+M',
-      win: 'Win+M',
-      linux: 'Super+H'
+      win: 'Ctrl+M',
+      linux: 'Super+M'
     }
   },
   {
@@ -846,8 +846,8 @@ export const keyboardShortcuts = [
     visible: true,
     shortcuts: {
       mac: 'Command+,',
-      win: 'Ctrl+,',
-      linux: 'Ctrl+,'
+      win: 'Ctrl+P',
+      linux: 'Ctrl+P'
     }
   },
   {

src/main/index.mjs

@@ -253,23 +253,23 @@ app.commandLine.appendSwitch('enable-oop-rasterization')
           label: global.FBW.store?.settingData?.autoSwitchWallpaper
             ? t('actions.autoSwitchWallpaper.stop')
             : t('actions.autoSwitchWallpaper.start'),
-          accelerator: global.FBW.store?.shortcutManager?.getShortcutByName(
-            'toggleAutoSwitchWallpaper'
-          ),
+          // accelerator: global.FBW.store?.shortcutManager?.getShortcutByName(
+          //   'toggleAutoSwitchWallpaper'
+          // ),
           click: () => {
             global.FBW.store?.toggleAutoSwitchWallpaper()
           }
         },
         {
           label: t('actions.nextWallpaper'),
-          accelerator: global.FBW.store?.shortcutManager?.getShortcutByName('nextWallpaper'),
+          // accelerator: global.FBW.store?.shortcutManager?.getShortcutByName('nextWallpaper'),
           click: () => {
             global.FBW.store?.doManualSwitchWallpaper('next')
           }
         },
         {
           label: t('actions.prevWallpaper'),
-          accelerator: global.FBW.store?.shortcutManager?.getShortcutByName('prevWallpaper'),
+          // accelerator: global.FBW.store?.shortcutManager?.getShortcutByName('prevWallpaper'),
           click: () => {
             global.FBW.store?.doManualSwitchWallpaper('prev')
           }
@@ -278,7 +278,7 @@ app.commandLine.appendSwitch('enable-oop-rasterization')
           label: global.FBW.store?.settingData?.suspensionBallVisible
             ? t('actions.closeSuspensionBall')
             : t('actions.openSuspensionBall'),
-          accelerator: global.FBW.store?.shortcutManager?.getShortcutByName('toggleSuspensionBall'),
+          // accelerator: global.FBW.store?.shortcutManager?.getShortcutByName('toggleSuspensionBall'),
           click: () => {
             global.FBW.suspensionBall.toggle()
           }
@@ -314,7 +314,7 @@ app.commandLine.appendSwitch('enable-oop-rasterization')
         } else if (item.placement.includes('trayFuncMenu')) {
           trayFuncMenuList.push({
             label: t(item.locale),
-            accelerator: global.FBW.store?.shortcutManager?.getShortcutByName(item.shortcutName),
+            // accelerator: global.FBW.store?.shortcutManager?.getShortcutByName(item.shortcutName),
             click: () => handleJumpToPage(item.name)
           })
         }
@@ -342,7 +342,7 @@ app.commandLine.appendSwitch('enable-oop-rasterization')
         },
         {
           label: t('actions.checkUpdate'),
-          accelerator: global.FBW.store?.shortcutManager?.getShortcutByName('checkUpdate'),
+          // accelerator: global.FBW.store?.shortcutManager?.getShortcutByName('checkUpdate'),
           click: () => {
             // "检查更新"功能
             global.FBW.updater.checkUpdate()
@@ -353,7 +353,7 @@ app.commandLine.appendSwitch('enable-oop-rasterization')
         },
         {
           label: t('actions.quit'),
-          accelerator: global.FBW.store?.shortcutManager?.getShortcutByName('quitApp'),
+          // accelerator: global.FBW.store?.shortcutManager?.getShortcutByName('quitApp'),
           click: () => {
             global.FBW.flags.isQuitting = true
             app.quit()

src/main/store/ShortcutManager.mjs

@@ -337,7 +337,7 @@ class ShortcutManager {
           global.FBW.store.doManualSwitchWallpaper('prev')
         }
         break
-      case 'toggleAutoSwitch':
+      case 'toggleAutoSwitchWallpaper':
         if (global.FBW?.store) {
           global.FBW.store.toggleAutoSwitchWallpaper()
         }
@@ -349,9 +349,11 @@ class ShortcutManager {
           })
         }
         break
-      case 'checkUpdate':
-        if (global.FBW?.updater) {
-          global.FBW.updater.checkUpdate()
+      case 'openUtils':
+        if (global.FBW?.mainWindow) {
+          global.FBW.mainWindow.reopen(() => {
+            global.FBW.mainWindow.win.webContents.send('main:jumpToPage', 'Utils')
+          })
         }
         break
       case 'openAbout':
@@ -361,6 +363,11 @@ class ShortcutManager {
           })
         }
         break
+      case 'checkUpdate':
+        if (global.FBW?.updater) {
+          global.FBW.updater.checkUpdate()
+        }
+        break
       case 'editSelectAll':
         if (win) {
           win.webContents.selectAll()
@@ -822,6 +829,7 @@ class ShortcutManager {
       // macOS平台的修饰键名称
       const macModifiers = {
         Command: 'Cmd',
+        CommandOrControl: 'Cmd',
         Ctrl: 'Ctrl',
         Option: 'Opt',
         Shift: 'Shift'
@@ -831,6 +839,7 @@ class ShortcutManager {
       // Linux平台的修饰键名称
       const linuxModifiers = {
         Control: 'Ctrl',
+        CommandOrControl: 'Ctrl',
         Meta: 'Super',
         Shift: 'Shift',
         Alt: 'Alt'
@@ -840,6 +849,7 @@ class ShortcutManager {
       // Windows平台的修饰键名称
       const winModifiers = {
         Control: 'Ctrl',
+        CommandOrControl: 'Ctrl',
         Shift: 'Shift',
         Alt: 'Alt',
         Windows: 'Win'

src/renderer/windows/MainWindow/components/ExploreCommon.vue

@@ -1802,7 +1802,7 @@ onBeforeUnmount(() => {
 
       <el-mention
         v-model="searchForm.filterKeywords"
-        class="condition-item"
+        class="condition-item condition-keywords"
         :disabled="flags.loading"
         :options="hotTags"
         :prefix="['#']"
@@ -2079,6 +2079,11 @@ onBeforeUnmount(() => {
   .condition-item {
     flex: none;
   }
+  :deep(.condition-keywords) {
+    .el-input__inner {
+      color: #ffffff !important;
+    }
+  }
 }
 
 .body-block {

src/renderer/windows/MainWindow/pages/Setting.vue

@@ -2106,7 +2106,7 @@ onBeforeUnmount(() => {
                 <template #default="scope">
                   <div class="shortcut-input">
                     <el-input
-                      :value="isEditing(scope.row.name) ? editingShortcut : scope.row.shortcut"
+                      :value="isEditing(scope.row.name) ? editingShortcut : scope.row.displayShortcut"
                       :placeholder="
                         isEditing(scope.row.name)
                           ? t('pages.Setting.shortcutSetting.pressShortcut')