diff --git a/src/main.ts b/src/main.ts index 6da73c1..bf042f9 100644 --- a/src/main.ts +++ b/src/main.ts @@ -23,6 +23,9 @@ app.whenReady().then(async () => { case "native": createNativeWindow(); break; + case "discord": + createNativeWindow(); + break; case "glasstron": dialog.showErrorBox( "Glasstron is unsupported.", diff --git a/src/settings/settings.html b/src/settings/settings.html index b74d94f..ec5149e 100644 --- a/src/settings/settings.html +++ b/src/settings/settings.html @@ -48,6 +48,7 @@ +
Client mod:
diff --git a/src/tray.ts b/src/tray.ts index 876755b..e1eedd6 100644 --- a/src/tray.ts +++ b/src/tray.ts @@ -1,38 +1,60 @@ -import {app, Menu, Tray} from "electron"; -import {mainWindow} from "./window"; +import { app, Menu, Tray } from "electron"; +import { mainWindow } from "./window"; +import { getConfig } from "./utils"; import * as path from "path"; -import {createSettingsWindow} from "./settings/main"; -let tray = null; -app.whenReady().then(() => { - tray = new Tray(path.join(__dirname, "../", "/assets/ac_plug.png")); - const contextMenu = Menu.buildFromTemplate([ - { - label: "Open ArmCord", - click: function () { - mainWindow.show(); +import { createSettingsWindow } from "./settings/main"; +let tray: any = null; +app.whenReady().then(async () => { + if (await getConfig("windowStyle") == "discord") { + tray = new Tray(path.join(__dirname, "../", "/assets/ac_plug.png")); + const contextMenu = Menu.buildFromTemplate([ + { + label: "Open ArmCord", + click: function () { + mainWindow.show(); + } + }, + { + label: "Quit ArmCord", + click: function () { + app.quit(); + } } - }, - { - label: "Open Settings", - click: function () { - createSettingsWindow(); - } - }, - { - label: "Support Discord Server", - click: function () { - mainWindow.show(); - mainWindow.loadURL("https://discord.gg/TnhxcqynZ2"); - } - }, - { - label: "Quit ArmCord", - click: function () { - app.quit(); - } - } - ]); + ]); - tray.setToolTip("ArmCord " + app.getVersion()); - tray.setContextMenu(contextMenu); + tray.setToolTip("Discord"); + tray.setContextMenu(contextMenu); + } else { + tray = new Tray(path.join(__dirname, "../", "/assets/ac_plug.png")); + const contextMenu = Menu.buildFromTemplate([ + { + label: "Open ArmCord", + click: function () { + mainWindow.show(); + } + }, + { + label: "Open Settings", + click: function () { + createSettingsWindow(); + } + }, + { + label: "Support Discord Server", + click: function () { + mainWindow.show(); + mainWindow.loadURL("https://discord.gg/TnhxcqynZ2"); + } + }, + { + label: "Quit ArmCord", + click: function () { + app.quit(); + } + } + ]); + + tray.setToolTip("ArmCord " + app.getVersion()); + tray.setContextMenu(contextMenu); + } });