Browse Source

Moves all plugins to use PluginPreferencesCategory

Change-Id: I73ae6bd4eadd67bee7381dc8117ab43b77b9db5b
Reviewed-on: http://gerrit.dmdirc.com/583
Automatic-Compile: Gregory Holmes <greboid@dmdirc.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>
tags/0.6.3
Gregory Holmes 14 years ago
parent
commit
a3fdb4c3a3

+ 3
- 1
src/com/dmdirc/addons/addonbrowser/BrowserPlugin.java View File

@@ -23,6 +23,7 @@
23 23
 
24 24
 package com.dmdirc.addons.addonbrowser;
25 25
 
26
+import com.dmdirc.config.prefs.PluginPreferencesCategory;
26 27
 import com.dmdirc.config.prefs.PreferencesCategory;
27 28
 import com.dmdirc.config.prefs.PreferencesManager;
28 29
 import com.dmdirc.plugins.Plugin;
@@ -45,7 +46,8 @@ public class BrowserPlugin extends Plugin {
45 46
     /** {@inheritDoc} */
46 47
     @Override
47 48
     public void showConfig(final PreferencesManager manager) {
48
-        PreferencesCategory category = new PreferencesCategory("Addon Browser",
49
+        PreferencesCategory category = new PluginPreferencesCategory(
50
+                getPluginInfo(), "Addon Browser",
49 51
                 "This addon is now part of the Swing UI and is no longer " +
50 52
                 "required. The plugin may be manually deleted from your " +
51 53
                 "plugins directory.");

+ 5
- 4
src/com/dmdirc/addons/dcc/DCCPlugin.java View File

@@ -34,6 +34,7 @@ import com.dmdirc.addons.ui_swing.components.text.TextLabel;
34 34
 import com.dmdirc.commandparser.CommandManager;
35 35
 import com.dmdirc.config.Identity;
36 36
 import com.dmdirc.config.IdentityManager;
37
+import com.dmdirc.config.prefs.PluginPreferencesCategory;
37 38
 import com.dmdirc.config.prefs.PreferencesCategory;
38 39
 import com.dmdirc.config.prefs.PreferencesManager;
39 40
 import com.dmdirc.config.prefs.PreferencesSetting;
@@ -563,10 +564,10 @@ public final class DCCPlugin extends Plugin implements ActionListener {
563 564
     /** {@inheritDoc} */
564 565
     @Override
565 566
     public void showConfig(final PreferencesManager manager) {
566
-        final PreferencesCategory general = new PreferencesCategory("DCC", "", "category-dcc");
567
-        final PreferencesCategory firewall = new PreferencesCategory("Firewall", "");
568
-        final PreferencesCategory sending = new PreferencesCategory("Sending", "");
569
-        final PreferencesCategory receiving = new PreferencesCategory("Receiving", "");
567
+        final PreferencesCategory general = new PluginPreferencesCategory(getPluginInfo(), "DCC", "", "category-dcc");
568
+        final PreferencesCategory firewall = new PluginPreferencesCategory(getPluginInfo(), "Firewall", "");
569
+        final PreferencesCategory sending = new PluginPreferencesCategory(getPluginInfo(), "Sending", "");
570
+        final PreferencesCategory receiving = new PluginPreferencesCategory(getPluginInfo(), "Receiving", "");
570 571
 
571 572
         manager.getCategory("Plugins").addSubCategory(general.setInlineAfter());
572 573
         general.addSubCategory(firewall.setInline());

+ 2
- 1
src/com/dmdirc/addons/freedesktop_notifications/FreeDesktopNotificationsPlugin.java View File

@@ -26,6 +26,7 @@ import com.dmdirc.Main;
26 26
 import com.dmdirc.addons.freedesktop_notifications.commons.StringEscapeUtils;
27 27
 import com.dmdirc.commandparser.CommandManager;
28 28
 import com.dmdirc.config.IdentityManager;
29
+import com.dmdirc.config.prefs.PluginPreferencesCategory;
29 30
 import com.dmdirc.config.prefs.PreferencesCategory;
30 31
 import com.dmdirc.config.prefs.PreferencesManager;
31 32
 import com.dmdirc.config.prefs.PreferencesSetting;
@@ -193,7 +194,7 @@ public final class FreeDesktopNotificationsPlugin extends Plugin implements
193 194
     /** {@inheritDoc} */
194 195
     @Override
195 196
     public void showConfig(final PreferencesManager manager) {
196
-        final PreferencesCategory general = new PreferencesCategory("FreeDesktop Notifications", "General configuration for FreeDesktop Notifications plugin.");
197
+        final PreferencesCategory general = new PluginPreferencesCategory(getPluginInfo(), "FreeDesktop Notifications", "General configuration for FreeDesktop Notifications plugin.");
197 198
         
198 199
         general.addSetting(new PreferencesSetting(PreferencesType.INTEGER, getDomain(), "general.timeout", "Timeout", "Length of time in seconds before the notification popup closes."));
199 200
         general.addSetting(new PreferencesSetting(PreferencesType.TEXT, getDomain(), "general.icon", "icon", "Path to icon to use on the notification."));

+ 3
- 2
src/com/dmdirc/addons/identd/IdentdPlugin.java View File

@@ -27,6 +27,7 @@ import com.dmdirc.actions.ActionManager;
27 27
 import com.dmdirc.actions.CoreActionType;
28 28
 import com.dmdirc.actions.interfaces.ActionType;
29 29
 import com.dmdirc.config.IdentityManager;
30
+import com.dmdirc.config.prefs.PluginPreferencesCategory;
30 31
 import com.dmdirc.config.prefs.PreferencesCategory;
31 32
 import com.dmdirc.config.prefs.PreferencesManager;
32 33
 import com.dmdirc.config.prefs.PreferencesSetting;
@@ -111,10 +112,10 @@ public class IdentdPlugin extends Plugin implements ActionListener {
111 112
     /** {@inheritDoc} */
112 113
     @Override
113 114
     public void showConfig(final PreferencesManager manager) {
114
-        final PreferencesCategory general = new PreferencesCategory("Identd",
115
+        final PreferencesCategory general = new PluginPreferencesCategory(getPluginInfo(), "Identd",
115 116
                 "General Identd Plugin config ('Lower' options take priority " +
116 117
                 "over those above them)");
117
-        final PreferencesCategory advanced = new PreferencesCategory("Advanced",
118
+        final PreferencesCategory advanced = new PluginPreferencesCategory(getPluginInfo(), "Advanced",
118 119
                 "Advanced Identd Plugin config - Only edit these if you need " +
119 120
                 "to/know what you are doing. Editing these could prevent " +
120 121
                 "access to some servers. ('Lower' options take priority over " +

+ 3
- 2
src/com/dmdirc/addons/lagdisplay/LagDisplayPlugin.java View File

@@ -31,6 +31,7 @@ import com.dmdirc.actions.interfaces.ActionType;
31 31
 import com.dmdirc.actions.CoreActionType;
32 32
 import com.dmdirc.config.ConfigManager;
33 33
 import com.dmdirc.config.IdentityManager;
34
+import com.dmdirc.config.prefs.PluginPreferencesCategory;
34 35
 import com.dmdirc.config.prefs.PreferencesCategory;
35 36
 import com.dmdirc.config.prefs.PreferencesManager;
36 37
 import com.dmdirc.config.prefs.PreferencesSetting;
@@ -260,8 +261,8 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener, Co
260 261
     /** {@inheritDoc} */
261 262
     @Override
262 263
     public void showConfig(final PreferencesManager manager) {
263
-        final PreferencesCategory cat = new PreferencesCategory("Lag display plugin",
264
-                                                                "");
264
+        final PreferencesCategory cat = new PluginPreferencesCategory(
265
+                getPluginInfo(), "Lag display plugin", "");
265 266
         cat.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
266 267
                 getDomain(), "usealternate",
267 268
                 "Alternate method", "Use an alternate method of determining "

+ 7
- 3
src/com/dmdirc/addons/logging/LoggingPlugin.java View File

@@ -31,6 +31,7 @@ import com.dmdirc.actions.CoreActionType;
31 31
 import com.dmdirc.actions.interfaces.ActionType;
32 32
 import com.dmdirc.commandparser.CommandManager;
33 33
 import com.dmdirc.config.IdentityManager;
34
+import com.dmdirc.config.prefs.PluginPreferencesCategory;
34 35
 import com.dmdirc.config.prefs.PreferencesCategory;
35 36
 import com.dmdirc.config.prefs.PreferencesManager;
36 37
 import com.dmdirc.config.prefs.PreferencesSetting;
@@ -235,9 +236,12 @@ public class LoggingPlugin extends Plugin implements ActionListener,
235 236
     /** {@inheritDoc} */
236 237
     @Override
237 238
     public void showConfig(final PreferencesManager manager) {
238
-        final PreferencesCategory general = new PreferencesCategory("Logging", "General configuration for Logging plugin.");
239
-        final PreferencesCategory backbuffer = new PreferencesCategory("Back Buffer", "Options related to the automatic backbuffer");
240
-        final PreferencesCategory advanced = new PreferencesCategory("Advanced", "Advanced configuration for Logging plugin. You shouldn't need to edit this unless you know what you are doing.");
239
+        final PreferencesCategory general = new PluginPreferencesCategory(
240
+                getPluginInfo(), "Logging", "General configuration for Logging plugin.");
241
+        final PreferencesCategory backbuffer = new PluginPreferencesCategory(
242
+                getPluginInfo(), "Back Buffer", "Options related to the automatic backbuffer");
243
+        final PreferencesCategory advanced = new PluginPreferencesCategory(
244
+                getPluginInfo(), "Advanced", "Advanced configuration for Logging plugin. You shouldn't need to edit this unless you know what you are doing.");
241 245
 
242 246
         general.addSetting(new PreferencesSetting(PreferencesType.TEXT, getDomain(), "general.directory", "Directory", "Directory for log files"));
243 247
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "general.networkfolders", "Separate logs by network", "Should the files be stored in a sub-dir with the networks name?"));

+ 5
- 2
src/com/dmdirc/addons/mediasource_vlc/VlcMediaSourcePlugin.java View File

@@ -25,6 +25,7 @@ package com.dmdirc.addons.mediasource_vlc;
25 25
 import com.dmdirc.addons.nowplaying.MediaSource;
26 26
 import com.dmdirc.addons.nowplaying.MediaSourceState;
27 27
 import com.dmdirc.config.IdentityManager;
28
+import com.dmdirc.config.prefs.PluginPreferencesCategory;
28 29
 import com.dmdirc.config.prefs.PreferencesCategory;
29 30
 import com.dmdirc.config.prefs.PreferencesManager;
30 31
 import com.dmdirc.config.prefs.PreferencesSetting;
@@ -201,9 +202,11 @@ public class VlcMediaSourcePlugin extends Plugin implements MediaSource {
201 202
     /** {@inheritDoc} */
202 203
     @Override
203 204
     public void showConfig(final PreferencesManager manager) {
204
-        final PreferencesCategory general = new PreferencesCategory("VLC Media Source",
205
+        final PreferencesCategory general = new PluginPreferencesCategory(
206
+                getPluginInfo(), "VLC Media Source",
205 207
                 "", "category-vlc");
206
-        final PreferencesCategory instr = new PreferencesCategory("Instructions",
208
+        final PreferencesCategory instr = new PluginPreferencesCategory(
209
+                getPluginInfo(), "Instructions",
207 210
                 "", new InstructionsPanel());
208 211
         
209 212
         general.addSetting(new PreferencesSetting(PreferencesType.TEXT, 

+ 5
- 2
src/com/dmdirc/addons/nickcolours/NickColourPlugin.java View File

@@ -28,6 +28,7 @@ import com.dmdirc.actions.ActionManager;
28 28
 import com.dmdirc.actions.interfaces.ActionType;
29 29
 import com.dmdirc.actions.CoreActionType;
30 30
 import com.dmdirc.config.IdentityManager;
31
+import com.dmdirc.config.prefs.PluginPreferencesCategory;
31 32
 import com.dmdirc.config.prefs.PreferencesCategory;
32 33
 import com.dmdirc.config.prefs.PreferencesManager;
33 34
 import com.dmdirc.config.prefs.PreferencesSetting;
@@ -235,9 +236,11 @@ public final class NickColourPlugin extends Plugin implements ActionListener,
235 236
     /** {@inheritDoc} */
236 237
     @Override
237 238
     public void showConfig(final PreferencesManager manager) {
238
-        final PreferencesCategory general = new PreferencesCategory("Nick Colours",
239
+        final PreferencesCategory general = new PluginPreferencesCategory(
240
+                getPluginInfo(), "Nick Colours",
239 241
                 "General configuration for NickColour plugin.");
240
-        final PreferencesCategory colours = new PreferencesCategory("Colours",
242
+        final PreferencesCategory colours = new PluginPreferencesCategory(
243
+                getPluginInfo(), "Colours",
241 244
                 "Set colours for specific nicknames.", new NickColourPanel(this));
242 245
         
243 246
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,

+ 3
- 1
src/com/dmdirc/addons/nowplaying/NowPlayingPlugin.java View File

@@ -27,6 +27,7 @@ import com.dmdirc.actions.interfaces.ActionType;
27 27
 import com.dmdirc.actions.CoreActionType;
28 28
 import com.dmdirc.commandparser.CommandManager;
29 29
 import com.dmdirc.config.IdentityManager;
30
+import com.dmdirc.config.prefs.PluginPreferencesCategory;
30 31
 import com.dmdirc.config.prefs.PreferencesCategory;
31 32
 import com.dmdirc.config.prefs.PreferencesManager;
32 33
 import com.dmdirc.interfaces.ActionListener;
@@ -101,7 +102,8 @@ public class NowPlayingPlugin extends Plugin implements ActionListener  {
101 102
     public void showConfig(final PreferencesManager manager) {
102 103
         final ConfigPanel configPanel = new ConfigPanel(this, order);
103 104
         
104
-        final PreferencesCategory category = new PreferencesCategory("Now Playing",
105
+        final PreferencesCategory category = new PluginPreferencesCategory(
106
+                getPluginInfo(), "Now Playing",
105 107
                 "", "category-nowplaying", configPanel);
106 108
         manager.getCategory("Plugins").addSubCategory(category);
107 109
     }

+ 3
- 1
src/com/dmdirc/addons/osd/OsdPlugin.java View File

@@ -25,6 +25,7 @@ package com.dmdirc.addons.osd;
25 25
 import com.dmdirc.commandparser.CommandManager;
26 26
 import com.dmdirc.config.IdentityManager;
27 27
 import com.dmdirc.config.prefs.CategoryChangeListener;
28
+import com.dmdirc.config.prefs.PluginPreferencesCategory;
28 29
 import com.dmdirc.config.prefs.PreferencesCategory;
29 30
 import com.dmdirc.config.prefs.PreferencesInterface;
30 31
 import com.dmdirc.config.prefs.PreferencesManager;
@@ -83,7 +84,8 @@ public final class OsdPlugin extends Plugin implements CategoryChangeListener,
83 84
         x = IdentityManager.getGlobalConfig().getOptionInt(getDomain(), "locationX");
84 85
         y = IdentityManager.getGlobalConfig().getOptionInt(getDomain(), "locationY");
85 86
         
86
-        final PreferencesCategory category = new PreferencesCategory("OSD",
87
+        final PreferencesCategory category = new PluginPreferencesCategory(
88
+                getPluginInfo(), "OSD",
87 89
                 "General configuration for OSD plugin.", "category-osd");
88 90
         
89 91
         fontSizeSetting = new PreferencesSetting(PreferencesType.INTEGER,

+ 5
- 2
src/com/dmdirc/addons/parser_twitter/TwitterPlugin.java View File

@@ -22,6 +22,7 @@
22 22
 
23 23
 package com.dmdirc.addons.parser_twitter;
24 24
 
25
+import com.dmdirc.config.prefs.PluginPreferencesCategory;
25 26
 import com.dmdirc.config.prefs.PreferencesCategory;
26 27
 import com.dmdirc.config.prefs.PreferencesManager;
27 28
 import com.dmdirc.config.prefs.PreferencesSetting;
@@ -71,8 +72,10 @@ public class TwitterPlugin extends Plugin  {
71 72
     /** {@inheritDoc} */
72 73
     @Override
73 74
     public void showConfig(final PreferencesManager manager) {
74
-        final PreferencesCategory category = new PreferencesCategory("Twitter Plugin", "Settings related to the twitter plugin");
75
-        final PreferencesCategory advanced = new PreferencesCategory("Advanced", "Advanced Settings related to the twitter plugin");
75
+        final PreferencesCategory category = new PluginPreferencesCategory(
76
+                getPluginInfo(), "Twitter Plugin", "Settings related to the twitter plugin");
77
+        final PreferencesCategory advanced = new PluginPreferencesCategory(
78
+                getPluginInfo(), "Advanced", "Advanced Settings related to the twitter plugin");
76 79
 
77 80
         category.addSetting(new PreferencesSetting(PreferencesType.INTEGER, getDomain(), "statuscount", "Statuses to request", "How many statuses to request at a time.?"));
78 81
         category.addSetting(new PreferencesSetting(PreferencesType.INTEGER, getDomain(), "apicalls", "API Calls", "Aim to only use how many API Calls per hour? (Twitter has a max of 150)"));

+ 3
- 1
src/com/dmdirc/addons/systray/SystrayPlugin.java View File

@@ -29,6 +29,7 @@ import com.dmdirc.actions.interfaces.ActionType;
29 29
 import com.dmdirc.actions.CoreActionType;
30 30
 import com.dmdirc.addons.ui_swing.MainFrame;
31 31
 import com.dmdirc.config.IdentityManager;
32
+import com.dmdirc.config.prefs.PluginPreferencesCategory;
32 33
 import com.dmdirc.config.prefs.PreferencesCategory;
33 34
 import com.dmdirc.config.prefs.PreferencesManager;
34 35
 import com.dmdirc.config.prefs.PreferencesSetting;
@@ -149,7 +150,8 @@ public final class SystrayPlugin extends Plugin implements ActionListener,
149 150
     /** {@inheritDoc} */
150 151
     @Override
151 152
     public void showConfig(final PreferencesManager manager) {
152
-        final PreferencesCategory category = new PreferencesCategory("System Tray", 
153
+        final PreferencesCategory category = new PluginPreferencesCategory(
154
+                getPluginInfo(), "System Tray",
153 155
                 "General configuration settings");
154 156
         
155 157
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,

+ 3
- 1
src/com/dmdirc/addons/windowstatus/WindowStatusPlugin.java View File

@@ -31,6 +31,7 @@ import com.dmdirc.actions.ActionManager;
31 31
 import com.dmdirc.actions.CoreActionType;
32 32
 import com.dmdirc.actions.interfaces.ActionType;
33 33
 import com.dmdirc.config.IdentityManager;
34
+import com.dmdirc.config.prefs.PluginPreferencesCategory;
34 35
 import com.dmdirc.config.prefs.PreferencesCategory;
35 36
 import com.dmdirc.config.prefs.PreferencesManager;
36 37
 import com.dmdirc.config.prefs.PreferencesSetting;
@@ -202,7 +203,8 @@ public final class WindowStatusPlugin extends Plugin implements ActionListener,
202 203
     /** {@inheritDoc} */
203 204
     @Override
204 205
     public void showConfig(final PreferencesManager manager) {
205
-        final PreferencesCategory category = new PreferencesCategory("Window status", "");
206
+        final PreferencesCategory category = new PluginPreferencesCategory(
207
+                getPluginInfo(), "Window status", "");
206 208
 
207 209
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
208 210
                 getDomain(), "channel.shownone", "Show 'none' count",

Loading…
Cancel
Save