### Eclipse Workspace Patch 1.0 #P org.eclipse.ecf.provider.irc.ui Index: build.properties =================================================================== RCS file: /cvsroot/technology/org.eclipse.ecf/plugins/org.eclipse.ecf.provider.irc.ui/build.properties,v retrieving revision 1.5 diff -u -r1.5 build.properties --- build.properties 16 Oct 2007 06:31:37 -0000 1.5 +++ build.properties 19 Mar 2008 11:39:04 -0000 @@ -2,6 +2,7 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ + icons/,\ plugin.xml,\ about.html,\ plugin.properties Index: plugin.properties =================================================================== RCS file: /cvsroot/technology/org.eclipse.ecf/plugins/org.eclipse.ecf.provider.irc.ui/plugin.properties,v retrieving revision 1.5 diff -u -r1.5 plugin.properties --- plugin.properties 2 Sep 2007 02:17:38 -0000 1.5 +++ plugin.properties 19 Mar 2008 11:39:04 -0000 @@ -27,3 +27,5 @@ colorDefinition.ircMeColor.description = Color of messages sent by local user using /me command. fontDefinition.ircMeFont = IRC /me font fontDefinition.ircMeFont.description = Font of messages sent by local user using /me command. + +IRCConnectWizardPage.description=Create a IRC connection Index: plugin.xml =================================================================== RCS file: /cvsroot/technology/org.eclipse.ecf/plugins/org.eclipse.ecf.provider.irc.ui/plugin.xml,v retrieving revision 1.7 diff -u -r1.7 plugin.xml --- plugin.xml 2 Sep 2007 02:17:38 -0000 1.7 +++ plugin.xml 19 Mar 2008 11:39:05 -0000 @@ -11,6 +11,25 @@ + + %IRCConnectWizardPage.description + + + + + + + + + @[:port][/,,...] IRCConnectWizardPage_PASSWORD_INFO=Password is for password-protected IRC servers. -IRCConnectWizardPage_CONNECTID_DEFAULT=ecfuser{0}@irc.freenode.net/#eclipse \ No newline at end of file +IRCConnectWizardPage_CONNECTID_DEFAULT=ecfuser{0}@irc.freenode.net/#eclipse + +IRCConnectWizard_WIZARD_TITLE=New IRC Connection Index: src/org/eclipse/ecf/internal/irc/ui/Messages.java =================================================================== RCS file: /cvsroot/technology/org.eclipse.ecf/plugins/org.eclipse.ecf.provider.irc.ui/src/org/eclipse/ecf/internal/irc/ui/Messages.java,v retrieving revision 1.4 diff -u -r1.4 Messages.java --- src/org/eclipse/ecf/internal/irc/ui/Messages.java 26 Jul 2007 20:42:12 -0000 1.4 +++ src/org/eclipse/ecf/internal/irc/ui/Messages.java 19 Mar 2008 11:39:05 -0000 @@ -35,6 +35,9 @@ public static String IRCUI_JOIN_COMMAND; public static String IRCUI_PART_COMMAND; public static String IRCUI_QUIT_COMMAND; + + public static String IRCConnectWizard_WIZARD_TITLE; + static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, Messages.class); Index: src/org/eclipse/ecf/internal/irc/ui/wizards/IRCConnectWizardPage.java =================================================================== RCS file: /cvsroot/technology/org.eclipse.ecf/plugins/org.eclipse.ecf.provider.irc.ui/src/org/eclipse/ecf/internal/irc/ui/wizards/IRCConnectWizardPage.java,v retrieving revision 1.14 diff -u -r1.14 IRCConnectWizardPage.java --- src/org/eclipse/ecf/internal/irc/ui/wizards/IRCConnectWizardPage.java 22 Aug 2007 06:37:28 -0000 1.14 +++ src/org/eclipse/ecf/internal/irc/ui/wizards/IRCConnectWizardPage.java 19 Mar 2008 11:39:05 -0000 @@ -85,6 +85,9 @@ } public void createControl(Composite parent) { + + parent = new Composite(parent, SWT.NONE); + parent.setLayout(new GridLayout()); GridData fillData = new GridData(SWT.FILL, SWT.CENTER, true, false); GridData endData = new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1); @@ -130,6 +133,7 @@ passwordText.setFocus(); } + org.eclipse.jface.dialogs.Dialog.applyDialogFont(parent); setControl(parent); } Index: src/org/eclipse/ecf/internal/irc/ui/wizards/IRCConnectWizard.java =================================================================== RCS file: /cvsroot/technology/org.eclipse.ecf/plugins/org.eclipse.ecf.provider.irc.ui/src/org/eclipse/ecf/internal/irc/ui/wizards/IRCConnectWizard.java,v retrieving revision 1.11 diff -u -r1.11 IRCConnectWizard.java --- src/org/eclipse/ecf/internal/irc/ui/wizards/IRCConnectWizard.java 27 May 2007 21:14:51 -0000 1.11 +++ src/org/eclipse/ecf/internal/irc/ui/wizards/IRCConnectWizard.java 19 Mar 2008 11:39:05 -0000 @@ -11,22 +11,29 @@ *****************************************************************************/ package org.eclipse.ecf.internal.irc.ui.wizards; +import org.eclipse.ecf.core.ContainerCreateException; +import org.eclipse.ecf.core.ContainerFactory; import org.eclipse.ecf.core.IContainer; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDCreateException; import org.eclipse.ecf.core.identity.IDFactory; import org.eclipse.ecf.core.security.ConnectContextFactory; import org.eclipse.ecf.core.security.IConnectContext; +import org.eclipse.ecf.internal.irc.ui.Activator; import org.eclipse.ecf.internal.irc.ui.IRCUI; +import org.eclipse.ecf.internal.irc.ui.Messages; import org.eclipse.ecf.presence.chatroom.IChatRoomManager; import org.eclipse.ecf.ui.IConnectWizard; import org.eclipse.ecf.ui.actions.AsynchContainerConnectAction; import org.eclipse.ecf.ui.dialogs.IDCreateErrorDialog; import org.eclipse.ecf.ui.util.PasswordCacheHelper; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; +import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; -public final class IRCConnectWizard extends Wizard implements IConnectWizard { +public final class IRCConnectWizard extends Wizard implements IConnectWizard, INewWizard { public static final String DEFAULT_GUEST_USER = "guest"; @@ -56,8 +63,22 @@ public void init(IWorkbench workbench, IContainer container) { this.container = container; + + setWindowTitle(Messages.IRCConnectWizard_WIZARD_TITLE); } + public void init(IWorkbench workbench, IStructuredSelection selection) { + this.container = null; + try { + this.container = ContainerFactory.getDefault().createContainer("ecf.irc.irclib"); + } catch (ContainerCreateException e) { + // None + } + + setWindowTitle(Messages.IRCConnectWizard_WIZARD_TITLE); + } + + public boolean performFinish() { final String connectID = page.getConnectID();