fixes issue 1138: nicklist altBackgroundColour should be under "ui" not "nicklist"

git-svn-id: http://svn.dmdirc.com/trunk@3899 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/config/prefs/PreferencesManager.java

@@ -427,7 +427,7 @@ public class PreferencesManager {
                 "ui", "nicklistforegroundcolour", "false:1", "Nicklist foreground colour",
                 "Foreground colour to use for the nicklist"));
         category.addSetting(new PreferencesSetting(PreferencesType.OPTIONALCOLOUR,
-                "nicklist", "altBackgroundColour", "false:f0f0f0", "Alternate background colour",
+                "ui", "altBackgroundColour", "false:f0f0f0", "Alternate background colour",
                 "Background colour to use for every other nicklist entry"));
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "ui", "sortByMode", "true", "Sort nicklist by user mode",

src/com/dmdirc/ui/swing/ChannelFrame.java

@@ -110,7 +110,7 @@ public final class ChannelFrame extends InputTextFrame implements MouseListener,
         getConfigManager().addChangeListener("ui", "nicklistbackgroundcolour",
                 this);
         getConfigManager().addChangeListener("ui", "backgroundcolour", this);
-        getConfigManager().addChangeListener("nicklist", "altBackgroundColour",
+        getConfigManager().addChangeListener("ui", "altBackgroundColour",
                 this);
 
         commandParser =
@@ -343,12 +343,11 @@ public final class ChannelFrame extends InputTextFrame implements MouseListener,
     public void configChanged(final String domain, final String key) {
         super.configChanged(domain, key);
 
-        if (("ui".equals(domain) || "nicklist".equals(domain)) &&
-                ("altBackgroundColour".equals(key) ||
+        if ("altBackgroundColour".equals(key) ||
                 "nicklistbackgroundcolour".equals(key) ||
                 "backgroundcolour".equals(key) ||
                 "nicklistforegroundcolour".equals(key) ||
-                "foregroundcolour".equals(key))) {
+                "foregroundcolour".equals(key)) {
             nickList.setBackground(getConfigManager().getOptionColour("ui",
                     "nicklistbackgroundcolour",
                     getConfigManager().getOptionColour("ui", "backgroundcolour",

src/com/dmdirc/ui/swing/components/renderers/NicklistRenderer.java

@@ -69,9 +69,9 @@ public final class NicklistRenderer extends DefaultListCellRenderer implements
         config.addChangeListener("ui", "shownickcoloursinnicklist", this);
         config.addChangeListener("ui", "nicklistbackgroundcolour", this);
         config.addChangeListener("ui", "backgroundcolour", this);
-        config.addChangeListener("nicklist", "altBackgroundColour", this);
+        config.addChangeListener("ui", "altBackgroundColour", this);
         altBackgroundColour =
-                config.getOptionColour("nicklist", "altBackgroundColour",
+                config.getOptionColour("ui", "altBackgroundColour",
                 config.getOptionColour("ui", "nicklistbackgroundcolour",
                 config.getOptionColour("ui", "backgroundcolour",
                 Color.WHITE)));
@@ -119,7 +119,7 @@ public final class NicklistRenderer extends DefaultListCellRenderer implements
 
         } else {
             altBackgroundColour =
-                    config.getOptionColour("nicklist", "altBackgroundColour",
+                    config.getOptionColour("ui", "altBackgroundColour",
                     config.getOptionColour("ui", "nicklistbackgroundcolour",
                     config.getOptionColour("ui", "backgroundcolour",
                     Color.WHITE)));