diff --git a/src-tauri/icons/fnos.icns b/src-tauri/icons/fnos.icns new file mode 100644 index 0000000..6b34b3e Binary files /dev/null and b/src-tauri/icons/fnos.icns differ diff --git a/src-tauri/pake.json b/src-tauri/pake.json index eadb6c8..5d9d98b 100644 --- a/src-tauri/pake.json +++ b/src-tauri/pake.json @@ -1,7 +1,7 @@ { "windows": [ { - "url": "https://weread.qq.com/", + "url": "https://192.168.31.3:5667/", "url_type": "web", "hide_title_bar": true, "fullscreen": false, diff --git a/src-tauri/png/fnos_256.ico b/src-tauri/png/fnos_256.ico new file mode 100644 index 0000000..c2fc6f3 Binary files /dev/null and b/src-tauri/png/fnos_256.ico differ diff --git a/src-tauri/png/fnos_32.ico b/src-tauri/png/fnos_32.ico new file mode 100644 index 0000000..a4f5540 Binary files /dev/null and b/src-tauri/png/fnos_32.ico differ diff --git a/src-tauri/png/fnos_512.png b/src-tauri/png/fnos_512.png new file mode 100644 index 0000000..494732a Binary files /dev/null and b/src-tauri/png/fnos_512.png differ diff --git a/src-tauri/src/app/window.rs b/src-tauri/src/app/window.rs index 8fadfb2..1ff3359 100644 --- a/src-tauri/src/app/window.rs +++ b/src-tauri/src/app/window.rs @@ -98,7 +98,7 @@ pub fn set_window(app: &mut App, config: &PakeConfig, tauri_config: &Config) -> #[cfg(all(not(target_os = "windows"), not(target_os = "macos")))] let mut linux_browser_args = String::from("--disable-blink-features=AutomationControlled"); - if window_config.ignore_certificate_errors { + if !window_config.ignore_certificate_errors { #[cfg(target_os = "windows")] { windows_browser_args.push_str(" --ignore-certificate-errors"); diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index eab659f..1d8c9cc 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,11 +1,11 @@ { - "productName": "Weread", - "identifier": "com.tencent.Weread", + "productName": "FnOS", + "identifier": "com.feiniu.FnOS", "version": "1.0.0", "app": { "withGlobalTauri": true, "trayIcon": { - "iconPath": "png/weread_512.png", + "iconPath": "png/fnos_512.png", "iconAsTemplate": false, "id": "pake-tray" }, diff --git a/src-tauri/tauri.linux.conf.json b/src-tauri/tauri.linux.conf.json index e17813e..5558b7a 100644 --- a/src-tauri/tauri.linux.conf.json +++ b/src-tauri/tauri.linux.conf.json @@ -1,7 +1,7 @@ { - "productName": "wechat", + "productName": "fnos", "bundle": { - "icon": ["png/weread_512.png"], + "icon": ["png/fnos_512.png"], "active": true, "linux": { "deb": { diff --git a/src-tauri/tauri.macos.conf.json b/src-tauri/tauri.macos.conf.json index 12e710a..8eec63e 100644 --- a/src-tauri/tauri.macos.conf.json +++ b/src-tauri/tauri.macos.conf.json @@ -1,6 +1,6 @@ { "bundle": { - "icon": ["icons/weread.icns"], + "icon": ["icons/fnos.icns"], "active": true, "targets": ["dmg"] } diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json index 3e45bd6..48ed8cf 100644 --- a/src-tauri/tauri.windows.conf.json +++ b/src-tauri/tauri.windows.conf.json @@ -1,8 +1,8 @@ { "bundle": { - "icon": ["png/weread_256.ico", "png/weread_32.ico"], + "icon": ["png/fnos_256.ico", "png/fnos_32.ico"], "active": true, - "resources": ["png/weread_32.ico"], + "resources": ["png/fnos_32.ico"], "targets": ["msi"], "windows": { "digestAlgorithm": "sha256",