[PD-cvs] pd/src desire.tk,1.1.2.563,1.1.2.564

Mathieu Bouchard matju at users.sourceforge.net
Sun Nov 19 03:19:00 CET 2006


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

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
Fixed several bugs in pdrc editor


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.563
retrieving revision 1.1.2.564
diff -C2 -d -r1.1.2.563 -r1.1.2.564
*** desire.tk	19 Nov 2006 01:46:01 -0000	1.1.2.563
--- desire.tk	19 Nov 2006 02:18:56 -0000	1.1.2.564
***************
*** 6265,6287 ****
  
  	frame $f.b       -borderwidth 0
! 	frame $f.b.entry -borderwidth 0
! 	frame $f.b.butts -borderwidth 0
! 
! 	entry $f.b.entry.add -width 15 -borderwidth 5 -relief ridge
! 	bind  $f.b.entry.add <Return> "$self lib_add $f"
! 	pack  $f.b.entry.add -side left
  
! 	foreach {w      cmd            lab  width padx} {
! 		entry.3 lib_add        add    6   0
! 		butts.4 listbox_up     up     4   3
! 		butts.5 listbox_down   down   4   2
! 		butts.6 listbox_remove remove 6   2
! 	} {
! 		pack [button $f.b.$w -command "$self $cmd $f" -text [say $lab] -width $width] -side left -padx $padx
! 		balloon $f.b.$w [say lib_$lab]
  	}
! 	pack $f.b.entry -side top
! 	pack $f.b.butts -side top
! 	pack $f.b       -side top
  }
  
--- 6265,6277 ----
  
  	frame $f.b       -borderwidth 0
! 	entry $f.b.entry -width 15 -borderwidth 5 -relief ridge
! 	bind  $f.b.entry <Return> "$self lib_add $f.a.list"
! 	pack  $f.b.entry -side top
  
! 	foreach {cmd lab} {lib_add add listbox_remove remove listbox_up up listbox_down down} {
! 		pack [button $f.b.$cmd -command "$self $cmd $f.a.list" -text [say $lab] -width 6] -side top
! 		balloon $f.b.$cmd [say dir_$lab]
  	}
! 	pack $f.b -side top
  }
  
***************
*** 6294,6300 ****
  }
  
  def Dialog lib_add {f} {
  	set listbox $f.a.list
! 	set entry $f.b.entry.add
  	set var [$entry get]
  	if {$var != ""} {$listbox insert end $var}
--- 6284,6297 ----
  }
  
+ # doesn't work with toplevel widget
+ proc upwidget {levels name} {
+ 	set l [split $name .]
+ 	return [join [lrange $l 0 end-$levels] .]
+ }
+ 
  def Dialog lib_add {f} {
+ 	set f [upwidget 2 $f]
  	set listbox $f.a.list
! 	set entry $f.b.entry
  	set var [$entry get]
  	if {$var != ""} {$listbox insert end $var}
***************
*** 6713,6716 ****
--- 6710,6717 ----
  }
  
+ proc pdtk_audio_dialog {args} {
+ 	logvar args
+ }
+ 
  class_new ServerPrefsDialog {PagedDialog}
  def ServerPrefsDialog apply {} {$self write}
***************
*** 6764,6767 ****
--- 6765,6769 ----
  		#{dual -midindev -midioutdev} -mididev
  		mset {type name} $pdrc_options_h($op)
+ 		set name [lindex [split $name "|"] 0]
  		set i [$self read_one $type $name $contents $i]
  	}
***************
*** 6773,6777 ****
  	#set fd stdout; puts "WOULD SAVE:"
  	foreach {type names} $pdrc_options {
! 		set name [lindex $names 0]
  		set v $_($self:$name) ;# bug in objective.tcl ?
  		switch $type {
--- 6775,6779 ----
  	#set fd stdout; puts "WOULD SAVE:"
  	foreach {type names} $pdrc_options {
! 		set name [lindex [split [lindex $names 0] "|"] 0]
  		set v $_($self:$name) ;# bug in objective.tcl ?
  		switch $type {
***************
*** 6799,6806 ****
  	set f .$self.1
  	set section 0
- 
  	set @label_width 200 ;# 24
  	foreach {type names} $pdrc_options {
! 		set name [lindex $names 0]
  		switch $type { void { set type toggle }}
  		switch $type {
--- 6801,6807 ----
  	set f .$self.1
  	set section 0
  	set @label_width 200 ;# 24
  	foreach {type names} $pdrc_options {
! 		set name [lindex [split [lindex $names 0] "|"] 0]
  		switch $type { void { set type toggle }}
  		switch $type {





More information about the Pd-cvs mailing list