Refactored.
diff --git a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.ide/plugin.xml b/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.ide/plugin.xml
index a7717b5..0f2d8ec 100644
--- a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.ide/plugin.xml
+++ b/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.ide/plugin.xml
@@ -57,7 +57,108 @@
<menuContribution
locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
<toolbar
- id="org.eclipse.amp.axf.ui.execute">
+ id="org.eclipse.amp.axf.ui.execute"
+ label="Control">
+ <command
+ commandId="org.eclipse.amp.axf.ui.start"
+ disabledIcon="icons/dtool16/run_exc.gif"
+ icon="icons/etool16/run_exc.gif"
+ label="Start"
+ style="push">
+ <visibleWhen
+ checkEnabled="false">
+ <reference
+ definitionId="org.eclipse.amp.axf.ui.active">
+ </reference>
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.amp.axf.ui.restart"
+ icon="icons/etool16/run_restart.gif"
+ label="Restart"
+ style="push">
+ <visibleWhen
+ checkEnabled="false">
+ <reference
+ definitionId="org.eclipse.amp.axf.ui.active">
+ </reference>
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.amp.axf.ui.pause"
+ disabledIcon="icons/dtool16/run_pause.gif"
+ icon="icons/etool16/run_pause.gif"
+ label="Pause"
+ style="push">
+ <visibleWhen
+ checkEnabled="false">
+ <reference
+ definitionId="org.eclipse.amp.axf.ui.active">
+ </reference>
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.amp.axf.ui.step"
+ disabledIcon="icons/dtool16/run_step.gif"
+ icon="icons/etool16/run_step.gif"
+ label="Step"
+ style="push">
+ <visibleWhen
+ checkEnabled="false">
+ <reference
+ definitionId="org.eclipse.amp.axf.ui.active">
+ </reference>
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.amp.axf.ui.resume"
+ disabledIcon="icons/dtool16/run_resume.gif"
+ icon="icons/etool16/run_resume.gif"
+ label="Resume"
+ style="push">
+ <visibleWhen
+ checkEnabled="false">
+ <reference
+ definitionId="org.eclipse.amp.axf.ui.active">
+ </reference>
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.amp.axf.ui.stop"
+ disabledIcon="icons/dtool16/run_stop.gif"
+ icon="icons/etool16/run_stop.gif"
+ label="Stop"
+ style="push">
+ <visibleWhen
+ checkEnabled="false">
+ <reference
+ definitionId="org.eclipse.amp.axf.ui.active">
+ </reference>
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.amp.axf.ui.close"
+ disabledIcon="icons/dtool16/run_close.gif"
+ icon="icons/etool16/run_close.gif"
+ label="Close"
+ style="push">
+ <visibleWhen
+ checkEnabled="false">
+ <reference
+ definitionId="org.eclipse.amp.axf.ui.active">
+ </reference>
+ </visibleWhen>
+ </command>
+ <control
+ class="org.eclipse.amp.axf.ide.view.ScaleGranularityControl"
+ id="org.eclipse.amp.axf.view.ui.slider">
+ <visibleWhen
+ checkEnabled="false">
+ <reference
+ definitionId="org.eclipse.amp.axf.ui.active">
+ </reference>
+ </visibleWhen>
+ </control>
</toolbar>
</menuContribution>
<menuContribution
@@ -164,109 +265,6 @@
</command>
</menu>
</menuContribution>
- <menuContribution
- locationURI="toolbar:org.eclipse.amp.axf.ui.execute">
- <command
- commandId="org.eclipse.amp.axf.ui.start"
- disabledIcon="icons/dtool16/run_exc.gif"
- icon="icons/etool16/run_exc.gif"
- label="Start"
- style="push">
- <visibleWhen
- checkEnabled="false">
- <reference
- definitionId="org.eclipse.amp.axf.ui.active">
- </reference>
- </visibleWhen>
- </command>
- <command
- commandId="org.eclipse.amp.axf.ui.restart"
- icon="icons/etool16/run_restart.gif"
- label="Restart"
- style="push">
- <visibleWhen
- checkEnabled="false">
- <reference
- definitionId="org.eclipse.amp.axf.ui.active">
- </reference>
- </visibleWhen>
- </command>
- <command
- commandId="org.eclipse.amp.axf.ui.pause"
- disabledIcon="icons/dtool16/run_pause.gif"
- icon="icons/etool16/run_pause.gif"
- label="Pause"
- style="push">
- <visibleWhen
- checkEnabled="false">
- <reference
- definitionId="org.eclipse.amp.axf.ui.active">
- </reference>
- </visibleWhen>
- </command>
- <command
- commandId="org.eclipse.amp.axf.ui.step"
- disabledIcon="icons/dtool16/run_step.gif"
- icon="icons/etool16/run_step.gif"
- label="Step"
- style="push">
- <visibleWhen
- checkEnabled="false">
- <reference
- definitionId="org.eclipse.amp.axf.ui.active">
- </reference>
- </visibleWhen>
- </command>
- <command
- commandId="org.eclipse.amp.axf.ui.resume"
- disabledIcon="icons/dtool16/run_resume.gif"
- icon="icons/etool16/run_resume.gif"
- label="Resume"
- style="push">
- <visibleWhen
- checkEnabled="false">
- <reference
- definitionId="org.eclipse.amp.axf.ui.active">
- </reference>
- </visibleWhen>
- </command>
- <command
- commandId="org.eclipse.amp.axf.ui.stop"
- disabledIcon="icons/dtool16/run_stop.gif"
- icon="icons/etool16/run_stop.gif"
- label="Stop"
- style="push">
- <visibleWhen
- checkEnabled="false">
- <reference
- definitionId="org.eclipse.amp.axf.ui.active">
- </reference>
- </visibleWhen>
- </command>
- <command
- commandId="org.eclipse.amp.axf.ui.close"
- disabledIcon="icons/dtool16/run_close.gif"
- icon="icons/etool16/run_close.gif"
- label="Close"
- style="push">
- <visibleWhen
- checkEnabled="false">
- <reference
- definitionId="org.eclipse.amp.axf.ui.active">
- </reference>
- </visibleWhen>
- </command>
- <control
- class="org.eclipse.amp.axf.ide.view.ScaleGranularityControl"
- id="org.eclipse.amp.axf.view.ui.slider">
- <visibleWhen
- checkEnabled="false">
- <reference
- definitionId="org.eclipse.amp.axf.ui.active">
- </reference>
- </visibleWhen>
- </control>
- </menuContribution>
</extension>
<extension point="org.eclipse.core.expressions.definitions">
<definition
