From 1c9eb0f6a9a0bfb2f21eec9d4f9ef0fa3b05d7c1 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Wed, 27 May 2015 17:56:59 -0400 Subject: Bug 468556 - Fix Docker Wizard Icons - switching all wizards to use the DESC_WIZARD icon which matches the New Connection wizard Change-Id: If860a2b69138f1cdf0d94ba91e6e817500e42754 Task-Url: Reviewed-on: https://git.eclipse.org/r/48821 Tested-by: Hudson CI Reviewed-by: Jeff Johnston Tested-by: Jeff Johnston --- .../org/eclipse/linuxtools/internal/docker/ui/SWTImagesFactory.java | 4 ++++ .../linuxtools/internal/docker/ui/wizards/ContainerCommitPage.java | 2 +- .../linuxtools/internal/docker/ui/wizards/ContainerCreatePage.java | 2 +- .../eclipse/linuxtools/internal/docker/ui/wizards/ImageBuildPage.java | 2 +- .../eclipse/linuxtools/internal/docker/ui/wizards/ImagePullPage.java | 2 +- .../eclipse/linuxtools/internal/docker/ui/wizards/ImagePushPage.java | 2 +- .../linuxtools/internal/docker/ui/wizards/ImageRemovePage.java | 2 +- .../linuxtools/internal/docker/ui/wizards/ImageRemoveTagPage.java | 2 +- .../eclipse/linuxtools/internal/docker/ui/wizards/ImageTagPage.java | 2 +- 9 files changed, 12 insertions(+), 8 deletions(-) diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/SWTImagesFactory.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/SWTImagesFactory.java index 6197c46e8c..b2e7d3d9da 100644 --- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/SWTImagesFactory.java +++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/SWTImagesFactory.java @@ -52,6 +52,8 @@ public class SWTImagesFactory { + "docker_large.png"; //$NON-NLS-1$ public static final String IMG_DOCKER_SMALL = NAME_PREFIX + "docker_small.gif"; //$NON-NLS-1$ + public static final String IMG_WIZARD = NAME_PREFIX + + "banner-repository.gif"; //$NON-NLS-1$ public static final String IMG_FILTER = NAME_PREFIX + "filter_ps.gif"; //$NON-NLS-1$ public static final String IMG_KILL = NAME_PREFIX + "kill.gif"; //$NON-NLS-1$ public static final String IMG_KILLD = NAME_PREFIX + "killd.gif"; //$NON-NLS-1$ @@ -90,6 +92,8 @@ public class SWTImagesFactory { IMG_DOCKER_LARGE); public static final ImageDescriptor DESC_DOCKER_SMALL = createManaged("", IMG_DOCKER_SMALL); + public static final ImageDescriptor DESC_WIZARD = createManaged("", + IMG_WIZARD); public static final ImageDescriptor DESC_FILTER = createManaged("", IMG_FILTER); public static final ImageDescriptor DESC_PULL = createManaged("", IMG_PULL); diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerCommitPage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerCommitPage.java index 0f4ba63f0c..0857441590 100644 --- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerCommitPage.java +++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerCommitPage.java @@ -49,7 +49,7 @@ public class ContainerCommitPage extends WizardPage { setDescription(WizardMessages.getFormattedString(DESC, container.substring(0, 8))); setTitle(WizardMessages.getString(TITLE)); - setImageDescriptor(SWTImagesFactory.DESC_DOCKER_LARGE); + setImageDescriptor(SWTImagesFactory.DESC_WIZARD); } public String getRepo() { diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerCreatePage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerCreatePage.java index 6099583189..1b9d5f2759 100644 --- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerCreatePage.java +++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerCreatePage.java @@ -111,7 +111,7 @@ public class ContainerCreatePage extends WizardPage { this.image = image; setDescription(WizardMessages.getString(DESC)); setTitle(WizardMessages.getString(TITLE)); - setImageDescriptor(SWTImagesFactory.DESC_DOCKER_LARGE); + setImageDescriptor(SWTImagesFactory.DESC_WIZARD); } public String getImageId() { diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageBuildPage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageBuildPage.java index 2abef6eacc..56e41a074a 100644 --- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageBuildPage.java +++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageBuildPage.java @@ -57,7 +57,7 @@ public class ImageBuildPage extends WizardPage { super(WizardMessages.getString(NAME)); setDescription(WizardMessages.getString(DESC)); setTitle(WizardMessages.getString(TITLE)); - setImageDescriptor(SWTImagesFactory.DESC_DOCKER_LARGE); + setImageDescriptor(SWTImagesFactory.DESC_WIZARD); } public String getImageName() { diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePullPage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePullPage.java index 6067da1de1..eae4691215 100644 --- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePullPage.java +++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePullPage.java @@ -41,7 +41,7 @@ public class ImagePullPage extends WizardPage { super(WizardMessages.getString(NAME)); setDescription(WizardMessages.getString(DESC)); setTitle(WizardMessages.getString(TITLE)); - setImageDescriptor(SWTImagesFactory.DESC_DOCKER_LARGE); + setImageDescriptor(SWTImagesFactory.DESC_WIZARD); } public String getImageId() { diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePushPage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePushPage.java index dd168569dd..241e489830 100644 --- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePushPage.java +++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePushPage.java @@ -50,7 +50,7 @@ public class ImagePushPage extends WizardPage { this.image = image; setDescription(WizardMessages.getString(DESC)); setTitle(WizardMessages.getString(TITLE)); - setImageDescriptor(SWTImagesFactory.DESC_DOCKER_LARGE); + setImageDescriptor(SWTImagesFactory.DESC_WIZARD); } public String getImageTag() { diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRemovePage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRemovePage.java index eef05a75c3..862fc07a42 100644 --- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRemovePage.java +++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRemovePage.java @@ -44,7 +44,7 @@ public class ImageRemovePage extends WizardPage { super(WizardMessages.getString(NAME)); setDescription(WizardMessages.getString(DESC)); setTitle(WizardMessages.getString(TITLE)); - setImageDescriptor(SWTImagesFactory.DESC_DOCKER_LARGE); + setImageDescriptor(SWTImagesFactory.DESC_WIZARD); } public List getImageNames() { diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRemoveTagPage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRemoveTagPage.java index 93ac139804..a00c02f5c8 100644 --- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRemoveTagPage.java +++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRemoveTagPage.java @@ -39,7 +39,7 @@ public class ImageRemoveTagPage extends WizardPage { super(WizardMessages.getString(NAME)); setDescription(WizardMessages.getString(DESC)); setTitle(WizardMessages.getString(TITLE)); - setImageDescriptor(SWTImagesFactory.DESC_DOCKER_LARGE); + setImageDescriptor(SWTImagesFactory.DESC_WIZARD); this.image = image; } diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageTagPage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageTagPage.java index 5ee23f7bae..4cbfdd4fc2 100644 --- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageTagPage.java +++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageTagPage.java @@ -39,7 +39,7 @@ public class ImageTagPage extends WizardPage { super(WizardMessages.getString(NAME)); setDescription(WizardMessages.getString(DESC)); setTitle(WizardMessages.getString(TITLE)); - setImageDescriptor(SWTImagesFactory.DESC_DOCKER_LARGE); + setImageDescriptor(SWTImagesFactory.DESC_WIZARD); } public String getTag() { -- cgit v1.2.3