diff --git a/build.xml b/build.xml
index 8dbae00bf..8398a4eac 100644
--- a/build.xml
+++ b/build.xml
@@ -1150,6 +1150,8 @@ javax.swing.event, javax.swing.border"/>
+
@@ -1187,6 +1189,8 @@ javax.swing.event, javax.swing.border"/>
prefix="net/java/sip/communicator/impl/protocol/jabber"/>
+
@@ -1213,6 +1217,8 @@ javax.swing.event, javax.swing.border"/>
+
@@ -1238,6 +1244,8 @@ javax.swing.event, javax.swing.border"/>
+
@@ -1251,7 +1259,7 @@ javax.swing.event, javax.swing.border"/>
-
+
@@ -1316,6 +1324,8 @@ javax.swing.event, javax.swing.border"/>
manifest="src/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf">
+
@@ -1326,6 +1336,8 @@ javax.swing.event, javax.swing.border"/>
manifest="src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf">
+
@@ -1336,6 +1348,8 @@ javax.swing.event, javax.swing.border"/>
manifest="src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf">
+
@@ -1346,6 +1360,8 @@ javax.swing.event, javax.swing.border"/>
manifest="src/net/java/sip/communicator/plugin/yahooaccregwizz/yahooaccregwizz.manifest.mf">
+
@@ -1356,6 +1372,8 @@ javax.swing.event, javax.swing.border"/>
manifest="src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf">
+
@@ -1367,6 +1385,8 @@ javax.swing.event, javax.swing.border"/>
manifest="src/net/java/sip/communicator/plugin/gibberishaccregwizz/gibberishaccregwizz.manifest.mf">
+
diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java
index 7ca4ead4f..b1672916a 100644
--- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java
@@ -65,6 +65,17 @@ public byte[] getIcon()
return Resources.getImage(Resources.GIBBERISH_LOGO);
}
+ /**
+ * Implements the AccountRegistrationWizard.getPageImage 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 AccountRegistrationWizard.getProtocolName
* method. Returns the protocol name for this wizard.
@@ -185,5 +196,5 @@ public void loadAccount(ProtocolProviderService protocolProvider)
this.firstWizardPage.loadAccount(protocolProvider);
isModification = true;
- }
+ }
}
diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/Resources.java
index 7af429724..40d16d47e 100644
--- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/Resources.java
+++ b/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.
diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/resources.properties b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/resources.properties
index 394774c5b..0852e0d3b 100644
--- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/resources.properties
+++ b/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
diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/resources/gibberish.png b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/resources/gibberish.png
deleted file mode 100644
index 8002921ea..000000000
Binary files a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/resources/gibberish.png and /dev/null differ
diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
index 7160fde28..ba5efa17c 100644
--- a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
+++ b/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 AccountRegistrationWizard.getPageImage 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 AccountRegistrationWizard.getProtocolName
* method. Returns the protocol name for this wizard.
@@ -200,5 +212,5 @@ public void loadAccount(ProtocolProviderService protocolProvider) {
this.firstWizardPage.loadAccount(protocolProvider);
this.isModification = true;
- }
+ }
}
diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/icqaccregwizz/Resources.java
index fd41d6836..679cc22a7 100644
--- a/src/net/java/sip/communicator/plugin/icqaccregwizz/Resources.java
+++ b/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.
diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/resources.properties b/src/net/java/sip/communicator/plugin/icqaccregwizz/resources.properties
index 88c0a2d02..1459b4233 100644
--- a/src/net/java/sip/communicator/plugin/icqaccregwizz/resources.properties
+++ b/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
diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/resources/Icq.png b/src/net/java/sip/communicator/plugin/icqaccregwizz/resources/Icq.png
deleted file mode 100644
index 6a3d1549f..000000000
Binary files a/src/net/java/sip/communicator/plugin/icqaccregwizz/resources/Icq.png and /dev/null differ
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
index babd9ddab..aff44dd07 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
+++ b/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 AccountRegistrationWizard.getPageImage 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);
}
/**
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/Resources.java
index 7076cc99f..d2bc9f13f 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/Resources.java
+++ b/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.
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/resources.properties b/src/net/java/sip/communicator/plugin/jabberaccregwizz/resources.properties
index 1a01e33a6..e58336049 100755
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/resources.properties
+++ b/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
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/resources/jabber.gif b/src/net/java/sip/communicator/plugin/jabberaccregwizz/resources/jabber.gif
deleted file mode 100644
index b66de9888..000000000
Binary files a/src/net/java/sip/communicator/plugin/jabberaccregwizz/resources/jabber.gif and /dev/null differ
diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java
index 714420854..9acb0a4d0 100644
--- a/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java
+++ b/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 AccountRegistrationWizard.getPageImage 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 AccountRegistrationWizard.getProtocolName
diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/msnaccregwizz/Resources.java
index a0b89e262..9ac6a4657 100644
--- a/src/net/java/sip/communicator/plugin/msnaccregwizz/Resources.java
+++ b/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.
diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/resources.properties b/src/net/java/sip/communicator/plugin/msnaccregwizz/resources.properties
index 704f92512..612b68047 100755
--- a/src/net/java/sip/communicator/plugin/msnaccregwizz/resources.properties
+++ b/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
diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/resources/msn.gif b/src/net/java/sip/communicator/plugin/msnaccregwizz/resources/msn.gif
deleted file mode 100644
index bfc862402..000000000
Binary files a/src/net/java/sip/communicator/plugin/msnaccregwizz/resources/msn.gif and /dev/null differ
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/Resources.java
index d1f3f014a..3e6f00c3d 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/Resources.java
+++ b/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.
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java
index 96dc9c6ef..7f177651a 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java
+++ b/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 AccountRegistrationWizard.getPageImage 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 AccountRegistrationWizard.getProtocolName
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/resources.properties b/src/net/java/sip/communicator/plugin/sipaccregwizz/resources.properties
index c3221d6f2..84d906bc0 100755
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/resources.properties
+++ b/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
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/resources/sip.png b/src/net/java/sip/communicator/plugin/sipaccregwizz/resources/sip.png
deleted file mode 100644
index efbfaf92c..000000000
Binary files a/src/net/java/sip/communicator/plugin/sipaccregwizz/resources/sip.png and /dev/null differ
diff --git a/src/net/java/sip/communicator/plugin/yahooaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/yahooaccregwizz/Resources.java
index 96001e644..cca7c2c61 100644
--- a/src/net/java/sip/communicator/plugin/yahooaccregwizz/Resources.java
+++ b/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.
diff --git a/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java
index f1e2d6ff0..72f3ad2f1 100644
--- a/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java
+++ b/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 AccountRegistrationWizard.getPageImage 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 AccountRegistrationWizard.getProtocolName
diff --git a/src/net/java/sip/communicator/plugin/yahooaccregwizz/resources.properties b/src/net/java/sip/communicator/plugin/yahooaccregwizz/resources.properties
index 149fddeb1..d5ded5dd2 100644
--- a/src/net/java/sip/communicator/plugin/yahooaccregwizz/resources.properties
+++ b/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
diff --git a/src/net/java/sip/communicator/plugin/yahooaccregwizz/resources/yahoo.png b/src/net/java/sip/communicator/plugin/yahooaccregwizz/resources/yahoo.png
deleted file mode 100644
index feaf973db..000000000
Binary files a/src/net/java/sip/communicator/plugin/yahooaccregwizz/resources/yahoo.png and /dev/null differ