Supply parent to topic bar colour picker.

Add DMDirc icon to colour pickers without parents.

Fixes CLIENT-192

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

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

@@ -40,6 +40,7 @@ import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.Styliser;
 
 import java.awt.Color;
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseEvent;
@@ -100,14 +101,16 @@ public class TopicBar extends JComponent implements ActionListener,
     /**
      * Instantiates a new topic bar.
      *
+     * @param window Parent window
      * @param channelFrame Parent channel frame
      */
-    public TopicBar(final ChannelFrame channelFrame) {
+    public TopicBar(final Window parentWindow,
+            final ChannelFrame channelFrame) {
         super();
 
         this.channel = (Channel) channelFrame.getContainer();
         controller = channelFrame.getController();
-        topicText = new TextPaneInputField();
+        topicText = new TextPaneInputField(parentWindow);
         topicLengthMax = channel.getMaxTopicLength();
         errorIcon =
                 new JLabel(IconManager.getIconManager().getIcon("input-error"));

src/com/dmdirc/addons/ui_swing/components/colours/ColourPickerDialog.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.components.colours;
 
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
+import com.dmdirc.ui.IconManager;
 
 import java.awt.Window;
 import java.awt.event.ActionListener;
@@ -73,6 +74,7 @@ public final class ColourPickerDialog extends StandardDialog {
      */
     public ColourPickerDialog(final boolean showIRC, final boolean showHex) {
         this(showIRC, showHex, null);
+        setIconImage(IconManager.getIconManager().getImage("icon"));
     }
 
     /**

src/com/dmdirc/addons/ui_swing/components/frames/ChannelFrame.java

@@ -71,6 +71,8 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
     private NickList nicklist;
     /** Topic bar. */
     private TopicBar topicBar;
+    /** UI controller. */
+    private SwingController controller;
 
     /**
      * Creates a new instance of ChannelFrame. Sets up callbacks and handlers,
@@ -81,6 +83,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
      */
     public ChannelFrame(final SwingController controller, final Channel owner) {
         super(controller, owner);
+        this.controller = controller;
 
         initComponents();
 
@@ -122,7 +125,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
      * Initialises the compoents in this frame.
      */
     private void initComponents() {
-        topicBar = new TopicBar(this);
+        topicBar = new TopicBar(controller.getMainFrame(), this);
 
         nicklist = new NickList(this, getContainer().getConfigManager());
         settingsMI = new JMenuItem("Settings");

src/com/dmdirc/addons/ui_swing/components/inputfields/TextPaneInputField.java

@@ -25,8 +25,9 @@ package com.dmdirc.addons.ui_swing.components.inputfields;
 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.interfaces.InputField;
-import java.awt.KeyboardFocusManager;
 
+import java.awt.KeyboardFocusManager;
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.beans.PropertyChangeEvent;
@@ -50,17 +51,21 @@ public class TextPaneInputField extends JEditorPane implements InputField,
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
+    /** Parent window. */
+    private final Window parentWindow;
     /** Colour picker. */
     protected ColourPickerDialog colourPicker;
 
     /**
      * Creates a new text pane input field.
+     *
+     * @param parentWindow Parent window, can be null
      */
-    public TextPaneInputField() {
+    public TextPaneInputField(final Window parentWindow) {
         super();
-
         KeyboardFocusManager.getCurrentKeyboardFocusManager()
                 .addPropertyChangeListener(this);
+        this.parentWindow = parentWindow;
     }
 
     /** {@inheritDoc} */
@@ -68,7 +73,7 @@ public class TextPaneInputField extends JEditorPane implements InputField,
     public void showColourPicker(final boolean irc, final boolean hex) {
         if (IdentityManager.getGlobalConfig().getOptionBool("general",
                 "showcolourdialog")) {
-            colourPicker = new ColourPickerDialog(irc, hex);
+            colourPicker = new ColourPickerDialog(irc, hex, parentWindow);
             colourPicker.addActionListener(new ActionListener() {
 
                 @Override