Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2002-06-11 08:36:36 +0000
committerDani Megert2002-06-11 08:36:36 +0000
commitfee092c71cc417214ff26e88142aab9922c4147f (patch)
tree2a8ab49a5e3108d214a71feb09e986107280a4be
parentc8a9dfc85106b5688798af7c5e63c2c566225c51 (diff)
downloadeclipse.platform.text-fee092c71cc417214ff26e88142aab9922c4147f.tar.gz
eclipse.platform.text-fee092c71cc417214ff26e88142aab9922c4147f.tar.xz
eclipse.platform.text-fee092c71cc417214ff26e88142aab9922c4147f.zip
Fixed bug 19341: Search View: 'Remove' menu item labels and tool tooltips are inconsistent
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveAllResultsAction.java1
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveAllSearchesAction.java2
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveMatchAction.java8
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveResultAction.java16
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDropDownAction.java3
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.properties20
6 files changed, 24 insertions, 26 deletions
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveAllResultsAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveAllResultsAction.java
index 4f70cf32c..91460ab10 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveAllResultsAction.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveAllResultsAction.java
@@ -16,7 +16,6 @@ class RemoveAllResultsAction extends Action {
public RemoveAllResultsAction() {
super(SearchMessages.getString("SearchResultView.removeAllResults.text")); //$NON-NLS-1$
- SearchPluginImages.setImageDescriptors(this, SearchPluginImages.T_LCL, SearchPluginImages.IMG_LCL_SEARCH_REM_ALL);
setToolTipText(SearchMessages.getString("SearchResultView.removeAllResults.tooltip")); //$NON-NLS-1$
}
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveAllSearchesAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveAllSearchesAction.java
index d15a359bc..6c652a624 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveAllSearchesAction.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveAllSearchesAction.java
@@ -10,7 +10,7 @@ class RemoveAllSearchesAction extends Action {
public RemoveAllSearchesAction() {
super(SearchMessages.getString("SearchResultView.removeAllSearches.text")); //$NON-NLS-1$
- SearchPluginImages.setImageDescriptors(this, SearchPluginImages.T_LCL, SearchPluginImages.IMG_LCL_SEARCH_REM_ALL);
+ SearchPluginImages.setImageDescriptors(this, SearchPluginImages.T_LCL, SearchPluginImages.IMG_LCL_SEARCH_REM_ALL);
setToolTipText(SearchMessages.getString("SearchResultView.removeAllSearches.tooltip")); //$NON-NLS-1$
}
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveMatchAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveMatchAction.java
index f4134a538..1f6a26e59 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveMatchAction.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveMatchAction.java
@@ -4,18 +4,17 @@
*/
package org.eclipse.search.internal.ui;
-import java.util.Iterator;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
+import org.eclipse.search.ui.ISearchResultViewEntry;
import org.eclipse.search.internal.ui.util.ExceptionHandler;
-import org.eclipse.search.ui.ISearchResultViewEntry;
class RemoveMatchAction extends Action {
@@ -23,7 +22,6 @@ class RemoveMatchAction extends Action {
public RemoveMatchAction(ISelectionProvider provider) {
super(SearchMessages.getString("SearchResultView.removeMatch.text")); //$NON-NLS-1$
- SearchPluginImages.setImageDescriptors(this, SearchPluginImages.T_LCL, SearchPluginImages.IMG_LCL_SEARCH_REM);
setToolTipText(SearchMessages.getString("SearchResultView.removeMatch.tooltip")); //$NON-NLS-1$
fSelectionProvider= provider;
}
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveResultAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveResultAction.java
index fd533d85a..0aa9dc50f 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveResultAction.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveResultAction.java
@@ -4,28 +4,28 @@
*/
package org.eclipse.search.internal.ui;
-import java.util.Iterator;
import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.runtime.CoreException;
+
+import org.eclipse.swt.custom.BusyIndicator;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-
import org.eclipse.search.internal.ui.util.ExceptionHandler;
-import org.eclipse.search.ui.ISearchResultViewEntry;
-import org.eclipse.swt.custom.BusyIndicator;
class RemoveResultAction extends Action {
private ISelectionProvider fSelectionProvider;
- public RemoveResultAction(ISelectionProvider provider) {
+ public RemoveResultAction(ISelectionProvider provider, boolean stringsDependOnMatchCount) {
fSelectionProvider= provider;
- if (getSelectedEntriesCount() > 1) {
+ if (!stringsDependOnMatchCount || getSelectedEntriesCount() > 1) {
setText(SearchMessages.getString("SearchResultView.removeEntries.text")); //$NON-NLS-1$
setToolTipText(SearchMessages.getString("SearchResultView.removeEntries.tooltip")); //$NON-NLS-1$
}
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDropDownAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDropDownAction.java
index 7b5f0b26e..6c5954162 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDropDownAction.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDropDownAction.java
@@ -52,12 +52,13 @@ class SearchDropDownAction extends Action implements IMenuCreator {
checkedOne= true;
addActionToMenu(menu, action);
}
+ new MenuItem(menu, SWT.SEPARATOR);
if (iter.hasNext()) {
- new MenuItem(menu, SWT.SEPARATOR);
Action others= new ShowSearchesAction();
others.setChecked(!checkedOne);
addActionToMenu(menu, others);
}
+ addActionToMenu(menu, new RemoveAllSearchesAction());
return menu;
}
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.properties b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.properties
index 8cd5d063c..b09b8d4c2 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.properties
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.properties
@@ -20,20 +20,20 @@ SearchResultView.title= Search
SearchResultView.titleWithDescription= Search ({0})
SearchResultView.matches= matches
SearchResultView.removed_resource= <removed resource>
-SearchResultView.removeAllResults.text= Remove &All
-SearchResultView.removeAllResults.tooltip= Remove All Search Results
-SearchResultView.removeAllSearches.text= Remove &All
-SearchResultView.removeAllSearches.tooltip= Remove All Searches
+SearchResultView.removeAllResults.text= Remove &All Matches
+SearchResultView.removeAllResults.tooltip= Remove All Matches
+SearchResultView.removeAllSearches.text= &Clear History
+SearchResultView.removeAllSearches.tooltip= Clear the search result history
SearchResultView.searchAgain.text= &Search Again
SearchResultView.searchAgain.tooltip= Search Again
SearchResultView.previousSearches.text= Previous Search Results
SearchResultView.previousSearches.tooltip= Previous Search Results
-SearchResultView.removeEntry.text= &Remove Entry
-SearchResultView.removeEntry.tooltip= Remove Entry
-SearchResultView.removeEntries.text= &Remove Entries
-SearchResultView.removeEntries.tooltip= Remove Entries
-SearchResultView.removeMatch.text= Remove &Match
-SearchResultView.removeMatch.tooltip= Remove Match
+SearchResultView.removeEntry.text= &Remove Selected Match
+SearchResultView.removeEntry.tooltip= Remove Selected Match
+SearchResultView.removeEntries.text= &Remove Selected Matches
+SearchResultView.removeEntries.tooltip= Remove Selected Matches
+SearchResultView.removeMatch.text= Remove Current &Match
+SearchResultView.removeMatch.tooltip= Remove Current Match
SearchResultView.gotoMarker.text= &Go to File
SearchResultView.gotoMarker.tooltip= Go to File
SearchResultView.showNext.text= Next Match

Back to the top