[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[cdt-patch] fix Search bugs 43932, 48020
|
UI:
fix bug 43932 Search: Wrong icons for context search in Outline View
fix bug 48020 Duplicate Mnemonics in Search Dialog
There are no tests for these changes (its all UI)
This patch was created against the HEAD, though it can probably be applied
to 1.2.1 as well.
-Andrew
Index: ChangeLog
===================================================================
retrieving revision 1.221
diff -u -r1.221 ChangeLog
--- ChangeLog 3 Dec 2003 20:29:29 -0000 1.221
+++ ChangeLog 5 Dec 2003 18:48:41 -0000
@@ -1,3 +1,7 @@
+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.
Index: src/org/eclipse/cdt/internal/ui/CPluginImages.java
===================================================================
retrieving revision 1.20
diff -u -r1.20 CPluginImages.java
--- src/org/eclipse/cdt/internal/ui/CPluginImages.java 15 Sep 2003 20:40:16 -0000 1.20
+++ src/org/eclipse/cdt/internal/ui/CPluginImages.java 5 Dec 2003 18:48:47 -0000
@@ -150,9 +150,11 @@
//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);
Index: src/org/eclipse/cdt/internal/ui/editor/SearchDialogAction.java
===================================================================
retrieving revision 1.3
diff -u -r1.3 SearchDialogAction.java
--- src/org/eclipse/cdt/internal/ui/editor/SearchDialogAction.java 11 Sep 2003 17:13:00 -0000 1.3
+++ src/org/eclipse/cdt/internal/ui/editor/SearchDialogAction.java 5 Dec 2003 18:48:47 -0000
@@ -43,7 +43,7 @@
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 @@
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 @@
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;
Index: src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties
===================================================================
retrieving revision 1.7
diff -u -r1.7 CSearchMessages.properties
--- src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties 12 Sep 2003 13:13:58 -0000 1.7
+++ src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties 5 Dec 2003 18:48:47 -0000
@@ -50,7 +50,7 @@
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
