tools and help dropdown

Author: smarasca5

app/src/processing/app/ui/ComposeTopBar.kt

@@ -60,10 +60,10 @@ fun TopBar(panel: ComposePanel, base: Base, editor: Editor) {
             //showMenuPopup(p, b, e, x, y)
         },
         TopBarItemData("Tools") { p, b, e, x, y ->
-            //showMenuPopup(p, b, e, x, y)
+            showMenuPopup(p, b, e, x, y)
         },
         TopBarItemData("Help") { p, b, e, x, y ->
-            //showMenuPopup(p, b, e, x, y)
+            showMenuPopup(p, b, e, x, y)
         },
         TopBarItemData("Develop") { p, _, e, x, y ->
             showDevelopPopup(p, e, x, y)
@@ -149,6 +149,16 @@ private fun showSketchPopup(panel: ComposePanel, editor: Editor, x: Int, y: Int)
     showPopupFromMenu(panel, menu, x, y)
 }
 
+private fun showToolsPopup(panel: ComposePanel, editor: Editor, x: Int, y: Int) {
+    val menu = editor.buildToolsMenu()
+    showPopupFromMenu(panel, menu, x, y)
+}
+
+private fun showHelpPopup(panel: ComposePanel, editor: Editor, x: Int, y: Int) {
+    val menu = editor.buildHelpMenu()
+    showPopupFromMenu(panel, menu, x, y)
+}
+
 private fun showDevelopPopup(panel: ComposePanel, editor: Editor, x: Int, y: Int) {
     editor.buildDevelopMenu()
 

app/src/processing/app/ui/Editor.java

@@ -1081,8 +1081,29 @@ public JMenu buildModeMenu() {
     return null;
   }
 
+  public void buildToolsMenu() {
+      toolsMenu = new JMenu(Language.text("menu.tools"));
+
+      var updateTrigger = new JMenuItem(Language.text("menu.tools.check_for_updates"));
+      updateTrigger.addActionListener(e -> {
+          Preferences.unset("update.last");
+          Preferences.setInteger("update.beta_welcome", 0);
+          new UpdateCheck(base);
+      });
+      toolsMenu.add(updateTrigger);
+  }
 
-  abstract public JMenu buildHelpMenu(); //HELP MENU CODE!!!!
+  public void buildHelpMenu(){
+      JMenu helpMenu = new JMenu(Language.text("menu.develop"));
+
+      var updateTrigger = new JMenuItem(Language.text("menu.help.check_for_updates"));
+      updateTrigger.addActionListener(e -> {
+          Preferences.unset("update.last");
+          Preferences.setInteger("update.beta_welcome", 0);
+          new UpdateCheck(base);
+      });
+      helpMenu.add(updateTrigger);
+  } //HELP MENU CODE!!!!
 
   public void buildDevelopMenu(){
     developMenu = new JMenu(Language.text("menu.develop"));