Configurable wizard "Finish" button. Account registration wizards have now a "Sign in" button.

16 files changed, 58 insertions, 9 deletions

diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java b/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java
index ab8a4a7..bbadee6 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java
@@ -621,4 +621,12 @@ public class Wizard
         this.pack();
         this.repaint();
     }
+
+    /**
+     * Implements the <tt>WizardContainer.setFinishButtonText()</tt> method.
+     */
+    public void setFinishButtonText(String text)
+    {
+        FINISH_TEXT = text;
+    }
 }
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomWizard.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomWizard.java
index 0b3c3ba..1ad24ed 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomWizard.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomWizard.java
@@ -50,6 +50,8 @@ public class CreateChatRoomWizard
         
         this.setTitle(Messages.getI18NString("createChatRoomWizard").getText());
 
+        this.setFinishButtonText(Messages.getI18NString("create").getText());
+
         page1 = new CreateChatRoomWizardPage1(this, newChatRoom,
                     mainFrame.getProtocolProviders());
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomWizard.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomWizard.java
index d235eba..18a0657 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomWizard.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomWizard.java
@@ -42,13 +42,15 @@ public class JoinChatRoomWizard
     public JoinChatRoomWizard(MainFrame mainFrame)
     {
         super(mainFrame);
-        
+
         this.mainFrame = mainFrame;
-     
+
         super.addWizardListener(this);
-        
+
         this.setTitle(Messages.getI18NString("joinChatRoomWizard").getText());
 
+        this.setFinishButtonText(Messages.getI18NString("join").getText());
+
         page1 = new JoinChatRoomWizardPage1(this, newChatRoom,
                     mainFrame.getProtocolProviders());
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizard.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizard.java
index cd7b601..a667405 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizard.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizard.java
@@ -43,13 +43,15 @@ public class AddContactWizard
     public AddContactWizard(MainFrame mainFrame)
     {
         super(mainFrame);
-        
+
         this.mainFrame = mainFrame;
-     
+
         super.addWizardListener(this);
-        
+
         this.setTitle(Messages.getI18NString("addContactWizard").getText());
 
+        this.setFinishButtonText(Messages.getI18NString("addContact").getText());
+
         Vector pps = new Vector();
         Iterator iter = mainFrame.getProtocolProviders();
         while (iter.hasNext())
diff --git a/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java
index 634c653..72e4456 100644
--- a/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java
@@ -41,6 +41,8 @@ public class AimAccountRegistrationWizard
     public AimAccountRegistrationWizard(WizardContainer wizardContainer)
     {
         this.wizardContainer = wizardContainer;
+
+        this.wizardContainer.setFinishButtonText(Resources.getString("signin"));
     }
 
     /**
diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java
index 76d08a5..6cfe057 100644
--- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java
@@ -54,6 +54,8 @@ public class GibberishAccountRegistrationWizard
     public GibberishAccountRegistrationWizard(WizardContainer wizardContainer)
     {
         this.wizardContainer = wizardContainer;
+
+        this.wizardContainer.setFinishButtonText(Resources.getString("signin"));
     }
 
     /**
diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
index 01bff6b..25b6d01 100644
--- a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
@@ -41,6 +41,8 @@ public class IcqAccountRegistrationWizard
     public IcqAccountRegistrationWizard(WizardContainer wizardContainer)
     {
         this.wizardContainer = wizardContainer;
+
+        this.wizardContainer.setFinishButtonText(Resources.getString("signin"));
     }
 
     /**
diff --git a/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java
index a532fb6..dc0433c 100644
--- a/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java
@@ -51,6 +51,8 @@ public class IrcAccountRegistrationWizard
     public IrcAccountRegistrationWizard(WizardContainer wizardContainer)
     {
         this.wizardContainer = wizardContainer;
+
+        this.wizardContainer.setFinishButtonText(Resources.getString("signin"));
     }
 
     /**
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
index e749d7a..78bc1ac 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
@@ -50,6 +50,8 @@ public class JabberAccountRegistrationWizard
     public JabberAccountRegistrationWizard(WizardContainer wizardContainer)
     {
         this.wizardContainer = wizardContainer;
+
+        this.wizardContainer.setFinishButtonText(Resources.getString("signin"));
     }
 
     /**
diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java
index abcb1a5..d6a58f2 100644
--- a/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java
@@ -45,6 +45,8 @@ public class MsnAccountRegistrationWizard
     public MsnAccountRegistrationWizard(WizardContainer wizardContainer)
     {
         this.wizardContainer = wizardContainer;
+
+        this.wizardContainer.setFinishButtonText(Resources.getString("signin"));
     }
 
     /**
diff --git a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java
index 6aa4f46..de92f82 100644
--- a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java
@@ -11,6 +11,7 @@ import java.util.*;
 
 import org.osgi.framework.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
+
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 
@@ -53,6 +54,9 @@ public class RssAccountRegistrationWizard
     public RssAccountRegistrationWizard(WizardContainer wizardContainer)
     {
         this.wizardContainer = wizardContainer;
+
+        this.wizardContainer
+            .setFinishButtonText(Resources.getString("activate"));
     }
 
     /**
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java
index ce8e2e9..80c8dbc 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java
@@ -47,8 +47,11 @@ public class SIPAccountRegistrationWizard
      * @param wizardContainer the wizard container, where this wizard
      * is added
      */
-    public SIPAccountRegistrationWizard(WizardContainer wizardContainer) {
+    public SIPAccountRegistrationWizard(WizardContainer wizardContainer)
+    {
         this.wizardContainer = wizardContainer;
+
+        this.wizardContainer.setFinishButtonText(Resources.getString("signin"));
     }
 
     /**
diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java
index afab7c7..c04a3ce 100644
--- a/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java
@@ -59,8 +59,11 @@ public class SSHAccountRegistrationWizard
      * @param wizardContainer the wizard container, where this wizard
      * is added
      */
-    public SSHAccountRegistrationWizard(WizardContainer wizardContainer) {
+    public SSHAccountRegistrationWizard(WizardContainer wizardContainer)
+    {
         this.wizardContainer = wizardContainer;
+
+        this.wizardContainer.setFinishButtonText(Resources.getString("signin"));
     }
     
     /**
diff --git a/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java
index 21a160c..5f6e915 100644
--- a/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java
@@ -46,6 +46,8 @@ public class YahooAccountRegistrationWizard
     public YahooAccountRegistrationWizard(WizardContainer wizardContainer)
     {
         this.wizardContainer = wizardContainer;
+
+        this.wizardContainer.setFinishButtonText(Resources.getString("signin"));
     }
 
     /**
diff --git a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java
index 6b031b3..6da3c02 100644
--- a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java
@@ -55,6 +55,8 @@ public class ZeroconfAccountRegistrationWizard
     public ZeroconfAccountRegistrationWizard(WizardContainer wizardContainer)
     {
         this.wizardContainer = wizardContainer;
+
+        this.wizardContainer.setFinishButtonText(Resources.getString("signin"));
     }
 
     /**
diff --git a/src/net/java/sip/communicator/service/gui/WizardContainer.java b/src/net/java/sip/communicator/service/gui/WizardContainer.java
index 257e787..5ffc1f5 100644
--- a/src/net/java/sip/communicator/service/gui/WizardContainer.java
+++ b/src/net/java/sip/communicator/service/gui/WizardContainer.java
@@ -58,7 +58,16 @@ public interface WizardContainer {
      * disable it.
      */
     public void setCancelButtonEnabled(boolean newValue);
-    
+
+    /**
+     * Sets the text label of the "Finish" wizard button. The default value of
+     * the "Finish" button is still defined by the implementation of this
+     * <tt>WizardContainer</tt> interface, but calling this method would allow
+     * wizards to specify their own finish button.
+     * @param text the new label of the button
+     */
+    public void setFinishButtonText(String text);
+
     /**
      * Refreshes the current content of this wizard container.
      */