From 6424b6c9803cf5cbd63c107d7f7dc6e6fc8d7afb Mon Sep 17 00:00:00 2001 From: John Camelon Date: Wed, 10 Dec 2003 00:20:47 +0000 Subject: [PATCH] Patch for Andrew Niefer. UI: fix bug 43932 Search: Wrong icons for context search in Outline View fix bug 48020 Duplicate Mnemonics in Search Dialog --- core/org.eclipse.cdt.ui/ChangeLog | 4 ++++ .../src/org/eclipse/cdt/internal/ui/CPluginImages.java | 2 ++ .../cdt/internal/ui/editor/SearchDialogAction.java | 8 +++++--- .../cdt/internal/ui/search/CSearchMessages.properties | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index ce4b223c7ba..173ea09ae75 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -3,6 +3,10 @@ Removed the case sensitivily user preference. Exported content assist strings to a properties file. +2003-12-05 Andrew Niefer + fix bug 43932 Search: Wrong icons for context search in Outline View + fix bug 48020 Duplicate Mnemonics in Search Dialog + 2003-12-03 Hoda Amer Content Assist work :Added a new internal package for content assist Added more functionality to the CompletionEngine. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java index 211fb9e52ae..07a7634c6d1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java @@ -150,9 +150,11 @@ public class CPluginImages { //for search public static final String IMG_OBJS_SEARCH_REF = NAME_PREFIX + "search_ref_obj.gif"; public static final String IMG_OBJS_SEARCH_DECL = NAME_PREFIX + "search_decl_obj.gif"; + public static final String IMG_OBJS_CSEARCH = NAME_PREFIX + "csearch_obj.gif"; public static final ImageDescriptor DESC_OBJS_SEARCH_DECL = createManaged(T_OBJ, IMG_OBJS_SEARCH_DECL); public static final ImageDescriptor DESC_OBJS_SEARCH_REF = createManaged(T_OBJ, IMG_OBJS_SEARCH_REF); + public static final ImageDescriptor DESC_OBJS_CSEARCH = createManaged(T_OBJ, IMG_OBJS_CSEARCH); public static void initialize() { //createManaged(registry, T_OBJ, IMG_OBJS_TUNIT); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SearchDialogAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SearchDialogAction.java index d558967993f..215199e9d54 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SearchDialogAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SearchDialogAction.java @@ -43,7 +43,7 @@ public class SearchDialogAction extends Action { setToolTipText(CUIPlugin.getResourceString(PREFIX + "tooltip")); if(provider instanceof CContentOutlinePage) { - CPluginImages.setImageDescriptors(this, CPluginImages.T_LCL, CPluginImages.IMG_MENU_OPEN_INCLUDE); + setImageDescriptor( CPluginImages.DESC_OBJS_CSEARCH ); } fSelectionProvider= provider; @@ -57,7 +57,7 @@ public class SearchDialogAction extends Action { setToolTipText(CUIPlugin.getResourceString(PREFIX + "tooltip")); if(provider instanceof CContentOutlinePage) { - CPluginImages.setImageDescriptors(this, CPluginImages.T_LCL, CPluginImages.IMG_MENU_OPEN_INCLUDE); + setImageDescriptor( CPluginImages.DESC_OBJS_CSEARCH ); } fSelectionProvider= provider; @@ -168,7 +168,9 @@ public class SearchDialogAction extends Action { if (descriptor != null) { return descriptor.getId(); } else { - return registry.getDefaultEditor().getId(); + //getDefaultEditor is deprecated, The system external editor is the default editor + return IEditorRegistry.SYSTEM_EXTERNAL_EDITOR_ID; + } } return null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties index f6b64aa328b..55a28c8b7d6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties @@ -50,7 +50,7 @@ Search.potentialMatchDialog.message= Inexact matches were found and will be disp CSearchPage.searchFor.label= Search For CSearchPage.searchFor.type= &Type -CSearchPage.searchFor.namespace= Name&space +CSearchPage.searchFor.namespace= Names&pace CSearchPage.searchFor.method= &Method CSearchPage.searchFor.function= F&unction CSearchPage.searchFor.field= &Field