diff --git a/index.js b/index.js index 5cf8ac2..c296129 100644 --- a/index.js +++ b/index.js @@ -59,18 +59,11 @@ app.on('ready', () => { label: 'Menu', submenu: [ { - label: 'Quit', + label: 'Toggle Menu Bar', click: () => { - app.quit(); + win.setMenuBarVisibility(!win.menuBarVisible); }, - accelerator: "CommandOrControl+Q" - }, - { - label: 'Toggle Developer Tools', - click: () => { - win.webContents.toggleDevTools() - }, - accelerator: "F12" + accelerator: "CommandOrControl+Shift+M" }, { label: 'Reload', @@ -87,6 +80,13 @@ app.on('ready', () => { }, accelerator: "CommandOrControl+M" }, + { + label: 'Toggle Developer Tools', + click: () => { + win.webContents.toggleDevTools() + }, + accelerator: "F12" + }, { label: 'About', click: () => { @@ -107,6 +107,13 @@ app.on('ready', () => { require('electron').dialog.showMessageBox(win, options); }, accelerator: "CommandOrControl+I" + }, + { + label: 'Quit', + click: () => { + app.quit(); + }, + accelerator: "CommandOrControl+Q" } ] } diff --git a/package-lock.json b/package-lock.json index 41ac2db..115a786 100644 --- a/package-lock.json +++ b/package-lock.json @@ -775,9 +775,9 @@ } }, "electron": { - "version": "11.2.1", - "resolved": "https://registry.npmjs.org/electron/-/electron-11.2.1.tgz", - "integrity": "sha512-Im1y29Bnil+Nzs+FCTq01J1OtLbs+2ZGLLllaqX/9n5GgpdtDmZhS/++JHBsYZ+4+0n7asO+JKQgJD+CqPClzg==", + "version": "11.2.3", + "resolved": "https://registry.npmjs.org/electron/-/electron-11.2.3.tgz", + "integrity": "sha512-6yxOc42nDAptHKNlUG/vcOh2GI9x2fqp2nQbZO0/3sz2CrwsJkwR3i3oMN9XhVJaqI7GK1vSCJz0verOkWlXcQ==", "dev": true, "requires": { "@electron/get": "^1.0.1", diff --git a/package.json b/package.json index c011f1b..859e2d9 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ }, "homepage": "https://github.com/ocogeclub/ocoge#readme", "devDependencies": { - "electron": "11.2.1", + "electron": "11.2.3", "electron-rebuild": "^2.3.4" }, "dependencies": { diff --git a/scripts/ugj_script.js b/scripts/ugj_script.js index fd2d4c5..8ac70e5 100644 --- a/scripts/ugj_script.js +++ b/scripts/ugj_script.js @@ -536,6 +536,9 @@ if (typeof require == 'function') { elec.newFile = () => { ; } elec.setWsChanged = () => { ; } + // マスコット + elec.getMascotFilePath = () => './img/cogechee.png'; + //ワークスペースのダウンロード elec.saveWsFile = xml_text => { let blob = new Blob([xml_text], { "type": "text/xml" });