diff options
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitHistoryPage.java | 19 | ||||
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties | 4 |
2 files changed, 7 insertions, 16 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitHistoryPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitHistoryPage.java index c480f2f092..58125d6ed1 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitHistoryPage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitHistoryPage.java @@ -163,6 +163,7 @@ import org.eclipse.team.ui.history.HistoryPage; import org.eclipse.team.ui.history.IHistoryView; import org.eclipse.ui.IActionBars; import org.eclipse.ui.ISharedImages; +import org.eclipse.ui.IWorkbenchCommandConstants; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchPartSite; import org.eclipse.ui.PlatformUI; @@ -462,11 +463,6 @@ public class GitHistoryPage extends HistoryPage implements RefsChangedListener, createActions(); } - private static String formatAccelerator(int accelerator) { - return SWTKeySupport.getKeyFormatterForPlatform().format( - SWTKeySupport.convertAcceleratorToKeyStroke(accelerator)); - } - private void createActions() { createRepositorySwitchAction(); createFindToolbarAction(); @@ -534,21 +530,16 @@ public class GitHistoryPage extends HistoryPage implements RefsChangedListener, @Override public void setChecked(boolean checked) { super.setChecked(checked); - int accelerator = getAccelerator(); if (checked) { - setToolTipText( - NLS.bind(UIText.GitHistoryPage_FindHideTooltip, - formatAccelerator(accelerator))); + setToolTipText(UIText.GitHistoryPage_FindHideTooltip); } else { - setToolTipText( - NLS.bind(UIText.GitHistoryPage_FindShowTooltip, - formatAccelerator(accelerator))); + setToolTipText(UIText.GitHistoryPage_FindShowTooltip); } } }; - // TODO: how not to hard-wire this? - findAction.setAccelerator(SWT.MOD1 | 'F'); + findAction.setActionDefinitionId( + IWorkbenchCommandConstants.EDIT_FIND_AND_REPLACE); findAction.setEnabled(false); // Gets enabled once we have commits boolean isChecked = historyPage.store 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 48487dbfd0..f363b51773 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 @@ -203,8 +203,8 @@ GitHistoryPage_FileNotInCommit={0} not in {1} GitHistoryPage_FileOrFolderPartOfGitDirMessage=File or folder {0} is part of the repository''s Git directory GitHistoryPage_FileType=File GitHistoryPage_FindMenuLabel=Find &Toolbar -GitHistoryPage_FindShowTooltip=Show Find Toolbar ({0}) -GitHistoryPage_FindHideTooltip=Hide Find Toolbar ({0}) +GitHistoryPage_FindShowTooltip=Show Find Toolbar +GitHistoryPage_FindHideTooltip=Hide Find Toolbar GitHistoryPage_FolderType=Folder GitHistoryPage_ModifyMenuLabel=Modi&fy GitHistoryPage_MultiResourcesType={0} resources |