Issue 465: OSD respond live to config changes

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

src/com/dmdirc/Main.java

@@ -64,7 +64,7 @@ public final class Main {
      * A revision number for actions and core plugins. If this is increased,
      * users will be prompted to re-extract them.
      */
-    private static final int ADDON_REVISION = 3;
+    private static final int ADDON_REVISION = 4;
     
     /**
      * The UI to use for the client.

src/com/dmdirc/addons/osdplugin/OsdPlugin.java

@@ -24,11 +24,13 @@ package com.dmdirc.addons.osdplugin;
 
 import com.dmdirc.Main;
 import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.interfaces.PreferencesInterface;
 import com.dmdirc.ui.interfaces.PreferencesPanel;
+import com.dmdirc.ui.swing.components.ColourChooser;
 
 import java.awt.BorderLayout;
 import java.util.Properties;
@@ -55,6 +57,12 @@ public final class OsdPlugin extends Plugin implements PreferencesInterface {
     /** Font size spinner. */
     private JSpinner spinner;
     
+    /** Background colour chooser. */
+    private ColourChooser bgColour;
+    
+    /** Background colour chooser. */
+    private ColourChooser fgColour;
+    
     /**
      * Creates a new instance of OsdPlugin.
      */
@@ -96,31 +104,46 @@ public final class OsdPlugin extends Plugin implements PreferencesInterface {
     
     /** {@inheritDoc}. */
     public void showConfig() {
-        final PreferencesPanel preferencesPanel = Main.getUI().getPreferencesPanel(this, "OSD Plugin - Config");
-        final JPanel panel = new JPanel();
+        final ConfigManager config = IdentityManager.getGlobalConfig();
+        final PreferencesPanel preferencesPanel = Main.getUI().
+                getPreferencesPanel(this, "OSD Plugin - Config");
+        final JPanel spinnerPanel = new JPanel(new BorderLayout());
+        final JPanel bgColourPanel = new JPanel(new BorderLayout());
+        final JPanel fgColourPanel = new JPanel(new BorderLayout());
         spinner = new JSpinner(new SpinnerNumberModel());
+        bgColour = new ColourChooser();
+        fgColour = new ColourChooser();
         
-        spinner.setValue(IdentityManager.getGlobalConfig().getOptionInt(MY_DOMAIN, "fontSize", 20));
+        spinner.setValue(config.getOptionInt(MY_DOMAIN, "fontSize", 20));
+        bgColour.setColour(config.getOption(MY_DOMAIN, "bgcolour", "2222aa"));
+        fgColour.setColour(config.getOption(MY_DOMAIN, "fgcolour", "ffffff"));
         
-        panel.setLayout(new BorderLayout());
-        panel.add(spinner);
+        spinnerPanel.add(spinner);
+        bgColourPanel.add(bgColour);
+        fgColourPanel.add(fgColour);
         
         preferencesPanel.addCategory("General", "General configuration for OSD plugin.");
         
         preferencesPanel.addPanelOption("General", "fontsize", "Font size: ",
-                "Changes the font size of the OSD", panel);
-        preferencesPanel.addColourOption("General", "bgcolour",
+                "Changes the font size of the OSD", spinnerPanel);
+        preferencesPanel.addPanelOption("General", "bgcolour",
                 "Background Colour: ", "Background colour for the OSD",
-                IdentityManager.getGlobalConfig().getOption(MY_DOMAIN, "bgcolour", "2222aa"), true, true);
-        preferencesPanel.addColourOption("General", "fgcolour",
-                "Foreground Colour: ", "Foreground colour for the OSD",
-                IdentityManager.getGlobalConfig().getOption(MY_DOMAIN, "fgcolour", "ffffff"), true, true);
+                bgColourPanel);
+        preferencesPanel.addPanelOption("General", "fgcolour",
+                "Foreground Colour: ", "Foreground colour for the OSD", 
+                fgColourPanel);
         preferencesPanel.addSpinnerOption("General", "timeout", "Timeout: ",
                 "Length of times in seconds before the OSD window times out",
                 IdentityManager.getGlobalConfig().getOptionInt(MY_DOMAIN, "timeout", 15));
         
         osdWindow = new OsdWindow("Please drag this OSD to position", true);
         
+        spinner.addChangeListener(osdWindow);
+        bgColour.addActionListener(osdWindow);
+        bgColour.setActionCommand("backgroundColour");
+        fgColour.addActionListener(osdWindow);
+        fgColour.setActionCommand("foregroundColour");
+        
         preferencesPanel.display();
     }
     
@@ -131,11 +154,11 @@ public final class OsdPlugin extends Plugin implements PreferencesInterface {
         if (spinner != null) {
             config.setOption(MY_DOMAIN, "fontSize", String.valueOf(spinner.getValue()));
         }
-        if (properties.getProperty("fgcolour") != null) {
-            config.setOption(MY_DOMAIN, "fgcolour", properties.getProperty("fgcolour"));
+        if (fgColour != null) {
+            config.setOption(MY_DOMAIN, "fgcolour", fgColour.getColour());
         }
-        if (properties.getProperty("bgcolour") != null) {
-            config.setOption(MY_DOMAIN, "bgcolour", properties.getProperty("bgcolour"));
+        if (bgColour != null) {
+            config.setOption(MY_DOMAIN, "bgcolour", bgColour.getColour());
         }
         if (properties.getProperty("timeout") != null) {
             config.setOption(MY_DOMAIN, "timeout", properties.getProperty("timeout"));

src/com/dmdirc/addons/osdplugin/OsdWindow.java

@@ -24,12 +24,16 @@ package com.dmdirc.addons.osdplugin;
 
 import com.dmdirc.Main;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.swing.MainFrame;
 import static com.dmdirc.ui.swing.UIUtilities.LARGE_BORDER;
+import com.dmdirc.ui.swing.components.ColourChooser;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
@@ -39,9 +43,13 @@ import java.util.TimerTask;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.JSpinner;
+import javax.swing.SpinnerNumberModel;
 import javax.swing.SwingConstants;
 import javax.swing.WindowConstants;
 import javax.swing.border.LineBorder;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 
 /**
  * The OSD Window is an always-on-top window designed to convey information
@@ -49,7 +57,7 @@ import javax.swing.border.LineBorder;
  * @author chris
  */
 public final class OsdWindow extends JDialog implements MouseListener,
-        MouseMotionListener {
+        MouseMotionListener, ChangeListener, ActionListener {
     
     /**
      * A version number for this class. It should be changed whenever the class
@@ -57,6 +65,12 @@ public final class OsdWindow extends JDialog implements MouseListener,
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 2;
+    
+    /** OSD Label. */
+    private final JLabel label;
+    
+    /** OSD Panel. */
+    private final JPanel panel;
 
     /**
      * Creates a new instance of OsdWindow.
@@ -80,7 +94,7 @@ public final class OsdWindow extends JDialog implements MouseListener,
         setLocation(IdentityManager.getGlobalConfig().getOptionInt("plugin-OSD", "locationX", 20),
                 IdentityManager.getGlobalConfig().getOptionInt("plugin-OSD", "locationY", 20));
         
-        final JPanel panel = new JPanel();
+        panel = new JPanel();
         panel.setBorder(new LineBorder(Color.BLACK));
         panel.setBackground(IdentityManager.getGlobalConfig().getOptionColour("plugin-OSD",
                 "bgcolour", Color.decode("#2222aa")));
@@ -88,7 +102,7 @@ public final class OsdWindow extends JDialog implements MouseListener,
         setContentPane(panel);
         setLayout(new BorderLayout());
         
-        final JLabel label = new JLabel(text);
+        label = new JLabel(text);
         label.setForeground(IdentityManager.getGlobalConfig().getOptionColour("plugin-OSD",
                 "fgcolour", Color.decode("#ffffff")));
         label.setFont(label.getFont().deriveFont(
@@ -145,5 +159,25 @@ public final class OsdWindow extends JDialog implements MouseListener,
     public void mouseMoved(final MouseEvent e) {
         // Do nothing
     }
+
+    /** {@inheritDoc} */
+    public void stateChanged(final ChangeEvent e) {
+        final float size = (((SpinnerNumberModel) ((JSpinner) e.getSource()).
+                getModel()).getNumber()).floatValue();
+        label.setFont(label.getFont().deriveFont(size));
+        setSize(new Dimension(500, (int) size + LARGE_BORDER));
+    }
+
+    /** {@inheritDoc} */
+    public void actionPerformed(final ActionEvent e) {
+        if ("backgroundColour".equals(e.getActionCommand())) {
+            panel.setBackground(ColourManager.parseColour(
+                    ((ColourChooser) e.getSource()).getColour()));
+        }
+        if ("foregroundColour".equals(e.getActionCommand())) {
+            label.setForeground(ColourManager.parseColour(
+                    ((ColourChooser) e.getSource()).getColour()));
+        }
+    }
     
 }

src/com/dmdirc/ui/swing/components/ColourChooser.java

@@ -35,6 +35,7 @@ import java.awt.event.ActionListener;
 import javax.swing.BorderFactory;
 import javax.swing.JButton;
 import javax.swing.JPanel;
+import javax.swing.event.EventListenerList;
 
 /**
  * Colour chooser widget.
@@ -66,6 +67,12 @@ public final class ColourChooser extends JPanel implements ActionListener {
     /** The value of this component. */
     private String value;
     
+    /** Event listeners. */
+    private EventListenerList listeners;
+    
+    /** Action command. */
+    private String command;
+    
     /** Creates a new instance of ColourChooser. */
     public ColourChooser() {
         this("ffffff", true, true);
@@ -84,6 +91,8 @@ public final class ColourChooser extends JPanel implements ActionListener {
         showIRC = ircColours;
         showHex = hexColours;
         value = initialColour;
+        listeners = new EventListenerList();
+        command = "";
         
         editButton = new JButton("Edit");
         editButton.setMargin(new Insets(0, 2, 0, 2));
@@ -94,10 +103,10 @@ public final class ColourChooser extends JPanel implements ActionListener {
         previewPanel.setPreferredSize(new Dimension(40, 10));
         previewPanel.setBorder(BorderFactory.createLineBorder(Color.DARK_GRAY));
         
-        this.setLayout(new BorderLayout(SMALL_BORDER, SMALL_BORDER));
+        setLayout(new BorderLayout(SMALL_BORDER, SMALL_BORDER));
         
-        this.add(editButton, BorderLayout.LINE_END);
-        this.add(previewPanel, BorderLayout.CENTER);
+        add(editButton, BorderLayout.LINE_END);
+        add(previewPanel, BorderLayout.CENTER);
         
         updateColour(initialColour);
     }
@@ -150,7 +159,54 @@ public final class ColourChooser extends JPanel implements ActionListener {
         } else {
             value = e.getActionCommand();
             updateColour(e.getActionCommand());
+            fireActionPerformed();
             cpd.dispose();
         }
     }
+    
+    /**
+     * Sets this colour choosers action command.
+     *
+     * @param command New action command
+     */
+    public void setActionCommand(final String command) {
+        this.command = command;
+    }
+    
+    /**
+     * Adds a ActionListener to the listener list.
+     *
+     * @param listener Listener to add
+     */
+    public void addActionListener(final ActionListener listener) {
+        synchronized (listeners) {
+            if (listener == null) {
+                return;
+            }
+            listeners.add(ActionListener.class, listener);
+        }
+    }
+    
+    /**
+     * Removes a ActionListener from the listener list.
+     *
+     * @param listener Listener to remove
+     */
+    public void removeActionListener(final ActionListener listener) {
+        listeners.remove(ActionListener.class, listener);
+    }
+    
+    /**
+     * Fires the action performed method on all listeners.
+     */
+    protected void fireActionPerformed() {
+        final Object[] listenerList = listeners.getListenerList();
+        for (int i = 0; i < listenerList.length; i += 2) {
+            if (listenerList[i] == ActionListener.class) {
+                ((ActionListener) listenerList[i + 1]).actionPerformed(
+                        new ActionEvent((Object) this, 
+                        ActionEvent.ACTION_PERFORMED, command));
+            }
+        }
+    }
 }