Changeset 1652 for branches/blt4

Timestamp:

Feb 3, 2010, 8:25:30 PM (15 years ago)

Author:

gah

Message:

 

Location:

branches/blt4/gui/scripts

Files:

• icons.tcl (modified) (1 diff)
• periodictable.tcl (modified) (5 diffs)
• resultset.tcl (modified) (8 diffs)
• scroller.tcl (modified) (1 diff)

branches/blt4/gui/scripts/icons.tcl

@@ -105 +105 @@
     set img [image create picture]
     $img copy [lindex $args 0]
-    eval $img append [lrange $args 1 end]
-    $img export gif -animated -data bytes -delay $delay
+    eval $img sequence append [lrange $args 1 end]
+    $img export gif -animate -data bytes -delay $delay
     image delete $img
     return $bytes

branches/blt4/gui/scripts/periodictable.tcl

@@ -19 +19 @@
 option add *PeriodicTable.borderwidth 1 widgetDefault
 option add *PeriodicTable.relief flat widgetDefault
-option add *PeriodicTable.font "Arial 8"
+option add *PeriodicTable.font "Arial 6"
 
 itcl::class Rappture::PeriodicTable {
@@ -292 +292 @@
     
 itk::usual PeriodicTable {
-    keep -background -outline -cursor 
+    keep -outline -cursor 
 }
 itk::usual Scrollset {
@@ -310 +310 @@
     }
     itk_component add scroller {
-        blt::scrollset $itk_interior.sc -yscrollmode $itk_interior.sc.ys \
+        blt::scrollset $itk_interior.sc -yscrollbar $itk_interior.sc.ys \
             -window $itk_interior.sc.table
     }
@@ -559 +559 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::PeriodicTable::Redraw {} {
-set sqwidth 24
-set sqheight 24
+    set sqwidth [winfo pixels . 0.22i]
+    set sqheight [winfo pixels . 0.22i]
 set xoffset 4
 set yoffset 4
@@ -586 +586 @@
                 -anchor c -fill $fg \
                 -text [string range $info(symbol) 0 4] \
-                -font "Arial 8 bold" -tags $info(name)-symbol
+                -font "Arial 6" -tags $info(name)-symbol
             $c create text [expr $x2-2] [expr $y1+2] -anchor ne \
                 -text $info(number) -fill $fg \
-                -font "math1 6" -tags $info(name)-number
+                -font "math1 4" -tags $info(name)-number
         }
         $c create rectangle $x1 $y1 $x2 $y2 -outline "" -fill "" \

branches/blt4/gui/scripts/resultset.tcl

@@ +1 @@
+
 # ----------------------------------------------------------------------
 #  COMPONENT: ResultSet - controls for a collection of related results
@@ -219 +220 @@
 
     itk_component add options {
-        Rappture::Scroller $inner.scrl -xscrollmode auto -yscrollmode auto
+        blt::scrollset $inner.scrl \
+            -xscrollbar $inner.scrl.xs \
+            -yscrollbar $inner.scrl.ys \
+            -window $inner.scrl.frame
     }
     pack $itk_component(options) -expand yes -fill both
-
-    set popup [$itk_component(options) contents frame]
-    frame $popup.bg
+    blt::tk::scrollbar $inner.scrl.xs           
+    blt::tk::scrollbar $inner.scrl.ys           
+    itk_component add popup {
+        frame $inner.scrl.frame
+    }
+    frame $itk_component(popup).bg
 
     eval itk_initialize $args
@@ -347 +354 @@
 
     # delete all adjuster controls
-    set popup [$itk_component(options) contents frame]
+    set popup $itk_component(popup)
     set shortlist $itk_component(dials)
     foreach col $_cntlInfo($this-all) {
@@ -679 +686 @@
     }
 
-    set popup [$itk_component(options) contents frame]
+    set popup $itk_component(popup)
     grid columnconfigure $popup 0 -minsize 16
     grid columnconfigure $popup 1 -weight 1
@@ -834 +841 @@
         #
         set id $_cntlInfo($this-$col-id)
-        set popup [$itk_component(options) contents frame]
+        set popup $itk_component(popup)
         set dial $popup.dial$id
 
@@ -883 +890 @@
     array set eventdata $args
 
-    set popup [$itk_component(options) contents frame]
+    set popup $itk_component(popup)
     set shortlist $itk_component(dials)
 
@@ -1295 +1302 @@
         set id $_cntlInfo($this-$col-id)
 
-        set popup [$itk_component(options) contents frame]
+        set popup $itk_component(popup)
         set widget $popup.label$id
         set wmax [winfo width $popup.dial$id]
@@ -1419 +1426 @@
     }
     set id $_cntlInfo($this-$col-id)
-    set popup [$itk_component(options) contents frame]
+    set popup $itk_component(popup)
     set pbutton $popup.all$id
     set current [$pbutton cget -relief]

branches/blt4/gui/scripts/scroller.tcl

@@ -77 +77 @@
         "[itcl::code $this _fixsize]; list"
 
+    itk_component add scrollset {
+        blt::scrollset $itk_interior.ss
+    }
     itk_component add xsbar {
-        scrollbar $itk_interior.xsbar -orient horizontal
+        blt::tk::scrollbar $itk_interior.xsbar -orient horizontal
     }
     itk_component add ysbar {
-        scrollbar $itk_interior.ysbar -orient vertical
+        blt::tk::scrollbar $itk_interior.ysbar -orient vertical
     }