From 4291396ce113aaf78d8fee5de8690aafe89f943e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20G=C3=BCm=C3=BC=C5=9F?= <10urgumus@gmail.com> Date: Sun, 16 Jan 2022 11:53:22 +0300 Subject: [PATCH] Added thumbar buttons win32 taskbar controls and svg icons to png --- src/main/cider-base.js | 3 +++ src/main/mpris.js | 36 ++++++++++++++++++++++++++ src/main/thumbaricons/backwardPng.png | Bin 0 -> 3391 bytes src/main/thumbaricons/forwardPng.png | Bin 0 -> 3541 bytes src/main/thumbaricons/pausePng.png | Bin 0 -> 2462 bytes src/main/thumbaricons/playPng.png | Bin 0 -> 3953 bytes 6 files changed, 39 insertions(+) create mode 100644 src/main/thumbaricons/backwardPng.png create mode 100644 src/main/thumbaricons/forwardPng.png create mode 100644 src/main/thumbaricons/pausePng.png create mode 100644 src/main/thumbaricons/playPng.png diff --git a/src/main/cider-base.js b/src/main/cider-base.js index 4a9f3f86..856e58c3 100644 --- a/src/main/cider-base.js +++ b/src/main/cider-base.js @@ -268,6 +268,7 @@ const CiderBase = { win.webContents.setZoomFactor(screen.getPrimaryDisplay().scaleFactor) mpris.connect(win) + mpris.SetButtons(win, false) lastfm.authenticate() // Discord @@ -275,6 +276,7 @@ const CiderBase = { ipcMain.on('playbackStateDidChange', (_event, a) => { app.media = a; discord.updateActivity(a) + mpris.SetButtons(win, a) mpris.updateState(a) lastfm.scrobbleSong(a) lastfm.updateNowPlayingSong(a) @@ -283,6 +285,7 @@ const CiderBase = { ipcMain.on('nowPlayingItemDidChange', (_event, a) => { app.media = a; discord.updateActivity(a) + mpris.SetButtons(win, a) mpris.updateAttributes(a) lastfm.scrobbleSong(a) lastfm.updateNowPlayingSong(a) diff --git a/src/main/mpris.js b/src/main/mpris.js index 3c92e322..086945da 100644 --- a/src/main/mpris.js +++ b/src/main/mpris.js @@ -1,3 +1,6 @@ +const { nativeImage } = require("electron"); +const path = require('path') + let mediaPlayer = null; module.exports = { @@ -102,6 +105,39 @@ module.exports = { } }, + SetButtons: (win, attributes) => { + if (process.platform === 'win32') { // Set the Windows Thumbnail Toolbar Buttons + win.setThumbarButtons([ + { + tooltip: 'Previous', + icon: nativeImage.createFromPath(path.join(__dirname, 'thumbaricons/backwardPng.png')), + click() { + console.log("Clicked the bc taskbar button!") + win.webContents.executeJavaScript('MusicKitInterop.previousTrack()').catch(err => console.error(err)) + } + }, + { + tooltip: attributes.status ? 'Pause' : 'Play', + //tooltip: 'Play', + icon: attributes.status ? nativeImage.createFromPath(path.join(__dirname, 'thumbaricons/pausePng.png')) : nativeImage.createFromPath(path.join(__dirname, 'thumbaricons/playPng.png')), + click() { + console.log("Clicked the pl taskbar button!") + win.webContents.executeJavaScript('MusicKitInterop.pausePlay()').catch(err => console.error(err)) + } + }, + { + tooltip: 'Next', + icon: nativeImage.createFromPath(path.join(__dirname, 'thumbaricons/forwardPng.png')), + click() { + console.log("Clicked the fw taskbar button!") + win.webContents.executeJavaScript('MusicKitInterop.nextTrack()').catch(err => console.error(err)) + } + } + ]); + + } + }, + /** * Closes the MPRIS interface. */ diff --git a/src/main/thumbaricons/backwardPng.png b/src/main/thumbaricons/backwardPng.png new file mode 100644 index 0000000000000000000000000000000000000000..4c99640c653675b0770373508a313aa4eec6d5e3 GIT binary patch literal 3391 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 M?dSE|;=m*S1sizR-~a#s literal 0 HcmV?d00001 diff --git a/src/main/thumbaricons/pausePng.png b/src/main/thumbaricons/pausePng.png new file mode 100644 index 0000000000000000000000000000000000000000..428b380ad22f8ee1621a7640840af49d125c38c4 GIT binary patch literal 2462 zcmeHIX;V{Y6i$d33x#OGjTT}Tb*jTs6_rKef&#M2E&&q36|`D0pkQ*N9f}HS0fX#u z96?Ntz#tV#$qiai3??jM3=l6iF6@^OBnipAw>O{t0qqChc|V-@Ip@rI=gjk*b1^K$ z&&JBZia;RP1o-=g69_~JfnY&cK*Evlj6sKSATul|awq=8KA-=h1HH-CEAZ~KPlbm> z5Qr9}d6x67ZEPtE7une_c66ey_||3J`VH?FXPwVw@~-Zl-WPq!{((W& z>!IP1(XsJ~$tlgWcIM-(PH&hqnh>Sq+agc*PYk9q z><u)vq-|x(T6W~mD`M4}tf!TTM z;J8=I({ls`KLmVoM?eR@_o?YeJTEQHRpI==q%{rltXETluM9A1Y(zfIuWQMWsRSt# zaj&-k>MRD5KoRm>p@GfuE#t`d5eT8br$*EQZX=ta8w=9p|#Yf zB8DD47BeQBeQrHrtb+MxBQu)XV(4Jz7Z9jbH1{H!gCfp|QRm#}c-+7&!%fQUm`p+I zs$|Te6`^BXv|rT^%cqb+P_YOx#04r`-xwbtkvTIpJkiA&L>_-9xw-$5Bin>Vu)_G) z$UzWz$o+_9)T;{V(H%b%@7FkWbT6n!_={hsvb_%+F1i56}gEaoA}g+~a2Xnz)XF{>oWcQwY_V?(nW$axU3=FHY} zlytQY3UNBo;K7_jHJoWK8mlh5FoO(?4X-M-XoqR#TbR{9;#CTjB%i}p%Rnq?maDAh zYK*RjDEelzN2DaZH-`enTZXnpNc2dqlC;DOFl0_s_stQWf0+}A7V{P?T(Oml>)^BT zxe5PsCd5DHN|hggetTR*IOVg=45l8WobECMs&QgkFj1{DGn{3n{L%(;=SE9hQ|q!M zWV44Vb8_o7ht7@@?aaVcU7;MJrdkz)So$=#EK2>4j=$S!>X$S;ySIb%I>mMw2pnCh zGp$uWCu(&-iPuoBV5`O$`qp-Hv{}je!WUZCV{3@TAh3}oF$nx|C5MxPc*H#OSkRhu zFL}gHh*sz^#Eh!ZBQ5Y(a*SPT&qUGWi=->jZI>WORFZ*y-Exv^Fg|#~uIT}UYhqDU z-ZQ^kcxed;NY!_>uHN(|ZU9!ib_u-yP;Jxr-GAzqcM$^pY=LDjU5x}b?aL9K~f3t-|Z8Hn0OI~Re#lUkJz z28;fPmO`}dk<@zXYC(|{!s2t_oO>;?jfp7Qt@E0T7H4L%-MKF%=ty=5iljF?gc;1^ zeK7X~KHgK9!gGjSjEIHOYhy^x0066uDi1WnFRPDBCm9vN47gnbJ1rOf*5&YuwvNRa zmfLuH(A>jq?ljf`YE9sdvz(vb_0(VP3!_^bH;vB?&$+ogdoLe{B3U=w>w%+5?;k6r zY1&*NmeKyM&G1m#K$QjMMLCXQV#X(n&b<1tS&Fc)AipTD?k9Z15(0LH_}<&jJpV5P Ci^1Ul literal 0 HcmV?d00001 diff --git a/src/main/thumbaricons/playPng.png b/src/main/thumbaricons/playPng.png new file mode 100644 index 0000000000000000000000000000000000000000..8ece27c0f3dc2004d8a55f08c7bdb2113647af9b GIT binary patch literal 3953 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 YncUvEnHm}JCqTr}*3G8+fbXUM0CPQe=l}o! literal 0 HcmV?d00001