From b97896b61b0423810e67b6a291a66d6194c261d7 Mon Sep 17 00:00:00 2001 From: Kushal Munir < kmunir@ca.ibm.com> Date: Thu, 14 Sep 2006 21:30:00 +0000 Subject: [PATCH] Add F1 for search view toolbar and menu actions --- .../org.eclipse.rse.ui/HelpContexts.xml | 22 +++++++++++++++++++ .../SystemSearchClearHistoryAction.java | 1 + .../search/SystemSearchHistoryAction.java | 2 ++ .../SystemSearchRemoveAllMatchesAction.java | 1 + ...stemSearchRemoveSelectedMatchesAction.java | 1 + .../ui/view/search/SystemSearchViewPart.java | 2 +- 6 files changed, 28 insertions(+), 1 deletion(-) diff --git a/rse/plugins/org.eclipse.rse.ui/HelpContexts.xml b/rse/plugins/org.eclipse.rse.ui/HelpContexts.xml index 9abcce63f37..2967742485b 100644 --- a/rse/plugins/org.eclipse.rse.ui/HelpContexts.xml +++ b/rse/plugins/org.eclipse.rse.ui/HelpContexts.xml @@ -866,6 +866,28 @@ The list on the left shows the existing compile commands: This view shows you the results of a remote file search. + + + +This action cancels the search operation. If the search is not complete, partial results may be shown in +the view. + + + +This action removes the selected matches from the view. If files are selected in the view, then all +selected matches in that file will also be removed from the view. + + + +This action removes all matches from the view. + + + +This action will bring up results for a previous search in the view. + + + +This action will remove the results of all searches from the view. diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchClearHistoryAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchClearHistoryAction.java index 44ccbb83f49..48521302cd3 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchClearHistoryAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchClearHistoryAction.java @@ -40,6 +40,7 @@ public class SystemSearchClearHistoryAction extends SystemBaseAction { RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SEARCH_CLEAR_HISTORY_ID), shell); this.searchView = searchView; + RSEUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(this, RSEUIPlugin.HELPPREFIX + "search_clear_history"); } /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchHistoryAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchHistoryAction.java index e93c7167575..63050e1b708 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchHistoryAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchHistoryAction.java @@ -18,6 +18,7 @@ package org.eclipse.rse.ui.view.search; import org.eclipse.jface.action.Action; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.rse.ui.RSEUIPlugin; /** * This is the history action for the remote system search view. @@ -41,6 +42,7 @@ public class SystemSearchHistoryAction extends Action { setToolTipText(text); this.searchView = searchView; this.index = index; + RSEUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(this, RSEUIPlugin.HELPPREFIX + "search_history"); } /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchRemoveAllMatchesAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchRemoveAllMatchesAction.java index e86af27e50f..d27c4626e92 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchRemoveAllMatchesAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchRemoveAllMatchesAction.java @@ -41,6 +41,7 @@ public class SystemSearchRemoveAllMatchesAction extends SystemBaseAction { shell); this.searchView = searchView; + RSEUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(this, RSEUIPlugin.HELPPREFIX + "search_remove_all"); } /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchRemoveSelectedMatchesAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchRemoveSelectedMatchesAction.java index 8e27c08c669..57f762958b7 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchRemoveSelectedMatchesAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchRemoveSelectedMatchesAction.java @@ -41,6 +41,7 @@ public class SystemSearchRemoveSelectedMatchesAction extends SystemBaseAction { shell); this.searchView = searchView; + RSEUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(this, RSEUIPlugin.HELPPREFIX + "search_remove_selected"); } /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchViewPart.java index 5b1d87fcf28..645cde4063b 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchViewPart.java @@ -40,7 +40,6 @@ import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.rse.core.SystemAdapterHelpers; -import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.model.ISystemResourceChangeEvent; import org.eclipse.rse.model.ISystemResourceChangeEvents; import org.eclipse.rse.model.ISystemResourceChangeListener; @@ -157,6 +156,7 @@ public class SystemSearchViewPart extends ViewPart public CancelAction() { super(SystemResources.ACTION_CANCEL_SEARCH_LABEL, RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_STOP_ID)); setToolTipText(SystemResources.ACTION_CANCEL_SEARCH_TOOLTIP); + RSEUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(this, RSEUIPlugin.HELPPREFIX + "search_cancel"); } public void run() {