Merge commit 'renji/Issue2937'

src/com/dmdirc/addons/ui_swing/components/MenuBar.java

@@ -260,7 +260,7 @@ public class MenuBar extends JMenuBar implements ActionListener, MenuListener {
         } else if (e.getActionCommand().equals("Exit")) {
             mainFrame.quit();
         } else if (e.getActionCommand().equals("Actions")) {
-            ActionsManagerDialog.showActionsManagerDialog(mainFrame);
+            ActionsManagerDialog.showActionsManagerDialog(mainFrame, controller);
         } else if (e.getActionCommand().equals("Aliases")) {
             AliasManagerDialog.showAliasManagerDialog(mainFrame);
         } else if (e.getActionCommand().equals("JoinDevChat")) {

src/com/dmdirc/addons/ui_swing/components/frames/AppleJFrame.java

@@ -0,0 +1,32 @@
+package com.dmdirc.addons.ui_swing.components.frames;
+
+import com.dmdirc.addons.ui_swing.*;
+import com.dmdirc.addons.ui_swing.components.MenuBar;
+import javax.swing.JFrame;
+
+/**
+ * Haxy JFrame to allow Apple to show the MenuBar in otherwise parent-less
+ * dialogs.
+ *
+ * @author shane
+ */
+public class AppleJFrame extends JFrame {
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 1;
+
+    /**
+     * Create a new Apple JFrame
+     *
+     * @param parentWindow Main Window
+     */
+    public AppleJFrame(final MainFrame parentWindow, final SwingController controller) {
+        super();
+        final MenuBar menu = new MenuBar(controller, parentWindow);
+        Apple.getApple().setMenuBar(menu);
+        setJMenuBar(menu);
+    }
+}

src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsManagerDialog.java

@@ -22,11 +22,15 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.actionsmanager;
 
+import com.dmdirc.addons.ui_swing.components.frames.AppleJFrame;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionGroup;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.addons.ui_swing.Apple;
+import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.validator.ActionGroupValidator;
 import com.dmdirc.config.prefs.validator.FileNameValidator;
@@ -98,8 +102,9 @@ public final class ActionsManagerDialog extends StandardDialog implements Action
     /** 
      * Creates a new instance of ActionsManagerDialog.
      */
-    private ActionsManagerDialog(final Window parentWindow) {
-        super(null, ModalityType.MODELESS);
+    private ActionsManagerDialog(final Window parentWindow, final SwingController controller) {
+        super(Apple.isAppleUI() ? new AppleJFrame((MainFrame) parentWindow, controller) :
+            null, ModalityType.MODELESS);
 
         initComponents();
         addListeners();
@@ -116,8 +121,8 @@ public final class ActionsManagerDialog extends StandardDialog implements Action
      * 
      * @param parentWindow Parent window
      */
-    public static void showActionsManagerDialog(final Window parentWindow) {
-        getActionsManagerDialog(parentWindow);
+    public static void showActionsManagerDialog(final Window parentWindow, final SwingController controller) {
+        getActionsManagerDialog(parentWindow, controller);
 
         me.setIconImages(parentWindow.getIconImages());
         me.pack();
@@ -140,10 +145,11 @@ public final class ActionsManagerDialog extends StandardDialog implements Action
      * 
      * @return The current ActionsManagerDialog instance
      */
-    public static ActionsManagerDialog getActionsManagerDialog(final Window parentWindow) {
+    public static ActionsManagerDialog getActionsManagerDialog(final Window parentWindow,
+            final SwingController controller) {
         synchronized (ActionsManagerDialog.class) {
             if (me == null) {
-                me = new ActionsManagerDialog(parentWindow);
+                me = new ActionsManagerDialog(parentWindow, controller);
             } else {
                 me.reloadGroups();
             }