issue 1898: AMD is now a top level window, AED is modal only to the AMD

src/com/dmdirc/ui/swing/dialogs/actionsmanager/ActionsGroupPanel.java

@@ -25,12 +25,12 @@ package com.dmdirc.ui.swing.dialogs.actionsmanager;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionGroup;
 import com.dmdirc.actions.ActionManager;
-import com.dmdirc.ui.swing.SwingController;
 import com.dmdirc.ui.swing.components.PackingTable;
 import com.dmdirc.ui.swing.components.renderers.ActionTypeTableCellRenderer;
 import com.dmdirc.ui.swing.components.renderers.ArrayCellRenderer;
 import com.dmdirc.ui.swing.dialogs.actioneditor.ActionEditorDialog;
 
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
@@ -62,6 +62,8 @@ public final class ActionsGroupPanel extends JPanel implements ActionListener,
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
+    /** Parent dialog. */
+    private Window parent;
     /** Table scrollpane. */
     private JScrollPane scrollPane;
     /** Actions table. */
@@ -82,9 +84,10 @@ public final class ActionsGroupPanel extends JPanel implements ActionListener,
      * 
      * @param group Action group to display
      */
-    public ActionsGroupPanel(final ActionGroup group) {
+    public ActionsGroupPanel(final Window parent, final ActionGroup group) {
         super();
 
+        this.parent = parent;
         this.group = group;
 
         initComponents();
@@ -226,11 +229,9 @@ public final class ActionsGroupPanel extends JPanel implements ActionListener,
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (e.getSource() == add) {
-            ActionEditorDialog.showActionEditorDialog(SwingController.getMainFrame(),
-                    group.getName());
+            ActionEditorDialog.showActionEditorDialog(parent, group.getName());
         } else if (e.getSource() == edit) {
-            ActionEditorDialog.showActionEditorDialog(SwingController.getMainFrame(),
-                    group.getName(),
+            ActionEditorDialog.showActionEditorDialog(parent, group.getName(),
                     model.getAction(
                     table.getRowSorter().convertRowIndexToModel(table.getSelectedRow())));
         } else if (e.getSource() == delete) {

src/com/dmdirc/ui/swing/dialogs/actionsmanager/ActionsManagerDialog.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.ui.swing.dialogs.actionsmanager;
 
-import com.dmdirc.Main;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionGroup;
 import com.dmdirc.actions.ActionManager;
@@ -33,7 +32,7 @@ import com.dmdirc.config.prefs.validator.ActionGroupValidator;
 import com.dmdirc.config.prefs.validator.FileNameValidator;
 import com.dmdirc.config.prefs.validator.ValidatorChain;
 import com.dmdirc.ui.swing.components.TextLabel;
-import com.dmdirc.ui.swing.MainFrame;
+import com.dmdirc.ui.swing.SwingController;
 import com.dmdirc.ui.swing.components.ListScroller;
 import com.dmdirc.ui.swing.components.StandardDialog;
 import com.dmdirc.ui.swing.components.StandardInputDialog;
@@ -97,7 +96,8 @@ public final class ActionsManagerDialog extends StandardDialog implements Action
 
     /** Creates a new instance of ActionsManagerDialog. */
     private ActionsManagerDialog() {
-        super((MainFrame) Main.getUI().getMainWindow(), false);
+        super(null, ModalityType.MODELESS);
+        setIconImage(SwingController.getMainFrame().getIcon().getImage());
 
         initComponents();
         addListeners();
@@ -114,7 +114,7 @@ public final class ActionsManagerDialog extends StandardDialog implements Action
         getActionsManagerDialog();
 
         me.pack();
-        me.setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
+        me.setLocationRelativeTo(SwingController.getMainFrame());
         me.setVisible(true);
         me.requestFocus();
 
@@ -151,7 +151,7 @@ public final class ActionsManagerDialog extends StandardDialog implements Action
         infoLabel = new TextLabel("Actions allow you to make DMDirc" +
                 " intelligently respond to various events.");
         groups = new JList(new DefaultListModel());
-        actions = new ActionsGroupPanel(null);
+        actions = new ActionsGroupPanel(this, null);
         info = new ActionGroupInformationPanel(null);
         settings = new HashMap<ActionGroup, ActionGroupSettingsPanel>();
         activeSettings = new ActionGroupSettingsPanel(null, this);