From 132ba9a2208625eaa13d479f4f761776e8d06ab4 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Fri, 25 Oct 2019 01:25:48 +0300
Subject: [PATCH] restructured v-block menu...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 ui (gen4)/features/ui-widgets.js     |  6 ++++++
 ui (gen4)/features/virtual-blocks.js | 15 +++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ui (gen4)/features/ui-widgets.js b/ui (gen4)/features/ui-widgets.js
index 3ac80b91..27142061 100755
--- a/ui (gen4)/features/ui-widgets.js	
+++ b/ui (gen4)/features/ui-widgets.js	
@@ -1373,6 +1373,12 @@ var BrowseActionsActions = actions.Actions({
 				'Image/-70:---',
 				'Image/-70:.*remove.*',
 			'$Virtual block',
+				'Virtual block/90:.*add.*',
+				'Virtual block/80:.*clone.*',
+				'Virtual block/70:.*edit.*',
+				'Virtual block/60:.*mark.*',
+				'Virtual block/50:---',
+				'Virtual block/40:.*crop.*',
 			'$Ribbon',
 				'Ribbon/-70:---',
 				'Ribbon/-70:.*remove.*',
diff --git a/ui (gen4)/features/virtual-blocks.js b/ui (gen4)/features/virtual-blocks.js
index df7f2ee7..b48cf165 100644
--- a/ui (gen4)/features/virtual-blocks.js	
+++ b/ui (gen4)/features/virtual-blocks.js	
@@ -138,7 +138,7 @@ var VirtualBlocksActions = actions.Actions({
 	// XXX this is enabled only in collection view as there is no way 
 	// 		to delete a block but possible to create one...
 	// 		...should we add a .removeBlock(..) action???
-	makeVirtualBlank: ['Virtual block/80:Add blank $after',
+	makeVirtualBlank: ['Virtual block/Add blank $after',
 		core.doc`
 		
 		`,
@@ -148,11 +148,11 @@ var VirtualBlocksActions = actions.Actions({
 				type: 'virtual',
 				path: null, 
 			}) }],
-	makeVirtualBlankBefore: ['Virtual block/81:Add blank $before',
+	makeVirtualBlankBefore: ['Virtual block/Add blank $before',
 		{ browseMode: 'makeVirtualBlank', },
 		'makeVirtualBlank: $0 "before"'],
 
-	cloneVirtualBlock: ['Virtual block/80:$Clone block...',
+	cloneVirtualBlock: ['Virtual block/$Clone block',
 		{ browseMode: function(){ 
 			return (this.image || {}).type != 'virtual' && 'disabled' }, },
 		function(ref, offset, img){
@@ -164,7 +164,7 @@ var VirtualBlocksActions = actions.Actions({
 
 	// crop...
 	// XXX would be nice to avoid these and just register a list and context...
-	cropVirtualBlocks: ['Virtual block|Crop/$Crop $virtual blocks',
+	cropVirtualBlocks: ['Virtual block|Crop/$Crop $virtual $blocks',
 		{ browseMode: 'makeVirtualBlock' },
 		'crop: "virtual" ...'],
 	cropVirtualBlocksOut: ['Virtual block|Crop/Crop virtual blocks out',
@@ -172,9 +172,12 @@ var VirtualBlocksActions = actions.Actions({
 		'crop: "!virtual" ...'],
 
 	// marks...
-	toggleMarkVirtualBlocks: ['Virtual block|Mark/-50:Toggle $mark on $virtual blocks',
+	toggleMarkVirtualBlocks: ['Virtual block|Mark/Toggle $mark on $virtual blocks',
 		{ browseMode: 'makeVirtualBlock' },
 		'toggleMark: "virtual"'],
+
+	// remove...
+	// XXX alias to "remove from crop/collection" ???
 })
 
 var VirtualBlocks = 
@@ -413,7 +416,7 @@ var VirtualBlocksEditUIActions = actions.Actions({
 
 	// XXX list existing non-blank v-blocks...
 	cloneVirtualBlockFrom: ['- Virtual block/Clone...',
-		function(){ 
+		function(position){ 
 		}],
 
 	// XXX add alias to remove virtual block...