[PD-cvs] pd/src desire.tk,1.1.2.216,1.1.2.217

[chunlee]

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

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
key binding editor mostly done...


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.216
retrieving revision 1.1.2.217
diff -C2 -d -r1.1.2.216 -r1.1.2.217
*** desire.tk	2 Jun 2006 01:09:43 -0000	1.1.2.216
--- desire.tk	2 Jun 2006 21:10:05 -0000	1.1.2.217
***************
*** 3855,3859 ****
  		set f $w.[string tolower [lindex $name 0]]
  		frame $f
! 		pack [label $f.label -text $label] -side left
  		#balloon $f.label $name
  		foreach item $name {
--- 3855,3865 ----
  		set f $w.[string tolower [lindex $name 0]]
  		frame $f
! 		set text ""
! 		set n 0
! 		foreach item $label { 
! 		if {$n != 0} {append text " & " [say $item]} else { set text [say $item]}
! 		incr n
! 		}
! 		pack [label $f.label -text $text] -side left
  		#balloon $f.label $name
  		foreach item $name {
***************
*** 4242,4245 ****
--- 4248,4272 ----
    key Canvas
    key Array
+  subsection edit
+   key {cut copy}
+   key {undo redo}
+   key paste
+   key select_all
+   key {reload redraw}
+   key editmodeswitch 
+  subsection general
+   key Pdwindow 
+   key new_file
+   key open_file
+   key {save save_as}
+   key {pdrc_editor ddrc_editor}
+   key paths
+   key {close quit}
+   key {find find_again}
+   key {audio_on audio_off}
+   key {audio_settings midi_settings}
+   key test_audio_and_midi
+   key {load_meter latency_meter}
+   key about
  }
  
***************
*** 4259,4263 ****
  			foreach item $subname {
  			set ddrc_options_h($item) [list $type $name]
- 			puts "$item:$type:$item"
  			}
  		}
--- 4286,4289 ----
***************
*** 4302,4305 ****
--- 4328,4332 ----
  	global ddrc_options ddrc_options_h cmdline look accels key
  	set fd [open $cmdline(ddrcfilename) w]
+ 	set check_key {}
  	#puts "fd ===== $fd"
  	foreach {type name} $ddrc_options {
***************
*** 4324,4333 ****
  				set old_key $key($item)
  				if {$key($item) != $new_key} {
! 				if {[dict exists $accels $old_key]} {
! 				set cmd [dict get $accels $old_key]
! 				set accels [dict remove $accels $old_key]
! 				dict set accels $new_key $cmd
! 				}
  				}
  				set key($item) $new_key
  				puts $fd "$type $item $new_key"
--- 4351,4362 ----
  				set old_key $key($item)
  				if {$key($item) != $new_key} {
! 					if {[dict exists $accels $old_key]} {
! 					set cmd [dict get $accels $old_key]
! 					set accels [dict remove $accels $old_key]
! 					dict set accels $new_key $cmd
! 					}
  				}
+ 				if {[dict exists $check_key $new_key]} {
+ 				error "$new_key already assigned" } else {dict set check_key $new_key key($item)}
  				set key($item) $new_key
  				puts $fd "$type $item $new_key"