[PD-cvs] pd/src desire.tk,1.1.2.243,1.1.2.244

[chunlee]

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

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
properties_dialog related fixes


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.243
retrieving revision 1.1.2.244
diff -C2 -d -r1.1.2.243 -r1.1.2.244
*** desire.tk	13 Jun 2006 21:21:58 -0000	1.1.2.243
--- desire.tk	13 Jun 2006 23:18:59 -0000	1.1.2.244
***************
*** 2962,2972 ****
  	#clone values	
  	foreach var $fields($class) {
! 		set val $_($of:$var)
  		switch -- $val { empty {set val ""}}
  		if {[regexp -nocase {^([a-z])col$} $var]} {set val [parse_color $val]}
  		set @$var $val
  	}
! 	set @loadbang [expr $@isa & 1]
! 	set @scale [expr ($@isa>>20) & 1]
  	set @class $_($of:class)
  	# the longest label is...
--- 2962,2982 ----
  	#clone values	
  	foreach var $fields($class) {
! 		puts "$var ---------- $_($of:$var)"
! 		switch $var {
! 			is_log {if {$_($of:$var)} {set val "linear"} else { set val "logarithmic"}}
! 			isa {if {$_($of:$var)} {set val "yes"} else { set val "no"}}
! 			steady {if {$_($of:$var)} {set val "jump"} else { set val "steady"}}
! 			fstyle {if {$_($of:$var)} {set val "yes"} else { set val "no"}}
! 			default {set val $_($of:$var); puts "here............."}
! 		}
! 		#set val $_($of:$var)
  		switch -- $val { empty {set val ""}}
  		if {[regexp -nocase {^([a-z])col$} $var]} {set val [parse_color $val]}
  		set @$var $val
  	}
! 	
! 
! 	#set @loadbang [expr $@isa & 1]
! 	#set @scale [expr ($@isa>>20) & 1]
  	set @class $_($of:class)
  	# the longest label is...
***************
*** 2990,2999 ****
  			}
  		isa {
! 			set options [list [say $propertie] [say yes] [say no]]
  			properties_dialog $self .$self iemgui_ok [list $propertie $options choice {}]
  			}
  		n {properties_dialog $self .$self iemgui_ok [list $propertie [say $propertie] integer {-width 4}]}
  		steady {
! 			set options [list [say $propertie] [say jump] [say steady]]
  			properties_dialog $self .$self iemgui_ok [list $propertie $options choice {}]
  			}
--- 3000,3009 ----
  			}
  		isa {
! 			set options [list [say $propertie] [say 1] [say 0]]
  			properties_dialog $self .$self iemgui_ok [list $propertie $options choice {}]
  			}
  		n {properties_dialog $self .$self iemgui_ok [list $propertie [say $propertie] integer {-width 4}]}
  		steady {
! 			set options [list [say $propertie] "jump" "steady"]
  			properties_dialog $self .$self iemgui_ok [list $propertie $options choice {}]
  			}
***************
*** 3004,3008 ****
  		laby {properties_dialog $self .$self iemgui_ok [list $propertie [say $propertie] entry {-width  5}]}
  		fstyle {
! 		set options [list  [say $propertie] "courier (typewriter)" "helvetica (sansserif)" "times (serif)"]
  		properties_dialog $self .$self iemgui_ok [list $propertie $options choice {}]
  		}
--- 3014,3018 ----
  		laby {properties_dialog $self .$self iemgui_ok [list $propertie [say $propertie] entry {-width  5}]}
  		fstyle {
! 		set options [list  [say $propertie] "courier" "helvetica" "times"]
  		properties_dialog $self .$self iemgui_ok [list $propertie $options choice {}]
  		}
***************
*** 4211,4218 ****
  		set m [menu $f.$name -tearoff 0]
  		foreach part [lrange $label 1 end] {
! 			$m add command -label $part -command [list dropmenu_set $f $part]
  			
  		}
! 		label $f.label_set -text "default" -relief raised
  		balloon $f.label_set "click to change setting"
  		pack $f.label $f.label_set -side left
--- 4221,4229 ----
  		set m [menu $f.$name -tearoff 0]
  		foreach part [lrange $label 1 end] {
! 			$m add command -label [say $part] -command [list dropmenu_set $f [say $part]]
  			
  		}
! 		puts "name ________ $name"
! 		label $f.label_set -text [say $_($self:$name)] -relief raised -width 20
  		balloon $f.label_set "click to change setting"
  		pack $f.label $f.label_set -side left
***************
*** 4572,4575 ****
--- 4583,4597 ----
  	set f .$self.1
  	set section 0
+ 	
+ 	foreach {type names} $pdrc_options {
+ 	set label ""
+ 	if {[llength $names] > 1} {
+ 	set label [say [lindex $names 0]]
+ 	} else {
+ 		set label [say $names]
+ 	}
+ 	if {[string length $label] > $@max_label} {set @max_label [string length $label]}	
+ 	}
+ 	puts "max_label:::: $@max_label"
  	foreach {type names} $pdrc_options {
  	  set name [lindex [split $names |] 0]
***************
*** 4579,4583 ****
  	    radio {
  		set babble {}
! 		foreach subname $names {lappend babble [say [lindex [split $subname |] 0]]}
  		puts "babble :::: $babble"
  		properties_dialog $self $f.main.$section ServerPrefsDialog_ok \
--- 4601,4606 ----
  	    radio {
  		set babble {}
! 		#foreach subname $names {lappend babble [say [lindex [split $subname |] 0]]}
! 		foreach subname $names {lappend babble [lindex [split $subname |] 0]}
  		puts "babble :::: $babble"
  		properties_dialog $self $f.main.$section ServerPrefsDialog_ok \
***************
*** 4769,4773 ****
  	foreach {type names} $ddrc_options {
  	set label ""
- 	
  	if {[llength $names] > 1} {
  		foreach name $names {
--- 4792,4795 ----
***************
*** 4777,4781 ****
  		set label [say $names]
  	}
! 	if {[string length $label] > $@max_label} {set @max_label [string length $label]}	
  	}
  	
--- 4799,4803 ----
  		set label [say $names]
  	}
! 	if {[string length $label] > $@max_label} {set @max_label [expr [string length $label] + 20]}	
  	}