Revision: 4582
http://sourceforge.net/p/vexi/code/4582
Author: mkpg2
Date: 2013-11-20 14:12:46 +0000 (Wed, 20 Nov 2013)
Log Message:
-----------
Include vera font package as build dependency.
Update-fix.
Modified Paths:
--------------
branches/vexi3/org.vexi-vapp.viewfont/meta/module.xml
branches/vexi3/org.vexi-vapp.viewfont/src_main/org/vexi/viewfont/main.t
Modified: branches/vexi3/org.vexi-vapp.viewfont/meta/module.xml
===================================================================
--- branches/vexi3/org.vexi-vapp.viewfont/meta/module.xml 2013-11-18
15:36:30 UTC (rev 4581)
+++ branches/vexi3/org.vexi-vapp.viewfont/meta/module.xml 2013-11-20
14:12:46 UTC (rev 4582)
@@ -1,6 +1,7 @@
<ebuild-module ebuild-version="0.8">
<artifact name="vexi.vexi"/>
<dependencies>
+ <dependency source="public" org="org.vexi" name="font.vera"
tag="1.0"/>
<dependency source="local" name="vexi.widgets"/>
<dependency source="local" name="vexi.icons"/>
</dependencies>
Modified:
branches/vexi3/org.vexi-vapp.viewfont/src_main/org/vexi/viewfont/main.t
===================================================================
--- branches/vexi3/org.vexi-vapp.viewfont/src_main/org/vexi/viewfont/main.t
2013-11-18 15:36:30 UTC (rev 4581)
+++ branches/vexi3/org.vexi-vapp.viewfont/src_main/org/vexi/viewfont/main.t
2013-11-20 14:12:46 UTC (rev 4582)
@@ -48,20 +48,20 @@
for (var i=0; n>i; i++) {
var c = $view[i];
c.font = $font.value;
- c.fontsize = $fontsize.value.number;
+ c.fontsize = $fontsize.value;
c.charsize = charsize;
}
$label.font = $font.value;
- $label.fontsize = $fontsize.value.number;
+ $label.fontsize = $fontsize.value;
$text.font = $font.value;
- $text.fontsize = $fontsize.value.number;
+ $text.fontsize = $fontsize.value;
}
$font.value ++= setToType;
$fontsize.value ++= setToType;
// populate fonts
- var fontdir = vexi.params["fontdir"];
+ var fontdir = vexi.params["fontdir"]?:"vexi.font";
if (fontdir == null) throw "Must specify a directory to search for
fonts";
// get font location resource
@@ -82,9 +82,12 @@
for (var k in res)
fontlist.push(k);
fontlist.sort();
+ trace(res);
+ trace(fontlist);
// load fonts in order from res
for (var i,name in fontlist) {
+
// skip irrelevant files
if (name.toLowerCase().indexOf(".ttf")==-1) continue;
// add item to $font option widget
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Shape the Mobile Experience: Free Subscription
Software experts and developers: Be at the forefront of tech innovation.
Intel(R) Software Adrenaline delivers strategic insight and game-changing
conversations that shape the rapidly evolving mobile landscape. Sign up now.
http://pubads.g.doubleclick.net/gampad/clk?id=63431311&iu=/4140/ostg.clktrk
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
