Revision: 3162
http://vexi.svn.sourceforge.net/vexi/?rev=3162&view=rev
Author: clrg
Date: 2008-11-02 15:13:58 +0000 (Sun, 02 Nov 2008)
Log Message:
-----------
Miscellaneous fixes
Modified Paths:
--------------
trunk/widgets/org.vexi.guide/src/org/vexi/guide/board.t
trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/basic.t
trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/basicitem.t
trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/pane_add.t
trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/scriptid.t
Added Paths:
-----------
trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/item.t
Modified: trunk/widgets/org.vexi.guide/src/org/vexi/guide/board.t
===================================================================
--- trunk/widgets/org.vexi.guide/src/org/vexi/guide/board.t 2008-11-02
15:12:24 UTC (rev 3161)
+++ trunk/widgets/org.vexi.guide/src/org/vexi/guide/board.t 2008-11-02
15:13:58 UTC (rev 3162)
@@ -30,7 +30,6 @@
var insert;
thisbox.enabled = true;
- thisbox.selected = null;
thisbox.viewactual ++= function(v) { cascade = v; $canvas.viewactual =
v; }
thisbox.active;
@@ -130,7 +129,7 @@
if (i.object.visible) {
i.object.overlay.display = true;
i.object.active = false;
- selected = i.object;
+ surf.selected = i.object;
} else {
if (i.object.overlay)
i.object.overlay.thisbox = null;
@@ -140,9 +139,26 @@
}
}
+ /** set selected state on selected uiobject */
+ var surfaceSelectWrite = function(v) {
+ if (v == selected) return;
+ if (surf.selected) surf.selected.selected = false;
+ cascade = v;
+ if (surf.selected) surf.selected.selected = true;
+ }
+
+ var surf;
surface ++= function(v) {
+ if (surf) {
+ surf.insert --= surfaceInsertWrite;
+ surf.selected --= surfaceSelectWrite;
+ }
cascade = v;
- if (surface) surface.insert ++= surfaceInsertWrite;
+ surf = surface;
+ if (surf) {
+ surf.insert ++= surfaceInsertWrite;
+ surf.selected ++= surfaceSelectWrite;
+ }
}
////////
@@ -156,14 +172,6 @@
if (!insert) selectreq = trapee;
}
- /** set selected state on selected uiobject */
- thisbox.selected ++= function(v) {
- if (v == selected) return;
- if (selected) selected.selected = false;
- cascade = v;
- if (selected) selected.selected = true;
- }
-
var dragObject = function(v) {
cascade = v;
if (!enabled) return;
@@ -178,7 +186,7 @@
var selectObject = function(v) {
cascade = v;
- if (selectreq == trapee) selected = trapee.object;
+ if (selectreq == trapee) surf.selected = trapee.object;
trapee.Leave --= dragObject;
trapee.Release1 --= callee;
}
@@ -196,7 +204,7 @@
/** deselect if clicking on the background */
Press1 ++= function(v) {
if (insert) surface.insert = null;
- else selected = null;
+ else surf.selected = null;
return;
}
@@ -294,16 +302,17 @@
switch (v) {
// remove selected object, protecting canvas[0]
case "delete":
- if (selected and selected != $canvas[0]) {
- selected.overlay.thisbox = null;
- selected.thisbox = null;
- selected = null;
+ var s = surf.selected;
+ if (s and s != $canvas[0]) {
+ s.overlay.thisbox = null;
+ s.thisbox = null;
+ s = null;
}
break;
// cancel an insert request, otherwise deselect
case "escape":
if (insert) surface.insert = null;
- else selected = null;
+ else surf.selected = null;
break;
}
}
Modified: trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/basic.t
===================================================================
--- trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/basic.t
2008-11-02 15:12:24 UTC (rev 3161)
+++ trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/basic.t
2008-11-02 15:13:58 UTC (rev 3162)
@@ -1,6 +1,6 @@
<!-- Copyright 2008 -- all rights reserved -->
-<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta"
xmlns="org.vexi.guide.propadd"
+<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta"
xmlns="org.vexi.guide.property"
xmlns:lay="vexi.layout"
xmlns:wi="vexi.widget">
<meta:doc>
@@ -9,8 +9,9 @@
<desc>Lists all or just unmapped properties for a UI Object</desc>
</meta:doc>
+ <item />
<wi:shadepane orient="vertical" title="Unsorted Properties">
- <!--check id="incmapped" text="Include mapped properties" /-->
+ <wi:check id="filtermanaged" text="Filter managed properties" />
<ui:box>
<ui:box hshrink="true" text=" Property:" />
<wi:textfield id="newprop" />
@@ -24,7 +25,7 @@
</lay:pad>
<wi:separator vshrink="true" />
- var accessmap; // created by guide.propset
+ var accessmap;
var proxies = [];
/** creates an arbitrary property list from target.properties */
@@ -34,13 +35,13 @@
if (target) {
for (var k in target.properties) {
//
- if (accessmap[k] and accessmap[k].visible) continue;
+ if ($filtermanaged.selected and accessmap[k] and
accessmap[k].visible) continue;
// at the moment this is all a little complicated because
we are
// using gridproxy so the 'basic' template is not directly
stored
// in the grid, rather it's children are. this forces us
to track
// the template box by maintaining a reference array
(proxies)
if (proxies[i] == null) {
- var b = .basic(vexi.box);
+ var b = .basicitem(vexi.box);
$content[i*2] = b;
proxies[i] = b;
}
@@ -72,7 +73,6 @@
c.target = target;
proxies[$content.numchildren/2] = c;
$content[$content.numchildren] = c;
- vexi.log.info("$addprop: "+c.prop+", "+c.value);
target.setProperty(c.prop, c.value);
}
Modified: trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/basicitem.t
===================================================================
--- trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/basicitem.t
2008-11-02 15:12:24 UTC (rev 3161)
+++ trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/basicitem.t
2008-11-02 15:13:58 UTC (rev 3162)
@@ -10,9 +10,19 @@
<ui:box redirect=":$content">
<ui:box id="content">
<ui:box align="right" id="prop" shrink="true" />
- <textfield id="value" />
+ <ui:box>
+ <textfield id="value" />
+ <ui:box id="close" width="15">
+ <bevel />
+ <ui:box fill=":.image.close" />
+ </ui:box>
+ </ui:box>
</ui:box>
+ $close.Enter ++= function(v) { $close[0].bevel = "thinup"; cascade =
v; }
+ $close.Leave ++= function(v) { $close[0].bevel = null; cascade = v; }
+ $close.Press1 ++= function(v) { thisbox = null; return; }
+
v_gridcontent = $content;
thisbox.prop ++= function(v) { $prop.text = v; cascade = v; }
Added: trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/item.t
===================================================================
--- trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/item.t
(rev 0)
+++ trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/item.t
2008-11-02 15:13:58 UTC (rev 3162)
@@ -0,0 +1,24 @@
+<!-- Copyright 2008 -- all rights reserved -->
+
+<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta">
+ <meta:doc>
+ <author>Charles Goodwin</author>
+ <name>Property Item</name>
+ </meta:doc>
+
+ <ui:box vshrink="true">
+
+ thisbox.target;
+
+ var selectWrite = function(v) { cascade = v; target = v; }
+
+ var surf;
+ surface ++= function(v) {
+ if (surf) surf.selected --= selectWrite;
+ cascade = v;
+ surf = surface;
+ if (surf) surf.insert ++= selectWrite;
+ }
+
+ </ui:box>
+</vexi>
\ No newline at end of file
Modified: trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/pane_add.t
===================================================================
--- trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/pane_add.t
2008-11-02 15:12:24 UTC (rev 3161)
+++ trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/pane_add.t
2008-11-02 15:13:58 UTC (rev 3162)
@@ -22,7 +22,7 @@
</ui:box>
<ui:box height="3" />
<scriptid id="scriptid" />
- <unsorted id="props" />
+ <basic id="props" />
<ui:box />
</ui:box>
<ui:box id="msg" orient="vertical">
Modified: trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/scriptid.t
===================================================================
--- trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/scriptid.t
2008-11-02 15:12:24 UTC (rev 3161)
+++ trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/scriptid.t
2008-11-02 15:13:58 UTC (rev 3162)
@@ -6,7 +6,7 @@
<author>Charles Goodwin</author>
</meta:doc>
- <ui:box propgroup="Standard">
+ <item propgroup="Standard">
<ui:box align="right" shrink="true" text=" Script ID:" />
<wi:textfield id="scriptid" shadowtext="[no script id]" />
@@ -52,5 +52,5 @@
}
}
- </ui:box>
+ </item>
</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.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
