From 02bd04e3a595f374d527468685eb7be7e6b4d82f Mon Sep 17 00:00:00 2001
From: MrGarlic <bsamans@samans.com>
Date: Sun, 5 May 2024 14:24:13 -0400
Subject: [PATCH] moved tray icon option from Vesktop settings to tray context
 menu item

---
 src/main/mainWindow.ts                        | 62 ++++++++++++++++---
 src/renderer/components/settings/Settings.tsx |  3 +-
 2 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/src/main/mainWindow.ts b/src/main/mainWindow.ts
index 58b580a..fc04402 100644
--- a/src/main/mainWindow.ts
+++ b/src/main/mainWindow.ts
@@ -102,6 +102,21 @@ function initTray(win: BrowserWindow) {
                 await clearData(win);
             }
         },
+        {
+            label: "Change Tray Icon",
+            async click() {
+                await setTrayIcon();
+                /*
+                switch (choice) {
+                    case "invalid":
+                        return;
+                    case "cancelled":
+                        return;
+                }
+                Settings.store.trayIconPath = choice;
+                */
+            }
+        },
         {
             type: "separator"
         },
@@ -120,12 +135,7 @@ function initTray(win: BrowserWindow) {
             }
         }
     ]);
-    tray = new Tray(ICON_PATH);
-    if (Settings.store.trayIconPath) {
-        const trayImage = nativeImage.createFromPath(Settings.store.trayIconPath);
-        if (!trayImage.isEmpty()) tray.setImage(trayImage.resize({width: 32, height: 32}));
-    }
-    
+    tray = new Tray(getTrayIcon());
     tray.setToolTip("Vesktop");
     tray.setContextMenu(trayMenu);
     tray.on("click", onTrayClick);
@@ -277,7 +287,7 @@ function getWindowBoundsOptions(): BrowserWindowConstructorOptions {
         options.x = x;
         options.y = y;
     }
-    
+
     if (!Settings.store.disableMinSize) {
         options.minWidth = MIN_WIDTH;
         options.minHeight = MIN_HEIGHT;
@@ -486,3 +496,41 @@ export async function createWindows() {
 
     initArRPC();
 }
+
+export function getTrayIcon(): string {
+    if (Settings.store.trayIconPath) {
+        const trayImage = nativeImage.createFromPath(Settings.store.trayIconPath);
+        if (!trayImage.isEmpty()) return Settings.store.trayIconPath;
+    }
+
+    return ICON_PATH;
+}
+
+async function setTrayIcon(): Promise<undefined> {
+    const userSelection = await dialog.showMessageBox(mainWin!, {
+        type: "question",
+        title: "Change/Reset tray icon",
+        message: "Would you like to change or reset the Vesktop tray icon?",
+        buttons: ["Change", "Reset"],
+        defaultId: 0,
+        cancelId: 2,
+        icon: getTrayIcon()
+    });
+    if (userSelection.response == 2) return;
+    if (userSelection.response == 1) {
+        Settings.store.trayIconPath = void 0;
+        return;
+    }
+    const res = await dialog.showOpenDialog(mainWin!, {
+        properties: ["openFile"],
+        filters: [{ name: "Image", extensions: ["png", "jpg"] }],
+        defaultPath: getTrayIcon()
+    });
+    if (!res.filePaths.length) return;
+
+    const dir = res.filePaths[0];
+    const image = nativeImage.createFromPath(dir);
+    if (image.isEmpty()) return;
+
+    Settings.store.trayIconPath = dir;
+}
diff --git a/src/renderer/components/settings/Settings.tsx b/src/renderer/components/settings/Settings.tsx
index 3127308..c162c26 100644
--- a/src/renderer/components/settings/Settings.tsx
+++ b/src/renderer/components/settings/Settings.tsx
@@ -127,8 +127,7 @@ const SettingsOptions: Record<string, Array<BooleanSetting | SettingsComponent>>
             defaultValue: false
         }
     ],
-    "Tray Icon Image": [TrayIconImagePicker],
-    "Vencord Location": [VencordLocationPicker],
+    "Tray Icon Image": [TrayIconImagePicker]
 };
 
 function SettingsSections() {