Skip to contentSkip to conversation

Add some new icons, and apply them where appropriate

PATCH In review Tor Arne Vestbø 2 participants 3 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Add some new icons, and apply them where appropriate

These icons are based on look of the existing CVS and SVN plugins, only with a Git branding (gray, red, green).

Having the same look and feel as the other team plugins will probably help us in being distributed as part of the Eclipse platform.

---

Topic branch here:

http://repo.or.cz/w/egit/torarne.git?a=shortlog;h=refs/heads/new-icon-theme

 org.spearce.egit.ui/icons/etool16/checkout.gif     |  Bin 0 -> 569 bytes
 org.spearce.egit.ui/icons/etool16/import_wiz.gif   |  Bin 602 -> 0 bytes
 .../icons/etool16/newconnect_wiz.gif               |  Bin 0 -> 368 bytes
 .../icons/etool16/newlocation_wiz.gif              |  Bin 0 -> 600 bytes
 org.spearce.egit.ui/icons/eview16/git_persp.gif    |  Bin 0 -> 578 bytes
 org.spearce.egit.ui/icons/obj16/import_obj.gif     |  Bin 0 -> 357 bytes
 org.spearce.egit.ui/icons/sharing.gif              |  Bin 564 -> 0 bytes
 org.spearce.egit.ui/icons/wizban/import.png        |  Bin 4739 -> 0 bytes
 org.spearce.egit.ui/icons/wizban/import_wiz.png    |  Bin 0 -> 6461 bytes
 .../icons/wizban/newconnect_wizban.png             |  Bin 0 -> 4918 bytes
 .../icons/wizban/newlocation_wizban.png            |  Bin 0 -> 5535 bytes
 org.spearce.egit.ui/plugin.xml                     |    4 ++--
 .../src/org/spearce/egit/ui/UIIcons.java           |    6 +++++-
 .../ui/internal/sharing/ExistingOrNewPage.java     |    2 ++
 14 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 org.spearce.egit.ui/icons/etool16/checkout.gif
 delete mode 100644 org.spearce.egit.ui/icons/etool16/import_wiz.gif
 create mode 100644 org.spearce.egit.ui/icons/etool16/newconnect_wiz.gif
 create mode 100644 org.spearce.egit.ui/icons/etool16/newlocation_wiz.gif
 create mode 100644 org.spearce.egit.ui/icons/eview16/git_persp.gif
 create mode 100644 org.spearce.egit.ui/icons/obj16/import_obj.gif
 delete mode 100644 org.spearce.egit.ui/icons/sharing.gif
 delete mode 100644 org.spearce.egit.ui/icons/wizban/import.png
 create mode 100644 org.spearce.egit.ui/icons/wizban/import_wiz.png
 create mode 100644 org.spearce.egit.ui/icons/wizban/newconnect_wizban.png
 create mode 100644 org.spearce.egit.ui/icons/wizban/newlocation_wizban.png
org.spearce.egit.ui/icons/etool16/checkout.gif new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..16872a90cea9a8f0fb3732b353db2c61294fc077
GIT binary patch
org.spearce.egit.ui/icons/etool16/import_wiz.gif deleted binary +0 -0
deleted file mode 100644
index 57878582d7daad0d2ca76ccb9192b75d6587b1a4..0000000000000000000000000000000000000000
GIT binary patch
org.spearce.egit.ui/icons/etool16/newconnect_wiz.gif new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..d698b00f31441f4c689cae03979fcceea38f6c0b
GIT binary patch
org.spearce.egit.ui/icons/etool16/newlocation_wiz.gif new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..768901b590fa8d1dc6b4b712216065c9b87a1f62
GIT binary patch
org.spearce.egit.ui/icons/eview16/git_persp.gif new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..f556a64ab9b6f0a32520a667646509205399ece4
GIT binary patch
org.spearce.egit.ui/icons/obj16/import_obj.gif new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..9035f0be3936598516b0cf8b8235fcdbe85e0825
GIT binary patch
org.spearce.egit.ui/icons/sharing.gif deleted binary +0 -0
deleted file mode 100644
index 07b60c873d5811b0b8dd6204670c903f84ac51a2..0000000000000000000000000000000000000000
GIT binary patch
org.spearce.egit.ui/icons/wizban/import.png deleted binary +0 -0
deleted file mode 100644
index 8f9fc202ca7c8870da720b5983d42cbc8a9edc16..0000000000000000000000000000000000000000
GIT binary patch
org.spearce.egit.ui/icons/wizban/import_wiz.png new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..b3207b35fcc71643ba2500df2875a23b69541274
GIT binary patch
org.spearce.egit.ui/icons/wizban/newconnect_wizban.png new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..ec9a393fb8085d619f325c52dcdd20535bbd6cbe
GIT binary patch
org.spearce.egit.ui/icons/wizban/newlocation_wizban.png new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..769973fe14776daf7a2064489e5a97b25cc50a6a
GIT binary patch
org.spearce.egit.ui/plugin.xml +2 -2
index b809300..393121f 100644
@@ -9,7 +9,7 @@
       <category name="%Git_clone_category"
 	    id="org.spearce.egit.ui.internal.clone.gitclonecategory"/>
       <wizard name="%Git_clone_wizard"
-	    icon="icons/etool16/import_wiz.gif"
+	    icon="icons/obj16/import_obj.gif"
 	    class="org.spearce.egit.ui.internal.clone.GitCloneWizard"
 	    id="org.spearce.egit.ui.internal.clone.GitCloneWizard"
 	    category="org.spearce.egit.ui.internal.clone.gitclonecategory">
@@ -19,7 +19,7 @@
 
    <extension point="org.eclipse.team.ui.configurationWizards">
       <wizard name="%SharingWizard_name"
-            icon="icons/sharing.gif"
+            icon="icons/etool16/newconnect_wiz.gif"
             class="org.spearce.egit.ui.internal.sharing.SharingWizard"
             id="org.spearce.egit.ui.internal.sharing.SharingWizard">
       </wizard>
org.spearce.egit.ui/src/org/spearce/egit/ui/UIIcons.java +5 -1
index edeffaa..a906750 100644
@@ -51,6 +51,9 @@ public class UIIcons {
 	/** Import Wizard banner */
 	public static final ImageDescriptor WIZBAN_IMPORT_REPO;
 
+	/** Connect Wizard banner */
+	public static final ImageDescriptor WIZBAN_CONNECT_REPO;
+
 	private static final URL base;
 
 	static {
@@ -63,7 +66,8 @@ public class UIIcons {
 		ELCL16_FIND = map("elcl16/find.gif");
 		ELCL16_NEXT = map("elcl16/next.gif");
 		ELCL16_PREVIOUS = map("elcl16/previous.gif");
-		WIZBAN_IMPORT_REPO = map("wizban/import.png");
+		WIZBAN_IMPORT_REPO = map("wizban/import_wiz.png");
+		WIZBAN_CONNECT_REPO = map("wizban/newconnect_wizban.png");
 		ELCL16_COMMIT = map("elcl16/commit.gif");
 		ELCL16_COMMENTS = map("elcl16/comment.gif");
 		ELCL16_AUTHOR = map("elcl16/author.gif");
org.spearce.egit.ui/src/org/spearce/egit/ui/internal/sharing/ExistingOrNewPage.java +2 -0
index d0ddcb7..b3ea769 100644
@@ -15,6 +15,7 @@ import org.eclipse.swt.layout.RowLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Group;
+import org.spearce.egit.ui.UIIcons;
 import org.spearce.egit.ui.UIText;
 
 class ExistingOrNewPage extends WizardPage {
@@ -25,6 +26,7 @@ class ExistingOrNewPage extends WizardPage {
 		super(ExistingOrNewPage.class.getName());
 		setTitle(UIText.ExistingOrNewPage_title);
 		setDescription(UIText.ExistingOrNewPage_description);
+		setImageDescriptor(UIIcons.WIZBAN_CONNECT_REPO);
 		myWizard = w;
 	}
 
Signature · 1 line
1.5.6.5
#1 lore raw

onsdagen den 13 augusti 2008 21.57.02 skrev Tor Arne Vestbø:

Quoted 8 lines

These icons are based on look of the existing CVS and SVN plugins, only with a Git branding (gray, red, green).

Having the same look and feel as the other team plugins will probably help us in being distributed as part of the Eclipse platform.

Looks nice, but please remove the icons that are not actually used from the patch. I also wonder also whether the sharing icon should have a network-like symbol. Connecting a project to a git repo involves no networking unlike most other SCMs.

Welcome to the project, btw!

-- robin

#2 lore raw
Quoted 11 lines · Robin Rosenberg

onsdagen den 13 augusti 2008 21.57.02 skrev Tor Arne Vestbø:

Quoted 8 lines

These icons are based on look of the existing CVS and SVN plugins, only with a Git branding (gray, red, green).

Having the same look and feel as the other team plugins will probably help us in being distributed as part of the Eclipse platform.

Looks nice,

Thanks

Quoted 2 lines

but please remove the icons that are not actually used from the patch.

Done. I know I'm going to need them later though (commit dialog, synchronize view), but that's OK.

Quoted 3 lines

I also wonder also whether the sharing icon should have a network-like symbol. Connecting a project to a git repo involves no networking unlike most other SCMs.

True. We could use the newlocation_wiz/newlocation_wizban pair. That would actually also be consistent with what the newlocation-action does for the CVS/SVN plugins, because we are hosting the repo locally. It also signals that 'sharing' the repository does not involve pushing, although we could have that as a separate step in the wizard (and then use the 'network' icon).

On that note, have we considered something like the "CVS Repositories" view, only for remotes?

I imagine the sharing wizard going something like:

Scan/create new repo -> Add remotes -> Push -> Finished

With the usual option to Finish earlier of course.

Quoted 1 line

Welcome to the project, btw!

Thanks! :)

Tor Arne