Browse Source

Remove deprecated UI methods from Systray plugin

Change-Id: I15047d6cdb1f642059a2989ce020842a55d251cc
Fixes-issue: 4413
Reviewed-on: http://gerrit.dmdirc.com/1465
Reviewed-by: Gregory Holmes <greg@dmdirc.com>
Automatic-Compile: Chris Smith <chris@dmdirc.com>
tags/0.6.5
Chris Smith 14 years ago
parent
commit
2d72cf17ae
1 changed files with 15 additions and 8 deletions
  1. 15
    8
      src/com/dmdirc/addons/systray/SystrayPlugin.java

+ 15
- 8
src/com/dmdirc/addons/systray/SystrayPlugin.java View File

@@ -26,7 +26,7 @@ import com.dmdirc.Main;
26 26
 import com.dmdirc.actions.ActionManager;
27 27
 import com.dmdirc.actions.CoreActionType;
28 28
 import com.dmdirc.actions.interfaces.ActionType;
29
-import com.dmdirc.addons.ui_swing.MainFrame;
29
+import com.dmdirc.addons.ui_swing.SwingController;
30 30
 import com.dmdirc.config.IdentityManager;
31 31
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
32 32
 import com.dmdirc.config.prefs.PreferencesCategory;
@@ -35,6 +35,7 @@ import com.dmdirc.config.prefs.PreferencesSetting;
35 35
 import com.dmdirc.config.prefs.PreferencesType;
36 36
 import com.dmdirc.util.validators.ValidationResponse;
37 37
 import com.dmdirc.plugins.Plugin;
38
+import com.dmdirc.plugins.PluginManager;
38 39
 import com.dmdirc.ui.IconManager;
39 40
 import com.dmdirc.ui.messages.Styliser;
40 41
 
@@ -109,7 +110,9 @@ public final class SystrayPlugin extends Plugin implements ActionListener,
109 110
     @Override
110 111
     public void actionPerformed(final ActionEvent e) {
111 112
         if (e.getActionCommand().equals("Show/hide")) {
112
-            Main.getUI().getMainWindow().setVisible(!Main.getUI().getMainWindow().isVisible());
113
+            final SwingController controller = (SwingController) PluginManager
114
+                    .getPluginManager().getPluginInfoByName("ui_swing").getPlugin();
115
+            controller.getMainWindow().setVisible(!controller.getMainWindow().isVisible());
113 116
         } else if (e.getActionCommand().equals("Quit")) {
114 117
             Main.quit();
115 118
         }
@@ -171,12 +174,14 @@ public final class SystrayPlugin extends Plugin implements ActionListener,
171 174
     @Override
172 175
     public void mouseClicked(final MouseEvent e) {
173 176
         if (e.getButton() == MouseEvent.BUTTON1) {
174
-            if (Main.getUI().getMainWindow().isVisible()) {
175
-                Main.getUI().getMainWindow().setVisible(false);
177
+            final SwingController controller = (SwingController) PluginManager
178
+                    .getPluginManager().getPluginInfoByName("ui_swing").getPlugin();
179
+            if (controller.getMainWindow().isVisible()) {
180
+                controller.getMainWindow().setVisible(false);
176 181
             } else {
177
-                Main.getUI().getMainWindow().setVisible(true);
178
-                ((MainFrame) Main.getUI().getMainWindow()).setState(Frame.NORMAL);
179
-                ((MainFrame) Main.getUI().getMainWindow()).toFront();
182
+                controller.getMainWindow().setVisible(true);
183
+                controller.getMainWindow().setState(Frame.NORMAL);
184
+                controller.getMainWindow().toFront();
180 185
             }
181 186
         }
182 187
     }
@@ -228,7 +233,9 @@ public final class SystrayPlugin extends Plugin implements ActionListener,
228 233
         if (type == CoreActionType.CLIENT_MINIMISED
229 234
                 && IdentityManager.getGlobalConfig().getOptionBool(getDomain(),
230 235
                 "autominimise")) {
231
-            Main.getUI().getMainWindow().setVisible(false);
236
+            final SwingController controller = (SwingController) PluginManager
237
+                    .getPluginManager().getPluginInfoByName("ui_swing").getPlugin();
238
+            controller.getMainWindow().setVisible(false);
232 239
         }
233 240
     }
234 241
 

Loading…
Cancel
Save