From 9ba3357a584b8b8e3a57e5b28962276a53871dab Mon Sep 17 00:00:00 2001 From: lencx Date: Wed, 25 Jan 2023 01:52:37 +0800 Subject: [PATCH] chore: tray --- .github/workflows/release.yml | 20 +++++++------- src-tauri/Cargo.toml | 2 +- src-tauri/src/app/setup.rs | 18 ++++++------- src-tauri/src/app/window.rs | 39 +++++++++++++-------------- src/components/SwitchOrigin/index.tsx | 22 ++++++++------- src/view/awesome/Form.tsx | 2 +- 6 files changed, 50 insertions(+), 53 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3913b95..c6f2d4e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -90,13 +90,13 @@ jobs: publish_dir: ./updater force_orphan: true - # publish-winget: - # # Action can only be run on windows - # runs-on: windows-latest - # needs: [create-release, build-tauri] - # steps: - # - uses: vedantmgoyal2009/winget-releaser@v1 - # with: - # identifier: lencx.ChatGPT - # token: ${{ secrets.WINGET_TOKEN }} - # version: ${{ env.version }} + publish-winget: + # Action can only be run on windows + runs-on: windows-latest + needs: [create-release, build-tauri] + steps: + - uses: vedantmgoyal2009/winget-releaser@v1 + with: + identifier: lencx.ChatGPT + token: ${{ secrets.WINGET_TOKEN }} + version: ${{ env.version }} diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index cbf996f..f0f4147 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -26,7 +26,7 @@ wry = "0.24.1" dark-light = "1.0.0" serde = { version = "1.0", features = ["derive"] } tokio = { version = "1.23.0", features = ["macros"] } -tauri = { version = "1.2.3", features = ["api-all", "devtools", "global-shortcut", "system-tray", "updater"] } +tauri = { version = "1.2.4", features = ["api-all", "devtools", "global-shortcut", "system-tray", "updater"] } tauri-plugin-positioner = { version = "1.0.4", features = ["system-tray"] } tauri-plugin-log = { git = "https://github.com/lencx/tauri-plugins-workspace", branch = "dev", features = ["colored"] } tauri-plugin-autostart = { git = "https://github.com/lencx/tauri-plugins-workspace", branch = "dev" } diff --git a/src-tauri/src/app/setup.rs b/src-tauri/src/app/setup.rs index 3aedf0f..7cb82b9 100644 --- a/src-tauri/src/app/setup.rs +++ b/src-tauri/src/app/setup.rs @@ -59,7 +59,13 @@ pub fn init(app: &mut App) -> std::result::Result<(), Box .title("ChatGPT") .resizable(true) .fullscreen(false) - .inner_size(800.0, 600.0); + .inner_size(800.0, 600.0) + .theme(theme) + .always_on_top(chat_conf.stay_on_top) + .title_bar_style(ChatConfJson::titlebar()) + .initialization_script(&utils::user_script()) + .initialization_script(include_str!("../scripts/core.js")) + .user_agent(&chat_conf.ua_window); if cfg!(target_os = "macos") { main_win = main_win.hidden_title(true); @@ -79,15 +85,7 @@ pub fn init(app: &mut App) -> std::result::Result<(), Box .initialization_script(include_str!("../scripts/cmd.js")) } - main_win - .theme(theme) - .always_on_top(chat_conf.stay_on_top) - .title_bar_style(ChatConfJson::titlebar()) - .initialization_script(&utils::user_script()) - .initialization_script(include_str!("../scripts/core.js")) - .user_agent(&chat_conf.ua_window) - .build() - .unwrap(); + main_win.build().unwrap(); }); } diff --git a/src-tauri/src/app/window.rs b/src-tauri/src/app/window.rs index e23daa8..cd7cf87 100644 --- a/src-tauri/src/app/window.rs +++ b/src-tauri/src/app/window.rs @@ -9,22 +9,24 @@ pub fn tray_window(handle: &tauri::AppHandle) { let app = handle.clone(); tauri::async_runtime::spawn(async move { - let mut tray_win = WindowBuilder::new( - &app, - "tray", - WindowUrl::App(chat_conf.tray_origin.clone().into()), - ) - .title("ChatGPT") - .resizable(false) - .fullscreen(false) - .inner_size(360.0, 540.0) - .decorations(false) - .always_on_top(true) - .theme(theme) - .initialization_script(&utils::user_script()) - .initialization_script(include_str!("../scripts/core.js")); + let link = if chat_conf.tray_dashboard { + "index.html" + } else { + &chat_conf.tray_origin + }; + let mut tray_win = WindowBuilder::new(&app, "tray", WindowUrl::App(link.into())) + .title("ChatGPT") + .resizable(false) + .fullscreen(false) + .inner_size(360.0, 540.0) + .decorations(false) + .always_on_top(true) + .theme(theme) + .initialization_script(&utils::user_script()) + .initialization_script(include_str!("../scripts/core.js")) + .user_agent(&chat_conf.ua_tray); - if chat_conf.tray_origin == "https://chat.openai.com" { + if chat_conf.tray_origin == "https://chat.openai.com" && !chat_conf.tray_dashboard { tray_win = tray_win .initialization_script(include_str!("../vendors/floating-ui-core.js")) .initialization_script(include_str!("../vendors/floating-ui-dom.js")) @@ -32,12 +34,7 @@ pub fn tray_window(handle: &tauri::AppHandle) { .initialization_script(include_str!("../scripts/popup.core.js")) } - tray_win - .user_agent(&chat_conf.ua_tray) - .build() - .unwrap() - .hide() - .unwrap(); + tray_win.build().unwrap().hide().unwrap(); }); } diff --git a/src/components/SwitchOrigin/index.tsx b/src/components/SwitchOrigin/index.tsx index d51c510..e9fd427 100644 --- a/src/components/SwitchOrigin/index.tsx +++ b/src/components/SwitchOrigin/index.tsx @@ -74,16 +74,18 @@ const SwitchOrigin: FC = ({ name }) => { name={originName} > diff --git a/src/view/awesome/Form.tsx b/src/view/awesome/Form.tsx index baee30b..26b972e 100644 --- a/src/view/awesome/Form.tsx +++ b/src/view/awesome/Form.tsx @@ -39,7 +39,7 @@ const AwesomeForm: ForwardRefRenderFunction = ({ re