welcome page is added in the account registration wizard when no registered accounts are found when starting the application

8 files changed, 120 insertions, 4 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 0f94239..de0af6d 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
@@ -470,7 +470,6 @@ public class Wizard extends WindowAdapter
         Box buttonBox = new Box(BoxLayout.X_AXIS);
 
         cardPanel = new JPanel();
-        cardPanel.setBorder(new EmptyBorder(new Insets(5, 10, 5, 10)));       
 
         cardLayout = new CardLayout(); 
         cardPanel.setLayout(cardLayout);
diff --git a/src/net/java/sip/communicator/impl/gui/i18n/messages.properties b/src/net/java/sip/communicator/impl/gui/i18n/messages.properties
index 1744eae..1830f21 100644
--- a/src/net/java/sip/communicator/impl/gui/i18n/messages.properties
+++ b/src/net/java/sip/communicator/impl/gui/i18n/messages.properties
@@ -81,6 +81,7 @@ next=Next
 new=New
 newName=New name:
 no=No
+noAccountFound=In order to use the SIP-Communicator you need at least one registered account. The following pages will guide you through the process of creating an account.
 nonEmptyChatWindowClose=You're trying to close a chat with a non-sent message. Are you sure you want to close this chat?
 nonExistingUserId=The ? server does not recognize specified user id.
 notifications=Notifications
diff --git a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegFirstPage.java b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegFirstPage.java
index 42973e9..b02fcda 100644
--- a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegFirstPage.java
+++ b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegFirstPage.java
@@ -17,6 +17,7 @@ import java.util.Iterator;
 import java.util.Map;
 
 import javax.imageio.ImageIO;
+import javax.swing.BorderFactory;
 import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -85,7 +86,9 @@ public class AccountRegFirstPage extends JPanel
                 Constants.FONT.deriveFont(Font.BOLD, 16f));
         
         this.add(messageTextArea, BorderLayout.NORTH);
-        this.add(tableScrollPane, BorderLayout.CENTER);        
+        this.add(tableScrollPane, BorderLayout.CENTER);
+        
+        this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
     }
     
     /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegSummaryPage.java b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegSummaryPage.java
index b74feb0..0493b15 100644
--- a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegSummaryPage.java
+++ b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegSummaryPage.java
@@ -11,6 +11,7 @@ import java.awt.GridLayout;
 import java.util.Iterator;
 import java.util.Map;
 
+import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -61,6 +62,8 @@ public class AccountRegSummaryPage extends JScrollPane
         this.wrapPanel.add(mainPanel, BorderLayout.NORTH);
         
         this.getViewport().add(wrapPanel);
+        
+        this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
     }
     
     /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegWizardContainerImpl.java b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegWizardContainerImpl.java
index 429e2b1..27f2828 100644
--- a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegWizardContainerImpl.java
+++ b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegWizardContainerImpl.java
@@ -177,11 +177,18 @@ public class AccountRegWizardContainerImpl extends Wizard
      * Opens a wizard for creating a new account.
      */
     public void newAccount() {
+        this.newAccount(firstPage.getIdentifier());        
+    }
+    
+    /**
+     * Opens a wizard for creating a new account.
+     */
+    public void newAccount(Object currentPageIdentifier) {
         this.registerWizardPage(firstPage.getIdentifier(), firstPage);
                 
         this.registerWizardPage(summaryPage.getIdentifier(), summaryPage);
         
-        this.setCurrentPage(firstPage.getIdentifier());        
+        this.setCurrentPage(currentPageIdentifier);        
     }
     
     /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/account/NoAccountFoundPage.java b/src/net/java/sip/communicator/impl/gui/main/account/NoAccountFoundPage.java
new file mode 100644
index 0000000..c27dd3d
--- /dev/null
+++ b/src/net/java/sip/communicator/impl/gui/main/account/NoAccountFoundPage.java
@@ -0,0 +1,95 @@
+/*
+ * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.impl.gui.main.account;
+
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+
+import net.java.sip.communicator.impl.gui.i18n.Messages;
+import net.java.sip.communicator.impl.gui.utils.AntialiasingManager;
+import net.java.sip.communicator.impl.gui.utils.Constants;
+import net.java.sip.communicator.impl.gui.utils.ImageLoader;
+import net.java.sip.communicator.service.gui.WizardPage;
+
+/**
+ * The <tt>NoAccountFoundPage</tt> is the page shown in the account registration
+ * wizard shown in the beginning of the program, when no registered accounts are
+ * found.
+ * @author Yana Stamcheva
+ */
+public class NoAccountFoundPage extends JPanel
+    implements WizardPage {
+
+    private static String NO_ACCOUNT_FOUND_PAGE = "NoAccountFoundPage";
+    
+    private JTextArea messageArea
+        = new JTextArea(Messages.getString("noAccountFound"));
+        
+    public NoAccountFoundPage() {
+        super(new BorderLayout());
+        
+        this.messageArea.setLineWrap(true);
+        this.messageArea.setWrapStyleWord(true);
+        this.messageArea.setEditable(false);
+        this.messageArea.setFont(Constants.FONT.deriveFont(Font.BOLD, 14f));
+                
+        this.add(messageArea, BorderLayout.CENTER);
+        
+        this.setBorder(BorderFactory.createEmptyBorder(55, 10, 10, 10));
+    }
+    
+    public Object getIdentifier() {
+        return NO_ACCOUNT_FOUND_PAGE;
+    }
+
+    public Object getNextPageIdentifier() {
+        return WizardPage.DEFAULT_PAGE_IDENTIFIER;
+    }
+
+    public Object getBackPageIdentifier() {
+        return null;
+    }
+
+    public Object getWizardForm() {
+        return this;
+    }
+
+    public void pageHiding() {
+    }
+
+    public void pageShown() {
+    }
+
+    public void pageShowing() {
+    }
+
+    public void pageNext() {
+    }
+
+    public void pageBack() {
+    }
+    
+    protected void paintComponent(Graphics g) {
+
+        super.paintComponent(g);
+
+        AntialiasingManager.activateAntialiasing(g);
+
+        Graphics2D g2 = (Graphics2D) g;
+       
+        g2.drawImage(ImageLoader.getImage(
+                ImageLoader.AUTH_WINDOW_BACKGROUND),
+                0, 0, this.getWidth(), this.getHeight(), null);
+    }
+}
diff --git a/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java b/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java
index 7985356..58c620e 100644
--- a/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java
+++ b/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java
@@ -22,6 +22,7 @@ import net.java.sip.communicator.impl.gui.i18n.Messages;
 import net.java.sip.communicator.impl.gui.main.MainFrame;
 import net.java.sip.communicator.impl.gui.main.StatusPanel;
 import net.java.sip.communicator.impl.gui.main.account.AccountRegWizardContainerImpl;
+import net.java.sip.communicator.impl.gui.main.account.NoAccountFoundPage;
 import net.java.sip.communicator.impl.gui.utils.Constants;
 import net.java.sip.communicator.service.protocol.AccountID;
 import net.java.sip.communicator.service.protocol.ProtocolProviderFactory;
@@ -170,6 +171,11 @@ public class LoginManager
             = (AccountRegWizardContainerImpl)GuiActivator.getUIService()
                 .getAccountRegWizardContainer();
 
+        NoAccountFoundPage noAccountFoundPage = new NoAccountFoundPage();
+        
+        wizard.registerWizardPage(noAccountFoundPage.getIdentifier(),
+                noAccountFoundPage);
+        
         wizard.setTitle(
             Messages.getString("accountRegistrationWizard"));
 
@@ -180,7 +186,7 @@ public class LoginManager
                 - 100
         );
 
-        wizard.newAccount();
+        wizard.newAccount(noAccountFoundPage.getIdentifier());
 
         wizard.showModalDialog();
     }
diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java
index 126bf9d..33bd1aa 100644
--- a/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java
@@ -95,6 +95,8 @@ public class FirstWizardPage extends JPanel
         mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS));
         
         this.init();
+        
+        this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
     }
     
     /**