Remove OptionType in favour of PreferencesType

Change-Id: I54e42578febfc7c9ed40e97c031ee84df5d2e7c3
Reviewed-on: http://gerrit.dmdirc.com/1595
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>

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

@@ -25,8 +25,8 @@ 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.expandingsettings.SettingsPanel.OptionType;
 import com.dmdirc.addons.ui_swing.components.renderers.AddOptionCellRenderer;
+import com.dmdirc.config.prefs.PreferencesType;
 
 import java.awt.Component;
 import java.awt.Font;
@@ -200,16 +200,16 @@ public class AddOptionPanel extends JPanel implements ActionListener {
      *
      * @param type Option type
      */
-    private void switchInputField(final OptionType type) {
+    private void switchInputField(final PreferencesType type) {
         if (type == null) {
             addInputCurrent = addInputNone;
         } else {
             switch (type) {
-                case TEXTFIELD:
+                case TEXT:
                     addInputText.setText("");
                     addInputCurrent = addInputText;
                     break;
-                case CHECKBOX:
+                case BOOLEAN:
                     addInputCheckbox.setSelected(false);
                     addInputCurrent = addInputCheckbox;
                     break;
@@ -217,14 +217,14 @@ public class AddOptionPanel extends JPanel implements ActionListener {
                     addInputColourChooser.clearColour();
                     addInputCurrent = addInputColourChooser;
                     break;
-                case SPINNER:
+                case INTEGER:
                     addInputSpinner.setValue(0);
                     addInputCurrent = addInputSpinner;
                     break;
                 case FONT:
                     addInputCurrent = addInputFontPicker;
                     break;
-                case COMBOBOX:
+                case MULTICHOICE:
                     addInputCurrent = addInputComboBox;
                     break;
                 default:
@@ -253,17 +253,17 @@ public class AddOptionPanel extends JPanel implements ActionListener {
             switchInputField(parent.getOptionType(
                     (String) addOptionComboBox.getSelectedItem()));
         } else if (e.getSource() == addOptionButton) {
-            final OptionType type = parent.getOptionType(
+            final PreferencesType type = parent.getOptionType(
                     (String) addOptionComboBox.getSelectedItem());
 
             switch (type) {
-                case TEXTFIELD:
+                case TEXT:
                     parent.addCurrentOption(
                             (String) addOptionComboBox.getSelectedItem(),
                             type,
                             addInputText.getText());
                     break;
-                case CHECKBOX:
+                case BOOLEAN:
                     parent.addCurrentOption(
                             (String) addOptionComboBox.getSelectedItem(),
                             type,
@@ -275,7 +275,7 @@ public class AddOptionPanel extends JPanel implements ActionListener {
                             type,
                             addInputColourChooser.getColour());
                     break;
-                case SPINNER:
+                case INTEGER:
                     parent.addCurrentOption(
                             (String) addOptionComboBox.getSelectedItem(),
                             type,
@@ -287,7 +287,7 @@ public class AddOptionPanel extends JPanel implements ActionListener {
                             type,
                             ((Font) addInputFontPicker.getSelectedItem()).getFamily());
                     break;
-                case COMBOBOX:
+                case MULTICHOICE:
                     parent.addCurrentOption((String) addOptionComboBox.getSelectedItem(),
                             type,
                             (String) addInputComboBox.getSelectedItem());

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

@@ -26,7 +26,7 @@ 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.addons.ui_swing.components.expandingsettings.SettingsPanel.OptionType;
+import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.ui.IconManager;
 
 import java.awt.Font;
@@ -120,25 +120,25 @@ public final class CurrentOptionsPanel extends JPanel implements ActionListener
      * @param value Option value
      */
     protected void addOption(final String optionName,
-            final OptionType type, final String value) {
+            final PreferencesType type, final String value) {
         switch (type) {
-            case TEXTFIELD:
+            case TEXT:
                 textFields.put(optionName, new JTextField(value));
                 break;
-            case CHECKBOX:
+            case BOOLEAN:
                 checkBoxes.put(optionName, new JCheckBox("", Boolean.parseBoolean(value)));
                 break;
             case COLOUR:
                 colours.put(optionName, new ColourChooser(value, true, true));
                 break;
-            case SPINNER:
+            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 COMBOBOX:
+            case MULTICHOICE:
                 if ("channel.encoding".equals(optionName)) {
                     comboboxes.put(optionName, new JComboBox(new DefaultComboBoxModel(Charset.availableCharsets().keySet().toArray())));
                     comboboxes.get(optionName).setSelectedItem(value);
@@ -160,24 +160,24 @@ public final class CurrentOptionsPanel extends JPanel implements ActionListener
      * @param type Option type
      */
     protected void delOption(final String optionName,
-            final OptionType type) {
+            final PreferencesType type) {
         switch (type) {
-            case TEXTFIELD:
+            case TEXT:
                 textFields.remove(optionName);
                 break;
-            case CHECKBOX:
+            case BOOLEAN:
                 checkBoxes.remove(optionName);
                 break;
             case COLOUR:
                 colours.remove(optionName);
                 break;
-            case SPINNER:
+            case INTEGER:
                 spinners.remove(optionName);
                 break;
             case FONT:
                 fonts.remove(optionName);
                 break;
-            case COMBOBOX:
+            case MULTICHOICE:
                 comboboxes.remove(optionName);
                 break;
             default:
@@ -195,15 +195,15 @@ public final class CurrentOptionsPanel extends JPanel implements ActionListener
      *
      * @return Option value or a blank string
      */
-    public String getOption(final String optionName, final OptionType type) {
+    public String getOption(final String optionName, final PreferencesType type) {
         String returnValue = null;
         switch (type) {
-            case TEXTFIELD:
+            case TEXT:
                 if (textFields.containsKey(optionName)) {
                     returnValue =  textFields.get(optionName).getText();
                 }
                 break;
-            case CHECKBOX:
+            case BOOLEAN:
                 if (checkBoxes.containsKey(optionName)) {
                     if (checkBoxes.get(optionName).isSelected()) {
                         returnValue = "true";
@@ -217,7 +217,7 @@ public final class CurrentOptionsPanel extends JPanel implements ActionListener
                     returnValue = colours.get(optionName).getColour();
                 }
                 break;
-            case SPINNER:
+            case INTEGER:
                 if (spinners.containsKey(optionName)) {
                     returnValue = spinners.get(optionName).getValue().toString();
                 }
@@ -227,7 +227,7 @@ public final class CurrentOptionsPanel extends JPanel implements ActionListener
                     returnValue = ((Font) fonts.get(optionName).getSelectedItem()).getFamily();
                 }
                 break;
-            case COMBOBOX:
+            case MULTICHOICE:
                 if (comboboxes.containsKey(optionName)) {
                     returnValue = (String) ((DefaultComboBoxModel) comboboxes.get(optionName).getModel()).getSelectedItem();
                 }

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

@@ -25,6 +25,7 @@ package com.dmdirc.addons.ui_swing.components.expandingsettings;
 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 java.util.LinkedHashMap;
 import java.util.Map;
@@ -50,28 +51,10 @@ public class SettingsPanel extends JPanel {
     private static final long serialVersionUID = 2;
     /** Config manager. */
     private final transient Identity config;
-
-    /** Valid option types. */
-    public enum OptionType {
-
-        /** Text field. */
-        TEXTFIELD,
-        /** Check box. */
-        CHECKBOX,
-        /** Colour chooser. */
-        COLOUR,
-        /** Number spinner. */
-        SPINNER,
-        /** Font picker. */
-        FONT,
-        /** Combo box. */
-        COMBOBOX,
-    }
-
     /** config option -> name. */
     private Map<String, String> names;
     /** config option -> type. */
-    private Map<String, OptionType> types;
+    private Map<String, PreferencesType> types;
     /** Info label. */
     private TextLabel infoLabel;
     /** Current options panel. */
@@ -119,7 +102,7 @@ public class SettingsPanel extends JPanel {
      */
     private void initComponents(final String infoText) {
         names = new LinkedHashMap<String, String>();
-        types = new LinkedHashMap<String, OptionType>();
+        types = new LinkedHashMap<String, PreferencesType>();
 
         infoLabel = new TextLabel(infoText);
         infoLabel.setVisible(!infoText.isEmpty());
@@ -158,9 +141,8 @@ public class SettingsPanel extends JPanel {
      * @param displayName Display name
      * @param type Option type
      */
-    public void addOption(final String optionName,
-            final String displayName,
-            final OptionType type) {
+    public void addOption(final String optionName, final String displayName,
+            final PreferencesType type) {
         if (config == null) {
             return;
         }
@@ -186,7 +168,7 @@ public class SettingsPanel extends JPanel {
         addOptionPanel.clearOptions();
         currentOptionsPanel.clearOptions();
 
-        for (Entry<String, OptionType> entry : types.entrySet()) {
+        for (Entry<String, PreferencesType> entry : types.entrySet()) {
             final String[] splitOption = entry.getKey().split("\\.");
 
             if (config.hasOptionString(splitOption[0], splitOption[1])) {
@@ -200,7 +182,7 @@ public class SettingsPanel extends JPanel {
 
     /** Saves the options to the config. */
     public void save() {
-        for (Entry<String, OptionType> entry : types.entrySet()) {
+        for (Entry<String, PreferencesType> entry : types.entrySet()) {
             final String value =
                     currentOptionsPanel.getOption(entry.getKey(),
                     entry.getValue());
@@ -221,7 +203,7 @@ public class SettingsPanel extends JPanel {
      * @param value Option value
      */
     protected void addCurrentOption(final String optionName,
-            final OptionType type, final String value) {
+            final PreferencesType type, final String value) {
         currentOptionsPanel.addOption(optionName, type, value);
     }
 
@@ -232,7 +214,7 @@ public class SettingsPanel extends JPanel {
      * @param type Option type
      */
     protected void removeCurrentOption(final String optionName,
-            final OptionType type) {
+            final PreferencesType type) {
         currentOptionsPanel.delOption(optionName, type);
     }
 
@@ -263,7 +245,7 @@ public class SettingsPanel extends JPanel {
      *
      * @return Option type for a specified option
      */
-    public OptionType getOptionType(final String optionName) {
+    public PreferencesType getOptionType(final String optionName) {
         return types.get(optionName);
     }
 }

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

@@ -25,10 +25,10 @@ package com.dmdirc.addons.ui_swing.dialogs.channelsetting;
 import com.dmdirc.Channel;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
-import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel.OptionType;
 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.ui.interfaces.InputWindow;
 
 import java.awt.Window;
@@ -197,45 +197,43 @@ public final class ChannelSettingsDialog extends StandardDialog implements
                 + " any settings specified here will overwrite global settings");
 
         channelSettingsPane.addOption("channel.splitusermodes",
-                "Split user modes", OptionType.CHECKBOX);
+                "Split user modes", PreferencesType.BOOLEAN);
         channelSettingsPane.addOption("channel.sendwho",
-                "Send channel WHOs", OptionType.CHECKBOX);
+                "Send channel WHOs", PreferencesType.BOOLEAN);
         channelSettingsPane.addOption("channel.showmodeprefix",
-                "Show mode prefixes", OptionType.CHECKBOX);
+                "Show mode prefixes", PreferencesType.BOOLEAN);
         channelSettingsPane.addOption("ui.shownickcoloursinnicklist",
-                "Show colours in nicklist", OptionType.CHECKBOX);
+                "Show colours in nicklist", PreferencesType.BOOLEAN);
         channelSettingsPane.addOption("ui.shownickcoloursintext",
-                "Show colours in textpane", OptionType.CHECKBOX);
+                "Show colours in textpane", PreferencesType.BOOLEAN);
         channelSettingsPane.addOption("general.cyclemessage",
-                "Cycle message", OptionType.TEXTFIELD);
+                "Cycle message", PreferencesType.TEXT);
         channelSettingsPane.addOption("general.kickmessage",
-                "Kick message", OptionType.TEXTFIELD);
+                "Kick message", PreferencesType.TEXT);
         channelSettingsPane.addOption("general.partmessage",
-                "Part message", OptionType.TEXTFIELD);
+                "Part message", PreferencesType.TEXT);
         channelSettingsPane.addOption("ui.backgroundcolour",
-                "Background colour", OptionType.COLOUR);
+                "Background colour", PreferencesType.COLOUR);
         channelSettingsPane.addOption("ui.foregroundcolour",
-                "Foreground colour", OptionType.COLOUR);
+                "Foreground colour", PreferencesType.COLOUR);
         channelSettingsPane.addOption("ui.frameBufferSize",
-                "Frame buffer size", OptionType.SPINNER);
+                "Frame buffer size", PreferencesType.INTEGER);
         channelSettingsPane.addOption("ui.textPaneFontName",
-                "Textpane font name",
-                OptionType.FONT);
+                "Textpane font name", PreferencesType.FONT);
         channelSettingsPane.addOption("ui.textPaneFontSize",
-                "Textpane font size",
-                OptionType.SPINNER);
+                "Textpane font size", PreferencesType.INTEGER);
         channelSettingsPane.addOption("ui.inputbuffersize",
-                "Input buffer size", OptionType.SPINNER);
+                "Input buffer size", PreferencesType.INTEGER);
         channelSettingsPane.addOption("ui.inputbackgroundcolour",
-                "Inputfield background colour", OptionType.COLOUR);
+                "Inputfield background colour", PreferencesType.COLOUR);
         channelSettingsPane.addOption("ui.inputforegroundcolour",
-                "Inputfield foreground colour", OptionType.COLOUR);
+                "Inputfield foreground colour", PreferencesType.COLOUR);
         channelSettingsPane.addOption("ui.nicklistbackgroundcolour",
-                "Nicklist background colour", OptionType.COLOUR);
+                "Nicklist background colour", PreferencesType.COLOUR);
         channelSettingsPane.addOption("ui.nicklistforegroundcolour",
-                "Nicklist foreground colour", OptionType.COLOUR);
+                "Nicklist foreground colour", PreferencesType.COLOUR);
         channelSettingsPane.addOption("channel.encoding", "Encoding",
-                OptionType.COMBOBOX);
+                PreferencesType.MULTICHOICE);
     }
 
     /** Initialises listeners for this dialog. */

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

@@ -23,10 +23,10 @@
 package com.dmdirc.addons.ui_swing.dialogs.serverlist;
 
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
-import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel.OptionType;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.addons.serverlists.ServerGroup;
 import com.dmdirc.addons.serverlists.ServerGroupItem;
+import com.dmdirc.config.prefs.PreferencesType;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -153,72 +153,72 @@ public class Settings extends JPanel implements ServerListListener {
      */
     private void addSettings(final SettingsPanel settingsPanel) {
         settingsPanel.addOption("channel.splitusermodes", "Split user modes",
-                OptionType.CHECKBOX);
+                PreferencesType.BOOLEAN);
         settingsPanel.addOption("channel.sendwho", "Send WHO",
-                OptionType.CHECKBOX);
+                PreferencesType.BOOLEAN);
         settingsPanel.addOption("channel.showmodeprefix", "Show mode prefix",
-                OptionType.CHECKBOX);
+                PreferencesType.BOOLEAN);
 
         settingsPanel.addOption("general.cyclemessage", "Cycle message",
-                OptionType.TEXTFIELD);
+                PreferencesType.TEXT);
         settingsPanel.addOption("general.kickmessage", "Kick message",
-                OptionType.TEXTFIELD);
+                PreferencesType.TEXT);
         settingsPanel.addOption("general.partmessage", "Part message",
-                OptionType.TEXTFIELD);
+                PreferencesType.TEXT);
 
         settingsPanel.addOption("ui.backgroundcolour", "Background colour",
-                OptionType.COLOUR);
+                PreferencesType.COLOUR);
         settingsPanel.addOption("ui.foregroundcolour", "Foreground colour",
-                OptionType.COLOUR);
+                PreferencesType.COLOUR);
         settingsPanel.addOption("ui.frameBufferSize", "Textpane buffer limit",
-                OptionType.SPINNER);
+                PreferencesType.INTEGER);
 
         settingsPanel.addOption("ui.inputBufferSize", "Input buffer size",
-                OptionType.SPINNER);
+                PreferencesType.INTEGER);
         settingsPanel.addOption("ui.textPaneFontName", "Textpane font name",
-                OptionType.TEXTFIELD);
+                PreferencesType.TEXT);
         settingsPanel.addOption("ui.textPaneFontSize", "Textpane font size",
-                OptionType.SPINNER);
+                PreferencesType.INTEGER);
 
         settingsPanel.addOption("ui.inputbackgroundcolour",
                 "Input field background colour",
-                OptionType.COLOUR);
+                PreferencesType.COLOUR);
         settingsPanel.addOption("ui.inputforegroundcolour",
                 "Input field foreground colour",
-                OptionType.COLOUR);
+                PreferencesType.COLOUR);
         settingsPanel.addOption("ui.nicklistbackgroundcolour",
                 "Nicklist background colour",
-                OptionType.COLOUR);
+                PreferencesType.COLOUR);
         settingsPanel.addOption("ui.nicklistforegroundcolour",
                 "Nicklist foreground colour",
-                OptionType.COLOUR);
+                PreferencesType.COLOUR);
         settingsPanel.addOption("ui.shownickcoloursinnicklist",
                 "Show coloured nicks in nicklist",
-                OptionType.CHECKBOX);
+                PreferencesType.BOOLEAN);
         settingsPanel.addOption("ui.shownickcoloursintext",
                 "Show coloured nicks in textpane",
-                OptionType.CHECKBOX);
+                PreferencesType.BOOLEAN);
 
         settingsPanel.addOption("general.closechannelsonquit",
                 "Close channels on quit",
-                OptionType.CHECKBOX);
+                PreferencesType.BOOLEAN);
         settingsPanel.addOption("general.closechannelsondisconnect",
                 "Close channels on disconnect",
-                OptionType.CHECKBOX);
+                PreferencesType.BOOLEAN);
         settingsPanel.addOption("general.closequeriesonquit",
                 "Close queries on quit",
-                OptionType.CHECKBOX);
+                PreferencesType.BOOLEAN);
         settingsPanel.addOption("general.closequeriesondisconnect",
                 "Close queries on disconnect",
-                OptionType.CHECKBOX);
+                PreferencesType.BOOLEAN);
         settingsPanel.addOption("general.quitmessage", "Quit message",
-                OptionType.TEXTFIELD);
+                PreferencesType.TEXT);
         settingsPanel.addOption("general.reconnectmessage", "Reconnect message",
-                OptionType.TEXTFIELD);
+                PreferencesType.TEXT);
         settingsPanel.addOption("general.rejoinchannels",
                 "Rejoin channels on reconnect",
-                OptionType.CHECKBOX);
+                PreferencesType.BOOLEAN);
         settingsPanel.addOption("general.pingtimeout", "Ping timeout",
-                OptionType.SPINNER);
+                PreferencesType.INTEGER);
     }
 }

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

@@ -26,10 +26,10 @@ import com.dmdirc.Server;
 import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
-import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel.OptionType;
 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 java.awt.Window;
 import java.awt.event.ActionEvent;
@@ -182,73 +182,73 @@ public final class ServerSettingsDialog extends StandardDialog implements Action
     /** Adds the settings to the panel. */
     private void addSettings() {
         settingsPanel.addOption("channel.splitusermodes", "Split user modes",
-                OptionType.CHECKBOX);
+                PreferencesType.BOOLEAN);
         settingsPanel.addOption("channel.sendwho", "Send WHO",
-                OptionType.CHECKBOX);
+                PreferencesType.BOOLEAN);
         settingsPanel.addOption("channel.showmodeprefix", "Show mode prefix",
-                OptionType.CHECKBOX);
+                PreferencesType.BOOLEAN);
 
         settingsPanel.addOption("general.cyclemessage", "Cycle message",
-                OptionType.TEXTFIELD);
+                PreferencesType.TEXT);
         settingsPanel.addOption("general.kickmessage", "Kick message",
-                OptionType.TEXTFIELD);
+                PreferencesType.TEXT);
         settingsPanel.addOption("general.partmessage", "Part message",
-                OptionType.TEXTFIELD);
+                PreferencesType.TEXT);
 
         settingsPanel.addOption("ui.backgroundcolour", "Background colour",
-                OptionType.COLOUR);
+                PreferencesType.COLOUR);
         settingsPanel.addOption("ui.foregroundcolour", "Foreground colour",
-                OptionType.COLOUR);
+                PreferencesType.COLOUR);
         settingsPanel.addOption("ui.frameBufferSize", "Textpane buffer limit",
-                OptionType.SPINNER);
+                PreferencesType.INTEGER);
         
         settingsPanel.addOption("ui.inputBufferSize", "Input buffer size",
-                OptionType.SPINNER);
+                PreferencesType.INTEGER);
         settingsPanel.addOption("ui.textPaneFontName", "Textpane font name",
-                OptionType.TEXTFIELD);
+                PreferencesType.TEXT);
         settingsPanel.addOption("ui.textPaneFontSize", "Textpane font size",
-                OptionType.SPINNER);
+                PreferencesType.INTEGER);
         
         settingsPanel.addOption("ui.inputbackgroundcolour",
                 "Input field background colour",
-                OptionType.COLOUR);
+                PreferencesType.COLOUR);
         settingsPanel.addOption("ui.inputforegroundcolour",
                 "Input field foreground colour",
-                OptionType.COLOUR);
+                PreferencesType.COLOUR);
         settingsPanel.addOption("ui.nicklistbackgroundcolour",
                 "Nicklist background colour",
-                OptionType.COLOUR);
+                PreferencesType.COLOUR);
         settingsPanel.addOption("ui.nicklistforegroundcolour",
                 "Nicklist foreground colour",
-                OptionType.COLOUR);
+                PreferencesType.COLOUR);
         settingsPanel.addOption("ui.shownickcoloursinnicklist",
                 "Show coloured nicks in nicklist",
-                OptionType.CHECKBOX);
+                PreferencesType.BOOLEAN);
         settingsPanel.addOption("ui.shownickcoloursintext",
                 "Show coloured nicks in textpane",
-                OptionType.CHECKBOX);
+                PreferencesType.BOOLEAN);
 
         settingsPanel.addOption("general.closechannelsonquit",
                 "Close channels on quit",
-                OptionType.CHECKBOX);
+                PreferencesType.BOOLEAN);
         settingsPanel.addOption("general.closechannelsondisconnect",
                 "Close channels on disconnect",
-                OptionType.CHECKBOX);
+                PreferencesType.BOOLEAN);
         settingsPanel.addOption("general.closequeriesonquit",
                 "Close queries on quit",
-                OptionType.CHECKBOX);
+                PreferencesType.BOOLEAN);
         settingsPanel.addOption("general.closequeriesondisconnect",
                 "Close queries on disconnect",
-                OptionType.CHECKBOX);
+                PreferencesType.BOOLEAN);
         settingsPanel.addOption("general.quitmessage", "Quit message",
-                OptionType.TEXTFIELD);
+                PreferencesType.TEXT);
         settingsPanel.addOption("general.reconnectmessage", "Reconnect message",
-                OptionType.TEXTFIELD);
+                PreferencesType.TEXT);
         settingsPanel.addOption("general.rejoinchannels",
                 "Rejoin channels on reconnect",
-                OptionType.CHECKBOX);
+                PreferencesType.BOOLEAN);
         settingsPanel.addOption("general.pingtimeout", "Ping timeout",
-                OptionType.SPINNER);
+                PreferencesType.INTEGER);
     }
 
     /** Initialises listeners for this dialog. */