[Vexi-svn] SF.net SVN: vexi:[4809] branches/vexi3/org.vexi-vapp.calc/src_main/org/vexi /calc/main.t
Revision: 4809
http://sourceforge.net/p/vexi/code/4809
Author: clrg
Date: 2015-08-05 10:26:10 + (Wed, 05 Aug 2015)
Log Message:
---
Fix
Modified Paths:
--
branches/vexi3/org.vexi-vapp.calc/src_main/org/vexi/calc/main.t
Modified: branches/vexi3/org.vexi-vapp.calc/src_main/org/vexi/calc/main.t
===
--- branches/vexi3/org.vexi-vapp.calc/src_main/org/vexi/calc/main.t
2015-07-11 23:25:28 UTC (rev 4808)
+++ branches/vexi3/org.vexi-vapp.calc/src_main/org/vexi/calc/main.t
2015-08-05 10:26:10 UTC (rev 4809)
@@ -1,6 +1,7 @@
-vexi xmlns:ui=vexi://ui xmlns=org.vexi.calc
-xmlns:lay=vexi.layout
-xmlns:wi=vexi.widget
+vexi xmlns:ui=vexi://ui
+ xmlns:wi=vexi.widget
+ xmlns:lay=vexi.layout
+ xmlns=org.vexi.calc
wi:surface /
ui:box framewidth=300 frameheight=300 orient=vertical
titlebar=VexiCalc
@@ -106,10 +107,10 @@
// Keyboard Handling
-surface._KeyPressed ++= function(v) {
+surface.event._KeyPressed ++= function(v) {
if (surface.keymap[v]) surface.keymap[v].action = true;
cascade = v;
}
/ui:box
-/vexi
\ No newline at end of file
+/vexi
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
___
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
[Vexi-svn] SF.net SVN: vexi:[4810] branches/vexi3/org.vexi-vapp.codetutor/src_main/org /vexi/codetutor
Revision: 4810
http://sourceforge.net/p/vexi/code/4810
Author: clrg
Date: 2015-08-05 10:27:35 + (Wed, 05 Aug 2015)
Log Message:
---
Refactor/improve
Modified Paths:
--
branches/vexi3/org.vexi-vapp.codetutor/src_main/org/vexi/codetutor/codeline.t
branches/vexi3/org.vexi-vapp.codetutor/src_main/org/vexi/codetutor/codeview.t
branches/vexi3/org.vexi-vapp.codetutor/src_main/org/vexi/codetutor/linenumber.t
branches/vexi3/org.vexi-vapp.codetutor/src_main/org/vexi/codetutor/main.t
Modified:
branches/vexi3/org.vexi-vapp.codetutor/src_main/org/vexi/codetutor/codeline.t
===
---
branches/vexi3/org.vexi-vapp.codetutor/src_main/org/vexi/codetutor/codeline.t
2015-08-05 10:26:10 UTC (rev 4809)
+++
branches/vexi3/org.vexi-vapp.codetutor/src_main/org/vexi/codetutor/codeline.t
2015-08-05 10:27:35 UTC (rev 4810)
@@ -1,9 +1,5 @@
-vexi xmlns:ui=vexi://ui xmlns:meta=vexi://meta xmlns=vexi
-meta:doc
-authorCharles Goodwin/author
-/meta:doc
-
-ui:box align=left fill=white fontsize=large vshrink=true
+vexi xmlns:ui=vexi://ui xmlns=vexi
+ui:Box align=left fontsize=large vshrink=true
font = .font[VeraMono.ttf];
-/ui:box
+/ui:Box
/vexi
\ No newline at end of file
Modified:
branches/vexi3/org.vexi-vapp.codetutor/src_main/org/vexi/codetutor/codeview.t
===
---
branches/vexi3/org.vexi-vapp.codetutor/src_main/org/vexi/codetutor/codeview.t
2015-08-05 10:26:10 UTC (rev 4809)
+++
branches/vexi3/org.vexi-vapp.codetutor/src_main/org/vexi/codetutor/codeview.t
2015-08-05 10:27:35 UTC (rev 4810)
@@ -1,11 +1,19 @@
-vexi xmlns:ui=vexi://ui xmlns:meta=vexi://meta xmlns=vexi.widget
xmlns:tutor=org.vexi.codetutor
-meta:doc
-authorCharles Goodwin/author
-/meta:doc
+vexi xmlns:ui=vexi://ui
+ xmlns:tutor=org.vexi.codetutor
+ xmlns=vexi.widget
-scrollpane align=top autohide=true
-ui:box id=line orient=vertical shrink=true /
-ui:box id=code orient=vertical vshrink=true /
+scrollpane autohide=true
+ui:Box align=topright fill=#e0e0e0 hshrink=true
+ui:Box id=line minwidth=24 orient=vertical shrink=true
+ui:Box height=3 /
+/ui:Box
+ui:Box width=2 /
+/ui:Box
+ui:Box align=top fill=white orient=vertical
+ui:Box height=3 /
+ui:Box id=code orient=vertical vshrink=true /
+tutor:codeline text=-End of File- textcolor=darkgray /
+/ui:Box
thisbox.tabtext = arguments[1];
@@ -19,18 +27,21 @@
}
{ // constructor
-var s = getStream(arguments[0], vexi[]);
-var samplestr = vexi.stream.utf8reader(s).all;
-var strbyline = samplestr.split('\n');
-var len = strbyline.length;
+const arg0 = arguments[0];
+const f = getStream(arg0, vexi[]);
+const samplestr = vexi.stream.utf8reader(f).all;
+const strbyline = samplestr.split('\n');
+const len = strbyline.length;
for (var i=0; leni; i++) {
-var c = tutor.codeline(vexi.box);
-c.text = strbyline[i];
-$code[i] = c;
-var l = tutor.linenumber(vexi.box);
+const c = new tutor.codeline();
+const t = strbyline[i];
+c.text = t.length ? t : ;
+$code.add(c);
+const l = new tutor.linenumber();
l.text = i;
-$line[i] = l;
+$line.add(l);
}
+location = arg0;
}
/scrollpane
Modified:
branches/vexi3/org.vexi-vapp.codetutor/src_main/org/vexi/codetutor/linenumber.t
===
---
branches/vexi3/org.vexi-vapp.codetutor/src_main/org/vexi/codetutor/linenumber.t
2015-08-05 10:26:10 UTC (rev 4809)
+++
branches/vexi3/org.vexi-vapp.codetutor/src_main/org/vexi/codetutor/linenumber.t
2015-08-05 10:27:35 UTC (rev 4810)
@@ -1,9 +1,5 @@
-vexi xmlns:ui=vexi://ui xmlns:meta=vexi://meta xmlns=vexi
-meta:doc
-authorCharles Goodwin/author
-/meta:doc
-
-ui:box align=right vshrink=true fill=#e0e0e0 fontsize=large
textcolor=darkgray
+vexi xmlns:ui=vexi://ui xmlns=vexi
+ui:Box align=right fontsize=large textcolor=darkgray vshrink=true
font = .font[VeraMono.ttf];
-/ui:box
+/ui:Box
/vexi
\ No newline at end of file
Modified:
branches/vexi3/org.vexi-vapp.codetutor/src_main/org/vexi/codetutor/main.t
===
--- branches/vexi3/org.vexi-vapp.codetutor/src_main/org/vexi/codetutor/main.t
2015-08-05 10:26:10 UTC (rev 4809)
+++
[Vexi-svn] SF.net SVN: vexi:[4811] branches/vexi3/org.vexi-vexi.widgets/src_main/org/ vexi/theme/classic/menu.t
Revision: 4811 http://sourceforge.net/p/vexi/code/4811 Author: clrg Date: 2015-08-05 10:28:29 + (Wed, 05 Aug 2015) Log Message: --- Fix translucent menu edges Modified Paths: -- branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/menu.t Modified: branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/menu.t === --- branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/menu.t 2015-08-05 10:27:35 UTC (rev 4810) +++ branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/menu.t 2015-08-05 10:28:29 UTC (rev 4811) @@ -17,8 +17,8 @@ ui:Box id=icon_pad width=4 display=false shrink=true/ ui:box id=menubox / /lib:layout.pad -bevel id=popbox form=above shrink=true -ui:box id=content orient=vertical fill=:.settings..panefill / +bevel id=popbox fill=:.settings..panefill form=above shrink=true +ui:box id=content orient=vertical / /bevel thisbox.v_popbox = $popbox; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- ___ Vexi-svn mailing list Vexi-svn@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/vexi-svn
[Vexi-svn] SF.net SVN: vexi:[4812] branches/vexi3/org.vexi-vexi.widgets/src_main/org/ vexi/lib/layout/icon.t
Revision: 4812
http://sourceforge.net/p/vexi/code/4812
Author: clrg
Date: 2015-08-05 10:32:57 + (Wed, 05 Aug 2015)
Log Message:
---
Improve icon to accept a stream as well as a string
Modified Paths:
--
branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/lib/layout/icon.t
Modified:
branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/lib/layout/icon.t
===
--- branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/lib/layout/icon.t
2015-08-05 10:28:29 UTC (rev 4811)
+++ branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/lib/layout/icon.t
2015-08-05 10:32:57 UTC (rev 4812)
@@ -38,7 +38,11 @@
if (!trapee.size) {
return;
}
-trapee[0][0].fill = v ? static.getIcon(icon+trapee.size, v) : null;
+// determine whether icon is null, a stream, otherwise
+// assume it is a string reference to look up an icon
+var icon = v==null or typeof(v)==stream ? v
+ : static.getIcon(icon+trapee.size, v);
+trapee[0][0].fill = icon;
}
/** sets the size, in pixels, of this icon */
@@ -94,8 +98,9 @@
static.getIcon = function(subdir, name){
const key = subdir+.+name;
var r = icons[subdir][name];
-if(!r){
-
+if (r==null) {
+ // if the look up fails, then fill in with a
+ // blank icon and output a suitable warning
var msg = [WARNING] icon not found: +subdir+/+name;
vexi.log.warn(new vexi.js.Exception(msg));
if(!listed[subdir]){
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
___
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
