diff --git a/src/main.ts b/src/main.ts index bf042f9..6da73c1 100644 --- a/src/main.ts +++ b/src/main.ts @@ -23,9 +23,6 @@ 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 ec5149e..b74d94f 100644 --- a/src/settings/settings.html +++ b/src/settings/settings.html @@ -48,7 +48,6 @@ -

Client mod:

diff --git a/src/tray.ts b/src/tray.ts index e1eedd6..876755b 100644 --- a/src/tray.ts +++ b/src/tray.ts @@ -1,60 +1,38 @@ -import { app, Menu, Tray } from "electron"; -import { mainWindow } from "./window"; -import { getConfig } from "./utils"; +import {app, Menu, Tray} from "electron"; +import {mainWindow} from "./window"; import * as path from "path"; -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(); - } +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(); } - ]); - - 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(); - } + }, + { + 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("ArmCord " + app.getVersion()); + tray.setContextMenu(contextMenu); });