diff --git a/icon.png b/icon.png new file mode 100644 index 0000000..15980d6 Binary files /dev/null and b/icon.png differ diff --git a/lib/tray.ts b/lib/tray.ts index 4bfee29..610b340 100644 --- a/lib/tray.ts +++ b/lib/tray.ts @@ -1,4 +1,3 @@ -import { defaultWindowIcon } from '@tauri-apps/api/app' import { Menu } from '@tauri-apps/api/menu' import { MenuItem } from '@tauri-apps/api/menu' import { resolveResource } from '@tauri-apps/api/path' @@ -72,7 +71,7 @@ export async function initTray(): Promise { await TrayIcon.new({ id: 'main-tray', - icon: (await defaultWindowIcon())!, + icon: (await resolveResource('icons/favicon/icon.png'))!, tooltip: 'Rclone', menu, menuOnLeftClick: true, @@ -85,7 +84,7 @@ export async function initTray(): Promise { } export async function initLoadingTray() { - const iconPath = await resolveResource('icons/favicon/frame_00_delay-0.1s.png') + const globeIconPath = await resolveResource('icons/favicon/frame_00_delay-0.1s.png') const quitItem = await MenuItem.new({ id: 'quit-loading', @@ -106,7 +105,7 @@ export async function initLoadingTray() { const loadingTray = await TrayIcon.new({ id: 'loading-tray', - icon: iconPath, + icon: globeIconPath, menu: loadingMenu, }) @@ -116,10 +115,10 @@ export async function initLoadingTray() { if (currentIcon > 17) { currentIcon = 1 } - const iconPath = await resolveResource( + const globeIconPath = await resolveResource( `icons/favicon/frame_${currentIcon < 10 ? '0' : ''}${currentIcon}_delay-0.1s.png` ) - await loadingTray?.setIcon(iconPath) + await loadingTray?.setIcon(globeIconPath) currentIcon = currentIcon + 1 }, 200) } diff --git a/src-tauri/icons/128x128.png b/src-tauri/icons/128x128.png index 2cba092..b3da6ff 100644 Binary files a/src-tauri/icons/128x128.png and b/src-tauri/icons/128x128.png differ diff --git a/src-tauri/icons/128x128@2x.png b/src-tauri/icons/128x128@2x.png index b8a714b..77f7a36 100644 Binary files a/src-tauri/icons/128x128@2x.png and b/src-tauri/icons/128x128@2x.png differ diff --git a/src-tauri/icons/32x32.png b/src-tauri/icons/32x32.png index 2a71047..7992422 100644 Binary files a/src-tauri/icons/32x32.png and b/src-tauri/icons/32x32.png differ diff --git a/src-tauri/icons/64x64.png b/src-tauri/icons/64x64.png new file mode 100644 index 0000000..7ed040a Binary files /dev/null and b/src-tauri/icons/64x64.png differ diff --git a/src-tauri/icons/Square107x107Logo.png b/src-tauri/icons/Square107x107Logo.png index 847f913..525cb42 100644 Binary files a/src-tauri/icons/Square107x107Logo.png and b/src-tauri/icons/Square107x107Logo.png differ diff --git a/src-tauri/icons/Square142x142Logo.png b/src-tauri/icons/Square142x142Logo.png index 23d8632..064b004 100644 Binary files a/src-tauri/icons/Square142x142Logo.png and b/src-tauri/icons/Square142x142Logo.png differ diff --git a/src-tauri/icons/Square150x150Logo.png b/src-tauri/icons/Square150x150Logo.png index dafecb9..3705a53 100644 Binary files a/src-tauri/icons/Square150x150Logo.png and b/src-tauri/icons/Square150x150Logo.png differ diff --git a/src-tauri/icons/Square284x284Logo.png b/src-tauri/icons/Square284x284Logo.png index 31f42c8..0ca3670 100644 Binary files a/src-tauri/icons/Square284x284Logo.png and b/src-tauri/icons/Square284x284Logo.png differ diff --git a/src-tauri/icons/Square30x30Logo.png b/src-tauri/icons/Square30x30Logo.png index e56efbe..9bbc87d 100644 Binary files a/src-tauri/icons/Square30x30Logo.png and b/src-tauri/icons/Square30x30Logo.png differ diff --git a/src-tauri/icons/Square310x310Logo.png b/src-tauri/icons/Square310x310Logo.png index 841afc6..cfbeb0b 100644 Binary files a/src-tauri/icons/Square310x310Logo.png and b/src-tauri/icons/Square310x310Logo.png differ diff --git a/src-tauri/icons/Square44x44Logo.png b/src-tauri/icons/Square44x44Logo.png index b813885..95e0124 100644 Binary files a/src-tauri/icons/Square44x44Logo.png and b/src-tauri/icons/Square44x44Logo.png differ diff --git a/src-tauri/icons/Square71x71Logo.png b/src-tauri/icons/Square71x71Logo.png index 15ed173..a67b712 100644 Binary files a/src-tauri/icons/Square71x71Logo.png and b/src-tauri/icons/Square71x71Logo.png differ diff --git a/src-tauri/icons/Square89x89Logo.png b/src-tauri/icons/Square89x89Logo.png index 7132d25..477b92f 100644 Binary files a/src-tauri/icons/Square89x89Logo.png and b/src-tauri/icons/Square89x89Logo.png differ diff --git a/src-tauri/icons/StoreLogo.png b/src-tauri/icons/StoreLogo.png index 9bdc616..066ec1f 100644 Binary files a/src-tauri/icons/StoreLogo.png and b/src-tauri/icons/StoreLogo.png differ diff --git a/src-tauri/icons/favicon/icon.png b/src-tauri/icons/favicon/icon.png new file mode 100644 index 0000000..5688a6e Binary files /dev/null and b/src-tauri/icons/favicon/icon.png differ diff --git a/src-tauri/icons/icon.icns b/src-tauri/icons/icon.icns index c0d83eb..c1859a1 100644 Binary files a/src-tauri/icons/icon.icns and b/src-tauri/icons/icon.icns differ diff --git a/src-tauri/icons/icon.ico b/src-tauri/icons/icon.ico index 74c834b..e318ebf 100644 Binary files a/src-tauri/icons/icon.ico and b/src-tauri/icons/icon.ico differ diff --git a/src-tauri/icons/icon.png b/src-tauri/icons/icon.png index 5688a6e..fc9d45c 100644 Binary files a/src-tauri/icons/icon.png and b/src-tauri/icons/icon.png differ diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 59ee319..24946e6 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -41,6 +41,7 @@ "icons/icon.ico" ], "resources": [ + "icons/favicon/icon.png", "icons/favicon/frame_00_delay-0.1s.png", "icons/favicon/frame_01_delay-0.1s.png", "icons/favicon/frame_02_delay-0.1s.png",