pd/src desire.tk,1.1.2.439,1.1.2.440 - Pd-cvs

31 Aug 2006


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1764
Modified Files:
      Tag: devel_0_39
    desire.tk 
Log Message:
removed ClientPrefsDialog write2
localized library list editor and path editor
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.439
retrieving revision 1.1.2.440
diff -C2 -d -r1.1.2.439 -r1.1.2.440
*** desire.tk	31 Aug 2006 19:47:25 -0000	1.1.2.439
--- desire.tk	31 Aug 2006 20:26:04 -0000	1.1.2.440
***************
*** 5010,5021 ****
    			
    			frame $f.b -borderwidth 0
! 				button $f.b.3 -command "$self dir_select $f.a.list" -text "add"    -width 6
! 				button $f.b.4 -command "$self dir_remove $f.a.list" -text "remove" -width 6
! 				button $f.b.5 -command "$self dir_up     $f.a.list" -text "up"     -width 6
! 				button $f.b.6 -command "$self dir_down   $f.a.list" -text "down"   -width 6
! 				balloon $f.b.3 "add a directory using a file dialog"
! 				balloon $f.b.4 "remove directory selected in the list"
! 				balloon $f.b.5 "swap order with previous directory"
! 				balloon $f.b.6 "swap order with next directory"
    			pack $f.b.3 $f.b.4 $f.b.5 $f.b.6 -side top
    			
--- 5010,5021 ----
    			
    			frame $f.b -borderwidth 0
! 				button $f.b.3 -command "$self dir_select $f.a.list" -text [say add]    -width 6
! 				button $f.b.4 -command "$self dir_remove $f.a.list" -text [say remove] -width 6
! 				button $f.b.5 -command "$self dir_up     $f.a.list" -text [say up]     -width 6
! 				button $f.b.6 -command "$self dir_down   $f.a.list" -text [say down]   -width 6
! 				balloon $f.b.3 [say dir_add]
! 				balloon $f.b.4 [say dir_remove]
! 				balloon $f.b.5 [say dir_up]
! 				balloon $f.b.6 [say dir_down]
    			pack $f.b.3 $f.b.4 $f.b.5 $f.b.6 -side top
    			
***************
*** 5050,5061 ****
    			pack  $f.b.entry.add -side left
    			
! 				button $f.b.entry.3 -command "$self lib_add    $f"        -text "add"    -width 6
! 				button $f.b.butts.5 -command "$self dir_up     $f.a.list" -text "up"     -width 4
! 				button $f.b.butts.6 -command "$self dir_down   $f.a.list" -text "down"   -width 4
! 				button $f.b.butts.4 -command "$self dir_remove $f.a.list" -text "remove" -width 6
! 				balloon $f.b.entry.3 "add the name you typed to the list"
! 				balloon $f.b.butts.5 "swap order with previous library"
! 				balloon $f.b.butts.6 "swap order with next library"
! 				balloon $f.b.butts.4 "remove library selected in the list"
    			pack $f.b.entry.3 -side left
    			pack $f.b.butts.5 -side left -padx 3
--- 5050,5061 ----
    			pack  $f.b.entry.add -side left
    			
! 				button $f.b.entry.3 -command "$self lib_add    $f"        -text [say add]    -width 6
! 				button $f.b.butts.5 -command "$self dir_up     $f.a.list" -text [say up]     -width 4
! 				button $f.b.butts.6 -command "$self dir_down   $f.a.list" -text [say down]   -width 4
! 				button $f.b.butts.4 -command "$self dir_remove $f.a.list" -text [say remove] -width 6
! 				balloon $f.b.entry.3 [say lib_add]
! 				balloon $f.b.butts.5 [say lib_up]
! 				balloon $f.b.butts.6 [say lib_down]
! 				balloon $f.b.butts.4 [say lib_remove]
    			pack $f.b.entry.3 -side left
    			pack $f.b.butts.5 -side left -padx 3
***************
*** 5545,5549 ****
    }
    close $fd
! 	set contents [concat [join $contents " "]] ;# concat casts to list type (faster)
    set i 0
    
--- 5545,5549 ----
    }
    close $fd
! 	set contents [concat [join $contents " "]] ;# concat casts to list type (faster) (?)
    set i 0
    
***************
*** 5569,5578 ****
  def ServerPrefsDialog write {} {
    global pdrc_options pdrc_options_h cmdline
! 	set fd [open $cmdline(rcfilename) w]
! 	#set fd stdout; puts "WOULD SAVE:"
    foreach {type names} $pdrc_options {
    	set name [lindex $names 0]
    	#set v $@$name
    	set v $_($self:$name) ;# bug in objective.tcl ?
    	switch $type {
    		folders   {foreach item $v {puts $fd "$name $item"}}
--- 5569,5579 ----
  def ServerPrefsDialog write {} {
    global pdrc_options pdrc_options_h cmdline
! 	#set fd [open $cmdline(rcfilename) w]
! 	set fd stdout; puts "WOULD SAVE:"
    foreach {type names} $pdrc_options {
    	set name [lindex $names 0]
    	#set v $@$name
    	set v $_($self:$name) ;# bug in objective.tcl ?
+ 		puts "_($self:$name) = $v"
    	switch $type {
    		folders   {foreach item $v {puts $fd "$name $item"}}
***************
*** 5584,5589 ****
    	}
    }
! 	close $fd
! 	# puts "THE END"
  }
  def ServerPrefsDialog reset {} {
--- 5585,5590 ----
    	}
    }
! 	#close $fd
! 	puts "THE END"
  }
  def ServerPrefsDialog reset {} {
***************
*** 5831,5888 ****
  }
! def ClientPrefsDialog write2 {} {
! 	global ddrc_options ddrc_options_h cmdline look accels key crosshair
! 	set fd [open $cmdline(ddrcfilename) w]
! 	set check_key {}
! 	#puts "fd ===== $fd"
! 	foreach {type class name} $ddrc_options {
! 		switch $type {
! 			color {
! 				set var ${name}path
! 				set new_color [$@$var cget -background]
! 				set look($name) $new_color 
! 				puts $fd "$type $name $new_color"
! 			}
! 			key {
! 				foreach item $name {
! 					set var ${item}path
! 					set new_key [$@$var get]
! 					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
! 							puts "$new_key ::: $cmd"
! 						}
! 					}
! 					if {[dict exists $check_key $new_key] && $new_key != ""} {
! 						error "$new_key already assigned" 
! 						#dict set check_key $new_key key($item)
! 					} else {dict set check_key $new_key key($item)}
! 					set key($item) $new_key
! 					puts $fd "$type $item $new_key"
! 				}
! 				
! 			}
! 			crosshair {
! 				set crosshair($name) $_($self:$name)
! 				puts $fd "$type $name $crosshair($name)"
! 			}
! 			bar {
! 				set bar($name) $_($self:$name)
! 				puts $fd "$type $name $bar($name)"
! 			}
! 		}
! 	}
! 	close $fd
  }
! def ClientPrefsDialog reset {} {
  }
  def ClientPrefsDialog init {} {
    global ddrc_options look key crosshair bar
    $self read
! 	super reset cancel apply ok
    set f .$self.1
    set section 0
--- 5832,5848 ----
  }
! def ClientPrefsDialog reset {} {
! 	# this should reload defaults.ddrc ?
  }
! def ClientPrefsDialog revert {} {
! 	# this should reload currently used settings ?
  }
+ 
  def ClientPrefsDialog init {} {
    global ddrc_options look key crosshair bar
    $self read
! 	super cancel apply ok
! 	#super cancel reset revert apply ok
    set f .$self.1
    set section 0