[PD-cvs] pd/src desire.tk,1.1.2.309,1.1.2.310

[Mathieu Bouchard]

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

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
added commandline options help and buttonbar tooltips


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.309
retrieving revision 1.1.2.310
diff -C2 -d -r1.1.2.309 -r1.1.2.310
*** desire.tk	10 Aug 2006 01:38:24 -0000	1.1.2.309
--- desire.tk	10 Aug 2006 19:51:17 -0000	1.1.2.310
***************
*** 375,378 ****
--- 375,393 ----
  set files_to_open {}
  
+ proc cmdline_help {} {
+   puts "DesireData commandline options:
+   -serverargs (for future use)
+       -server   select the executable for the pd server
+         -lang   language: english francais deutsch catala ...
+                       ... espanol portugues italiano bokmal
+      -console   set number of scrollback lines in console (0 = disable)
+          -gdb   run pd server through gdb
+        -nogdb   ... or don't
+   -gdbconsole   show gdb output in console
+ -nogdbconsole   ... or don't
+     -valgrind   run pd server through valgrind
+   -novalgrind   ... or don't"
+ }
+ 
  for {set i 0} {$i < $argc} {incr i} {
    global cmdline files_to_open
***************
*** 389,392 ****
--- 404,408 ----
        ^-valgrind\$ {set cmdline(valgrind) 1}
      ^-novalgrind\$ {set cmdline(valgrind) 0}
+     ^-h|-help|--help\$ {cmdline_help; exit 1}
      ^- {puts "ERROR: command line argument: unknown $o"}
      default {lappend files_to_open [lindex $argv $i]}
***************
*** 1226,1230 ****
      toplevel $win -menu $win.m
      # turn buttonbar on/off
!     if {[look buttonbar]} {pack [[ButtonBar new $self] widget] -side top -fill x -expand no}
      set @statusbar [StatusBar new $self]
      # turn statusbar on/off
--- 1242,1251 ----
      toplevel $win -menu $win.m
      # turn buttonbar on/off
!     if {[look buttonbar]} {
! 	if {[catch {pack [[ButtonBar new $self] widget] -side top -fill x -expand no}]} {
! 	    global errorInfo
! 	    post "Can't show ButtonBar: %s" $errorInfo
! 	}
!     }
      set @statusbar [StatusBar new $self]
      # turn statusbar on/off
***************
*** 4443,4464 ****
  
  set butt {
! 	{object  {obj_create %W butt}}
! 	{message {pd %W msg 0}}
! 	{number  {pd %W floatatom 0}}
! 	{symbol  {pd %W symbolatom 0}}
! 	{comment {pd %W text 0}}
! 	{bang    {pd %W bng 0}}
! 	{toggle  {pd %W toggle 0}}
! 	{number2 {pd %W numbox 0}}
! 	{vslider {pd %W vslider 0}}
! 	{hslider {pd %W hslider 0}}
! 	{vradio  {pd %W vradio 0}}
! 	{hradio  {pd %W hradio 0}}
! 	{vu      {pd %W vumeter 0}}
! 	{dropper {pd %W dropper 0}}
! 	{canvas  {pd %W mycnv 0}}
! 	{graph   {pd %W graph}}
! 	{array   {pd %W menuarray 0}}
  }
  
  proc button_bar_add {x y} {
--- 4464,4485 ----
  
  set butt {
! 	{object  obj        {obj_create %W butt}}
! 	{message msg        {pd %W msg 0}}
! 	{number  floatatom  {pd %W floatatom 0}}
! 	{symbol  symbolatom {pd %W symbolatom 0}}
! 	{comment text       {pd %W text 0}}
! 	{bang    bng        {pd %W bng 0}}
! 	{toggle  tgl        {pd %W toggle 0}}
! 	{number2 nbx        {pd %W numbox 0}}
! 	{vslider vsl        {pd %W vslider 0}}
! 	{hslider hsl        {pd %W hslider 0}}
! 	{vradio  vradio     {pd %W vradio 0}}
! 	{hradio  hradio     {pd %W hradio 0}}
! 	{vu      vu         {pd %W vumeter 0}}
! 	{canvas  cnv        {pd %W mycnv 0}}
! 	{graph   graph      {pd %W graph}}
! 	{array   array      {pd %W menuarray 0}}
  }
+ #	{dropper dropper    {pd %W dropper 0}}
  
  proc button_bar_add {x y} {
***************
*** 4469,4484 ****
  proc load_button_bar {} {
  	global butt cmdline
- 	set icons {mode_edit mode_run}
  	set dir $cmdline(icons)
! 	foreach b $butt {
! 		if {[string compare [lindex $b 2] noload]!=0} {
! 			lappend icons [lindex $b 0]
! 		}
  	}
! 	foreach im $icons {
! 		set errMsg {}
! 		if {[catch {image create photo icon_$im -file $dir/$im.gif }]} {
! 			# post_to_gui "ERROR: $errorInfo\n"
! 		}
  	}
  }
--- 4490,4500 ----
  proc load_button_bar {} {
  	global butt cmdline
  	set dir $cmdline(icons)
! 	foreach icon {mode_edit mode_run} {
! 		image create photo icon_$icon -file $dir/$icon.gif
  	}
! 	foreach b $butt {
! 		mset {icon name cmd} $b
! 		image create photo icon_$icon -file $dir/$icon.gif
  	}
  }
***************
*** 4495,4500 ****
  	pack [button $bb.edit -image icon_mode_edit -border 1 -command "$@canvas editmode= 1"] -side left
  	foreach e $butt {
! 	  mset {icon cmd} $e
! 	  catch {pack [button $bb.$icon -image icon_$icon -border 1 -command [regsub -all -- %W $cmd .$@canvas]] -side left}
  	}
  	pack [entry $bb.name -font {courier 9} -width 10 -border 0] -side right
--- 4511,4518 ----
  	pack [button $bb.edit -image icon_mode_edit -border 1 -command "$@canvas editmode= 1"] -side left
  	foreach e $butt {
! 	  mset {icon name cmd} $e
! 	  pack [button $bb.$name -image icon_$icon -border 1 \
! 		-command [regsub -all -- %W $cmd .$@canvas]] -side left
! 	  balloon $bb.$name [say $name]
  	}
  	pack [entry $bb.name -font {courier 9} -width 10 -border 0] -side right