Port expanding settings to use prefs components. Remove hardcoded values from settings dialogs.

Fixes CLIENT-26
Fixes CLIENT-88

Depends-On: I2d8a4b2a0adc480a03750abc4d82b4c6809e2ce8
Depends-On: I69c5fd43b97244343b824aa7c2cf1d8bb71ba741

Change-Id: Ica55307fa7527a5c4f835cbb9b5afdfded88c328
Reviewed-on: http://gerrit.dmdirc.com/1836
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/ui_swing/components/ImageButton.java

@@ -30,9 +30,11 @@ import javax.swing.Icon;
 import javax.swing.JButton;
 
 /**
- * Image button.
+ * Image button, also has the ability to hold an object.
+ *
+ * <T> Type of object the button holds.
  */
-public class ImageButton extends JButton {
+public class ImageButton<T> extends JButton {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -40,6 +42,8 @@ public class ImageButton extends JButton {
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 2;
+    /** Button object. */
+    private T object;
 
     /**
      * Creates a new instance of ImageButton.
@@ -95,4 +99,22 @@ public class ImageButton extends JButton {
         setRolloverIcon(icon);
         setPressedIcon(icon);
     }
+
+    /**
+     * Sets the object for this button.
+     *
+     * @param object Object to hold
+     */
+    public void setObject(final T object) {
+        this.object = object;
+    }
+
+    /**
+     * Get's this buttons object.
+     *
+     * @return This button's object
+     */
+    public T getObject() {
+        return object;
+    }
 }

src/com/dmdirc/addons/ui_swing/components/expandingsettings/AddOptionPanel.java

@@ -23,28 +23,18 @@
 package com.dmdirc.addons.ui_swing.components.expandingsettings;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.addons.ui_swing.components.FontPicker;
-import com.dmdirc.addons.ui_swing.components.colours.ColourChooser;
 import com.dmdirc.addons.ui_swing.components.renderers.AddOptionCellRenderer;
-import com.dmdirc.config.prefs.PreferencesType;
 
 import java.awt.Component;
-import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.nio.charset.Charset;
 
-import javax.swing.AbstractAction;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JButton;
-import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
+import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.JSpinner;
-import javax.swing.JTextField;
-import javax.swing.KeyStroke;
-import javax.swing.SpinnerNumberModel;
 
 import net.miginfocom.swing.MigLayout;
 
@@ -69,18 +59,6 @@ public class AddOptionPanel extends JPanel implements ActionListener {
     private JButton addOptionButton;
     /** Current add option input. */
     private Component addInputCurrent;
-    /** Add option colour chooser. */
-    private ColourChooser addInputColourChooser;
-    /** Add option textfield. */
-    private JTextField addInputText;
-    /** Add option checkbox. */
-    private JCheckBox addInputCheckbox;
-    /** Add option checkbox. */
-    private JSpinner addInputSpinner;
-    /** Add option font picker. */
-    private FontPicker addInputFontPicker;
-    /** Add option combobox. */
-    private JComboBox addInputComboBox;
     /** Add option checkbox. */
     private JLabel addInputNone;
 
@@ -108,15 +86,7 @@ public class AddOptionPanel extends JPanel implements ActionListener {
 
         addOptionComboBox.setRenderer(new AddOptionCellRenderer(parent));
 
-        addInputColourChooser = new ColourChooser();
-        addInputText = new JTextField();
-        addInputCheckbox = new JCheckBox();
-        addInputCheckbox.setOpaque(UIUtilities.getTabbedPaneOpaque());
-        addInputSpinner = new JSpinner(new SpinnerNumberModel());
         addInputNone = new JLabel("");
-        addInputFontPicker = new FontPicker("Dialog");
-        addInputComboBox = new JComboBox(new DefaultComboBoxModel());
-        addInputComboBox.setPrototypeDisplayValue("test");
         addInputCurrent = addInputNone;
 
         addOptionComboBox.setEnabled(false);
@@ -126,21 +96,10 @@ public class AddOptionPanel extends JPanel implements ActionListener {
     /** Initialises listeners. */
     private void initListeners() {
         //Only fire events on selection not on highlight
-        addOptionComboBox.putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE);
+        addOptionComboBox.putClientProperty("JComboBox.isTableCellEditor",
+                Boolean.TRUE);
         addOptionComboBox.addActionListener(this);
         addOptionButton.addActionListener(this);
-
-        addInputText.getActionMap().put("enter", new AbstractAction() {
-
-            private static final long serialVersionUID = 2;
-
-            /** {@inheritDoc} */
-            @Override
-            public void actionPerformed(final ActionEvent e) {
-                addOptionButton.doClick();
-            }
-        });
-        addInputText.getInputMap().put(KeyStroke.getKeyStroke("ENTER"), "enter");
     }
 
     /** Lays out the components. */
@@ -161,15 +120,9 @@ public class AddOptionPanel extends JPanel implements ActionListener {
      *
      * @param optionName Option name
      */
-    protected void addOption(final String optionName) {
-        ((DefaultComboBoxModel) addOptionComboBox.getModel()).addElement(
-                optionName);
-        if ("channel.encoding".equals(optionName)) {
-            ((DefaultComboBoxModel) addInputComboBox.getModel()).removeAllElements();
-            for (Object argument : Charset.availableCharsets().keySet()) {
-                ((DefaultComboBoxModel) addInputComboBox.getModel()).addElement(argument);
-            }
-        }
+    protected void addOption(final JComponent setting) {
+        ((DefaultComboBoxModel) addOptionComboBox.getModel())
+                .addElement(setting);
         addOptionButton.setEnabled(true);
         addOptionComboBox.setEnabled(true);
     }
@@ -179,9 +132,9 @@ public class AddOptionPanel extends JPanel implements ActionListener {
      *
      * @param optionName Option name
      */
-    protected void delOption(final String optionName) {
-        ((DefaultComboBoxModel) addOptionComboBox.getModel()).removeElement(
-                optionName);
+    protected void delOption(final JComponent setting) {
+        ((DefaultComboBoxModel) addOptionComboBox.getModel())
+                .removeElement(setting);
         if (addOptionComboBox.getModel().getSize() == 0) {
             addOptionComboBox.setEnabled(false);
             addOptionButton.setEnabled(false);
@@ -200,37 +153,11 @@ public class AddOptionPanel extends JPanel implements ActionListener {
      *
      * @param type Option type
      */
-    private void switchInputField(final PreferencesType type) {
-        if (type == null) {
+    private void switchInputField(final JComponent setting) {
+        if (setting == null) {
             addInputCurrent = addInputNone;
         } else {
-            switch (type) {
-                case TEXT:
-                    addInputText.setText("");
-                    addInputCurrent = addInputText;
-                    break;
-                case BOOLEAN:
-                    addInputCheckbox.setSelected(false);
-                    addInputCurrent = addInputCheckbox;
-                    break;
-                case COLOUR:
-                    addInputColourChooser.clearColour();
-                    addInputCurrent = addInputColourChooser;
-                    break;
-                case INTEGER:
-                    addInputSpinner.setValue(0);
-                    addInputCurrent = addInputSpinner;
-                    break;
-                case FONT:
-                    addInputCurrent = addInputFontPicker;
-                    break;
-                case MULTICHOICE:
-                    addInputCurrent = addInputComboBox;
-                    break;
-                default:
-                    addInputCurrent = addInputNone;
-                    break;
-            }
+            addInputCurrent = setting;
         }
 
         layoutComponents();
@@ -250,53 +177,10 @@ public class AddOptionPanel extends JPanel implements ActionListener {
                 addOptionComboBox.setEnabled(false);
                 addOptionButton.setEnabled(false);
             }
-            switchInputField(parent.getOptionType(
-                    (String) addOptionComboBox.getSelectedItem()));
+            switchInputField(((JComponent) addOptionComboBox.getSelectedItem()));
         } else if (e.getSource() == addOptionButton) {
-            final PreferencesType type = parent.getOptionType(
-                    (String) addOptionComboBox.getSelectedItem());
-
-            switch (type) {
-                case TEXT:
-                    parent.addCurrentOption(
-                            (String) addOptionComboBox.getSelectedItem(),
-                            type,
-                            addInputText.getText());
-                    break;
-                case BOOLEAN:
-                    parent.addCurrentOption(
-                            (String) addOptionComboBox.getSelectedItem(),
-                            type,
-                            String.valueOf(addInputCheckbox.isSelected()));
-                    break;
-                case COLOUR:
-                    parent.addCurrentOption(
-                            (String) addOptionComboBox.getSelectedItem(),
-                            type,
-                            addInputColourChooser.getColour());
-                    break;
-                case INTEGER:
-                    parent.addCurrentOption(
-                            (String) addOptionComboBox.getSelectedItem(),
-                            type,
-                            addInputSpinner.getValue().toString());
-                    break;
-                case FONT:
-                    parent.addCurrentOption(
-                            (String) addOptionComboBox.getSelectedItem(),
-                            type,
-                            ((Font) addInputFontPicker.getSelectedItem()).getFamily());
-                    break;
-                case MULTICHOICE:
-                    parent.addCurrentOption((String) addOptionComboBox.getSelectedItem(),
-                            type,
-                            (String) addInputComboBox.getSelectedItem());
-                    break;
-                default:
-                    break;
-            }
-
-            delOption((String) addOptionComboBox.getSelectedItem());
+            parent.addCurrentOption((JComponent) addOptionComboBox.getSelectedItem());
+            delOption((JComponent) addOptionComboBox.getSelectedItem());
         }
     }
 

src/com/dmdirc/addons/ui_swing/components/expandingsettings/CurrentOptionsPanel.java

@@ -23,36 +23,25 @@
 package com.dmdirc.addons.ui_swing.components.expandingsettings;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.addons.ui_swing.components.FontPicker;
 import com.dmdirc.addons.ui_swing.components.ImageButton;
-import com.dmdirc.addons.ui_swing.components.colours.ColourChooser;
-import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.ui.IconManager;
 
-import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.nio.charset.Charset;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
+import java.util.ArrayList;
+import java.util.List;
 
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.JSpinner;
-import javax.swing.JTextField;
-import javax.swing.SpinnerNumberModel;
 
 import net.miginfocom.swing.MigLayout;
 
 /**
  * Current options panel.
  */
-public final class CurrentOptionsPanel extends JPanel implements ActionListener {
+public final class CurrentOptionsPanel extends JPanel implements
+        ActionListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -60,22 +49,10 @@ public final class CurrentOptionsPanel extends JPanel implements ActionListener
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 2;
-
     /** Parent settings panel. */
     private final SettingsPanel parent;
-
-    /** config option -> text fields. */
-    private Map<String, JTextField> textFields;
-    /** config option -> checkboxes. */
-    private Map<String, JCheckBox> checkBoxes;
-    /** config option -> colours. */
-    private Map<String, ColourChooser> colours;
-    /** config option -> spinners. */
-    private Map<String, JSpinner> spinners;
-    /** config option -> spinners. */
-    private Map<String, FontPicker> fonts;
-    /** config option -> comboboxes. */
-    private Map<String, JComboBox> comboboxes;
+    /** Curent options to display. */
+    private final List<JComponent> settings;
 
     /**
      * Creates a new instance of CurrentOptionsPanel.
@@ -88,27 +65,12 @@ public final class CurrentOptionsPanel extends JPanel implements ActionListener
         this.parent = parent;
 
         this.setOpaque(UIUtilities.getTabbedPaneOpaque());
-        initComponents();
-    }
-
-    /** Initialises the components. */
-    private void initComponents() {
-        textFields = new HashMap<String, JTextField>();
-        checkBoxes = new HashMap<String, JCheckBox>();
-        colours = new HashMap<String, ColourChooser>();
-        spinners = new HashMap<String, JSpinner>();
-        fonts = new HashMap<String, FontPicker>();
-        comboboxes = new HashMap<String, JComboBox>();
+        settings = new ArrayList<JComponent>();
     }
 
     /** Clears all the current options. */
     protected void clearOptions() {
-        textFields.clear();
-        checkBoxes.clear();
-        colours.clear();
-        spinners.clear();
-        fonts.clear();
-        comboboxes.clear();
+        settings.clear();
         populateCurrentSettings();
     }
 
@@ -119,36 +81,8 @@ public final class CurrentOptionsPanel extends JPanel implements ActionListener
      * @param type Option type
      * @param value Option value
      */
-    protected void addOption(final String optionName,
-            final PreferencesType type, final String value) {
-        switch (type) {
-            case TEXT:
-                textFields.put(optionName, new JTextField(value));
-                break;
-            case BOOLEAN:
-                checkBoxes.put(optionName, new JCheckBox("", Boolean.parseBoolean(value)));
-                break;
-            case COLOUR:
-                colours.put(optionName, new ColourChooser(value, true, true));
-                break;
-            case INTEGER:
-                spinners.put(optionName, new JSpinner(new SpinnerNumberModel()));
-                spinners.get(optionName).setValue(Integer.parseInt(value));
-                break;
-            case FONT:
-                fonts.put(optionName, new FontPicker(value));
-                break;
-            case MULTICHOICE:
-                if ("channel.encoding".equals(optionName)) {
-                    comboboxes.put(optionName, new JComboBox(
-                            new DefaultComboBoxModel(Charset.availableCharsets()
-                            .keySet().toArray())));
-                    comboboxes.get(optionName).setSelectedItem(value);
-                }
-                break;
-            default:
-                throw new IllegalArgumentException("Illegal Type: " + type);
-        }
+    protected void addOption(final JComponent setting) {
+        settings.add(setting);
 
         populateCurrentSettings();
     }
@@ -159,85 +93,11 @@ public final class CurrentOptionsPanel extends JPanel implements ActionListener
      * @param optionName Option to delete
      * @param type Option type
      */
-    protected void delOption(final String optionName,
-            final PreferencesType type) {
-        switch (type) {
-            case TEXT:
-                textFields.remove(optionName);
-                break;
-            case BOOLEAN:
-                checkBoxes.remove(optionName);
-                break;
-            case COLOUR:
-                colours.remove(optionName);
-                break;
-            case INTEGER:
-                spinners.remove(optionName);
-                break;
-            case FONT:
-                fonts.remove(optionName);
-                break;
-            case MULTICHOICE:
-                comboboxes.remove(optionName);
-                break;
-            default:
-                throw new IllegalArgumentException("Illegal Type: " + type);
-        }
-
+    protected void delOption(final JComponent setting) {
+        settings.remove(setting);
         populateCurrentSettings();
     }
 
-    /**
-     * Retrives an options value.
-     *
-     * @param optionName Option to delete
-     * @param type Option type
-     *
-     * @return Option value or a blank string
-     */
-    public String getOption(final String optionName, final PreferencesType type) {
-        String returnValue = null;
-        switch (type) {
-            case TEXT:
-                if (textFields.containsKey(optionName)) {
-                    returnValue =  textFields.get(optionName).getText();
-                }
-                break;
-            case BOOLEAN:
-                if (checkBoxes.containsKey(optionName)) {
-                    if (checkBoxes.get(optionName).isSelected()) {
-                        returnValue = "true";
-                    } else {
-                        returnValue = "false";
-                    }
-                }
-                break;
-            case COLOUR:
-                if (colours.containsKey(optionName)) {
-                    returnValue = colours.get(optionName).getColour();
-                }
-                break;
-            case INTEGER:
-                if (spinners.containsKey(optionName)) {
-                    returnValue = spinners.get(optionName).getValue().toString();
-                }
-                break;
-            case FONT:
-                if (fonts.containsKey(optionName)) {
-                    returnValue = ((Font) fonts.get(optionName).getSelectedItem()).getFamily();
-                }
-                break;
-            case MULTICHOICE:
-                if (comboboxes.containsKey(optionName)) {
-                    returnValue = (String) ((DefaultComboBoxModel) comboboxes.get(optionName).getModel()).getSelectedItem();
-                }
-                break;
-            default:
-                throw new IllegalArgumentException("Illegal Type: " + type);
-        }
-        return returnValue;
-    }
-
     /**
      * Adds an option to the current options pane.
      * @param configName config option name
@@ -245,21 +105,22 @@ public final class CurrentOptionsPanel extends JPanel implements ActionListener
      * @param panel parent panel
      * @param component Option component to add
      */
-    private void addCurrentOption(final String configName, final String displayName,
-            final JPanel panel, final JComponent component) {
+    private void addCurrentOption(final JComponent component) {
         final JLabel label = new JLabel();
-        final ImageButton button = new ImageButton(configName,
+        final ImageButton<JComponent> button = new ImageButton(
+                component.getName(),
                 IconManager.getIconManager().getIcon("close-inactive"),
                 IconManager.getIconManager().getIcon("close-active"));
+        button.setObject(component);
 
-        label.setText(displayName + ": ");
+        label.setText(component.getName() + ": ");
         label.setLabelFor(component);
 
         button.addActionListener(this);
 
-        panel.add(label);
-        panel.add(component, "growx, pushx");
-        panel.add(button, "wrap");
+        add(label);
+        add(component, "");
+        add(button, "wrap");
     }
 
 
@@ -267,44 +128,12 @@ public final class CurrentOptionsPanel extends JPanel implements ActionListener
     protected void populateCurrentSettings() {
         setVisible(false);
 
-        setLayout(new MigLayout("fillx, aligny top"));
+        setLayout(new MigLayout("fillx, aligny top, wmax 100%"));
 
         removeAll();
 
-        for (Entry<String, JTextField> entry : textFields.entrySet()) {
-            addCurrentOption(entry.getKey(),
-                    parent.getOptionName(entry.getKey()),
-                    this, entry.getValue());
-        }
-
-        for (Entry<String, JCheckBox> entry : checkBoxes.entrySet()) {
-            addCurrentOption(entry.getKey(),
-                    parent.getOptionName(entry.getKey()),
-                    this, entry.getValue());
-        }
-
-        for (Entry<String, ColourChooser> entry : colours.entrySet()) {
-            addCurrentOption(entry.getKey(),
-                    parent.getOptionName(entry.getKey()),
-                    this, entry.getValue());
-        }
-
-        for (Entry<String, JSpinner> entry : spinners.entrySet()) {
-            addCurrentOption(entry.getKey(),
-                    parent.getOptionName(entry.getKey()),
-                    this, entry.getValue());
-        }
-
-        for (Entry<String, FontPicker> entry : fonts.entrySet()) {
-            addCurrentOption(entry.getKey(),
-                    parent.getOptionName(entry.getKey()),
-                    this, entry.getValue());
-        }
-
-        for (Entry<String, JComboBox> entry : comboboxes.entrySet()) {
-            addCurrentOption(entry.getKey(),
-                    parent.getOptionName(entry.getKey()),
-                    this, entry.getValue());
+        for (JComponent setting : settings) {
+            addCurrentOption(setting);
         }
 
         setVisible(true);
@@ -317,8 +146,10 @@ public final class CurrentOptionsPanel extends JPanel implements ActionListener
      */
     @Override
     public void actionPerformed(final ActionEvent e) {
-        delOption(e.getActionCommand(), parent.getOptionType(e.getActionCommand()));
-        parent.addAddableOption(e.getActionCommand());
+        final JComponent setting = ((ImageButton<JComponent>)
+                e.getSource()).getObject();
+        delOption(setting);
+        parent.addAddableOption(setting);
     }
 
 }

src/com/dmdirc/addons/ui_swing/components/expandingsettings/SettingsPanel.java

@@ -22,16 +22,17 @@
 
 package com.dmdirc.addons.ui_swing.components.expandingsettings;
 
+import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.config.Identity;
-import com.dmdirc.config.prefs.PreferencesType;
+import com.dmdirc.config.prefs.PreferencesCategory;
+import com.dmdirc.config.prefs.PreferencesSetting;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Map.Entry;
+import com.dmdirc.util.DoubleMap;
 
 import javax.swing.BorderFactory;
+import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.UIManager;
@@ -48,13 +49,11 @@ public class SettingsPanel extends JPanel {
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
-    private static final long serialVersionUID = 2;
+    private static final long serialVersionUID = 3;
     /** Config manager. */
     private final transient Identity config;
-    /** config option -> name. */
-    private Map<String, String> names;
-    /** config option -> type. */
-    private Map<String, PreferencesType> types;
+    /** Current Settings. */
+    private final DoubleMap<PreferencesSetting, JComponent> settings;
     /** Info label. */
     private TextLabel infoLabel;
     /** Current options panel. */
@@ -65,6 +64,8 @@ public class SettingsPanel extends JPanel {
     private JScrollPane scrollPane;
     /** Use external padding. */
     private final boolean padding;
+    /** Preferences Category. */
+    private PreferencesCategory category;
 
     /**
      * Creates a new instance of SettingsPanel.
@@ -87,6 +88,8 @@ public class SettingsPanel extends JPanel {
             final boolean padding) {
         super();
 
+        settings = new DoubleMap<PreferencesSetting, JComponent>();
+
         this.setOpaque(UIUtilities.getTabbedPaneOpaque());
         this.config = config;
         this.padding = padding;
@@ -101,16 +104,11 @@ public class SettingsPanel extends JPanel {
      * @param infoText Info blurb.
      */
     private void initComponents(final String infoText) {
-        names = new LinkedHashMap<String, String>();
-        types = new LinkedHashMap<String, PreferencesType>();
-
         infoLabel = new TextLabel(infoText);
         infoLabel.setVisible(!infoText.isEmpty());
 
-        addOptionPanel =
-                new AddOptionPanel(this);
-        currentOptionsPanel =
-                new CurrentOptionsPanel(this);
+        addOptionPanel = new AddOptionPanel(this);
+        currentOptionsPanel = new CurrentOptionsPanel(this);
         scrollPane = new JScrollPane(currentOptionsPanel);
 
         scrollPane.setBorder(BorderFactory.createTitledBorder(UIManager.
@@ -129,9 +127,9 @@ public class SettingsPanel extends JPanel {
         setLayout(new MigLayout("fill, wrap 1, hidemode 3, "
                 + (padding ? "ins rel" : "ins 0")));
 
-        add(infoLabel, "growx, pushx");
-        add(scrollPane, "grow, push");
-        add(addOptionPanel, "growx, pushx");
+        add(infoLabel, "growx");
+        add(scrollPane, "grow, pushy");
+        add(addOptionPanel, "growx");
     }
 
     /**
@@ -141,25 +139,25 @@ public class SettingsPanel extends JPanel {
      * @param displayName Display name
      * @param type Option type
      */
-    public void addOption(final String optionName, final String displayName,
-            final PreferencesType type) {
+    public void addOption(final PreferencesCategory category) {
         if (config == null) {
             return;
         }
 
-        if (optionName.indexOf('.') == -1) {
-            return;
-        }
-        final String[] splitOption = optionName.split("\\.");
-
-        names.put(optionName, displayName);
-        types.put(optionName, type);
+        this.category = category;
 
-        if (config.hasOptionString(splitOption[0], splitOption[1])) {
-            addCurrentOption(optionName, type,
-                    config.getOption(splitOption[0], splitOption[1]));
-        } else {
-            addAddableOption(optionName);
+        for (PreferencesSetting setting : category.getSettings()) {
+            if (settings.get(setting) == null) {
+                final JComponent component = PrefsComponentFactory
+                        .getComponent(setting);
+                component.setName(setting.getTitle());
+                settings.put(setting, component);
+            }
+            if (setting.isSet()) {
+                addCurrentOption(settings.get(setting));
+            } else {
+                addAddableOption(settings.get(setting));
+            }
         }
     }
 
@@ -168,31 +166,23 @@ public class SettingsPanel extends JPanel {
         addOptionPanel.clearOptions();
         currentOptionsPanel.clearOptions();
 
-        for (Entry<String, PreferencesType> entry : types.entrySet()) {
-            final String[] splitOption = entry.getKey().split("\\.");
-
-            if (config.hasOptionString(splitOption[0], splitOption[1])) {
-                addCurrentOption(entry.getKey(), entry.getValue(),
-                        config.getOption(splitOption[0], splitOption[1]));
+        for (PreferencesSetting setting : category.getSettings()) {
+            if (setting.isSet()) {
+                addCurrentOption(settings.get(setting));
             } else {
-                addAddableOption(entry.getKey());
+                addAddableOption(settings.get(setting));
             }
         }
     }
 
     /** Saves the options to the config. */
     public void save() {
-        for (Entry<String, PreferencesType> entry : types.entrySet()) {
-            final String value =
-                    currentOptionsPanel.getOption(entry.getKey(),
-                    entry.getValue());
-            final String[] splitOption = entry.getKey().split("\\.");
-            if (value == null) {
-                config.unsetOption(splitOption[0], splitOption[1]);
-            } else {
-                config.setOption(splitOption[0], splitOption[1], value);
-            }
-        }
+        category.save();
+    }
+
+    /** Dismisses the options changed. */
+    public void dismiss() {
+        category.dismiss();
     }
 
     /**
@@ -202,9 +192,8 @@ public class SettingsPanel extends JPanel {
      * @param type Option type
      * @param value Option value
      */
-    protected void addCurrentOption(final String optionName,
-            final PreferencesType type, final String value) {
-        currentOptionsPanel.addOption(optionName, type, value);
+    protected void addCurrentOption(final JComponent setting) {
+        currentOptionsPanel.addOption(setting);
     }
 
     /**
@@ -213,9 +202,8 @@ public class SettingsPanel extends JPanel {
      * @param optionName Option to delete
      * @param type Option type
      */
-    protected void removeCurrentOption(final String optionName,
-            final PreferencesType type) {
-        currentOptionsPanel.delOption(optionName, type);
+    protected void removeCurrentOption(final JComponent setting) {
+        currentOptionsPanel.delOption(setting);
     }
 
     /**
@@ -223,29 +211,19 @@ public class SettingsPanel extends JPanel {
      *
      * @param optionName Option name
      */
-    protected void addAddableOption(final String optionName) {
-        addOptionPanel.addOption(optionName);
-    }
-
-    /**
-     * Returns the display name for a config option.
-     *
-     * @param optionName Option name to return the name for
-     *
-     * @return Display name for a specified option
-     */
-    public String getOptionName(final String optionName) {
-        return names.get(optionName);
+    protected void addAddableOption(final JComponent setting) {
+        settings.getKey(setting).setValue(null);
+        addOptionPanel.addOption(setting);
     }
 
     /**
-     * Returns the option type for a config option.
+     * Returns the component associated with a setting.
      *
-     * @param optionName Option name to return the type of
+     * @param component The component to get the setting for
      *
-     * @return Option type for a specified option
+     * @return Setting or null if not found
      */
-    public PreferencesType getOptionType(final String optionName) {
-        return types.get(optionName);
+    public PreferencesSetting getSettingForComponent(final JComponent comp) {
+        return settings.getKey(comp);
     }
 }

src/com/dmdirc/addons/ui_swing/components/renderers/AddOptionCellRenderer.java

@@ -23,10 +23,12 @@
 package com.dmdirc.addons.ui_swing.components.renderers;
 
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
+import com.dmdirc.config.prefs.PreferencesSetting;
 
 import java.awt.Component;
 
 import javax.swing.DefaultListCellRenderer;
+import javax.swing.JComponent;
 import javax.swing.JList;
 
 /**
@@ -40,19 +42,18 @@ public final class AddOptionCellRenderer extends DefaultListCellRenderer {
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-    
-    /** Settings panel parent. */
-    private final SettingsPanel parent;
-    
+    /** Parent settings panel. */
+    private final SettingsPanel settingsPanel;
+
     /**
-     * Instantiates the renderer.
+     * Creates a new add option cell renderer.
      *
-     * @param parent Parent settings panel
+     * @param settingsPanel Parent settings panel
      */
-    public AddOptionCellRenderer(final SettingsPanel parent) {
+    public AddOptionCellRenderer(final SettingsPanel settingsPanel) {
         super();
         
-        this.parent = parent;
+        this.settingsPanel = settingsPanel;
     }
     
     /** {@inheritDoc} */
@@ -62,13 +63,21 @@ public final class AddOptionCellRenderer extends DefaultListCellRenderer {
             final Object value,
             final int index,
             final boolean isSelected,
-            final boolean cellHasFocus) {
-        final String selected = (String) value;
-        
+            final boolean cellHasFocus) {       
         super.getListCellRendererComponent(list, value, index, isSelected,
                 cellHasFocus);
-        
-        setText(parent.getOptionName(selected));
+
+        final PreferencesSetting setting;
+        if (value instanceof JComponent) {
+            setting = settingsPanel.getSettingForComponent((JComponent) value);
+        } else {
+            setting = null;
+        }
+        if (setting == null) {
+           setText(value.toString());
+        } else {
+            setText(setting.getTitle());
+        }
         
         return this;
     }

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java

@@ -28,7 +28,7 @@ import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.config.prefs.PreferencesType;
+import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.awt.Window;
@@ -71,7 +71,7 @@ public final class ChannelSettingsDialog extends StandardDialog implements
     /** Channel identity file. */
     private final Identity identity;
     /** Channel window. */
-    private InputWindow channelWindow;
+    private final InputWindow channelWindow;
 
     /**
      * Creates a new instance of ChannelSettingsDialog.
@@ -195,45 +195,9 @@ public final class ChannelSettingsDialog extends StandardDialog implements
         channelSettingsPane = new SettingsPanel(identity,
                 "These settings are specific to this channel on this network,"
                 + " any settings specified here will overwrite global settings");
-
-        channelSettingsPane.addOption("channel.splitusermodes",
-                "Split user modes", PreferencesType.BOOLEAN);
-        channelSettingsPane.addOption("channel.sendwho",
-                "Send channel WHOs", PreferencesType.BOOLEAN);
-        channelSettingsPane.addOption("channel.showmodeprefix",
-                "Show mode prefixes", PreferencesType.BOOLEAN);
-        channelSettingsPane.addOption("ui.shownickcoloursinnicklist",
-                "Show colours in nicklist", PreferencesType.BOOLEAN);
-        channelSettingsPane.addOption("ui.shownickcoloursintext",
-                "Show colours in textpane", PreferencesType.BOOLEAN);
-        channelSettingsPane.addOption("general.cyclemessage",
-                "Cycle message", PreferencesType.TEXT);
-        channelSettingsPane.addOption("general.kickmessage",
-                "Kick message", PreferencesType.TEXT);
-        channelSettingsPane.addOption("general.partmessage",
-                "Part message", PreferencesType.TEXT);
-        channelSettingsPane.addOption("ui.backgroundcolour",
-                "Background colour", PreferencesType.COLOUR);
-        channelSettingsPane.addOption("ui.foregroundcolour",
-                "Foreground colour", PreferencesType.COLOUR);
-        channelSettingsPane.addOption("ui.frameBufferSize",
-                "Frame buffer size", PreferencesType.INTEGER);
-        channelSettingsPane.addOption("ui.textPaneFontName",
-                "Textpane font name", PreferencesType.FONT);
-        channelSettingsPane.addOption("ui.textPaneFontSize",
-                "Textpane font size", PreferencesType.INTEGER);
-        channelSettingsPane.addOption("ui.inputbuffersize",
-                "Input buffer size", PreferencesType.INTEGER);
-        channelSettingsPane.addOption("ui.inputbackgroundcolour",
-                "Inputfield background colour", PreferencesType.COLOUR);
-        channelSettingsPane.addOption("ui.inputforegroundcolour",
-                "Inputfield foreground colour", PreferencesType.COLOUR);
-        channelSettingsPane.addOption("ui.nicklistbackgroundcolour",
-                "Nicklist background colour", PreferencesType.COLOUR);
-        channelSettingsPane.addOption("ui.nicklistforegroundcolour",
-                "Nicklist foreground colour", PreferencesType.COLOUR);
-        channelSettingsPane.addOption("channel.encoding", "Encoding",
-                PreferencesType.MULTICHOICE);
+        channelSettingsPane.addOption(PreferencesManager
+                .getPreferencesManager().getChannelSettings(
+                channel.getConfigManager(), identity));
     }
 
     /** Initialises listeners for this dialog. */

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/Settings.java

@@ -26,7 +26,9 @@ import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.addons.serverlists.ServerGroup;
 import com.dmdirc.addons.serverlists.ServerGroupItem;
-import com.dmdirc.config.prefs.PreferencesType;
+import com.dmdirc.config.ConfigManager;
+import com.dmdirc.config.Identity;
+import com.dmdirc.config.prefs.PreferencesManager;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -117,7 +119,9 @@ public class Settings extends JPanel implements ServerListListener {
                 panels.put(item, new SettingsPanel(IdentityManager.
                         getServerConfig(item.getName()), "", false));
             }
-            addSettings(panels.get(item));
+            addSettings(panels.get(item), new ConfigManager("irc", "", 
+                    item.getGroup().getNetwork(), item.getName()),
+                    IdentityManager.getServerConfig(item.getName()));
         }
         return panels.get(item);
     }
@@ -151,74 +155,9 @@ public class Settings extends JPanel implements ServerListListener {
      * 
      * @param settingsPanel Settings panel to add settings to
      */
-    private void addSettings(final SettingsPanel settingsPanel) {
-        settingsPanel.addOption("channel.splitusermodes", "Split user modes",
-                PreferencesType.BOOLEAN);
-        settingsPanel.addOption("channel.sendwho", "Send WHO",
-                PreferencesType.BOOLEAN);
-        settingsPanel.addOption("channel.showmodeprefix", "Show mode prefix",
-                PreferencesType.BOOLEAN);
-
-        settingsPanel.addOption("general.cyclemessage", "Cycle message",
-                PreferencesType.TEXT);
-        settingsPanel.addOption("general.kickmessage", "Kick message",
-                PreferencesType.TEXT);
-        settingsPanel.addOption("general.partmessage", "Part message",
-                PreferencesType.TEXT);
-
-        settingsPanel.addOption("ui.backgroundcolour", "Background colour",
-                PreferencesType.COLOUR);
-        settingsPanel.addOption("ui.foregroundcolour", "Foreground colour",
-                PreferencesType.COLOUR);
-        settingsPanel.addOption("ui.frameBufferSize", "Textpane buffer limit",
-                PreferencesType.INTEGER);
-
-        settingsPanel.addOption("ui.inputBufferSize", "Input buffer size",
-                PreferencesType.INTEGER);
-        settingsPanel.addOption("ui.textPaneFontName", "Textpane font name",
-                PreferencesType.TEXT);
-        settingsPanel.addOption("ui.textPaneFontSize", "Textpane font size",
-                PreferencesType.INTEGER);
-
-        settingsPanel.addOption("ui.inputbackgroundcolour",
-                "Input field background colour",
-                PreferencesType.COLOUR);
-        settingsPanel.addOption("ui.inputforegroundcolour",
-                "Input field foreground colour",
-                PreferencesType.COLOUR);
-        settingsPanel.addOption("ui.nicklistbackgroundcolour",
-                "Nicklist background colour",
-                PreferencesType.COLOUR);
-        settingsPanel.addOption("ui.nicklistforegroundcolour",
-                "Nicklist foreground colour",
-                PreferencesType.COLOUR);
-        settingsPanel.addOption("ui.shownickcoloursinnicklist",
-                "Show coloured nicks in nicklist",
-                PreferencesType.BOOLEAN);
-        settingsPanel.addOption("ui.shownickcoloursintext",
-                "Show coloured nicks in textpane",
-                PreferencesType.BOOLEAN);
-
-        settingsPanel.addOption("general.closechannelsonquit",
-                "Close channels on quit",
-                PreferencesType.BOOLEAN);
-        settingsPanel.addOption("general.closechannelsondisconnect",
-                "Close channels on disconnect",
-                PreferencesType.BOOLEAN);
-        settingsPanel.addOption("general.closequeriesonquit",
-                "Close queries on quit",
-                PreferencesType.BOOLEAN);
-        settingsPanel.addOption("general.closequeriesondisconnect",
-                "Close queries on disconnect",
-                PreferencesType.BOOLEAN);
-        settingsPanel.addOption("general.quitmessage", "Quit message",
-                PreferencesType.TEXT);
-        settingsPanel.addOption("general.reconnectmessage", "Reconnect message",
-                PreferencesType.TEXT);
-        settingsPanel.addOption("general.rejoinchannels",
-                "Rejoin channels on reconnect",
-                PreferencesType.BOOLEAN);
-        settingsPanel.addOption("general.pingtimeout", "Ping timeout",
-                PreferencesType.INTEGER);
+    private void addSettings(final SettingsPanel settingsPanel,
+            final ConfigManager manager, final Identity identity) {
+        settingsPanel.addOption(PreferencesManager.getPreferencesManager()
+                .getServerSettings(manager, identity));
     }
 }

src/com/dmdirc/addons/ui_swing/dialogs/serversetting/ServerSettingsDialog.java

@@ -29,7 +29,7 @@ import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.config.Identity;
-import com.dmdirc.config.prefs.PreferencesType;
+import com.dmdirc.config.prefs.PreferencesManager;
 
 import java.awt.Window;
 import java.awt.event.ActionEvent;
@@ -67,7 +67,7 @@ public final class ServerSettingsDialog extends StandardDialog implements Action
     /** The tabbed pane. */
     private JTabbedPane tabbedPane;
     /** Parent window. */
-    private Window parentWindow;
+    private final Window parentWindow;
 
     /**
      * Creates a new instance of ServerSettingsDialog.
@@ -181,74 +181,8 @@ public final class ServerSettingsDialog extends StandardDialog implements Action
 
     /** Adds the settings to the panel. */
     private void addSettings() {
-        settingsPanel.addOption("channel.splitusermodes", "Split user modes",
-                PreferencesType.BOOLEAN);
-        settingsPanel.addOption("channel.sendwho", "Send WHO",
-                PreferencesType.BOOLEAN);
-        settingsPanel.addOption("channel.showmodeprefix", "Show mode prefix",
-                PreferencesType.BOOLEAN);
-
-        settingsPanel.addOption("general.cyclemessage", "Cycle message",
-                PreferencesType.TEXT);
-        settingsPanel.addOption("general.kickmessage", "Kick message",
-                PreferencesType.TEXT);
-        settingsPanel.addOption("general.partmessage", "Part message",
-                PreferencesType.TEXT);
-
-        settingsPanel.addOption("ui.backgroundcolour", "Background colour",
-                PreferencesType.COLOUR);
-        settingsPanel.addOption("ui.foregroundcolour", "Foreground colour",
-                PreferencesType.COLOUR);
-        settingsPanel.addOption("ui.frameBufferSize", "Textpane buffer limit",
-                PreferencesType.INTEGER);
-        
-        settingsPanel.addOption("ui.inputBufferSize", "Input buffer size",
-                PreferencesType.INTEGER);
-        settingsPanel.addOption("ui.textPaneFontName", "Textpane font name",
-                PreferencesType.TEXT);
-        settingsPanel.addOption("ui.textPaneFontSize", "Textpane font size",
-                PreferencesType.INTEGER);
-        
-        settingsPanel.addOption("ui.inputbackgroundcolour",
-                "Input field background colour",
-                PreferencesType.COLOUR);
-        settingsPanel.addOption("ui.inputforegroundcolour",
-                "Input field foreground colour",
-                PreferencesType.COLOUR);
-        settingsPanel.addOption("ui.nicklistbackgroundcolour",
-                "Nicklist background colour",
-                PreferencesType.COLOUR);
-        settingsPanel.addOption("ui.nicklistforegroundcolour",
-                "Nicklist foreground colour",
-                PreferencesType.COLOUR);
-        settingsPanel.addOption("ui.shownickcoloursinnicklist",
-                "Show coloured nicks in nicklist",
-                PreferencesType.BOOLEAN);
-        settingsPanel.addOption("ui.shownickcoloursintext",
-                "Show coloured nicks in textpane",
-                PreferencesType.BOOLEAN);
-
-        settingsPanel.addOption("general.closechannelsonquit",
-                "Close channels on quit",
-                PreferencesType.BOOLEAN);
-        settingsPanel.addOption("general.closechannelsondisconnect",
-                "Close channels on disconnect",
-                PreferencesType.BOOLEAN);
-        settingsPanel.addOption("general.closequeriesonquit",
-                "Close queries on quit",
-                PreferencesType.BOOLEAN);
-        settingsPanel.addOption("general.closequeriesondisconnect",
-                "Close queries on disconnect",
-                PreferencesType.BOOLEAN);
-        settingsPanel.addOption("general.quitmessage", "Quit message",
-                PreferencesType.TEXT);
-        settingsPanel.addOption("general.reconnectmessage", "Reconnect message",
-                PreferencesType.TEXT);
-        settingsPanel.addOption("general.rejoinchannels",
-                "Rejoin channels on reconnect",
-                PreferencesType.BOOLEAN);
-        settingsPanel.addOption("general.pingtimeout", "Ping timeout",
-                PreferencesType.INTEGER);
+        settingsPanel.addOption(PreferencesManager.getPreferencesManager()
+                .getServerSettings(server.getConfigManager(), server.getServerIdentity()));
     }
 
     /** Initialises listeners for this dialog. */