Changeset 2152 for trunk

Timestamp:

Mar 26, 2011, 7:39:07 PM (13 years ago)

Author:

mmc

Message:

Added a new "language" attribute type used for the builder. Fixed some
problems in the image type. Updated the number to include an image
attribute for its icon.

Location:

trunk/lang/tcl/scripts

Files:

• Makefile.in (modified) (1 diff)
• objects.tcl (modified) (4 diffs)
• objects/number/number.rp (modified) (1 diff)
• types/image.tcl (modified) (1 diff)
• types/language.tcl (added)

trunk/lang/tcl/scripts/Makefile.in

@@ -63 +63 @@
                 $(srcdir)/types/file.tcl \
                 $(srcdir)/types/image.tcl \
+                $(srcdir)/types/language.tcl \
                 $(srcdir)/types/string.tcl \
                 $(srcdir)/types/units.tcl

trunk/lang/tcl/scripts/objects.tcl

@@ -217 +217 @@
     # does this object type have a value class?
     if {[catch {$ovclass ::#auto} obj]} {
-puts "OOPS! can't construct: $obj"
         return ""
     }
@@ -225 +224 @@
         return $obj
     }
-puts "OOPS! $result\nin $obj = [$obj info class]\nfrom: $obj import xml $xmlobj $path\n$::errorInfo"
 
     # can't seem to load anything -- return null
@@ -938 +936 @@
         # scan through all matching types and try to import the value
         foreach type [importTypes] {
-puts "checking $type = $pattern"
             if {[string match $pattern $type]} {
                 set cmd [format {eval $this import_%s $args} $type]
-puts "  testing $type = ($cmd)"
                 if {[catch $cmd result] == 0} {
-puts "  success!"
                     return 1
                 }
@@ -949 +944 @@
             }
         }
-puts "  failed: $errs"
         return [concat 0 $errs]
     }

trunk/lang/tcl/scripts/objects/number/number.rp

@@ -22 +22 @@
     attr min -title "Minimum Value" -type string:validate=number -path min
     attr max -title "Maximum Value" -type string:validate=number -path max
+    attr icon -title "Icon" -type image:maxsize=20,rescale=yes -path about.icon
     attr color -title "Color" -type color -path color
 

trunk/lang/tcl/scripts/types/image.tcl

@@ -161 +161 @@
                 } else {
                     if {$_actual eq ""} {
-                        set _actual [image create photo -data $bytes]
+                        set _actual [image create photo -data $data]
                     } else {
-                        $_actual configure -data $bytes
+                        $_actual configure -data $data
                     }
                 }