diff --git a/ui (gen4)/features/app.js b/ui (gen4)/features/app.js index 4ed44009..b38367d3 100755 --- a/ui (gen4)/features/app.js +++ b/ui (gen4)/features/app.js @@ -30,9 +30,9 @@ var AppControlActions = actions.Actions({ }, // XXX revise these... - close: ['File|Interface/Close viewer', + close: ['File|Window/Close viewer', function(){ window.close() }], - storeWindowGeometry: ['- Interface/Store window state', + storeWindowGeometry: ['- Window/Store window state', function(){ // store window parameters (size, state)... var win = nw.Window.get() @@ -55,7 +55,7 @@ var AppControlActions = actions.Actions({ } } }], - restoreWindowGeometry: ['- Interface/Restore window state', + restoreWindowGeometry: ['- Window/Restore window state', function(){ var that = this // or global.window.nwDispatcher.requireNwGui() @@ -109,11 +109,11 @@ var AppControlActions = actions.Actions({ }, this.config['window-delay-initial-display'] || 0) }], - minimize: ['Interface/Minimize', + minimize: ['Window/Minimize', function(){ nw.Window.get().minimize() }], - toggleFullScreen: ['Interface/Toggle full screen mode', + toggleFullScreen: ['Window/Toggle full screen mode', toggler.CSSClassToggler( function(){ return document.body }, '.full-screen-mode', diff --git a/ui (gen4)/features/ui-widgets.js b/ui (gen4)/features/ui-widgets.js index 57eaba6c..13caf210 100755 --- a/ui (gen4)/features/ui-widgets.js +++ b/ui (gen4)/features/ui-widgets.js @@ -680,7 +680,7 @@ var DialogsActions = actions.Actions({ })], - listDialogs: ['Interface/Dialog list...', + listDialogs: ['Interface/Dialog/Dialog list...', makeUIDialog(function(){ var actions = this @@ -812,7 +812,7 @@ var BrowseActionsActions = actions.Actions({ // base order/priorities... // // XXX can we do a deep search on '/' -- find any nested action??? - browseActions: ['Interface/Actions...', + browseActions: ['Interface/Dialog/Actions...', makeUIDialog(function(path){ var actions = this var priority = /^(-?[0-9]+)\s*:\s*/