diff --git a/src/main/index.js b/src/main/index.js index 5097293..70f0ec2 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -97,6 +97,7 @@ function hearthbeat(){ function registerChannel(){ ipcMain.on('server', (event, data) => windows.server.webContents.send('server', data) ) ipcMain.on('server-show', () => windows.server.show() ) + ipcMain.on('show', (event, data) => showWindow(data) ) ipcMain.on('main', (event, data) => windows.main.webContents.send('main', data) ) ipcMain.on('main-error', (event, data) => windows.main.webContents.send('main-error', data) ) @@ -105,7 +106,7 @@ function registerChannel(){ ipcMain.on('ps4', (event, data) => windows.ps4.webContents.send('ps4', data) ) ipcMain.on('error', (event, data) => windows.main.webContents.send('error', data) ) - ipcMain.on('notify', (event, data) => notify(data)) + ipcMain.on('notify', (event, data) => notify(data) ) ipcMain.on('quit', () => app.quit() ) } @@ -135,7 +136,17 @@ function notify(data){ new Notification(data).show() } +// show window +function showWindow(data){ + if(data == 'ps4') + windows.ps4.show() + if(data == 'server') + windows.server.show() + + if(data == 'info') + windows.info.show() +} // quit application when all windows are closed app.on('window-all-closed', () => { diff --git a/src/renderer/App.vue b/src/renderer/App.vue index cc22fb7..a26d5ce 100644 --- a/src/renderer/App.vue +++ b/src/renderer/App.vue @@ -83,6 +83,10 @@ export default { ipcRenderer.send('server-show') }, + show(data){ + ipcRenderer.send('show', data) + }, + sendMain(msg){ console.log('sending to main', msg) ipcRenderer.send('main', msg) diff --git a/src/renderer/layout/DefaultLayout.vue b/src/renderer/layout/DefaultLayout.vue index f1a3541..789f619 100644 --- a/src/renderer/layout/DefaultLayout.vue +++ b/src/renderer/layout/DefaultLayout.vue @@ -31,12 +31,12 @@ Settings
- + - Local Server - PS4 API Logs - Info + Open Local Server + Open PS4 API Logs + Info @@ -119,6 +119,10 @@ export default { }); }, + handleViewCallback(view){ + ipcRenderer.send('show', view) + }, + } } diff --git a/src/renderer/scss/titlebar.scss b/src/renderer/scss/titlebar.scss index 228fd4f..45a812f 100644 --- a/src/renderer/scss/titlebar.scss +++ b/src/renderer/scss/titlebar.scss @@ -34,6 +34,10 @@ $titleBarColorDark: #0c0c0c; height: 40px; width: 40px; margin-top: 2px; + + &:focus { + outline: none !important; + } } &:focus { diff --git a/static/assets/rpsV2.png b/static/assets/rpsV2.png new file mode 100644 index 0000000..4350ed3 Binary files /dev/null and b/static/assets/rpsV2.png differ diff --git a/static/assets/rpsV2.svg b/static/assets/rpsV2.svg new file mode 100644 index 0000000..ca43a3b --- /dev/null +++ b/static/assets/rpsV2.svg @@ -0,0 +1,121 @@ + + Neues Projekt + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file