Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2016-03-16 10:21:42 -0400
committerTom Schindl2016-03-16 10:21:42 -0400
commitc012411794c3f0ae66df270d4f9b7affb895a3ad (patch)
tree56386c8134312736edfb6ac5769f0f89fc2acffc /testcases
parent63f338ab515119116616568c317c80a15dd72b48 (diff)
parentaa71c74f50697dada863b88cdbb5debd9f3334b1 (diff)
downloadorg.eclipse.efxclipse-c012411794c3f0ae66df270d4f9b7affb895a3ad.tar.gz
org.eclipse.efxclipse-c012411794c3f0ae66df270d4f9b7affb895a3ad.tar.xz
org.eclipse.efxclipse-c012411794c3f0ae66df270d4f9b7affb895a3ad.zip
Merge branch 'master' of ssh://tschindl@git.eclipse.org:29418/efxclipse/org.eclipse.efxclipse
Conflicts: bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/StyledTextArea.java
Diffstat (limited to 'testcases')
-rwxr-xr-xtestcases/org.eclipse.fx.testcases.e4/Application.e4xmi7
1 files changed, 6 insertions, 1 deletions
diff --git a/testcases/org.eclipse.fx.testcases.e4/Application.e4xmi b/testcases/org.eclipse.fx.testcases.e4/Application.e4xmi
index a9ddd2163..ac30a18f7 100755
--- a/testcases/org.eclipse.fx.testcases.e4/Application.e4xmi
+++ b/testcases/org.eclipse.fx.testcases.e4/Application.e4xmi
@@ -39,7 +39,12 @@
<children xsi:type="basic:Part" xmi:id="_cjVs4OL-EeGP-5z69KadAQ" elementId="org.eclipse.fx.testcases.e4.part.1" contributionURI="bundleclass://org.eclipse.fx.testcases.e4/org.eclipse.fx.testcases.e4.parts.ContentPanel" label="C1">
<tags>Part-ToolBarMenu-Floating</tags>
<toolbar xmi:id="_QPi6AIHxEeKxavJ0U4_mHQ" elementId="org.eclipse.fx.testcases.e4.toolbar.4">
- <children xsi:type="menu:DirectToolItem" xmi:id="_QxE5wIHxEeKxavJ0U4_mHQ" elementId="org.eclipse.fx.testcases.e4.directtoolitem.8" label="DI" contributionURI="bundleclass://org.eclipse.fx.testcases.e4/org.eclipse.fx.testcases.e4.handlers.DiHandler2"/>
+ <children xsi:type="menu:DirectToolItem" xmi:id="_zFeR4E1YEeWIZtt-ld8_6A" elementId="org.eclipse.fx.testcases.e4.directtoolitem.testradio" label="Test Radio" contributionURI="bundleclass://org.eclipse.fx.testcases.e4/org.eclipse.fx.testcases.e4.handlers.DiHandler2">
+ <menu xmi:id="_1o4p0E1YEeWIZtt-ld8_6A" elementId="org.eclipse.fx.testcases.e4.menu.11">
+ <children xsi:type="menu:DirectMenuItem" xmi:id="_2u0XIE1YEeWIZtt-ld8_6A" elementId="org.eclipse.fx.testcases.e4.directmenuitem.r1" label="R1" type="Radio" contributionURI="bundleclass://org.eclipse.fx.testcases.e4/org.eclipse.fx.testcases.e4.handlers.DiHandler2"/>
+ <children xsi:type="menu:DirectMenuItem" xmi:id="_4VJbwE1YEeWIZtt-ld8_6A" elementId="org.eclipse.fx.testcases.e4.directmenuitem.r2" label="R2" type="Radio" contributionURI="bundleclass://org.eclipse.fx.testcases.e4/org.eclipse.fx.testcases.e4.handlers.DiHandler2"/>
+ </menu>
+ </children>
</toolbar>
</children>
<children xsi:type="basic:Part" xmi:id="_f5-RgOL-EeGP-5z69KadAQ" elementId="org.eclipse.fx.testcases.e4.part.2" toBeRendered="false" contributionURI="bundleclass://org.eclipse.fx.testcases.e4/org.eclipse.fx.testcases.e4.parts.ContentPanel" label="C2" closeable="true"/>

Back to the top