diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/DebuggerResources.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/DebuggerResources.java index 06195e0a11..9c03da89af 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/DebuggerResources.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/DebuggerResources.java @@ -89,18 +89,32 @@ public interface DebuggerResources { ImageIcon ICON_SNAP_BACKWARD = ResourceManager.loadImage("images/2leftarrow.png"); ImageIcon ICON_SEEK_PRESENT = ICON_RESUME; - ImageIcon ICON_SET_BREAKPOINT = ResourceManager.loadImage("images/breakpoint-set.png"); - ImageIcon ICON_CLEAR_BREAKPOINT = ResourceManager.loadImage("images/breakpoint-clear.png"); - ImageIcon ICON_ENABLE_BREAKPOINT = ResourceManager.loadImage("images/breakpoint-enable.png"); + boolean altIcons = Boolean.parseBoolean(System.getProperty("debugger.breakpoints.alt.icons")); + + ImageIcon ICON_SET_BREAKPOINT = + altIcons ? ResourceManager.loadImage("images/alt-breakpoint-set.png") + : ResourceManager.loadImage("images/breakpoint-set.png"); + ImageIcon ICON_CLEAR_BREAKPOINT = + altIcons ? ResourceManager.loadImage("images/alt-breakpoint-clear.png") + : ResourceManager.loadImage("images/breakpoint-clear.png"); + ImageIcon ICON_ENABLE_BREAKPOINT = + altIcons ? ResourceManager.loadImage("images/alt-breakpoint-enable.png") + : ResourceManager.loadImage("images/breakpoint-enable.png"); ImageIcon ICON_ENABLE_ALL_BREAKPOINTS = - ResourceManager.loadImage("images/breakpoints-enable-all.png"); - ImageIcon ICON_DISABLE_BREAKPOINT = ResourceManager.loadImage("images/breakpoint-disable.png"); + altIcons ? ResourceManager.loadImage("images/alt-breakpoints-enable-all.png") + : ResourceManager.loadImage("images/breakpoints-enable-all.png"); + ImageIcon ICON_DISABLE_BREAKPOINT = + altIcons ? ResourceManager.loadImage("images/alt-breakpoint-disable.png") + : ResourceManager.loadImage("images/breakpoint-disable.png"); ImageIcon ICON_DISABLE_ALL_BREAKPOINTS = - ResourceManager.loadImage("images/breakpoints-disable-all.png"); + altIcons ? ResourceManager.loadImage("images/alt-breakpoints-disable-all.png") + : ResourceManager.loadImage("images/breakpoints-disable-all.png"); ImageIcon ICON_CLEAR_ALL_BREAKPOINTS = - ResourceManager.loadImage("images/breakpoints-clear-all.png"); + altIcons ? ResourceManager.loadImage("images/alt-breakpoints-clear-all.png") + : ResourceManager.loadImage("images/breakpoints-clear-all.png"); ImageIcon ICON_MAKE_BREAKPOINTS_EFFECTIVE = - ResourceManager.loadImage("images/breakpoints-make-effective.png"); + altIcons ? ResourceManager.loadImage("images/alt-breakpoints-make-effective.png") + : ResourceManager.loadImage("images/breakpoints-make-effective.png"); // TODO: Some overlay to indicate dynamic, or new icon altogether ImageIcon ICON_LISTING = ResourceManager.loadImage("images/Browser.gif"); @@ -279,16 +293,21 @@ public interface DebuggerResources { int PRIORITY_BREAKPOINT_INEFFECTIVE_D_MARKER = MarkerService.BREAKPOINT_PRIORITY; int PRIORITY_BREAKPOINT_MIXED_ED_MARKER = MarkerService.BREAKPOINT_PRIORITY; int PRIORITY_BREAKPOINT_MIXED_DE_MARKER = MarkerService.BREAKPOINT_PRIORITY; + ImageIcon ICON_BREAKPOINT_ENABLED_MARKER = ICON_ENABLE_BREAKPOINT; ImageIcon ICON_BREAKPOINT_DISABLED_MARKER = ICON_DISABLE_BREAKPOINT; ImageIcon ICON_BREAKPOINT_MIXED_ED_MARKER = - ResourceManager.loadImage("images/breakpoint-mixed-ed.png"); + altIcons ? ResourceManager.loadImage("images/alt-breakpoint-mixed-ed.png") + : ResourceManager.loadImage("images/breakpoint-mixed-ed.png"); ImageIcon ICON_BREAKPOINT_MIXED_DE_MARKER = - ResourceManager.loadImage("images/breakpoint-mixed-de.png"); + altIcons ? ResourceManager.loadImage("images/alt-breakpoint-mixed-de.png") + : ResourceManager.loadImage("images/breakpoint-mixed-de.png"); ImageIcon ICON_BREAKPOINT_INEFFECTIVE_E_MARKER = - ResourceManager.loadImage("images/breakpoint-ineffective-e.png"); + altIcons ? ResourceManager.loadImage("images/alt-breakpoint-ineffective-e.png") + : ResourceManager.loadImage("images/breakpoint-ineffective-e.png"); ImageIcon ICON_BREAKPOINT_INEFFECTIVE_D_MARKER = - ResourceManager.loadImage("images/breakpoint-ineffective-d.png"); + altIcons ? ResourceManager.loadImage("images/alt-breakpoint-ineffective-d.png") + : ResourceManager.loadImage("images/breakpoint-ineffective-d.png"); Icon ICON_UNIQUE_REF_READ = new RotateIcon(ResourceManager.loadImage("images/cursor_arrow.gif"), 180); // TODO @@ -1734,4 +1753,5 @@ public interface DebuggerResources { action.setSelected(value); } } + } diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-clear.png b/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-clear.png index e031698377..bb783d7247 100644 Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-clear.png and b/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-clear.png differ diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-disable.png b/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-disable.png old mode 100644 new mode 100755 index 6386998ebc..344e4a2e24 Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-disable.png and b/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-disable.png differ diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-enable.png b/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-enable.png old mode 100644 new mode 100755 index ea1e926811..b5907a734b Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-enable.png and b/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-enable.png differ diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-mixed-de.png b/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-mixed-de.png old mode 100644 new mode 100755 index 201d4a298d..56823827c2 Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-mixed-de.png and b/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-mixed-de.png differ diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-mixed-ed.png b/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-mixed-ed.png old mode 100644 new mode 100755 index 0f9d808294..ecb9c8153e Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-mixed-ed.png and b/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-mixed-ed.png differ diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-set.png b/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-set.png old mode 100644 new mode 100755 index e12b41d306..482c7c0aff Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-set.png and b/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoint-set.png differ diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoints-clear-all.png b/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoints-clear-all.png old mode 100644 new mode 100755 index 2988e9da8c..eb75b54579 Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoints-clear-all.png and b/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoints-clear-all.png differ diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoints-disable-all.png b/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoints-disable-all.png old mode 100644 new mode 100755 index 3d80965e63..9b85001ce5 Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoints-disable-all.png and b/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoints-disable-all.png differ diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoints-enable-all.png b/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoints-enable-all.png old mode 100644 new mode 100755 index 0c2e466dba..6e5e936d4c Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoints-enable-all.png and b/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoints-enable-all.png differ diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoints-make-effective.png b/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoints-make-effective.png old mode 100644 new mode 100755 index b1e1ab4ede..60d9bbe7a1 Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoints-make-effective.png and b/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoints-make-effective.png differ diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoints.png b/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoints.png old mode 100644 new mode 100755 index 4d27be0a40..2bdaccc11b Binary files a/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoints.png and b/Ghidra/Debug/Debugger/src/main/resources/images/alt-breakpoints.png differ