From f0a032979ccd638ba5fcaad31a906286f4782533 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Fri, 8 Sep 2017 22:29:45 +0300
Subject: [PATCH] some tweaking...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 ui (gen4)/features/base.js        | 7 +++++--
 ui (gen4)/features/collections.js | 2 +-
 ui (gen4)/features/keyboard.js    | 5 +++++
 ui (gen4)/features/ui-widgets.js  | 5 +++++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ui (gen4)/features/base.js b/ui (gen4)/features/base.js
index 35c37e81..dac2b5a4 100755
--- a/ui (gen4)/features/base.js	
+++ b/ui (gen4)/features/base.js	
@@ -1720,7 +1720,8 @@ module.CropActions = actions.Actions({
 
 	// crop edit actions...
 	// XXX do we need this???
-	removeFromCrop: ['Crop/Remove from crop',
+	// XXX undo...
+	removeFromCrop: ['Crop|Image/Remove from crop',
 		{browseMode: 'uncrop'},
 		function(gids){
 			var that = this
@@ -1763,7 +1764,9 @@ module.CropActions = actions.Actions({
 
 			// restore correct focus...
 			focus
-				&& this.focusImage(this.direction == 'left' ? 'prev' : 'next')
+				&& this.focusImage(
+					data.getImage(this.direction == 'left' ? 'before' : 'after')
+					|| data.getImage(this.direction == 'left' ? 'after' : 'before'))
 		}]
 })
 
diff --git a/ui (gen4)/features/collections.js b/ui (gen4)/features/collections.js
index 66d15e64..24218b31 100755
--- a/ui (gen4)/features/collections.js	
+++ b/ui (gen4)/features/collections.js	
@@ -555,7 +555,7 @@ var CollectionActions = actions.Actions({
 				this.saveCollection(collection)
 			}
 		}],
-	uncollect: ['Collections|Image/$Uncollect image',
+	uncollect: ['Collections|Image/Remove from collection',
 		{browseMode: function(){ return !this.collection && 'disabled' }},
 		function(gids, collection){
 			collection = collection || this.collection
diff --git a/ui (gen4)/features/keyboard.js b/ui (gen4)/features/keyboard.js
index bda0f884..f6305434 100755
--- a/ui (gen4)/features/keyboard.js	
+++ b/ui (gen4)/features/keyboard.js	
@@ -124,6 +124,7 @@ module.GLOBAL_KEYBOARD = {
 
 		drop: [
 			'Esc',
+			'Del',
 		],
 
 		Esc: 'uncrop',
@@ -141,6 +142,10 @@ module.GLOBAL_KEYBOARD = {
 
 	'Collection': {
 		pattern: '.collection-mode',
+		drop: [
+			'Esc',
+			'Del',
+		],
 
 		Esc: 'loadCollection: "ALL" -- Load all images',
 
diff --git a/ui (gen4)/features/ui-widgets.js b/ui (gen4)/features/ui-widgets.js
index 914e8810..ea123f6f 100755
--- a/ui (gen4)/features/ui-widgets.js	
+++ b/ui (gen4)/features/ui-widgets.js	
@@ -1136,6 +1136,8 @@ var BrowseActionsActions = actions.Actions({
 			'99:$Edit',
 			'$Navigate',
 			'$Image',
+				'Image/-90:---',
+				'Image/-90:.*remove.*',
 			'$Ribbon',
 			'$Crop',
 				'Crop/80:Crop $marked images',
@@ -1173,6 +1175,9 @@ var BrowseActionsActions = actions.Actions({
 				'Crop/-70:---',
 				//*/
 
+				'Crop/-70:---',
+				'Crop/-70:.*remove.*',
+
 				'Crop/-80:Uncrop and keep crop image order',
 				'Crop/-81:Uncrop all',
 				'Crop/-82:$Uncrop',