fix: customize global shortcuts (#108)

lencx · Dec 30, 2022 · dc0c78f · dc0c78f
1 parent b3bd54c
commit dc0c78f
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 22 deletions.
diff --git a/UPDATE_LOG.md b/UPDATE_LOG.md
@@ -1,5 +1,10 @@
 # UPDATE LOG
 
+## v0.7.4
+
+fix:
+- customize global shortcuts (`Menu -> Preferences -> Control Center -> General -> Global Shortcut`)
+
 ## v0.7.3
 
 chore:

diff --git a/src-tauri/src/app/setup.rs b/src-tauri/src/app/setup.rs
@@ -13,30 +13,25 @@ pub fn init(app: &mut App) -> std::result::Result<(), Box<dyn std::error::Error>
         window::tray_window(&handle);
     });
 
-    {
-        info!("global_shortcut_start");
+    if let Some(v) = chat_conf.global_shortcut {
+        info!("global_shortcut");
         let handle = app.app_handle();
         let mut shortcut = app.global_shortcut_manager();
-        let core_shortcut = shortcut.is_registered("CmdOrCtrl+Shift+O");
-
-        info!("is_registered: {}", core_shortcut.is_ok());
-
-        if core_shortcut.is_ok() {
-            shortcut
-                .register("CmdOrCtrl+Shift+O", move || {
-                    if let Some(w) = handle.get_window("core") {
-                        if w.is_visible().unwrap() {
-                            w.hide().unwrap();
-                        } else {
-                            w.show().unwrap();
-                            w.set_focus().unwrap();
-                        }
-                    }
-                })
-                .unwrap();
-        };
-        info!("global_shortcut_end");
-    }
+        shortcut.register(&v, move|| {
+            if let Some(w) = handle.get_window("core") {
+                if w.is_visible().unwrap() {
+                    w.hide().unwrap();
+                } else {
+                    w.show().unwrap();
+                    w.set_focus().unwrap();
+                }
+            }
+        }).unwrap_or_else(|err| {
+            info!("global_shortcut_register_error: {}", err);
+        });
+    } else {
+        info!("global_shortcut_unregister");
+    };
 
     if chat_conf.hide_dock_icon {
         #[cfg(target_os = "macos")]

diff --git a/src-tauri/src/conf.rs b/src-tauri/src/conf.rs
@@ -18,6 +18,7 @@ pub const DEFAULT_CHAT_CONF: &str = r#"{
     "stay_on_top": false,
     "theme": "Light",
     "titlebar": true,
+    "global_shortcut": "",
     "hide_dock_icon": false,
     "default_origin": "https://chat.openai.com",
     "origin": "https://chat.openai.com",
@@ -28,6 +29,7 @@ pub const DEFAULT_CHAT_CONF_MAC: &str = r#"{
     "stay_on_top": false,
     "theme": "Light",
     "titlebar": false,
+    "global_shortcut": "",
     "hide_dock_icon": false,
     "default_origin": "https://chat.openai.com",
     "origin": "https://chat.openai.com",
@@ -61,6 +63,7 @@ pub struct ChatConfJson {
     pub origin: String,
     pub ua_window: String,
     pub ua_tray: String,
+    pub global_shortcut: Option<String>,
 }
 
 impl ChatConfJson {

diff --git a/src/view/General.tsx b/src/view/General.tsx
@@ -17,6 +17,24 @@ const OriginLabel = ({ url }: { url: string }) => {
   )
 }
 
+const GlobalShortcut = () => {
+  return (
+    <div>
+      Global Shortcut
+      {' '}
+      <Tooltip title={(
+        <div>
+          <div>Shortcut definition, modifiers and key separated by "+" e.g. CmdOrControl+Q</div>
+          <div style={{ margin: '10px 0'}}>If empty, the shortcut is disabled.</div>
+          <a href="https://tauri.app/v1/api/js/globalshortcut" target="_blank">https://tauri.app/v1/api/js/globalshortcut</a>
+        </div>
+      )}>
+        <QuestionCircleOutlined />
+      </Tooltip>
+    </div>
+  )
+}
+
 export default function General() {
   const [form] = Form.useForm();
   const [platformInfo, setPlatform] = useState<string>('');
@@ -71,6 +89,9 @@ export default function General() {
       <Form.Item label="Stay On Top" name="stay_on_top" valuePropName="checked">
         <Switch />
       </Form.Item>
+      <Form.Item label={<GlobalShortcut />} name="global_shortcut">
+        <Input placeholder="CmdOrCtrl+Shift+O" {...DISABLE_AUTO_COMPLETE} />
+      </Form.Item>
       {platformInfo === 'darwin' && (
         <Form.Item label="Titlebar" name="titlebar" valuePropName="checked">
           <Switch />