diff --git a/instance/main.js b/instance/main.js index fcd19a39ca20ef8edfb0beaa4c7b9743118ad6de..a56640e3aad77fa44e87aa87e4602919e5316b60 100644 --- a/instance/main.js +++ b/instance/main.js @@ -8,11 +8,8 @@ const buttonList = [ [ "right", "Quit LektorApp", "closeButton" ], ]; -const karaJSON = require('../test/dummyKara.json'); - window.onload = () => { createButtonList(buttonList); - // karaList(karaJSON); document.getElementById("closeButton").addEventListener('click', () => { ipcRenderer.send('close-app') @@ -32,6 +29,7 @@ window.onload = () => { logger.debug("Window loaded"); }; +/* Create the button list */ function createButtonList(list) { var renderHtmlLeft = ""; var renderHtmlRight = ""; @@ -54,19 +52,11 @@ function createButtonList(list) { } ipcRenderer.on("reload-db-responce", (event, arg) => { - logger.debug(`Web page got reload-db`); - document.getElementById("panelLeft").innerHTML = arg; -}); - -function karaList(karas) { var karaList = ""; - var playingList = ""; - karas.forEach( (kara) => { - if (kara.author_name === "Sting") { - playingList += '<div class="card shadow" style="margin: 5px; border-radius: 10px; margin: 20px 0px 20px 0px;"><div class="card-body">' + kara.source_name + ' - ' + kara.song_name + '</div></div>'; - } - karaList += '<div class="card shadow" style="margin: 5px; border-radius: 10px; margin: 20px 0px 20px 0px;"><div class="card-body">' + kara.source_name + ' - ' + kara.song_name + '</div></div>'; + logger.debug(`Web page got reload-db`); + arg.forEach( kara => { + karaList += `<div class="card shadow" style="margin: 5px; border-radius: 10px; margin: 20px 0px 20px 0px;"> + <div class="card-body">${kara.string} </div></div>`; }); document.getElementById("panelLeft").innerHTML = karaList; - document.getElementById("panelRight").innerHTML = playingList; -} +}); diff --git a/main.js b/main.js index 5ce682dba73c2313bab75cb1ca4ed9f24711e00a..6f0a79d41f18aa73ae6f160a9d7f2bda5e68887d 100644 --- a/main.js +++ b/main.js @@ -1,7 +1,8 @@ const logger = require.main.require('./common/logger.js'); -const electron = require('electron') -const { app, BrowserWindow } = require('electron') -const { ipcMain } = require('electron') +const electron = require('electron'); +const { app, BrowserWindow } = require('electron'); +const { globalShortcut } = require('electron'); +const { ipcMain } = require('electron'); const { fork, spawn } = require('child_process'); const fs = require("fs"); const db = require.main.require("./common/db.js"); @@ -28,13 +29,13 @@ function createInstanceWindow () { width: 1280, height: 720, frame: false, + menuBarVisible: true, webPreferences: { nodeIntegration: true } - }) + }); win.loadFile('instance/index.html'); - // win.webContents.openDevTools(); } /****************************** @@ -58,6 +59,24 @@ app.on('ready', () => { logger.info("Main window is ready"); createInstanceWindow(); client = fork('client/main.js'); + + globalShortcut.register('CommandOrControl+D', () => { + var win = BrowserWindow.getFocusedWindow(); + if (win === null) { + return; + } + logger.info("Reloading DB"); + let contents = win.webContents; + myDb.all().then( karas => { + contents.send("reload-db-responce", karas); + }); + }); + globalShortcut.register('F12', () => { + var focused = BrowserWindow.getFocusedWindow(); + if (focused) { + focused.webContents.openDevTools(); + } + }); }); /********************************* @@ -76,11 +95,6 @@ ipcMain.on("cmd-stop", (event, arg) => { ipcMain.on("reload-db-request", (event, arg) => { logger.info("Reloading the left panel with all the DB"); myDb.all().then( karas => { - var karaList = ""; - karas.forEach( kara => { - karaList += `<div class="card shadow" style="margin: 5px; border-radius: 10px; margin: 20px 0px 20px 0px;"> - <div class="card-body">${kara.string} </div></div>`; - }); - event.reply("reload-db-responce", karaList); + event.reply("reload-db-responce", karas); }); });