Revision: 3500
http://vexi.svn.sourceforge.net/vexi/?rev=3500&view=rev
Author: clrg
Date: 2009-05-18 15:16:18 +0000 (Mon, 18 May 2009)
Log Message:
-----------
Demo fixes
Modified Paths:
--------------
trunk/widgets/org.vexi.demo/src/org/vexi/demo/feature/packing.t
trunk/widgets/org.vexi.demo/src/org/vexi/demo/feature/surface.t
trunk/widgets/org.vexi.demo/src/org/vexi/demo/inner/packbox.t
trunk/widgets/org.vexi.demo/src/org/vexi/demo/inner/surface_property.t
trunk/widgets/org.vexi.demo/src/org/vexi/demo/main.t
Modified: trunk/widgets/org.vexi.demo/src/org/vexi/demo/feature/packing.t
===================================================================
--- trunk/widgets/org.vexi.demo/src/org/vexi/demo/feature/packing.t
2009-05-18 15:15:55 UTC (rev 3499)
+++ trunk/widgets/org.vexi.demo/src/org/vexi/demo/feature/packing.t
2009-05-18 15:16:18 UTC (rev 3500)
@@ -6,6 +6,7 @@
static.name = "Packing";
static.category = "Layout";
+ <wi:surface />
<ui:box orient="vertical">
<lay:pad padding="5" shrink="true" text="Packed Layout Demonstration
(Resize Frame)" />
<wi:bevel fill="black" form="down" orient="vertical">
@@ -40,5 +41,6 @@
<packbox fill="blue" minwidth="250" />
</ui:box>
</wi:bevel>
+ vexi.ui.frame = thisbox;
</ui:box>
</vexi>
Modified: trunk/widgets/org.vexi.demo/src/org/vexi/demo/feature/surface.t
===================================================================
--- trunk/widgets/org.vexi.demo/src/org/vexi/demo/feature/surface.t
2009-05-18 15:15:55 UTC (rev 3499)
+++ trunk/widgets/org.vexi.demo/src/org/vexi/demo/feature/surface.t
2009-05-18 15:16:18 UTC (rev 3500)
@@ -8,72 +8,72 @@
static.name = "Surface";
static.category = "Core Features";
- <lay:pad padding="3">
- <ui:box orient="vertical">
- <ui:box text="Sample Property Manipulation" shrink="true" />
- <ui:box height="5" />
- <ui:box orient="vertical" shrink="true">
+ <lay:pad orient="vertical" padding="3">
+ <ui:box text="Sample Property Manipulation" shrink="true" />
+ <ui:box height="5" />
+ <ui:box vshrink="true">
+ <ui:box>
+ <ui:box />
<wi:button id="minimize" hshrink="false" text="Minimize"
tooltip="Minimize this window to the taskbar" />
<wi:button id="maximize" hshrink="false" text="Maximize"
tooltip="Toggle between maximized states" />
<wi:button id="close" hshrink="false" text="Close"
tooltip="Close this window - ends the application!" />
- <wi:button id="settitle" hshrink="false" text="Set frametitle"
+ <ui:box />
+ </ui:box>
+ <wi:separator hshrink="true" />
+ <ui:box orient="vertical">
+ <wi:textfield id="title" />
+ <wi:button id="settitle" hshrink="true" text="Set Frame Title"
tooltip="Set the frametitle text to the below value" />
- <ui:box>
- <ui:box align="right" text="frametitle text:" />
- <ui:box width="3" />
+ </ui:box>
+ </ui:box>
+ <!-- broken
+ frametitle can't be assigned an image as reference.pdf says
+ also should be an option widget with several icons
+ <wi:button id="setIcon" text="Set frametitle Icon" />
+ $setIcon.action ++= function(v) {
+ thisbox.frametitle = .org.vexi.theme.classic.image.arrowdown;
+ }
+ -->
+ <wi:separator vshrink="true" />
+ <ui:box vshrink="true">
+ <lay:pad orient="vertical" padding="3">
+ <ui:box text="Surface Events" shrink="true" />
+ <ui:box height="5" />
+ <ui:box vshrink="true">
+ <ui:box text="Event" align="left" />
+ <ui:box text="Occurances" shrink="true" />
</ui:box>
- <wi:textfield id="title" />
- <!-- broken
- frametitle can't be assigned an image as reference.pdf says
- also should be an option widget with several icons
- <wi:button id="setIcon" text="Set frametitle Icon" />
- $setIcon.action ++= function(v) {
- thisbox.frametitle =
.org.vexi.theme.classic.image.arrowdown;
- }
- -->
- </ui:box>
-
- <wi:separator margin="8 3" />
-
- <ui:box>
- <lay:pad orient="vertical" padding="3">
- <ui:box text="Surface Events" shrink="true" />
- <ui:box height="5" />
- <ui:box vshrink="true">
- <ui:box text="Event" align="left" />
- <ui:box text="Occurances" shrink="true" />
+ <ui:box align="topleft">
+ <ui:box id="events" orient="vertical" />
+ </ui:box>
+ </lay:pad>
+ <wi:separator hshrink="true" />
+ <lay:pad orient="vertical" padding="3">
+ <ui:box text="Surface Properties" shrink="true" />
+ <ui:box height="5" />
+ <ui:box vshrink="true">
+ <ui:box text="Property" align="left" />
+ <ui:box text="Value" shrink="true" />
+ </ui:box>
+ <ui:box align="topleft">
+ <ui:box id="properties" orient="vertical" vshrink="true">
+ <demo:inner.surface_property name="x" value="0" />
+ <demo:inner.surface_property name="y" value="0" />
+ <demo:inner.surface_property name="width" value="0" />
+ <demo:inner.surface_property name="height" value="0" />
</ui:box>
- <ui:box align="topleft" layout="place">
- <ui:box id="events" orient="vertical" />
- </ui:box>
- </lay:pad>
- <wi:separator orient="vertical" margin="3 8" />
- <lay:pad orient="vertical" padding="3">
- <ui:box text="Surface Properties" shrink="true" />
- <ui:box height="5" />
- <ui:box vshrink="true">
- <ui:box text="Property" align="left" />
- <ui:box text="Value" shrink="true" />
- </ui:box>
- <ui:box align="topleft" layout="place">
- <ui:box id="properties" orient="vertical"
vshrink="true">
- <demo:surfaceProperty name="x" value="0" />
- <demo:surfaceProperty name="y" value="0" />
- <demo:surfaceProperty name="width" value="0" />
- <demo:surfaceProperty name="height" value="0" />
- </ui:box>
- </ui:box>
- </lay:pad>
- </ui:box>
+ </ui:box>
+ </lay:pad>
</ui:box>
+ <ui:box />
- $minimize.action ++= function(v) { surface.frame.Minimized =
!surface.frame.Minimized; }
- $maximize.action ++= function(v) { surface.frame.Maximized =
!surface.frame.Maximized; }
- $settitle.action ++= function(v) { surface.frame.frametitle =
$title.text; }
- $close.action ++= function(v) { surface.frame.Close = true; }
+ $minimize.action ++= function(v) { surface.frame.Minimized =
!surface.frame.Minimized; return; }
+ $maximize.action ++= function(v) { surface.frame.Maximized =
!surface.frame.Maximized; return; }
+ $settitle.action ++= function(v) { surface.frame.frametitle =
$title.text; return; }
+ $close.action ++= function(v) { surface.frame.Close = true; return; }
// event handling
@@ -81,7 +81,7 @@
var eventTrap = function(v) {
if (!events[trapname]) {
- var sp = demo.surfaceProperty(vexi.box);
+ var sp = demo.inner.surface_property(vexi.box);
sp.name = trapname;
events[trapname] = sp;
$events[$events.numchildren] = sp;
@@ -101,7 +101,7 @@
// additional functions
- var maxUnmax = function(v) { $maximize.text = (v?"M":"Unm")+"aximize";
cascade = v; }
+ var maxUnmax = function(v) { $maximize.text = (v?"Unm":"M")+"aximize";
cascade = v; }
surface ++= function(v) {
if (!visible) return;
@@ -110,21 +110,53 @@
}
visible ++= function(v) {
+ var o = surface;
cascade = v;
var s = surface;
- if (!s) return;
+
+ // remove traps
+ if (o) {
+ // other
+ s.event.delMoveTrap(eventTrap);
+ s.frame.Maximized --= maxUnmax;
+ s.revertTitle(); // arbitrary
+
+ // properties
+ s.frame.height --= propertyWrite;
+ s.frame.width --= propertyWrite;
+ s.frame.x --= propertyWrite;
+ s.frame.y --= propertyWrite;
+
+ // events
+ s.frame.Focused --= eventTrap;
+ s.frame.Maximized --= eventTrap;
+ s.frame.Minimized --= eventTrap;
+
+ s.event.Click1 --= eventTrap;
+ s.event.Click2 --= eventTrap;
+ s.event.Click3 --= eventTrap;
+ s.event.DoubleClick1 --= eventTrap;
+ s.event.DoubleClick2 --= eventTrap;
+ s.event.DoubleClick3 --= eventTrap;
+ s.event.Press1 --= eventTrap;
+ s.event.Press2 --= eventTrap;
+ s.event.Press3 --= eventTrap;
+ s.event.Release1 --= eventTrap;
+ s.event.Release2 --= eventTrap;
+ s.event.Release3 --= eventTrap;
+ }
// add traps
- if (v) {
+ if (s) {
// other
- s.addMoveTrap(eventTrap);
- s.Maximized ++= maxUnmax;
+ s.event.addMoveTrap(eventTrap);
+ s.frame.Maximized ++= maxUnmax;
// properties
- s.x ++= propertyWrite;
- s.y ++= propertyWrite;
- s.width ++= propertyWrite;
- s.height ++= propertyWrite;
+ s.frame.x ++= propertyWrite;
+ s.frame.y ++= propertyWrite;
+ s.frame.width ++= propertyWrite;
+ s.frame.height ++= propertyWrite;
properties.x.value = s.x;
properties.y.value = s.y;
@@ -132,53 +164,22 @@
properties.height.value = s.height;
// events
- s.Focused ++= eventTrap;
- s.Maximized ++= eventTrap;
- s.Minimized ++= eventTrap;
+ s.frame.Focused ++= eventTrap;
+ s.frame.Maximized ++= eventTrap;
+ s.frame.Minimized ++= eventTrap;
- s.Click1 ++= eventTrap;
- s.Click2 ++= eventTrap;
- s.Click3 ++= eventTrap;
- s.DoubleClick1 ++= eventTrap;
- s.DoubleClick2 ++= eventTrap;
- s.DoubleClick3 ++= eventTrap;
- s.Press1 ++= eventTrap;
- s.Press2 ++= eventTrap;
- s.Press3 ++= eventTrap;
- s.Release1 ++= eventTrap;
- s.Release2 ++= eventTrap;
- s.Release3 ++= eventTrap;
-
- // remove traps
- } else {
- // other
- s.delMoveTrap(eventTrap);
- s.Maximized --= maxUnmax;
- s.revertTitle(); // arbitrary
-
- // properties
- s.height --= propertyWrite;
- s.width --= propertyWrite;
- s.x --= propertyWrite;
- s.y --= propertyWrite;
-
- // events
- s.Focused --= eventTrap;
- s.Maximized --= eventTrap;
- s.Minimized --= eventTrap;
-
- s.Click1 --= eventTrap;
- s.Click2 --= eventTrap;
- s.Click3 --= eventTrap;
- s.DoubleClick1 --= eventTrap;
- s.DoubleClick2 --= eventTrap;
- s.DoubleClick3 --= eventTrap;
- s.Press1 --= eventTrap;
- s.Press2 --= eventTrap;
- s.Press3 --= eventTrap;
- s.Release1 --= eventTrap;
- s.Release2 --= eventTrap;
- s.Release3 --= eventTrap;
+ s.event.Click1 ++= eventTrap;
+ s.event.Click2 ++= eventTrap;
+ s.event.Click3 ++= eventTrap;
+ s.event.DoubleClick1 ++= eventTrap;
+ s.event.DoubleClick2 ++= eventTrap;
+ s.event.DoubleClick3 ++= eventTrap;
+ s.event.Press1 ++= eventTrap;
+ s.event.Press2 ++= eventTrap;
+ s.event.Press3 ++= eventTrap;
+ s.event.Release1 ++= eventTrap;
+ s.event.Release2 ++= eventTrap;
+ s.event.Release3 ++= eventTrap;
}
}
Modified: trunk/widgets/org.vexi.demo/src/org/vexi/demo/inner/packbox.t
===================================================================
--- trunk/widgets/org.vexi.demo/src/org/vexi/demo/inner/packbox.t
2009-05-18 15:15:55 UTC (rev 3499)
+++ trunk/widgets/org.vexi.demo/src/org/vexi/demo/inner/packbox.t
2009-05-18 15:16:18 UTC (rev 3500)
@@ -10,9 +10,9 @@
<ui:box />
</ui:box>
- thisbox.fill ++= static.innerWrite;
- thisbox.maxwidth ++= static.innerWrite;
- thisbox.minwidth ++= static.innerWrite;
+ //thisbox.fill ++= static.innerWrite;
+ //thisbox.maxwidth ++= static.innerWrite;
+ //thisbox.minwidth ++= static.innerWrite;
thisbox.maxwidth ++= function(v) { cascade = v; $max.text = " max:
"+v; $max.maxwidth = v; }
thisbox.minwidth ++= function(v) { cascade = v; $min.text = " min:
"+v; $min.width = v; }
thisbox.width ++= function(v) { cascade = v; $act.text = " act: "+v; }
Modified: trunk/widgets/org.vexi.demo/src/org/vexi/demo/inner/surface_property.t
===================================================================
--- trunk/widgets/org.vexi.demo/src/org/vexi/demo/inner/surface_property.t
2009-05-18 15:15:55 UTC (rev 3499)
+++ trunk/widgets/org.vexi.demo/src/org/vexi/demo/inner/surface_property.t
2009-05-18 15:16:18 UTC (rev 3500)
@@ -4,7 +4,7 @@
<ui:box>
<ui:box id="name" align="left" />
<ui:box id="value" shrink="true" />
- name ++= function(v) { $name.text = v; }
- value ++= function(v) { $value.text = v; }
+ name ++= function(v) { cascade = v; $name.text = v; }
+ value ++= function(v) { cascade = v; $value.text = v; }
</ui:box>
</vexi>
\ No newline at end of file
Modified: trunk/widgets/org.vexi.demo/src/org/vexi/demo/main.t
===================================================================
--- trunk/widgets/org.vexi.demo/src/org/vexi/demo/main.t 2009-05-18
15:15:55 UTC (rev 3499)
+++ trunk/widgets/org.vexi.demo/src/org/vexi/demo/main.t 2009-05-18
15:16:18 UTC (rev 3500)
@@ -7,7 +7,7 @@
</meta:doc>
<wi:surface />
- <ui:box orient="vertical" framewidth="600" frameheight="500">
+ <ui:box orient="vertical">
<demomenus />
<wi:tabpane id="content" displayclose="true" margin="10">
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables
unlimited royalty-free distribution of the report engine
for externally facing server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
