Fix menus again

pull/11/head
Dave Conway-Jones 2019-10-27 10:46:03 +00:00
rodzic 138456ed63
commit 234fa89c24
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 302A6725C594817F
3 zmienionych plików z 61 dodań i 81 usunięć

Plik binarny nie jest wyświetlany.

Przed

Szerokość:  |  Wysokość:  |  Rozmiar: 75 KiB

131
main.js
Wyświetl plik

@ -148,86 +148,67 @@ if (settings.httpAdminRoot !== false) {
red_app.use(settings.httpNodeRoot,RED.httpNode);
// Create the Application's main menu
var template = [];
if (process.platform === 'darwin') { // Mac has it's own first menu
template.push( {
label: app.getName(),
submenu: [
{ type: 'separator' },
{ type: 'separator' },
{ role: 'about' },
{ type: 'separator' },
{ role: 'hide' },
{ role: 'hideothers' },
{ role: 'unhide' },
{ type: 'separator' },
{ role: 'togglefullscreen' },
{ role: 'quit' }
]
} )
}
// Now add the main Node-RED menu
template.push(
{ label: 'Node-RED',
submenu: [
{ label: 'Import Flow',
accelerator: "Shift+CmdOrCtrl+O",
click() { openFlow(); }
},
{ label: 'Save Flow As',
accelerator: "Shift+CmdOrCtrl+S",
click() { saveFlow(); }
},
{ type: 'separator' },
{ label: 'Console',
accelerator: "Shift+CmdOrCtrl+C",
click() { createConsole(); }
},
{ label: 'Dashboard',
accelerator: "Shift+CmdOrCtrl+D",
click() { mainWindow.loadURL("http://localhost:"+listenPort+urldash); }
},
{ label: 'Editor',
accelerator: "Shift+CmdOrCtrl+E",
click() { mainWindow.loadURL("http://localhost:"+listenPort+urledit); }
},
{ label: 'Worldmap',
accelerator: "Shift+CmdOrCtrl+M",
click() { mainWindow.loadURL("http://localhost:"+listenPort+urlmap); }
},
{ type: 'separator' },
{ type: 'separator' },
{ label: 'Documentation',
click() { electron.shell.openExternal('https://nodered.org/docs') }
},
{ label: 'Flows and Nodes',
click() { electron.shell.openExternal('https://flows.nodered.org') }
},
{ label: 'Discourse Forum',
click() { electron.shell.openExternal('https://discourse.nodered.org/') }
}
]
}
);
var template = [{
label: 'Node-RED',
submenu: [
{ label: 'Import Flow',
accelerator: "Shift+CmdOrCtrl+O",
click() { openFlow(); }
},
{ label: 'Save Flow As',
accelerator: "Shift+CmdOrCtrl+S",
click() { saveFlow(); }
},
{ type: 'separator' },
{ label: 'Console',
accelerator: "Shift+CmdOrCtrl+C",
click() { createConsole(); }
},
{ label: 'Dashboard',
accelerator: "Shift+CmdOrCtrl+D",
click() { mainWindow.loadURL("http://localhost:"+listenPort+urldash); }
},
{ label: 'Editor',
accelerator: "Shift+CmdOrCtrl+E",
click() { mainWindow.loadURL("http://localhost:"+listenPort+urledit); }
},
{ label: 'Worldmap',
accelerator: "Shift+CmdOrCtrl+M",
click() { mainWindow.loadURL("http://localhost:"+listenPort+urlmap); }
},
{ type: 'separator' },
{ type: 'separator' },
{ label: 'Documentation',
click() { electron.shell.openExternal('https://nodered.org/docs') }
},
{ label: 'Flows and Nodes',
click() { electron.shell.openExternal('https://flows.nodered.org') }
},
{ label: 'Discourse Forum',
click() { electron.shell.openExternal('https://discourse.nodered.org/') }
},
{ type: 'separator' },
{ role: 'togglefullscreen' },
{ role: 'quit' }
]
}];
var tempNum = template.length - 1;
// Add quit and toggle full screen to this menu if not on Mac
if (process.platform !== 'darwin') {
template[tempNum].submenu.push({ type: "separator" });
template[tempNum].submenu.push({ role: 'togglefullscreen' });
template[tempNum].submenu.push({ role: 'quit' });
if (!showMap) { template[tempNum].submenu.splice(8,1); }
}
else {
if (!showMap) { template[tempNum].submenu.splice(6,1); }
}
if (!showMap) { template[0].submenu.splice(6,1); }
if (!editable) {
template[tempNum].submenu.splice(3,1);
template[tempNum].submenu.splice(4,1);
template[0].submenu.splice(3,1);
template[0].submenu.splice(4,1);
}
if (!allowLoadSave) { template[tempNum].submenu.splice(0,2); }
if (!allowLoadSave) { template[0].submenu.splice(0,2); }
// Top and tail menu on Mac
if (process.platform === 'darwin') {
template[0].submenu.unshift({ type: 'separator' });
template[0].submenu.unshift({ role: 'about' });
template[0].submenu.unshift({ type: 'separator' });
template[0].submenu.unshift({ type: 'separator' });
}
let fileName = "";
function saveFlow() {

Wyświetl plik

@ -15,11 +15,11 @@
"url": "git+https://github.com/dceejay/electron-node-red.git"
},
"dependencies": {
"express": "~4.17.1",
"express": "^4.17.1",
"node-red": "1.0.2",
"node-red-contrib-play-audio": "*",
"node-red-contrib-web-worldmap": "~2.1.4",
"node-red-dashboard": "~2.17.1",
"node-red-contrib-web-worldmap": "*",
"node-red-dashboard": "^2.17.1",
"node-red-node-base64": "*",
"node-red-node-geofence": "*",
"node-red-node-random": "*",
@ -40,9 +40,8 @@
},
"homepage": "https://github.com/dceejay/electron-node-red#readme",
"devDependencies": {
"electron": "~6.0.12",
"electron-builder": "^21.2.0",
"electron-create-menu": "^3.0.0"
"electron": "^7.0.0",
"electron-builder": "^21.2.0"
},
"build": {
"npmRebuild": false,