From e5dd8cb87a459311730595aa6f06cd4796d9d60d Mon Sep 17 00:00:00 2001 From: Mastermindzh Date: Wed, 30 Oct 2019 21:43:52 +0100 Subject: [PATCH] added temp tray and renamed mediaKeysModule --- src/main.js | 7 +++++-- src/preload.js | 8 ++++---- src/scripts/{media-keys.js => mediaKeys.js} | 4 ++-- src/scripts/tray.js | 20 ++++++++++++++++++++ 4 files changed, 31 insertions(+), 8 deletions(-) rename src/scripts/{media-keys.js => mediaKeys.js} (60%) create mode 100644 src/scripts/tray.js diff --git a/src/main.js b/src/main.js index c7a98ad..e3a7815 100644 --- a/src/main.js +++ b/src/main.js @@ -1,7 +1,8 @@ const { app, BrowserWindow, globalShortcut } = require("electron"); const path = require("path"); const tidalUrl = "https://listen.tidal.com"; -const mediaKeys = require("./scripts/media-keys"); +const trayModule = require("./scripts/tray"); +const mediaKeysModule = require("./scripts/mediaKeys"); let mainWindow; let icon = path.join(__dirname, "../assets/icon.png"); @@ -46,7 +47,7 @@ function createWindow(options = {}) { } function addGlobalShortcuts() { - Object.values(mediaKeys).forEach((key) => { + Object.values(mediaKeysModule).forEach((key) => { globalShortcut.register(key, () => { mainWindow.webContents.send("globalKey", key); }); @@ -60,6 +61,8 @@ app.on("ready", () => { // window with white backround createWindow(); addGlobalShortcuts(); + trayModule.addTray({ icon }); + trayModule.refreshTray(); }); app.on("activate", function() { diff --git a/src/preload.js b/src/preload.js index 07b9352..dee6f30 100644 --- a/src/preload.js +++ b/src/preload.js @@ -1,7 +1,7 @@ const { setTitle, getTitle } = require("./scripts/window-functions"); const { dialog } = require("electron").remote; const hotkeys = require("./scripts/hotkeys"); -const mediaKeys = require("./scripts/media-keys"); +const mediaKeysModule = require("./scripts/mediaKeys"); const notifier = require("node-notifier"); const { ipcRenderer } = require("electron"); const { app } = require("electron").remote; @@ -189,13 +189,13 @@ function addIPCEventListeners() { ipcRenderer.on("globalEvent", (event, args) => { switch (args) { - case mediaKeys.playPause: + case mediaKeysModule.playPause: playPause(); break; - case mediaKeys.next: + case mediaKeysModule.next: elements.click("next"); break; - case mediaKeys.previous: + case mediaKeysModule.previous: elements.click("previous"); break; } diff --git a/src/scripts/media-keys.js b/src/scripts/mediaKeys.js similarity index 60% rename from src/scripts/media-keys.js rename to src/scripts/mediaKeys.js index 7f13af7..e94bde2 100644 --- a/src/scripts/media-keys.js +++ b/src/scripts/mediaKeys.js @@ -1,7 +1,7 @@ -const mediaKeys = { +const mediaKeysModule = { play: "MediaPlayPause", next: "MediaNextTrack", previous: "MediaPreviousTrack", }; -module.exports = mediaKeys; +module.exports = mediaKeysModule; diff --git a/src/scripts/tray.js b/src/scripts/tray.js new file mode 100644 index 0000000..9099581 --- /dev/null +++ b/src/scripts/tray.js @@ -0,0 +1,20 @@ +const { Tray, Menu } = require("electron"); +const trayModule = {}; +let tray; + +trayModule.addTray = function(options = { icon: "" }) { + tray = new Tray(options.icon); +}; + +trayModule.refreshTray = function() { + const contextMenu = Menu.buildFromTemplate([ + { label: "Item1", type: "radio" }, + { label: "Item2", type: "radio" }, + { label: "Item3", type: "radio", checked: true }, + { label: "Item4", type: "radio" }, + ]); + tray.setToolTip("This is my application."); + tray.setContextMenu(contextMenu); +}; + +module.exports = trayModule;