diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/icons/full/obj16/watch_exp.gif b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/icons/full/obj16/watch_exp.gif deleted file mode 100644 index d37495a8391..00000000000 Binary files a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/icons/full/obj16/watch_exp.gif and /dev/null differ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.properties b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.properties index 8a051dd3f79..5a4c78d4733 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.properties +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.properties @@ -30,11 +30,6 @@ tracepoints.property.actions=Actions tracepoints.action.page.label=Actions tracepointActionsPrefPage.name=Tracepoint Actions -popup.addExpression.label=Add Watch Expression... -popup.resumeAtLine.label=Resume At Li&ne -popup.moveToLine.label=&Move To Line -popup.runToLine.label=Run To &Line - # Tracepoints view.traceControl.name=Trace Control toolbar.startTracing.name=Start Tracing diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.xml b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.xml index ddbc6408fb7..4c6e9675bb7 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.xml +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.xml @@ -446,84 +446,6 @@ id="org.eclipse.cdt.dsf.gdb.ui.preferences.TracepointActionsPreferencePage" name="%tracepointActionsPrefPage.name"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbUIPlugin.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbUIPlugin.java index aeaf872aefb..6866babf972 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbUIPlugin.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbUIPlugin.java @@ -55,8 +55,6 @@ public class GdbUIPlugin extends AbstractUIPlugin { super.start(context); plugin = this; - EvaluationContextManager.startup(); - fTracingConsoleManager = new TracingConsoleManager(); fTracingConsoleManager.startup(); } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/icons/full/obj16/move_to_line.gif b/dsf/org.eclipse.cdt.dsf.ui/icons/move_to_line.gif similarity index 100% rename from dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/icons/full/obj16/move_to_line.gif rename to dsf/org.eclipse.cdt.dsf.ui/icons/move_to_line.gif diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/icons/full/obj16/resume_at_line.gif b/dsf/org.eclipse.cdt.dsf.ui/icons/resume_at_line.gif similarity index 100% rename from dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/icons/full/obj16/resume_at_line.gif rename to dsf/org.eclipse.cdt.dsf.ui/icons/resume_at_line.gif diff --git a/dsf/org.eclipse.cdt.dsf.ui/plugin.properties b/dsf/org.eclipse.cdt.dsf.ui/plugin.properties index 9fe899554b8..f37e87ec369 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/plugin.properties +++ b/dsf/org.eclipse.cdt.dsf.ui/plugin.properties @@ -47,6 +47,12 @@ action.refreshAll.name=Refresh Debug Views action.refresh.label=Refresh +popup.addExpression.label=Add Watch Expression... +popup.resumeAtLine.label=Resume At Li&ne +popup.moveToLine.label=&Move To Line +popup.runToLine.label=Run To &Line + + # Preferences debugCallStack = Debug Call Stack diff --git a/dsf/org.eclipse.cdt.dsf.ui/plugin.xml b/dsf/org.eclipse.cdt.dsf.ui/plugin.xml index 6183613adab..73d37bb1f19 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/plugin.xml +++ b/dsf/org.eclipse.cdt.dsf.ui/plugin.xml @@ -729,6 +729,38 @@ + + + + + + + + + + +