Revision: 1899
http://svn.sourceforge.net/vexi/?rev=1899&view=rev
Author: clrg
Date: 2007-07-01 17:23:17 -0700 (Sun, 01 Jul 2007)
Log Message:
-----------
Remove almost all references to packed, cols, and rows leaving only cases where
replacement is not trivial
Modified Paths:
--------------
widgets/trunk/org.vexi.widgets/doc/test_add_del.t
widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/body.t
widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/column.t
widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/combo.t
widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/option.t
widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/slider.t
widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/spin.t
widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/splitpane.t
widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/table.t
widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/textfield.t
widgets/trunk/org.vexi.widgets/src/vexi/util/date/monthview.t
widgets/trunk/org.vexi.widgets/src/vexi/util/fade.t
widgets/trunk/org.vexi.widgets/src/vexi/widget/body.t
widgets/trunk/org.vexi.widgets/src/vexi/widget/foot.t
widgets/trunk/org.vexi.widgets/src/vexi/widget/head.t
widgets/trunk/org.vexi.widgets/src/vexi/widget/row.t
widgets/trunk/org.vexi.widgets/src/vexi/widget/scrollbar.t
Modified: widgets/trunk/org.vexi.widgets/doc/test_add_del.t
===================================================================
--- widgets/trunk/org.vexi.widgets/doc/test_add_del.t 2007-06-28 22:39:04 UTC
(rev 1898)
+++ widgets/trunk/org.vexi.widgets/doc/test_add_del.t 2007-07-02 00:23:17 UTC
(rev 1899)
@@ -1,5 +1,5 @@
<vexi xmlns="vexi.theme">
- <ui:box cols="1" maxwidth="300" maxheight="300">
+ <ui:box orient="vertical" maxwidth="300" maxheight="300">
<ui:box id="c" text="Add" fill="black" textcolor="white" />
<ui:box height="1" fill="black" />
<ui:box id="t" rowspan="2" />
Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/body.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/body.t
2007-06-28 22:39:04 UTC (rev 1898)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/body.t
2007-07-02 00:23:17 UTC (rev 1899)
@@ -5,5 +5,5 @@
<author>Charles Goodwin</author>
</meta:doc>
- <org.vexi.lib.widget.body cols="1" />
+ <org.vexi.lib.widget.body orient="vertical" />
</vexi>
Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/column.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/column.t
2007-06-28 22:39:04 UTC (rev 1898)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/column.t
2007-07-02 00:23:17 UTC (rev 1899)
@@ -7,9 +7,8 @@
<lib:column />
<ui:box redirect="$content" padding="2 1">
- <button id="b">
- <ui:box id="counter" minwidth="8" />
- <ui:box align="left" packed="false">
+ <button id="b"layout="absolute">
+ <ui:box align="left">
<ui:box>
<ui:box id="sort" align="right" shrink="true" />
</ui:box>
@@ -31,7 +30,7 @@
}
}
- $content.height ++= function(v) { $counter.minheight = v; cascade = v;
}
+ $content.height ++= function(v) { $counter.minheight = v + 3; cascade
= v; }
$b.action ++= function(v) { thisbox.action = true; cascade = v; }
</ui:box>
Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/combo.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/combo.t
2007-06-28 22:39:04 UTC (rev 1898)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/combo.t
2007-07-02 00:23:17 UTC (rev 1899)
@@ -8,8 +8,8 @@
<lib:widget.combo redirect="$proxy" fill="white" margin="3"
maxlistheight="160">
<bevel form="down">
<pad id="pad" padding="3">
- <ui:box id="inset">
- <lib:text.default id="edit" align="left" packed="false"
vshrink="true" />
+ <ui:box id="inset" layout="absolute">
+ <lib:text.default id="edit" align="left" vshrink="true" />
</ui:box>
</pad>
<button id="button" width="19" minheight="19">
Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/option.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/option.t
2007-06-28 22:39:04 UTC (rev 1898)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/option.t
2007-07-02 00:23:17 UTC (rev 1899)
@@ -6,25 +6,26 @@
</meta:doc>
<lib:option redirect="$proxy" fill="white" margin="3" maxlistheight="160">
- <bevel form="down">
- <pad id="pad" fill="white" minwidth="0" padding="1 3">
- <ui:box id="output" align="left" packed="false" shrink="true" />
- </pad>
- <focusborder id="focus" align="topleft" packed="false"
display="false" />
- <button id="button" width="19" minheight="19">
- <ui:box fill="#d4d0c8">
- <ui:box id="arrow" align="center" fill=".image.arrowdown"
shrink="true" />
- </ui:box>
- </button>
- </bevel>
- <!-- always hidden -->
- <ui:box id="proxy" display="false" />
- <!-- moved elsewhere -->
- <border id="popbox" border="black" depth="1">
- <scrollpane id="scroll" autohidevertical="true" fill="white"
hshrink="true" scrollhorizontal="false">
- <ui:box id="content" align="topleft" shrink="true" />
- </scrollpane>
- </border>
+ <bevel form="down">
+ <focusborder id="focus" align="topleft" display="false">
+ <pad id="pad" fill="white" layout="absolute" minwidth="0"
padding="1 3">
+ <ui:box id="output" align="left" shrink="true" />
+ </pad>
+ </focusborder>
+ <button id="button" width="19" minheight="19">
+ <ui:box fill="#d4d0c8">
+ <ui:box id="arrow" align="center" fill=".image.arrowdown"
shrink="true" />
+ </ui:box>
+ </button>
+ </bevel>
+ <!-- always hidden -->
+ <ui:box id="proxy" display="false" />
+ <!-- moved elsewhere -->
+ <border id="popbox" border="black" depth="1">
+ <scrollpane id="scroll" autohidevertical="true" fill="white"
hshrink="true" scrollhorizontal="false">
+ <ui:box id="content" align="topleft" shrink="true" />
+ </scrollpane>
+ </border>
// redirects
util.redirect..addRedirect(thisbox, $pad, "fill");
Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/slider.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/slider.t
2007-06-28 22:39:04 UTC (rev 1898)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/slider.t
2007-07-02 00:23:17 UTC (rev 1899)
@@ -5,38 +5,36 @@
<author>Charles Goodwin</author>
</meta:doc>
- <lib:slider cols="1">
- <ui:box id="track">
- <bevel id="bevel" form="down" vshrink="true" />
- <focusborder id="focus" packed="false" display="false" />
- <ui:box id="handle" align="topleft" packed="false" shrink="true" />
+ <lib:slider orient="horizontal">
+ <ui:box id="track" layout="absolute">
+ <focusborder id="focus">
+ <bevel id="bevel" form="down" vshrink="true" />
+ </focusborder>
+ <ui:box id="handle" align="topleft" shrink="true" />
</ui:box>
thisbox.th_track = $track;
thisbox.th_handle = $handle;
- thisbox.focused ++= function(v)
+ thisbox.focused ++= .focusborder..focusFunc;
+
+ var dimFunc = function(v)
{
cascade = v;
- $focus.display = focused;
+ $track[flip(dim)] = $handle[flip(dim)];
}
thisbox.orient ++= function(v)
{
cascade = v;
- var foo = ((orient == "horizontal") ? "h" : "v");
- $handle.fill = .image["slider_"+foo];
- $track[maxdim] = vexi.ui.maxdim;
- $track[flip(dim)] = $handle[flip(dim)];
$bevel[shr] = false;
$bevel[flip(shr)] = true;
+ $track[maxdim] = vexi.ui.maxdim;
+ $handle[dim] --= dimFunc;
+ $handle[flip(dim)] ++= dimFunc;
+ var o = ((orient == "horizontal") ? "h" : "v");
+ $handle.fill = .image["slider_"+o];
}
- $handle[flip(dim)] ++= function(v)
- {
- cascade = v;
- $track[flip(dim)] = $handle[flip(dim)];
- }
-
</lib:slider>
</vexi>
Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/spin.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/spin.t
2007-06-28 22:39:04 UTC (rev 1898)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/spin.t
2007-07-02 00:23:17 UTC (rev 1899)
@@ -8,10 +8,12 @@
<lib:spin />
<ui:box redirect="$content" margin="3" padding="3" vshrink="true">
<bevel form="down">
- <ui:box id="content" fill="white">
- <focusborder id="focus" packed="false" display="false" />
+ <ui:box id="bg" fill="white">
+ <focusborder id="focus">
+ <ui:box id="content" />
+ </focusborder>
</ui:box>
- <ui:box cols="1" width="15">
+ <ui:box orient="vertical" width="15">
<button id="more" repeats="true">
<ui:box align="center" fill=".image.arrowup_small"
shrink="true" />
</button>
@@ -21,6 +23,7 @@
</ui:box>
</bevel>
+ thisbox.th_bg = $bg;
thisbox.th_content = $content;
thisbox.th_focus = $focus;
thisbox.th_more = $more;
@@ -36,7 +39,7 @@
static.enableFunc = function(v)
{
cascade = v;
- trapee.th_content.fill = v ? "white" : "#d4d0c8";
+ trapee.th_bg.fill = v ? "white" : "#d4d0c8";
}
static.widthFunc = function(v)
Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/splitpane.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/splitpane.t
2007-06-28 22:39:04 UTC (rev 1898)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/splitpane.t
2007-07-02 00:23:17 UTC (rev 1899)
@@ -5,9 +5,9 @@
<author>Charles Goodwin</author>
</meta:doc>
- <splitpane redirect="$content">
+ <splitpane redirect="$content" layout="absolute">
<ui:box id="content" />
- <ui:box id="marker" align="topleft" display="false" packed="false"
fill="black" minwidth="2" minheight="2" />
+ <ui:box id="marker" align="topleft" display="false" fill="black"
minwidth="2" minheight="2" />
thisbox.th_marker = $marker;
thisbox.markeroffset = 1;
Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/table.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/table.t
2007-06-28 22:39:04 UTC (rev 1898)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/table.t
2007-07-02 00:23:17 UTC (rev 1899)
@@ -9,21 +9,21 @@
if(lazy) lib.lazytable(thisbox);
else lib.table(thisbox);
</ui:box>
- <ui:box redirect="$content" cols="2">
- <ui:box id="headport" height="0">
- <ui:box id="headview" align="topleft" packed="false"
vshrink="true" />
+ <ui:box redirect="$content" orient="vertical">
+ <ui:box id="headport" height="0" layout="absolute">
+ <ui:box id="headview" align="topleft" vshrink="true" />
$headview.height ++= function(v) { height = v; }
</ui:box>
<ui:box shrink="true" />
- <ui:box id="bodyport" fill="white">
- <ui:box id="bodyview" align="topleft" packed="false"
vshrink="true" />
- <ui:box id="bodyover" align="topleft" packed="false"
vshrink="true" />
+ <ui:box id="bodyport" fill="white" layout="absolute">
+ <ui:box id="bodyview" align="topleft" vshrink="true" />
+ <ui:box id="bodyover" align="topleft" vshrink="true" />
</ui:box>
<scrollbar id="vscroll" orient="vertical" />
- <ui:box id="footport" height="0">
- <ui:box id="footview" align="topleft" packed="false"
vshrink="true" />
+ <ui:box id="footport" height="0" layout="absolute">
+ <ui:box id="footview" align="topleft" vshrink="true" />
$footview.height ++= function(v) { height = v; }
</ui:box>
<ui:box shrink="true" />
Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/textfield.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/textfield.t
2007-06-28 22:39:04 UTC (rev 1898)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/textfield.t
2007-07-02 00:23:17 UTC (rev 1899)
@@ -8,8 +8,8 @@
<lib:widget.textfield />
<bevel redirect="null" fill="white" form="down" margin="3">
<pad padding="3">
- <ui:box id="inset">
- <lib:text.default id="edit" align="left" packed="false"
vshrink="true" />
+ <ui:box id="inset" layout="absolute">
+ <lib:text.default id="edit" align="left" vshrink="true" />
</ui:box>
</pad>
Modified: widgets/trunk/org.vexi.widgets/src/vexi/util/date/monthview.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/vexi/util/date/monthview.t
2007-06-28 22:39:04 UTC (rev 1898)
+++ widgets/trunk/org.vexi.widgets/src/vexi/util/date/monthview.t
2007-07-02 00:23:17 UTC (rev 1899)
@@ -1,7 +1,7 @@
<!-- Copyright 2006 Charles Goodwin -->
<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta"
xmlns:win2k="org.vexi.theme.win2k.image" xmlns="vexi.widget">
- <pad cols="1" fill="black" padding="1">
+ <pad orient="vertical" fill="black" padding="1">
<ui:box fill="white" vshrink="true">
<button id="decmonth" fill="#d4d0c8" hshrink="true" margin="0"
padding="4 2">
<ui:box win2k:fill=".arrowleft" />
Modified: widgets/trunk/org.vexi.widgets/src/vexi/util/fade.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/vexi/util/fade.t 2007-06-28 22:39:04 UTC
(rev 1898)
+++ widgets/trunk/org.vexi.widgets/src/vexi/util/fade.t 2007-07-02 00:23:17 UTC
(rev 1899)
@@ -9,9 +9,9 @@
</meta:doc>
<vexi.util.redirect />
- <ui:box redirect="$content" fill="white">
+ <ui:box redirect="$content" fill="white" layout="absolute">
<ui:box id="content" />
- <ui:box id="overlay" fill="white" packed="false" />
+ <ui:box id="overlay" fill="white" />
addRedirect(thisbox, $content, "font", "fontsize", "text",
"textcolor");
Modified: widgets/trunk/org.vexi.widgets/src/vexi/widget/body.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/vexi/widget/body.t 2007-06-28
22:39:04 UTC (rev 1898)
+++ widgets/trunk/org.vexi.widgets/src/vexi/widget/body.t 2007-07-02
00:23:17 UTC (rev 1899)
@@ -1,3 +1,3 @@
<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta">
- <vexi.theme.body cols="1" v_table_type="body" />
+ <vexi.theme.body orient="vertical" v_table_type="body" />
</vexi>
Modified: widgets/trunk/org.vexi.widgets/src/vexi/widget/foot.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/vexi/widget/foot.t 2007-06-28
22:39:04 UTC (rev 1898)
+++ widgets/trunk/org.vexi.widgets/src/vexi/widget/foot.t 2007-07-02
00:23:17 UTC (rev 1899)
@@ -1,3 +1,3 @@
<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta">
- <ui:box rows="1" v_table_type="foot" />
+ <ui:box v_table_type="foot" />
</vexi>
Modified: widgets/trunk/org.vexi.widgets/src/vexi/widget/head.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/vexi/widget/head.t 2007-06-28
22:39:04 UTC (rev 1898)
+++ widgets/trunk/org.vexi.widgets/src/vexi/widget/head.t 2007-07-02
00:23:17 UTC (rev 1899)
@@ -1,3 +1,3 @@
<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta">
- <vexi.theme.head rows="1" v_table_type="head" />
+ <vexi.theme.head v_table_type="head" />
</vexi>
Modified: widgets/trunk/org.vexi.widgets/src/vexi/widget/row.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/vexi/widget/row.t 2007-06-28
22:39:04 UTC (rev 1898)
+++ widgets/trunk/org.vexi.widgets/src/vexi/widget/row.t 2007-07-02
00:23:17 UTC (rev 1899)
@@ -1,3 +1,3 @@
<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta">
- <ui:box rows="1" v_table_type="foot" />
+ <ui:box v_table_type="foot" />
</vexi>
Modified: widgets/trunk/org.vexi.widgets/src/vexi/widget/scrollbar.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/vexi/widget/scrollbar.t 2007-06-28
22:39:04 UTC (rev 1898)
+++ widgets/trunk/org.vexi.widgets/src/vexi/widget/scrollbar.t 2007-07-02
00:23:17 UTC (rev 1899)
@@ -9,11 +9,11 @@
cases, as you have to manually set up a scrollbar.
To set up a scrollbar, you assign a box to the viewport property
- of the scrollbar. The viewport box should contain a child box
- whose packed property is set to false with align being topleft:
+ of the scrollbar. The viewport box should contain a child box,
+ with align being topleft, and the viewport layout as absolute.
- <ui:box id="vp">
- <ui:box id="c" align="topleft" packed="false" />
+ <ui:box id="vp" layout="absolute">
+ <ui:box id="c" />
</ui:box>
<scrollbar id="s" />
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Vexi-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/vexi-svn
