Merge cfb6b9287f into d92e34949c

src/common/ipcNames.ts

@@ -153,6 +153,8 @@ const modules = {
     download_list_update: 'download_list_update',
     download_list_remove: 'download_list_remove',
     download_list_clear: 'download_list_clear',
+
+    on_open_setting:'on_open_setting'
   },
   winLyric: {
     close: 'close',

src/main/modules/tray.ts

@@ -5,9 +5,11 @@ import {
   hideWindow as hideMainWindow,
   isExistWindow as isExistMainWindow,
   isShowWindow as isShowMainWindow,
+  sendEvent,
   showWindow as showMainWindow,
 } from './winMain'
 import { quitApp } from '@main/app'
+import { WIN_MAIN_RENDERER_EVENT_NAME } from '@common/ipcNames'
 
 let tray: Electron.Tray | null
 let isEnableTray: boolean = false
@@ -138,6 +140,13 @@ export const createMenu = () => {
             showMainWindow()
           },
         })
+    menu.push({
+      label: '设置',
+      click() {
+        sendEvent(WIN_MAIN_RENDERER_EVENT_NAME.on_open_setting)
+        showMainWindow()
+      },
+    })
   }
   menu.push(global.lx.appSetting['desktopLyric.enable']
     ? {

src/renderer/core/useApp/useEventListener.ts

@@ -2,6 +2,7 @@ import { getFontSizeWithScreen } from '@renderer/utils'
 import {
   minWindow,
   onFocus,
+  onOpenSetting,
   onSettingChanged,
   onThemeChange,
   openDevTools,
@@ -104,6 +105,10 @@ export default () => {
     window.app_event.configUpdate()
   })
 
+  const rOpenSetting = onOpenSetting(({}) => {
+    window.location.href="#/setting"
+  })
+
   const rFocus = onFocus(() => {
     clearDownKeys()
   })
@@ -145,5 +150,6 @@ export default () => {
     rSetConfig()
     rFocus()
     rThemeChange()
+    rOpenSetting()
   })
 }

src/renderer/utils/ipc.ts

@@ -20,6 +20,13 @@ export const onSettingChanged = (listener: LX.IpcRendererEventListenerParams<Par
   }
 }
 
+export const onOpenSetting = (listener: LX.IpcRendererEventListenerParams<Partial<LX.AppSetting>>): RemoveListener => {
+  rendererOn(WIN_MAIN_RENDERER_EVENT_NAME.on_open_setting, listener)
+  return () => {
+    rendererOff(WIN_MAIN_RENDERER_EVENT_NAME.on_open_setting, listener)
+  }
+}
+
 export const sendInited = () => {
   rendererSend(WIN_MAIN_RENDERER_EVENT_NAME.inited)
 }