From 21ada0959742c10c62f4d1a5e2ac718b52cd0e7b Mon Sep 17 00:00:00 2001
From: jmoenig <jens@moenig.org>
Date: Thu, 25 Nov 2021 16:33:10 +0100
Subject: [PATCH] rearranged and amended the project menu

---
 HISTORY.md |  3 +++
 snap.html  |  2 +-
 src/gui.js | 57 +++++++++++++++++++++++++++++++++---------------------
 3 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 7de073cd..c01404f7 100755
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -64,6 +64,9 @@
     * Chinese, thanks, Simon!
     * Brazilian Portuguese, thank you, Cassiano D'Andrea!
 
+### 2021-11-24
+* gui: rearranged and amended the project menu
+
 ### 2021-11-24
 * threads: fixed #2918
 * gui, objects, scenes: added scene-setting to hide/show buttons in the unified palette
diff --git a/snap.html b/snap.html
index 689541e2..30ba12cd 100755
--- a/snap.html
+++ b/snap.html
@@ -20,7 +20,7 @@
         <script src="src/threads.js?version=2021-11-24"></script>
         <script src="src/objects.js?version=2021-11-24"></script>
         <script src="src/scenes.js?version=2021-11-24"></script>
-        <script src="src/gui.js?version=2021-11-24"></script>
+        <script src="src/gui.js?version=2021-11-25"></script>
         <script src="src/paint.js?version=2021-07-05"></script>
         <script src="src/lists.js?version=2021-07-19"></script>
         <script src="src/byob.js?version=2021-11-23"></script>
diff --git a/src/gui.js b/src/gui.js
index 1470e0e9..df62e161 100644
--- a/src/gui.js
+++ b/src/gui.js
@@ -86,7 +86,7 @@ BlockVisibilityDialogMorph, ThreadManager*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.gui = '2021-November-24';
+modules.gui = '2021-November-25';
 
 // Declarations
 
@@ -4340,27 +4340,11 @@ IDE_Morph.prototype.projectMenu = function () {
         },
         'save project data as XML\nto your downloads folder'
     );
-
-    if (this.stage.globalBlocks.length) {
-        menu.addItem(
-            'Export blocks...',
-            () => this.exportGlobalBlocks(),
-            'save global custom block\ndefinitions as XML'
-        );
-        menu.addItem(
-            'Unused blocks...',
-            () => this.removeUnusedBlocks(),
-            'find unused global custom blocks' +
-                '\nand remove their definitions'
-        );
-    }
-
     menu.addItem(
         'Export summary...',
         () => this.exportProjectSummary(),
         'save a summary\nof this project'
     );
-
     if (shiftClicked) {
         menu.addItem(
             'Export summary with drop-shadows...',
@@ -4378,7 +4362,34 @@ IDE_Morph.prototype.projectMenu = function () {
             new Color(100, 0, 0)
         );
     }
-
+    menu.addLine();
+    if (this.stage.globalBlocks.length) {
+        menu.addItem(
+            'Export blocks...',
+            () => this.exportGlobalBlocks(),
+            'save global custom block\ndefinitions as XML'
+        );
+        menu.addItem(
+            'Unused blocks...',
+            () => this.removeUnusedBlocks(),
+            'find unused global custom blocks' +
+                '\nand remove their definitions'
+        );
+    }
+    menu.addItem(
+        'Hide blocks...',
+        () => new BlockVisibilityDialogMorph(this.currentSprite).popUp(world)
+    );
+    menu.addItem(
+        'New category...',
+        () => this.createNewCategory()
+    );
+    if (SpriteMorph.prototype.customCategories.size) {
+        menu.addItem(
+            'Remove a category...',
+            () => this.deleteUserCategory(pos)
+        );
+    }
     menu.addLine();
     if (this.scenes.length() > 1) {
         menu.addItem('Scenes...', 'scenesMenu');
@@ -4403,7 +4414,6 @@ IDE_Morph.prototype.projectMenu = function () {
         },
         'Select categories of additional blocks to add to this project.'
     );
-
     menu.addItem(
         localize(graphicsName) + '...',
         () => {
@@ -4437,7 +4447,6 @@ IDE_Morph.prototype.projectMenu = function () {
             'Bring back deleted sprites'
         );
     }
-
     menu.popup(world, pos);
 };
 
@@ -5060,7 +5069,7 @@ IDE_Morph.prototype.addPaletteCategory = function (name, color) {
     this.fixLayout();
 };
 
-IDE_Morph.prototype.deleteUserCategory = function () {
+IDE_Morph.prototype.deleteUserCategory = function (pos) {
     var menu = new MenuMorph(
         this.deletePaletteCategory,
         null,
@@ -5083,7 +5092,11 @@ IDE_Morph.prototype.deleteUserCategory = function () {
             true // verbatim - don't translate
         )
     );
-    menu.popUpAtHand(this.world());
+    if (pos) {
+        menu.popup(this.world(), pos);
+    } else {
+        menu.popUpAtHand(this.world());
+    }
 };
 
 IDE_Morph.prototype.deletePaletteCategory = function (name) {