Przeglądaj źródła

Fix OSD Plugin.

pull/291/head
Greg Holmes 9 lat temu
rodzic
commit
09f11e6b89

+ 11
- 0
osd/src/com/dmdirc/addons/osd/OsdManager.java Wyświetl plik

22
 
22
 
23
 package com.dmdirc.addons.osd;
23
 package com.dmdirc.addons.osd;
24
 
24
 
25
+import com.dmdirc.DMDircMBassador;
25
 import com.dmdirc.addons.ui_swing.UIUtilities;
26
 import com.dmdirc.addons.ui_swing.UIUtilities;
26
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
27
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
27
 import com.dmdirc.config.prefs.CategoryChangeListener;
28
 import com.dmdirc.config.prefs.CategoryChangeListener;
82
     private PreferencesSetting maxWindowsSetting;
83
     private PreferencesSetting maxWindowsSetting;
83
     /** This plugin's plugin info. */
84
     /** This plugin's plugin info. */
84
     private final PluginInfo pluginInfo;
85
     private final PluginInfo pluginInfo;
86
+    private final DMDircMBassador eventBus;
85
     /** The controller to read/write settings with. */
87
     /** The controller to read/write settings with. */
86
     private final IdentityController identityController;
88
     private final IdentityController identityController;
87
     /** The manager to use to parse colours. */
89
     /** The manager to use to parse colours. */
90
     @Inject
92
     @Inject
91
     public OsdManager(
93
     public OsdManager(
92
             @MainWindow final Window mainFrame,
94
             @MainWindow final Window mainFrame,
95
+            final DMDircMBassador eventBus,
93
             final IdentityController identityController,
96
             final IdentityController identityController,
94
             final ColourManagerFactory colourManagerFactory,
97
             final ColourManagerFactory colourManagerFactory,
95
             @PluginDomain(OsdPlugin.class) final PluginInfo pluginInfo) {
98
             @PluginDomain(OsdPlugin.class) final PluginInfo pluginInfo) {
96
         this.mainFrame = mainFrame;
99
         this.mainFrame = mainFrame;
100
+        this.eventBus = eventBus;
97
         this.identityController = identityController;
101
         this.identityController = identityController;
98
         this.colourManager = colourManagerFactory.getColourManager(identityController.getGlobalConfiguration());
102
         this.colourManager = colourManagerFactory.getColourManager(identityController.getGlobalConfiguration());
99
         this.pluginInfo = pluginInfo;
103
         this.pluginInfo = pluginInfo;
321
         }
325
         }
322
     }
326
     }
323
 
327
 
328
+    public void onLoad() {
329
+        eventBus.subscribe(this);
330
+    }
331
+
332
+    public void onUnload() {
333
+        eventBus.subscribe(this);
334
+    }
324
 }
335
 }

+ 10
- 0
osd/src/com/dmdirc/addons/osd/OsdPlugin.java Wyświetl plik

47
         registerCommand(OsdCommand.class, OsdCommand.INFO);
47
         registerCommand(OsdCommand.class, OsdCommand.INFO);
48
     }
48
     }
49
 
49
 
50
+    @Override
51
+    public void onLoad() {
52
+        osdManager.onLoad();
53
+    }
54
+
55
+    @Override
56
+    public void onUnload() {
57
+        osdManager.onUnload();
58
+    }
59
+
50
     /**
60
     /**
51
      * Shows an OSD with the specified message, title is ignored, exported method used for
61
      * Shows an OSD with the specified message, title is ignored, exported method used for
52
      * showNotification.
62
      * showNotification.

Ładowanie…
Anuluj
Zapisz