remove all icons stored in the wizard plugins, use icons stored in the resources package instead

build.xml

@@ -1150,6 +1150,8 @@ javax.swing.event, javax.swing.border"/>
             <zipfileset src="${lib.noinst}/joscar-protocol.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/retroweaver-rt-2.0Beta4.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/jsocks-klea.jar" prefix=""/>
+        	<zipfileset dir="resources/images/icq"
+        	                prefix="resources/images/icq"/>
         </jar>
     </target>
 
@@ -1187,6 +1189,8 @@ javax.swing.event, javax.swing.border"/>
                 prefix="net/java/sip/communicator/impl/protocol/jabber"/>
             <zipfileset src="${lib.noinst}/smack.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/smackx.jar" prefix=""/>
+        	<zipfileset dir="resources/images/jabber"
+        	                prefix="resources/images/jabber"/>
         </jar>
     </target>
 
@@ -1213,6 +1217,8 @@ javax.swing.event, javax.swing.border"/>
             <zipfileset src="${lib.noinst}/jml-1.0b1.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/cindy.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/commons-logging.jar" prefix=""/>
+        	<zipfileset dir="resources/images/msn"
+        	                prefix="resources/images/msn"/>
         </jar>
     </target>
 
@@ -1238,6 +1244,8 @@ javax.swing.event, javax.swing.border"/>
             <zipfileset dir="${dest}/net/java/sip/communicator/impl/protocol/yahoo"
                 prefix="net/java/sip/communicator/impl/protocol/yahoo"/>
             <zipfileset src="${lib.noinst}/ymsg_network_v0_61.jar" prefix=""/>
+        	<zipfileset dir="resources/images/yahoo"
+        	                prefix="resources/images/yahoo"/>
         </jar>
     </target>
 
@@ -1251,7 +1259,7 @@ javax.swing.event, javax.swing.border"/>
         <!-- zipfileset src="${lib.noinst}/gibberish_stack.jar" prefix=""/-->
         <zipfileset dir="resources/images/gibberish"
                 prefix="resources/images/gibberish"/>
-        </jar>
+		</jar>
     </target>
 
     <!-- BUNDLE-YAHOO-SLICK -->
@@ -1316,6 +1324,8 @@ javax.swing.event, javax.swing.border"/>
             manifest="src/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf">
             <zipfileset dir="${dest}/net/java/sip/communicator/plugin/icqaccregwizz"
                 prefix="net/java/sip/communicator/plugin/icqaccregwizz"/>
+        	<zipfileset dir="resources/images/icq"
+        	                prefix="resources/images/icq"/>
         </jar>
     </target>
 
@@ -1326,6 +1336,8 @@ javax.swing.event, javax.swing.border"/>
             manifest="src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf">
             <zipfileset dir="${dest}/net/java/sip/communicator/plugin/jabberaccregwizz"
                 prefix="net/java/sip/communicator/plugin/jabberaccregwizz"/>
+        	<zipfileset dir="resources/images/jabber"
+        	                prefix="resources/images/jabber"/>
         </jar>
     </target>
 
@@ -1336,6 +1348,8 @@ javax.swing.event, javax.swing.border"/>
             manifest="src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf">
             <zipfileset dir="${dest}/net/java/sip/communicator/plugin/msnaccregwizz"
                 prefix="net/java/sip/communicator/plugin/msnaccregwizz"/>
+        	<zipfileset dir="resources/images/msn"
+        	                prefix="resources/images/msn"/>
         </jar>
     </target>
 
@@ -1346,6 +1360,8 @@ javax.swing.event, javax.swing.border"/>
             manifest="src/net/java/sip/communicator/plugin/yahooaccregwizz/yahooaccregwizz.manifest.mf">
             <zipfileset dir="${dest}/net/java/sip/communicator/plugin/yahooaccregwizz"
                 prefix="net/java/sip/communicator/plugin/yahooaccregwizz"/>
+        	<zipfileset dir="resources/images/yahoo"
+        	                prefix="resources/images/yahoo"/>
         </jar>
     </target>
 
@@ -1356,6 +1372,8 @@ javax.swing.event, javax.swing.border"/>
             manifest="src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf">
             <zipfileset dir="${dest}/net/java/sip/communicator/plugin/sipaccregwizz"
                 prefix="net/java/sip/communicator/plugin/sipaccregwizz"/>
+        	<zipfileset dir="resources/images/sip"
+        	                prefix="resources/images/sip"/>
         </jar>
     </target>
 
@@ -1367,6 +1385,8 @@ javax.swing.event, javax.swing.border"/>
             manifest="src/net/java/sip/communicator/plugin/gibberishaccregwizz/gibberishaccregwizz.manifest.mf">
             <zipfileset dir="${dest}/net/java/sip/communicator/plugin/gibberishaccregwizz"
                 prefix="net/java/sip/communicator/plugin/gibberishaccregwizz"/>
+        	<zipfileset dir="resources/images/gibberish"
+        	                prefix="resources/images/gibberish"/>
         </jar>
     </target>
 

src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java

@@ -65,6 +65,17 @@ public byte[] getIcon()
         return Resources.getImage(Resources.GIBBERISH_LOGO);
     }
 
+    /**
+     * Implements the <code>AccountRegistrationWizard.getPageImage</code> method.
+     * Returns the image used to decorate the wizard page
+     * 
+     * @return byte[] the image used to decorate the wizard page
+     */
+    public byte[] getPageImage()
+    {
+        return Resources.getImage(Resources.PAGE_IMAGE);
+    }
+    
     /**
      * Implements the <code>AccountRegistrationWizard.getProtocolName</code>
      * method. Returns the protocol name for this wizard.
@@ -185,5 +196,5 @@ public void loadAccount(ProtocolProviderService protocolProvider)
         this.firstWizardPage.loadAccount(protocolProvider);
 
         isModification = true;
-    }
+    }    
 }

src/net/java/sip/communicator/plugin/gibberishaccregwizz/Resources.java

@@ -30,6 +30,8 @@ public class Resources
         .getBundle(BUNDLE_NAME);
 
     public static ImageID GIBBERISH_LOGO = new ImageID("protocolIcon");
+    
+    public static ImageID PAGE_IMAGE = new ImageID("pageImage");
 
     /**
      * Returns an internationalized string corresponding to the given key.

src/net/java/sip/communicator/plugin/gibberishaccregwizz/resources.properties

@@ -5,4 +5,6 @@ password=Password:
 rememberPassword=Remember password
 userAndPassword=Identification
 existingAccount=* The account you entered is already installed.
-protocolIcon=net/java/sip/communicator/plugin/gibberishaccregwizz/resources/gibberish.png
+
+protocolIcon=resources/images/gibberish/gibberish-online.png
+pageImage=resources/images/gibberish/gibberish64x64.png

src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java

@@ -9,6 +9,7 @@
 import java.util.*;
 
 import net.java.sip.communicator.impl.gui.customcontrols.*;
+import net.java.sip.communicator.plugin.gibberishaccregwizz.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 
@@ -21,8 +22,8 @@
  *
  * @author Yana Stamcheva
  */
-public class IcqAccountRegistrationWizard implements AccountRegistrationWizard {
-
+public class IcqAccountRegistrationWizard implements AccountRegistrationWizard
+{
     private FirstWizardPage firstWizardPage;
 
     private IcqAccountRegistration registration
@@ -50,7 +51,18 @@ public IcqAccountRegistrationWizard(WizardContainer wizardContainer) {
     public byte[] getIcon() {
         return Resources.getImage(Resources.ICQ_LOGO);
     }
-
+    
+    /**
+     * Implements the <code>AccountRegistrationWizard.getPageImage</code> method.
+     * Returns the image used to decorate the wizard page
+     * 
+     * @return byte[] the image used to decorate the wizard page
+     */
+    public byte[] getPageImage()
+    {
+        return Resources.getImage(Resources.PAGE_IMAGE);
+    }
+    
     /**
      * Implements the <code>AccountRegistrationWizard.getProtocolName</code>
      * method. Returns the protocol name for this wizard.
@@ -200,5 +212,5 @@ public void loadAccount(ProtocolProviderService protocolProvider) {
         this.firstWizardPage.loadAccount(protocolProvider);
 
         this.isModification = true;
-    }
+    }    
 }

src/net/java/sip/communicator/plugin/icqaccregwizz/Resources.java

@@ -28,6 +28,8 @@ public class Resources {
     
     public static ImageID ICQ_LOGO = new ImageID("protocolIcon");
     
+    public static ImageID PAGE_IMAGE = new ImageID("pageImage");
+    
     /**
      * Returns an internationalized string corresponding to the given key.
      * @param key The key of the string.

src/net/java/sip/communicator/plugin/icqaccregwizz/resources.properties

@@ -15,4 +15,5 @@ proxyType=Proxy type
 proxyUsername=Proxy username
 proxyPassword=Proxy password
 
-protocolIcon=net/java/sip/communicator/plugin/icqaccregwizz/resources/Icq.png
+protocolIcon=resources/images/icq/icq16x16-online.png
+pageImage=resources/images/icq/icq64x64.png

src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java

@@ -10,6 +10,7 @@
 
 import org.osgi.framework.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
+import net.java.sip.communicator.plugin.gibberishaccregwizz.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 
@@ -55,7 +56,18 @@ public JabberAccountRegistrationWizard(WizardContainer wizardContainer)
      */
     public byte[] getIcon()
     {
-        return Resources.getImage(Resources.JABBER_LOGO);
+        return Resources.getImage(Resources.PROTOCOL_ICON);
+    }
+    
+    /**
+     * Implements the <code>AccountRegistrationWizard.getPageImage</code> method.
+     * Returns the image used to decorate the wizard page
+     * 
+     * @return byte[] the image used to decorate the wizard page
+     */
+    public byte[] getPageImage()
+    {
+        return Resources.getImage(Resources.PAGE_IMAGE);
     }
 
     /**

src/net/java/sip/communicator/plugin/jabberaccregwizz/Resources.java

@@ -28,7 +28,9 @@ public class Resources
     private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
         .getBundle(BUNDLE_NAME);
 
-    public static ImageID JABBER_LOGO = new ImageID("protocolIcon");
+    public static ImageID PROTOCOL_ICON = new ImageID("protocolIcon");
+    
+    public static ImageID PAGE_IMAGE = new ImageID("pageImage");
 
     /**
      * Returns an internationalized string corresponding to the given key.

src/net/java/sip/communicator/plugin/jabberaccregwizz/resources.properties

@@ -11,4 +11,5 @@ port=Port
 sendKeepAlive=Send keep alive packets
 existingAccount=* The account you entered is already installed.
 
-protocolIcon=net/java/sip/communicator/plugin/jabberaccregwizz/resources/jabber.gif
+protocolIcon=resources/images/jabber/jabber16x16-online.png
+pageImage=resources/images/jabber/jabber48x48.png

src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java

@@ -13,6 +13,7 @@
 import org.osgi.framework.*;
 
 import net.java.sip.communicator.impl.gui.customcontrols.*;
+import net.java.sip.communicator.plugin.jabberaccregwizz.*;
 import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
@@ -56,6 +57,18 @@ public MsnAccountRegistrationWizard(WizardContainer wizardContainer) {
     public byte[] getIcon() {
         return Resources.getImage(Resources.MSN_LOGO);
     }
+    
+    /**
+     * Implements the <code>AccountRegistrationWizard.getPageImage</code> method.
+     * Returns the image used to decorate the wizard page
+     * 
+     * @return byte[] the image used to decorate the wizard page
+     */
+    public byte[] getPageImage()
+    {
+        return Resources.getImage(Resources.PAGE_IMAGE);
+    }
+
 
     /**
      * Implements the <code>AccountRegistrationWizard.getProtocolName</code>

src/net/java/sip/communicator/plugin/msnaccregwizz/Resources.java

@@ -27,6 +27,8 @@ public class Resources {
             .getBundle(BUNDLE_NAME);
 
     public static ImageID MSN_LOGO = new ImageID("protocolIcon");
+    
+    public static ImageID PAGE_IMAGE = new ImageID("pageImage");
 
     /**
      * Returns an internationalized string corresponding to the given key.

src/net/java/sip/communicator/plugin/msnaccregwizz/resources.properties

@@ -6,4 +6,5 @@ rememberPassword=Remember password
 uinAndPassword=ID and Password
 existingAccount=* The account you entered is already installed.
 
-protocolIcon=net/java/sip/communicator/plugin/msnaccregwizz/resources/msn.gif
+protocolIcon=resources/images/msn/msn16x16.png
+pageImage=resources/images/msn/msn64x64.png

src/net/java/sip/communicator/plugin/sipaccregwizz/Resources.java

@@ -27,6 +27,8 @@ public class Resources {
             .getBundle(BUNDLE_NAME);
 
     public static ImageID SIP_LOGO = new ImageID("protocolIcon");
+    
+    public static ImageID PAGE_IMAGE = new ImageID("pageImage");
 
     /**
      * Returns an internationalized string corresponding to the given key.

src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java

@@ -11,6 +11,7 @@
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.customcontrols.*;
+import net.java.sip.communicator.plugin.msnaccregwizz.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 
@@ -56,6 +57,18 @@ public SIPAccountRegistrationWizard(WizardContainer wizardContainer) {
     public byte[] getIcon() {
         return Resources.getImage(Resources.SIP_LOGO);
     }
+    
+    /**
+     * Implements the <code>AccountRegistrationWizard.getPageImage</code> method.
+     * Returns the image used to decorate the wizard page
+     * 
+     * @return byte[] the image used to decorate the wizard page
+     */
+    public byte[] getPageImage()
+    {
+        return Resources.getImage(Resources.PAGE_IMAGE);
+    }
+
 
     /**
      * Implements the <code>AccountRegistrationWizard.getProtocolName</code>

src/net/java/sip/communicator/plugin/sipaccregwizz/resources.properties

@@ -15,4 +15,5 @@ yes=Yes
 no=No
 existingAccount=* The account you entered is already installed.
 
-protocolIcon=net/java/sip/communicator/plugin/sipaccregwizz/resources/sip.png
+protocolIcon=resources/images/sip/sip16x16.png
+pageImage=resources/images/sip/sip64x64.png

src/net/java/sip/communicator/plugin/yahooaccregwizz/Resources.java

@@ -27,6 +27,8 @@ public class Resources {
             .getBundle(BUNDLE_NAME);
 
     public static ImageID YAHOO_LOGO = new ImageID("protocolIcon");
+    
+    public static ImageID PAGE_IMAGE = new ImageID("pageImage");
 
     /**
      * Returns an internationalized string corresponding to the given key.

src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java

@@ -13,6 +13,7 @@
 import org.osgi.framework.*;
 
 import net.java.sip.communicator.impl.gui.customcontrols.*;
+import net.java.sip.communicator.plugin.sipaccregwizz.*;
 import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
@@ -56,6 +57,17 @@ public YahooAccountRegistrationWizard(WizardContainer wizardContainer) {
     public byte[] getIcon() {
         return Resources.getImage(Resources.YAHOO_LOGO);
     }
+    
+    /**
+     * Implements the <code>AccountRegistrationWizard.getPageImage</code> method.
+     * Returns the image used to decorate the wizard page
+     * 
+     * @return byte[] the image used to decorate the wizard page
+     */
+    public byte[] getPageImage()
+    {
+        return Resources.getImage(Resources.PAGE_IMAGE);
+    }
 
     /**
      * Implements the <code>AccountRegistrationWizard.getProtocolName</code>

src/net/java/sip/communicator/plugin/yahooaccregwizz/resources.properties

@@ -6,4 +6,5 @@ rememberPassword=Remember password
 uinAndPassword=ID and Password
 existingAccount=* The account you entered is already installed.
 
-protocolIcon=net/java/sip/communicator/plugin/yahooaccregwizz/resources/yahoo.png
+protocolIcon=resources/images/yahoo/yahoo16x16.png
+pageImage=resources/images/yahoo/yahoo64x64.png