Compare commits

..

No commits in common. "495a813af164ac44eb4707cb39b58a1bd0c62b03" and "4b4e72ccf42f8ab26e211b19c1397648719afbdf" have entirely different histories.

3 changed files with 33 additions and 59 deletions

View file

@ -23,9 +23,6 @@ app.whenReady().then(async () => {
case "native":
createNativeWindow();
break;
case "discord":
createNativeWindow();
break;
case "glasstron":
dialog.showErrorBox(
"Glasstron is unsupported.",

View file

@ -48,7 +48,6 @@
<option value="cumcord">Cumcord</option>
<option value="goosemod">GooseMod</option>
<option value="flicker">Flicker</option>
<option value="none">None</option>
</select>
<p class="header">Client mod:</p>
</div>

View file

@ -1,30 +1,9 @@
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();
}
}
]);
tray.setToolTip("Discord");
tray.setContextMenu(contextMenu);
} else {
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([
{
@ -56,5 +35,4 @@ app.whenReady().then(async () => {
tray.setToolTip("ArmCord " + app.getVersion());
tray.setContextMenu(contextMenu);
}
});