Revision: 3339
http://vexi.svn.sourceforge.net/vexi/?rev=3339&view=rev
Author: clrg
Date: 2009-01-05 06:59:59 +0000 (Mon, 05 Jan 2009)
Log Message:
-----------
Layout tweaks and other trivial updates + nicer progressbar
Modified Paths:
--------------
trunk/widgets/org.vexi.demo/src/org/vexi/demo/feature/progressbar.t
trunk/widgets/org.vexi.widgets/src/org/vexi/lib/text/default.t
trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/cell.t
trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/item.t
trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/progressbar.t
trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/scrollpane.t
trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/table.t
trunk/widgets/org.vexi.widgets/src/vexi/util/queue.t
trunk/widgets/org.vexi.widgets/src/vexi/widget/progressbar.t
Modified: trunk/widgets/org.vexi.demo/src/org/vexi/demo/feature/progressbar.t
===================================================================
--- trunk/widgets/org.vexi.demo/src/org/vexi/demo/feature/progressbar.t
2009-01-05 03:39:14 UTC (rev 3338)
+++ trunk/widgets/org.vexi.demo/src/org/vexi/demo/feature/progressbar.t
2009-01-05 06:59:59 UTC (rev 3339)
@@ -32,7 +32,7 @@
for(var i=0; total>=i; i++){
// FIXME - make delay relative to time elapsed (so it will
be something less than 1sec)
vexi.thread.sleep(1000);
- $progress.sofar = i;
+ $progress.amount = i;
}
$progress.display = false;
};
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/lib/text/default.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/org/vexi/lib/text/default.t
2009-01-05 03:39:14 UTC (rev 3338)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/lib/text/default.t
2009-01-05 06:59:59 UTC (rev 3339)
@@ -74,13 +74,13 @@
$edit.focused ++= function(v) { cascade = v; $cursor.repeat = v; }
thisbox.cursorcolor ++= static.cursorcolorWrite;
- thisbox.multiline ++= static.multilineWrite;
- thisbox.wrapwidth ++= static.wrapwidthWrite;
+ thisbox.multiline ++= static.forwardToEdit;
+ thisbox.textalign ++= static.forwardToEdit;
+ thisbox.wrapwidth ++= static.forwardToEdit;
</ui:box>
static.cursorcolorWrite = function(v) { cascade = v; trapee.v_cursor.fill
= v; }
- static.multilineWrite = function(v) { cascade = v; trapee.v_edit.multiline
= v; }
- static.wrapwidthWrite = function(v) { cascade = v; trapee.v_edit.wrapwidth
= v; }
+ static.forwardToEdit = function(v) { cascade = v; trapee.v_edit[trapname]
= v; }
</vexi>
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/cell.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/cell.t
2009-01-05 03:39:14 UTC (rev 3338)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/cell.t
2009-01-05 06:59:59 UTC (rev 3339)
@@ -6,5 +6,5 @@
<author>Charles Goodwin</author>
</meta:doc>
- <cell padding="2" />
+ <cell padding="2" textalign="left" />
</vexi>
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/item.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/item.t
2009-01-05 03:39:14 UTC (rev 3338)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/item.t
2009-01-05 06:59:59 UTC (rev 3339)
@@ -6,7 +6,7 @@
</meta:doc>
<item />
- <ui:box padding="3">
+ <ui:box padding="3" textalign="left">
thisbox.selected ++= static.selectWrite;
</ui:box>
Modified:
trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/progressbar.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/progressbar.t
2009-01-05 03:39:14 UTC (rev 3338)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/progressbar.t
2009-01-05 06:59:59 UTC (rev 3339)
@@ -1,46 +1,43 @@
<!-- Copyright 2008 - see COPYING for details [LGPL] -->
-<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta" xmlns="vexi.theme"
xmlns:lay="vexi.layout">
-
- <bevel form="up" vshrink="true">
- <lay:pad padding="5">
- <bevel form="down" fill="#aaaaaa">
- <ui:box align="right" orient="vertical">
- <ui:box id="what"/>
- <ui:box id="percent" shrink="true" />
- <ui:box id="amount" shrink="true" />
- </ui:box>
- </bevel>
- </lay:pad>
+<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta" xmlns="vexi.theme"
xmlns:lay="vexi.layout">
+ <meta:doc>
+ <author>Mike Goodwin</author>
+ <author>Chares Goodwin</author>
+ </meta:doc>
+
+ <bevel redirect=":$content" align="left" form="thindown" layout="layer"
margin="5" padding="5" vshrink="true">
+ <ui:box id="content" />
+ <ui:box id="bar" align="left" fill="#d4d0c8" layout="place">
+ <lay:pad id="barpad">
+ <ui:box id="barmsg" align="left" textcolor="white" />
+ </lay:pad>
+ </ui:box>
- thisbox.sofar = 0;
+ thisbox.amount = 0;
thisbox.total = -1;
thisbox.percent = 0;
thisbox.units = null;
- var update = function(){
- if(total!=-1) {
- var newpercent = vexi.math.floor((sofar/total)*100);
- if(newpercent!=percent){
- percent = newpercent;
- $percent.text = newpercent+"%";
- }
- $amount.text = sofar +"/"+total+(units==null?"":units);
- }else{
- $amount.text = sofar+(units==null?"":units);
+ var update = function() {
+ $barpad.padding = padding;
+ if (total!=-1) {
+ $bar.width = vexi.math.ceil((amount/total)*$content.width);
+ var newpercent = vexi.math.floor((amount/total)*100)+"%";
+ var msg = newpercent+" - "+amount +" / "+total;
+ if (units!=null) msg += units;
+ $barmsg.text = msg;
+ text = msg;
+ } else {
+ text = amount+(units==null?"":units);
}
};
- thisbox.what ++= function(v){
- cascade = v; $what.text = v;
- };
-
- thisbox.sofar ++= function(v){
+ thisbox.amount ++= function(v) {
cascade = v;
update();
};
-
</bevel>
</vexi>
\ No newline at end of file
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/scrollpane.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/scrollpane.t
2009-01-05 03:39:14 UTC (rev 3338)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/scrollpane.t
2009-01-05 06:59:59 UTC (rev 3339)
@@ -18,6 +18,7 @@
<ui:box id="inset" shrink="true" />
</ui:box>
+ thisbox.v_fillbox = $content;
thisbox.th_hscroll = $hscroll;
thisbox.th_vscroll = $vscroll;
thisbox.th_viewport = $view;
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/table.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/table.t
2009-01-05 03:39:14 UTC (rev 3338)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/table.t
2009-01-05 06:59:59 UTC (rev 3339)
@@ -50,6 +50,7 @@
thisbox.th_vscroll = $vscroll;
thisbox.th_deselect = $topinset;
thisbox.v_content = $bodyview;
+ thisbox.v_fillbox = $content;
thisbox.fetchData ++= function(f) {
//if f==null ???
Modified: trunk/widgets/org.vexi.widgets/src/vexi/util/queue.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/vexi/util/queue.t 2009-01-05
03:39:14 UTC (rev 3338)
+++ trunk/widgets/org.vexi.widgets/src/vexi/util/queue.t 2009-01-05
06:59:59 UTC (rev 3339)
@@ -13,7 +13,7 @@
action.execute[0].apply(action.execute[1]);
action.execute[1] = action.queue;
action.queue = null;
- }
+ }
action.cancel = false;
action.going = false;
}
Modified: trunk/widgets/org.vexi.widgets/src/vexi/widget/progressbar.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/vexi/widget/progressbar.t
2009-01-05 03:39:14 UTC (rev 3338)
+++ trunk/widgets/org.vexi.widgets/src/vexi/widget/progressbar.t
2009-01-05 06:59:59 UTC (rev 3339)
@@ -12,5 +12,4 @@
<margin />
<theme:progressbar />
-
</vexi>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Vexi-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/vexi-svn
