DCC Plugin now uses its own icons. Fixes issue 1253.

URL Builder now supports plugin:// URLs. Fixes issue 1252.

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

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

@@ -52,7 +52,7 @@ public class DCCChatWindow extends DCCFrame implements DCCChatInterface {
 	 * @param targetNick Nickname of target
 	 */
 	public DCCChatWindow(final DCCPlugin plugin, final DCCChat dcc, final String title, final String nick, final String targetNick) {
-		super(plugin, title, false);
+		super(plugin, title, "dcc-chat-inactive", false);
 		this.dcc = dcc;
 		dcc.setHandler(this);
 		nickname = nick;
@@ -115,6 +115,7 @@ public class DCCChatWindow extends DCCFrame implements DCCChatInterface {
 		final StringBuffer buff = new StringBuffer("DCCChatInfo");
 		ActionManager.processEvent(DCCActions.DCC_CHAT_SOCKETCLOSED, buff, this);
 		addLine(buff, "Socket closed");
+        setIcon("dcc-chat-inactive");
 	}
 	
 	/**
@@ -127,6 +128,7 @@ public class DCCChatWindow extends DCCFrame implements DCCChatInterface {
 		final StringBuffer buff = new StringBuffer("DCCChatInfo");
 		ActionManager.processEvent(DCCActions.DCC_CHAT_SOCKETOPENED, buff, this);
 		addLine(buff, "Socket opened");
+        setIcon("dcc-chat-active");
 	}
 	
 	/**

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

@@ -157,9 +157,10 @@ public abstract class DCCFrame extends WritableFrameContainer {
 	 *
 	 * @param plugin The DCCPlugin that owns this frame
 	 * @param title The title of this window
+     * @param icon The icon to use
 	 */
-	public DCCFrame(final DCCPlugin plugin, final String title) {
-		this(plugin, title, true);
+	public DCCFrame(final DCCPlugin plugin, final String title, final String icon) {
+		this(plugin, title, icon, true);
 	}
 	
 	/**
@@ -168,9 +169,11 @@ public abstract class DCCFrame extends WritableFrameContainer {
 	 * @param plugin The DCCPlugin that owns this frame
 	 * @param title The title of this window
 	 * @param defaultWindow Create default (empty) window.
+     * @param icon The icon to use
 	 */
-	public DCCFrame(final DCCPlugin plugin, final String title, final boolean defaultWindow) {
-		super("raw", IdentityManager.getGlobalConfig());
+	public DCCFrame(final DCCPlugin plugin, final String title,
+            final String icon ,final boolean defaultWindow) {
+		super(icon, IdentityManager.getGlobalConfig());
 		this.title = title;
 		this.plugin = plugin;
 

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

@@ -358,7 +358,7 @@ public final class DCCPlugin extends Plugin implements ActionListener {
 	 * Create the container window.
 	 */
 	protected void createContainer() {
-		container = new DCCFrame(this, "DCCs"){};
+		container = new DCCFrame(this, "DCCs", "dcc"){};
 		final TextLabel label = new TextLabel("This is a placeholder window to group DCCs together.");
 		label.setText(label.getText()+"\n\nClosing this window will close all the active DCCs");
 		((TextFrame)container.getFrame()).getContentPane().add(label);
@@ -415,6 +415,15 @@ public final class DCCPlugin extends Plugin implements ActionListener {
 		defaults.setOption(MY_DOMAIN, "send.blocksize", "1024");
 		defaults.setOption(MY_DOMAIN, "receive.autoaccept", "false");
 		defaults.setOption(MY_DOMAIN, "general.ip", "");
+        
+        final String url = "plugin://dcc:com/dmdirc/addons/dcc/res/";
+        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");
+        defaults.setOption("icon", "dcc-send-active", url + "send.png");
+        defaults.setOption("icon", "dcc-send-inactive", url + "send-inactive.png");
+        defaults.setOption("icon", "dcc-receive-active", url + "receive.png");
+        defaults.setOption("icon", "dcc-receive-inactive", url + "receive-inactive.png");
 		
 		defaults.setOption("formatter", "DCCChatStarting", "Starting DCC Chat with: %1$s on %2$s:%3$s");
 		defaults.setOption("formatter", "DCCChatInfo", "%1$s");

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

@@ -88,7 +88,8 @@ public class DCCSendWindow extends DCCFrame implements DCCSendInterface, ActionL
 	 * @param targetNick Nickname of target
 	 */
 	public DCCSendWindow(final DCCPlugin plugin, final DCCSend dcc, final String title, final String nick, final String targetNick) {
-		super(plugin, title);
+		super(plugin, title, dcc.getType() == DCCSend.TransferType.SEND ? 
+            "dcc-send-inactive" : "dcc-receive-inactive");
 		this.dcc = dcc;
 		dcc.setHandler(this);
 		nickname = nick;
@@ -216,6 +217,8 @@ public class DCCSendWindow extends DCCFrame implements DCCSendInterface, ActionL
 			status.setText("Status: Transfer Failed.");
 		}
 		updateSpeedAndTime();
+        setIcon(dcc.getType() == DCCSend.TransferType.SEND ? 
+            "dcc-send-active" : "dcc-receive-active");
 	}
 	
 	/**
@@ -228,6 +231,8 @@ public class DCCSendWindow extends DCCFrame implements DCCSendInterface, ActionL
 		ActionManager.processEvent(DCCActions.DCC_SEND_SOCKETOPENED, null, this);
 		status.setText("Status: Socket Opened");
 		timeStarted = System.currentTimeMillis();
+        setIcon(dcc.getType() == DCCSend.TransferType.SEND ? 
+            "dcc-send-inactive" : "dcc-receive-inactive");
 	}
 	
 	/**

src/com/dmdirc/util/URLBuilder.java

@@ -24,6 +24,7 @@ package com.dmdirc.util;
 
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.themes.ThemeManager;
 
 import java.net.MalformedURLException;
@@ -98,6 +99,19 @@ public final class URLBuilder {
         return buildJarURL(ThemeManager.getThemeDirectory() + theme + ".zip", path);
     }
     
+    /**
+     * Builds an URL pointing to a resource within a DMDirc plugin.
+     * 
+     * @param plugin The plugin which the resource is located in
+     * @param path The path within the theme of the resource
+     * @return An URL corresponding to the specified resource, or null on failure
+     */
+    public static URL buildPluginURL(final String plugin, final String path) {
+        return buildJarURL(
+                PluginManager.getPluginManager().getPluginInfoByName(plugin).getFullFilename(),
+                path);
+    }
+    
     /**
      * Constructs an URL corresponding to the described resource.
      * 
@@ -106,6 +120,7 @@ public final class URLBuilder {
      * <li>jar://path/to/jarfile:path/inside/jarfile
      * <li>zip://path/to/zipfile:path/inside/zipfile
      * <li>theme://theme_name:file/inside/theme
+     * <li>plugin://plugin_name:file/inside/plugin
      * <li>http://server/path
      * <li>https://server/path
      * <li>[file://]/path/on/filesystem</ul>
@@ -124,6 +139,15 @@ public final class URLBuilder {
             } else {
                 return buildJarURL(spec.substring(6, offset), spec.substring(offset + 1));
             }
+        } else if (spec.startsWith("plugin://")) {
+            final int offset = spec.indexOf(':', 8);
+            
+            if (offset < 0) {
+                Logger.userError(ErrorLevel.LOW, "Invalid URL, must contain ':': " + spec);
+                return null;
+            } else {
+                return buildPluginURL(spec.substring(9, offset), spec.substring(offset + 1));
+            }            
         } else if (spec.startsWith("theme://")) {
             final int offset = spec.indexOf(':', 8);