diff --git a/assets/data/icons/generate_ico.sh b/assets/data/icons/generate_ico.sh index ef67adf3..acfd61e2 100644 --- a/assets/data/icons/generate_ico.sh +++ b/assets/data/icons/generate_ico.sh @@ -1,14 +1,14 @@ #!/bin/sh # Traymenu icons. Sometimes the wrong size is selected, so leave just one. -convert pm_dark_green_512.png -colors 256 -define icon:auto-resize=64 pm_dark_green.ico -convert pm_dark_blue_512.png -colors 256 -define icon:auto-resize=64 pm_dark_blue.ico -convert pm_dark_red_512.png -colors 256 -define icon:auto-resize=64 pm_dark_red.ico -convert pm_dark_yellow_512.png -colors 256 -define icon:auto-resize=64 pm_dark_yellow.ico -convert pm_light_blue_512.png -colors 256 -define icon:auto-resize=64 pm_light_blue.ico -convert pm_light_green_512.png -colors 256 -define icon:auto-resize=64 pm_light_green.ico -convert pm_light_red_512.png -colors 256 -define icon:auto-resize=64 pm_light_red.ico -convert pm_light_yellow_512.png -colors 256 -define icon:auto-resize=64 pm_light_yellow.ico +convert pm_dark_green_512.png -resize 64x64 pm_dark_green_64.png +convert pm_dark_blue_512.png -resize 64x64 pm_dark_blue_64.png +convert pm_dark_red_512.png -resize 64x64 pm_dark_red_64.png +convert pm_dark_yellow_512.png -resize 64x64 pm_dark_yellow_64.png +convert pm_light_blue_512.png -resize 64x64 pm_light_blue_64.png +convert pm_light_green_512.png -resize 64x64 pm_light_green_64.png +convert pm_light_red_512.png -resize 64x64 pm_light_red_64.png +convert pm_light_yellow_512.png -resize 64x64 pm_light_yellow_64.png convert pm_dark_512.png -colors 256 -define icon:auto-resize=64,48,32,16 pm_dark.ico convert pm_light_512.png -colors 256 -define icon:auto-resize=64,48,32,16 pm_light.ico diff --git a/assets/data/icons/pm_dark_blue.png b/assets/data/icons/pm_dark_blue.png new file mode 100644 index 00000000..4b40e7ac Binary files /dev/null and b/assets/data/icons/pm_dark_blue.png differ diff --git a/assets/data/icons/pm_dark_blue_64.png b/assets/data/icons/pm_dark_blue_64.png new file mode 100644 index 00000000..808ffb18 Binary files /dev/null and b/assets/data/icons/pm_dark_blue_64.png differ diff --git a/assets/data/icons/pm_dark_green_64.png b/assets/data/icons/pm_dark_green_64.png new file mode 100644 index 00000000..7f21cc72 Binary files /dev/null and b/assets/data/icons/pm_dark_green_64.png differ diff --git a/assets/data/icons/pm_dark_red.png b/assets/data/icons/pm_dark_red.png new file mode 100644 index 00000000..65a66ffe Binary files /dev/null and b/assets/data/icons/pm_dark_red.png differ diff --git a/assets/data/icons/pm_dark_red_64.png b/assets/data/icons/pm_dark_red_64.png new file mode 100644 index 00000000..85ab38f0 Binary files /dev/null and b/assets/data/icons/pm_dark_red_64.png differ diff --git a/assets/data/icons/pm_dark_yellow.png b/assets/data/icons/pm_dark_yellow.png new file mode 100644 index 00000000..57c29eff Binary files /dev/null and b/assets/data/icons/pm_dark_yellow.png differ diff --git a/assets/data/icons/pm_dark_yellow_64.png b/assets/data/icons/pm_dark_yellow_64.png new file mode 100644 index 00000000..7b98f3a4 Binary files /dev/null and b/assets/data/icons/pm_dark_yellow_64.png differ diff --git a/assets/data/icons/pm_light_blue.png b/assets/data/icons/pm_light_blue.png new file mode 100644 index 00000000..ba607e5b Binary files /dev/null and b/assets/data/icons/pm_light_blue.png differ diff --git a/assets/data/icons/pm_light_blue_64.png b/assets/data/icons/pm_light_blue_64.png new file mode 100644 index 00000000..7dfce1d1 Binary files /dev/null and b/assets/data/icons/pm_light_blue_64.png differ diff --git a/assets/data/icons/pm_light_green.png b/assets/data/icons/pm_light_green.png new file mode 100644 index 00000000..f7333b34 Binary files /dev/null and b/assets/data/icons/pm_light_green.png differ diff --git a/assets/data/icons/pm_light_green_64.png b/assets/data/icons/pm_light_green_64.png new file mode 100644 index 00000000..710e6c0c Binary files /dev/null and b/assets/data/icons/pm_light_green_64.png differ diff --git a/assets/data/icons/pm_light_red.png b/assets/data/icons/pm_light_red.png new file mode 100644 index 00000000..c31c5b24 Binary files /dev/null and b/assets/data/icons/pm_light_red.png differ diff --git a/assets/data/icons/pm_light_red_64.png b/assets/data/icons/pm_light_red_64.png new file mode 100644 index 00000000..e6aa7935 Binary files /dev/null and b/assets/data/icons/pm_light_red_64.png differ diff --git a/assets/data/icons/pm_light_yellow.png b/assets/data/icons/pm_light_yellow.png new file mode 100644 index 00000000..f68d5126 Binary files /dev/null and b/assets/data/icons/pm_light_yellow.png differ diff --git a/assets/data/icons/pm_light_yellow_64.png b/assets/data/icons/pm_light_yellow_64.png new file mode 100644 index 00000000..1e1c7e62 Binary files /dev/null and b/assets/data/icons/pm_light_yellow_64.png differ diff --git a/desktop/tauri/src-tauri/src/traymenu.rs b/desktop/tauri/src-tauri/src/traymenu.rs index 0fbd8912..b3fef2ba 100644 --- a/desktop/tauri/src-tauri/src/traymenu.rs +++ b/desktop/tauri/src-tauri/src/traymenu.rs @@ -44,9 +44,9 @@ const PM_TRAY_ICON_ID: &'static str = "pm_icon"; fn get_green_icon() -> &'static [u8] { const LIGHT_GREEN_ICON: &'static [u8] = - include_bytes!("../../../../assets/data/icons/pm_light_green.ico"); + include_bytes!("../../../../assets/data/icons/pm_light_green_64.png"); const DARK_GREEN_ICON: &'static [u8] = - include_bytes!("../../../../assets/data/icons/pm_dark_green.ico"); + include_bytes!("../../../../assets/data/icons/pm_dark_green_64.png"); let mode = dark_light::detect(); match mode { @@ -57,9 +57,9 @@ fn get_green_icon() -> &'static [u8] { fn get_blue_icon() -> &'static [u8] { const LIGHT_BLUE_ICON: &'static [u8] = - include_bytes!("../../../../assets/data/icons/pm_light_blue.ico"); + include_bytes!("../../../../assets/data/icons/pm_light_blue_64.png"); const DARK_BLUE_ICON: &'static [u8] = - include_bytes!("../../../../assets/data/icons/pm_dark_blue.ico"); + include_bytes!("../../../../assets/data/icons/pm_dark_blue_64.png"); let mode = dark_light::detect(); match mode { dark_light::Mode::Light => DARK_BLUE_ICON, @@ -69,9 +69,9 @@ fn get_blue_icon() -> &'static [u8] { fn get_red_icon() -> &'static [u8] { const LIGHT_RED_ICON: &'static [u8] = - include_bytes!("../../../../assets/data/icons/pm_light_red.ico"); + include_bytes!("../../../../assets/data/icons/pm_light_red_64.png"); const DARK_RED_ICON: &'static [u8] = - include_bytes!("../../../../assets/data/icons/pm_dark_red.ico"); + include_bytes!("../../../../assets/data/icons/pm_dark_red_64.png"); let mode = dark_light::detect(); match mode { dark_light::Mode::Light => DARK_RED_ICON, @@ -81,10 +81,10 @@ fn get_red_icon() -> &'static [u8] { fn get_yellow_icon() -> &'static [u8] { const LIGHT_YELLOW_ICON: &'static [u8] = - include_bytes!("../../../../assets/data/icons/pm_light_yellow.ico"); + include_bytes!("../../../../assets/data/icons/pm_light_yellow_64.png"); const DARK_YELLOW_ICON: &'static [u8] = - include_bytes!("../../../../assets/data/icons/pm_dark_yellow.ico"); + include_bytes!("../../../../assets/data/icons/pm_dark_yellow_64.png"); let mode = dark_light::detect(); match mode { dark_light::Mode::Light => DARK_YELLOW_ICON,