diff --git a/build.sh b/build.sh index 65cef06..79cf4c9 100755 --- a/build.sh +++ b/build.sh @@ -56,7 +56,7 @@ for app_info in "${app_list[@]}"; do fi echo "update ico with 32x32 pictue" - cp "src-tauri/png/${package_name}_32.png" "src-tauri/icons/icon.ico" + cp "src-tauri/png/${package_name}_32.ico" "src-tauri/icons/icon.ico" if [[ "$OSTYPE" =~ ^linux ]]; then echo "update desktop" diff --git a/icns2png.py b/icns2png.py index 6f71355..7de8b82 100644 --- a/icns2png.py +++ b/icns2png.py @@ -26,9 +26,9 @@ if __name__ == "__main__": image_32 = image.copy().resize((32, 32)) image_name = os.path.splitext(file)[0] image_512_path = os.path.join(png_dir, image_name + "_512.png") - image_32_path = os.path.join(png_dir, image_name + "_32.png") + image_32_path = os.path.join(png_dir, image_name + "_32.ico") image_512.save(image_512_path, "PNG") - image_32.save(image_32_path, "PNG") + image_32.save(image_32_path, "ICO") print("png file write success.") print(f"There are {len(os.listdir(png_dir))} png picture in ", png_dir) diff --git a/src-tauri/icons/icon.ico b/src-tauri/icons/icon.ico index 357d038..351c871 100644 Binary files a/src-tauri/icons/icon.ico and b/src-tauri/icons/icon.ico differ diff --git a/src-tauri/png/aliyuque_32.ico b/src-tauri/png/aliyuque_32.ico new file mode 100644 index 0000000..a993cf7 Binary files /dev/null and b/src-tauri/png/aliyuque_32.ico differ diff --git a/src-tauri/png/aliyuque_32.png b/src-tauri/png/aliyuque_32.png deleted file mode 100644 index 3f28185..0000000 Binary files a/src-tauri/png/aliyuque_32.png and /dev/null differ diff --git a/src-tauri/png/anymind_32.ico b/src-tauri/png/anymind_32.ico new file mode 100644 index 0000000..a66c510 Binary files /dev/null and b/src-tauri/png/anymind_32.ico differ diff --git a/src-tauri/png/anymind_32.png b/src-tauri/png/anymind_32.png deleted file mode 100644 index 298807a..0000000 Binary files a/src-tauri/png/anymind_32.png and /dev/null differ diff --git a/src-tauri/png/code_32.ico b/src-tauri/png/code_32.ico new file mode 100644 index 0000000..d3bc12f Binary files /dev/null and b/src-tauri/png/code_32.ico differ diff --git a/src-tauri/png/code_32.png b/src-tauri/png/code_32.png deleted file mode 100644 index a9bd2e7..0000000 Binary files a/src-tauri/png/code_32.png and /dev/null differ diff --git a/src-tauri/png/fanfou_32.ico b/src-tauri/png/fanfou_32.ico new file mode 100644 index 0000000..14b8e1d Binary files /dev/null and b/src-tauri/png/fanfou_32.ico differ diff --git a/src-tauri/png/fanfou_32.png b/src-tauri/png/fanfou_32.png deleted file mode 100644 index 779b0af..0000000 Binary files a/src-tauri/png/fanfou_32.png and /dev/null differ diff --git a/src-tauri/png/flomo_32.ico b/src-tauri/png/flomo_32.ico new file mode 100644 index 0000000..e1ecbeb Binary files /dev/null and b/src-tauri/png/flomo_32.ico differ diff --git a/src-tauri/png/flomo_32.png b/src-tauri/png/flomo_32.png deleted file mode 100644 index 02b1432..0000000 Binary files a/src-tauri/png/flomo_32.png and /dev/null differ diff --git a/src-tauri/png/fone_32.ico b/src-tauri/png/fone_32.ico new file mode 100644 index 0000000..b500385 Binary files /dev/null and b/src-tauri/png/fone_32.ico differ diff --git a/src-tauri/png/fone_32.png b/src-tauri/png/fone_32.png deleted file mode 100644 index b39a094..0000000 Binary files a/src-tauri/png/fone_32.png and /dev/null differ diff --git a/src-tauri/png/jdread_32.ico b/src-tauri/png/jdread_32.ico new file mode 100644 index 0000000..b1c54f3 Binary files /dev/null and b/src-tauri/png/jdread_32.ico differ diff --git a/src-tauri/png/jdread_32.png b/src-tauri/png/jdread_32.png deleted file mode 100644 index d15e07c..0000000 Binary files a/src-tauri/png/jdread_32.png and /dev/null differ diff --git a/src-tauri/png/jike_32.ico b/src-tauri/png/jike_32.ico new file mode 100644 index 0000000..b5a68aa Binary files /dev/null and b/src-tauri/png/jike_32.ico differ diff --git a/src-tauri/png/jike_32.png b/src-tauri/png/jike_32.png deleted file mode 100644 index b9fb48d..0000000 Binary files a/src-tauri/png/jike_32.png and /dev/null differ diff --git a/src-tauri/png/notion_32.ico b/src-tauri/png/notion_32.ico new file mode 100644 index 0000000..632bcf4 Binary files /dev/null and b/src-tauri/png/notion_32.ico differ diff --git a/src-tauri/png/notion_32.png b/src-tauri/png/notion_32.png deleted file mode 100644 index f274c9b..0000000 Binary files a/src-tauri/png/notion_32.png and /dev/null differ diff --git a/src-tauri/png/reference_32.ico b/src-tauri/png/reference_32.ico new file mode 100644 index 0000000..95bc857 Binary files /dev/null and b/src-tauri/png/reference_32.ico differ diff --git a/src-tauri/png/reference_32.png b/src-tauri/png/reference_32.png deleted file mode 100644 index 93c63c2..0000000 Binary files a/src-tauri/png/reference_32.png and /dev/null differ diff --git a/src-tauri/png/roam_32.ico b/src-tauri/png/roam_32.ico new file mode 100644 index 0000000..8dda778 Binary files /dev/null and b/src-tauri/png/roam_32.ico differ diff --git a/src-tauri/png/roam_32.png b/src-tauri/png/roam_32.png deleted file mode 100644 index cf8a796..0000000 Binary files a/src-tauri/png/roam_32.png and /dev/null differ diff --git a/src-tauri/png/tool_32.ico b/src-tauri/png/tool_32.ico new file mode 100644 index 0000000..a7bae8e Binary files /dev/null and b/src-tauri/png/tool_32.ico differ diff --git a/src-tauri/png/tool_32.png b/src-tauri/png/tool_32.png deleted file mode 100644 index 701914e..0000000 Binary files a/src-tauri/png/tool_32.png and /dev/null differ diff --git a/src-tauri/png/translate_32.ico b/src-tauri/png/translate_32.ico new file mode 100644 index 0000000..c9fe263 Binary files /dev/null and b/src-tauri/png/translate_32.ico differ diff --git a/src-tauri/png/translate_32.png b/src-tauri/png/translate_32.png deleted file mode 100644 index 7add941..0000000 Binary files a/src-tauri/png/translate_32.png and /dev/null differ diff --git a/src-tauri/png/twitter_32.ico b/src-tauri/png/twitter_32.ico new file mode 100644 index 0000000..396798b Binary files /dev/null and b/src-tauri/png/twitter_32.ico differ diff --git a/src-tauri/png/twitter_32.png b/src-tauri/png/twitter_32.png deleted file mode 100644 index a6a758c..0000000 Binary files a/src-tauri/png/twitter_32.png and /dev/null differ diff --git a/src-tauri/png/v2ex_32.ico b/src-tauri/png/v2ex_32.ico new file mode 100644 index 0000000..d852d2e Binary files /dev/null and b/src-tauri/png/v2ex_32.ico differ diff --git a/src-tauri/png/v2ex_32.png b/src-tauri/png/v2ex_32.png deleted file mode 100644 index 44f4352..0000000 Binary files a/src-tauri/png/v2ex_32.png and /dev/null differ diff --git a/src-tauri/png/vercel_32.ico b/src-tauri/png/vercel_32.ico new file mode 100644 index 0000000..59b4d77 Binary files /dev/null and b/src-tauri/png/vercel_32.ico differ diff --git a/src-tauri/png/vercel_32.png b/src-tauri/png/vercel_32.png deleted file mode 100644 index 937e84a..0000000 Binary files a/src-tauri/png/vercel_32.png and /dev/null differ diff --git a/src-tauri/png/weread_32.ico b/src-tauri/png/weread_32.ico new file mode 100644 index 0000000..351c871 Binary files /dev/null and b/src-tauri/png/weread_32.ico differ diff --git a/src-tauri/png/weread_32.png b/src-tauri/png/weread_32.png deleted file mode 100644 index 357d038..0000000 Binary files a/src-tauri/png/weread_32.png and /dev/null differ diff --git a/src-tauri/png/whatsapp_32.ico b/src-tauri/png/whatsapp_32.ico new file mode 100644 index 0000000..7327bd7 Binary files /dev/null and b/src-tauri/png/whatsapp_32.ico differ diff --git a/src-tauri/png/whatsapp_32.png b/src-tauri/png/whatsapp_32.png deleted file mode 100644 index 643f55e..0000000 Binary files a/src-tauri/png/whatsapp_32.png and /dev/null differ diff --git a/src-tauri/png/witeboard_32.ico b/src-tauri/png/witeboard_32.ico new file mode 100644 index 0000000..ab99a55 Binary files /dev/null and b/src-tauri/png/witeboard_32.ico differ diff --git a/src-tauri/png/witeboard_32.png b/src-tauri/png/witeboard_32.png deleted file mode 100644 index ecdbf23..0000000 Binary files a/src-tauri/png/witeboard_32.png and /dev/null differ diff --git a/src-tauri/png/youtube_32.ico b/src-tauri/png/youtube_32.ico new file mode 100644 index 0000000..33a6870 Binary files /dev/null and b/src-tauri/png/youtube_32.ico differ diff --git a/src-tauri/png/youtube_32.png b/src-tauri/png/youtube_32.png deleted file mode 100644 index a654fb0..0000000 Binary files a/src-tauri/png/youtube_32.png and /dev/null differ diff --git a/src-tauri/png/yuque_32.ico b/src-tauri/png/yuque_32.ico new file mode 100644 index 0000000..803c542 Binary files /dev/null and b/src-tauri/png/yuque_32.ico differ diff --git a/src-tauri/png/yuque_32.png b/src-tauri/png/yuque_32.png deleted file mode 100644 index a35df31..0000000 Binary files a/src-tauri/png/yuque_32.png and /dev/null differ diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 2d07a59..4d252c0 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -4,8 +4,6 @@ extern crate image; use tauri_utils::config::{Config, WindowConfig}; #[cfg(target_os = "macos")] use wry::application::platform::macos::WindowBuilderExtMacOS; -#[cfg(target_os = "windows")] -use wry::application::platform::windows::WindowBuilderExtWindows; #[cfg(target_os="macos")] use wry::{