From 61e8a6cdb9a77c60b277c5f8eda5c71aada1fbfc Mon Sep 17 00:00:00 2001 From: Michael Keppler Date: Sat, 23 Jun 2018 07:28:52 +0200 Subject: Normalize tag name when typing Use the BranchNameNormalizer also in the CreateTagDialog. Additionally remove the tooltip, and remove the stars from the mandatory input field labels, since we don't have those anywhere else. Change-Id: I96bf9c1db8b00f31a8b1263a264a68e3999fb904 Signed-off-by: Michael Keppler Bug:535577--- org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java | 3 --- .../src/org/eclipse/egit/ui/internal/dialogs/CreateTagDialog.java | 6 +++--- .../src/org/eclipse/egit/ui/internal/uitext.properties | 5 ++--- 3 files changed, 5 insertions(+), 9 deletions(-) (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui') 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 f472bc972f..9e76587ab6 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 @@ -4304,9 +4304,6 @@ public class UIText extends NLS { /** */ public static String CreateTagDialog_advancedMessage; - /** */ - public static String CreateTagDialog_tagNameToolTip; - /** */ public static String CreateTagDialog_clearButton; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CreateTagDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CreateTagDialog.java index e2285c09b8..42ed473223 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CreateTagDialog.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CreateTagDialog.java @@ -32,6 +32,7 @@ import org.eclipse.egit.ui.internal.CompareUtils; import org.eclipse.egit.ui.internal.UIIcons; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.egit.ui.internal.ValidationUtils; +import org.eclipse.egit.ui.internal.components.BranchNameNormalizer; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.IInputValidator; import org.eclipse.jface.dialogs.TitleAreaDialog; @@ -442,9 +443,8 @@ public class CreateTagDialog extends TitleAreaDialog { validateInput(); } }); - - UIUtils.addBulbDecorator(tagNameText, - UIText.CreateTagDialog_tagNameToolTip); + BranchNameNormalizer normalizer = new BranchNameNormalizer(tagNameText); + normalizer.setVisible(false); new Label(left, SWT.WRAP).setText(UIText.CreateTagDialog_tagMessage); 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 9a726a6c5b..0ddcda2da5 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 @@ -1482,8 +1482,8 @@ TagAction_unableToResolveHeadObjectId=Unable to resolve object id associated wit TagAction_creating=Creating {0} tag. TagAction_taggingFailed=Tagging failed -CreateTagDialog_tagName=Tag &name*: -CreateTagDialog_tagMessage=Tag &message*: +CreateTagDialog_tagName=Tag &name: +CreateTagDialog_tagMessage=Tag &message: CreateTagDialog_questionNewTagTitle=Create New Tag on Branch ''{0}'' CreateTagDialog_overwriteTag=Force &replace existing tag CreateTagDialog_overwriteTagToolTip=Select this option if you want to change message or commit associated with already existing tag. @@ -1491,7 +1491,6 @@ CreateTagDialog_existingTags=&Existing tags: CreateTagDialog_advanced=&Advanced CreateTagDialog_advancedToolTip=In the advanced section you may choose the commit to be tagged. CreateTagDialog_advancedMessage=Choose commit that should be associated with this tag. -CreateTagDialog_tagNameToolTip=Start typing tag name to filter list of existing tags. CreateTagDialog_clearButton=C&lear CreateTagDialog_clearButtonTooltip=Clear all dialog fields. CreateTagDialog_CreateTagAndStartPushButton=Create Tag and Start &Push... -- cgit v1.2.3