diff --git a/src-tauri/src/app/menu.rs b/src-tauri/src/app/menu.rs index a230641..875a707 100644 --- a/src-tauri/src/app/menu.rs +++ b/src-tauri/src/app/menu.rs @@ -47,10 +47,6 @@ pub fn init(context: &Context) -> Menu { let preferences_menu = Submenu::new( "Preferences", Menu::with_items([ - CustomMenuItem::new("dashboard".to_string(), "Dashboard") - .accelerator("CmdOrCtrl+D") - .into(), - MenuItem::Separator.into(), Submenu::new( "Theme", Menu::new() @@ -73,6 +69,9 @@ pub fn init(context: &Context) -> Menu { CustomMenuItem::new("inject_script".to_string(), "Inject Script") .accelerator("CmdOrCtrl+J") .into(), + CustomMenuItem::new("control_center".to_string(), "Control Center") + .accelerator("CmdOrCtrl+Shift+P") + .into(), MenuItem::Separator.into(), CustomMenuItem::new("go_conf".to_string(), "Go to Config") .accelerator("CmdOrCtrl+Shift+G") @@ -160,7 +159,7 @@ pub fn menu_handler(event: WindowMenuEvent) { match menu_id { // Preferences - "dashboard" => app.get_window("main").unwrap().show().unwrap(), + "control_center" => app.get_window("main").unwrap().show().unwrap(), "restart" => tauri::api::process::restart(&app.env()), "inject_script" => open(&app, script_path), "go_conf" => utils::open_file(utils::chat_root()), diff --git a/src-tauri/src/app/setup.rs b/src-tauri/src/app/setup.rs index 6812ce9..d7beb2e 100644 --- a/src-tauri/src/app/setup.rs +++ b/src-tauri/src/app/setup.rs @@ -21,7 +21,7 @@ pub fn init(app: &mut App) -> std::result::Result<(), Box .initialization_script(include_str!("../assets/jspdf.js")) .initialization_script(include_str!("../assets/core.js")) .initialization_script(include_str!("../assets/export.js")) - .user_agent(&chat_conf.ua_pc) + .user_agent(&chat_conf.ua_window) .build()?; #[cfg(not(target_os = "macos"))] @@ -37,7 +37,7 @@ pub fn init(app: &mut App) -> std::result::Result<(), Box .initialization_script(include_str!("../assets/jspdf.js")) .initialization_script(include_str!("../assets/core.js")) .initialization_script(include_str!("../assets/export.js")) - .user_agent(&chat_conf.ua_pc) + .user_agent(&chat_conf.ua_window) .build()?; Ok(()) diff --git a/src-tauri/src/app/window.rs b/src-tauri/src/app/window.rs index 1548347..ea6b27e 100644 --- a/src-tauri/src/app/window.rs +++ b/src-tauri/src/app/window.rs @@ -17,7 +17,7 @@ pub fn mini_window(handle: &tauri::AppHandle) { .initialization_script(include_str!("../assets/jspdf.js")) .initialization_script(include_str!("../assets/core.js")) .initialization_script(include_str!("../assets/export.js")) - .user_agent(&chat_conf.ua_phone) + .user_agent(&chat_conf.ua_tray) .build() .unwrap() .hide() diff --git a/src-tauri/src/conf.rs b/src-tauri/src/conf.rs index c73cb0e..7765763 100644 --- a/src-tauri/src/conf.rs +++ b/src-tauri/src/conf.rs @@ -19,8 +19,8 @@ pub const DEFAULT_CHAT_CONF: &str = r#"{ "titlebar": true, "default_origin": "https://chat.openai.com", "origin": "https://chat.openai.com", - "ua_pc": "", - "ua_phone": "" + "ua_window": "", + "ua_tray": "" }"#; pub const DEFAULT_CHAT_CONF_MAC: &str = r#"{ "always_on_top": false, @@ -28,8 +28,8 @@ pub const DEFAULT_CHAT_CONF_MAC: &str = r#"{ "titlebar": false, "default_origin": "https://chat.openai.com", "origin": "https://chat.openai.com", - "ua_pc": "", - "ua_phone": "" + "ua_window": "", + "ua_tray": "" }"#; pub struct ChatState { @@ -51,8 +51,8 @@ pub struct ChatConfJson { pub theme: String, pub default_origin: String, pub origin: String, - pub ua_pc: String, - pub ua_phone: String, + pub ua_window: String, + pub ua_tray: String, } impl ChatConfJson { diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index d1cab6c..d98406d 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -9,6 +9,7 @@ mod utils; use app::{cmd, menu, setup}; use conf::{ChatConfJson, ChatState}; +use tauri::Manager; fn main() { ChatConfJson::init(); diff --git a/src/view/General.tsx b/src/view/General.tsx index 43654a7..40efef4 100644 --- a/src/view/General.tsx +++ b/src/view/General.tsx @@ -1,12 +1,21 @@ import { useEffect, useState } from 'react'; -import { Form, Radio, Switch, Input, Button, Space, message } from 'antd'; +import { Form, Radio, Switch, Input, Button, Space, message, Tooltip } from 'antd'; +import { QuestionCircleOutlined } from '@ant-design/icons'; import { invoke } from '@tauri-apps/api'; import { platform } from '@tauri-apps/api/os'; import { ask } from '@tauri-apps/api/dialog'; import { relaunch } from '@tauri-apps/api/process'; import { clone, pick, isEqual } from 'lodash'; -const restartNames = ['origin', 'ua_window', 'ua_tray'] +const restartNames = ['theme', 'titlebar', 'origin', 'ua_window', 'ua_tray']; + +const OriginLabel = ({ url }: { url: string }) => { + return ( + + Switch Origin + + ) +} export default function General() { const [form] = Form.useForm(); @@ -27,17 +36,12 @@ export default function General() { form.setFieldsValue(clone(chatConf)); }, [chatConf]) - console.log('«28» /src/view/General.tsx ~> ', chatConf); - - const onCancel = () => { form.setFieldsValue(chatConf); }; const onFinish = async (values: any) => { await invoke('form_confirm', { data: values, label: 'main' }); - console.log('«33» /src/view/General.tsx ~> ', pick(chatConf, restartNames), pick(values, restartNames)); - if (!isEqual(pick(chatConf, restartNames), pick(values, restartNames))) { const isOk = await ask(`Configuration saved successfully, whether to restart?`, { title: 'ChatGPT Preferences' @@ -71,13 +75,13 @@ export default function General() { )} - + } name="origin"> - +