v0.7.2

add `#[cfg(target_os = "macos")]` when declare titlebar and titlebar_menu

.github/workflows/release.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   create-release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     outputs:
       RELEASE_UPLOAD_ID: ${{ steps.create_release.outputs.id }}
 
@@ -36,34 +36,32 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [macos-latest, ubuntu-latest, windows-latest]
+        platform: [macos-latest, ubuntu-20.04, windows-latest]
 
     runs-on: ${{ matrix.platform }}
     steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup node
-        uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+      - name: setup node
+        uses: actions/setup-node@v3
         with:
-          node-version: 18
-
-      - name: Install Rust stable
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-
-      # Rust cache
-      - uses: Swatinem/rust-cache@v1
+          node-version: 16
 
+      - name: install Rust stable
+        uses: dtolnay/rust-toolchain@stable
       - name: install dependencies (ubuntu only)
-        if: matrix.platform == 'ubuntu-latest'
+        if: matrix.platform == 'ubuntu-20.04'
         run: |
           sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
+          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
 
       - name: Install app dependencies and build it
         run: yarn && yarn build:fe
 
+      - name: fix tray icon
+        if: matrix.platform != 'macos-latest'
+        run: |
+          yarn fix:tray
+
       - uses: tauri-apps/tauri-action@v0.3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -74,7 +72,7 @@ jobs:
           releaseId: ${{ needs.create-release.outputs.RELEASE_UPLOAD_ID }}
 
   updater:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: [create-release, build-tauri]
 
     steps:

.github/workflows/win.yml

@@ -0,0 +1,72 @@
+# name: Release CI
+
+# on:
+#   push:
+#     # Sequence of patterns matched against refs/tags
+#     tags:
+#       - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+
+# jobs:
+#   create-release:
+#     runs-on: ubuntu-20.04
+#     outputs:
+#       RELEASE_UPLOAD_ID: ${{ steps.create_release.outputs.id }}
+
+#     steps:
+#       - uses: actions/checkout@v2
+#       - name: Query version number
+#         id: get_version
+#         shell: bash
+#         run: |
+#           echo "using version tag ${GITHUB_REF:10}"
+#           echo "version=${GITHUB_REF:10}" >> $GITHUB_ENV
+
+#       - name: Create Release
+#         id: create_release
+#         uses: actions/create-release@v1
+#         env:
+#           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#         with:
+#           tag_name: '${{ env.version }}'
+#           release_name: 'ChatGPT ${{ env.version }}'
+#           body: 'See the assets to download this version and install.'
+
+#   build-tauri:
+#     needs: create-release
+#     strategy:
+#       fail-fast: false
+#       matrix:
+#         platform: [windows-latest]
+
+#     runs-on: ${{ matrix.platform }}
+#     steps:
+#       - uses: actions/checkout@v3
+#       - name: setup node
+#         uses: actions/setup-node@v3
+#         with:
+#           node-version: 16
+
+#       - name: install Rust stable
+#         uses: dtolnay/rust-toolchain@stable
+#       - name: install dependencies (ubuntu only)
+#         if: matrix.platform == 'ubuntu-20.04'
+#         run: |
+#           sudo apt-get update
+#           sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
+
+#       - name: Install app dependencies and build it
+#         run: yarn && yarn build:fe
+
+#       - name: fix tray icon
+#         if: matrix.platform != 'macos-latest'
+#         run: |
+#           yarn fix:tray
+
+#       - uses: tauri-apps/tauri-action@v0.3
+#         env:
+#           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#           # 📝: https://tauri.app/v1/guides/distribution/updater#signing-updates
+#           TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
+#           TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+#         with:
+#           releaseId: ${{ needs.create-release.outputs.RELEASE_UPLOAD_ID }}

README-ZH_CN.md

@@ -22,9 +22,9 @@
 
 **最新版:**
 
-- `Mac`: [ChatGPT_0.7.0_x64.dmg](https://github.com/lencx/ChatGPT/releases/download/v0.7.0/ChatGPT_0.7.0_x64.dmg)
-- `Linux`: [chat-gpt_0.7.0_amd64.deb](https://github.com/lencx/ChatGPT/releases/download/v0.7.0/chat-gpt_0.7.0_amd64.deb)
-- `Windows`: [ChatGPT_0.7.0_x64_en-US.msi](https://github.com/lencx/ChatGPT/releases/download/v0.7.0/ChatGPT_0.7.0_x64_en-US.msi)
+- `Mac`: [ChatGPT_0.7.2_x64.dmg](https://github.com/lencx/ChatGPT/releases/download/v0.7.2/ChatGPT_0.7.2_x64.dmg)
+- `Linux`: [chat-gpt_0.7.2_amd64.deb](https://github.com/lencx/ChatGPT/releases/download/v0.7.2/chat-gpt_0.7.2_amd64.deb)
+- `Windows`: [ChatGPT_0.7.2_x64_en-US.msi](https://github.com/lencx/ChatGPT/releases/download/v0.7.2/ChatGPT_0.7.2_x64_en-US.msi)
 
 [其他版本...](https://github.com/lencx/ChatGPT/releases)
 
@@ -74,7 +74,7 @@ cask "popcorn-time", args: { "no-quarantine": true }
 - 系统托盘悬浮窗
 - 应用菜单功能强大
 - 支持斜杠命令及其配置（可手动配置或从文件同步 [#55](https://github.com/lencx/ChatGPT/issues/55)）
-- 进入应用的全局快捷键 (mac: `command+shift+o`, windows: `ctrl+shift+o`)
+<!-- - 进入应用的全局快捷键 (mac: `command+shift+o`, windows: `ctrl+shift+o`) -->
 
 ### 菜单项
 

README.md

@@ -24,9 +24,9 @@
 
 **Latest:**
 
-- `Mac`: [ChatGPT_0.7.0_x64.dmg](https://github.com/lencx/ChatGPT/releases/download/v0.7.0/ChatGPT_0.7.0_x64.dmg)
-- `Linux`: [chat-gpt_0.7.0_amd64.deb](https://github.com/lencx/ChatGPT/releases/download/v0.7.0/chat-gpt_0.7.0_amd64.deb)
-- `Windows`: [ChatGPT_0.7.0_x64_en-US.msi](https://github.com/lencx/ChatGPT/releases/download/v0.7.0/ChatGPT_0.7.0_x64_en-US.msi)
+- `Mac`: [ChatGPT_0.7.2_x64.dmg](https://github.com/lencx/ChatGPT/releases/download/v0.7.2/ChatGPT_0.7.2_x64.dmg)
+- `Linux`: [chat-gpt_0.7.2_amd64.deb](https://github.com/lencx/ChatGPT/releases/download/v0.7.2/chat-gpt_0.7.2_amd64.deb)
+- `Windows`: [ChatGPT_0.7.2_x64_en-US.msi](https://github.com/lencx/ChatGPT/releases/download/v0.7.2/ChatGPT_0.7.2_x64_en-US.msi)
 
 [Other version...](https://github.com/lencx/ChatGPT/releases)
 
@@ -76,7 +76,7 @@ In the chatgpt text input area, type a character starting with `/` to bring up t
 - System tray hover window
 - Powerful menu items
 - Support for slash commands and their configuration (can be configured manually or synchronized from a file [#55](https://github.com/lencx/ChatGPT/issues/55))
-- Global shortcuts to the chatgpt app (mac: `command+shift+o`, windows: `ctrl+shift+o`)
+<!-- - Global shortcuts to the chatgpt app (mac: `command+shift+o`, windows: `ctrl+shift+o`) -->
 
 ### MenuItem
 

UPDATE_LOG.md

@@ -1,5 +1,16 @@
 # UPDATE LOG
 
+## v0.7.2
+
+fix: some windows systems cannot start the application
+
+## v0.7.1
+
+fix:
+- some windows systems cannot start the application
+- windows and linux add about menu (show version information)
+- the tray icon is indistinguishable from the background in dark mode on window and linux
+
 ## v0.7.0
 
 fix:
@@ -8,7 +19,7 @@ fix:
 
 feat:
 - use the keyboard `⇧` (arrow up) and `⇩` (arrow down) keys to select the slash command
-- global shortcuts to the chatgpt app (mac: command+shift+o, windows: ctrl+shift+o)
+<!-- - global shortcuts to the chatgpt app (mac: command+shift+o, windows: ctrl+shift+o) -->
 
 ## v0.6.10
 

package.json

@@ -8,6 +8,8 @@
     "build": "yarn tauri build",
     "updater": "tr updater",
     "release": "tr release --git",
+    "fix:tray": "tr override --json.tauri_systemTray_iconPath=\"icons/tray-icon-light.png\" --json.tauri_systemTray_iconAsTemplate=false",
+    "fix:tray:mac": "tr override --json.tauri_systemTray_iconPath=\"icons/tray-icon.png\" --json.tauri_systemTray_iconAsTemplate=true",
     "download": "node ./scripts/download.js",
     "tr": "tr",
     "tauri": "tauri"

src-tauri/Cargo.toml

@@ -17,7 +17,7 @@ tauri-build = {version = "1.2.1", features = [] }
 anyhow = "1.0.66"
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.2.2", features = ["api-all", "devtools", "system-tray", "updater"] }
+tauri = { version = "1.2.3", features = ["api-all", "devtools", "system-tray", "updater"] }
 tauri-plugin-positioner = { version = "1.0.4", features = ["system-tray"] }
 log = "0.4.17"
 csv = "1.1.6"

src-tauri/src/app/menu.rs

@@ -3,11 +3,14 @@ use crate::{
     utils,
 };
 use tauri::{
-    AboutMetadata, AppHandle, CustomMenuItem, Manager, Menu, MenuItem, Submenu, SystemTray,
-    SystemTrayEvent, SystemTrayMenu, SystemTrayMenuItem, WindowMenuEvent,
+    AppHandle, CustomMenuItem, Manager, Menu, MenuItem, Submenu, SystemTray, SystemTrayEvent,
+    SystemTrayMenu, SystemTrayMenuItem, WindowMenuEvent,
 };
 use tauri_plugin_positioner::{on_tray_event, Position, WindowExt};
 
+#[cfg(target_os = "macos")]
+use tauri::AboutMetadata;
+
 use super::window;
 
 // --- Menu
@@ -16,19 +19,23 @@ pub fn init() -> Menu {
     let name = "ChatGPT";
     let app_menu = Submenu::new(
         name,
-        Menu::new()
-            .add_native_item(MenuItem::About(name.into(), AboutMetadata::default()))
-            .add_native_item(MenuItem::Services)
-            .add_native_item(MenuItem::Separator)
-            .add_native_item(MenuItem::Hide)
-            .add_native_item(MenuItem::HideOthers)
-            .add_native_item(MenuItem::ShowAll)
-            .add_native_item(MenuItem::Separator)
-            .add_native_item(MenuItem::Quit),
+        Menu::with_items([
+            #[cfg(target_os = "macos")]
+            MenuItem::About(name.into(), AboutMetadata::default()).into(),
+            #[cfg(not(target_os = "macos"))]
+            CustomMenuItem::new("about".to_string(), "About ChatGPT").into(),
+            MenuItem::Services.into(),
+            MenuItem::Hide.into(),
+            MenuItem::HideOthers.into(),
+            MenuItem::ShowAll.into(),
+            MenuItem::Separator.into(),
+            MenuItem::Quit.into(),
+        ]),
     );
 
     let stay_on_top =
         CustomMenuItem::new("stay_on_top".to_string(), "Stay On Top").accelerator("CmdOrCtrl+T");
+    #[cfg(target_os = "macos")]
     let titlebar =
         CustomMenuItem::new("titlebar".to_string(), "Titlebar").accelerator("CmdOrCtrl+B");
     let theme_light = CustomMenuItem::new("theme_light".to_string(), "Light");
@@ -40,6 +47,7 @@ pub fn init() -> Menu {
     } else {
         stay_on_top
     };
+    #[cfg(target_os = "macos")]
     let titlebar_menu = if chat_conf.titlebar {
         titlebar.selected()
     } else {
@@ -175,6 +183,15 @@ pub fn menu_handler(event: WindowMenuEvent<tauri::Wry>) {
     let menu_handle = core_window.menu_handle();
 
     match menu_id {
+        // App
+        "about" => {
+            let tauri_conf = utils::get_tauri_conf().unwrap();
+            tauri::api::dialog::message(
+                app.get_window("core").as_ref(),
+                "ChatGPT",
+                format!("Version {}", tauri_conf.package.version.unwrap()),
+            );
+        }
         // Preferences
         "control_center" => window::control_window(&app),
         "restart" => tauri::api::process::restart(&app.env()),

src-tauri/src/app/setup.rs

@@ -1,5 +1,6 @@
 use crate::{app::window, conf::ChatConfJson, utils};
-use tauri::{utils::config::WindowUrl, window::WindowBuilder, App, GlobalShortcutManager, Manager};
+use log::info;
+use tauri::{utils::config::WindowUrl, window::WindowBuilder, App, Manager};
 
 pub fn init(app: &mut App) -> std::result::Result<(), Box<dyn std::error::Error>> {
     let chat_conf = ChatConfJson::get_chat_conf();
@@ -11,26 +12,31 @@ pub fn init(app: &mut App) -> std::result::Result<(), Box<dyn std::error::Error>
         window::tray_window(&handle);
     });
 
-    {
-        let handle = app.app_handle();
-        let mut shortcut = app.global_shortcut_manager();
-        let is_mini_key = shortcut.is_registered("CmdOrCtrl+Shift+O");
+    info!("stepup");
 
-        if !is_mini_key.unwrap() {
-            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();
-        };
-    }
+    // fix: Global shortcuts can cause programs to exit under windows
+    // {
+    //     info!("global_shortcut_start");
+    //     let handle = app.app_handle();
+    //     let mut shortcut = app.global_shortcut_manager();
+    //     let is_mini_key = shortcut.is_registered("CmdOrCtrl+Shift+O");
+
+    //     if is_mini_key.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");
+    // }
 
     if chat_conf.hide_dock_icon {
         #[cfg(target_os = "macos")]

src-tauri/src/utils.rs

@@ -8,19 +8,18 @@ use std::{
     path::{Path, PathBuf},
     process::Command,
 };
-use tauri::Manager;
-// use tauri::utils::config::Config;
+use tauri::{utils::config::Config, Manager};
 
 pub fn chat_root() -> PathBuf {
     tauri::api::path::home_dir().unwrap().join(".chatgpt")
 }
 
-// pub fn get_tauri_conf() -> Option<Config> {
-//     let config_file = include_str!("../tauri.conf.json");
-//     let config: Config =
-//         serde_json::from_str(config_file).expect("failed to parse tauri.conf.json");
-//     Some(config)
-// }
+pub fn get_tauri_conf() -> Option<Config> {
+    let config_file = include_str!("../tauri.conf.json");
+    let config: Config =
+        serde_json::from_str(config_file).expect("failed to parse tauri.conf.json");
+    Some(config)
+}
 
 pub fn exists(path: &Path) -> bool {
     Path::new(path).exists()

src-tauri/tauri.conf.json

@@ -7,11 +7,14 @@
   },
   "package": {
     "productName": "ChatGPT",
-    "version": "0.7.0"
+    "version": "0.7.2"
   },
   "tauri": {
     "allowlist": {
       "all": true,
+      "globalShortcut": {
+        "all": true
+      },
       "http": {
         "all": true,
         "scope": [
@@ -27,8 +30,8 @@
       }
     },
     "systemTray": {
-      "iconPath": "icons/tray-icon.png",
-      "iconAsTemplate": true,
+      "iconPath": "icons/tray-icon-light.png",
+      "iconAsTemplate": false,
       "menuOnLeftClick": false
     },
     "bundle": {