diff options
| author | Matthias Sohn | 2016-10-20 21:47:03 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2016-10-26 21:53:58 +0000 |
| commit | 8a46974e3078e55f4b541d019f4fb5d648f6db92 (patch) | |
| tree | 2ad8fff0773230dc58279351fb3aff52ca231b86 /org.eclipse.egit.ui | |
| parent | 0098ee4394b35940c0a1048f0632320513474179 (diff) | |
| download | egit-8a46974e3078e55f4b541d019f4fb5d648f6db92.tar.gz egit-8a46974e3078e55f4b541d019f4fb5d648f6db92.tar.xz egit-8a46974e3078e55f4b541d019f4fb5d648f6db92.zip | |
Fix tooltip shown on content assist light bulb for ref proposals
Change-Id: Id58fd71b49a2927e781b994ccdd2c3378a06af2b
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.ui')
3 files changed, 10 insertions, 2 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIUtils.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIUtils.java index 4608f03dce..e626a2ef74 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIUtils.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIUtils.java @@ -430,11 +430,11 @@ public class UIUtils { .getKeystrokeOfBestActiveBindingFor(IWorkbenchCommandConstants.EDIT_CONTENT_ASSIST); if (stroke == null) addBulbDecorator(textField, - UIText.UIUtils_StartTypingForPreviousValuesMessage); + UIText.UIUtils_StartTypingForRemoteRefMessage); else addBulbDecorator( textField, - NLS.bind(UIText.UIUtils_PressShortcutMessage, + NLS.bind(UIText.UIUtils_PressShortcutForRemoteRefMessage, stroke.format())); IContentProposalProvider cp = new IContentProposalProvider() { 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 43ed1f0185..b5b373d906 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 @@ -4093,6 +4093,12 @@ public class UIText extends NLS { public static String UIUtils_StartTypingForPreviousValuesMessage; /** */ + public static String UIUtils_PressShortcutForRemoteRefMessage; + + /** */ + public static String UIUtils_StartTypingForRemoteRefMessage; + + /** */ public static String UIUtils_ShowInMenuLabel; /** */ 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 acebe6a5fe..1616e8cf22 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 @@ -1414,6 +1414,8 @@ UIUtils_CollapseAll=Collapse All UIUtils_ExpandAll=Expand All UIUtils_PressShortcutMessage=Press {0} or begin typing to see a filtered list of previously used values (use "*" as wildcard) UIUtils_StartTypingForPreviousValuesMessage=Start typing to see a filtered list of previously used values (use "*" as wildcard) +UIUtils_PressShortcutForRemoteRefMessage=Press {0} or begin typing to see a filtered list of available refs +UIUtils_StartTypingForRemoteRefMessage=Start typing to see a filtered list of available refs UIUtils_ShowInMenuLabel=Sho&w In UnmergedBranchDialog_Message=Not all commits of these branches have been merged into the currently checked out branch.\n\nDo you still want to delete these branches? UnmergedBranchDialog_Title=Confirm Branch Deletion |