Revision: 3501
          http://vexi.svn.sourceforge.net/vexi/?rev=3501&view=rev
Author:   clrg
Date:     2009-05-18 16:33:34 +0000 (Mon, 18 May 2009)

Log Message:
-----------
More demo fixes

Modified Paths:
--------------
    trunk/widgets/org.vexi.demo/src/org/vexi/demo/feature/biscuits.t
    trunk/widgets/org.vexi.demo/src/org/vexi/demo/feature/border.t
    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/main.t

Modified: trunk/widgets/org.vexi.demo/src/org/vexi/demo/feature/biscuits.t
===================================================================
--- trunk/widgets/org.vexi.demo/src/org/vexi/demo/feature/biscuits.t    
2009-05-18 15:16:18 UTC (rev 3500)
+++ trunk/widgets/org.vexi.demo/src/org/vexi/demo/feature/biscuits.t    
2009-05-18 16:33:34 UTC (rev 3501)
@@ -39,8 +39,8 @@
         thisbox.loadParams = function() {
             var parms = vexi.prefs.getAllPreferences();
             fillList($prefs, parms);
-            var parms = vexi.prefs.getPersistentPreferences();
-            fillList($persistprefs, parms);
+            var prefs = vexi.prefs.getPersistentPreferences();
+            fillList($persistprefs, prefs);
         }
         
         thisbox.fillList = function(listbox, valueObj) {
@@ -62,7 +62,7 @@
         
         loadParams();
         
-        $set.action ++= function(v) {
+        $set.action ++= function(a) {
             var n = $paramname.text;
             var v = $paramvalue.text;
             if (n.length > 0) {

Modified: trunk/widgets/org.vexi.demo/src/org/vexi/demo/feature/border.t
===================================================================
--- trunk/widgets/org.vexi.demo/src/org/vexi/demo/feature/border.t      
2009-05-18 15:16:18 UTC (rev 3500)
+++ trunk/widgets/org.vexi.demo/src/org/vexi/demo/feature/border.t      
2009-05-18 16:33:34 UTC (rev 3501)
@@ -11,9 +11,9 @@
     static.category = "Layout";
     
     <ui:box orient="vertical">
-        <lay:pad padding="10">
-            <ui:box orient="vertical">
-                <ui:box text="Choose a bevel type" align="left" shrink="true"/>
+        <lay:pad orient="vertical" padding="10">
+            <ui:box>
+                <ui:box text=" Choose a bevel type: " align="left" 
shrink="true" />
                 <wi:option id="beveltype">
                     <wi:item value="" text="" />
                     <wi:item value="thindown" text="bevel thindown" />
@@ -24,27 +24,32 @@
                     <wi:item value="flat" text="bevel flat" />
                     <wi:item value="tabtop" text="bevel tabtop" />
                 </wi:option>
+                <ui:box />
             </ui:box>
             <wi:bevel id="bev" margin="9">
                 <ui:box id="bevbox" text="none"/>
             </wi:bevel>
+            
             var dfltform = $bev.form;
+            
 //            $beveltype.text ++= function(v) {
 //                $bev.form = v;
 //                $bevbox.text = v;
 //            }
+            
             $beveltype.value ++= function(v) {
+                cascade = v;
                 if (v != "") {
                     $bev.form = v;
                     $bevbox.text = $beveltype.text;
-                }
-                else {
+                } else {
                     $bev.form = dfltform;
                     $bevbox.text = "none";
                 }
             }
+            
         </lay:pad>
-
+        <wi:separator vshrink="true" />
         <lay:pad orient="vertical" padding="10">
             <ui:box text="Custom fill/borders" align="left" shrink="true"/>
             <ui:box>

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:16:18 UTC (rev 3500)
+++ trunk/widgets/org.vexi.demo/src/org/vexi/demo/feature/packing.t     
2009-05-18 16:33:34 UTC (rev 3501)
@@ -41,6 +41,5 @@
                 <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:16:18 UTC (rev 3500)
+++ trunk/widgets/org.vexi.demo/src/org/vexi/demo/feature/surface.t     
2009-05-18 16:33:34 UTC (rev 3501)
@@ -103,12 +103,6 @@
         
         var maxUnmax = function(v) { $maximize.text = (v?"Unm":"M")+"aximize"; 
cascade = v; }
         
-        surface ++= function(v) {
-            if (!visible) return;
-            cascade = v;
-            visible = true;
-        }
-        
         visible ++= function(v) {
             var o = surface;
             cascade = v;
@@ -117,33 +111,33 @@
             // remove traps
             if (o) {
                 // other
-                s.event.delMoveTrap(eventTrap);
-                s.frame.Maximized --= maxUnmax;
-                s.revertTitle(); // arbitrary
+                o.event.delMoveTrap(eventTrap);
+                o.frame.Maximized --= maxUnmax;
+                o.revertTitle(); // arbitrary
                 
                 // properties
-                s.frame.height --= propertyWrite;
-                s.frame.width --= propertyWrite;
-                s.frame.x --= propertyWrite;
-                s.frame.y --= propertyWrite;
+                o.frame.height --= propertyWrite;
+                o.frame.width --= propertyWrite;
+                o.frame.x --= propertyWrite;
+                o.frame.y --= propertyWrite;
                 
                 // events
-                s.frame.Focused --= eventTrap;
-                s.frame.Maximized --= eventTrap;
-                s.frame.Minimized --= eventTrap;
+                o.frame.Focused --= eventTrap;
+                o.frame.Maximized --= eventTrap;
+                o.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;
+                o.event.Click1 --= eventTrap;
+                o.event.Click2 --= eventTrap;
+                o.event.Click3 --= eventTrap;
+                o.event.DoubleClick1 --= eventTrap;
+                o.event.DoubleClick2 --= eventTrap;
+                o.event.DoubleClick3 --= eventTrap;
+                o.event.Press1 --= eventTrap;
+                o.event.Press2 --= eventTrap;
+                o.event.Press3 --= eventTrap;
+                o.event.Release1 --= eventTrap;
+                o.event.Release2 --= eventTrap;
+                o.event.Release3 --= eventTrap;
             }
             
             // add traps

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:16:18 UTC (rev 3500)
+++ trunk/widgets/org.vexi.demo/src/org/vexi/demo/main.t        2009-05-18 
16:33:34 UTC (rev 3501)
@@ -10,7 +10,7 @@
     <ui:box orient="vertical">
         
         <demomenus />
-        <wi:tabpane id="content" displayclose="true" margin="10">
+        <wi:tabpane id="content" closeable="true" margin="10">
             // load this one normally as it's is shown by default
             <about tabtext="About" />
             // load the rest on-request to boost startup speed


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

Reply via email to