Change wizard, reusing some strings.

Fix order of bundles, make sure that simpleaccreg is registered after all account wizards.
15 years ago · ecabea4720
parent 6fd94d65de
commit ecabea4720
5 changed files with 12 additions and 14 deletions
--- a/lib/felix.client.run.properties
+++ b/lib/felix.client.run.properties
@ -158,11 +158,13 @@ felix.auto.start.67= \
 # accordingly.

 felix.auto.start.70= \
- reference:file:sc-bundles/simpleaccreg.jar \
 reference:file:sc-bundles/securityconfig.jar \
 reference:file:sc-bundles/ippiaccregwizz.jar \
 reference:file:sc-bundles/iptelaccregwizz.jar

+felix.auto.start.72= \
+ reference:file:sc-bundles/simpleaccreg.jar \
+
 felix.auto.start.75= \
 reference:file:sc-bundles/argdelegation.jar

--- a/resources/languages/resources.properties
+++ b/resources/languages/resources.properties
@ -972,11 +972,7 @@ plugin.sip2sipaccregwizz.CREATE_ACCOUNT=Create a free sip2sip.info account
 # ippi accregwizz
 plugin.ippiaccregwizz.PROTOCOL_NAME=ippi
 plugin.ippiaccregwizz.PROTOCOL_DESCRIPTION=VoIP && Instant Messaging
-plugin.ippiaccregwizz.USERNAME=Username
-plugin.ippiaccregwizz.RETYPE_PASSWORD=Retype password
-plugin.ippiaccregwizz.EMAIL=Email address
 plugin.ippiaccregwizz.NEW_ACCOUNT_TITLE=For help about this service visit<br>http://ippi.fr
-plugin.ippiaccregwizz.EMAIL_NOTE=<html>The email address is used to send voicemail messages, <br>missed calls notifications and to recover a lost password</html>
 plugin.ippiaccregwizz.INFO_NOTE=<html>For help about this service visit <a href=''>http://ippi.fr</a></html>
 plugin.ippiaccregwizz.EXISTING_ACCOUNT=Existing ippi account
 plugin.ippiaccregwizz.CREATE_ACCOUNT=Create a free ippi account
--- a/src/net/java/sip/communicator/plugin/ippiaccregwizz/CreateIppiAccountForm.java
+++ b/src/net/java/sip/communicator/plugin/ippiaccregwizz/CreateIppiAccountForm.java
@ -88,13 +88,13 @@ private void init()
            IppiAccRegWizzActivator.getResources()
                .getI18NString("plugin.sipaccregwizz.CREATE_ACCOUNT_TITLE")));

-        JPanel labelsPanel = new TransparentPanel(new GridLayout(0, 1));
+        JPanel labelsPanel = new TransparentPanel(new GridLayout(0, 1, 0, 4));

-        JPanel valuesPanel = new TransparentPanel(new GridLayout(0, 1));
+        JPanel valuesPanel = new TransparentPanel(new GridLayout(0, 1, 0, 4));

        JLabel usernameLabel
            = new JLabel(IppiAccRegWizzActivator.getResources()
-                    .getI18NString("plugin.ippiaccregwizz.USERNAME"));
+                    .getI18NString("plugin.sip2sipaccregwizz.USERNAME"));

        JLabel passLabel
            = new JLabel(IppiAccRegWizzActivator.getResources()
@ -102,11 +102,11 @@ private void init()

        JLabel retypePasswordLabel
            = new JLabel(IppiAccRegWizzActivator.getResources()
-            .getI18NString("plugin.ippiaccregwizz.RETYPE_PASSWORD"));
+            .getI18NString("plugin.sip2sipaccregwizz.RETYPE_PASSWORD"));

        JLabel emailLabel
            = new JLabel(IppiAccRegWizzActivator.getResources()
-                .getI18NString("plugin.ippiaccregwizz.EMAIL"));
+                .getI18NString("plugin.sip2sipaccregwizz.EMAIL"));

        labelsPanel.add(usernameLabel);
        labelsPanel.add(passLabel);
@ -120,7 +120,7 @@ private void init()

        JLabel emailDescriptionLabel
            = new JLabel(IppiAccRegWizzActivator.getResources()
-                .getI18NString("plugin.ippiaccregwizz.EMAIL_NOTE"),
+                .getI18NString("plugin.sip2sipaccregwizz.EMAIL_NOTE"),
                SwingConstants.CENTER);
        emailDescriptionLabel.setForeground(Color.GRAY);
        emailDescriptionLabel.setFont(emailDescriptionLabel.getFont().deriveFont(8));
--- a/src/net/java/sip/communicator/plugin/ippiaccregwizz/IppiAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/ippiaccregwizz/IppiAccountRegistrationWizard.java
@ -212,7 +212,7 @@ protected SIPAccountCreationFormService getCreateAccountService()
     */
    protected String getUsernameLabel()
    {
-        return Resources.getString("plugin.ippiaccregwizz.USERNAME");
+        return Resources.getString("plugin.sip2sipaccregwizz.USERNAME");
    }

    /**
--- a/src/net/java/sip/communicator/plugin/ippiaccregwizz/ippiaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/ippiaccregwizz/ippiaccregwizz.manifest.mf
@ -1,6 +1,6 @@
 Bundle-Activator: net.java.sip.communicator.plugin.ippiaccregwizz.IppiAccRegWizzActivator
-Bundle-Name: Sip 2 Sip account registration wizard
-Bundle-Description: Sip 2 Sip account registration wizard.
+Bundle-Name: Ippi account registration wizard
+Bundle-Description: Ippi account registration wizard.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 System-Bundle: yes