Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2015-04-17 17:04:40 -0400
committerTom Schindl2015-04-17 17:04:40 -0400
commit5e38b38462847ceb0de8d175d72542ea0e353585 (patch)
tree5cdc6dbbbe3b8b995f90ab8b1a9907e1bbb9edda /testcases/org.eclipse.fx.testcases.e4
parent6bc9a8d56a6c7ab91e3e0560563e0987f2e52734 (diff)
downloadorg.eclipse.efxclipse-5e38b38462847ceb0de8d175d72542ea0e353585.tar.gz
org.eclipse.efxclipse-5e38b38462847ceb0de8d175d72542ea0e353585.tar.xz
org.eclipse.efxclipse-5e38b38462847ceb0de8d175d72542ea0e353585.zip
Bug 464382 - Add support to show lightweight dialogs
Diffstat (limited to 'testcases/org.eclipse.fx.testcases.e4')
-rwxr-xr-xtestcases/org.eclipse.fx.testcases.e4/Application.e4xmi3
-rwxr-xr-xtestcases/org.eclipse.fx.testcases.e4/META-INF/MANIFEST.MF4
-rw-r--r--testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/OpenLightweightWindow.java13
-rw-r--r--testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/lightweight/SimpleWindow.java18
4 files changed, 37 insertions, 1 deletions
diff --git a/testcases/org.eclipse.fx.testcases.e4/Application.e4xmi b/testcases/org.eclipse.fx.testcases.e4/Application.e4xmi
index bd1434eff..168ade1c5 100755
--- a/testcases/org.eclipse.fx.testcases.e4/Application.e4xmi
+++ b/testcases/org.eclipse.fx.testcases.e4/Application.e4xmi
@@ -203,6 +203,7 @@
<visibleWhen xsi:type="ui:CoreExpression" xmi:id="_A09kgANxEeS-UZpK2iB2xg" coreExpressionId="org.eclipse.fx.testcases.e4.definition1"/>
</children>
<children xsi:type="menu:DirectMenuItem" xmi:id="_p-vFcAxJEeSIHKL_NsSDZw" elementId="org.eclipse.fx.testcases.e4.directmenuitem.16" label="Disable Delayed" contributionURI="bundleclass://org.eclipse.fx.testcases.e4/org.eclipse.fx.testcases.e4.handlers.DisableDelayed"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_2IheMOLTEeS2FPacIwDu2A" elementId="org.eclipse.fx.testcases.e4.handledmenuitem.openLwWindowDialog" label="Open LW Window Dialog" command="_vYMZ4OLTEeS2FPacIwDu2A"/>
</children>
<children xsi:type="menu:Menu" xmi:id="_d-oDwO6yEeG4lfn-YKJbJw" elementId="org.eclipse.fx.testcases.e4.menu.3" label="Switch">
<children xsi:type="menu:HandledMenuItem" xmi:id="_jYdPMO6yEeG4lfn-YKJbJw" elementId="org.eclipse.fx.testcases.e4.handledmenuitem.4" label="Perspective 0" command="_kCbZQO6yEeG4lfn-YKJbJw">
@@ -295,6 +296,7 @@
<handlers xmi:id="_0_q1EOqiEeGrz8mV_3Gr5A" elementId="org.eclipse.fx.testcases.e4.handler.0" contributionURI="bundleclass://org.eclipse.fx.testcases.e4/org.eclipse.fx.testcases.e4.handlers.Handler1" command="_3PQSEOqiEeGrz8mV_3Gr5A"/>
<handlers xmi:id="_otsOgO6yEeG4lfn-YKJbJw" elementId="org.eclipse.fx.testcases.e4.handler.0" contributionURI="bundleclass://org.eclipse.fx.testcases.e4/org.eclipse.fx.testcases.e4.handlers.SwitchPerspectiveHandler" command="_kCbZQO6yEeG4lfn-YKJbJw"/>
<handlers xmi:id="__UfAcD4rEeKaHfJUGGs7Mw" elementId="org.eclipse.fx.testcases.e4.handler.1" contributionURI="bundleclass://org.eclipse.fx.testcases.e4/org.eclipse.fx.testcases.e4.handlers.FunctionHandler" command="_8Tn3gD4rEeKaHfJUGGs7Mw"/>
+ <handlers xmi:id="_srkbkOLTEeS2FPacIwDu2A" elementId="org.eclipse.fx.testcases.e4.handler.2" contributionURI="bundleclass://org.eclipse.fx.testcases.e4/org.eclipse.fx.testcases.e4.handlers.OpenLightweightWindow" command="_vYMZ4OLTEeS2FPacIwDu2A"/>
<bindingTables xmi:id="_A7QWm-L-EeGP-5z69KadAQ" bindingContext="_A7QWkeL-EeGP-5z69KadAQ">
<bindings xmi:id="_XqO-oOUcEeGP-5z69KadAQ" keySequence="CTRL+I" command="_FEZr8OUcEeGP-5z69KadAQ"/>
<bindings xmi:id="_6h40ID4rEeKaHfJUGGs7Mw" elementId="org.eclipse.fx.testcases.e4.keybinding.0" keySequence="F2" command="_8Tn3gD4rEeKaHfJUGGs7Mw"/>
@@ -309,6 +311,7 @@
<parameters xmi:id="_mCIAIO6yEeG4lfn-YKJbJw" elementId="org.eclipse.fx.testcases.e4.command.2.perspective" name="Perspective Id" optional="false"/>
</commands>
<commands xmi:id="_8Tn3gD4rEeKaHfJUGGs7Mw" elementId="org.eclipse.fx.testcases.e4.command.3" commandName="Function Keybinding"/>
+ <commands xmi:id="_vYMZ4OLTEeS2FPacIwDu2A" elementId="org.eclipse.fx.testcases.e4.command.openLighweightWindowDialog" commandName="Open Lighweight Window Dialog"/>
<addons xmi:id="_A7QWlOL-EeGP-5z69KadAQ" elementId="org.eclipse.e4.core.commands.service" contributionURI="bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon"/>
<addons xmi:id="_A7QWleL-EeGP-5z69KadAQ" elementId="org.eclipse.e4.ui.contexts.service" contributionURI="bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon"/>
<addons xmi:id="_A7QWluL-EeGP-5z69KadAQ" elementId="org.eclipse.fx.ui.keybindings.e4.service" contributionURI="bundleclass://org.eclipse.fx.ui.keybindings.e4/org.eclipse.fx.ui.keybindings.e4.BindingServiceAddon"/>
diff --git a/testcases/org.eclipse.fx.testcases.e4/META-INF/MANIFEST.MF b/testcases/org.eclipse.fx.testcases.e4/META-INF/MANIFEST.MF
index 33b5f8bea..9fbb1ca16 100755
--- a/testcases/org.eclipse.fx.testcases.e4/META-INF/MANIFEST.MF
+++ b/testcases/org.eclipse.fx.testcases.e4/META-INF/MANIFEST.MF
@@ -35,7 +35,9 @@ Require-Bundle: org.eclipse.e4.ui.model.workbench;bundle-version="0.10.1",
org.eclipse.fx.core.di;bundle-version="1.0.0",
org.eclipse.core.expressions;bundle-version="3.4.600",
org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
- org.eclipse.fx.ui.workbench.services;bundle-version="1.0.0"
+ org.eclipse.fx.ui.workbench.services;bundle-version="1.0.0",
+ org.eclipse.fx.ui.controls,
+ org.eclipse.fx.ui.panes
Bundle-ActivationPolicy: lazy
Import-Package: javafx.animation;version="2.0.0",
javafx.application;version="2.0.0",
diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/OpenLightweightWindow.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/OpenLightweightWindow.java
new file mode 100644
index 000000000..03a048595
--- /dev/null
+++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/OpenLightweightWindow.java
@@ -0,0 +1,13 @@
+package org.eclipse.fx.testcases.e4.handlers;
+
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.fx.testcases.e4.lightweight.SimpleWindow;
+import org.eclipse.fx.ui.services.dialog.LightWeightDialogService;
+import org.eclipse.fx.ui.services.dialog.LightWeightDialogService.ModalityScope;
+
+public class OpenLightweightWindow {
+ @Execute
+ public void run(LightWeightDialogService service) {
+ service.openDialog(SimpleWindow.class, ModalityScope.WINDOW);
+ }
+}
diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/lightweight/SimpleWindow.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/lightweight/SimpleWindow.java
new file mode 100644
index 000000000..f15d04b35
--- /dev/null
+++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/lightweight/SimpleWindow.java
@@ -0,0 +1,18 @@
+package org.eclipse.fx.testcases.e4.lightweight;
+
+import org.eclipse.fx.ui.controls.stage.DefaultFramePane;
+import org.eclipse.fx.ui.panes.FillLayoutPane;
+
+import javafx.scene.control.Button;
+
+public class SimpleWindow extends DefaultFramePane {
+ public SimpleWindow() {
+ super(true);
+ setTitle("Bla Bla Bla");
+ FillLayoutPane fillLayoutPane = new FillLayoutPane();
+ fillLayoutPane.setId("client-area");
+ setContent(fillLayoutPane);
+ setClientArea(new Button("Hello World!!!!"));
+ setMaxSize(500, 500);
+ }
+}

Back to the top