From 457924ff1c4f0c5bc9ca998cf0c8712a4ce60a9f Mon Sep 17 00:00:00 2001 From: Oleg Krasilnikov Date: Mon, 16 Apr 2007 11:36:27 +0000 Subject: [PATCH] Bug #181022 : separate markers for excluded source & header files --- .../icons/obj16/asm_resource_obj.gif | Bin 0 -> 344 bytes .../icons/obj16/ch_resource_obj.gif | Bin 0 -> 956 bytes .../eclipse/cdt/internal/ui/CPluginImages.java | 4 ++++ .../ui/viewsupport/CElementImageProvider.java | 14 +++++++++++--- 4 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 core/org.eclipse.cdt.ui/icons/obj16/asm_resource_obj.gif create mode 100644 core/org.eclipse.cdt.ui/icons/obj16/ch_resource_obj.gif diff --git a/core/org.eclipse.cdt.ui/icons/obj16/asm_resource_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/asm_resource_obj.gif new file mode 100644 index 0000000000000000000000000000000000000000..678d3cdc49fe853f5c498400f4db61176391e5d6 GIT binary patch literal 344 zcmZ?wbhEHb6krfwxGKglp~2zCgAW=B6E1AXcyOX)Lx;tOA3rJzJYIbG(NN)W_%e$g5NuY#R zz^N=K#({;0F=cPul=GQoyFDB^-Za^;IBGJz;mGFWD`#*OY!RzuYT*-f747X|;_4A~ uiw_xpMQV)`updvKW{$%`tarVy%#_3KL39I#rG#~em;Kv zyO{xfBx1;npR!n zUsdd1T@p}N>Q@b96bH0d`81dN)|dEAtoP`x_3Ekhn%n9+y~%AuzulT1hvi*P%e$Qx zbvQpb(Z6Ma?UhX#S2ktd+FNsVQ|ABw{~1QXXb8|a1av^=gYp6c$3lj54jGRP3Xb9& z!b&C@7mhZx3ncDH=wM=QlN2*NGQn_TLKnBBL!7_`rDNS9tf3qy43wK2rt{0K(KvC4 z$$Pp!t4KoNg_dR>UL%gumj_%93JV(vRGe&ZY~xht>RT~^@j$?G9ybx4i3*3Cc>I)8 zJRBA&aBxZ)BJ;yTQg#&yCn^#g G7_0#giL8zQ literal 0 HcmV?d00001 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 7f1b22bd034..c8366e9a115 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 @@ -85,6 +85,8 @@ public class CPluginImages { public static final String IMG_OBJS_TUNIT_HEADER= NAME_PREFIX + "h_file_obj.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_TUNIT_ASM= NAME_PREFIX + "s_file_obj.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_TUNIT_RESOURCE= NAME_PREFIX + "c_resource_obj.gif"; //$NON-NLS-1$ + public static final String IMG_OBJS_TUNIT_RESOURCE_H= NAME_PREFIX + "ch_resource_obj.gif"; //$NON-NLS-1$ + public static final String IMG_OBJS_TUNIT_RESOURCE_A= NAME_PREFIX + "asm_resource_obj.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_SOURCE_ROOT= NAME_PREFIX + "sroot_obj.gif"; // $NON-NLS-1$ //$NON-NLS-1$ public static final String IMG_OBJS_CFOLDER= NAME_PREFIX + "cfolder_obj.gif"; // $NON-NLS-1$ //$NON-NLS-1$ public static final String IMG_OBJS_ARCHIVE= NAME_PREFIX + "ar_obj.gif"; //$NON-NLS-1$ @@ -160,6 +162,8 @@ public class CPluginImages { public static final ImageDescriptor DESC_OBJS_TUNIT_HEADER= createManaged(T_OBJ, IMG_OBJS_TUNIT_HEADER); public static final ImageDescriptor DESC_OBJS_TUNIT_ASM= createManaged(T_OBJ, IMG_OBJS_TUNIT_ASM); public static final ImageDescriptor DESC_OBJS_TUNIT_RESOURCE= createManaged(T_OBJ, IMG_OBJS_TUNIT_RESOURCE); + public static final ImageDescriptor DESC_OBJS_TUNIT_RESOURCE_H= createManaged(T_OBJ, IMG_OBJS_TUNIT_RESOURCE_H); + public static final ImageDescriptor DESC_OBJS_TUNIT_RESOURCE_A= createManaged(T_OBJ, IMG_OBJS_TUNIT_RESOURCE_A); public static final ImageDescriptor DESC_OBJS_SOURCE_ROOT= createManaged(T_OBJ, IMG_OBJS_SOURCE_ROOT); public static final ImageDescriptor DESC_OBJS_CFOLDER= createManaged(T_OBJ, IMG_OBJS_CFOLDER); public static final ImageDescriptor DESC_OBJS_ARCHIVE= createManaged(T_OBJ, IMG_OBJS_ARCHIVE); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementImageProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementImageProvider.java index 01092ee577d..246b4d5bf86 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementImageProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementImageProvider.java @@ -115,9 +115,17 @@ public class CElementImageProvider { } else if (element instanceof IFile) { // Check for Non Translation Unit. IFile file = (IFile)element; - if (CoreModel.isValidTranslationUnitName(file.getProject(), file.getName()) || - CoreModel.isValidTranslationUnitName(null, file.getName())) { - descriptor = CPluginImages.DESC_OBJS_TUNIT_RESOURCE; + String name = file.getName(); + if (CoreModel.isValidTranslationUnitName(file.getProject(), name) || + CoreModel.isValidTranslationUnitName(null, name)) { + if (CoreModel.isValidCHeaderUnitName(null, name) || + CoreModel.isValidCXXHeaderUnitName(null, name)) + descriptor = CPluginImages.DESC_OBJS_TUNIT_RESOURCE_H; + else if (CoreModel.isValidASMSourceUnitName(null, name)) + descriptor = CPluginImages.DESC_OBJS_TUNIT_RESOURCE_A; + else + descriptor = CPluginImages.DESC_OBJS_TUNIT_RESOURCE; + Point size= useSmallSize(flags) ? SMALL_SIZE : BIG_SIZE; descriptor = new CElementImageDescriptor(descriptor, 0, size); }