Revision: 3171
http://vexi.svn.sourceforge.net/vexi/?rev=3171&view=rev
Author: clrg
Date: 2008-11-04 16:26:12 +0000 (Tue, 04 Nov 2008)
Log Message:
-----------
Fixes to make GUIDE run on it's own [still unusable]
Modified Paths:
--------------
trunk/widgets/org.vexi.guide/src/org/vexi/guide/main.t
trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/pane.t
trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/pane_add.t
trunk/widgets/org.vexi.guide/src/org/vexi/guide/script/pane.t
trunk/widgets/org.vexi.guide/src/org/vexi/guide/script/trap.t
trunk/widgets/org.vexi.guide/src/org/vexi/guide/uioverlay.t
Added Paths:
-----------
trunk/widgets/org.vexi.guide/src/org/vexi/guide/widget/
trunk/widgets/org.vexi.guide/src/org/vexi/guide/widget/panel.t
trunk/widgets/org.vexi.guide/src/org/vexi/guide/widget/toolitem.t
Modified: trunk/widgets/org.vexi.guide/src/org/vexi/guide/main.t
===================================================================
--- trunk/widgets/org.vexi.guide/src/org/vexi/guide/main.t 2008-11-04
13:33:39 UTC (rev 3170)
+++ trunk/widgets/org.vexi.guide/src/org/vexi/guide/main.t 2008-11-04
16:26:12 UTC (rev 3171)
@@ -1,7 +1,7 @@
<!-- Copyright 2008 -- all rights reserved -->
<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta" xmlns="vexi.widget"
- xmlns:i16="vexi.icon.i16">
+ xmlns:guide="org.vexi.guide" xmlns:icon="vexi.icon">
<meta:doc>
<author>Charles Goodwin</author>
</meta:doc>
@@ -9,65 +9,47 @@
<surface />
<ui:box orient="vertical" framewidth="750" frameheight="600">
<toolbar>
- <menu text="Form">
- <menuitem id="menu_save" text="Save" enabled="false"
icon=":i16.filesave" />
- <separator vshrink="true" />
- <menuitem id="menu_delete" text="Delete" icon=":i16.trashcan"
/>
- <separator vshrink="true" />
- <menuitem text="Quit" icon=":i16.exit">
+ <menu text="Application">
+ <menuitem text="Quit"> // icon=":icon.exit">
thisbox.action ++= function(v) { surface.Close = true;
return; }
</menuitem>
</menu>
- <menu text="Edit">
- <menuitem text="Undo" enabled="false" icon=":i16.redo" />
- <menuitem text="Redo" enabled="false" icon=":i16.undo" />
- <separator vshrink="true" />
- <menuitem text="Preferences" enabled="false"
icon=":i16.configure" />
- </menu>
- <ui:box />
- <ui:box fill=":i16.emanate5" shrink="true" />
- <ui:box width="5" />
- <ui:box text="Emanate5 UI Designer" shrink="true" />
- <ui:box width="5" />
</toolbar>
<ui:box height="5" />
- <webit:feedback layout="layer">
- <toolbar align="topleft" form="null">
- <separator hshrink="true" />
- <webit:toolitem id="selectmode" icon="select" text="Select" />
- <webit:toolitem id="saveform" icon="filesave" text="Save" />
- <separator hshrink="true" />
- <ui:box text=" Create: " shrink="true" />
- <webit:toolitem id="autoform" enabled="false"
icon="frame_spreadsheet" text="Auto-Populate" />
- <webit:toolitem id="autolabel" enabled="false"
icon="frame_text" text="Auto-Label" />
- <ui:box />
- </toolbar>
- <tabpane>
- th_head.align = "right";
- <webit:card id="viewlayout" tabicon="frame_edit" tabtext="Edit
Layout">
- <splitpane>
- <splitpane hshrink="true" orient="vertical"
minwidth="250">
- <tabpane>
- <guide:insert.pane id="insert" />
- <guide:field.pane id="fields" />
- </tabpane>
- <tabpane>
- // note: propset must come becore propadd
- // as they interact using the surface obj
- // for which propset sets some properties
- <guide:propset.pane id="propset" />
- <guide:propadd.pane id="propadd" />
- </tabpane>
- </splitpane>
- <ui:box id="holdlayout">
- <guide:board id="board" />
- </ui:box>
+ <toolbar align="topleft" form="null">
+ <separator hshrink="true" />
+ <guide:widget.toolitem id="selectmode" icon="select" text="Select"
/>
+ <guide:widget.toolitem id="saveform" icon="filesave" text="Save" />
+ <separator hshrink="true" />
+ <ui:box text=" Create: " shrink="true" />
+ <guide:widget.toolitem id="autoform" enabled="false"
icon="frame_spreadsheet" text="Auto-Populate" />
+ <guide:widget.toolitem id="autolabel" enabled="false"
icon="frame_text" text="Auto-Label" />
+ <ui:box />
+ </toolbar>
+ <tabpane>
+ th_head.align = "right";
+ <ui:box id="viewlayout" tabtext="Edit Layout">
+ <splitpane>
+ <splitpane hshrink="true" orient="vertical" minwidth="250">
+ <tabpane>
+ <guide:insert.pane id="insert" />
+ </tabpane>
+ <tabpane>
+ // note: propset must come becore propadd
+ // as they interact using the surface obj
+ // for which propset sets some properties
+ <guide:property.pane id="propset" />
+ <guide:property.pane_add id="propadd" />
+ </tabpane>
</splitpane>
- </webit:card>
- <webit:card id="viewactual" tabicon="display" tabtext="View
Actual" />
- <guide:script.pane id="script" />
- </tabpane>
- </webit:feedback>
+ <ui:box id="holdlayout">
+ <guide:board id="board" />
+ </ui:box>
+ </splitpane>
+ </ui:box>
+ <ui:box id="viewactual" tabicon="display" tabtext="View Actual" />
+ <guide:script.pane id="script" />
+ </tabpane>
$propadd.propgroups = $propset.propgroups;
@@ -197,8 +179,8 @@
<label text="Are you sure you want to remove this form?" />
<separator vshrink="true" />
<ui:box>
- <webit:link id="delform_cancel" text="Go back" icon="back" />
- <webit:link id="delform_remove" text="Remove" icon="form"
emblem="delete" />
+ <link id="delform_cancel" text="Go back" icon="back" />
+ <link id="delform_remove" text="Remove" icon="form"
emblem="delete" />
</ui:box>
</ui:box>
Modified: trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/pane.t
===================================================================
--- trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/pane.t
2008-11-04 13:33:39 UTC (rev 3170)
+++ trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/pane.t
2008-11-04 16:26:12 UTC (rev 3171)
@@ -1,6 +1,6 @@
<!-- Copyright 2008 -- all rights reserved -->
-<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta"
xmlns="org.vexi.guide.propset">
+<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta"
xmlns="org.vexi.guide.property">
<meta:doc>
<author>Charles Goodwin</author>
<name>UI Property Listing</name>
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-04 13:33:39 UTC (rev 3170)
+++ trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/pane_add.t
2008-11-04 16:26:12 UTC (rev 3171)
@@ -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">
<meta:doc>
<author>Charles Goodwin</author>
<name>UI Property Listing</name>
Modified: trunk/widgets/org.vexi.guide/src/org/vexi/guide/script/pane.t
===================================================================
--- trunk/widgets/org.vexi.guide/src/org/vexi/guide/script/pane.t
2008-11-04 13:33:39 UTC (rev 3170)
+++ trunk/widgets/org.vexi.guide/src/org/vexi/guide/script/pane.t
2008-11-04 16:26:12 UTC (rev 3171)
@@ -7,13 +7,13 @@
<name>Script manager</name>
</meta:doc>
- <webit:card orient="vertical" tabicon="funct" tabtext="Script">
+ <ui:box orient="vertical" tabtext="Script">
<ui:box vshrink="true">
<script:select id="scripts" />
<separator hshrink="true" />
- <webit:link id="addnew" text="Add New" icon="funct" emblem="add" />
- <webit:link id="saveit" text="Apply All" icon="apply" emblem="run"
/>
- <webit:link id="revert" text="Revert All" icon="undo" />
+ <link id="addnew" text="Add New" icon="funct" emblem="add" />
+ <link id="saveit" text="Apply All" icon="apply" emblem="run" />
+ <link id="revert" text="Revert All" icon="undo" />
</ui:box>
<tabpane id="editors" />
@@ -72,8 +72,8 @@
</lay:grid>
<separator vshrink="true" />
<ui:box>
- <webit:link id="addscript_cancel" text="Go back" icon="back" />
- <webit:link id="addscript_apply" text="Create" icon="add" />
+ <link id="addscript_cancel" text="Go back" icon="back" />
+ <link id="addscript_apply" text="Create" icon="add" />
</ui:box>
</ui:box>
@@ -135,5 +135,5 @@
return;
}
- </webit:card>
+ </ui:box>
</vexi>
\ No newline at end of file
Modified: trunk/widgets/org.vexi.guide/src/org/vexi/guide/script/trap.t
===================================================================
--- trunk/widgets/org.vexi.guide/src/org/vexi/guide/script/trap.t
2008-11-04 13:33:39 UTC (rev 3170)
+++ trunk/widgets/org.vexi.guide/src/org/vexi/guide/script/trap.t
2008-11-04 16:26:12 UTC (rev 3171)
@@ -1,7 +1,8 @@
<!-- Copyright 2008 -- all rights reserved -->
<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta" xmlns="vexi.widget"
- xmlns:lay="vexi.layout">
+ xmlns:lay="vexi.layout"
+ xmlns:webit="webenableit.widget">
<meta:doc>
<author>Charles Goodwin</author>
<name>Script editor</name>
Modified: trunk/widgets/org.vexi.guide/src/org/vexi/guide/uioverlay.t
===================================================================
--- trunk/widgets/org.vexi.guide/src/org/vexi/guide/uioverlay.t 2008-11-04
13:33:39 UTC (rev 3170)
+++ trunk/widgets/org.vexi.guide/src/org/vexi/guide/uioverlay.t 2008-11-04
16:26:12 UTC (rev 3171)
@@ -46,7 +46,7 @@
thisbox.resync = function() {
width = object.width + (object.viewactual ? 10 : 0);
height = object.height + (object.viewactual ? 10 : 0);
- var d = object.parent.distanceto(object);
+ var d = object.parent ? object.parent.distanceto(object) : { x:0,
y:0 };
x = d.x;
y = d.y;
var n = numchildren;
Added: trunk/widgets/org.vexi.guide/src/org/vexi/guide/widget/panel.t
===================================================================
--- trunk/widgets/org.vexi.guide/src/org/vexi/guide/widget/panel.t
(rev 0)
+++ trunk/widgets/org.vexi.guide/src/org/vexi/guide/widget/panel.t
2008-11-04 16:26:12 UTC (rev 3171)
@@ -0,0 +1,17 @@
+<!-- Copyright 2008 WEBenableIT -- all rights reserved -->
+
+<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta" xmlns="vexi.widget">
+ <meta:doc>
+ <author>Charles Goodwin</author>
+ <name>Panel</name>
+ </meta:doc>
+
+ <bevel redirect=":$shade" form="up">
+ <shadepane id="shade" margin="0" orient="vertical" title="Insert
Widgets" titlefill="#00008b" vshrink="false" />
+
+ $shade.shade ++= function(v) { cascade = v; vshrink = v; }
+ thisbox.title ++= function(v) { cascade = v; $shade.title = v; }
+ thisbox.orient ++= function(v) { cascade = v; $shade.orient = v; }
+
+ </bevel>
+</vexi>
\ No newline at end of file
Added: trunk/widgets/org.vexi.guide/src/org/vexi/guide/widget/toolitem.t
===================================================================
--- trunk/widgets/org.vexi.guide/src/org/vexi/guide/widget/toolitem.t
(rev 0)
+++ trunk/widgets/org.vexi.guide/src/org/vexi/guide/widget/toolitem.t
2008-11-04 16:26:12 UTC (rev 3171)
@@ -0,0 +1,22 @@
+<!-- Copyright 2008 WEBenableIT -- all rights reserved -->
+
+<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta" xmlns="vexi.widget"
+ xmlns:i16="uk.co.webenableit.icon16">
+ <meta:doc>
+ <author>Charles Goodwin</author>
+ <name></name>
+ <desc></desc>
+ <usage></usage>
+ </meta:doc>
+
+ <toolitem>
+ <ui:box id="image" shrink="true" />
+ <ui:box width="5" />
+ <ui:box id="text" />
+
+ thisbox.icon ++= function(v) { $image.fill = v ? i16[v] :
i16["filenew"]; cascade = v; }
+ thisbox.enabled ++= function(v) { $text.textcolor = v ? "black" :
"#888888"; cascade = v; }
+ thisbox.text ++= function(v) { $text.text = v; return; }
+
+ </toolitem>
+</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
