Issue 1737

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

src/com/dmdirc/addons/dcc/DCCPlugin.java

 		defaults.setOption(MY_DOMAIN, "firewall.ports.endPort", "11019");
 		
 		final String url = "plugin://dcc:com/dmdirc/addons/dcc/res/";
+        defaults.setOption("icon", "category-dcc", url + "transfers.png");
 		defaults.setOption("icon", "dcc", url + "transfers.png");
 		defaults.setOption("icon", "dcc-chat-active", url + "chat.png");
 		defaults.setOption("icon", "dcc-chat-inactive", url + "chat-inactive.png");
 	/** {@inheritDoc} */
 	@Override
 	public void showConfig(final PreferencesManager manager) {
-		final PreferencesCategory general = new PreferencesCategory("DCC", "");
+		final PreferencesCategory general = new PreferencesCategory("DCC", "", "category-dcc");
 		final PreferencesCategory firewall = new PreferencesCategory("Firewall", "");
 		final PreferencesCategory sending = new PreferencesCategory("Sending", "");
 		final PreferencesCategory receiving = new PreferencesCategory("Receiving", "");

src/com/dmdirc/addons/mediasource_vlc/VlcMediaSourcePlugin.java

     /** {@inheritDoc} */
     @Override    
     public void onLoad() {
-        // Do nothing
+        IdentityManager.getAddonIdentity().setOption("icon", "category-vlc",
+                "plugin://vlcmediasource:com/dmdirc/addons/mediasource_vlc/vlc.png");
     }
 
     /** {@inheritDoc} */
     /** {@inheritDoc} */
     @Override
     public void showConfig(final PreferencesManager manager) {
-        final PreferencesCategory general = new PreferencesCategory("VLC Media Source", "");
+        final PreferencesCategory general = new PreferencesCategory("VLC Media Source",
+                "", "category-vlc");
         final PreferencesCategory instr = new PreferencesCategory("Instructions",
                 "", new InstructionsPanel());
         

src/com/dmdirc/addons/nowplaying/NowPlayingPlugin.java

         
         ActionManager.addListener(this, CoreActionType.PLUGIN_LOADED,
                 CoreActionType.PLUGIN_UNLOADED);
+
+        IdentityManager.getConfigIdentity().setOption("icon", "category-nowplaying",
+                "plugin://nowplaying:com/dmdirc/addons/nowplaying/nowplaying.png");
         
         for (PluginInfo target : PluginManager.getPluginManager().getPluginInfos()) {
             if (target.isLoaded()) {
         final ConfigPanel configPanel = new ConfigPanel(this, order);
         
         final PreferencesCategory category = new PreferencesCategory("Now Playing",
-                "", configPanel);
+                "", "category-nowplaying", configPanel);
         manager.getCategory("Plugins").addSubCategory(category);
     }
     

src/com/dmdirc/addons/nowplaying/nowplaying.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg2450"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="nowplaying.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs2452">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective2458" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="5.5386024"
+     inkscape:cy="8"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1151"
+     inkscape:window-height="654"
+     inkscape:window-x="0"
+     inkscape:window-y="295">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2460" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2455">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#800080;fill-opacity:1;fill-rule:evenodd;stroke:#800080;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2462"
+       sodipodi:cx="6.3519802"
+       sodipodi:cy="11.112128"
+       sodipodi:rx="2.7930694"
+       sodipodi:ry="2.8155942"
+       d="M 9.1450496,11.112128 A 2.7930694,2.8155942 0 1 1 3.5589108,11.112128 A 2.7930694,2.8155942 0 1 1 9.1450496,11.112128 z"
+       transform="translate(-0.9460396,0.3603961)" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#800080;stroke-width:1.89999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 7.1915538,12.286342 L 8.1736822,3.1003096 C 8.1736822,3.1003096 11.2885,7.0470597 13.585397,4.4414127"
+       id="path2464" />
+  </g>
+</svg>

src/com/dmdirc/config/defaults/default/defaults

   popups
   protocol
   plugin-addonid
+  icon
 
 identity:
   name=DMDirc default settings
   timeplugin=6
   urlcatcher=25
   userlevel=21
-  windowstatus=13
+  windowstatus=13
+
+icon:
+  category-addons=dmdirc://com/dmdirc/res/addon.png
+  category-advanced=dmdirc://com/dmdirc/res/cog.png
+  category-connection=dmdirc://com/dmdirc/res/server.png
+  category-gui=dmdirc://com/dmdirc/res/monitor.png
+  category-messages=dmdirc://com/dmdirc/res/feedback.png
+  category-updates=dmdirc://com/dmdirc/res/update.png
+  category-urlhandlers=dmdirc://com/dmdirc/res/urls.png

src/com/dmdirc/config/prefs/PreferencesCategory.java

     
     /** A description of this category. */
     private final String description;
+
+    /** The icon to use for this category. */
+    private final String icon;
     
     /** Whether or not this category is inline. */
     private boolean isInline = false;
      * @param description The description of this category
      */
     public PreferencesCategory(final String title, final String description) {
-        this(title, description, null);
+        this(title, description, null, null);
     }
-    
+
+    /**
+     * Creates a new preferences category that contains settings.
+     *
+     * @since 0.6.3
+     * @param title The title of this preferences category
+     * @param description The description of this category
+     * @param icon The icon to use for this category
+     */
+    public PreferencesCategory(final String title, final String description,
+            final String icon) {
+        this(title, description, icon, null);
+    }
+
     /**
      * Creates a new preferences category that contains an object.
-     * 
+     *
      * @param title The title of this preferences category
      * @param description The description of this category
      * @param object The replacement object for this category
      */
     public PreferencesCategory(final String title, final String description,
             final PreferencesInterface object) {
+        this(title, description, null, object);
+    }
+    
+    /**
+     * Creates a new preferences category that contains an object.
+     *
+     * @since 0.6.3
+     * @param title The title of this preferences category
+     * @param description The description of this category
+     * @param icon The icon to use for this category
+     * @param object The replacement object for this category
+     */
+    public PreferencesCategory(final String title, final String description,
+            final String icon, final PreferencesInterface object) {
         this.title = title;
         this.description = description;
+        this.icon = icon;
         this.object = object;
     }
     
     public String getTitle() {
         return title;
     }
+
+    /**
+     * Retrieves the icon to use for this category.
+     *
+     * @return This category's icon
+     * @since 0.6.3
+     */
+    public String getIcon() {
+        return icon;
+    }
     
     /**
      * Determines if this category has a replacement object.

src/com/dmdirc/config/prefs/PreferencesManager.java

      * Creates and adds the "Connection" category.
      */
     private void addConnectionCategory() {
-        final PreferencesCategory category = new PreferencesCategory("Connection", "");
+        final PreferencesCategory category = new PreferencesCategory("Connection",
+                "", "category-connection");
 
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "general", "closechannelsonquit", "false", "Close channels on quit",
      * Creates and adds the "Messages" category.
      */
     private void addMessagesCategory() {
-        final PreferencesCategory category = new PreferencesCategory("Messages", "");
+        final PreferencesCategory category = new PreferencesCategory("Messages",
+                "", "category-messages");
 
         category.addSetting(new PreferencesSetting(PreferencesType.TEXT,
                 "general", "closemessage", "DMDirc exiting",
      * Creates and adds the "Advanced" category.
      */
     private void addAdvancedCategory() {
-        final PreferencesCategory category = new PreferencesCategory("Advanced", "");
+        final PreferencesCategory category = new PreferencesCategory("Advanced", 
+                "", "category-advanced");
 
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "browser", "userlaunchdelay", "false", "Use browser launch delay",
         final Map<String, String> lafs = new HashMap<String, String>();
         final Map<String, String> framemanagers = new HashMap<String, String>();
         final Map<String, String> fmpositions = new HashMap<String, String>();
-        final PreferencesCategory category = new PreferencesCategory("GUI", "");
+        final PreferencesCategory category = new PreferencesCategory("GUI", "",
+                "category-gui");
 
         framemanagers.put("treeview", "Treeview");
         framemanagers.put("buttonbar", "Button bar");
     private void addThemesCategory(final PreferencesCategory parent) {
         // TODO: Abstract the panel
 
-        parent.addSubCategory(new PreferencesCategory("Themes", "", new ThemePanel()));        
+        parent.addSubCategory(new PreferencesCategory("Themes", "",
+                "category-addons", new ThemePanel()));
     }
 
     /**
     private void addPluginsCategory() {
         // TODO: Abstract the panel
 
-        addCategory(new PreferencesCategory("Plugins", "", new PluginPanel()));
+        addCategory(new PreferencesCategory("Plugins", "", "category-addons",
+                new PluginPanel()));
     }
 
     /**
     private void addUpdatesCategory() {
         // TODO: Abstract the panel
 
-        addCategory(new PreferencesCategory("Updates", "", new UpdateConfigPanel()));
+        addCategory(new PreferencesCategory("Updates", "", "category-updates",
+                new UpdateConfigPanel()));
     }
 
     /**
 
         addCategory(new PreferencesCategory("URL Handlers",
                 "Configure how DMDirc handles different types of URLs",
-                new URLConfigPanel()));
+                "category-urlhandlers", new URLConfigPanel()));
     }
 
     /**

src/com/dmdirc/ui/IconManager.java

         //Get the url for the speficied path
         URL imageURL = URLBuilder.buildURL(path);
         
-        try {
-            //if the path didnt exist see if its a file
-            if (imageURL == null) {
-                final File file = new File(path);
-                if (file.exists()) {
-                    imageURL = file.toURI().toURL();
-                } else {
-                    imageURL = defaultURL;
-                }
-            }
-            
-            //check if the url has content
-            if (imageURL == null || imageURL.getContent() == null)  {
-                imageURL = defaultURL;
-            }
-        } catch (IOException ex) {
-            imageURL = defaultURL;
+        if (imageURL == null && defaultURL != null) {
+           imageURL = defaultURL;
         }
-        
-        if (imageURL == null) {
+
+        if (imageURL == null && defaultURL == null) {
             imageURL = cldr.getResource("com/dmdirc/res/icon.png");
             
             if (imageURL == null) {

src/com/dmdirc/ui/swing/components/renderers/ProfileListCellRenderer.java

 
 package com.dmdirc.ui.swing.components.renderers;
 
-import com.dmdirc.ui.swing.dialogs.profiles.Profile;
+import com.dmdirc.config.Profile;
 
 import java.awt.Component;
 

src/com/dmdirc/ui/swing/dialogs/prefs/PreferencesTreeCellRenderer.java

 
 package com.dmdirc.ui.swing.dialogs.prefs;
 
+import com.dmdirc.config.prefs.PreferencesCategory;
+import com.dmdirc.ui.IconManager;
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Font;
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 import javax.swing.JTree;
+import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreeCellRenderer;
 
 import net.miginfocom.layout.PlatformDefaults;
     public final Component getTreeCellRendererComponent(final JTree tree,
             final Object value, final boolean sel, final boolean expanded,
             final boolean leaf, final int row, final boolean focused) {
-        setPreferredSize(new Dimension(100000,
-                getFont().getSize() + padding));
-        setBorder(BorderFactory.createEmptyBorder(0, 0, padding,
-                padding));
-        setText(value.toString());
+        if (((DefaultMutableTreeNode) value).getUserObject() instanceof PreferencesCategory) {
+            final PreferencesCategory cat = (PreferencesCategory)
+                    ((DefaultMutableTreeNode) value).getUserObject();
+
+            setText(cat.getTitle());
+            setIcon(IconManager.getIconManager().getIcon(cat.getIcon()));
+        }
+
+        setPreferredSize(new Dimension(100000, Math.max(16,
+                getFont().getSize()) + padding));
+        setBorder(BorderFactory.createEmptyBorder(0, 0, padding, padding));
         setBackground(tree.getBackground());
         setForeground(tree.getForeground());
         setOpaque(true);

src/com/dmdirc/ui/swing/dialogs/prefs/SwingPreferencesDialog.java

 
     /**
      * Resets the content of the tooltip.
+     *
+     * @since 0.6.3
      */
     protected void resetTooltip() {
         tooltip.setFont(tooltip.getFont().deriveFont(Font.ITALIC));
      * Sets the content of the tooltip area to the specified text.
      *
      * @param text The text to be displayed
+     * @since 0.6.3
      */
     protected void setTooltip(final String text) {
         tooltip.setFont(tooltip.getFont().deriveFont(Font.PLAIN));
      * listeners to any {@link JComponent} with a tooltip set.
      *
      * @param components The components to iterate over
+     * @since 0.6.3
      */
     protected void addMouseListeners(final Component[] components) {
         for (Component component : components) {
         final String path = namePrefix + "/" + category.getTitle();
         DefaultMutableTreeNode newNode;
 
-        newNode = new DefaultMutableTreeNode(category.getTitle());
+        newNode = new DefaultMutableTreeNode(category);
 
         categories.put(category, panel);
         nodes.put(newNode, path);
 
         mainPanel.add(scrollPane, path);
         ((DefaultTreeModel) tabList.getModel()).insertNodeInto(newNode,
-                parentNode, parentNode.getChildCount());
+                rootNode, parentNode.getChildCount());
         tabList.scrollPathToVisible(new TreePath(newNode.getPath()));
 
         initCategory(category, panel, newNode, path);
         }
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     *
+     * @since 0.6.3
+     */
     @Override
     public void mouseClicked(final MouseEvent e) {
         // Not used
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     *
+     * @since 0.6.3
+     */
     @Override
     public void mousePressed(final MouseEvent e) {
         // Not used
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     *
+     * @since 0.6.3
+     */
     @Override
     public void mouseReleased(final MouseEvent e) {
         // Not used
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     *
+     * @since 0.6.3
+     */
     @Override
     public void mouseEntered(final MouseEvent e) {
         setTooltip(tooltips.get(e.getComponent()));
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     *
+     * @since 0.6.3
+     */
     @Override
     public void mouseExited(final MouseEvent e) {
         resetTooltip();