Changed icons with new ones for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=183015. Also updated and added to code references.

32 files changed, 32 insertions, 22 deletions

diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/disabled/presence_member.gif b/framework/bundles/org.eclipse.ecf.ui/icons/disabled/presence_member.gif
deleted file mode 100644
index 758be455a..000000000
--- a/framework/bundles/org.eclipse.ecf.ui/icons/disabled/presence_member.gif
+++ /dev/null
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/dpresence16/add_buddy.gif b/framework/bundles/org.eclipse.ecf.ui/icons/dpresence16/add_buddy.gif
deleted file mode 100644
index d0e6d7b45..000000000
--- a/framework/bundles/org.eclipse.ecf.ui/icons/dpresence16/add_buddy.gif
+++ /dev/null
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/dpresence16/add_group.gif b/framework/bundles/org.eclipse.ecf.ui/icons/dpresence16/add_group.gif
deleted file mode 100644
index c44e5e1e8..000000000
--- a/framework/bundles/org.eclipse.ecf.ui/icons/dpresence16/add_group.gif
+++ /dev/null
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/enabled/add_chat.gif b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/add_chat.gif
new file mode 100644
index 000000000..0840bc609
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/add_chat.gif
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/enabled/add_contact.gif b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/add_contact.gif
new file mode 100644
index 000000000..d3323e64f
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/add_contact.gif
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/epresence16/add_group.gif b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/add_group.gif
index 7492f8ac1..7492f8ac1 100644
--- a/framework/bundles/org.eclipse.ecf.ui/icons/epresence16/add_group.gif
+++ b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/add_group.gif
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/enabled/addbuddy.gif b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/addbuddy.gif
deleted file mode 100644
index 768d505d8..000000000
--- a/framework/bundles/org.eclipse.ecf.ui/icons/enabled/addbuddy.gif
+++ /dev/null
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/enabled/addchat.gif b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/addchat.gif
deleted file mode 100644
index 364a08a48..000000000
--- a/framework/bundles/org.eclipse.ecf.ui/icons/enabled/addchat.gif
+++ /dev/null
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/enabled/addgroup.gif b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/addgroup.gif
deleted file mode 100644
index 17d2f1ccf..000000000
--- a/framework/bundles/org.eclipse.ecf.ui/icons/enabled/addgroup.gif
+++ /dev/null
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/enabled/contact_away.gif b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/contact_away.gif
new file mode 100644
index 000000000..93bd42413
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/contact_away.gif
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/enabled/contact_disabled.gif b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/contact_disabled.gif
new file mode 100644
index 000000000..c684f405b
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/contact_disabled.gif
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/enabled/contact_do_not_disturb.gif b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/contact_do_not_disturb.gif
new file mode 100644
index 000000000..86c8cb915
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/contact_do_not_disturb.gif
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/enabled/contact_enabled.gif b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/contact_enabled.gif
new file mode 100644
index 000000000..5eed04350
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/contact_enabled.gif
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/enabled/group.gif b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/group.gif
new file mode 100644
index 000000000..c952bbfd2
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/group.gif
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/enabled/messages.gif b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/messages.gif
new file mode 100644
index 000000000..27d15cc3c
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/messages.gif
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/enabled/presence_member.gif b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/presence_member.gif
deleted file mode 100644
index d307b2006..000000000
--- a/framework/bundles/org.eclipse.ecf.ui/icons/enabled/presence_member.gif
+++ /dev/null
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/epresence16/add_buddy.gif b/framework/bundles/org.eclipse.ecf.ui/icons/epresence16/add_buddy.gif
deleted file mode 100644
index f527bd1a2..000000000
--- a/framework/bundles/org.eclipse.ecf.ui/icons/epresence16/add_buddy.gif
+++ /dev/null
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/epresence16/buddy_available.gif b/framework/bundles/org.eclipse.ecf.ui/icons/epresence16/buddy_available.gif
deleted file mode 100644
index 31d8f3ac7..000000000
--- a/framework/bundles/org.eclipse.ecf.ui/icons/epresence16/buddy_available.gif
+++ /dev/null
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/epresence16/buddy_away.gif b/framework/bundles/org.eclipse.ecf.ui/icons/epresence16/buddy_away.gif
deleted file mode 100644
index 01c25e897..000000000
--- a/framework/bundles/org.eclipse.ecf.ui/icons/epresence16/buddy_away.gif
+++ /dev/null
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/epresence16/buddy_dnd.gif b/framework/bundles/org.eclipse.ecf.ui/icons/epresence16/buddy_dnd.gif
deleted file mode 100644
index 97bfb24f6..000000000
--- a/framework/bundles/org.eclipse.ecf.ui/icons/epresence16/buddy_dnd.gif
+++ /dev/null
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/epresence16/buddy_unavailable.gif b/framework/bundles/org.eclipse.ecf.ui/icons/epresence16/buddy_unavailable.gif
deleted file mode 100644
index 2d5430d6d..000000000
--- a/framework/bundles/org.eclipse.ecf.ui/icons/epresence16/buddy_unavailable.gif
+++ /dev/null
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/epresence16/group.gif b/framework/bundles/org.eclipse.ecf.ui/icons/epresence16/group.gif
deleted file mode 100644
index 495c1a22b..000000000
--- a/framework/bundles/org.eclipse.ecf.ui/icons/epresence16/group.gif
+++ /dev/null
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/epresence16/im.gif b/framework/bundles/org.eclipse.ecf.ui/icons/epresence16/im.gif
deleted file mode 100644
index d52de243f..000000000
--- a/framework/bundles/org.eclipse.ecf.ui/icons/epresence16/im.gif
+++ /dev/null
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/group.gif b/framework/bundles/org.eclipse.ecf.ui/icons/group.gif
deleted file mode 100644
index 495c1a22b..000000000
--- a/framework/bundles/org.eclipse.ecf.ui/icons/group.gif
+++ /dev/null
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/person.gif b/framework/bundles/org.eclipse.ecf.ui/icons/person.gif
deleted file mode 100644
index 608d2d165..000000000
--- a/framework/bundles/org.eclipse.ecf.ui/icons/person.gif
+++ /dev/null
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/sample.gif b/framework/bundles/org.eclipse.ecf.ui/icons/sample.gif
deleted file mode 100644
index 34fb3c9d8..000000000
--- a/framework/bundles/org.eclipse.ecf.ui/icons/sample.gif
+++ /dev/null
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/wizards/chat_wizard.png b/framework/bundles/org.eclipse.ecf.ui/icons/wizards/chat_wizard.png
new file mode 100644
index 000000000..74aee56b2
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf.ui/icons/wizards/chat_wizard.png
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/wizards/collaboration_wizard.png b/framework/bundles/org.eclipse.ecf.ui/icons/wizards/collaboration_wizard.png
new file mode 100644
index 000000000..8b468507c
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf.ui/icons/wizards/collaboration_wizard.png
diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/Activator.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/Activator.java
index 6994cb925..4da0fed57 100644
--- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/Activator.java
+++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/Activator.java
@@ -144,6 +144,19 @@ public class Activator extends AbstractUIPlugin {
 				.imageDescriptorFromPlugin(PLUGIN_ID, IImageFiles.ADD)
 				.createImage());
 
+		registry.put(SharedImages.IMG_MESSAGES, AbstractUIPlugin
+				.imageDescriptorFromPlugin(PLUGIN_ID, IImageFiles.MESSAGES)
+				.createImage());
+
+		registry.put(SharedImages.IMG_CHAT_WIZARD, AbstractUIPlugin
+				.imageDescriptorFromPlugin(PLUGIN_ID, IImageFiles.CHAT_WIZARD)
+				.createImage());
+
+		registry.put(SharedImages.IMG_COLLABORATION_WIZARD, AbstractUIPlugin
+				.imageDescriptorFromPlugin(PLUGIN_ID, IImageFiles.COLLABORATION_WIZARD)
+				.createImage());
+
+
 		return registry;
 	}
 
diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/IImageFiles.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/IImageFiles.java
index 94b768695..b8fb65571 100644
--- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/IImageFiles.java
+++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/IImageFiles.java
@@ -13,31 +13,33 @@ package org.eclipse.ecf.internal.ui;
 
 public interface IImageFiles {
 
-	public static final String USER_AVAILABLE = "icons/epresence16/buddy_available.gif"; //$NON-NLS-1$
+	public static final String USER_AVAILABLE = "icons/enabled/contact_enabled.gif"; //$NON-NLS-1$
 
-	public static final String USER_AWAY = "icons/epresence16/buddy_away.gif"; //$NON-NLS-1$
+	public static final String USER_AWAY = "icons/enabled/contact_away.gif"; //$NON-NLS-1$
 
-	public static final String USER_DND = "icons/epresence16/buddy_dnd.gif"; //$NON-NLS-1$
+	public static final String USER_DND = "icons/enabled/contact_do_not_disturb.gif"; //$NON-NLS-1$
 
-	public static final String USER_UNAVAILABLE = "icons/epresence16/buddy_unavailable.gif"; //$NON-NLS-1$
+	public static final String USER_UNAVAILABLE = "icons/enabled/contact_disabled.gif"; //$NON-NLS-1$
 
-	public static final String GROUP = "icons/epresence16/group.gif"; //$NON-NLS-1$
+	public static final String GROUP = "icons/enabled/group.gif"; //$NON-NLS-1$
 
 	public static final String DISCONNECT_DISABLED = "icons/disabled/terminate_co.gif"; //$NON-NLS-1$
 
 	public static final String DISCONNECT_ENABLED = "icons/enabled/terminate_co.gif"; //$NON-NLS-1$
 
-	public static final String ADD_GROUP = "icons/epresence16/add_group.gif"; //$NON-NLS-1$
+	public static final String ADD_GROUP = "icons/enabled/add_group.gif"; //$NON-NLS-1$
 
-	public static final String ADD_BUDDY = "icons/epresence16/add_buddy.gif"; //$NON-NLS-1$
+	public static final String ADD_BUDDY = "icons/enabled/add_contact.gif"; //$NON-NLS-1$
 
-	public static final String ADD_CHAT = "icons/enabled/addchat.gif"; //$NON-NLS-1$
+	public static final String ADD_CHAT = "icons/enabled/add_chat.gif"; //$NON-NLS-1$
 
 	public static final String SEND_MESSAGE = "icons/enabled/message.gif"; //$NON-NLS-1$
 
 	public static final String ADD = "icons/enabled/add.gif"; //$NON-NLS-1$
 
-	public static final String CONFIGURATION_WIZARD = "icons/wizards/configuration.gif"; //$NON-NLS-1$
-
-	public static final String CONNECT_WIZARD = "icons/wizards/connect.gif"; //$NON-NLS-1$
+	public static final String MESSAGES = "icons/enabled/messages.gif";
+	
+	public static final String CHAT_WIZARD = "icons/wizards/chat_wizard.png"; //$NON_NLS-$1
+	
+	public static final String COLLABORATION_WIZARD = "icons/wizards/collaboration_wizard.png"; //$NON_NLS-$1
 }
diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/SharedImages.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/SharedImages.java
index 37f77b61c..1144697fe 100644
--- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/SharedImages.java
+++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/SharedImages.java
@@ -45,6 +45,12 @@ public final class SharedImages {
 
 	public static final String IMG_ADD = "IMG_ADD"; //$NON-NLS-1$
 
+	public static final String IMG_MESSAGES = "IMG_MESSAGES"; //$NON-NLS-1$
+	
+	public static final String IMG_CHAT_WIZARD = "IMG_CHAT_WIZARD"; //$NON-NLS-1$
+	
+	public static final String IMG_COLLABORATION_WIZARD = "IMG_COLLABORATION_WIZARD"; //$NON-NLS-1$
+	
 	public static ImageDescriptor getImageDescriptor(String key) {
 		return Activator.getDefault().getImageRegistry().getDescriptor(key);
 	}
diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/wizards/ConfigurationWizardSelectionWizard.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/wizards/ConfigurationWizardSelectionWizard.java
index 4b266f8a9..12f93beb1 100644
--- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/wizards/ConfigurationWizardSelectionWizard.java
+++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/wizards/ConfigurationWizardSelectionWizard.java
@@ -11,15 +11,11 @@
 
 package org.eclipse.ecf.ui.wizards;
 
-import org.eclipse.ecf.internal.ui.Activator;
-import org.eclipse.ecf.internal.ui.IImageFiles;
 import org.eclipse.ecf.internal.ui.Messages;
 import org.eclipse.ecf.ui.ContainerConfigurationResult;
-import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 /**
  * A wizard to allow the selection and display of a configuration.  This wizard shows
@@ -66,13 +62,6 @@ public class ConfigurationWizardSelectionWizard extends Wizard {
 		this.workbench = aWorkbench;
 		this.selection = currentSelection;
 
-		ImageDescriptor wizardBannerImage = AbstractUIPlugin
-				.imageDescriptorFromPlugin(Activator.PLUGIN_ID,
-						IImageFiles.CONFIGURATION_WIZARD);
-
-		if (wizardBannerImage != null)
-			setDefaultPageImageDescriptor(wizardBannerImage);
-
 		setWindowTitle(Messages.ConfigurationWizard_title);
 
 		setNeedsProgressMonitor(true);