|
@@ -22,11 +22,15 @@
|
22
|
22
|
|
23
|
23
|
package com.dmdirc.addons.ui_swing.dialogs.actionsmanager;
|
24
|
24
|
|
|
25
|
+import com.dmdirc.addons.ui_swing.components.frames.AppleJFrame;
|
25
|
26
|
import com.dmdirc.actions.Action;
|
26
|
27
|
import com.dmdirc.actions.ActionGroup;
|
27
|
28
|
import com.dmdirc.actions.ActionManager;
|
28
|
29
|
import com.dmdirc.actions.CoreActionType;
|
29
|
30
|
import com.dmdirc.actions.interfaces.ActionType;
|
|
31
|
+import com.dmdirc.addons.ui_swing.Apple;
|
|
32
|
+import com.dmdirc.addons.ui_swing.MainFrame;
|
|
33
|
+import com.dmdirc.addons.ui_swing.SwingController;
|
30
|
34
|
import com.dmdirc.config.IdentityManager;
|
31
|
35
|
import com.dmdirc.config.prefs.validator.ActionGroupValidator;
|
32
|
36
|
import com.dmdirc.config.prefs.validator.FileNameValidator;
|
|
@@ -98,8 +102,9 @@ public final class ActionsManagerDialog extends StandardDialog implements Action
|
98
|
102
|
/**
|
99
|
103
|
* Creates a new instance of ActionsManagerDialog.
|
100
|
104
|
*/
|
101
|
|
- private ActionsManagerDialog(final Window parentWindow) {
|
102
|
|
- super(null, ModalityType.MODELESS);
|
|
105
|
+ private ActionsManagerDialog(final Window parentWindow, final SwingController controller) {
|
|
106
|
+ super(Apple.isAppleUI() ? new AppleJFrame((MainFrame) parentWindow, controller) :
|
|
107
|
+ null, ModalityType.MODELESS);
|
103
|
108
|
|
104
|
109
|
initComponents();
|
105
|
110
|
addListeners();
|
|
@@ -116,8 +121,8 @@ public final class ActionsManagerDialog extends StandardDialog implements Action
|
116
|
121
|
*
|
117
|
122
|
* @param parentWindow Parent window
|
118
|
123
|
*/
|
119
|
|
- public static void showActionsManagerDialog(final Window parentWindow) {
|
120
|
|
- getActionsManagerDialog(parentWindow);
|
|
124
|
+ public static void showActionsManagerDialog(final Window parentWindow, final SwingController controller) {
|
|
125
|
+ getActionsManagerDialog(parentWindow, controller);
|
121
|
126
|
|
122
|
127
|
me.setIconImages(parentWindow.getIconImages());
|
123
|
128
|
me.pack();
|
|
@@ -140,10 +145,11 @@ public final class ActionsManagerDialog extends StandardDialog implements Action
|
140
|
145
|
*
|
141
|
146
|
* @return The current ActionsManagerDialog instance
|
142
|
147
|
*/
|
143
|
|
- public static ActionsManagerDialog getActionsManagerDialog(final Window parentWindow) {
|
|
148
|
+ public static ActionsManagerDialog getActionsManagerDialog(final Window parentWindow,
|
|
149
|
+ final SwingController controller) {
|
144
|
150
|
synchronized (ActionsManagerDialog.class) {
|
145
|
151
|
if (me == null) {
|
146
|
|
- me = new ActionsManagerDialog(parentWindow);
|
|
152
|
+ me = new ActionsManagerDialog(parentWindow, controller);
|
147
|
153
|
} else {
|
148
|
154
|
me.reloadGroups();
|
149
|
155
|
}
|