Added a bunch of options to various settings dialogs

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

src/com/dmdirc/ui/components/PreferencesPanel.java

@@ -220,11 +220,11 @@ public final class PreferencesPanel extends StandardDialog implements
         
         getContentPane().setLayout(layout);
         
-        tabList.setPreferredSize(new Dimension(150, 450));
-        tabList.setMinimumSize(new Dimension(150, 450));
-        setMinimumSize(new Dimension(650, 500));
-        setPreferredSize(new Dimension(650, 500));
-        setMaximumSize(new Dimension(650, 500));
+        tabList.setPreferredSize(new Dimension(150, 550));
+        tabList.setMinimumSize(new Dimension(150, 550));
+        setMinimumSize(new Dimension(650, 600));
+        setPreferredSize(new Dimension(650, 600));
+        setMaximumSize(new Dimension(650, 600));
         
         orderButtons(button1, button2);
         

src/com/dmdirc/ui/dialogs/PreferencesDialog.java

@@ -275,6 +275,17 @@ public final class PreferencesDialog implements PreferencesInterface {
         preferencesPanel.addCheckboxOption(tabName, "ui.showinlist",
                 "Show colours in nick list: ", "Show nickname colours in the nicklist",
                 Config.getOptionBool("ui", "shownickcoloursinnicklist"));
+        preferencesPanel.addComboboxOption(tabName, "ui.framemanager",
+                "Frame manager: ", "Which frame manager should be used",
+                new String[]{"treeview", "buttonbar", },
+                Config.getOption("ui", "framemanager", "treeview"), false);
+        preferencesPanel.addComboboxOption(tabName, "ui.framemanagerPosition",
+                "Frame manager position: ", "Where should the frame manager be positioned",
+                new String[]{"top", "bottom", "left", "right"},
+                Config.getOption("ui", "framemanagerPosition", "left"), false);
+        preferencesPanel.addCheckboxOption(tabName, "ui.stylelinks",
+                "Style links: ", "Style links in the textpane",
+                Config.getOptionBool("ui", "stylelinks"));
     }
     
     /**
@@ -339,6 +350,19 @@ public final class PreferencesDialog implements PreferencesInterface {
         preferencesPanel.addCheckboxOption(tabName, "treeview.sortservers",
                 "Sort servers: ", "Sort servers in the treeview",
                 Config.getOptionBool("treeview", "sortservers"));
+        preferencesPanel.addCheckboxOption(tabName, "ui.treeviewActiveBold",
+                "Active node bold: ", "Show the active node in bold",
+                Config.getOptionBool("ui", "treeviewActiveBold"));
+        preferencesPanel.addOptionalColourOption(tabName, "ui.treeviewActiveForeground",
+                "Active node foreground: ", "Foreground colour of the active node",
+                Config.getOption("treeview", "treeviewActiveForeground",
+                Config.getOption("treeview", "foregroundcolour", "")),
+                false, true, true);
+        preferencesPanel.addOptionalColourOption(tabName, "ui.treeviewActiveBackground",
+                "Active node background: ", "Background colour of the active node",
+                Config.getOption("treeview", "treeviewActiveBackground",
+                Config.getOption("treeview", "backgroundcolour", "")),
+                false, true, true);
     }
     
     /**

src/com/dmdirc/ui/dialogs/channelsetting/ChannelListModesPane.java

@@ -29,6 +29,7 @@ import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
 import java.awt.BorderLayout;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
+import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
@@ -43,7 +44,6 @@ import javax.swing.JList;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
-import javax.swing.UIManager;
 
 /**
  * List modes panel.
@@ -186,6 +186,7 @@ public class ChannelListModesPane extends JPanel implements ActionListener {
         add(addListModeButton, constraints);
 
         constraints.gridx = 2;
+        constraints.insets = new Insets(0, SMALL_BORDER, 0, 0);
         add(removeListModeButton, constraints);
 
         update();

src/com/dmdirc/ui/dialogs/channelsetting/ChannelSettingsDialog.java

@@ -234,6 +234,14 @@ public final class ChannelSettingsDialog extends StandardDialog implements Actio
 
         channelSettingsPane.addOption("channel.splitusermodes",
                 "Split user modes", OptionType.CHECKBOX);
+        channelSettingsPane.addOption("channel.sendwho", "Send channel WHOs",
+                OptionType.CHECKBOX);
+        channelSettingsPane.addOption("channel.showmodeprefix", "Show mode prefixes",
+                OptionType.CHECKBOX);
+        channelSettingsPane.addOption("ui.shownickcoloursinnicklist", 
+                "Show colours in nicklist", OptionType.CHECKBOX);
+        channelSettingsPane.addOption("ui.shownickcoloursintext", 
+                "Show colours in textpane", OptionType.CHECKBOX);
         channelSettingsPane.addOption("general.cyclemessage", "Cycle message",
                 OptionType.TEXTFIELD);
         channelSettingsPane.addOption("general.kickmessage", "Kick message",
@@ -248,6 +256,14 @@ public final class ChannelSettingsDialog extends StandardDialog implements Actio
                 OptionType.SPINNER);
         channelSettingsPane.addOption("ui.inputbuffersize", "Input buffer size",
                 OptionType.SPINNER);
+        channelSettingsPane.addOption("ui.inputbackgroundcolour", 
+                "Inputfield background colour", OptionType.COLOUR);
+        channelSettingsPane.addOption("ui.inputforegroundcolour", 
+                "Inputfield foreground colour", OptionType.COLOUR);
+        channelSettingsPane.addOption("ui.nicklistbackgroundcolour", 
+                "Nicklist background colour", OptionType.COLOUR);
+        channelSettingsPane.addOption("ui.nicklistforegroundcolour", 
+                "Nicklist foreground colour", OptionType.COLOUR);
     }
 
     /** Initialises listeners for this dialog. */

test/com/dmdirc/ProgramErrorTest.java

@@ -54,8 +54,8 @@ public class ProgramErrorTest extends TestCase {
     
     public void testGetDate() {
         final ProgramError inst = new ProgramError(level, message, trace, date);
-        assertTrue("Date check after failed.", inst.getDate().after(new Date(date.getTime() - 1000)));
-        assertTrue("Date check before failed.", inst.getDate().before(new Date(date.getTime() + 1000)));
+        assertTrue("Date check after failed.", inst.getDate().after(new Date(date.getTime() - 1)));
+        assertTrue("Date check before failed.", inst.getDate().before(new Date(date.getTime() + 1)));
     }
     
     public void testGetStatus() {