Revision: 3889
http://vexi.svn.sourceforge.net/vexi/?rev=3889&view=rev
Author: clrg
Date: 2010-09-07 10:22:09 +0000 (Tue, 07 Sep 2010)
Log Message:
-----------
Minor update
Modified Paths:
--------------
trunk/widgets/org.vexi.widgets/src/org/vexi/lib/role/surface.t
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/lib/role/surface.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/org/vexi/lib/role/surface.t
2010-09-07 10:14:30 UTC (rev 3888)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/lib/role/surface.t
2010-09-07 10:22:09 UTC (rev 3889)
@@ -8,6 +8,10 @@
<ui:box>
+ // stops warnings about an undeclared property
+ thisbox.theme;
+ thisbox.icons;
+
// the surface object and key components
var s = {};
@@ -82,17 +86,21 @@
* THEME HANDLING
*/
- // stops warnings about an undeclared property
- thisbox.theme;
- // no theme/icons have been specified by the user
- if (theme == null) theme = static.theme;
- // set up the theme/icons redirects
+ if (theme == null) {
+ // no theme has been specified
+ theme = static.theme;
+ }
+ // set up theme redirect
.theme ++= theme;
- // do the same for icons
- thisbox.icons;
- if (icons == null) icons = static.icon;
- if (icons) .icon ++= icons;
+ if (icons == null) {
+ // no icons have been specified
+ icons = static.icon;
+ }
+ if (icons) {
+ // icons specified, set up icons redirect
+ .icon ++= icons;
+ }
// apply the theme surface template
.theme.surface(thisbox);
@@ -112,8 +120,9 @@
themeres = res;
}
if (themeres == null) {
- if (.conf.theme[""]!=null)
+ if (.conf.theme[""]!=null) {
themeres = .conf.theme..location;
+ }
}
var ret = themeres != null ? themeres : vexi..org.vexi.theme.classic;
var str = (""+ret);
@@ -135,8 +144,9 @@
iconres = res;
}
if (iconres == null) {
- if (.conf.icon[""]!=null)
+ if (.conf.icon[""]!=null) {
iconres = .conf.icon..location;
+ }
}
var ret = iconres != null ? iconres : .theme.settings..iconlocation;
var str = (""+ret);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:
Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
