franpcode/ChatGPT
1
0
Fork 0
mirror of https://github.com/FranP-code/ChatGPT.git synced 2025-10-13 00:13:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: customize global shortcuts (#108)

Browse Source
This commit is contained in:
lencx
2022-12-30 23:46:30 +08:00
parent b3bd54ce81
commit dc0c78fee2
4 changed files with 46 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src-tauri/src/app/setup.rs
View File

@@ -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")]

3
src-tauri/src/conf.rs
View File

@@ -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 {