Merge "More icons in staging view context menu"

5 files changed, 270 insertions, 3 deletions

diff --git a/icons/org.eclipse.egit.ui/icons/elcl16/goto_input.svg b/icons/org.eclipse.egit.ui/icons/elcl16/goto_input.svg
new file mode 100644
index 0000000000..3d44978b3e
--- /dev/null
+++ b/icons/org.eclipse.egit.ui/icons/elcl16/goto_input.svg
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- From eclipse.platform.images; org.eclipse.jdt.ui/icons/full/elcl16/goto_input.svg -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="goto_input.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient16147">
+      <stop
+         style="stop-color:#a66b10;stop-opacity:1"
+         offset="0"
+         id="stop16149" />
+      <stop
+         style="stop-color:#bd8416;stop-opacity:1"
+         offset="1"
+         id="stop16151" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5097">
+      <stop
+         style="stop-color:#778cb4;stop-opacity:1"
+         offset="0"
+         id="stop5099" />
+      <stop
+         style="stop-color:#677da9;stop-opacity:1"
+         offset="1"
+         id="stop5101" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5089">
+      <stop
+         style="stop-color:#f9fafc;stop-opacity:1"
+         offset="0"
+         id="stop5091" />
+      <stop
+         style="stop-color:#e0eaf7;stop-opacity:1"
+         offset="1"
+         id="stop5093" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4315">
+      <stop
+         style="stop-color:#c7b571;stop-opacity:1"
+         offset="0"
+         id="stop4317" />
+      <stop
+         style="stop-color:#9a998f;stop-opacity:1"
+         offset="1"
+         id="stop4319" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4315"
+       id="linearGradient4060"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.99967,2.000063)"
+       x1="8.0137892"
+       y1="1036.6622"
+       x2="8.0137892"
+       y2="1050.0707" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5089"
+       id="linearGradient5095"
+       x1="14"
+       y1="1039.3622"
+       x2="14"
+       y2="1051.3622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5097"
+       id="linearGradient5103"
+       x1="11"
+       y1="1044.8623"
+       x2="14"
+       y2="1044.8623"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5103-6-0"
+       id="linearGradient5109-2-1"
+       x1="12.178074"
+       y1="1047.3309"
+       x2="12.178074"
+       y2="1042.3309"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient5103-6-0">
+      <stop
+         style="stop-color:#fefdef;stop-opacity:1"
+         offset="0"
+         id="stop5105-40-0" />
+      <stop
+         id="stop7550-3-3"
+         offset="0.40000653"
+         style="stop-color:#fef5d4;stop-opacity:1" />
+      <stop
+         id="stop7548-4-6"
+         offset="0.60000652"
+         style="stop-color:#fbe08e;stop-opacity:1" />
+      <stop
+         style="stop-color:#fbdd83;stop-opacity:1"
+         offset="1"
+         id="stop5107-10-1" />
+    </linearGradient>
+    <linearGradient
+       y2="1068.1893"
+       x2="12.402885"
+       y1="1061.0154"
+       x1="12.402885"
+       gradientTransform="translate(0,-20)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient16112"
+       xlink:href="#linearGradient16147"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9999997"
+     inkscape:cx="-0.90164703"
+     inkscape:cy="16.695777"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1241"
+     inkscape:window-height="814"
+     inkscape:window-x="150"
+     inkscape:window-y="150"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3999" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="fill:url(#linearGradient5095);fill-opacity:1;stroke:url(#linearGradient4060);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
+       d="m 4.9700418,1037.8621 10.5299582,0 0,14.0018 -10.5299582,0"
+       id="rect3997-9"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#a9b7d2;fill-opacity:1;stroke:none;display:inline"
+       d="m 7,1049.3621 0,0.091 0,0.9091 7,0 0,-0.9091 0,-0.091 z"
+       id="rect4816-1-1-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill:#a9b7d2;fill-opacity:1;stroke:none;display:inline"
+       d="m 12,1047.3621 0,0.091 0,0.9091 2,0 0,-0.9091 0,-0.091 z"
+       id="rect4816-1-1-4-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill:#c1c6d9;fill-opacity:1;stroke:none;display:inline"
+       d="m 12,1041.3621 0,0.091 0,0.9091 2,0 0,-0.9091 0,-0.091 z"
+       id="rect4816-1-1-4-8-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill:#c1c6d9;fill-opacity:1;stroke:none;display:inline"
+       d="m 7,1039.3621 0,0.091 0,0.9091 7,0 0,-0.9091 0,-0.091 z"
+       id="rect4816-1-1-4-8-5-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill:#286296;fill-opacity:1;stroke:none;display:inline"
+       d="m 11,1043.3621 0,0.091 0,0.9091 3,0 0,-0.9091 0,-0.091 z"
+       id="rect4816-1-1-4-8-5-5-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill:#286296;fill-opacity:1;stroke:none;display:inline"
+       d="m 11,1045.3621 0,0.091 0,0.9091 3,0 0,-0.9091 0,-0.091 z"
+       id="rect4816-1-1-4-8-5-5-4-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill:url(#linearGradient5103);fill-opacity:1;stroke:none;display:inline"
+       d="m 11,1044.3622 0,0.091 0,0.9091 3,0 0,-0.9091 0,-0.091 z"
+       id="rect4816-1-1-4-8-5-5-4-1-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill:#a9b7d2;fill-opacity:1;stroke:none;display:inline"
+       d="m 9,1047.3621 0,0.091 0,0.9091 2,0 0,-0.9091 0,-0.091 z"
+       id="rect4816-1-1-4-8-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill:#c1c6d9;fill-opacity:1;stroke:none;display:inline"
+       d="m 9,1041.3621 0,0.091 0,0.9091 2,0 0,-0.9091 0,-0.091 z"
+       id="rect4816-1-1-4-8-5-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <g
+       transform="matrix(1,0,0,-1,-5.178074,2089.6931)"
+       inkscape:label="Layer 1"
+       id="layer1-7-8"
+       style="display:inline">
+      <path
+         style="fill:url(#linearGradient5109-2-1);fill-opacity:1;stroke:none;display:inline"
+         d="m 5.6629126,1043.3309 0,2.9844 5.5870874,0 0,1.5313 3.781143,-2.9844 -3.781143,-3.0469 0,1.5156 z"
+         id="path4108-1-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccc" />
+      <path
+         style="fill:url(#linearGradient16112);fill-opacity:1;stroke:none;display:inline"
+         d="m 10.25,1040.8153 0,1.5156 -3.4103107,0 -1,0 c -0.99185,0.9918 -0.986324,3.9981 0,4.9844 l 1,0 3.4103107,0 0,1.5313 c 0,0.6519 0.740915,0.6375 1.5,0 l 4.71875,-3.9844 -4.71875,-4.0469 c -0.760225,-0.7602 -1.5,-0.5203 -1.5,0 z m 1,1 3.78125,3.0469 -3.78125,2.9844 0,-1.5313 -4.8478107,0 c -0.276214,-0.2099 -0.277444,-2.7126 0,-2.9844 l 4.8478107,0 z"
+         id="path4108-1-6-4"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccccccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/org.eclipse.egit.ui/icons/elcl16/goto_input.png b/org.eclipse.egit.ui/icons/elcl16/goto_input.png
new file mode 100644
index 0000000000..b108c2e7ae
--- /dev/null
+++ b/org.eclipse.egit.ui/icons/elcl16/goto_input.png
diff --git a/org.eclipse.egit.ui/icons/elcl16/goto_input@2x.png b/org.eclipse.egit.ui/icons/elcl16/goto_input@2x.png
new file mode 100644
index 0000000000..5a0e47d92e
--- /dev/null
+++ b/org.eclipse.egit.ui/icons/elcl16/goto_input@2x.png
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIIcons.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIIcons.java
index 93fb1944aa..76a5a89316 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIIcons.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIIcons.java
@@ -352,6 +352,12 @@ public class UIIcons {
 	/** {@link #BRANCH} overlaid with {@link #OVR_CHECKEDOUT}. */
 	public final static ImageDescriptor CHECKED_OUT_BRANCH;
 
+	/** Ignore icon */
+	public final static ImageDescriptor IGNORE;
+
+	/** go to input icon */
+	public final static ImageDescriptor GOTO_INPUT;
+
 	/** base URL */
 	public final static URL base;
 
@@ -469,6 +475,8 @@ public class UIIcons {
 		UNSTAGE_ALL = map("elcl16/unstage_all.png"); //$NON-NLS-1$
 		ASSUME_UNCHANGED = map("obj16/assume_unchanged.png"); //$NON-NLS-1$
 		UNTRACK = map("obj16/untrack.png"); //$NON-NLS-1$
+		IGNORE = map("obj16/ignore.png"); //$NON-NLS-1$
+		GOTO_INPUT = map("elcl16/goto_input.png"); //$NON-NLS-1$
 		CHECKED_OUT_BRANCH = new DecorationOverlayDescriptor(BRANCH,
 				OVR_CHECKEDOUT, IDecoration.TOP_LEFT);
 
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java
index 5cc0d86f93..451a44ec60 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java
@@ -2802,7 +2802,8 @@ public class StagingView extends ViewPart
 
 				if (!folderSelected) {
 					Action openWorkingTreeVersion = new Action(
-							UIText.CommitFileDiffViewer_OpenWorkingTreeVersionInEditorMenuLabel) {
+							UIText.CommitFileDiffViewer_OpenWorkingTreeVersionInEditorMenuLabel,
+							UIIcons.GOTO_INPUT) {
 						@Override
 						public void run() {
 							openSelectionInEditor(fileSelection);
@@ -2814,7 +2815,8 @@ public class StagingView extends ViewPart
 					String label = stagingEntryList.get(0).isStaged()
 									? UIText.CommitFileDiffViewer_CompareWorkingDirectoryMenuLabel
 									: UIText.StagingView_CompareWithIndexMenuLabel;
-					Action openCompareWithIndex = new Action(label) {
+					Action openCompareWithIndex = new Action(label,
+							UIIcons.ELCL16_COMPARE_VIEW) {
 						@Override
 						public void run() {
 							runCommand(ActionCommands.COMPARE_WITH_INDEX_ACTION,
@@ -3125,7 +3127,7 @@ public class StagingView extends ViewPart
 		private final IStructuredSelection selection;
 
 		IgnoreAction(IStructuredSelection selection) {
-			super(UIText.StagingView_IgnoreItemMenuLabel);
+			super(UIText.StagingView_IgnoreItemMenuLabel, UIIcons.IGNORE);
 			this.selection = selection;
 		}