|
@@ -38,6 +38,7 @@ import com.dmdirc.addons.ui_swing.dialogs.aliases.AliasManagerDialog;
|
38
|
38
|
import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
|
39
|
39
|
import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
|
40
|
40
|
import com.dmdirc.addons.ui_swing.framemanager.windowmenu.WindowMenuFrameManager;
|
|
41
|
+import com.dmdirc.ui.WindowManager;
|
41
|
42
|
|
42
|
43
|
import java.awt.event.ActionEvent;
|
43
|
44
|
import java.awt.event.ActionListener;
|
|
@@ -268,7 +269,7 @@ public class MenuBar extends JMenuBar implements ActionListener, MenuListener {
|
268
|
269
|
} else if (e.getActionCommand().equals("feedback")) {
|
269
|
270
|
FeedbackDialog.showFeedbackDialog(mainFrame);
|
270
|
271
|
} else if (e.getActionCommand().equals("ChannelSettings")) {
|
271
|
|
- final Window activeWindow = controller.getActiveWindow();
|
|
272
|
+ final Window activeWindow = WindowManager.getActiveWindow();
|
272
|
273
|
if (activeWindow instanceof ChannelFrame) {
|
273
|
274
|
controller.showChannelSettingsDialog(((ChannelFrame) activeWindow).
|
274
|
275
|
getChannel());
|
|
@@ -303,7 +304,7 @@ public class MenuBar extends JMenuBar implements ActionListener, MenuListener {
|
303
|
304
|
/** {@inheritDoc} */
|
304
|
305
|
@Override
|
305
|
306
|
public void menuSelected(final MenuEvent e) {
|
306
|
|
- final Window activeWindow = controller.getActiveWindow();
|
|
307
|
+ final Window activeWindow = WindowManager.getActiveWindow();
|
307
|
308
|
|
308
|
309
|
ssd.setEnabled(activeWindow != null && activeWindow.getContainer().
|
309
|
310
|
getServer() != null && activeWindow.getContainer().
|