From bfbf619f145d0e423f20dae8eb91e6d393e7f34f Mon Sep 17 00:00:00 2001
From: Mikhail Khodjaiants <mikhailkhod@googlemail.com>
Date: Thu, 26 Jun 2003 16:18:54 +0000
Subject: [PATCH] New icon for shared libraries with loaded symbols.
---
debug/org.eclipse.cdt.debug.ui/ChangeLog | 6 ++++++
.../icons/full/ovr16/symbols_ovr.gif | Bin 0 -> 66 bytes
.../internal/ui/CDTDebugModelPresentation.java | 8 +++-----
.../cdt/debug/internal/ui/CDebugImages.java | 2 ++
4 files changed, 11 insertions(+), 5 deletions(-)
create mode 100644 debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/symbols_ovr.gif
diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index 855b672b205..506627e6b3c 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-26 Mikhail Khodjaiants
+ New icon for shared libraries with loaded symbols.
+ * icons/full/ovr16/symbols_ovr.gif: new
+ * CDebugImages.java
+ * CDTDebugModelPresentation.java
+
2003-06-24 Mikhail Khodjaiants
Warnings cleanup.
* CDebugPreferencePage.java
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/symbols_ovr.gif b/debug/org.eclipse.cdt.debug.ui/icons/full/ovr16/symbols_ovr.gif
new file mode 100644
index 0000000000000000000000000000000000000000..08438a590ab4ebfbfaffbbe40fb91e679fd8b5bc
GIT binary patch
literal 66
zcmZ?wbhEHbWM^P!nE0RJz<~q*85kNE82<nNulSRNkpT#FKm<tMfl2U)l2G#FLu@62
RD=ijoJpCk)fx()=8UUfT6XO5?
literal 0
HcmV?d00001
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java
index 9bd6d8cff10..a4b79c01bac 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java
@@ -921,12 +921,10 @@ public class CDTDebugModelPresentation extends LabelProvider
{
if ( element.areSymbolsLoaded() )
{
- return CDebugUIPlugin.getImageDescriptorRegistry().get( CDebugImages.DESC_OBJS_LOADED_SHARED_LIBRARY );
- }
- else
- {
- return CDebugUIPlugin.getImageDescriptorRegistry().get( CDebugImages.DESC_OBJS_SHARED_LIBRARY );
+ return fImageCache.getImageFor( new OverlayImageDescriptor( fDebugImageRegistry.get( CDebugImages.DESC_OBJS_LOADED_SHARED_LIBRARY ),
+ new ImageDescriptor[] { null, CDebugImages.DESC_OVRS_SYMBOLS, null, null } ) );
}
+ return CDebugUIPlugin.getImageDescriptorRegistry().get( CDebugImages.DESC_OBJS_SHARED_LIBRARY );
}
protected DisassemblyEditorInput getDisassemblyEditorInput( ICAddressBreakpoint breakpoint )
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugImages.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugImages.java
index 7bd6d9c0995..7a0c0ceb676 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugImages.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugImages.java
@@ -59,6 +59,7 @@ public class CDebugImages
public static final String IMG_OVRS_FUNCTION_BREAKPOINT_DISABLED = NAME_PREFIX + "function_ovr_disabled.gif"; //$NON-NLS-1$
public static final String IMG_OVRS_ERROR = NAME_PREFIX + "error_ovr.gif"; //$NON-NLS-1$
public static final String IMG_OVRS_WARNING = NAME_PREFIX + "warning_ovr.gif"; //$NON-NLS-1$
+ public static final String IMG_OVRS_SYMBOLS = NAME_PREFIX + "symbols_ovr.gif"; //$NON-NLS-1$
public static final String IMG_OBJS_ADDRESS_BREAKPOINT_ENABLED = NAME_PREFIX + "addrbrkp_obj.gif"; //$NON-NLS-1$
public static final String IMG_OBJS_ADDRESS_BREAKPOINT_DISABLED = NAME_PREFIX + "addrbrkpd_obj.gif"; //$NON-NLS-1$
public static final String IMG_OBJS_FUNCTION_BREAKPOINT_ENABLED = NAME_PREFIX + "funbrkp_obj.gif"; //$NON-NLS-1$
@@ -123,6 +124,7 @@ public class CDebugImages
public static final ImageDescriptor DESC_OVRS_ADDRESS_BREAKPOINT_DISABLED = createManaged( T_OVR, IMG_OVRS_ADDRESS_BREAKPOINT_DISABLED );
public static final ImageDescriptor DESC_OVRS_FUNCTION_BREAKPOINT = createManaged( T_OVR, IMG_OVRS_FUNCTION_BREAKPOINT );
public static final ImageDescriptor DESC_OVRS_FUNCTION_BREAKPOINT_DISABLED = createManaged( T_OVR, IMG_OVRS_FUNCTION_BREAKPOINT_DISABLED );
+ public static final ImageDescriptor DESC_OVRS_SYMBOLS = createManaged( T_OVR, IMG_OVRS_SYMBOLS );
public static final ImageDescriptor DESC_OBJS_WATCHPOINT_ENABLED = createManaged( T_OBJ, IMG_OBJS_WATCHPOINT_ENABLED );
public static final ImageDescriptor DESC_OBJS_WATCHPOINT_DISABLED = createManaged( T_OBJ, IMG_OBJS_WATCHPOINT_DISABLED );
public static final ImageDescriptor DESC_OBJS_READ_WATCHPOINT_ENABLED = createManaged( T_OBJ, IMG_OBJS_READ_WATCHPOINT_ENABLED );