diff options
| author | Yana Stamcheva <yana@jitsi.org> | 2011-07-04 14:24:18 +0000 |
|---|---|---|
| committer | Yana Stamcheva <yana@jitsi.org> | 2011-07-04 14:24:18 +0000 |
| commit | c8b23f022b1e482133a8a5549c452d3440dca0bc (patch) | |
| tree | 4d7eff1e4d0811cb242b089678dd2b6d3fca2f06 /src/net/java/sip | |
| parent | 1e7c94ec424edcfe3d5037d6e1d04b9071b1e8e3 (diff) | |
| download | jitsi-c8b23f022b1e482133a8a5549c452d3440dca0bc.zip jitsi-c8b23f022b1e482133a8a5549c452d3440dca0bc.tar.gz jitsi-c8b23f022b1e482133a8a5549c452d3440dca0bc.tar.bz2 | |
Removes advanced tabs in edit account form, when account advanced configuration is disabled.
Diffstat (limited to 'src/net/java/sip')
6 files changed, 149 insertions, 32 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationPanel.java b/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationPanel.java index 5685809..f605ef7 100644 --- a/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationPanel.java @@ -75,24 +75,21 @@ public class AccountsConfigurationPanel new TransparentPanel(new FlowLayout(FlowLayout.RIGHT));
newButton.addActionListener(this);
+ editButton.addActionListener(this);
removeButton.addActionListener(this);
this.newButton.setMnemonic(GuiActivator.getResources().getI18nMnemonic(
"service.gui.ADD"));
+ this.editButton
+ .setMnemonic(GuiActivator.getResources().getI18nMnemonic(
+ "service.gui.EDIT"));
this.removeButton
.setMnemonic(GuiActivator.getResources().getI18nMnemonic(
"service.gui.DELETE"));
buttonsPanel.add(newButton);
- if (!ConfigurationManager.isAdvancedAccountConfigDisabled())
- {
- buttonsPanel.add(editButton);
- this.editButton
- .setMnemonic(GuiActivator.getResources().getI18nMnemonic(
- "service.gui.EDIT"));
- editButton.addActionListener(this);
- }
+ buttonsPanel.add(editButton);
buttonsPanel.add(removeButton);
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccRegWizzActivator.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccRegWizzActivator.java index b91e4c2..945a616 100644 --- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccRegWizzActivator.java +++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccRegWizzActivator.java @@ -10,7 +10,9 @@ import java.util.*; import org.osgi.framework.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.service.browserlauncher.*; +import net.java.sip.communicator.service.configuration.*; import net.java.sip.communicator.service.credentialsstorage.*; import net.java.sip.communicator.service.gui.*; import net.java.sip.communicator.service.protocol.*; @@ -35,6 +37,11 @@ public class JabberAccRegWizzActivator private static BrowserLauncherService browserLauncherService; + /** + * A reference to the configuration service. + */ + private static ConfigurationService configService; + private static CredentialsStorageService credentialsService = null; private static WizardContainer wizardContainer; @@ -156,4 +163,50 @@ public class JabberAccRegWizzActivator return credentialsService; } + + /** + * Returns the <tt>ConfigurationService</tt> obtained from the bundle + * context. + * @return the <tt>ConfigurationService</tt> obtained from the bundle + * context + */ + public static ConfigurationService getConfigurationService() + { + if (configService == null) + { + ServiceReference serviceReference = bundleContext + .getServiceReference(ConfigurationService.class.getName()); + + configService = (ConfigurationService)bundleContext + .getService(serviceReference); + } + + return configService; + } + + /** + * Indicates if the advanced account configuration is currently disabled. + * + * @return <tt>true</tt> if the advanced account configuration is disabled, + * otherwise returns false + */ + public static boolean isAdvancedAccountConfigDisabled() + { + // Load the "net.java.sip.communicator.impl.gui.main.account + // .ADVANCED_CONFIG_DISABLED" property. + String advancedConfigDisabledDefaultProp + = Resources.getSettingsString( + "impl.gui.main.account.ADVANCED_CONFIG_DISABLED"); + + boolean isAdvancedConfigDisabled = false; + + if (advancedConfigDisabledDefaultProp != null) + isAdvancedConfigDisabled + = Boolean.parseBoolean(advancedConfigDisabledDefaultProp); + + return getConfigurationService().getBoolean( + "net.java.sip.communicator.impl.gui.main.account." + + "ADVANCED_CONFIG_DISABLED", + isAdvancedConfigDisabled); + } } diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationForm.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationForm.java index 2c54d6b..a54a710 100644 --- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationForm.java +++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationForm.java @@ -70,22 +70,27 @@ public class JabberAccountRegistrationForm if (createService != null) createService.clear(); - if (accountPanel.getParent() != tabbedPane) - tabbedPane.addTab( Resources.getString("service.gui.ACCOUNT"), - accountPanel); + if (!JabberAccRegWizzActivator.isAdvancedAccountConfigDisabled()) + { + if (accountPanel.getParent() != tabbedPane) + tabbedPane.addTab( Resources.getString("service.gui.ACCOUNT"), + accountPanel); - if (connectionPanel.getParent() != tabbedPane) - tabbedPane.addTab(Resources.getString("service.gui.CONNECTION"), - connectionPanel); + if (connectionPanel.getParent() != tabbedPane) + tabbedPane.addTab(Resources.getString("service.gui.CONNECTION"), + connectionPanel); - if (iceConfigPanel.getParent() != tabbedPane) - tabbedPane.addTab(Resources.getString("service.gui.ICE"), - iceConfigPanel); + if (iceConfigPanel.getParent() != tabbedPane) + tabbedPane.addTab(Resources.getString("service.gui.ICE"), + iceConfigPanel); - if (tabbedPane.getParent() != this) - this.add(tabbedPane, BorderLayout.NORTH); + if (tabbedPane.getParent() != this) + this.add(tabbedPane, BorderLayout.NORTH); - tabbedPane.setSelectedIndex(0); + tabbedPane.setSelectedIndex(0); + } + else + add(accountPanel, BorderLayout.NORTH); } /** diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccRegWizzActivator.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccRegWizzActivator.java index fa5ce53..512c6a9 100644 --- a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccRegWizzActivator.java +++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccRegWizzActivator.java @@ -9,7 +9,10 @@ import java.util.*; import org.osgi.framework.*; +import sun.reflect.ReflectionFactory.*; + import net.java.sip.communicator.service.browserlauncher.*; +import net.java.sip.communicator.service.configuration.*; import net.java.sip.communicator.service.gui.*; import net.java.sip.communicator.service.protocol.*; import net.java.sip.communicator.util.*; @@ -30,6 +33,11 @@ public class SIPAccRegWizzActivator private static WizardContainer wizardContainer; + /** + * A reference to the configuration service. + */ + private static ConfigurationService configService; + private static BrowserLauncherService browserLauncherService; private static SIPAccountRegistrationWizard sipWizard; @@ -129,4 +137,50 @@ public class SIPAccRegWizzActivator return browserLauncherService; } + + /** + * Returns the <tt>ConfigurationService</tt> obtained from the bundle + * context. + * @return the <tt>ConfigurationService</tt> obtained from the bundle + * context + */ + public static ConfigurationService getConfigurationService() + { + if (configService == null) + { + ServiceReference serviceReference = bundleContext + .getServiceReference(ConfigurationService.class.getName()); + + configService = (ConfigurationService)bundleContext + .getService(serviceReference); + } + + return configService; + } + + /** + * Indicates if the advanced account configuration is currently disabled. + * + * @return <tt>true</tt> if the advanced account configuration is disabled, + * otherwise returns false + */ + public static boolean isAdvancedAccountConfigDisabled() + { + // Load the "net.java.sip.communicator.impl.gui.main.account + // .ADVANCED_CONFIG_DISABLED" property. + String advancedConfigDisabledDefaultProp + = Resources.getResources().getSettingsString( + "impl.gui.main.account.ADVANCED_CONFIG_DISABLED"); + + boolean isAdvancedConfigDisabled = false; + + if (advancedConfigDisabledDefaultProp != null) + isAdvancedConfigDisabled + = Boolean.parseBoolean(advancedConfigDisabledDefaultProp); + + return getConfigurationService().getBoolean( + "net.java.sip.communicator.impl.gui.main.account." + + "ADVANCED_CONFIG_DISABLED", + isAdvancedConfigDisabled); + } } diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationForm.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationForm.java index f366e2c..534eda7 100644 --- a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationForm.java +++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationForm.java @@ -66,22 +66,27 @@ public class SIPAccountRegistrationForm if (createService != null) createService.clear(); - if (accountPanel.getParent() != tabbedPane) - tabbedPane.addTab( Resources.getString("service.gui.ACCOUNT"), - accountPanel); + if (!SIPAccRegWizzActivator.isAdvancedAccountConfigDisabled()) + { + if (accountPanel.getParent() != tabbedPane) + tabbedPane.addTab( Resources.getString("service.gui.ACCOUNT"), + accountPanel); - if (connectionPanel.getParent() != tabbedPane) - tabbedPane.addTab(Resources.getString("service.gui.CONNECTION"), - connectionPanel); + if (connectionPanel.getParent() != tabbedPane) + tabbedPane.addTab(Resources.getString("service.gui.CONNECTION"), + connectionPanel); - if (presencePanel.getParent() != tabbedPane) - tabbedPane.addTab(Resources.getString("service.gui.PRESENCE"), - presencePanel); + if (presencePanel.getParent() != tabbedPane) + tabbedPane.addTab(Resources.getString("service.gui.PRESENCE"), + presencePanel); - if (tabbedPane.getParent() != this) - this.add(tabbedPane, BorderLayout.NORTH); + if (tabbedPane.getParent() != this) + this.add(tabbedPane, BorderLayout.NORTH); - tabbedPane.setSelectedIndex(0); + tabbedPane.setSelectedIndex(0); + } + else + add(accountPanel, BorderLayout.NORTH); } /** diff --git a/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java b/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java index c7bfa3e..6802fb0 100644 --- a/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/service/gui/AccountRegistrationWizard.java @@ -36,6 +36,9 @@ public abstract class AccountRegistrationWizard */ private boolean isModification; + /** + * The parent wizard container. + */ private WizardContainer wizardContainer; /** |