diff --git a/instance/main.js b/instance/main.js index c9702889cba23e43161e6fe8a8cf3d6421d5524a..14b697536d9171f7ecfa072e4e6614528413940a 100644 --- a/instance/main.js +++ b/instance/main.js @@ -19,7 +19,6 @@ const buttonList = [ [ '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' ], [ 'right', `<i class="fas fa-window-close"></i>`, 'closeButton', 'Quit Amadeus' ], ]; @@ -85,7 +84,6 @@ window.onload = () => { addIpcToButton('openKurisu', ['toggle-kurisu']); addIpcToButton('openUserView', ['toggle-client-view']); - addIpcToButton('reloadQueue', ['reload-queue-request']); setTimeout(() => ipcRenderer.send('reload-queue-request'), 1000); setInterval(() => ipcRenderer.send('verify-queue-reloaded-request'), 50); diff --git a/main.js b/main.js index db53eeb542b3b7c7ae6b6c4b66c78b156f5f1f52..a6966b581e9d585a6894d3eb07a833fb74af5209 100644 --- a/main.js +++ b/main.js @@ -75,6 +75,8 @@ function createInstanceWindow() { win = new BrowserWindow({ width: 1280, height: 720, + minWidth: 1200, + minHeight: 360, hasShadow: false, frame: false, menuBarVisible: true, @@ -87,6 +89,26 @@ function createInstanceWindow() { win.loadFile('instance/index.html'); } +function createUserViewWindow() { + /* User view window */ + const uv = new BrowserWindow({ + width: 720, + title: 'Kurisu', + height: 360, + frame: false, + parent: win, + webPreferences: { + nodeIntegration: true, + worldSafeExecuteJavaScript: true, + contextIsolation: true, + }, + }); + uv.loadURL(`http://localhost:${config.clientport}/`); + uv.once('ready-to-show', () => { + uv.show(); + }); +} + function createKurisuWindow() { /* Kurisu window */ const kurisu = new BrowserWindow({ @@ -162,10 +184,15 @@ app.on('ready', () => { ***************/ ipcMain.on('toggle-kurisu', (event, arg) => { - logger.debug('main', 'Toggle kurisu view'); + logger.debug('main', 'Open kurisu view'); createKurisuWindow(); }); +ipcMain.on('toggle-client-view', (event, arg) => { + logger.debug('main', 'Open client view'); + createUserViewWindow(); +}); + /********************************* * Messages from the main window * *********************************/