Adds support for protocol providers without wizards. Patch contributed by Tom Denham.

cusax-fix
Damian Minkov 13 years ago
parent 6b4f9cbc15
commit 773e1fa6f8

@ -527,6 +527,7 @@ service.gui.UPDATE=Update
service.gui.MOBILE_PHONE=Mobile service.gui.MOBILE_PHONE=Mobile
service.gui.WORK_PHONE=Work service.gui.WORK_PHONE=Work
service.gui.PHONE=Home service.gui.PHONE=Home
service.gui.EDIT_NOT_SUPPORTED=Editing this account is not supported
service.gui.ZID_NAME_SET=ZRTP identifier's name: service.gui.ZID_NAME_SET=ZRTP identifier's name:
service.gui.ZID_NAME_NOT_SET=ZRTP identifier name is not set. service.gui.ZID_NAME_NOT_SET=ZRTP identifier name is not set.

@ -19,11 +19,12 @@
import net.java.sip.communicator.util.swing.*; import net.java.sip.communicator.util.swing.*;
import org.jitsi.service.configuration.*; import org.jitsi.service.configuration.*;
import org.jitsi.service.resources.*;
/** /**
* The <tt>AccountsConfigurationPanel</tt> is the panel containing the accounts * The <tt>AccountsConfigurationPanel</tt> is the panel containing the accounts
* list and according buttons shown in the options form. * list and according buttons shown in the options form.
* *
* @author Yana Stamcheva * @author Yana Stamcheva
* @author Lubomir Marinov * @author Lubomir Marinov
*/ */
@ -171,11 +172,13 @@ else if (sourceButton.equals(removeButton))
= (AccountRegWizardContainerImpl) GuiActivator = (AccountRegWizardContainerImpl) GuiActivator
.getUIService().getAccountRegWizardContainer(); .getUIService().getAccountRegWizardContainer();
AccountRegistrationWizard wizard ProtocolProviderService protocolProvider =
= wizardContainer.getProtocolWizard( account.getProtocolProvider();
account.getProtocolProvider()); AccountRegistrationWizard wizard =
wizardContainer.getProtocolWizard(protocolProvider);
wizard.accountRemoved(account.getProtocolProvider()); if (wizard != null)
wizard.accountRemoved(protocolProvider);
} }
} }
} }
@ -191,17 +194,34 @@ else if (sourceButton.equals(editButton))
(AccountRegWizardContainerImpl) GuiActivator.getUIService() (AccountRegWizardContainerImpl) GuiActivator.getUIService()
.getAccountRegWizardContainer(); .getAccountRegWizardContainer();
wizard.setTitle(GuiActivator.getResources().getI18NString( AccountRegistrationWizard protocolWizard =
"service.gui.ACCOUNT_REGISTRATION_WIZARD")); wizard.getProtocolWizard(account.getProtocolProvider());
ResourceManagementService resources = GuiActivator.getResources();
if (protocolWizard != null)
{
wizard.setTitle(resources.getI18NString(
"service.gui.ACCOUNT_REGISTRATION_WIZARD"));
wizard.modifyAccount(account.getProtocolProvider()); wizard.modifyAccount(account.getProtocolProvider());
wizard.showDialog(false); wizard.showDialog(false);
}
else
{
// There is no wizard for this account - just show an error
// dialog:
String title = resources.getI18NString("service.gui.ERROR");
String message =
resources.getI18NString("service.gui.EDIT_NOT_SUPPORTED");
ErrorDialog dialog = new ErrorDialog(null, title, message);
dialog.setVisible(true);
}
} }
} }
/** /**
* Returns the edit button. * Returns the edit button.
* *
* @return the edit button * @return the edit button
*/ */
public JButton getEditButton() public JButton getEditButton()

Loading…
Cancel
Save