Changeset 3642 for trunk/gui/scripts/gauge.tcl

Timestamp:

May 9, 2013, 11:29:37 AM (11 years ago)

Author:

mmc

Message:

Fixes for nanoHUB ticket #258058 and #258045 -- note within a group tab
doesn't fill out the area properly. Should work better now. Also fixed
tabs to contain the window, instead of floating above the cotents as they
have for a long time.

Fixed boolean controls to have a more obvious on/off switch instead of a
checkbox. Fixed integers and spinners to use larger +/- buttons that are
easier to press on an iPad. Fixed numbers and other gauges to have the
same relief style as entries and other widgets.

Added new layout styles to groups: horizontal, vertical, tabs, and sentence.
You can now explicitly make a layout vertical instead of tabs by setting
the layout to "vertical" instead of throwing in a separator. Updated the
zoo/groups example to show off new horizontal and sentence types.

Fixed the "drawing" example in the zoo to gray out the trapezoid top when
it is disabled.

File:

• trunk/gui/scripts/gauge.tcl (modified) (10 diffs)

trunk/gui/scripts/gauge.tcl

@@ -20 +20 @@
 option add *Gauge.sampleWidth 30 widgetDefault
 option add *Gauge.sampleHeight 20 widgetDefault
+option add *Gauge.borderWidth 2 widgetDefault
+option add *Gauge.relief sunken widgetDefault
 option add *Gauge.valuePosition "right" widgetDefault
 option add *Gauge.textBackground #cccccc widgetDefault
@@ -57 +59 @@
     private variable _value 0  ;# value for this widget
 
-    blt::bitmap define GaugeArrow-up {
-        #define up_width 8
-        #define up_height 4
-        static unsigned char up_bits[] = {
-           0x10, 0x38, 0x7c, 0xfe};
-    }
-    blt::bitmap define GaugeArrow-down {
-        #define arrow_width 8
-        #define arrow_height 4
-        static unsigned char arrow_bits[] = {
-           0xfe, 0x7c, 0x38, 0x10};
-    }
-
     blt::bitmap define GaugeArrow {
         #define arrow_width 9
@@ -87 +76 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Gauge::constructor {args} {
+    itk_option remove hull.borderwidth hull.relief
+    component hull configure -borderwidth 0
+
     itk_component add icon {
         canvas $itk_interior.icon -width 1 -height 1 \
@@ -93 +85 @@
         usual
         ignore -highlightthickness -highlightbackground -highlightcolor
-    }
-    pack $itk_component(icon) -side left
+        ignore -borderwidth -relief
+    }
     bind $itk_component(icon) <Configure> [itcl::code $this _redraw]
 
     itk_component add -protected vframe {
         frame $itk_interior.vframe
+    } {
+        keep -borderwidth -relief
     }
 
     itk_component add value {
-        label $itk_component(vframe).value -borderwidth 1 -width 7 \
-            -textvariable [itcl::scope _value]
+        label $itk_component(vframe).value -width 7 \
+            -borderwidth 1 -relief flat -textvariable [itcl::scope _value]
     } {
         rename -background -textbackground textBackground Background
@@ -146 +140 @@
 
     itk_component add spinup {
-        button $itk_component(spinner).up -bitmap GaugeArrow-up \
+        button $itk_component(spinner).up -image [Rappture::icon intplus] \
             -borderwidth 1 -relief raised -highlightthickness 0 \
             -command [itcl::code $this bump 1]
@@ -152 +146 @@
         usual
         ignore -borderwidth -highlightthickness
-    }
-    pack $itk_component(spinup) -side top -expand yes -fill both
+        rename -background -buttonbackground buttonBackground Background
+    }
+    pack $itk_component(spinup) -side left -expand yes -fill both
 
     itk_component add spindn {
-        button $itk_component(spinner).down -bitmap GaugeArrow-down \
+        button $itk_component(spinner).down -image [Rappture::icon intminus] \
             -borderwidth 1 -relief raised -highlightthickness 0 \
             -command [itcl::code $this bump -1]
@@ -162 +157 @@
         usual
         ignore -borderwidth -highlightthickness
-    }
-    pack $itk_component(spindn) -side bottom -expand yes -fill both
+        rename -background -buttonbackground buttonBackground Background
+    }
+    pack $itk_component(spindn) -side right -expand yes -fill both
 
 
     itk_component add presets {
         button $itk_component(vframe).psbtn -bitmap GaugeArrow \
-            -borderwidth 1 -highlightthickness 0 -relief flat
+            -borderwidth 1 -highlightthickness 0 -relief raised
     } {
         usual
         ignore -borderwidth -relief -highlightthickness
-        rename -background -textbackground textBackground Background
     }
 
@@ -470 +465 @@
         $itk_component($comp) configure -relief solid
     } else {
-        $itk_component($comp) configure -relief flat
+        if {$comp eq "presets"} {
+            $itk_component($comp) configure -relief raised
+        } else {
+            $itk_component($comp) configure -relief flat
+        }
     }
 }
@@ -560 +559 @@
         }
         unpost {
-            $itk_component(presets) configure -relief flat
+            $itk_component(presets) configure -relief raised
         }
         select {
@@ -600 +599 @@
 
     if {"" != $itk_option(-image) || "" != $itk_option(-spectrum)} {
-        pack $itk_component(icon) -side $pos
+        pack $itk_component(icon) -side $pos -padx 2
     }
 }