diff options
author | slewis | 2007-05-22 20:53:15 +0000 |
---|---|---|
committer | slewis | 2007-05-22 20:53:15 +0000 |
commit | 4953a0be78fdea174707d5245fac79864dcc81a4 (patch) | |
tree | 2680826f08facdd552611ad98fb6ff25dde1fdf7 /examples | |
parent | 7f33c255ee87b1f2daf417c31d010f6fb766de9d (diff) | |
download | org.eclipse.ecf-4953a0be78fdea174707d5245fac79864dcc81a4.tar.gz org.eclipse.ecf-4953a0be78fdea174707d5245fac79864dcc81a4.tar.xz org.eclipse.ecf-4953a0be78fdea174707d5245fac79864dcc81a4.zip |
Changed icons with new ones for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=183015. Also updated and added to code references.v20070522-1552
Diffstat (limited to 'examples')
13 files changed, 16 insertions, 12 deletions
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/icons/buddy_available.gif b/examples/bundles/org.eclipse.ecf.example.collab/icons/buddy_available.gif Binary files differdeleted file mode 100644 index 31d8f3ac7..000000000 --- a/examples/bundles/org.eclipse.ecf.example.collab/icons/buddy_available.gif +++ /dev/null diff --git a/examples/bundles/org.eclipse.ecf.example.collab/icons/collaboration.gif b/examples/bundles/org.eclipse.ecf.example.collab/icons/collaboration.gif Binary files differnew file mode 100644 index 000000000..6b343da8d --- /dev/null +++ b/examples/bundles/org.eclipse.ecf.example.collab/icons/collaboration.gif diff --git a/examples/bundles/org.eclipse.ecf.example.collab/icons/contact_enabled.gif b/examples/bundles/org.eclipse.ecf.example.collab/icons/contact_enabled.gif Binary files differnew file mode 100644 index 000000000..5eed04350 --- /dev/null +++ b/examples/bundles/org.eclipse.ecf.example.collab/icons/contact_enabled.gif diff --git a/examples/bundles/org.eclipse.ecf.example.collab/icons/group.gif b/examples/bundles/org.eclipse.ecf.example.collab/icons/group.gif Binary files differdeleted file mode 100644 index 495c1a22b..000000000 --- a/examples/bundles/org.eclipse.ecf.example.collab/icons/group.gif +++ /dev/null diff --git a/examples/bundles/org.eclipse.ecf.example.collab/icons/im.gif b/examples/bundles/org.eclipse.ecf.example.collab/icons/im.gif Binary files differdeleted file mode 100644 index d52de243f..000000000 --- a/examples/bundles/org.eclipse.ecf.example.collab/icons/im.gif +++ /dev/null diff --git a/examples/bundles/org.eclipse.ecf.example.collab/icons/messages.gif b/examples/bundles/org.eclipse.ecf.example.collab/icons/messages.gif Binary files differnew file mode 100644 index 000000000..27d15cc3c --- /dev/null +++ b/examples/bundles/org.eclipse.ecf.example.collab/icons/messages.gif diff --git a/examples/bundles/org.eclipse.ecf.example.collab/icons/person.gif b/examples/bundles/org.eclipse.ecf.example.collab/icons/person.gif Binary files differdeleted file mode 100644 index 608d2d165..000000000 --- a/examples/bundles/org.eclipse.ecf.example.collab/icons/person.gif +++ /dev/null diff --git a/examples/bundles/org.eclipse.ecf.example.collab/icons/presence_member.gif b/examples/bundles/org.eclipse.ecf.example.collab/icons/presence_member.gif Binary files differdeleted file mode 100644 index d307b2006..000000000 --- a/examples/bundles/org.eclipse.ecf.example.collab/icons/presence_member.gif +++ /dev/null diff --git a/examples/bundles/org.eclipse.ecf.example.collab/plugin.xml b/examples/bundles/org.eclipse.ecf.example.collab/plugin.xml index dea4f4ba8..74035700e 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/plugin.xml +++ b/examples/bundles/org.eclipse.ecf.example.collab/plugin.xml @@ -5,7 +5,7 @@ id="org.eclipse.ecf.example.collab.ui.ClientPreferencePage" point="org.eclipse.ui.views"> <view - icon="icons/group.gif" + icon="icons/collaboration.gif" class="org.eclipse.ecf.internal.example.collab.ui.LineChatView" category="org.eclipse.ecf.ui.viewcategory" name="Collaboration" @@ -32,7 +32,7 @@ </menu> <action class="org.eclipse.ecf.internal.example.collab.actions.JoinGroupWizardAction" - icon="icons/group.gif" + icon="icons/collaboration.gif" id="org.eclipse.ecf.client.joingroupwizardaction" label="Connect Project to ECF Collaboration Group..." menubarPath="org.eclipse.ecf.example.collab.menu1/group1"/> @@ -126,7 +126,7 @@ </menu> <action class="org.eclipse.ecf.internal.example.collab.actions.JoinGroupWizardAction" - icon="icons/group.gif" + icon="icons/collaboration.gif" id="org.eclipse.ecf.example.collab.action2" label="Connect to ECF Collaboration Group..." style="push" @@ -135,7 +135,7 @@ </action> <action class="org.eclipse.ecf.internal.ui.actions.SelectProviderAction" - icon="icons/im.gif" + icon="icons/messages.gif" id="org.eclipse.ecf.example.collab.ui.connectAction" label="Connect to ECF IM/Chat Provider" style="pulldown" @@ -151,7 +151,7 @@ class="org.eclipse.ecf.example.collab.ui.SharedEditor" default="false" extensions="xml,txt,java" - icon="icons/person.gif" + icon="icons/contact_enabled.gif" id="org.eclipse.ecf.example.collab.SharedEditor" name="Shared Editor"/> </extension> diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ClientPlugin.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ClientPlugin.java index 65b7d72ce..879b8b68f 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ClientPlugin.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ClientPlugin.java @@ -227,8 +227,8 @@ public class ClientPlugin extends AbstractUIPlugin implements .getWorkbench().getSharedImages().getImage( ISharedImages.IMG_OBJ_FOLDER)); registry.put(ClientPluginConstants.DECORATION_USER, AbstractUIPlugin - .imageDescriptorFromPlugin("org.eclipse.ecf.example.collab", - "icons/buddy_available.gif").createImage()); + .imageDescriptorFromPlugin("org.eclipse.ecf.ui", + "icons/enabled/contact_enabled.gif").createImage()); registry.put(ClientPluginConstants.DECORATION_TIME, PlatformUI .getWorkbench().getSharedImages().getImage( ISharedImages.IMG_TOOL_FORWARD)); diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/ChatWindow.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/ChatWindow.java index ad947ca77..9b0416d47 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/ChatWindow.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/ChatWindow.java @@ -131,7 +131,7 @@ public class ChatWindow extends ApplicationWindow { newShell.setText("Team Chat: " + view.name); image = ImageDescriptor.createFromURL( FileLocator.find(ClientPlugin.getDefault().getBundle(), - new Path("icons/person.gif"), null)).createImage(); + new Path("icons/contact_enabled.gif"), null)).createImage(); newShell.setImage(image); RGB[] colors = new RGB[2]; colors[0] = new RGB(0, 0, 0); diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/JoinGroupWizard.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/JoinGroupWizard.java index 56eba084c..028a26234 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/JoinGroupWizard.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/JoinGroupWizard.java @@ -25,7 +25,7 @@ import org.eclipse.ui.IWorkbench; public class JoinGroupWizard extends Wizard { - protected static final String PAGE_TITLE = "ECF Collaboration Connect"; + protected static final String PAGE_TITLE = "Collaboration Connect"; private static final String DIALOG_SETTINGS = JoinGroupWizard.class .getName(); diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/JoinGroupWizardPage.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/JoinGroupWizardPage.java index 3a7910231..85315e7c2 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/JoinGroupWizardPage.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/JoinGroupWizardPage.java @@ -16,6 +16,7 @@ import java.util.List; import org.eclipse.ecf.core.ContainerFactory; import org.eclipse.ecf.core.ContainerTypeDescription; +import org.eclipse.ecf.ui.SharedImages; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.SWT; @@ -39,12 +40,12 @@ public class JoinGroupWizardPage extends WizardPage { protected static final String USER_NAME_SYSTEM_PROPERTY = "user.name"; - protected static final String PAGE_DESCRIPTION = "Complete account info and choose 'Finish' to login"; + protected static final String PAGE_DESCRIPTION = "Complete account info and choose 'Finish' to login."; protected static final String JOINGROUP_FIELDNAME = "Group ID:"; protected static final String NICKNAME_FIELDNAME = "Nickname:"; protected static final String ECF_DEFAULT_URL = "ecftcp://ecf.eclipse.org:3282/server"; protected static final String ECF_TEMPLATE_URL = "ecftcp://<server>:<port>/<groupname>"; - protected static final String PAGE_TITLE = "Connect ECF Generic Client"; + protected static final String PAGE_TITLE = "Connect Generic Client"; protected static final String DEFAULT_CLIENT = "ecf.generic.client"; @@ -54,6 +55,7 @@ public class JoinGroupWizardPage extends WizardPage { super("wizardPage"); setTitle(PAGE_TITLE); setDescription(PAGE_DESCRIPTION); + setImageDescriptor(SharedImages.getImageDescriptor(SharedImages.IMG_COLLABORATION_WIZARD)); } protected String template_url = ECF_TEMPLATE_URL; @@ -179,7 +181,9 @@ public class JoinGroupWizardPage extends WizardPage { autoLoginFlag = autoLogin.getSelection(); } }); - + // XXX disallow autologin for now + autoLogin.setEnabled(false); + fillCombo(); restoreDialogSettings(); } |