From 62d89c6fad055a1360070cdb1d8a2a831a37e5b3 Mon Sep 17 00:00:00 2001 From: Tlntin Date: Tue, 22 Nov 2022 00:25:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=B1=E4=BA=8E?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E8=B7=AF=E5=BE=84=E9=87=87=E7=94=A8=E7=BB=9D?= =?UTF-8?q?=E5=AF=B9=E8=B7=AF=E5=BE=84=EF=BC=8C=E4=BB=A5=E5=8F=8A=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E8=B5=84=E6=BA=90=E4=B8=BA=E6=B7=BB=E5=8A=A0=E5=88=B0?= =?UTF-8?q?msi=E6=96=87=E4=BB=B6=E5=AF=BC=E8=87=B4exe=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=BF=90=E8=A1=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-tauri/src/main.rs | 4 +--- src-tauri/tauri.conf.json | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 383a5b5..8ba6e3f 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -118,9 +118,7 @@ fn main() -> wry::Result<()> { }) .with_inner_size(wry::application::dpi::LogicalSize::new(width, height)); #[cfg(target_os = "windows")] - let icon_path = concat!(env!("CARGO_MANIFEST_DIR"), "/png/weread_32.ico"); - #[cfg(target_os = "windows")] - let icon = load_icon(std::path::Path::new(icon_path)); + let icon = load_icon(std::path::Path::new("png/weread_32.ico")); #[cfg(target_os = "windows")] let window = common_window diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 2f28d0d..b8c66d5 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -52,7 +52,7 @@ "providerShortName": null, "signingIdentity": null }, - "resources": [], + "resources": ["png/weread_32.ico"], "shortDescription": "", "targets": ["deb", "msi", "dmg"], "windows": { From 6f87ffa93d96e4c6dacddfa9bf8ee3c4e9edcca7 Mon Sep 17 00:00:00 2001 From: Tlntin Date: Tue, 22 Nov 2022 00:29:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- README_EN.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8d90bae..4db1b2e 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ | ⌘ + r | Ctrl + r | 刷新页面 | | ⌘ + w | Ctrl + w | 隐藏窗口，非退出 | | ⌘ + - | Ctrl + - | 缩小页面 | -| ⌘ + w | Ctrl + + | 放大页面 | +| ⌘ + + | Ctrl + + | 放大页面 | | ⌘ + = | Ctrl + = | 放大页面 | | ⌘ + 0 | Ctrl + 0 | 重置页面缩放 | @@ -82,7 +82,7 @@ ## 注意点 -- Windows 下不能安装到 C:\Program File，会直接闪退。建议安装到其他目录，比如 D:\Program Files。 +- Windows 下不能安装到 C:\Program File，会直接闪退。建议安装到其他非管理员权限目录，比如 D:\Program Files (x86) 。 - Linux 下暂时不能存 cookie，即应用关闭后数据清空，账号自动推出。 ## 开发 diff --git a/README_EN.md b/README_EN.md index 2f79cd4..a1b2acc 100644 --- a/README_EN.md +++ b/README_EN.md @@ -82,7 +82,7 @@ In addition, it supports double clicking the head to switch to full screen, and ## Precautions -- It cannot be installed to C:\Program File under Windows, and it will crash directly. It is recommended to install to another directory, such as D:\Program Files. +- It cannot be installed to C:\Program File under Windows, and it will crash directly. It is recommended to install to other non-administrator directories, such as D:\Program Files (x86) . - Under Linux, cookies cannot be stored temporarily, that is, the data will be cleared after the application is closed, and the account will be automatically released. ## Development