From 3e6d327e1c9f7df7d2930425a8e664a8f176ea6e Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Tue, 14 Feb 2023 03:26:32 +0000
Subject: [PATCH] Refactor help menu

---
 .../sf/openrocket/gui/main/BasicFrame.java    | 21 +++++---
 .../gui/util/DummyFrameMenuOSX.java           | 48 +------------------
 2 files changed, 15 insertions(+), 54 deletions(-)

diff --git a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java
index d505e00f1..acb3a134d 100644
--- a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java
+++ b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java
@@ -751,6 +751,15 @@ public class BasicFrame extends JFrame {
 		}
 
 		////	Help
+		generateHelpMenu(menubar, this);
+
+		this.setJMenuBar(menubar);
+	}
+
+	public static void generateHelpMenu(JMenuBar menubar, JFrame parent) {
+		JMenu menu;
+		JMenuItem item;
+
 		menu = new JMenu(trans.get("main.menu.help"));
 		menu.setMnemonic(KeyEvent.VK_H);
 		menu.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.help.desc"));
@@ -764,7 +773,7 @@ public class BasicFrame extends JFrame {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				log.info(Markers.USER_MARKER, "Guided tours selected");
-				GuidedTourSelectionDialog.showDialog(BasicFrame.this);
+				GuidedTourSelectionDialog.showDialog(parent);
 			}
 		});
 		menu.add(item);
@@ -779,7 +788,7 @@ public class BasicFrame extends JFrame {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				log.info(Markers.USER_MARKER, "Bug report selected");
-				BugReportDialog.showBugReportDialog(BasicFrame.this);
+				BugReportDialog.showBugReportDialog(parent);
 			}
 		});
 		menu.add(item);
@@ -793,7 +802,7 @@ public class BasicFrame extends JFrame {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				log.info(Markers.USER_MARKER, "Debug log selected");
-				new DebugLogDialog(BasicFrame.this).setVisible(true);
+				new DebugLogDialog(parent).setVisible(true);
 			}
 		});
 		menu.add(item);
@@ -808,7 +817,7 @@ public class BasicFrame extends JFrame {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				log.info(Markers.USER_MARKER, "License selected");
-				new LicenseDialog(BasicFrame.this).setVisible(true);
+				new LicenseDialog(parent).setVisible(true);
 			}
 		});
 		menu.add(item);
@@ -821,12 +830,10 @@ public class BasicFrame extends JFrame {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				log.info(Markers.USER_MARKER, "About selected");
-				new AboutDialog(BasicFrame.this).setVisible(true);
+				new AboutDialog(parent).setVisible(true);
 			}
 		});
 		menu.add(item);
-
-		this.setJMenuBar(menubar);
 	}
 
 	public RocketActions getRocketActions() {
diff --git a/swing/src/net/sf/openrocket/gui/util/DummyFrameMenuOSX.java b/swing/src/net/sf/openrocket/gui/util/DummyFrameMenuOSX.java
index 1d0bf444e..a509d172f 100644
--- a/swing/src/net/sf/openrocket/gui/util/DummyFrameMenuOSX.java
+++ b/swing/src/net/sf/openrocket/gui/util/DummyFrameMenuOSX.java
@@ -131,54 +131,8 @@ public class DummyFrameMenuOSX extends JFrame {
         });
         menu.add(item);
 
-
         ////	Help
-        menu = new JMenu(trans.get("main.menu.help"));
-        menu.setMnemonic(KeyEvent.VK_H);
-        menu.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.help.desc"));
-        menubar.add(menu);
-
-        ////	Guided tours
-        item = new JMenuItem(trans.get("main.menu.help.tours"), KeyEvent.VK_L);
-        item.setIcon(Icons.HELP_TOURS);
-        item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.help.tours.desc"));
-        item.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                log.info(Markers.USER_MARKER, "Guided tours selected");
-                GuidedTourSelectionDialog.showDialog(DummyFrameMenuOSX.this);
-            }
-        });
-        menu.add(item);
-
-        menu.addSeparator();
-
-        ////	License
-        item = new JMenuItem(trans.get("main.menu.help.license"), KeyEvent.VK_L);
-        item.setIcon(Icons.HELP_LICENSE);
-        item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.help.license.desc"));
-        item.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                log.info(Markers.USER_MARKER, "License selected");
-                new LicenseDialog(DummyFrameMenuOSX.this).setVisible(true);
-            }
-        });
-        menu.add(item);
-
-        ////	About
-        item = new JMenuItem(trans.get("main.menu.help.about"), KeyEvent.VK_A);
-        item.setIcon(Icons.HELP_ABOUT);
-        item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.help.about.desc"));
-        item.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                log.info(Markers.USER_MARKER, "About selected");
-                new AboutDialog(DummyFrameMenuOSX.this).setVisible(true);
-            }
-        });
-        menu.add(item);
-
+        BasicFrame.generateHelpMenu(menubar, this);
 
         this.setJMenuBar(menubar);
     }