Changeset 3642 for trunk/gui/scripts/spinint.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/spinint.tcl (modified) (4 diffs)

trunk/gui/scripts/spinint.tcl

@@ -18 +18 @@
 option add *Spinint.width 5 widgetDefault
 option add *Spinint.textBackground white widgetDefault
-
-blt::bitmap define Spinint-up {
-#define up_width 8
-#define up_height 4
-static unsigned char up_bits[] = {
-   0x10, 0x38, 0x7c, 0xfe};
-}
-
-blt::bitmap define Spinint-down {
-#define arrow_width 8
-#define arrow_height 4
-static unsigned char arrow_bits[] = {
-   0xfe, 0x7c, 0x38, 0x10};
-}
 
 itcl::class Rappture::Spinint {
@@ -82 +68 @@
 
     itk_component add up {
-        button $itk_component(controls).spinup -bitmap Spinint-up \
+        button $itk_component(controls).spinup \
+            -image [Rappture::icon intplus] \
             -borderwidth 1 -relief raised -highlightthickness 0 \
             -command [itcl::code $this bump up]
@@ -88 +75 @@
         usual
         ignore -borderwidth -highlightthickness
+        rename -background -buttonbackground buttonBackground Background
     }
-    pack $itk_component(up) -side top -expand yes -fill both
+    pack $itk_component(up) -side left -expand yes -fill both
 
     itk_component add down {
-        button $itk_component(controls).spindn -bitmap Spinint-down \
+        button $itk_component(controls).spindn \
+            -image [Rappture::icon intminus] \
             -borderwidth 1 -relief raised -highlightthickness 0 \
             -command [itcl::code $this bump down]
@@ -98 +87 @@
         usual
         ignore -borderwidth -highlightthickness
+        rename -background -buttonbackground buttonBackground Background
     }
-    pack $itk_component(down) -side bottom -expand yes -fill both
+    pack $itk_component(down) -side right -expand yes -fill both
 
     eval itk_initialize $args