Changeset 1923 for branches/blt4/gui/scripts/filechoiceentry.tcl

Timestamp:

Oct 18, 2010, 11:59:55 AM (14 years ago)

Author:

gah

Message:

 

File:

• branches/blt4/gui/scripts/filechoiceentry.tcl (modified) (11 diffs)

branches/blt4/gui/scripts/filechoiceentry.tcl

@@ -22 +22 @@
 
     constructor {owner path args} { 
-        # defined below 
+        # defined below 
     }
     destructor { 
-        # defined below 
+        # defined below 
     }
     public method value {args}
@@ -55 +55 @@
 itcl::body Rappture::FileChoiceEntry::constructor {owner path args} {
     if {[catch {$owner isa Rappture::ControlOwner} valid] != 0 || !$valid} {
-        error "bad object \"$owner\": should be Rappture::ControlOwner"
+        error "bad object \"$owner\": should be Rappture::ControlOwner"
     }
     set _owner $owner
@@ -65 +65 @@
     #
     itk_component add choice {
-        Rappture::Combobox $itk_interior.choice -editable no
+        Rappture::Combobox $itk_interior.choice -editable no
     }
     pack $itk_component(choice) -expand yes -fill both
@@ -73 +73 @@
     # for each template found. 
     foreach cname [$_owner xml children -type pattern $_path] {
-        set glob [string trim [$_owner xml get $_path.$cname]]
-        # Successively replace each template with its value.
-        while { [regexp -indices {@@[^@]*@@} $glob range] } {
-            foreach {first last} $range break
-            set i1 [expr $first + 2]
-            set i2 [expr $last  - 2]
-            set cpath [string range $glob $i1 $i2]
-            set value [$_owner xml get $cpath.$cname]
-            set glob [string replace $glob $first $last $value]
-            $_owner notify add $this $cpath [itcl::code $this _whenidle]
-        }
+        set glob [string trim [$_owner xml get $_path.$cname]]
+        # Successively replace each template with its value.
+        while { [regexp -indices {@@[^@]*@@} $glob range] } {
+            foreach {first last} $range break
+            set i1 [expr $first + 2]
+            set i2 [expr $last  - 2]
+            set cpath [string range $glob $i1 $i2]
+            set value [$_owner xml get $cpath.$cname]
+            set glob [string replace $glob $first $last $value]
+            $_owner notify add $this $cpath [itcl::code $this _whenidle]
+        }
     }
     $_owner notify sync
@@ -110 +110 @@
     set i [lsearch -exact $args -check]
     if {$i >= 0} {
-        set onlycheck 1
-        set args [lreplace $args $i $i]
+        set onlycheck 1
+        set args [lreplace $args $i $i]
     }
 
     if {[llength $args] == 1} {
-        if {$onlycheck} {
-            # someday we may add validation...
-            return
-        }
-        set newval [lindex $args 0]
-        if {[info exists _str2val($newval)]} {
-            # this is a label -- use it directly
-            $itk_component(choice) value $newval
-            set newval $_str2val($newval)  ;# report the actual value
-        } else {
-            # this is a value -- search for corresponding label
-            foreach str [array names _str2val] {
-                if {$_str2val($str) == $newval} {
-                    $itk_component(choice) value $str
-                    break
-                }
-            }
-        }
-        return $newval
+        if {$onlycheck} {
+            # someday we may add validation...
+            return
+        }
+        set newval [lindex $args 0]
+        if {[info exists _str2val($newval)]} {
+            # this is a label -- use it directly
+            $itk_component(choice) value $newval
+            set newval $_str2val($newval)  ;# report the actual value
+        } else {
+            # this is a value -- search for corresponding label
+            foreach str [array names _str2val] {
+                if {$_str2val($str) == $newval} {
+                    $itk_component(choice) value $str
+                    break
+                }
+            }
+        }
+        return $newval
 
     } elseif {[llength $args] != 0} {
-        error "wrong # args: should be \"value ?-check? ?newval?\""
+        error "wrong # args: should be \"value ?-check? ?newval?\""
     }
 
@@ -144 +144 @@
     set str [$itk_component(choice) value]
     if {[info exists _str2val($str)]} {
-        return $_str2val($str)
+        return $_str2val($str)
     }
     return $str
@@ -158 +158 @@
     set label [$_owner xml get $_path.about.label]
     if {"" == $label} {
-        set label "Choice"
+        set label "Choice"
     }
     return $label
@@ -196 +196 @@
     set allfiles {}
     foreach cname [$_owner xml children -type pattern $_path] {
-        set glob [string trim [$_owner xml get $_path.$cname]]
-        # Successively replace each template with its value.
-        while { [regexp -indices {@@[^@]*@@} $glob range] } {
-            foreach {first last} $range break
-            set i1 [expr $first + 2]
-            set i2 [expr $last  - 2]
-            set cpath [string range $glob $i1 $i2]
-            set value [$_owner xml get $cpath.current]
-            if { $value == "" } {
-                set value [$_owner xml get $cpath.default]
-            }
-            set glob [string replace $glob $first $last $value]
-        }
-        # Replace the template with the substituted value.
-        set files [glob -nocomplain -type { r f } $glob]
-        set allfiles [concat $allfiles $files]
+        set glob [string trim [$_owner xml get $_path.$cname]]
+        # Successively replace each template with its value.
+        while { [regexp -indices {@@[^@]*@@} $glob range] } {
+            foreach {first last} $range break
+            set i1 [expr $first + 2]
+            set i2 [expr $last  - 2]
+            set cpath [string range $glob $i1 $i2]
+            set value [$_owner xml get $cpath.current]
+            if { $value == "" } {
+                set value [$_owner xml get $cpath.default]
+            }
+            set glob [string replace $glob $first $last $value]
+        }
+        # Replace the template with the substituted value.
+        set files [glob -nocomplain -type { r f } $glob]
+        set allfiles [concat $allfiles $files]
     }
     set first ""
     set tail ""
     foreach file $allfiles {
-        set tail [file tail $file]
-        if { $first == "" } {
-            set first $tail
-        }
-        set tail [file root $tail]
-        $itk_component(choice) choices insert end $file $tail
-        set _str2val($tail) $file
-        set len [string length $tail]
-        if {$len > $max} { set max $len }
+        set tail [file tail $file]
+        if { $first == "" } {
+            set first $tail
+        }
+        set tail [file root $tail]
+        $itk_component(choice) choices insert end $file $tail
+        set _str2val($tail) $file
+        set len [string length $tail]
+        if {$len > $max} { set max $len }
     }
     $itk_component(choice) configure -width $max
@@ -254 +254 @@
     set desc $path
     if {$path == ""} {
-        set desc [$_owner xml get $_path.about.description]
+        set desc [$_owner xml get $_path.about.description]
     }
 
     if {[string length $str] > 0 && [string length $desc] > 0} {
-        append tip "\n\n$str:\n$desc"
+        append tip "\n\n$str:\n$desc"
     }
     return $tip
@@ -269 +269 @@
     set valid {normal disabled}
     if {[lsearch -exact $valid $itk_option(-state)] < 0} {
-        error "bad value \"$itk_option(-state)\": should be [join $valid {, }]"
+        error "bad value \"$itk_option(-state)\": should be [join $valid {, }]"
     }
     $itk_component(choice) configure -state $itk_option(-state)
@@ -276 +276 @@
 itcl::body Rappture::FileChoiceEntry::_whenidle {} {
     if { !$_rebuildPending } {
-        after 10 [itcl::code $this _rebuild]
-        set _rebuildPending 1
-    }
-}
+        after 10 [itcl::code $this _rebuild]
+        set _rebuildPending 1
+    }
+}