diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/iface2/DbgModelTargetExceptionContainer.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/iface2/DbgModelTargetExceptionContainer.java index 6f0e06b6d6..7b66363730 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/iface2/DbgModelTargetExceptionContainer.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/iface2/DbgModelTargetExceptionContainer.java @@ -19,7 +19,7 @@ import ghidra.dbg.target.TargetAggregate; import ghidra.dbg.target.schema.*; @TargetObjectSchemaInfo( - name = "EventContainer", + name = "ExceptionContainer", elements = { @TargetElementType(type = DbgModelTargetException.class) }, attributes = { diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/impl/DbgModelTargetExecutionOptionImpl.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/impl/DbgModelTargetExecutionOptionImpl.java index 2ba750752b..014962d10c 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/impl/DbgModelTargetExecutionOptionImpl.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/impl/DbgModelTargetExecutionOptionImpl.java @@ -26,7 +26,7 @@ import agent.dbgeng.model.iface2.*; import ghidra.dbg.target.schema.*; @TargetObjectSchemaInfo( - name = "ExecutionFilter", + name = "ExecutionOption", elements = { @TargetElementType(type = Void.class) }, attributes = { @@ -39,7 +39,7 @@ public class DbgModelTargetExecutionOptionImpl extends DbgModelTargetObjectImpl public DbgModelTargetExecutionOptionImpl(DbgModelTargetEvent event, DebugFilterExecutionOption option) { - super(event.getModel(), event, "Execute", "ExecutionFilter"); + super(event.getModel(), event, "Execute", "ExecutionOption"); this.event = event; this.getModel().addModelObject(option, this); this.optionExc = option; @@ -48,7 +48,7 @@ public class DbgModelTargetExecutionOptionImpl extends DbgModelTargetObjectImpl public DbgModelTargetExecutionOptionImpl(DbgModelTargetException exc, DebugFilterExecutionOption option) { - super(exc.getModel(), exc, "Execute", "ExecutionFilter"); + super(exc.getModel(), exc, "Execute", "ExecutionOption"); this.event = exc; this.getModel().addModelObject(option, this); this.optionExc = option; diff --git a/Ghidra/Debug/Debugger/certification.manifest b/Ghidra/Debug/Debugger/certification.manifest index e0ef58ee77..e67929747c 100644 --- a/Ghidra/Debug/Debugger/certification.manifest +++ b/Ghidra/Debug/Debugger/certification.manifest @@ -148,6 +148,7 @@ src/main/resources/images/breakpoints-enable-all.png||GHIDRA||||END| src/main/resources/images/breakpoints-make-effective.png||GHIDRA||||END| src/main/resources/images/breakpoints.png||GHIDRA||||END| src/main/resources/images/closedFolder.png||Modified Nuvola Icons - LGPL 2.1||||END| +src/main/resources/images/conf.png||GHIDRA||||END| src/main/resources/images/connect.png||GHIDRA||||END| src/main/resources/images/console.png||GHIDRA||||END| src/main/resources/images/continue.png||GHIDRA||||END| @@ -176,6 +177,7 @@ src/main/resources/images/stepout.png||GHIDRA||||END| src/main/resources/images/stepover.png||GHIDRA||||END| src/main/resources/images/stop.png||GHIDRA||||END| src/main/resources/images/sync_enabled.png||GHIDRA||||END| +src/main/resources/images/system-switch-user.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| src/main/resources/images/table.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| src/main/resources/images/text-xml.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| src/main/resources/images/thread.png||GHIDRA||||END| 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 e54e947418..c47eb3f3d7 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 @@ -170,6 +170,9 @@ public interface DebuggerResources { ImageIcon ICON_BLANK = ResourceManager.loadImage("images/blank.png"); ImageIcon ICON_PACKAGE = ResourceManager.loadImage("images/debugger32.png"); + ImageIcon ICON_CONFIG = ResourceManager.loadImage("images/conf.png"); + ImageIcon ICON_TOGGLE = ResourceManager.loadImage("images/system-switch-user.png"); + HelpLocation HELP_PACKAGE = new HelpLocation("Debugger", "package"); String HELP_ANCHOR_PLUGIN = "plugin"; @@ -1212,7 +1215,7 @@ public interface DebuggerResources { abstract class AbstractToggleAction extends DockingAction { public static final String NAME = "Toggle"; - public static final Icon ICON = ICON_BREAKPOINT_MIXED_ED_MARKER; + public static final Icon ICON = ICON_TOGGLE; public static final String HELP_ANCHOR = "toggle_option"; public static HelpLocation help(Plugin owner) { diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/DebuggerObjectsProvider.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/DebuggerObjectsProvider.java index 740f4926a4..9cb56ca38d 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/DebuggerObjectsProvider.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/DebuggerObjectsProvider.java @@ -339,7 +339,7 @@ public class DebuggerObjectsProvider extends ComponentProviderAdapter attachDialog = new DebuggerAttachDialog(this); breakpointDialog = new DebuggerBreakpointDialog(this); configDialog = new DebuggerMethodInvocationDialog(tool, "Configuration", "Configure", - DebuggerResources.ICON_LAUNCH); + DebuggerResources.ICON_CONFIG); } private void addToPanel(ObjectPane p) throws Exception { diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/conf.png b/Ghidra/Debug/Debugger/src/main/resources/images/conf.png new file mode 100644 index 0000000000..4c659e70a2 Binary files /dev/null and b/Ghidra/Debug/Debugger/src/main/resources/images/conf.png differ diff --git a/Ghidra/Debug/Debugger/src/main/resources/images/system-switch-user.png b/Ghidra/Debug/Debugger/src/main/resources/images/system-switch-user.png new file mode 100644 index 0000000000..b84e2b7758 Binary files /dev/null and b/Ghidra/Debug/Debugger/src/main/resources/images/system-switch-user.png differ