From cc1c81747a1c50a0211524fb0af860a363faa3eb Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Mon, 26 Oct 2020 17:51:12 +0300 Subject: [PATCH] tweaks to menues... Signed-off-by: Alex A. Naanou --- Viewer/features/app.js | 6 ------ Viewer/features/meta.js | 1 - Viewer/features/ui-widgets.js | 6 ++++-- Viewer/features/ui.js | 13 +++++++++++-- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/Viewer/features/app.js b/Viewer/features/app.js index 3dcc4e74..c25d6c61 100755 --- a/Viewer/features/app.js +++ b/Viewer/features/app.js @@ -430,12 +430,6 @@ var BrowserHostActions = actions.Actions({ copy: ['Image|Edit/Copy image', core.doc`Copy image - Copy current image (original ref)... - .copy() - - Copy best matching preview of current image... - .copy(size) - NOTE: this must be called from within an event handler... NOTE: this will not work with file:// paths... `, diff --git a/Viewer/features/meta.js b/Viewer/features/meta.js index 2a278c3f..cd7eb4bb 100755 --- a/Viewer/features/meta.js +++ b/Viewer/features/meta.js @@ -43,7 +43,6 @@ core.ImageGridFeatures.Feature('imagegrid-ui-minimal', [ 'keyboard', 'ui-cursor', 'ui-control', - //'ui-copy-image', 'ui-drag-n-drop', // XXX use one... diff --git a/Viewer/features/ui-widgets.js b/Viewer/features/ui-widgets.js index 060a7c61..80bfb084 100755 --- a/Viewer/features/ui-widgets.js +++ b/Viewer/features/ui-widgets.js @@ -2199,6 +2199,7 @@ var BrowseActionsActions = actions.Actions({ '99:$Edit', 'Edit/90:Undo', 'Edit/90:Redo', + 'Edit/85:$Copy image', 'Edit/85:.*copy.*', 'Edit/85:.*paste.*', 'Edit/85:.*base.*', @@ -2214,8 +2215,9 @@ var BrowseActionsActions = actions.Actions({ 'Navigate/80:.*screen.*', 'Navigate/70:.*ribbon.*', '$Image', - 'Image/98:.*copy.*', - 'Image/98:.*paste.*', + 'Image/99:$Copy image', + 'Image/99:.*copy.*', + 'Image/99:.*paste.*', 'Image/98:.*editor.*', 'Image/98:.*folder.*', 'Image/95:.*metadata.*', diff --git a/Viewer/features/ui.js b/Viewer/features/ui.js index c4df7561..66f8d9f0 100755 --- a/Viewer/features/ui.js +++ b/Viewer/features/ui.js @@ -1165,12 +1165,21 @@ module.CopyImiage = core.ImageGridFeatures.Feature({ actions: actions.Actions({ // XXX mark copied image(s)... - copy: ['- Image|Edit/Copy image', + copy: ['- Image|Edit/$Copy image', + core.doc`Copy image + + Copy current image... + .copy() + + Copy best matching preview of current image... + .copy(size) + + `, function(size){ // XXX }], // XXX if pasted image(s) is the one(s) marked by copy, do a shift action... - paste: ['- Image|Edit/Paste image', + paste: ['- Image|Edit/$Paste image', function(){ // XXX }],