Merge pull request #289 from greboid/ned

Use events for showing config in some more plugins.

freedesktop_notifications/src/com/dmdirc/addons/freedesktop_notifications/FDManager.java

@@ -25,12 +25,19 @@ package com.dmdirc.addons.freedesktop_notifications;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.ClientModule.UserConfig;
 import com.dmdirc.DMDircMBassador;
+import com.dmdirc.config.prefs.PluginPreferencesCategory;
+import com.dmdirc.config.prefs.PreferencesCategory;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
+import com.dmdirc.config.prefs.PreferencesSetting;
+import com.dmdirc.config.prefs.PreferencesType;
+import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.plugins.PluginDomain;
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.PluginFilesHelper;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.io.StreamUtils;
@@ -43,6 +50,8 @@ import java.io.IOException;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import net.engio.mbassy.listener.Handler;
+
 @Singleton
 public class FDManager implements ConfigChangeListener {
 
@@ -56,6 +65,7 @@ public class FDManager implements ConfigChangeListener {
     private final PluginFilesHelper filesHelper;
     /** The event bus to post errors to. */
     private final DMDircMBassador eventBus;
+    private final PluginInfo pluginInfo;
     /** notification timeout. */
     private int timeout;
     /** notification icon. */
@@ -71,12 +81,14 @@ public class FDManager implements ConfigChangeListener {
             @UserConfig final ConfigProvider userConfig,
             @PluginDomain(FreeDesktopNotificationsPlugin.class) final String domain,
             final PluginFilesHelper filesHelper,
-            final DMDircMBassador eventBus) {
+            final DMDircMBassador eventBus,
+            @PluginDomain(FreeDesktopNotificationsPlugin.class) final PluginInfo pluginInfo) {
         this.domain = domain;
         this.config = config;
         this.userConfig = userConfig;
         this.filesHelper = filesHelper;
         this.eventBus = eventBus;
+        this.pluginInfo = pluginInfo;
     }
 
     /**
@@ -171,4 +183,33 @@ public class FDManager implements ConfigChangeListener {
         config.removeListener(this);
     }
 
+
+
+    @Handler
+    public void showConfig(final ClientPrefsOpenedEvent event) {
+        final PreferencesDialogModel manager = event.getModel();
+        final PreferencesCategory general = new PluginPreferencesCategory(
+                pluginInfo, "FreeDesktop Notifications",
+                "General configuration for FreeDesktop Notifications plugin.");
+
+        general.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
+                pluginInfo.getDomain(), "general.timeout", "Timeout",
+                "Length of time in seconds before the notification popup closes.",
+                manager.getConfigManager(), manager.getIdentity()));
+        general.addSetting(new PreferencesSetting(PreferencesType.FILE,
+                pluginInfo.getDomain(), "general.icon", "icon",
+                "Path to icon to use on the notification.",
+                manager.getConfigManager(), manager.getIdentity()));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                pluginInfo.getDomain(), "advanced.escapehtml", "Escape HTML",
+                "Some Implementations randomly parse HTML, escape it before showing?",
+                manager.getConfigManager(), manager.getIdentity()));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                pluginInfo.getDomain(), "advanced.stripcodes", "Strip Control Codes",
+                "Strip IRC Control codes from messages?",
+                manager.getConfigManager(), manager.getIdentity()));
+
+        manager.getCategory("Plugins").addSubCategory(general);
+    }
+
 }

freedesktop_notifications/src/com/dmdirc/addons/freedesktop_notifications/FDModule.java

@@ -54,4 +54,10 @@ public class FDModule {
         return new PluginFilesHelper(manager, pluginInfo);
     }
 
+    @Provides
+    @PluginDomain(FreeDesktopNotificationsPlugin.class)
+    public PluginInfo getPluginInfo() {
+        return pluginInfo;
+    }
+
 }

freedesktop_notifications/src/com/dmdirc/addons/freedesktop_notifications/FreeDesktopNotificationsPlugin.java

@@ -22,11 +22,6 @@
 
 package com.dmdirc.addons.freedesktop_notifications;
 
-import com.dmdirc.config.prefs.PluginPreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesDialogModel;
-import com.dmdirc.config.prefs.PreferencesSetting;
-import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.plugins.Exported;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
@@ -38,15 +33,9 @@ import dagger.ObjectGraph;
  */
 public class FreeDesktopNotificationsPlugin extends BaseCommandPlugin {
 
-    /** This plugin's plugin info. */
-    private final PluginInfo pluginInfo;
     /** Manager to show notifications. */
     private FDManager manager;
 
-    public FreeDesktopNotificationsPlugin(final PluginInfo pluginInfo) {
-        this.pluginInfo = pluginInfo;
-    }
-
     @Override
     public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
         super.load(pluginInfo, graph);
@@ -81,35 +70,9 @@ public class FreeDesktopNotificationsPlugin extends BaseCommandPlugin {
      * Called when this plugin is Unloaded.
      */
     @Override
-    public synchronized void onUnload() {
+    public void onUnload() {
         manager.onUnLoad();
         super.onUnload();
     }
 
-    @Override
-    public void showConfig(final PreferencesDialogModel manager) {
-        final PreferencesCategory general = new PluginPreferencesCategory(
-                pluginInfo, "FreeDesktop Notifications",
-                "General configuration for FreeDesktop Notifications plugin.");
-
-        general.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
-                pluginInfo.getDomain(), "general.timeout", "Timeout",
-                "Length of time in seconds before the notification popup closes.",
-                manager.getConfigManager(), manager.getIdentity()));
-        general.addSetting(new PreferencesSetting(PreferencesType.FILE,
-                pluginInfo.getDomain(), "general.icon", "icon",
-                "Path to icon to use on the notification.",
-                manager.getConfigManager(), manager.getIdentity()));
-        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                pluginInfo.getDomain(), "advanced.escapehtml", "Escape HTML",
-                "Some Implementations randomly parse HTML, escape it before showing?",
-                manager.getConfigManager(), manager.getIdentity()));
-        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                pluginInfo.getDomain(), "advanced.stripcodes", "Strip Control Codes",
-                "Strip IRC Control codes from messages?",
-                manager.getConfigManager(), manager.getIdentity()));
-
-        manager.getCategory("Plugins").addSubCategory(general);
-    }
-
 }

identd/src/com/dmdirc/addons/identd/IdentModule.java

@@ -44,4 +44,10 @@ public class IdentModule {
         return pluginInfo.getDomain();
     }
 
+    @Provides
+    @PluginDomain(IdentdPlugin.class)
+    public PluginInfo getPluginInfo() {
+        return pluginInfo;
+    }
+
 }

identd/src/com/dmdirc/addons/identd/IdentdManager.java

@@ -24,12 +24,20 @@ package com.dmdirc.addons.identd;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
+import com.dmdirc.config.prefs.PluginPreferencesCategory;
+import com.dmdirc.config.prefs.PreferencesCategory;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
+import com.dmdirc.config.prefs.PreferencesSetting;
+import com.dmdirc.config.prefs.PreferencesType;
+import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.events.ServerConnectErrorEvent;
 import com.dmdirc.events.ServerConnectedEvent;
 import com.dmdirc.events.ServerConnectingEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
+import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.util.validators.PortValidator;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -50,11 +58,14 @@ public class IdentdManager {
     private final IdentdServer server;
     /** Event bus to subscribe to events on. */
     private final DMDircMBassador eventBus;
+    private final PluginInfo pluginInfo;
 
     @Inject
     public IdentdManager(@GlobalConfig final AggregateConfigProvider config,
             @PluginDomain(IdentdPlugin.class) final String domain,
+            @PluginDomain(IdentdPlugin.class) final PluginInfo pluginInfo,
             final IdentdServer server, final DMDircMBassador eventBus) {
+        this.pluginInfo = pluginInfo;
         connections = new ArrayList<>();
         this.config = config;
         this.domain = domain;
@@ -113,4 +124,78 @@ public class IdentdManager {
             }
     }
 
+
+
+    @Handler
+    public void showConfig(final ClientPrefsOpenedEvent event) {
+        final PreferencesDialogModel manager = event.getModel();
+        final PreferencesCategory general = new PluginPreferencesCategory(
+                pluginInfo, "Identd",
+                "General Identd Plugin config ('Lower' options take priority "
+                        + "over those above them)");
+        final PreferencesCategory advanced = new PluginPreferencesCategory(
+                pluginInfo, "Advanced",
+                "Advanced Identd Plugin config - Only edit these if you need "
+                        + "to/know what you are doing. Editing these could prevent "
+                        + "access to some servers. ('Lower' options take priority over "
+                        + "those above them)");
+
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                domain, "general.useUsername", "Use connection "
+                + "username rather than system username", "If this is enabled,"
+                + " the username for the connection will be used rather than '"
+                + System.getProperty("user.name") + '\'',
+                manager.getConfigManager(), manager.getIdentity()));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                domain, "general.useNickname", "Use connection "
+                + "nickname rather than system username", "If this is enabled, "
+                + "the nickname for the connection will be used rather than '"
+                + System.getProperty("user.name") + '\'',
+                manager.getConfigManager(), manager.getIdentity()));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                domain, "general.useCustomName", "Use custom name" + " all the time",
+                "If this is enabled, the name specified below" + " will be used all the time",
+                manager.getConfigManager(),
+                manager.getIdentity()));
+        general.addSetting(new PreferencesSetting(PreferencesType.TEXT,
+                domain, "general.customName", "Custom Name to use",
+                "The custom name to use when 'Use Custom Name' is enabled",
+                manager.getConfigManager(), manager.getIdentity()));
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                domain, "advanced.alwaysOn", "Always have ident " + "port open",
+                "By default the identd only runs when there are "
+                        + "active connection attempts. This overrides that.",
+                manager.getConfigManager(), manager.getIdentity()));
+        advanced.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
+                new PortValidator(), domain, "advanced.port",
+                "What port should the identd listen on", "Default port is 113,"
+                + " this is probably useless if changed unless you port forward"
+                + " ident to a different port", manager.getConfigManager(),
+                manager.getIdentity()));
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                domain, "advanced.useCustomSystem", "Use custom OS",
+                "By default the plugin uses 'UNIX' or 'WIN32' as the system "
+                        + "type, this can be overridden by enabling this.",
+                manager.getConfigManager(), manager.getIdentity()));
+        advanced.addSetting(new PreferencesSetting(PreferencesType.TEXT,
+                domain, "advanced.customSystem", "Custom OS to use",
+                "The custom system to use when 'Use Custom System' is enabled",
+                manager.getConfigManager(), manager.getIdentity()));
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                domain, "advanced.isHiddenUser", "Respond to ident"
+                + " requests with HIDDEN-USER error", "By default the plugin will"
+                + " give a USERID response, this can force an 'ERROR :"
+                + " HIDDEN-USER' response instead.", manager.getConfigManager(),
+                manager.getIdentity()));
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                domain, "advanced.isNoUser", "Respond to ident"
+                + " requests with NO-USER error", "By default the plugin will"
+                + " give a USERID response, this can force an 'ERROR : NO-USER'"
+                + " response instead. (Overrides HIDDEN-USER)",
+                manager.getConfigManager(), manager.getIdentity()));
+
+        manager.getCategory("Plugins").addSubCategory(general);
+        general.addSubCategory(advanced);
+    }
+
 }

identd/src/com/dmdirc/addons/identd/IdentdPlugin.java

@@ -74,75 +74,4 @@ public class IdentdPlugin extends BasePlugin {
         identdManager.onLoad();
     }
 
-    @Override
-    public void showConfig(final PreferencesDialogModel manager) {
-        final PreferencesCategory general = new PluginPreferencesCategory(
-                pluginInfo, "Identd",
-                "General Identd Plugin config ('Lower' options take priority "
-                + "over those above them)");
-        final PreferencesCategory advanced = new PluginPreferencesCategory(
-                pluginInfo, "Advanced",
-                "Advanced Identd Plugin config - Only edit these if you need "
-                + "to/know what you are doing. Editing these could prevent "
-                + "access to some servers. ('Lower' options take priority over "
-                + "those above them)");
-
-        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                domain, "general.useUsername", "Use connection "
-                + "username rather than system username", "If this is enabled,"
-                + " the username for the connection will be used rather than '"
-                + System.getProperty("user.name") + '\'',
-                manager.getConfigManager(), manager.getIdentity()));
-        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                domain, "general.useNickname", "Use connection "
-                + "nickname rather than system username", "If this is enabled, "
-                + "the nickname for the connection will be used rather than '"
-                + System.getProperty("user.name") + '\'',
-                manager.getConfigManager(), manager.getIdentity()));
-        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                domain, "general.useCustomName", "Use custom name" + " all the time",
-                "If this is enabled, the name specified below" + " will be used all the time",
-                manager.getConfigManager(),
-                manager.getIdentity()));
-        general.addSetting(new PreferencesSetting(PreferencesType.TEXT,
-                domain, "general.customName", "Custom Name to use",
-                "The custom name to use when 'Use Custom Name' is enabled",
-                manager.getConfigManager(), manager.getIdentity()));
-        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                domain, "advanced.alwaysOn", "Always have ident " + "port open",
-                "By default the identd only runs when there are "
-                + "active connection attempts. This overrides that.",
-                manager.getConfigManager(), manager.getIdentity()));
-        advanced.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
-                new PortValidator(), domain, "advanced.port",
-                "What port should the identd listen on", "Default port is 113,"
-                + " this is probably useless if changed unless you port forward"
-                + " ident to a different port", manager.getConfigManager(),
-                manager.getIdentity()));
-        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                domain, "advanced.useCustomSystem", "Use custom OS",
-                "By default the plugin uses 'UNIX' or 'WIN32' as the system "
-                + "type, this can be overridden by enabling this.",
-                manager.getConfigManager(), manager.getIdentity()));
-        advanced.addSetting(new PreferencesSetting(PreferencesType.TEXT,
-                domain, "advanced.customSystem", "Custom OS to use",
-                "The custom system to use when 'Use Custom System' is enabled",
-                manager.getConfigManager(), manager.getIdentity()));
-        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                domain, "advanced.isHiddenUser", "Respond to ident"
-                + " requests with HIDDEN-USER error", "By default the plugin will"
-                + " give a USERID response, this can force an 'ERROR :"
-                + " HIDDEN-USER' response instead.", manager.getConfigManager(),
-                manager.getIdentity()));
-        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                domain, "advanced.isNoUser", "Respond to ident"
-                + " requests with NO-USER error", "By default the plugin will"
-                + " give a USERID response, this can force an 'ERROR : NO-USER'"
-                + " response instead. (Overrides HIDDEN-USER)",
-                manager.getConfigManager(), manager.getIdentity()));
-
-        manager.getCategory("Plugins").addSubCategory(general);
-        general.addSubCategory(advanced);
-    }
-
 }

lagdisplay/src/com/dmdirc/addons/lagdisplay/LagDisplayManager.java

@@ -31,6 +31,12 @@ import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
+import com.dmdirc.config.prefs.PluginPreferencesCategory;
+import com.dmdirc.config.prefs.PreferencesCategory;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
+import com.dmdirc.config.prefs.PreferencesSetting;
+import com.dmdirc.config.prefs.PreferencesType;
+import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.events.ServerDisconnectedEvent;
 import com.dmdirc.events.ServerGotPingEvent;
 import com.dmdirc.events.ServerNoPingEvent;
@@ -42,6 +48,7 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.plugins.PluginDomain;
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.util.collections.RollingList;
 
 import java.util.Date;
@@ -71,6 +78,7 @@ public class LagDisplayManager implements ConfigChangeListener {
     private final Provider<LagDisplayPanel> panelProvider;
     /** The settings domain to use. */
     private final String domain;
+    private final PluginInfo pluginInfo;
     /** Config to read global settings from. */
     private final AggregateConfigProvider globalConfig;
     /** A cache of ping times. */
@@ -92,12 +100,14 @@ public class LagDisplayManager implements ConfigChangeListener {
             final ActiveFrameManager activeFrameManager,
             final Provider<LagDisplayPanel> panelProvider,
             @PluginDomain(LagDisplayPlugin.class) final String domain,
+            @PluginDomain(LagDisplayPlugin.class) final PluginInfo pluginInfo,
             @GlobalConfig final AggregateConfigProvider globalConfig) {
         this.eventBus = eventBus;
         this.swingEventBus = swingEventBus;
         this.activeFrameManager = activeFrameManager;
         this.panelProvider = panelProvider;
         this.domain = domain;
+        this.pluginInfo = pluginInfo;
         this.globalConfig = globalConfig;
     }
 
@@ -299,4 +309,31 @@ public class LagDisplayManager implements ConfigChangeListener {
                 .filter(connection::equals).isPresent();
     }
 
+
+
+    @Handler
+    public void showConfig(final ClientPrefsOpenedEvent event) {
+        final PreferencesDialogModel manager = event.getModel();
+        final PreferencesCategory cat = new PluginPreferencesCategory(
+                pluginInfo, "Lag display plugin", "");
+        cat.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                pluginInfo.getDomain(), "usealternate",
+                "Alternate method", "Use an alternate method of determining "
+                + "lag which bypasses bouncers or proxies that may reply?",
+                manager.getConfigManager(), manager.getIdentity()));
+        cat.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                pluginInfo.getDomain(), "graph", "Show graph", "Show a graph of ping times "
+                + "for the current server in the information popup?",
+                manager.getConfigManager(), manager.getIdentity()));
+        cat.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                pluginInfo.getDomain(), "labels", "Show labels", "Show labels on selected "
+                + "points on the ping graph?",
+                manager.getConfigManager(), manager.getIdentity()));
+        cat.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
+                pluginInfo.getDomain(), "history", "Graph points", "Number of data points "
+                + "to plot on the graph, if enabled.",
+                manager.getConfigManager(), manager.getIdentity()));
+        manager.getCategory("Plugins").addSubCategory(cat);
+    }
+
 }

lagdisplay/src/com/dmdirc/addons/lagdisplay/LagDisplayModule.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.lagdisplay;
 
 import com.dmdirc.addons.ui_swing.injection.SwingModule;
 import com.dmdirc.plugins.PluginDomain;
+import com.dmdirc.plugins.PluginInfo;
 
 import dagger.Module;
 import dagger.Provides;
@@ -34,17 +35,22 @@ import dagger.Provides;
 @Module(injects = LagDisplayManager.class, addsTo = SwingModule.class)
 public class LagDisplayModule {
 
-    /** The domain for plugin settings. */
-    private final String domain;
+    private final PluginInfo pluginInfo;
 
-    public LagDisplayModule(final String domain) {
-        this.domain = domain;
+    public LagDisplayModule(final PluginInfo pluginInfo) {
+        this.pluginInfo = pluginInfo;
     }
 
     @Provides
     @PluginDomain(LagDisplayPlugin.class)
     public String getDomain() {
-        return domain;
+        return pluginInfo.getDomain();
+    }
+
+    @Provides
+    @PluginDomain(LagDisplayPlugin.class)
+    public PluginInfo getPluginInfo() {
+        return pluginInfo;
     }
 
 }

lagdisplay/src/com/dmdirc/addons/lagdisplay/LagDisplayPlugin.java

@@ -22,11 +22,6 @@
 
 package com.dmdirc.addons.lagdisplay;
 
-import com.dmdirc.config.prefs.PluginPreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesDialogModel;
-import com.dmdirc.config.prefs.PreferencesSetting;
-import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BasePlugin;
 
@@ -37,25 +32,14 @@ import dagger.ObjectGraph;
  */
 public final class LagDisplayPlugin extends BasePlugin {
 
-    /** This plugin's plugin info. */
-    private final PluginInfo pluginInfo;
     /** The manager currently in use. */
     private LagDisplayManager manager;
 
-    /**
-     * Creates a new LagDisplayPlugin.
-     *
-     * @param pluginInfo This plugin's plugin info
-     */
-    public LagDisplayPlugin(final PluginInfo pluginInfo) {
-        this.pluginInfo = pluginInfo;
-    }
-
     @Override
     public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
         super.load(pluginInfo, graph);
 
-        setObjectGraph(graph.plus(new LagDisplayModule(pluginInfo.getDomain())));
+        setObjectGraph(graph.plus(new LagDisplayModule(pluginInfo)));
         manager = getObjectGraph().get(LagDisplayManager.class);
     }
 
@@ -68,29 +52,4 @@ public final class LagDisplayPlugin extends BasePlugin {
     public void onUnload() {
         manager.unload();
     }
-
-    @Override
-    public void showConfig(final PreferencesDialogModel manager) {
-        final PreferencesCategory cat = new PluginPreferencesCategory(
-                pluginInfo, "Lag display plugin", "");
-        cat.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                pluginInfo.getDomain(), "usealternate",
-                "Alternate method", "Use an alternate method of determining "
-                + "lag which bypasses bouncers or proxies that may reply?",
-                manager.getConfigManager(), manager.getIdentity()));
-        cat.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                pluginInfo.getDomain(), "graph", "Show graph", "Show a graph of ping times "
-                + "for the current server in the information popup?",
-                manager.getConfigManager(), manager.getIdentity()));
-        cat.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                pluginInfo.getDomain(), "labels", "Show labels", "Show labels on selected "
-                + "points on the ping graph?",
-                manager.getConfigManager(), manager.getIdentity()));
-        cat.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
-                pluginInfo.getDomain(), "history", "Graph points", "Number of data points "
-                + "to plot on the graph, if enabled.",
-                manager.getConfigManager(), manager.getIdentity()));
-        manager.getCategory("Plugins").addSubCategory(cat);
-    }
-
 }

logging/src/com/dmdirc/addons/logging/LoggingManager.java

@@ -27,6 +27,11 @@ import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
+import com.dmdirc.config.prefs.PluginPreferencesCategory;
+import com.dmdirc.config.prefs.PreferencesCategory;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
+import com.dmdirc.config.prefs.PreferencesSetting;
+import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.events.BaseChannelActionEvent;
 import com.dmdirc.events.BaseChannelMessageEvent;
 import com.dmdirc.events.BaseQueryActionEvent;
@@ -41,6 +46,7 @@ import com.dmdirc.events.ChannelOpenedEvent;
 import com.dmdirc.events.ChannelPartEvent;
 import com.dmdirc.events.ChannelQuitEvent;
 import com.dmdirc.events.ChannelTopicChangeEvent;
+import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.events.QueryClosedEvent;
 import com.dmdirc.events.QueryOpenedEvent;
 import com.dmdirc.events.UserErrorEvent;
@@ -52,6 +58,7 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.plugins.PluginDomain;
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.Styliser;
@@ -97,6 +104,7 @@ public class LoggingManager implements ConfigChangeListener {
     private static final Object FORMAT_LOCK = new Object();
     /** This plugin's plugin info. */
     private final String domain;
+    private final PluginInfo pluginInfo;
     /** Global config. */
     private final AggregateConfigProvider config;
     /** The manager to add history windows to. */
@@ -125,12 +133,14 @@ public class LoggingManager implements ConfigChangeListener {
 
     @Inject
     public LoggingManager(@PluginDomain(LoggingPlugin.class) final String domain,
+            @PluginDomain(LoggingPlugin.class) final PluginInfo pluginInfo,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final WindowManager windowManager, final DMDircMBassador eventBus,
             @Directory(LoggingModule.LOGS_DIRECTORY) final Provider<String> directoryProvider,
             final BackBufferFactory backBufferFactory,
             final LogFileLocator locator) {
         this.domain = domain;
+        this.pluginInfo = pluginInfo;
         this.config = globalConfig;
         this.windowManager = windowManager;
         this.eventBus = eventBus;
@@ -603,6 +613,83 @@ public class LoggingManager implements ConfigChangeListener {
         backbufferLines = config.getOptionInt(domain, "backbuffer.lines");
     }
 
+    @Handler
+    public void showConfig(final ClientPrefsOpenedEvent event) {
+        final PreferencesDialogModel manager = event.getModel();
+        final PreferencesCategory general = new PluginPreferencesCategory(
+                pluginInfo, "Logging", "General configuration for Logging plugin.");
+        final PreferencesCategory backbuffer = new PluginPreferencesCategory(
+                pluginInfo, "Back Buffer", "Options related to the automatic backbuffer");
+        final PreferencesCategory advanced = new PluginPreferencesCategory(
+                pluginInfo, "Advanced",
+                "Advanced configuration for Logging plugin. You shouldn't need to edit this unless you know what you are doing.");
+
+        general.addSetting(new PreferencesSetting(PreferencesType.DIRECTORY,
+                pluginInfo.getDomain(), "general.directory", "Directory",
+                "Directory for log files", manager.getConfigManager(),
+                manager.getIdentity()));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                pluginInfo.getDomain(), "general.networkfolders",
+                "Separate logs by network",
+                "Should the files be stored in a sub-dir with the networks name?",
+                manager.getConfigManager(), manager.getIdentity()));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                pluginInfo.getDomain(), "general.addtime", "Timestamp logs",
+                "Should a timestamp be added to the log files?",
+                manager.getConfigManager(), manager.getIdentity()));
+        general.addSetting(new PreferencesSetting(PreferencesType.TEXT,
+                pluginInfo.getDomain(), "general.timestamp", "Timestamp format",
+                "The String to pass to 'SimpleDateFormat' to format the timestamp",
+                manager.getConfigManager(), manager.getIdentity()));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                pluginInfo.getDomain(), "general.stripcodes", "Strip Control Codes",
+                "Remove known irc control codes from lines before saving?",
+                manager.getConfigManager(), manager.getIdentity()));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                pluginInfo.getDomain(), "general.channelmodeprefix",
+                "Show channel mode prefix", "Show the @,+ etc next to nicknames",
+                manager.getConfigManager(), manager.getIdentity()));
+
+        backbuffer.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                pluginInfo.getDomain(), "backbuffer.autobackbuffer", "Automatically display",
+                "Automatically display the backbuffer when a channel is joined",
+                manager.getConfigManager(), manager.getIdentity()));
+        backbuffer.addSetting(new PreferencesSetting(PreferencesType.COLOUR,
+                pluginInfo.getDomain(), "backbuffer.colour", "Colour to use for display",
+                "Colour used when displaying the backbuffer",
+                manager.getConfigManager(), manager.getIdentity()));
+        backbuffer.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
+                pluginInfo.getDomain(), "backbuffer.lines", "Number of lines to show",
+                "Number of lines used when displaying backbuffer",
+                manager.getConfigManager(), manager.getIdentity()));
+        backbuffer.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                pluginInfo.getDomain(), "backbuffer.timestamp", "Show Formatter-Timestamp",
+                "Should the line be added to the frame with the timestamp from "
+                        + "the formatter aswell as the file contents",
+                manager.getConfigManager(), manager.getIdentity()));
+
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                pluginInfo.getDomain(), "advanced.filenamehash", "Add Filename hash",
+                "Add the MD5 hash of the channel/client name to the filename. "
+                        + "(This is used to allow channels with similar names "
+                        + "(ie a _ not a  -) to be logged separately)",
+                manager.getConfigManager(), manager.getIdentity()));
+
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                pluginInfo.getDomain(), "advanced.usedate", "Use Date directories",
+                "Should the log files be in separate directories based on the date?",
+                manager.getConfigManager(), manager.getIdentity()));
+        advanced.addSetting(new PreferencesSetting(PreferencesType.TEXT,
+                pluginInfo.getDomain(), "advanced.usedateformat", "Archive format",
+                "The String to pass to 'SimpleDateFormat' to format the "
+                        + "directory name(s) for archiving",
+                manager.getConfigManager(), manager.getIdentity()));
+
+        general.addSubCategory(backbuffer.setInline());
+        general.addSubCategory(advanced.setInline());
+        manager.getCategory("Plugins").addSubCategory(general.setInlineAfter());
+    }
+
     /** Open File. */
     private static class OpenFile {
 

logging/src/com/dmdirc/addons/logging/LoggingModule.java

@@ -30,6 +30,7 @@ import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
+import com.dmdirc.plugins.PluginInfo;
 
 import java.io.File;
 
@@ -44,16 +45,16 @@ public class LoggingModule {
 
     public static final String LOGS_DIRECTORY = "logs";
 
-    private final String domain;
+    private final PluginInfo pluginInfo;
 
-    public LoggingModule(final String domain) {
-        this.domain = domain;
+    public LoggingModule(final PluginInfo pluginInfo) {
+        this.pluginInfo = pluginInfo;
     }
 
     @Provides
     @PluginDomain(LoggingPlugin.class)
     public String getDomain() {
-        return domain;
+        return pluginInfo.getDomain();
     }
 
     @Provides
@@ -72,4 +73,10 @@ public class LoggingModule {
         return globalConfig.getOptionString(domain, "general.directory");
     }
 
+    @Provides
+    @PluginDomain(LoggingPlugin.class)
+    public PluginInfo getPluginInfo() {
+        return pluginInfo;
+    }
+
 }

logging/src/com/dmdirc/addons/logging/LoggingPlugin.java

@@ -22,11 +22,6 @@
 
 package com.dmdirc.addons.logging;
 
-import com.dmdirc.config.prefs.PluginPreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesDialogModel;
-import com.dmdirc.config.prefs.PreferencesSetting;
-import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
@@ -37,26 +32,14 @@ import dagger.ObjectGraph;
  */
 public class LoggingPlugin extends BaseCommandPlugin {
 
-    /** This plugin's plugin info. */
-    private final PluginInfo pluginInfo;
-
     /** The manager in use. */
     private LoggingManager manager;
 
-    /**
-     * Creates a new instance of this plugin.
-     *
-     * @param pluginInfo This plugin's plugin info
-     */
-    public LoggingPlugin(final PluginInfo pluginInfo) {
-        this.pluginInfo = pluginInfo;
-    }
-
     @Override
     public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
         super.load(pluginInfo, graph);
 
-        setObjectGraph(graph.plus(new LoggingModule(pluginInfo.getDomain())));
+        setObjectGraph(graph.plus(new LoggingModule(pluginInfo)));
         manager = getObjectGraph().get(LoggingManager.class);
 
         registerCommand(LoggingCommand.class, LoggingCommand.INFO);
@@ -74,80 +57,4 @@ public class LoggingPlugin extends BaseCommandPlugin {
         manager.unload();
     }
 
-    @Override
-    public void showConfig(final PreferencesDialogModel manager) {
-        final PreferencesCategory general = new PluginPreferencesCategory(
-                pluginInfo, "Logging", "General configuration for Logging plugin.");
-        final PreferencesCategory backbuffer = new PluginPreferencesCategory(
-                pluginInfo, "Back Buffer", "Options related to the automatic backbuffer");
-        final PreferencesCategory advanced = new PluginPreferencesCategory(
-                pluginInfo, "Advanced",
-                "Advanced configuration for Logging plugin. You shouldn't need to edit this unless you know what you are doing.");
-
-        general.addSetting(new PreferencesSetting(PreferencesType.DIRECTORY,
-                pluginInfo.getDomain(), "general.directory", "Directory",
-                "Directory for log files", manager.getConfigManager(),
-                manager.getIdentity()));
-        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                pluginInfo.getDomain(), "general.networkfolders",
-                "Separate logs by network",
-                "Should the files be stored in a sub-dir with the networks name?",
-                manager.getConfigManager(), manager.getIdentity()));
-        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                pluginInfo.getDomain(), "general.addtime", "Timestamp logs",
-                "Should a timestamp be added to the log files?",
-                manager.getConfigManager(), manager.getIdentity()));
-        general.addSetting(new PreferencesSetting(PreferencesType.TEXT,
-                pluginInfo.getDomain(), "general.timestamp", "Timestamp format",
-                "The String to pass to 'SimpleDateFormat' to format the timestamp",
-                manager.getConfigManager(), manager.getIdentity()));
-        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                pluginInfo.getDomain(), "general.stripcodes", "Strip Control Codes",
-                "Remove known irc control codes from lines before saving?",
-                manager.getConfigManager(), manager.getIdentity()));
-        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                pluginInfo.getDomain(), "general.channelmodeprefix",
-                "Show channel mode prefix", "Show the @,+ etc next to nicknames",
-                manager.getConfigManager(), manager.getIdentity()));
-
-        backbuffer.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                pluginInfo.getDomain(), "backbuffer.autobackbuffer", "Automatically display",
-                "Automatically display the backbuffer when a channel is joined",
-                manager.getConfigManager(), manager.getIdentity()));
-        backbuffer.addSetting(new PreferencesSetting(PreferencesType.COLOUR,
-                pluginInfo.getDomain(), "backbuffer.colour", "Colour to use for display",
-                "Colour used when displaying the backbuffer",
-                manager.getConfigManager(), manager.getIdentity()));
-        backbuffer.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
-                pluginInfo.getDomain(), "backbuffer.lines", "Number of lines to show",
-                "Number of lines used when displaying backbuffer",
-                manager.getConfigManager(), manager.getIdentity()));
-        backbuffer.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                pluginInfo.getDomain(), "backbuffer.timestamp", "Show Formatter-Timestamp",
-                "Should the line be added to the frame with the timestamp from "
-                + "the formatter aswell as the file contents",
-                manager.getConfigManager(), manager.getIdentity()));
-
-        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                pluginInfo.getDomain(), "advanced.filenamehash", "Add Filename hash",
-                "Add the MD5 hash of the channel/client name to the filename. "
-                + "(This is used to allow channels with similar names "
-                + "(ie a _ not a  -) to be logged separately)",
-                manager.getConfigManager(), manager.getIdentity()));
-
-        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                pluginInfo.getDomain(), "advanced.usedate", "Use Date directories",
-                "Should the log files be in separate directories based on the date?",
-                manager.getConfigManager(), manager.getIdentity()));
-        advanced.addSetting(new PreferencesSetting(PreferencesType.TEXT,
-                pluginInfo.getDomain(), "advanced.usedateformat", "Archive format",
-                "The String to pass to 'SimpleDateFormat' to format the "
-                + "directory name(s) for archiving",
-                manager.getConfigManager(), manager.getIdentity()));
-
-        general.addSubCategory(backbuffer.setInline());
-        general.addSubCategory(advanced.setInline());
-        manager.getCategory("Plugins").addSubCategory(general.setInlineAfter());
-    }
-
 }

osd/src/com/dmdirc/addons/osd/OsdManager.java

@@ -23,39 +23,80 @@
 package com.dmdirc.addons.osd;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.injection.MainWindow;
+import com.dmdirc.config.prefs.CategoryChangeListener;
+import com.dmdirc.config.prefs.PluginPreferencesCategory;
+import com.dmdirc.config.prefs.PreferencesCategory;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
+import com.dmdirc.config.prefs.PreferencesInterface;
+import com.dmdirc.config.prefs.PreferencesSetting;
+import com.dmdirc.config.prefs.PreferencesType;
+import com.dmdirc.config.prefs.SettingChangeListener;
+import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.interfaces.config.IdentityController;
+import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.messages.ColourManager;
+import com.dmdirc.ui.messages.ColourManagerFactory;
+import com.dmdirc.util.validators.NumericalValidator;
+import com.dmdirc.util.validators.OptionalValidator;
 
 import java.awt.Window;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Queue;
 
+import javax.inject.Inject;
+
+import net.engio.mbassy.listener.Handler;
+
 /**
  * Class to manage OSD Windows.
  */
-public class OsdManager {
+public class OsdManager implements CategoryChangeListener, PreferencesInterface,
+        SettingChangeListener {
 
     /** The frame the OSD will be associated with. */
     private final Window mainFrame;
-    /** The controller to read/write settings with. */
-    private final IdentityController identityController;
-    /** The colour manager to use to parse colours. */
-    private final ColourManager colourManager;
     /** List of OSD Windows. */
     private final List<OsdWindow> windowList = new ArrayList<>();
     /** List of messages to be queued. */
     private final Queue<QueuedMessage> windowQueue = new LinkedList<>();
     /** This plugin's settings domain. */
     private final String domain;
+    /** Config OSD Window. */
+    private OsdWindow osdWindow;
+    /** X-axis position of OSD. */
+    private int x;
+    /** Y-axis potion of OSD. */
+    private int y;
+    /** Setting objects with registered change listeners. */
+    private PreferencesSetting fontSizeSetting;
+    private PreferencesSetting backgroundSetting;
+    private PreferencesSetting foregroundSetting;
+    private PreferencesSetting widthSetting;
+    private PreferencesSetting timeoutSetting;
+    private PreferencesSetting maxWindowsSetting;
+    /** This plugin's plugin info. */
+    private final PluginInfo pluginInfo;
+    /** The controller to read/write settings with. */
+    private final IdentityController identityController;
+    /** The manager to use to parse colours. */
+    private final ColourManager colourManager;
 
-    public OsdManager(final Window mainFrame, final IdentityController identityController,
-            final ColourManager colourManager, final PluginInfo pluginInfo) {
+    @Inject
+    public OsdManager(
+            @MainWindow final Window mainFrame,
+            final IdentityController identityController,
+            final ColourManagerFactory colourManagerFactory,
+            @PluginDomain(OsdPlugin.class) final PluginInfo pluginInfo) {
         this.mainFrame = mainFrame;
         this.identityController = identityController;
-        this.colourManager = colourManager;
+        this.colourManager = colourManagerFactory.getColourManager(identityController.getGlobalConfiguration());
+        this.pluginInfo = pluginInfo;
         this.domain = pluginInfo.getDomain();
     }
 
@@ -97,8 +138,9 @@ public class OsdManager {
      * @param message Text to display in the OSD window.
      */
     private synchronized void displayWindow(final int timeout, final String message) {
-        final OsdPolicy policy = OsdPolicy.valueOf(identityController.getGlobalConfiguration()
-                .getOption(domain, "newbehaviour").toUpperCase());
+        final OsdPolicy policy = OsdPolicy.valueOf(
+                identityController.getGlobalConfiguration().getOption(domain, "newbehaviour")
+                        .toUpperCase());
         final int startY = identityController.getGlobalConfiguration()
                 .getOptionInt(domain, "locationY");
 
@@ -167,4 +209,116 @@ public class OsdManager {
         return windowList.size();
     }
 
+    @Handler
+    public void showConfig(final ClientPrefsOpenedEvent event) {
+        final PreferencesDialogModel manager = event.getModel();
+        x = identityController.getGlobalConfiguration()
+                .getOptionInt(domain, "locationX");
+        y = identityController.getGlobalConfiguration()
+                .getOptionInt(domain, "locationY");
+
+        final PreferencesCategory category = new PluginPreferencesCategory(
+                pluginInfo, "OSD",
+                "General configuration for OSD plugin.", "category-osd");
+
+        fontSizeSetting = new PreferencesSetting(PreferencesType.INTEGER,
+                domain, "fontSize", "Font size", "Changes the font " + "size of the OSD",
+                manager.getConfigManager(),
+                manager.getIdentity()).registerChangeListener(this);
+        backgroundSetting = new PreferencesSetting(PreferencesType.COLOUR,
+                domain, "bgcolour", "Background colour",
+                "Background colour for the OSD", manager.getConfigManager(),
+                manager.getIdentity()).registerChangeListener(this);
+        foregroundSetting = new PreferencesSetting(PreferencesType.COLOUR,
+                domain, "fgcolour", "Foreground colour",
+                "Foreground colour for the OSD", manager.getConfigManager(),
+                manager.getIdentity()).registerChangeListener(this);
+        widthSetting = new PreferencesSetting(PreferencesType.INTEGER,
+                domain, "width", "OSD Width", "Width of the OSD Window",
+                manager.getConfigManager(), manager.getIdentity())
+                .registerChangeListener(this);
+        timeoutSetting = new PreferencesSetting(PreferencesType.OPTIONALINTEGER,
+                new OptionalValidator(new NumericalValidator(1, Integer.MAX_VALUE)),
+                domain, "timeout", "Timeout", "Length of time in "
+                + "seconds before the OSD window closes", manager.getConfigManager(),
+                manager.getIdentity());
+        maxWindowsSetting = new PreferencesSetting(PreferencesType.OPTIONALINTEGER,
+                new OptionalValidator(new NumericalValidator(1, Integer.MAX_VALUE)),
+                domain, "maxWindows", "Maximum open windows",
+                "Maximum number of OSD windows that will be displayed at any given time",
+                manager.getConfigManager(), manager.getIdentity());
+
+        category.addSetting(fontSizeSetting);
+        category.addSetting(backgroundSetting);
+        category.addSetting(foregroundSetting);
+        category.addSetting(widthSetting);
+        category.addSetting(timeoutSetting);
+        category.addSetting(maxWindowsSetting);
+
+        final Map<String, String> posOptions = new HashMap<>();
+
+        //Populate policy MULTICHOICE
+        for (OsdPolicy policy : OsdPolicy.values()) {
+            posOptions.put(policy.name(), policy.getDescription());
+        }
+
+        category.addSetting(new PreferencesSetting(domain, "newbehaviour",
+                "New window policy", "What to do when an OSD Window "
+                + "is opened when there are other, existing windows open",
+                posOptions, manager.getConfigManager(), manager.getIdentity()));
+
+        category.addChangeListener(this);
+        manager.getCategory("Plugins").addSubCategory(category);
+        manager.registerSaveListener(this);
+    }
+
+    @Override
+    public void categorySelected(final PreferencesCategory category) {
+        osdWindow = new OsdWindow(mainFrame, identityController, this, colourManager,
+                -1, "Please drag this OSD to position", true, x, y, domain);
+        osdWindow.setBackgroundColour(backgroundSetting.getValue());
+        osdWindow.setForegroundColour(foregroundSetting.getValue());
+        osdWindow.setFontSize(Integer.parseInt(fontSizeSetting.getValue()));
+    }
+
+    @Override
+    public void categoryDeselected(final PreferencesCategory category) {
+        x = osdWindow.getLocationOnScreen().x;
+        y = osdWindow.getLocationOnScreen().y;
+
+        osdWindow.dispose();
+        osdWindow = null;
+    }
+
+    @Override
+    public void save() {
+        identityController.getUserSettings().setOption(domain, "locationX", x);
+        identityController.getUserSettings().setOption(domain, "locationY", y);
+    }
+
+    @Override
+    public void settingChanged(final PreferencesSetting setting) {
+        if (osdWindow == null) {
+            // They've changed categories but are somehow poking settings.
+            // Ignore the request.
+            return;
+        }
+
+        if (setting.equals(fontSizeSetting)) {
+            osdWindow.setFontSize(Integer.parseInt(setting.getValue()));
+        } else if (setting.equals(backgroundSetting)) {
+            osdWindow.setBackgroundColour(setting.getValue());
+        } else if (setting.equals(foregroundSetting)) {
+            osdWindow.setForegroundColour(setting.getValue());
+        } else if (setting.equals(widthSetting)) {
+            int width = 500;
+            try {
+                width = Integer.parseInt(setting.getValue());
+            } catch (NumberFormatException e) {
+                //Ignore
+            }
+            osdWindow.setSize(width, osdWindow.getHeight());
+        }
+    }
+
 }

osd/src/com/dmdirc/addons/osd/OsdModule.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2006-2015 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.osd;
+
+import com.dmdirc.addons.ui_swing.injection.SwingModule;
+import com.dmdirc.plugins.PluginDomain;
+import com.dmdirc.plugins.PluginInfo;
+
+import dagger.Module;
+import dagger.Provides;
+
+/**
+ * Dependency injection module for the OSD plugin.
+ */
+@Module(injects = {OsdManager.class, OsdCommand.class}, addsTo = SwingModule.class)
+public class OsdModule {
+
+    private final PluginInfo pluginInfo;
+
+    public OsdModule(final PluginInfo pluginInfo) {
+        this.pluginInfo = pluginInfo;
+    }
+
+    @Provides
+    @PluginDomain(OsdPlugin.class)
+    public PluginInfo getPluginInfo() {
+        return pluginInfo;
+    }
+}

osd/src/com/dmdirc/addons/osd/OsdPlugin.java

@@ -22,193 +22,29 @@
 
 package com.dmdirc.addons.osd;
 
-import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.config.prefs.CategoryChangeListener;
-import com.dmdirc.config.prefs.PluginPreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesDialogModel;
-import com.dmdirc.config.prefs.PreferencesInterface;
-import com.dmdirc.config.prefs.PreferencesSetting;
-import com.dmdirc.config.prefs.PreferencesType;
-import com.dmdirc.config.prefs.SettingChangeListener;
-import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.plugins.Exported;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
-import com.dmdirc.ui.messages.ColourManager;
-import com.dmdirc.util.validators.NumericalValidator;
-import com.dmdirc.util.validators.OptionalValidator;
 
-import java.awt.Frame;
-import java.util.HashMap;
-import java.util.Map;
+import dagger.ObjectGraph;
 
 /**
  * Allows the user to display on-screen-display messages.
  */
-public class OsdPlugin extends BaseCommandPlugin implements
-        CategoryChangeListener, PreferencesInterface, SettingChangeListener {
+public class OsdPlugin extends BaseCommandPlugin {
 
-    /** Config OSD Window. */
-    private OsdWindow osdWindow;
-    /** The OSD Manager that this plugin is using. */
-    private final OsdManager osdManager;
-    /** X-axis position of OSD. */
-    private int x;
-    /** Y-axis potion of OSD. */
-    private int y;
-    /** Setting objects with registered change listeners. */
-    private PreferencesSetting fontSizeSetting;
-    private PreferencesSetting backgroundSetting;
-    private PreferencesSetting foregroundSetting;
-    private PreferencesSetting widthSetting;
-    private PreferencesSetting timeoutSetting;
-    private PreferencesSetting maxWindowsSetting;
-    /** This plugin's plugin info. */
-    private final PluginInfo pluginInfo;
-    /** The controller to read/write settings with. */
-    private final IdentityController identityController;
-    /** The manager to use to parse colours. */
-    private final ColourManager colourManager;
-    /** The frame that the OSDs will be associated with. */
-    private final Frame mainFrame;
-    /** This plugin's settings domain. */
-    private final String domain;
-
-    /**
-     * Creates a new instance of this plugin.
-     *
-     * @param swingController    The controller that owns this plugin.
-     * @param pluginInfo         This plugin's plugin info
-     * @param identityController The controller to use to read and write settings.
-     * @param commandController  Command controller to register commands
-     * @param colourManager      The manager to use to parse colours.
-     */
-    public OsdPlugin(
-            final SwingController swingController,
-            final PluginInfo pluginInfo,
-            final IdentityController identityController,
-            final CommandController commandController,
-            final ColourManager colourManager) {
-        this.pluginInfo = pluginInfo;
-        this.identityController = identityController;
-        this.colourManager = colourManager;
-        this.mainFrame = swingController.getMainFrame();
-        this.domain = pluginInfo.getDomain();
-        osdManager = new OsdManager(mainFrame, identityController, colourManager, pluginInfo);
-        registerCommand(new OsdCommand(commandController, osdManager), OsdCommand.INFO);
-    }
-
-    @Override
-    public void showConfig(final PreferencesDialogModel manager) {
-        x = identityController.getGlobalConfiguration()
-                .getOptionInt(domain, "locationX");
-        y = identityController.getGlobalConfiguration()
-                .getOptionInt(domain, "locationY");
-
-        final PreferencesCategory category = new PluginPreferencesCategory(
-                pluginInfo, "OSD",
-                "General configuration for OSD plugin.", "category-osd");
-
-        fontSizeSetting = new PreferencesSetting(PreferencesType.INTEGER,
-                domain, "fontSize", "Font size", "Changes the font " + "size of the OSD",
-                manager.getConfigManager(),
-                manager.getIdentity()).registerChangeListener(this);
-        backgroundSetting = new PreferencesSetting(PreferencesType.COLOUR,
-                domain, "bgcolour", "Background colour",
-                "Background colour for the OSD", manager.getConfigManager(),
-                manager.getIdentity()).registerChangeListener(this);
-        foregroundSetting = new PreferencesSetting(PreferencesType.COLOUR,
-                domain, "fgcolour", "Foreground colour",
-                "Foreground colour for the OSD", manager.getConfigManager(),
-                manager.getIdentity()).registerChangeListener(this);
-        widthSetting = new PreferencesSetting(PreferencesType.INTEGER,
-                domain, "width", "OSD Width", "Width of the OSD Window",
-                manager.getConfigManager(), manager.getIdentity())
-                .registerChangeListener(this);
-        timeoutSetting = new PreferencesSetting(PreferencesType.OPTIONALINTEGER,
-                new OptionalValidator(new NumericalValidator(1, Integer.MAX_VALUE)),
-                domain, "timeout", "Timeout", "Length of time in "
-                + "seconds before the OSD window closes", manager.getConfigManager(),
-                manager.getIdentity());
-        maxWindowsSetting = new PreferencesSetting(PreferencesType.OPTIONALINTEGER,
-                new OptionalValidator(new NumericalValidator(1, Integer.MAX_VALUE)),
-                domain, "maxWindows", "Maximum open windows",
-                "Maximum number of OSD windows that will be displayed at any given time",
-                manager.getConfigManager(), manager.getIdentity());
-
-        category.addSetting(fontSizeSetting);
-        category.addSetting(backgroundSetting);
-        category.addSetting(foregroundSetting);
-        category.addSetting(widthSetting);
-        category.addSetting(timeoutSetting);
-        category.addSetting(maxWindowsSetting);
-
-        final Map<String, String> posOptions = new HashMap<>();
-
-        //Populate policy MULTICHOICE
-        for (OsdPolicy policy : OsdPolicy.values()) {
-            posOptions.put(policy.name(), policy.getDescription());
-        }
 
-        category.addSetting(new PreferencesSetting(domain, "newbehaviour",
-                "New window policy", "What to do when an OSD Window "
-                + "is opened when there are other, existing windows open",
-                posOptions, manager.getConfigManager(), manager.getIdentity()));
-
-        category.addChangeListener(this);
-        manager.getCategory("Plugins").addSubCategory(category);
-        manager.registerSaveListener(this);
-    }
-
-    @Override
-    public void categorySelected(final PreferencesCategory category) {
-        osdWindow = new OsdWindow(mainFrame, identityController, osdManager, colourManager,
-                -1, "Please drag this OSD to position", true, x, y, domain);
-        osdWindow.setBackgroundColour(backgroundSetting.getValue());
-        osdWindow.setForegroundColour(foregroundSetting.getValue());
-        osdWindow.setFontSize(Integer.parseInt(fontSizeSetting.getValue()));
-    }
-
-    @Override
-    public void categoryDeselected(final PreferencesCategory category) {
-        x = osdWindow.getLocationOnScreen().x;
-        y = osdWindow.getLocationOnScreen().y;
-
-        osdWindow.dispose();
-        osdWindow = null;
-    }
+    /** The OSD Manager that this plugin is using. */
+    private OsdManager osdManager;
 
     @Override
-    public void save() {
-        identityController.getUserSettings().setOption(domain, "locationX", x);
-        identityController.getUserSettings().setOption(domain, "locationY", y);
-    }
+    public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
+        super.load(pluginInfo, graph);
 
-    @Override
-    public void settingChanged(final PreferencesSetting setting) {
-        if (osdWindow == null) {
-            // They've changed categories but are somehow poking settings.
-            // Ignore the request.
-            return;
-        }
+        setObjectGraph(graph.plus(new OsdModule(pluginInfo)));
+        osdManager = getObjectGraph().get(OsdManager.class);
 
-        if (setting.equals(fontSizeSetting)) {
-            osdWindow.setFontSize(Integer.parseInt(setting.getValue()));
-        } else if (setting.equals(backgroundSetting)) {
-            osdWindow.setBackgroundColour(setting.getValue());
-        } else if (setting.equals(foregroundSetting)) {
-            osdWindow.setForegroundColour(setting.getValue());
-        } else if (setting.equals(widthSetting)) {
-            int width = 500;
-            try {
-                width = Integer.parseInt(setting.getValue());
-            } catch (NumberFormatException e) {
-                //Ignore
-            }
-            osdWindow.setSize(width, osdWindow.getHeight());
-        }
+        registerCommand(OsdCommand.class, OsdCommand.INFO);
     }
 
     /**

systray/src/com/dmdirc/addons/systray/SystrayManager.java

@@ -25,10 +25,17 @@ package com.dmdirc.addons.systray;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.config.prefs.PluginPreferencesCategory;
+import com.dmdirc.config.prefs.PreferencesCategory;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
+import com.dmdirc.config.prefs.PreferencesSetting;
+import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.events.ClientMinimisedEvent;
+import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.addons.ui_swing.components.IconManager;
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.messages.Styliser;
 
 import java.awt.AWTException;
@@ -48,6 +55,7 @@ import net.engio.mbassy.listener.Handler;
 
 public class SystrayManager implements ActionListener, MouseListener {
 
+    private final PluginInfo pluginInfo;
     /** Main frame instance. */
     private final MainFrame mainFrame;
     /** This plugin's settings domain. */
@@ -65,11 +73,13 @@ public class SystrayManager implements ActionListener, MouseListener {
     public SystrayManager(
             @GlobalConfig final AggregateConfigProvider globalConfig,
             @PluginDomain(SystrayPlugin.class) final String domain,
+            @PluginDomain(SystrayPlugin.class) final PluginInfo pluginInfo,
             final MainFrame mainFrame,
             final IconManager iconManager,
             final DMDircMBassador eventBus) {
         this.globalConfig = globalConfig;
         this.domain = domain;
+        this.pluginInfo = pluginInfo;
         this.mainFrame = mainFrame;
         this.iconManager = iconManager;
         this.eventBus = eventBus;
@@ -158,6 +168,22 @@ public class SystrayManager implements ActionListener, MouseListener {
         }
     }
 
+    @Handler
+    public void showConfig(final ClientPrefsOpenedEvent event) {
+        final PreferencesDialogModel manager = event.getModel();
+        final PreferencesCategory category = new PluginPreferencesCategory(
+                pluginInfo, "System Tray",
+                "General configuration settings");
+
+        category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                pluginInfo.getDomain(), "autominimise", "Auto-hide DMDirc when minimised",
+                "If this option is enabled, the systray plugin will hide DMDirc"
+                        + " to the system tray whenever DMDirc is minimised",
+                manager.getConfigManager(), manager.getIdentity()));
+
+        manager.getCategory("Plugins").addSubCategory(category);
+    }
+
     @Override
     public void mousePressed(final MouseEvent e) {
         //Ignore

systray/src/com/dmdirc/addons/systray/SystrayModule.java

@@ -44,4 +44,10 @@ public class SystrayModule {
         return pluginInfo.getDomain();
     }
 
+    @Provides
+    @PluginDomain(SystrayPlugin.class)
+    public PluginInfo getPluginInfo() {
+        return pluginInfo;
+    }
+
 }

systray/src/com/dmdirc/addons/systray/SystrayPlugin.java

@@ -22,11 +22,6 @@
 
 package com.dmdirc.addons.systray;
 
-import com.dmdirc.config.prefs.PluginPreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesDialogModel;
-import com.dmdirc.config.prefs.PreferencesSetting;
-import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.plugins.Exported;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
@@ -42,20 +37,9 @@ import dagger.ObjectGraph;
  */
 public class SystrayPlugin extends BaseCommandPlugin {
 
-    /** This plugin's plugin info. */
-    private final PluginInfo pluginInfo;
     /** Systray manager. */
     private SystrayManager manager;
 
-    /**
-     * Creates a new system tray plugin.
-     *
-     * @param pluginInfo This plugin's plugin info.
-     */
-    public SystrayPlugin(final PluginInfo pluginInfo) {
-        this.pluginInfo = pluginInfo;
-    }
-
     @Override
     public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
         super.load(pluginInfo, graph);
@@ -97,20 +81,4 @@ public class SystrayPlugin extends BaseCommandPlugin {
         manager.unload();
         super.onUnload();
     }
-
-    @Override
-    public void showConfig(final PreferencesDialogModel manager) {
-        final PreferencesCategory category = new PluginPreferencesCategory(
-                pluginInfo, "System Tray",
-                "General configuration settings");
-
-        category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                pluginInfo.getDomain(), "autominimise", "Auto-hide DMDirc when minimised",
-                "If this option is enabled, the systray plugin will hide DMDirc"
-                + " to the system tray whenever DMDirc is minimised",
-                manager.getConfigManager(), manager.getIdentity()));
-
-        manager.getCategory("Plugins").addSubCategory(category);
-    }
-
 }

windowflashing/src/com/dmdirc/addons/windowflashing/WindowFlashing.java

@@ -22,11 +22,6 @@
 
 package com.dmdirc.addons.windowflashing;
 
-import com.dmdirc.config.prefs.PluginPreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesDialogModel;
-import com.dmdirc.config.prefs.PreferencesSetting;
-import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.plugins.Exported;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
@@ -40,19 +35,12 @@ public class WindowFlashing extends BaseCommandPlugin {
 
     /** Window flashing manager. */
     private WindowFlashingManager manager;
-    /** This plugin's plugin info. */
-    private PluginInfo pluginInfo;
-
-    public WindowFlashing(final PluginInfo pluginInfo) {
-        this.pluginInfo = pluginInfo;
-    }
 
     @Override
     public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
         super.load(pluginInfo, graph);
-        this.pluginInfo = pluginInfo;
 
-        setObjectGraph(graph.plus(new WindowFlashingModule()));
+        setObjectGraph(graph.plus(new WindowFlashingModule(pluginInfo)));
         registerCommand(FlashWindow.class, FlashWindow.INFO);
         manager = getObjectGraph().get(WindowFlashingManager.class);
     }
@@ -80,33 +68,4 @@ public class WindowFlashing extends BaseCommandPlugin {
         manager.onUnload();
     }
 
-    @Override
-    public void showConfig(final PreferencesDialogModel manager) {
-        final PreferencesCategory category = new PluginPreferencesCategory(
-                pluginInfo, "Window Flashing",
-                "General configuration for window flashing plugin.");
-
-        category.addSetting(new PreferencesSetting(
-                PreferencesType.OPTIONALINTEGER, pluginInfo.getDomain(), "blinkrate",
-                "Blink rate", "Specifies the rate at which the taskbar and or "
-                + "caption will blink, if unspecified this will be your cursor "
-                + "blink rate.",
-                manager.getConfigManager(), manager.getIdentity()));
-        category.addSetting(new PreferencesSetting(
-                PreferencesType.OPTIONALINTEGER, pluginInfo.getDomain(), "flashcount",
-                "Flash count", "Specifies the number of times to blink, if "
-                + "unspecified this will blink indefinitely",
-                manager.getConfigManager(), manager.getIdentity()));
-        category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                pluginInfo.getDomain(), "flashtaskbar", "Flash taskbar",
-                "Should the taskbar entry flash?",
-                manager.getConfigManager(), manager.getIdentity()));
-        category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                pluginInfo.getDomain(), "flashcaption", "Flash caption",
-                "Should the window caption flash?",
-                manager.getConfigManager(), manager.getIdentity()));
-
-        manager.getCategory("Plugins").addSubCategory(category);
-    }
-
 }

windowflashing/src/com/dmdirc/addons/windowflashing/WindowFlashingManager.java

@@ -27,8 +27,16 @@ import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.config.ConfigBinder;
 import com.dmdirc.config.ConfigBinding;
+import com.dmdirc.config.prefs.PluginPreferencesCategory;
+import com.dmdirc.config.prefs.PreferencesCategory;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
+import com.dmdirc.config.prefs.PreferencesSetting;
+import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.events.ClientFocusGainedEvent;
+import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.plugins.PluginDomain;
+import com.dmdirc.plugins.PluginInfo;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -44,6 +52,7 @@ import net.engio.mbassy.listener.Handler;
 @Singleton
 public class WindowFlashingManager {
 
+    private final PluginInfo pluginInfo;
     /** Swing main frame. */
     private final MainFrame mainFrame;
     /** Event bus. */
@@ -70,8 +79,10 @@ public class WindowFlashingManager {
     @Inject
     public WindowFlashingManager(
             @GlobalConfig final AggregateConfigProvider config,
+            @PluginDomain(WindowFlashing.class) final PluginInfo pluginInfo,
             final MainFrame mainFrame,
             final DMDircMBassador eventBus) {
+        this.pluginInfo = pluginInfo;
         this.mainFrame = mainFrame;
         this.eventBus = eventBus;
         binder = config.getBinder();
@@ -165,4 +176,36 @@ public class WindowFlashingManager {
         }
     }
 
+
+
+    @Handler
+    public void showConfig(final ClientPrefsOpenedEvent event) {
+        final PreferencesDialogModel manager = event.getModel();
+        final PreferencesCategory category = new PluginPreferencesCategory(
+                pluginInfo, "Window Flashing",
+                "General configuration for window flashing plugin.");
+
+        category.addSetting(new PreferencesSetting(
+                PreferencesType.OPTIONALINTEGER, pluginInfo.getDomain(), "blinkrate",
+                "Blink rate", "Specifies the rate at which the taskbar and or "
+                + "caption will blink, if unspecified this will be your cursor "
+                + "blink rate.",
+                manager.getConfigManager(), manager.getIdentity()));
+        category.addSetting(new PreferencesSetting(
+                PreferencesType.OPTIONALINTEGER, pluginInfo.getDomain(), "flashcount",
+                "Flash count", "Specifies the number of times to blink, if "
+                + "unspecified this will blink indefinitely",
+                manager.getConfigManager(), manager.getIdentity()));
+        category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                pluginInfo.getDomain(), "flashtaskbar", "Flash taskbar",
+                "Should the taskbar entry flash?",
+                manager.getConfigManager(), manager.getIdentity()));
+        category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                pluginInfo.getDomain(), "flashcaption", "Flash caption",
+                "Should the window caption flash?",
+                manager.getConfigManager(), manager.getIdentity()));
+
+        manager.getCategory("Plugins").addSubCategory(category);
+    }
+
 }

windowflashing/src/com/dmdirc/addons/windowflashing/WindowFlashingModule.java

@@ -23,12 +23,27 @@
 package com.dmdirc.addons.windowflashing;
 
 import com.dmdirc.addons.ui_swing.injection.SwingModule;
+import com.dmdirc.plugins.PluginDomain;
+import com.dmdirc.plugins.PluginInfo;
 
 import dagger.Module;
+import dagger.Provides;
 
 /**
  * DI Module for the window flashing module.
  */
 @Module(injects = {WindowFlashingManager.class, FlashWindow.class}, addsTo = SwingModule.class)
 public class WindowFlashingModule {
+
+    private final PluginInfo pluginInfo;
+
+    public WindowFlashingModule(final PluginInfo pluginInfo) {
+        this.pluginInfo = pluginInfo;
+    }
+
+    @Provides
+    @PluginDomain(WindowFlashing.class)
+    public PluginInfo getPluginInfo() {
+        return pluginInfo;
+    }
 }