From b902fa1f6aa27e8ee019406260e3589bca4a92c6 Mon Sep 17 00:00:00 2001 From: Kubat <mael.martin31@gmail.com> Date: Fri, 6 Nov 2020 23:18:53 +0100 Subject: [PATCH] Add the kurisu button --- instance/main.js | 2 ++ main.js | 31 ++++++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/instance/main.js b/instance/main.js index d09f36a..a490a12 100644 --- a/instance/main.js +++ b/instance/main.js @@ -14,6 +14,7 @@ const buttonList = [ [ 'sleft', `<i class="fas fa-tag"></i>`, 'selectPlaylist', 'Playlist search' ], [ 'sleft', `<i class="fas fa-bookmark"></i>`, 'selectPool', 'Pool search' ], + [ 'right', `<i class="fas fa-compass"></i>`, 'openKurisu', 'Kurisu in a new page' ], [ 'right', `<i class="fas fa-user-friends"></i>`, 'openUserView', 'Open client view' ], [ 'right', `<i class="fas fa-music"></i>`, 'openMdtView', 'Open metadata view' ], [ 'right', `<i class="fas fa-sync-alt"></i>`, 'reloadQueue', 'Reload the queue' ], @@ -43,6 +44,7 @@ window.onload = () => { addIpcToButton('selectPool', ['select-pool']); addIpcToButton('openMdtView', ['select-mdt']); + addIpcToButton('openKurisu', ['toggle-kurisu']); addIpcToButton('openUserView', ['toggle-client-view']); addIpcToButton('reloadQueue', ['reload-queue-request']); addIpcToButton('reloadDb', ['reload-db-request', 'reload-queue-request']); diff --git a/main.js b/main.js index 5241605..67c8418 100644 --- a/main.js +++ b/main.js @@ -12,6 +12,8 @@ var lektor_closed = false; /* Is lektord closed? */ var myDb = new db('/home/kara/kara.db'); +var win = null; /* The main window */ + /********************** * Reinit the logfile * **********************/ @@ -28,7 +30,7 @@ tail.on('line', function (data) { function createInstanceWindow() { /* Main window */ - const win = new BrowserWindow({ + win = new BrowserWindow({ width: 1280, height: 720, hasShadow: false, @@ -41,6 +43,24 @@ function createInstanceWindow() { win.loadFile('instance/index.html'); } +function createKurisuWindow() { + /* Main window */ + const kurisu = new BrowserWindow({ + width: 1280, + title: 'Kurisu', + height: 720, + frame: false, + parent: win, + webPreferences: { + nodeIntegration: true, + }, + }); + kurisu.loadURL('https://dev-kurisu.iiens.net'); + kurisu.once('ready-to-show', () => { + kurisu.show(); + }); +} + /****************************** * The end of the application * ******************************/ @@ -133,6 +153,15 @@ app.on('ready', () => { }); }); +/*************** + * Kurisu View * + ***************/ + +ipcMain.on('toggle-kurisu', (event, arg) => { + logger.debug('main', 'Toggle kurisu view'); + createKurisuWindow(); +}); + /********************************* * Messages from the main window * *********************************/ -- GitLab