Improve icons for interactive rebase fixup and squash actions

- use better icons provided by Vadim Dmitriev
- flip direction of the icons when reversing direction of interactive
  rebase view

Bug: 443930
Change-Id: I2d1b99d64d68a1f2d20f0519a375449d83fdd24b
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Also-By: Vadim Dmitriev <dmgloss@mail.ru>

9 files changed, 32 insertions, 14 deletions

diff --git a/org.eclipse.egit.ui/icons/obj16/fixup-down.png b/org.eclipse.egit.ui/icons/obj16/fixup-down.png
new file mode 100644
index 0000000000..6a2a080cad
--- /dev/null
+++ b/org.eclipse.egit.ui/icons/obj16/fixup-down.png
diff --git a/org.eclipse.egit.ui/icons/obj16/fixup-up.png b/org.eclipse.egit.ui/icons/obj16/fixup-up.png
new file mode 100644
index 0000000000..f903519027
--- /dev/null
+++ b/org.eclipse.egit.ui/icons/obj16/fixup-up.png
diff --git a/org.eclipse.egit.ui/icons/obj16/fixup.gif b/org.eclipse.egit.ui/icons/obj16/fixup.gif
deleted file mode 100644
index 2b9905f629..0000000000
--- a/org.eclipse.egit.ui/icons/obj16/fixup.gif
+++ /dev/null
diff --git a/org.eclipse.egit.ui/icons/obj16/squash-down.png b/org.eclipse.egit.ui/icons/obj16/squash-down.png
new file mode 100644
index 0000000000..306c57467d
--- /dev/null
+++ b/org.eclipse.egit.ui/icons/obj16/squash-down.png
diff --git a/org.eclipse.egit.ui/icons/obj16/squash-up.png b/org.eclipse.egit.ui/icons/obj16/squash-up.png
new file mode 100644
index 0000000000..e1ff226fcd
--- /dev/null
+++ b/org.eclipse.egit.ui/icons/obj16/squash-up.png
diff --git a/org.eclipse.egit.ui/icons/obj16/squash.gif b/org.eclipse.egit.ui/icons/obj16/squash.gif
deleted file mode 100644
index 816540603e..0000000000
--- a/org.eclipse.egit.ui/icons/obj16/squash.gif
+++ /dev/null
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 a949dea2ac..0bbea32be2 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
@@ -252,11 +252,17 @@ public class UIIcons {
 	/** Compact tree presentation icon */
 	public final static ImageDescriptor COMPACT;
 
-	/** Squash icon */
-	public final static ImageDescriptor SQUASH;
+	/** Squash icon arrow up */
+	public final static ImageDescriptor SQUASH_UP;
 
-	/** Fixup icon */
-	public final static ImageDescriptor FIXUP;
+	/** Squash icon arrow down */
+	public final static ImageDescriptor SQUASH_DOWN;
+
+	/** Fixup icon arrow up */
+	public final static ImageDescriptor FIXUP_UP;
+
+	/** Fixup icon arrow down */
+	public final static ImageDescriptor FIXUP_DOWN;
 
 	/** Reword icon */
 	public final static ImageDescriptor REWORD;
@@ -354,8 +360,10 @@ public class UIIcons {
 		HIERARCHY = map("elcl16/hierarchicalLayout.gif"); //$NON-NLS-1$
 		FLAT = map("elcl16/flatLayout.gif"); //$NON-NLS-1$
 		COMPACT = map("elcl16/compactLayout.gif"); //$NON-NLS-1$
-		SQUASH = map("obj16/squash.gif"); //$NON-NLS-1$
-		FIXUP = map("obj16/fixup.gif"); //$NON-NLS-1$
+		SQUASH_UP = map("obj16/squash-up.png"); //$NON-NLS-1$
+		SQUASH_DOWN = map("obj16/squash-down.png"); //$NON-NLS-1$
+		FIXUP_UP = map("obj16/fixup-up.png"); //$NON-NLS-1$
+		FIXUP_DOWN = map("obj16/fixup-down.png"); //$NON-NLS-1$
 		REWORD = map("obj16/reword.gif"); //$NON-NLS-1$
 		DONE_STEP = map("obj16/done_step.gif"); //$NON-NLS-1$
 		CURRENT_STEP = map("obj16/current_step.gif"); //$NON-NLS-1$
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveStepActionToolBarProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveStepActionToolBarProvider.java
index 611d7d7f79..58379c521c 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveStepActionToolBarProvider.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveStepActionToolBarProvider.java
@@ -122,7 +122,7 @@ public class RebaseInteractiveStepActionToolBarProvider {
 		rebaseActionItems[2] = itemEdit;
 
 		itemSquash = new ToolItem(theToolbar, SWT.RADIO);
-		itemSquash.setImage(getImage(UIIcons.SQUASH));
+		itemSquash.setImage(getImage(UIIcons.SQUASH_UP));
 		itemSquash.addSelectionListener(new ActionSelectionListener(
 				RebaseInteractivePlan.ElementAction.SQUASH));
 		itemSquash
@@ -130,7 +130,7 @@ public class RebaseInteractiveStepActionToolBarProvider {
 		rebaseActionItems[3] = itemSquash;
 
 		itemFixup = new ToolItem(theToolbar, SWT.RADIO);
-		itemFixup.setImage(getImage(UIIcons.FIXUP));
+		itemFixup.setImage(getImage(UIIcons.FIXUP_UP));
 		itemFixup.addSelectionListener(new ActionSelectionListener(
 				RebaseInteractivePlan.ElementAction.FIXUP));
 		itemFixup
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java
index c890a9c36f..d8c8b3a078 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java
@@ -588,8 +588,8 @@ public class RebaseInteractiveView extends ViewPart implements
 			}
 		});
 
-		boolean orderReversed = RebaseInteractivePreferences.isOrderReversed();
-		int direction = (orderReversed ? SWT.DOWN : SWT.UP);
+		int direction = (RebaseInteractivePreferences.isOrderReversed() ? SWT.DOWN
+				: SWT.UP);
 
 		Tree planTree = planTreeViewer.getTree();
 		planTree.setSortColumn(stepColumn.getColumn());
@@ -606,7 +606,12 @@ public class RebaseInteractiveView extends ViewPart implements
 					case EDIT:
 						return UIIcons.getImage(resources, UIIcons.EDITCONFIG);
 					case FIXUP:
-						return UIIcons.getImage(resources, UIIcons.FIXUP);
+						if (RebaseInteractivePreferences.isOrderReversed())
+							return UIIcons.getImage(resources,
+									UIIcons.FIXUP_DOWN);
+						else
+							return UIIcons.getImage(resources,
+									UIIcons.FIXUP_UP);
 					case PICK:
 						return UIIcons.getImage(resources, UIIcons.CHERRY_PICK);
 					case REWORD:
@@ -614,7 +619,12 @@ public class RebaseInteractiveView extends ViewPart implements
 					case SKIP:
 						return UIIcons.getImage(resources, UIIcons.REBASE_SKIP);
 					case SQUASH:
-						return UIIcons.getImage(resources, UIIcons.SQUASH);
+						if (RebaseInteractivePreferences.isOrderReversed())
+							return UIIcons.getImage(resources,
+									UIIcons.SQUASH_DOWN);
+						else
+							return UIIcons.getImage(resources,
+									UIIcons.SQUASH_UP);
 					default:
 						// fall through
 					}
@@ -871,11 +881,11 @@ public class RebaseInteractiveView extends ViewPart implements
 				planViewer, actionToolBarProvider));
 		contextMenuItems.add(new PlanContextMenuAction(
 				UIText.RebaseInteractiveStepActionToolBarProvider_SquashText,
-				UIIcons.SQUASH, RebaseInteractivePlan.ElementAction.SQUASH,
+				UIIcons.SQUASH_UP, RebaseInteractivePlan.ElementAction.SQUASH,
 				planViewer, actionToolBarProvider));
 		contextMenuItems.add(new PlanContextMenuAction(
 				UIText.RebaseInteractiveStepActionToolBarProvider_FixupText,
-				UIIcons.FIXUP, RebaseInteractivePlan.ElementAction.FIXUP,
+				UIIcons.FIXUP_UP, RebaseInteractivePlan.ElementAction.FIXUP,
 				planViewer, actionToolBarProvider));
 		contextMenuItems.add(new PlanContextMenuAction(
 				UIText.RebaseInteractiveStepActionToolBarProvider_RewordText,