Changeset 52 for trunk/gui/scripts/combobox.tcl

Timestamp:

Sep 7, 2005, 10:03:19 AM (19 years ago)

Author:

mmc

Message:

• Added a back door so we can debug Rappture applications running in the nanoHUB environment.

• Added format and label controls to the axes of an XY plot.

• Added a <molecule><about><emblems> directive, a boolean control indicating whether or not the molecule viewer should show the atom labels by default. If missing or "off", the labels are turned off. To turn labels on by default, this must be set to a boolean true value.

• Fixed the packing bug that was causing tabbed notebooks to be the wrong size (size of last page, rather than max overall size).

• Added -state option to comboboxes, so they can be disabled.

• Added a grab stack, so that when a balloon dialog has the grab and a combobox steals it away, the balloon gets it back.

File:

• trunk/gui/scripts/combobox.tcl (modified) (6 diffs)

trunk/gui/scripts/combobox.tcl

@@ -21 +21 @@
 option add *Combobox.textBackground white widgetDefault
 option add *Combobox.textForeground black widgetDefault
+option add *Combobox.disabledBackground white widgetDefault
+option add *Combobox.disabledForeground gray widgetDefault
 option add *Combobox.font -*-helvetica-medium-r-normal-*-*-120-* widgetDefault
 
@@ -27 +29 @@
 
     itk_option define -editable editable Editable ""
+    itk_option define -state state State "normal"
     itk_option define -width width Width 0
+    itk_option define -disabledbackground disabledBackground DisabledBackground ""
+    itk_option define -disabledforeground disabledForeground DisabledForeground ""
 
     constructor {args} { # defined below }
@@ -37 +42 @@
     protected method _entry {option}
     protected method _dropdown {option}
+    protected method _fixState {}
 
     blt::bitmap define ComboboxArrow {
@@ -175 +181 @@
     switch -- $option {
         apply {
-            if {$itk_option(-editable)} {
+            if {$itk_option(-editable) && $itk_option(-state) == "normal"} {
                 event generate $itk_component(hull) <<Value>>
             }
         }
         click {
-            if {!$itk_option(-editable)} {
+            if {!$itk_option(-editable) && $itk_option(-state) == "normal"} {
                 $itk_component(button) configure -relief sunken
                 update idletasks; after 100
@@ -233 +239 @@
 
 # ----------------------------------------------------------------------
+# USAGE: _fixState
+#
+# Used internally to fix the widget state when the -editable/-state
+# options change.
+# ----------------------------------------------------------------------
+itcl::body Rappture::Combobox::_fixState {} {
+    if {$itk_option(-state) == "normal"} {
+        $itk_component(button) configure -state normal
+        $itk_component(entry) configure \
+            -background $itk_option(-textbackground) \
+            -foreground $itk_option(-textforeground) \
+            -disabledbackground $itk_option(-textbackground) \
+            -disabledforeground $itk_option(-textforeground)
+    } else {
+        $itk_component(button) configure -state disabled
+        $itk_component(entry) configure \
+            -background $itk_option(-disabledbackground) \
+            -foreground $itk_option(-disabledforeground) \
+            -disabledbackground $itk_option(-disabledbackground) \
+            -disabledforeground $itk_option(-disabledforeground)
+    }
+
+    if {$itk_option(-editable)} {
+        if {$itk_option(-state) == "normal"} {
+            $itk_component(entry) configure -state normal
+        } else {
+            $itk_component(entry) configure -state disabled
+        }
+    } else {
+        $itk_component(entry) configure -state disabled
+    }
+
+    if {!$itk_option(-editable) || $itk_option(-state) != "normal"} {
+        # can't keep focus here -- move it along to the next widget
+        if {[focus] == $itk_component(entry)} {
+            focus [tk_focusNext [focus]]
+        }
+    }
+}
+
+# ----------------------------------------------------------------------
 # CONFIGURATION OPTION: -editable
 # ----------------------------------------------------------------------
@@ -239 +286 @@
         error "bad value \"$itk_option(-editable)\": should be boolean"
     }
-    if {$itk_option(-editable)} {
-        $itk_component(entry) configure -state normal
-    } else {
-        $itk_component(entry) configure -state disabled
-        if {[focus] == $itk_component(entry)} {
-            focus [tk_focusNext [focus]]
-        }
-    }
-}
+    _fixState
+}
+
+# ----------------------------------------------------------------------
+# CONFIGURATION OPTION: -state
+# ----------------------------------------------------------------------
+itcl::configbody Rappture::Combobox::state {
+    set valid {normal disabled}
+    if {[lsearch -exact $valid $itk_option(-state)] < 0} {
+        error "bad value \"$itk_option(-state)\": should be [join $valid {, }]"
+    }
+    _fixState
+}