diff --git a/src/main/ipc.ts b/src/main/ipc.ts index 46afde5..8fad6b0 100644 --- a/src/main/ipc.ts +++ b/src/main/ipc.ts @@ -18,7 +18,7 @@ import { IpcEvents } from "../shared/IpcEvents"; import { setBadgeCount } from "./appBadge"; import { autoStart } from "./autoStart"; import { VENCORD_FILES_DIR, VENCORD_QUICKCSS_FILE, VENCORD_THEMES_DIR } from "./constants"; -import { mainWin } from "./mainWindow"; +import { mainWin, getTrayIcon } from "./mainWindow"; import { Settings } from "./settings"; import { handle, handleSync } from "./utils/ipcWrappers"; import { PopoutWindows } from "./utils/popout"; @@ -121,20 +121,6 @@ handle(IpcEvents.SELECT_VENCORD_DIR, async () => { return dir; }); -handle(IpcEvents.SELECT_TRAY_ICON, async () => { - const res = await dialog.showOpenDialog(mainWin!, { - properties: ["openFile"], - filters: [{name: "Image", extensions: ["png", "jpg"]}] - }); - if (!res.filePaths.length) return "cancelled"; - - const dir = res.filePaths[0]; - const image = nativeImage.createFromPath(dir); - if(image.isEmpty()) return "invalid"; - - return dir; -}); - handle(IpcEvents.SET_BADGE_COUNT, (_, count: number) => setBadgeCount(count)); handle(IpcEvents.CLIPBOARD_COPY_IMAGE, async (_, buf: ArrayBuffer, src: string) => { diff --git a/src/preload/VesktopNative.ts b/src/preload/VesktopNative.ts index 467bfb6..184b095 100644 --- a/src/preload/VesktopNative.ts +++ b/src/preload/VesktopNative.ts @@ -33,8 +33,7 @@ export const VesktopNative = { }, fileManager: { showItemInFolder: (path: string) => invoke(IpcEvents.SHOW_ITEM_IN_FOLDER, path), - selectVencordDir: () => invoke>(IpcEvents.SELECT_VENCORD_DIR), - selectTrayIcon: () => invoke>(IpcEvents.SELECT_TRAY_ICON) + selectVencordDir: () => invoke>(IpcEvents.SELECT_VENCORD_DIR) }, settings: { get: () => sendSync(IpcEvents.GET_SETTINGS), diff --git a/src/renderer/components/settings/TrayIconImagePicker.tsx b/src/renderer/components/settings/TrayIconImagePicker.tsx deleted file mode 100644 index 352e51e..0000000 --- a/src/renderer/components/settings/TrayIconImagePicker.tsx +++ /dev/null @@ -1,62 +0,0 @@ -/* - * SPDX-License-Identifier: GPL-3.0 - * Vesktop, a desktop app aiming to give you a snappier Discord Experience - * Copyright (c) 2023 Vendicated and Vencord contributors - */ - -import { Button, Forms, Toasts } from "@vencord/types/webpack/common"; - -import { SettingsComponent } from "./Settings"; - -export const TrayIconImagePicker: SettingsComponent = ({ settings }) => { - return ( - <> - - Tray icon is currently {" "} - {settings.trayIconPath ? ( - { - e.preventDefault(); - VesktopNative.fileManager.showItemInFolder(settings.trayIconPath!); - }} - > - {settings.trayIconPath} - - ) : ( - "the default location" - )} - -
- - -
- - ); -}; diff --git a/src/shared/IpcEvents.ts b/src/shared/IpcEvents.ts index 407403b..df64403 100644 --- a/src/shared/IpcEvents.ts +++ b/src/shared/IpcEvents.ts @@ -24,7 +24,6 @@ export const enum IpcEvents { SET_SETTINGS = "VCD_SET_SETTINGS", SELECT_VENCORD_DIR = "VCD_SELECT_VENCORD_DIR", - SELECT_TRAY_ICON = "VCD_SELECT_TRAY_ICON", UPDATER_GET_DATA = "VCD_UPDATER_GET_DATA", UPDATER_DOWNLOAD = "VCD_UPDATER_DOWNLOAD",