Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames2002-02-01 18:47:13 +0000
committerjames2002-02-01 18:47:13 +0000
commit93cf2a46e441db6b978d3b223311d9f9bf04f349 (patch)
tree44a63e443c217190c56470dfd693d34a69c20078
parentab83e8614a776a73254e4a01041fdd135c37f925 (diff)
downloadeclipse.platform.team-93cf2a46e441db6b978d3b223311d9f9bf04f349.tar.gz
eclipse.platform.team-93cf2a46e441db6b978d3b223311d9f9bf04f349.tar.xz
eclipse.platform.team-93cf2a46e441db6b978d3b223311d9f9bf04f349.zip
8180: Need banner graphics for wizards
-rw-r--r--bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/mergestream_wizban.gifbin0 -> 512 bytes
-rw-r--r--bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/newconnect_wizban.gifbin0 -> 603 bytes
-rw-r--r--bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/newstream_wizban.gifbin0 -> 519 bytes
-rw-r--r--bundles/org.eclipse.team.cvs.ui/icons/full/wizban/mergestream_wizban.gifbin0 -> 2435 bytes
-rw-r--r--bundles/org.eclipse.team.cvs.ui/icons/full/wizban/newconnect_wizban.gifbin0 -> 2615 bytes
-rw-r--r--bundles/org.eclipse.team.cvs.ui/icons/full/wizban/newstream_wizban.gifbin0 -> 2416 bytes
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java7
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizard.java5
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/BranchWizard.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/NewLocationWizard.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java13
-rw-r--r--bundles/org.eclipse.team.ui/icons/basic/wizban/newconnect_wizban.gifbin0 -> 603 bytes
-rw-r--r--bundles/org.eclipse.team.ui/icons/full/wizban/newconnect_wizban.gifbin0 -> 2615 bytes
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ConfigureProjectWizard.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/UIConstants.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamUIPlugin.java1
17 files changed, 30 insertions, 11 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/mergestream_wizban.gif b/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/mergestream_wizban.gif
new file mode 100644
index 000000000..dcba98c3e
--- /dev/null
+++ b/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/mergestream_wizban.gif
Binary files differ
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/newconnect_wizban.gif b/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/newconnect_wizban.gif
new file mode 100644
index 000000000..6a40323ff
--- /dev/null
+++ b/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/newconnect_wizban.gif
Binary files differ
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/newstream_wizban.gif b/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/newstream_wizban.gif
new file mode 100644
index 000000000..e177a11f7
--- /dev/null
+++ b/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/newstream_wizban.gif
Binary files differ
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/mergestream_wizban.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/mergestream_wizban.gif
new file mode 100644
index 000000000..147335887
--- /dev/null
+++ b/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/mergestream_wizban.gif
Binary files differ
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/newconnect_wizban.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/newconnect_wizban.gif
new file mode 100644
index 000000000..3038a23c0
--- /dev/null
+++ b/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/newconnect_wizban.gif
Binary files differ
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/newstream_wizban.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/newstream_wizban.gif
new file mode 100644
index 000000000..339e7dd8c
--- /dev/null
+++ b/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/newstream_wizban.gif
Binary files differ
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
index 11741c005..1e852aea5 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
@@ -135,6 +135,9 @@ public class CVSUIPlugin extends AbstractUIPlugin {
createImageDescriptor(ICVSUIConstants.IMG_BRANCHES_CATEGORY, baseURL);
createImageDescriptor(ICVSUIConstants.IMG_VERSIONS_CATEGORY, baseURL);
createImageDescriptor(ICVSUIConstants.IMG_PROJECT_VERSION, baseURL);
+ createImageDescriptor(ICVSUIConstants.IMG_WIZBAN_BRANCH, baseURL);
+ createImageDescriptor(ICVSUIConstants.IMG_WIZBAN_MERGE, baseURL);
+ createImageDescriptor(ICVSUIConstants.IMG_WIZBAN_SHARE, baseURL);
}
/**
* Convenience method for logging statuses to the plugin log
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java
index 8d18fcf00..ccc8acaf0 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java
@@ -45,6 +45,11 @@ public interface ICVSUIConstants {
public final String PREF_DIRTY_FLAG = "pref_dirty_flag";
public final String PREF_ADDED_FLAG = "pref_added_flag";
- public final String PREF_CALCULATE_DIRTY = "pref_calculate_dirty";
+ public final String PREF_CALCULATE_DIRTY = "pref_calculate_dirty";
+
+ // Wizard banners
+ public final String IMG_WIZBAN_SHARE = "wizban/newconnect_wizban.gif";
+ public final String IMG_WIZBAN_BRANCH = "wizban/newstream_wizban.gif";
+ public final String IMG_WIZBAN_MERGE = "wizban/mergestream_wizban.gif";
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizard.java
index ee244d327..2367ff9f9 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizard.java
@@ -23,10 +23,11 @@ public class MergeWizard extends Wizard {
IProject project;
public void addPages() {
- startPage = new MergeWizardStartPage("startPage", Policy.bind("MergeWizard.start"), null);
+ ImageDescriptor mergeImage = CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_MERGE);
+ startPage = new MergeWizardStartPage("startPage", Policy.bind("MergeWizard.start"), mergeImage);
startPage.setProject(project);
addPage(startPage);
- endPage = new MergeWizardEndPage("endPage", Policy.bind("MergeWizard.end"), null);
+ endPage = new MergeWizardEndPage("endPage", Policy.bind("MergeWizard.end"), mergeImage);
endPage.setProject(project);
addPage(endPage);
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/BranchWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/BranchWizard.java
index 2b8c7d5d2..a4af5b41d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/BranchWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/BranchWizard.java
@@ -29,6 +29,7 @@ import org.eclipse.team.core.TeamException;
import org.eclipse.team.core.TeamPlugin;
import org.eclipse.team.internal.ccvs.core.CVSException;
import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
+import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants;
import org.eclipse.team.internal.ccvs.ui.Policy;
import org.eclipse.team.internal.ccvs.ui.RepositoryManager;
import org.eclipse.team.internal.ccvs.ui.model.BranchTag;
@@ -42,7 +43,7 @@ public class BranchWizard extends Wizard {
}
public void addPages() {
- mainPage = new BranchWizardPage("branchPage", Policy.bind("BranchWizard.createABranch"), null);
+ mainPage = new BranchWizardPage("branchPage", Policy.bind("BranchWizard.createABranch"), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_BRANCH));
addPage(mainPage);
}
public boolean performFinish() {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/NewLocationWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/NewLocationWizard.java
index aa53072a1..614027009 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/NewLocationWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/NewLocationWizard.java
@@ -18,6 +18,7 @@ import org.eclipse.team.ccvs.core.ICVSProvider;
import org.eclipse.team.ccvs.core.ICVSRepositoryLocation;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
+import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants;
import org.eclipse.team.internal.ccvs.ui.Policy;
public class NewLocationWizard extends Wizard {
@@ -38,7 +39,7 @@ public class NewLocationWizard extends Wizard {
* Creates the wizard pages
*/
public void addPages() {
- mainPage = new ConfigurationWizardMainPage("repositoryPage1", Policy.bind("NewLocationWizard.title"), null);
+ mainPage = new ConfigurationWizardMainPage("repositoryPage1", Policy.bind("NewLocationWizard.title"), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_SHARE));
if (properties != null) {
mainPage.setProperties(properties);
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java
index 724e900c9..c617cb72b 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java
@@ -16,6 +16,7 @@ import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.team.ccvs.core.CVSProviderPlugin;
@@ -32,6 +33,7 @@ import org.eclipse.team.internal.ccvs.core.syncinfo.*;
import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo;
import org.eclipse.team.internal.ccvs.ui.CVSDecorator;
import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
+import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants;
import org.eclipse.team.internal.ccvs.ui.Policy;
import org.eclipse.team.internal.ccvs.ui.sync.CVSSyncCompareInput;
import org.eclipse.team.ui.IConfigurationWizard;
@@ -67,21 +69,22 @@ public class SharingWizard extends Wizard implements IConfigurationWizard {
setNeedsProgressMonitor(true);
}
public void addPages() {
+ ImageDescriptor sharingImage = CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_SHARE);
if (doesCVSDirectoryExist()) {
- autoconnectPage = new ConfigurationWizardAutoconnectPage("autoconnectPage", Policy.bind("SharingWizard.autoConnectTitle"), null);
+ autoconnectPage = new ConfigurationWizardAutoconnectPage("autoconnectPage", Policy.bind("SharingWizard.autoConnectTitle"), sharingImage);
autoconnectPage.setProject(project);
addPage(autoconnectPage);
} else {
ICVSRepositoryLocation[] locations = CVSUIPlugin.getPlugin().getRepositoryManager().getKnownRoots();
if (locations.length > 0) {
- locationPage = new RepositorySelectionPage("importPage", Policy.bind("SharingWizard.importTitle"), null);
+ locationPage = new RepositorySelectionPage("importPage", Policy.bind("SharingWizard.importTitle"), sharingImage);
addPage(locationPage);
}
- createLocationPage = new ConfigurationWizardMainPage("createLocationPage", Policy.bind("SharingWizard.enterInformation"), null);
+ createLocationPage = new ConfigurationWizardMainPage("createLocationPage", Policy.bind("SharingWizard.enterInformation"), sharingImage);
addPage(createLocationPage);
- modulePage = new ModuleSelectionPage("modulePage", Policy.bind("SharingWizard.enterModuleName"), null);
+ modulePage = new ModuleSelectionPage("modulePage", Policy.bind("SharingWizard.enterModuleName"), sharingImage);
addPage(modulePage);
- finishPage = new SharingWizardFinishPage("finishPage", Policy.bind("Ready to Share Project"), null);
+ finishPage = new SharingWizardFinishPage("finishPage", Policy.bind("Ready to Share Project"), sharingImage);
addPage(finishPage);
}
}
diff --git a/bundles/org.eclipse.team.ui/icons/basic/wizban/newconnect_wizban.gif b/bundles/org.eclipse.team.ui/icons/basic/wizban/newconnect_wizban.gif
new file mode 100644
index 000000000..6a40323ff
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/basic/wizban/newconnect_wizban.gif
Binary files differ
diff --git a/bundles/org.eclipse.team.ui/icons/full/wizban/newconnect_wizban.gif b/bundles/org.eclipse.team.ui/icons/full/wizban/newconnect_wizban.gif
new file mode 100644
index 000000000..3038a23c0
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/wizban/newconnect_wizban.gif
Binary files differ
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ConfigureProjectWizard.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ConfigureProjectWizard.java
index d8f554f08..9247f90c7 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ConfigureProjectWizard.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ConfigureProjectWizard.java
@@ -68,7 +68,7 @@ public class ConfigureProjectWizard extends Wizard implements IConfigurationWiza
return;
}
}
- mainPage = new ConfigureProjectWizardMainPage("configurePage1", Policy.bind("ConfigureProjectWizard.configureProject"), null, wizards);
+ mainPage = new ConfigureProjectWizardMainPage("configurePage1", Policy.bind("ConfigureProjectWizard.configureProject"), TeamUIPlugin.getPlugin().getImageDescriptor(UIConstants.IMG_WIZBAN_SHARE), wizards);
mainPage.setDescription(Policy.bind("ConfigureProjectWizard.description"));
mainPage.setProject(project);
mainPage.setWorkbench(workbench);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/UIConstants.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/UIConstants.java
index 12d32787d..c7e905dde 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/UIConstants.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/UIConstants.java
@@ -31,4 +31,8 @@ public interface UIConstants {
public final String IMG_SYNC_MODE_CATCHUP = "clcl16/catchup_rls.gif";
public final String IMG_SYNC_MODE_RELEASE = "clcl16/release_rls.gif";
public final String IMG_SYNC_MODE_FREE = "clcl16/catchuprelease_rls.gif";
+
+ // Wizard banners
+ public final String IMG_WIZBAN_SHARE = "wizban/newconnect_wizban.gif";
+
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamUIPlugin.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamUIPlugin.java
index 3e8de141b..876de245c 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamUIPlugin.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamUIPlugin.java
@@ -163,6 +163,7 @@ public class TeamUIPlugin extends AbstractUIPlugin implements ISharedImages {
createImageDescriptor(UIConstants.IMG_SYNC_MODE_CATCHUP, baseURL);
createImageDescriptor(UIConstants.IMG_SYNC_MODE_RELEASE, baseURL);
createImageDescriptor(UIConstants.IMG_SYNC_MODE_FREE, baseURL);
+ createImageDescriptor(UIConstants.IMG_WIZBAN_SHARE, baseURL);
}
/**
* Initializes the preferences for this plugin if necessary.

Back to the top