[PD-cvs] pd/src desire.tk,1.1.2.600.2.116,1.1.2.600.2.117

[Mathieu Bouchard]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3488

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
smaller ButtonBar, StatusBar and Client windows.


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.116
retrieving revision 1.1.2.600.2.117
diff -C2 -d -r1.1.2.600.2.116 -r1.1.2.600.2.117
*** desire.tk	19 Dec 2006 19:29:54 -0000	1.1.2.600.2.116
--- desire.tk	19 Dec 2006 20:32:13 -0000	1.1.2.600.2.117
***************
*** 747,761 ****
  	pack $f -side left -pady 0 -padx 0
      }
-     frame .controls.switches
      foreach {w x y z} {
  	    audiobutton audio  ctrls_audio_on {netsend [list pd dsp    $ctrls_audio_on]}
  	    meterbutton meters ctrls_meter_on {netsend [list pd meters $ctrls_meter_on]}
      } {
! 	pack [checkbutton .controls.switches.$w -text [say $x] \
  		-variable $y -anchor w -command $z] -side left
      }
!     pack [button .controls.clear -text [say console_clear] -command {.log.1 delete 0.0 end} -padx 5] -side right
!     pack [button .controls.switches.dio -text [say io_errors] -command {netsend [list pd audiostatus]} -padx 5]
!     pack .controls.switches -side right
      if {$::debug} {
  	    frame .debug
--- 747,760 ----
  	pack $f -side left -pady 0 -padx 0
      }
      foreach {w x y z} {
  	    audiobutton audio  ctrls_audio_on {netsend [list pd dsp    $ctrls_audio_on]}
  	    meterbutton meters ctrls_meter_on {netsend [list pd meters $ctrls_meter_on]}
      } {
! 	pack [checkbutton .controls.$w -text [say $x] \
  		-variable $y -anchor w -command $z] -side left
      }
!     button .controls.clear -text [say console_clear] -command {.log.1 delete 0.0 end}         -padx 2 -pady 2
!     button .controls.dio   -text [say io_errors]     -command {netsend [list pd audiostatus]} -padx 2 -pady 2
!     pack .controls.clear .controls.dio -side right
      if {$::debug} {
  	    frame .debug
***************
*** 765,779 ****
  	    pack .debug -side bottom -fill x
      }
! #    pack [label .debug.1 -anchor w -text ""] -side left
!     #pack [entry .controls.3 -textvariable ::serial -width 5] -side right
!     #pack [label .controls.2 -text "obj.serial: " -justify right] -side right
! #    set @book [Notebook new_as book]
! #    $@book add_section 1 [say posts]
! #    $@book add_section 2 [say socket_log]
! #    pack .book -side top -fill both -expand 1
!     if {$::cmdline(console)} {
! 	#set ::console [Console new .book.main.1.log]
! 	set ::console [Console new .log]
!     }
      . configure -menu .mbar
      wm title . "DesireData"
--- 764,768 ----
  	    pack .debug -side bottom -fill x
      }
!     if {$::cmdline(console)} {set ::console [Console new .log]}
      . configure -menu .mbar
      wm title . "DesireData"
***************
*** 848,851 ****
--- 837,841 ----
  			while {![eof $gdb] && [clock seconds] < $timeout} {
  				set line [gets $gdb]
+ 				if {$line eq ""} {continue} ;# busy-wait
  				regsub {^\(gdb\) ?} $line {} line
  				append where "$line\n"
***************
*** 2806,2811 ****
  def StatusBar addw {a b text args} {
  	set f [$self widget]
! 	if {$text!=""} {eval [concat [list pack [label $f.${a}_l -text $text -font {helvetica -11}] -side left] $args]}
! 	label $f.$a -width $b -font {helvetica -11} -background #cccccc -foreground black -anchor w
  	pack $f.$a -side left
  }
--- 2796,2803 ----
  def StatusBar addw {a b text args} {
  	set f [$self widget]
! 	if {$text!=""} {
! 		eval [concat [list pack [label $f.${a}_l -text $text -font {helvetica -10} -pady 0] -side left] $args]
! 	}
! 	label $f.$a -width $b -font {helvetica -10} -background #cccccc -foreground black -anchor w -pady 0
  	pack $f.$a -side left
  }
***************
*** 5547,5552 ****
  		balloon $bb._$name [say $name]
  	}
! 	pack [entry $bb.name -font {helvetica -12} -width 10 -border 0] -side right
! 	pack [spinbox $bb.scale -width 6 -command "$canvas zooming %d" -state readonly] -side right
  	$bb.scale set [format %d%% [expr int(100*[$@canvas zoom])]]
  	$bb.name insert 0 $@canvas
--- 5539,5544 ----
  		balloon $bb._$name [say $name]
  	}
! 	pack [entry $bb.name -font {helvetica -12} -width 8 -border 0] -side right
! 	pack [spinbox $bb.scale -width 5 -command "$canvas zooming %d" -state readonly] -side right
  	$bb.scale set [format %d%% [expr int(100*[$@canvas zoom])]]
  	$bb.name insert 0 $@canvas
***************
*** 5641,5645 ****
  	$self item TEXT text [list [expr $x+12] $ny] -fill $fg -text $@text -anchor w
  	mset {x1 y1 x2 y2} [l+ [$c bbox ${self}TEXT] [list -4 -4 +4 +4]]
- 	logvar x1 y1 x2 y2
  	switch -- $@type {
  	  o {set coords [list $x1 $y1 [expr $x1+8] $y1 $x $y [expr $x1+16] $y1 $x2 $y1 $x2 $y2 $x1 $y2 $x1 $y1]}
--- 5633,5636 ----
***************
*** 6344,6348 ****
  	if {$@bold  } {lappend @str bold  }
  	if {$@italic} {lappend @str italic}
! 	logvar @str
  	$f.font2.preview.canvas itemconfigure ${self}TEXT -font $@str
  }
--- 6335,6339 ----
  	if {$@bold  } {lappend @str bold  }
  	if {$@italic} {lappend @str italic}
! 	# logvar @str
  	$f.font2.preview.canvas itemconfigure ${self}TEXT -font $@str
  }