From 66eaaf5a48dcc94730ac07e6f9e88b9febd25013 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Sat, 9 Jan 2016 20:39:03 +0000 Subject: [PATCH] Add 'view' menu and reorganise a few things --- editor/js/main.js | 27 +++++++++++++-------------- editor/js/ui/sidebar.js | 6 +++--- editor/js/ui/tab-config.js | 3 +++ red/api/locales/en-US/editor.json | 21 ++++++++++----------- 4 files changed, 29 insertions(+), 28 deletions(-) diff --git a/editor/js/main.js b/editor/js/main.js index 6d29ee55e..f467eccdc 100644 --- a/editor/js/main.js +++ b/editor/js/main.js @@ -156,11 +156,14 @@ var RED = (function() { function loadEditor() { RED.menu.init({id:"btn-sidemenu", options: [ - {id:"menu-item-sidebar-menu",label:RED._("menu.label.sidebar.sidebar"),options:[ - {id:"menu-item-sidebar",label:RED._("menu.label.sidebar.show"),toggle:true,onselect:RED.sidebar.toggleSidebar, selected: true}, - null + {id:"menu-item-view-menu",label:RED._("menu.label.view.view"),options:[ + {id:"menu-item-view-show-grid",label:RED._("menu.label.view.showGrid"),toggle:true,onselect:RED.view.toggleShowGrid}, + {id:"menu-item-view-snap-grid",label:RED._("menu.label.view.snapGrid"),toggle:true,onselect:RED.view.toggleSnapGrid}, + null, + {id:"menu-item-status",label:RED._("menu.label.displayStatus"),toggle:true,onselect:toggleStatus, selected: true}, + null, + {id:"menu-item-sidebar",label:RED._("menu.label.sidebar.show"),toggle:true,onselect:RED.sidebar.toggleSidebar, selected: true} ]}, - {id:"menu-item-status",label:RED._("menu.label.displayStatus"),toggle:true,onselect:toggleStatus, selected: true}, null, {id:"menu-item-import",label:RED._("menu.label.import"),options:[ {id:"menu-item-import-clipboard",label:RED._("menu.label.clipboard"),onselect:RED.clipboard.import}, @@ -171,28 +174,24 @@ var RED = (function() { {id:"menu-item-export-library",label:RED._("menu.label.library"),disabled:true,onselect:RED.library.export} ]}, null, - {id:"menu-item-subflow",label:RED._("menu.label.subflows"), options: [ - {id:"menu-item-subflow-create",label:RED._("menu.label.createSubflow"),onselect:RED.subflow.createSubflow}, - {id:"menu-item-subflow-convert",label:RED._("menu.label.selectionToSubflow"),disabled:true,onselect:RED.subflow.convertToSubflow}, - ]}, - null, + {id:"menu-item-config-nodes",label:RED._("menu.label.displayConfig"),onselect:function(){}}, {id:"menu-item-workspace",label:RED._("menu.label.flows"),options:[ {id:"menu-item-workspace-add",label:RED._("menu.label.add"),onselect:RED.workspaces.add}, {id:"menu-item-workspace-edit",label:RED._("menu.label.rename"),onselect:RED.workspaces.edit}, {id:"menu-item-workspace-delete",label:RED._("menu.label.delete"),onselect:RED.workspaces.remove}, null ]}, - null, - {id:"menu-item-layout",label:RED._("menu.label.layout.layout"), options: [ - {id:"menu-item-layout-show-grid",label:RED._("menu.label.layout.showGrid"),toggle:true,onselect:RED.view.toggleShowGrid}, - {id:"menu-item-layout-snap-grid",label:RED._("menu.label.layout.snapGrid"),toggle:true,onselect:RED.view.toggleSnapGrid} + {id:"menu-item-subflow",label:RED._("menu.label.subflows"), options: [ + {id:"menu-item-subflow-create",label:RED._("menu.label.createSubflow"),onselect:RED.subflow.createSubflow}, + {id:"menu-item-subflow-convert",label:RED._("menu.label.selectionToSubflow"),disabled:true,onselect:RED.subflow.convertToSubflow}, ]}, null, {id:"menu-item-keyboard-shortcuts",label:RED._("menu.label.keyboardShortcuts"),onselect:RED.keyboard.showHelp}, {id:"menu-item-help", label: RED.settings.theme("menu.menu-item-help.label","Node-RED Website"), href: RED.settings.theme("menu.menu-item-help.url","http://nodered.org/docs") - } + }, + {id:"menu-item-node-red-version", label:"v"+RED.settings.version} ] }); diff --git a/editor/js/ui/sidebar.js b/editor/js/ui/sidebar.js index 5149a96dc..0f2403b34 100644 --- a/editor/js/ui/sidebar.js +++ b/editor/js/ui/sidebar.js @@ -60,8 +60,8 @@ RED.sidebar = (function() { $(options.content).hide(); var id = options.id; - RED.menu.addItem("menu-item-sidebar-menu",{ - id:"menu-item-sidebar-menu-"+options.id, + RED.menu.addItem("menu-item-view-menu",{ + id:"menu-item-view-menu-"+options.id, label:options.name, onselect:function() { showSidebar(options.id); @@ -80,7 +80,7 @@ RED.sidebar = (function() { sidebar_tabs.removeTab(id); $(knownTabs[id].content).remove(); delete knownTabs[id]; - RED.menu.removeItem("menu-item-sidebar-menu-"+id); + RED.menu.removeItem("menu-item-view-menu-"+id); } var sidebarSeparator = {}; diff --git a/editor/js/ui/tab-config.js b/editor/js/ui/tab-config.js index 635fbca76..29849fff4 100644 --- a/editor/js/ui/tab-config.js +++ b/editor/js/ui/tab-config.js @@ -116,6 +116,9 @@ RED.sidebar.config = (function() { onchange: function() { refreshConfigNodeList(); } }); + RED.menu.setAction('menu-item-config-nodes',function() { + RED.sidebar.show('config'); + }) $(".workspace-config-node-tray-header").on('click', function(e) { var icon = $(this).find("i"); if (icon.hasClass("expanded")) { diff --git a/red/api/locales/en-US/editor.json b/red/api/locales/en-US/editor.json index 4e272c60b..c704ed57b 100644 --- a/red/api/locales/en-US/editor.json +++ b/red/api/locales/en-US/editor.json @@ -17,11 +17,15 @@ }, "menu": { "label": { - "sidebar": { - "sidebar": "Sidebar", - "show": "Toggle Sidebar" + "view": { + "view": "View", + "showGrid": "Show grid", + "snapGrid": "Snap to grid" }, - "displayStatus": "Display Node Status", + "sidebar": { + "show": "Show sidebar" + }, + "displayStatus": "Display node status", "displayConfig": "Configuration Nodes", "import": "Import", "export": "Export", @@ -30,18 +34,13 @@ "subflows": "Subflows", "createSubflow": "Create Subflow", "selectionToSubflow": "Selection to Subflow", - "flows": "Tabs", + "flows": "Flows", "add": "Add", "rename": "Rename", "delete": "Delete", "keyboardShortcuts": "Keyboard Shortcuts", "login": "Login", - "logout": "Logout", - "layout": { - "layout": "Layout", - "showGrid": "Show grid", - "snapGrid": "Snap to grid" - } + "logout": "Logout" } }, "user": {