From 790a689a5ce09e9905bb40ab6eb9067b0886b6bd Mon Sep 17 00:00:00 2001
From: Andrew Gvozdev <angvoz.dev@gmail.com>
Date: Sat, 26 Dec 2009 19:40:33 +0000
Subject: [PATCH] bug 298540: The overlay icon for custom resource settings is
 misleading

---
 .../icons/ovr16/setting_nav.gif               | Bin 0 -> 151 bytes
 .../cdt/internal/ui/CPluginImages.java        |   3 ++-
 .../viewsupport/ProblemsLabelDecorator.java   |   4 ++--
 .../cdt/ui/CElementImageDescriptor.java       |  19 +++++++++++++-----
 4 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 core/org.eclipse.cdt.ui/icons/ovr16/setting_nav.gif

diff --git a/core/org.eclipse.cdt.ui/icons/ovr16/setting_nav.gif b/core/org.eclipse.cdt.ui/icons/ovr16/setting_nav.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f25aa532b1fb17eb6be0e90e7030c5f6af985fdc
GIT binary patch
literal 151
zcmZ?wbhEHbWM^P!Xc1!g`u=CG!^~+phsE{c`8C4qLhH8fJ)`DXVH{AIP`9*t#;)zh
zZ@cBq>0f_#`GFfx-+uY=`|sa>|NavV6o0ZXGBC(9=r8~Q$W8`Ukq6&hT_rnH9Q#(@
QoV8Tyte(~UBn}2^008?}djJ3c

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 36ad35a125e..58db3fb4602 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
@@ -287,7 +287,8 @@ public class CPluginImages {
     public static final ImageDescriptor DESC_OVR_READ_WRITE_ACCESS= create(T_OVR, "readwrite.gif"); //$NON-NLS-1$
     public static final ImageDescriptor DESC_OVR_WRITE_ACCESS= create(T_OVR, "write.gif"); //$NON-NLS-1$
 	public static final ImageDescriptor DESC_OVR_EXTERNAL_FILE= create(T_OVR, "external_file.gif"); //$NON-NLS-1$
-    
+	public static final ImageDescriptor DESC_OVR_SETTING= create(T_OVR, "setting_nav.gif"); //$NON-NLS-1$
+
 	public static final ImageDescriptor DESC_OVR_WARNING= create(T_OVR, "warning_co.gif"); //$NON-NLS-1$
 	public static final ImageDescriptor DESC_OVR_ERROR= create(T_OVR, "error_co.gif"); //$NON-NLS-1$
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java
index 73ba1c1f0fc..92d9b7bbc06 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java
@@ -92,7 +92,7 @@ public class ProblemsLabelDecorator implements ILabelDecorator, ILightweightLabe
 
 	private static final int ERRORTICK_WARNING= CElementImageDescriptor.WARNING;
 	private static final int ERRORTICK_ERROR= CElementImageDescriptor.ERROR;	
-	private static final int TICK_CONFIGURATION = CElementImageDescriptor.SYSTEM_INCLUDE;	
+	private static final int TICK_CONFIGURATION = CElementImageDescriptor.SETTINGS;	
 	
 	private ImageDescriptorRegistry fRegistry;
 	private boolean fUseNewRegistry= false;
@@ -360,7 +360,7 @@ public class ProblemsLabelDecorator implements ILabelDecorator, ILightweightLabe
 		int adornmentFlags= computeAdornmentFlags(element);
 
 		if ((adornmentFlags & TICK_CONFIGURATION) != 0) {
-			decoration.addOverlay(CPluginImages.DESC_OVR_SYSTEM_INCLUDE);
+			decoration.addOverlay(CPluginImages.DESC_OVR_SETTING);
 			adornmentFlags &= ~TICK_CONFIGURATION;
 		}
 		
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementImageDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementImageDescriptor.java
index c7f7aaf5ab5..5cb12f55495 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementImageDescriptor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementImageDescriptor.java
@@ -104,6 +104,10 @@ public class CElementImageDescriptor extends CompositeImageDescriptor {
     /** Flag to render the 'external file' adornment for translation units */
 	public static final int EXTERNAL_FILE = 0x40000;
 
+    /** Flag to render the 'custom settings' adornment 
+     * @since 5.2 */
+    public final static int SETTINGS= 0x80000;
+
 	private ImageDescriptor fBaseImage;
 	private int fFlags;
 	private Point fSize;
@@ -234,11 +238,16 @@ public class CElementImageDescriptor extends CompositeImageDescriptor {
 			x-= data.width;
 			drawImage(data, x, 0);
 		}
-        if ((fFlags & SYSTEM_INCLUDE) != 0) {
-            data= CPluginImages.DESC_OVR_SYSTEM_INCLUDE.getImageData();
-            x-= data.width;
-            drawImage(data, x, 0);
-        }
+		if ((fFlags & SYSTEM_INCLUDE) != 0) {
+			data = CPluginImages.DESC_OVR_SYSTEM_INCLUDE.getImageData();
+			x -= data.width;
+			drawImage(data, x, 0);
+		}
+		if ((fFlags & SETTINGS) != 0) {
+			data = CPluginImages.DESC_OVR_SETTING.getImageData();
+			x -= data.width;
+			drawImage(data, x, 0);
+		}
 	}		
 	
 	private void drawBottomRight() {