Initial work on redesigning the plugin panel in the prefs dialog.

This iteration brings the plugin information into a panel at the bottom,
it also changes the enable button into a checkbox.  This has code added
for improvements later on but the UI elements for this commented out.

Issue CLIENT-33

Change-Id: I6835f140b74e6f8e6ab815e6277504a3aaa0ed47
Reviewed-on: http://gerrit.dmdirc.com/2147
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/ui_swing/SwingController.java

@@ -502,7 +502,6 @@ public class SwingController extends BasePlugin implements UIController {
     @Override
     public void showConfig(final PreferencesDialogModel manager) {
         manager.getCategory("GUI").addSubCategory(createGeneralCategory());
-
     }
 
     /**

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

@@ -97,7 +97,7 @@ public class LockedLayer<T extends JComponent> extends
     private Component recentFocusOwner;
     /** Cursor to show when locked. */
     private Cursor lockedCursor = Cursor.getPredefinedCursor(
-            Cursor.WAIT_CURSOR);
+            Cursor.DEFAULT_CURSOR);
     /** Effect to apply when locked. */
     private LayerEffect[] lockedEffects = new LayerEffect[0];
     /** Focus listener. */

src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonCell.java

@@ -27,18 +27,18 @@ import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import java.awt.Color;
 import java.awt.Font;
 
-import javax.swing.BorderFactory;
+import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JSeparator;
 import javax.swing.UIManager;
+import javax.swing.text.StyleConstants;
 
-import net.miginfocom.layout.PlatformDefaults;
 import net.miginfocom.swing.MigLayout;
 
 /**
  * Renders an addon for display in the plugin panel.
  */
-public class AddonCell extends JPanel {
+public class AddonCell extends JPanel implements AddonToggleListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -47,30 +47,29 @@ public class AddonCell extends JPanel {
      */
     private static final long serialVersionUID = 1;
     /** Addon toggle object. */
-    private final Object info;
+    private final AddonToggle info;
     /** Name of the addon. */
     private final TextLabel name;
-    /** Version of the addon. */
-    private final TextLabel version;
-    /** Author of the addon. */
-    private final TextLabel author;
-    /** Description of the addon. */
-    private final TextLabel desc;
+    /** Status label. */
+    private final TextLabel status;
+    /** Addon icon. */
+    private final JLabel icon;
 
     /**
      * Creates a new addon cell representing the specified addon info.
      *
      * @param info PluginInfoToggle or ThemeToggle
      */
-    public AddonCell(final Object info) {
+    public AddonCell(final AddonToggle info) {
         super();
 
         name = new TextLabel(false);
-        version = new TextLabel(false);
-        author = new TextLabel(false);
-        desc = new TextLabel(false);
+        status = new TextLabel(false);
+        status.setAlignment(StyleConstants.ALIGN_RIGHT);
+        icon = new JLabel();
 
         this.info = info;
+        info.addListener(this);
         init();
     }
 
@@ -78,35 +77,24 @@ public class AddonCell extends JPanel {
      * Initialises the addon cell.
      */
     private void init() {
-        setLayout(new MigLayout("fill, ins 3 0 0 0"));
-
+        setLayout(new MigLayout("fill, ins 0, debug"));
         Color foreground = UIManager.getColor("Table.foreground");
-        if (info instanceof AddonToggle) {
-            final AddonToggle plugin = (AddonToggle) info;
-
-            if (!plugin.getState()) {
-                foreground = foreground.brighter().brighter().brighter();
-            }
-
-            name.setText(plugin.getName());
-            version.setText(plugin.getVersion());
-            author.setText(plugin.getAuthor());
-            desc.setText(plugin.getDescription());
+        if (!info.getState()) {
+            foreground = foreground.brighter().brighter().brighter();
         }
-
+        name.setText(info.getName());
+        status.setText(info.getState() ? "Enabled" : "Disabled");
         name.setForeground(foreground);
         name.setFont(name.getFont().deriveFont(Font.BOLD));
-        version.setForeground(foreground);
-        author.setForeground(foreground);
-        desc.setForeground(foreground);
-        desc.setBorder(BorderFactory.createEmptyBorder((int) PlatformDefaults.
-                getPanelInsets(0).getValue(), 0, 0, 0));
-
-        add(name, "gapleft 3, wmin 50%, wmax 50%");
-        add(version, "wmin 25%, wmax 25%");
-        add(author, "gapright 3, wmin 24.9%, wmax 24.9%, alignx right");
-        add(desc, "newline, span, grow, pushy, gapleft 3, gapright 3, wmax 99%");
-        add(new JSeparator(), "newline, span, growx, pushx");
+        status.setForeground(foreground);
+
+        add(icon, "gaptop rel, gapbottom rel, gapleft rel, "
+                + "wmin 20, wmax 20");
+        add(name, "gaptop rel, gapbottom rel, "
+                + "wmin 50% - 20, wmax 50% - 20");
+        add(status, "gaptop rel, gapbottom rel, gapright rel, "
+                + "wmin 50% - 20, wmax 50% - 20");
+        add(new JSeparator(), "newline, spanx, growx, pushx");
     }
 
     /**
@@ -124,26 +112,23 @@ public class AddonCell extends JPanel {
      * @return true iif enabled
      */
     public boolean isToggled() {
-        if (info instanceof AddonToggle) {
-            return ((AddonToggle) info).getState();
-        }
-        return false;
+        return info.getState();
     }
 
     /** {@inheritDoc} */
     @Override
-    public void setForeground(final Color color) {
+    public void setForeground(final Color fg) {
         if (name != null) {
-            name.setForeground(color);
-        }
-        if (version != null) {
-            version.setForeground(color);
+            name.setForeground(fg);
         }
-        if (author != null) {
-            author.setForeground(color);
-        }
-        if (desc != null) {
-            desc.setForeground(color);
+        if (status != null) {
+            status.setForeground(fg);
         }
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public void addonToggled() {
+        status.setText(info.getState() ? "Enabled" : "Disabled");
+    }
 }

src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonInfoPanel.java

@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.ui_swing.components.addonpanel;
+
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
+import com.dmdirc.util.ListenerList;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JCheckBox;
+import javax.swing.JPanel;
+
+import net.miginfocom.swing.MigLayout;
+
+/**
+ * Simple panel describing an addon toggle.
+ */
+public class AddonInfoPanel extends JPanel implements ActionListener,
+        AddonToggleListener {
+
+    /** Java serialisation version UID. */
+    private static final long serialVersionUID = 1L;
+    /** Addon toggle. */
+    private AddonToggle addonToggle;
+    /** Plugin description text label. */
+    private final TextLabel description;
+    /** Status toggle button. */
+    private final JCheckBox status;
+    /** Label to describe status checkbox. */
+    private final TextLabel statusLabel;
+    /** Uninstall button. */
+    //private final JButton uninstall;
+    /** Should we check this addon for updates? */
+    private final JCheckBox update;
+    /** Label to describe update checkbox. */
+    //private final TextLabel updateLabel;
+    /** Listener list. */
+    private final ListenerList listeners;
+
+    /**
+     * Creates a new addon info panel.
+     */
+    public AddonInfoPanel() {
+        description = new TextLabel();
+        status = new JCheckBox();
+        statusLabel = new TextLabel("Enable this addon", false);
+        //uninstall = new JButton("Uninstall");
+        update = new JCheckBox();
+        //updateLabel = new TextLabel("Check for updates for this addon", false);
+        listeners = new ListenerList();
+
+        layoutComponents();
+        update.addActionListener(this);
+        status.addActionListener(this);
+    }
+
+    /**
+     * Lays out the components in this panel.
+     */
+    private void layoutComponents() {
+        setLayout(new MigLayout("ins 0, fill", "[65%!][]", ""));
+
+        add(description, "grow, spany 3");
+        add(status, "aligny top");
+        add(statusLabel, "grow, push, wrap");
+        //add(update, "aligny top");
+        //add(updateLabel, "grow, push, wrap, gapbottom rel");
+        //add(uninstall, "grow, spanx 2, wrap");
+    }
+
+    /**
+     * Sets the addon toggle this panel should display information about.
+     *
+     * @param addonToggle Addon toggle to display, or null
+     */
+    public void setAddonToggle(final AddonToggle addonToggle) {
+        if (this.addonToggle != null) {
+            this.addonToggle.removeListener(this);
+        }
+        addonToggle.addListener(this);
+        this.addonToggle = addonToggle;
+        if (addonToggle == null) {
+            description.setText("");
+        } else {
+            description.setText("<b>" + addonToggle.getName() + "</b> "
+                    + addonToggle.getVersion() + " by "
+                    + addonToggle.getAuthor()
+                    + "<br><br>" + addonToggle.getDescription());
+            status.setSelected(addonToggle.getState());
+            update.setSelected(addonToggle.getUpdateState());
+        }
+    }
+
+    /**
+     * Adds an addon toggle listener to this panel, this proxies whatever
+     * addon listener is being displayed.
+     *
+     * @param listener Listener to add
+     */
+    public void addListener(final AddonToggleListener listener) {
+        listeners.add(AddonToggleListener.class, listener);
+    }
+
+    /**
+     * Removes an addon toggle listener from this panel.
+     *
+     * @param listener Listener to remove
+     */
+    public void removeListener(final AddonToggleListener listener) {
+        listeners.remove(AddonToggleListener.class, listener);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void addonToggled() {
+        listeners.getCallable(AddonToggleListener.class).addonToggled();
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param e Action event
+     */
+    @Override
+    public void actionPerformed(final ActionEvent e) {
+        if (e.getSource() == update) {
+            addonToggle.setUpdateState(update.isSelected());
+        } else if (e.getSource() == status) {
+            addonToggle.setState(status.isSelected());
+        }
+    }
+
+}

src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonPanel.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.components.addonpanel;
 
 import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.addons.ui_swing.components.addonbrowser.BrowserWindow;
 import com.dmdirc.addons.ui_swing.components.renderers.AddonCellRenderer;
@@ -30,16 +31,15 @@ import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.config.prefs.PreferencesInterface;
 
 import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.List;
 
-import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
+import javax.swing.event.HyperlinkEvent;
+import javax.swing.event.HyperlinkEvent.EventType;
+import javax.swing.event.HyperlinkListener;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.table.DefaultTableModel;
@@ -49,11 +49,9 @@ import net.miginfocom.swing.MigLayout;
 /**
  * Addon panel, base class for displaying and managing addons.
  */
-public abstract class AddonPanel extends JPanel implements
-        ActionListener, ListSelectionListener, PreferencesInterface {
+public abstract class AddonPanel extends JPanel implements AddonToggleListener,
+        ListSelectionListener, PreferencesInterface, HyperlinkListener {
 
-    /** Button to enable/disable addon. */
-    protected JButton toggleButton;
     /** List of addons. */
     protected JTable addonList;
     /**
@@ -68,10 +66,14 @@ public abstract class AddonPanel extends JPanel implements
     private final SwingController controller;
     /** Addon list scroll pane. */
     private JScrollPane scrollPane;
-    /** Currently selected addon. */
-    private int selectedAddon;
     /** Blurb label. */
     private TextLabel blurbLabel;
+    /** Get more info link. */
+    private TextLabel getMoreLabel;
+    /** Addon info panel. */
+    private AddonInfoPanel addonInfo;
+    /** Selected addon. */
+    private int selectedAddon = -1;
 
     /**
      * Creates a new instance of AddonPanel
@@ -87,11 +89,7 @@ public abstract class AddonPanel extends JPanel implements
         this.controller = controller;
 
         initComponents();
-        addListeners();
         layoutComponents();
-
-        addonList.getSelectionModel().setSelectionInterval(0, 0);
-        selectedAddon = 0;
     }
 
     /** Initialises the components. */
@@ -115,7 +113,6 @@ public abstract class AddonPanel extends JPanel implements
         addonList.setShowGrid(false);
         addonList.getSelectionModel().setSelectionMode(
                 ListSelectionModel.SINGLE_SELECTION);
-        addonList.getSelectionModel().clearSelection();
 
         scrollPane = new JScrollPane(new JLabel("Loading " + getTypeName()
                 + "..."));
@@ -124,12 +121,14 @@ public abstract class AddonPanel extends JPanel implements
         scrollPane.setVerticalScrollBarPolicy(
                 JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
 
-        toggleButton = new JButton("Enable");
-        toggleButton.setEnabled(false);
-
         blurbLabel = new TextLabel(getTypeName().substring(0, 1).toUpperCase()
                 + getTypeName().substring(1) + " allow you to extend the "
                 + "functionality of DMDirc.");
+        getMoreLabel = new TextLabel(
+                "<a href=\"http://addons.dmdirc.com\">Get more addons</a>");
+        getMoreLabel.addHyperlinkListener(this);
+        addonInfo = new AddonInfoPanel();
+        addonInfo.addListener(this);
 
         /** {@inheritDoc}. */
         new LoggingSwingWorker<Object, Object>() {
@@ -145,6 +144,17 @@ public abstract class AddonPanel extends JPanel implements
             protected void done() {
                 super.done();
                 scrollPane.setViewportView(addonList);
+                UIUtilities.invokeLater(new Runnable() {
+
+                    /** {@inheritDoc}. */
+                    @Override
+                    public void run() {
+                        addonList.getSelectionModel()
+                                .addListSelectionListener(AddonPanel.this);
+                        addonList.getSelectionModel()
+                                .setSelectionInterval(0, 0);
+                    }
+                });
             }
         }.executeInExecutor();
     }
@@ -152,26 +162,23 @@ public abstract class AddonPanel extends JPanel implements
     /** Lays out the dialog. */
     private void layoutComponents() {
         if (controller == null) {
-            setLayout(new MigLayout("ins 0, fill, hmax " + 300));
+            setLayout(new MigLayout("ins 0, fill, hmax " + 500));
         } else {
             setLayout(new MigLayout("ins 0, fill, hmax "
                     + controller.getPrefsDialog().getPanelHeight()));
         }
 
-        add(blurbLabel, "wrap 10, growx, pushx");
-
+        add(blurbLabel, "wrap 5, growx, pushx");
+        add(getMoreLabel, "wrap 5, right");
         add(scrollPane, "wrap 5, grow, push");
-
-        add(toggleButton, "split 2, growx, pushx, sg button");
-
-        final JButton button = new JButton("Get more " + getTypeName());
-        button.addActionListener(this);
-        add(button, "growx, pushx, sg button");
+        add(addonInfo, "grow, push");
     }
 
     /**
      * Populates the addon list returning it when complete.
      *
+     * @param table Table to be populated
+     *
      * @return Populated table
      */
     protected abstract JTable populateList(final JTable table);
@@ -183,61 +190,25 @@ public abstract class AddonPanel extends JPanel implements
      */
     protected abstract String getTypeName();
 
-    /** Adds listeners to components. */
-    private void addListeners() {
-        toggleButton.addActionListener(this);
-        addonList.getSelectionModel().addListSelectionListener(this);
-    }
-
-    /**
-     * Invoked when an action occurs.
-     *
-     * @param e The event related to this action.
-     */
+    /** {@inheritDoc}. */
     @Override
-    public void actionPerformed(final ActionEvent e) {
-        if (e.getSource() == toggleButton && selectedAddon >= 0) {
-            final AddonToggle addonToggle = (AddonToggle) ((AddonCell)
-                    addonList.getModel().getValueAt(addonList
-                    .getSelectedRow(), 0)).getObject();
-
-            addonToggle.toggle();
-
-            if (addonToggle.getState()) {
-                toggleButton.setText("Disable");
-            } else {
-                toggleButton.setText("Enable");
-            }
-
-            addonList.repaint();
-        } else if (e.getSource() != toggleButton) {
-            new BrowserWindow(parentWindow);
+    public void valueChanged(final ListSelectionEvent e) {
+        final int newSelection = addonList.getSelectedRow();
+        if (newSelection == -1) {
+            addonList.getSelectionModel().setSelectionInterval(0, selectedAddon);
+        } else if (addonList.getModel().getRowCount() > newSelection) {
+            addonInfo.setAddonToggle((AddonToggle) ((AddonCell) addonList
+                    .getModel().getValueAt(newSelection, 0)).getObject());
         }
+        selectedAddon = addonList.getSelectedRow();
     }
 
     /** {@inheritDoc}. */
     @Override
-    public void valueChanged(final ListSelectionEvent e) {
-        if (!e.getValueIsAdjusting()) {
-            return;
-        }
-        final int selected = addonList.getSelectionModel()
-                .getLeadSelectionIndex();
-        if (selected == -1) {
-            return;
-        }
-        final AddonToggle addonToggle = (AddonToggle) ((AddonCell)
-                ((List) ((DefaultTableModel) addonList.getModel())
-                .getDataVector().elementAt(selected)).get(0)).getObject();
-        toggleButton.setEnabled(true);
-
-        if (addonToggle.getState()) {
-            toggleButton.setEnabled(addonToggle.isUnloadable());
-            toggleButton.setText("Disable");
-        } else {
-            toggleButton.setText("Enable");
+    public void hyperlinkUpdate(final HyperlinkEvent e) {
+        if (e.getEventType() == EventType.ACTIVATED) {
+            new BrowserWindow(parentWindow);
         }
-        selectedAddon = selected;
     }
 
     /** {@inheritDoc} */
@@ -246,10 +217,16 @@ public abstract class AddonPanel extends JPanel implements
         if (addonList.getRowCount() == 0) {
             return;
         }
-        for (int i = 1; i < addonList.getRowCount(); i++) {
+        for (int i = 0; i < addonList.getRowCount(); i++) {
             addonList.getModel().getColumnCount();
             ((AddonToggle) ((AddonCell) addonList.getModel()
                     .getValueAt(i, 0)).getObject()).apply();
         }
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public void addonToggled() {
+        addonList.repaint();
+    }
 }

src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonToggle.java

@@ -21,23 +21,33 @@
  */
 package com.dmdirc.addons.ui_swing.components.addonpanel;
 
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.themes.Theme;
 import com.dmdirc.ui.themes.ThemeManager;
+import com.dmdirc.updater.UpdateChecker;
+import com.dmdirc.updater.UpdateComponent;
+import com.dmdirc.util.ListenerList;
 
 /**
  * Wraps a Addon object (Theme or Plugin) with a boolean to indicate whether
  * it should be toggled or not.
  */
-public class AddonToggle {
+public final class AddonToggle {
 
     /** The PluginInfo object we're wrapping. */
     private final PluginInfo pi;
     /** The Theme object we're wrapping. */
     private final Theme theme;
-    /** Whether or not to toggle it. */
-    private boolean toggled = false;
+    /** Update component. */
+    private final UpdateComponent updateComponent;
+    /** Addon state. */
+    private boolean state;
+    /** Whether or nor the addon update state should be toggled. */
+    private boolean updateState;
+    /** Listener list. */
+    private final ListenerList listeners;
 
     /**
      * Creates a new instance of AddonToggle to wrap the specified
@@ -53,13 +63,32 @@ public class AddonToggle {
         }
         this.pi = pi;
         this.theme = theme;
+        listeners = new ListenerList();
+        state = pi.isLoaded();
+        updateComponent = UpdateChecker.findComponent("addon-" + getID());
+        if (updateComponent != null) {
+            updateState = UpdateChecker.isEnabled(updateComponent);
+        }
+    }
+
+    /**
+     * Sets the state of this adddon.
+     *
+     * @param state New state
+     */
+    public void setState(final boolean state) {
+        this.state = state;
+        triggerListener();
     }
 
     /**
-     * Toggles this PluginInfoToggle.
+     * Sets the update state of this addon.
+     *
+     * @param updateState New update state
      */
-    public void toggle() {
-        toggled ^= true;
+    public void setUpdateState(final boolean updateState) {
+        this.updateState = updateState;
+        triggerListener();
     }
 
     /**
@@ -69,11 +98,18 @@ public class AddonToggle {
      * @return True if the plugin is or should be loaded, false otherwise.
      */
     public boolean getState() {
+        return state;
+    }
+
+    /**
+     * Gets the update state of this PluginInfo, taking into account the state
+     * of the update toggle setting.
+     *
+     * @return True if the plugin is or should be updated, false otherwise.
+     */
+    public boolean getUpdateState() {
         if (pi != null) {
-            return toggled ^ pi.isLoaded();
-        }
-        if (theme != null) {
-            return toggled ^ theme.isEnabled();
+            return updateState;
         }
         return false;
     }
@@ -105,16 +141,25 @@ public class AddonToggle {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                if (pi != null && toggled) {
-                    if (pi.isLoaded()) {
-                        pi.unloadPlugin();
-                    } else {
+                if (pi != null) {
+                    if (AddonToggle.this.getState()) {
                         pi.loadPlugin();
+                    } else {
+                        pi.unloadPlugin();
                     }
                     PluginManager.getPluginManager().updateAutoLoad(pi);
+                    if (getID() != -1) {
+                        if (getUpdateState()) {
+                            IdentityManager.getConfigIdentity().unsetOption(
+                                    "updater", "enable-addon-" + getID());
+                        } else {
+                            IdentityManager.getConfigIdentity().setOption(
+                                   "updater", "enable-addon-" + getID(), false);
+                        }
+                    }
                 }
-                if (theme != null && toggled) {
-                    if (theme.isEnabled()) {
+                if (theme != null) {
+                    if (AddonToggle.this.getState()) {
                         theme.applyTheme();
                     } else {
                         theme.removeTheme();
@@ -153,6 +198,18 @@ public class AddonToggle {
         return "Unknown addon name";
     }
 
+    /**
+     * Returns the ID of this addon. This will return -1 for any theme.
+     *
+     * @return Addon ID
+     */
+    public int getID() {
+        if (pi != null) {
+            return pi.getMetaData().getUpdaterId();
+        }
+        return -1;
+    }
+
     /**
      * Returns the friendly version of this addon.
      *
@@ -204,4 +261,29 @@ public class AddonToggle {
         return "There is an error with this addon.";
     }
 
+    /**
+     * Adds an addon toggle listener to this panel.
+     *
+     * @param listener Listener to add
+     */
+    public void addListener(final AddonToggleListener listener) {
+        listeners.add(AddonToggleListener.class, listener);
+    }
+
+    /**
+     * Removes an addon toggle listener from this panel.
+     *
+     * @param listener Listener to remove
+     */
+    public void removeListener(final AddonToggleListener listener) {
+        listeners.remove(AddonToggleListener.class, listener);
+    }
+
+    /**
+     * Triggers this listener to be called across all it's listeners.
+     */
+    public void triggerListener() {
+        listeners.getCallable(AddonToggleListener.class).addonToggled();
+    }
+
 }

src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonToggleListener.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.ui_swing.components.addonpanel;
+
+/**
+ * Addon toggle listener.
+ */
+public interface AddonToggleListener {
+
+    /**
+     * Called when the addon has been toggled.
+     */
+    void addonToggled();
+}

src/com/dmdirc/addons/ui_swing/components/addonpanel/PluginPanel.java

@@ -85,12 +85,6 @@ public class PluginPanel extends AddonPanel implements ActionListener {
                             new AddonCell[]{
                         new AddonCell(new AddonToggle(plugin, null)), });
                 }
-
-                if (((DefaultTableModel) table.getModel()).getRowCount()
-                        > 0) {
-                    toggleButton.setEnabled(true);
-                }
-
                 table.repaint();
             }
         });

src/com/dmdirc/addons/ui_swing/components/addonpanel/ThemePanel.java

@@ -78,11 +78,6 @@ public class ThemePanel extends AddonPanel {
                         new AddonCell(new AddonToggle(null, theme)), });
                 }
 
-                if (((DefaultTableModel) addonList.getModel()).getRowCount()
-                        > 0) {
-                    toggleButton.setEnabled(true);
-                }
-
                 addonList.repaint();
             }
         });

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

@@ -55,11 +55,6 @@ public class AddonCellRenderer implements TableCellRenderer {
                 label.setBackground(table.getSelectionBackground());
             } else {
                 label.setBackground(table.getBackground());
-                final Color colour = (row & 1)
-                        == 1 ? new Color(0xEE, 0xEE, 0xFF) : Color.WHITE;
-                if (!label.getBackground().equals(colour)) {
-                    label.setBackground(colour);
-                }
             }
 
             final int height = label.getPreferredSize().height;

src/com/dmdirc/addons/ui_swing/dialogs/prefs/SwingPreferencesDialog.java

@@ -82,7 +82,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
     /** Parent window. */
     private final MainFrame parentWindow;
     /** Panel size. */
-    private int panelSize = 300;
+    private int panelSize = 500;
 
     /**
      * Creates a new instance of SwingPreferencesDialog.