Added interactive rebase tooltip descriptions

This commit adds mouse over, hover text to the interactive rebase's
tooltip buttons to explain to the user what the options mean and will
do. These buttons include: Skip, Edit, Fixup, Move Up/Down, Pick,
Reword, and Squash.

Bug: 445530
Change-Id: I4540c4f557fb4e4475e7a90097dce3f3859779a1
Signed-off-by: rnveach <rveach02@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

3 files changed, 45 insertions, 0 deletions

diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java
index 7fb6768bff..e915024793 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java
@@ -743,30 +743,54 @@ public class UIText extends NLS {
 	public static String RebaseInteractiveStepActionToolBarProvider_SkipText;
 
 	/** */
+	public static String RebaseInteractiveStepActionToolBarProvider_SkipDesc;
+
+	/** */
 	public static String RebaseInteractiveStepActionToolBarProvider_EditText;
 
 	/** */
+	public static String RebaseInteractiveStepActionToolBarProvider_EditDesc;
+
+	/** */
 	public static String RebaseInteractiveStepActionToolBarProvider_FixupText;
 
 	/** */
+	public static String RebaseInteractiveStepActionToolBarProvider_FixupDesc;
+
+	/** */
 	public static String RebaseInteractiveStepActionToolBarProvider_MoveDownText;
 
 	/** */
+	public static String RebaseInteractiveStepActionToolBarProvider_MoveDownDesc;
+
+	/** */
 	public static String RebaseInteractiveStepActionToolBarProvider_MoveUpText;
 
 	/** */
+	public static String RebaseInteractiveStepActionToolBarProvider_MoveUpDesc;
+
+	/** */
 	public static String RebaseInteractiveStepActionToolBarProvider_PickText;
 
 	/** */
+	public static String RebaseInteractiveStepActionToolBarProvider_PickDesc;
+
+	/** */
 	public static String RebaseInteractiveStepActionToolBarProvider_RedoText;
 
 	/** */
 	public static String RebaseInteractiveStepActionToolBarProvider_RewordText;
 
 	/** */
+	public static String RebaseInteractiveStepActionToolBarProvider_RewordDesc;
+
+	/** */
 	public static String RebaseInteractiveStepActionToolBarProvider_SquashText;
 
 	/** */
+	public static String RebaseInteractiveStepActionToolBarProvider_SquashDesc;
+
+	/** */
 	public static String RebaseInteractiveStepActionToolBarProvider_UndoText;
 
 	/** */
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 333b2ac3ca..5357d7204c 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
@@ -106,6 +106,7 @@ public class RebaseInteractiveStepActionToolBarProvider {
 		itemPick.addSelectionListener(new ActionSelectionListener(
 				RebaseInteractivePlan.ElementAction.PICK));
 		itemPick.setText(UIText.RebaseInteractiveStepActionToolBarProvider_PickText);
+		itemPick.setToolTipText(UIText.RebaseInteractiveStepActionToolBarProvider_PickDesc);
 		rebaseActionItems[0] = itemPick;
 
 		itemSkip = new ToolItem(theToolbar, SWT.RADIO);
@@ -113,6 +114,7 @@ public class RebaseInteractiveStepActionToolBarProvider {
 		itemSkip.addSelectionListener(new ActionSelectionListener(
 				RebaseInteractivePlan.ElementAction.SKIP));
 		itemSkip.setText(UIText.RebaseInteractiveStepActionToolBarProvider_SkipText);
+		itemSkip.setToolTipText(UIText.RebaseInteractiveStepActionToolBarProvider_SkipDesc);
 		rebaseActionItems[1] = itemSkip;
 
 		itemEdit = new ToolItem(theToolbar, SWT.RADIO);
@@ -120,6 +122,7 @@ public class RebaseInteractiveStepActionToolBarProvider {
 		itemEdit.addSelectionListener(new ActionSelectionListener(
 				RebaseInteractivePlan.ElementAction.EDIT));
 		itemEdit.setText(UIText.RebaseInteractiveStepActionToolBarProvider_EditText);
+		itemEdit.setToolTipText(UIText.RebaseInteractiveStepActionToolBarProvider_EditDesc);
 		rebaseActionItems[2] = itemEdit;
 
 		itemSquash = new ToolItem(theToolbar, SWT.RADIO);
@@ -128,6 +131,8 @@ public class RebaseInteractiveStepActionToolBarProvider {
 				RebaseInteractivePlan.ElementAction.SQUASH));
 		itemSquash
 				.setText(UIText.RebaseInteractiveStepActionToolBarProvider_SquashText);
+		itemSquash
+				.setToolTipText(UIText.RebaseInteractiveStepActionToolBarProvider_SquashDesc);
 		rebaseActionItems[3] = itemSquash;
 
 		itemFixup = new ToolItem(theToolbar, SWT.RADIO);
@@ -136,6 +141,8 @@ public class RebaseInteractiveStepActionToolBarProvider {
 				RebaseInteractivePlan.ElementAction.FIXUP));
 		itemFixup
 				.setText(UIText.RebaseInteractiveStepActionToolBarProvider_FixupText);
+		itemFixup
+				.setToolTipText(UIText.RebaseInteractiveStepActionToolBarProvider_FixupDesc);
 		rebaseActionItems[4] = itemFixup;
 
 		itemReword = new ToolItem(theToolbar, SWT.RADIO);
@@ -144,6 +151,8 @@ public class RebaseInteractiveStepActionToolBarProvider {
 				RebaseInteractivePlan.ElementAction.REWORD));
 		itemReword
 				.setText(UIText.RebaseInteractiveStepActionToolBarProvider_RewordText);
+		itemReword
+				.setToolTipText(UIText.RebaseInteractiveStepActionToolBarProvider_RewordDesc);
 		rebaseActionItems[5] = itemReword;
 
 		new ToolItem(theToolbar, SWT.SEPARATOR);
@@ -152,6 +161,8 @@ public class RebaseInteractiveStepActionToolBarProvider {
 		itemMoveUp.setImage(getImage(UIIcons.ELCL16_PREVIOUS));
 		itemMoveUp
 				.setText(UIText.RebaseInteractiveStepActionToolBarProvider_MoveUpText);
+		itemMoveUp
+				.setToolTipText(UIText.RebaseInteractiveStepActionToolBarProvider_MoveUpDesc);
 		itemMoveUp.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -175,6 +186,8 @@ public class RebaseInteractiveStepActionToolBarProvider {
 		itemMoveDown.setImage(getImage(UIIcons.ELCL16_NEXT));
 		itemMoveDown
 				.setText(UIText.RebaseInteractiveStepActionToolBarProvider_MoveDownText);
+		itemMoveDown
+				.setToolTipText(UIText.RebaseInteractiveStepActionToolBarProvider_MoveDownDesc);
 		itemMoveDown.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
index 8b98ba7803..2dd37727ea 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
@@ -317,14 +317,22 @@ RebaseCurrentRefCommand_ErrorGettingCurrentBranchMessage=Error getting the branc
 RebaseInteractiveHandler_EditMessageDialogText=Edit the commit message. Lines starting with a \# are comments and will be ignored.
 RebaseInteractiveHandler_EditMessageDialogTitle=Edit Commit Message
 RebaseInteractiveStepActionToolBarProvider_SkipText=Skip
+RebaseInteractiveStepActionToolBarProvider_SkipDesc=Remove the commit from the history
 RebaseInteractiveStepActionToolBarProvider_EditText=Edit
+RebaseInteractiveStepActionToolBarProvider_EditDesc=Pause before applying the commit, so\nthat new changes can be added
 RebaseInteractiveStepActionToolBarProvider_FixupText=Fixup
+RebaseInteractiveStepActionToolBarProvider_FixupDesc=Combine the commit with the previous commit,\nusing the previous commit's message
 RebaseInteractiveStepActionToolBarProvider_MoveDownText=Move down
+RebaseInteractiveStepActionToolBarProvider_MoveDownDesc=Move the commit down in the order of steps
 RebaseInteractiveStepActionToolBarProvider_MoveUpText=Move up
+RebaseInteractiveStepActionToolBarProvider_MoveUpDesc=Move the commit up in the order of steps
 RebaseInteractiveStepActionToolBarProvider_PickText=Pick
+RebaseInteractiveStepActionToolBarProvider_PickDesc=Apply the commit normally
 RebaseInteractiveStepActionToolBarProvider_RedoText=Redo
 RebaseInteractiveStepActionToolBarProvider_RewordText=Reword
+RebaseInteractiveStepActionToolBarProvider_RewordDesc=Pause before applying the commit, so\nthat the commit message can be changed
 RebaseInteractiveStepActionToolBarProvider_SquashText=Squash
+RebaseInteractiveStepActionToolBarProvider_SquashDesc=Combine the commit with the previous commit\nand allow the commit message to be edited
 RebaseInteractiveStepActionToolBarProvider_UndoText=Undo
 RebaseInteractiveView_HeadingStep=Step
 RebaseInteractiveView_HeadingAction=Action