Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv422
Modified Files: Tag: devel_0_39 desire.tk Log Message: changed ddrc_options so that its like pdrc_options, which uses the say method
Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.191 retrieving revision 1.1.2.192 diff -C2 -d -r1.1.2.191 -r1.1.2.192 *** desire.tk 25 Apr 2006 13:57:27 -0000 1.1.2.191 --- desire.tk 26 Apr 2006 11:04:52 -0000 1.1.2.192 *************** *** 3351,3355 **** proc iemgui_choose_col {id var title} { set self [string trimleft $id .] ! global _ #set c $_($self:$var) set c 0xFFFFFF --- 3351,3356 ---- proc iemgui_choose_col {id var title} { set self [string trimleft $id .] ! puts "self ::: $self" ! global _ look #set c $_($self:$var) set c 0xFFFFFF *************** *** 3357,3362 **** #set color [tk_chooseColor -title $title \ # -initialcolor [format "#%6.6x" [expr $c&0xFFFFFF]]] ! set color [tk_chooseColor -title $title \ ! -initialcolor [format "#%6.6x" $c]] if {$color != ""} { color_popup_select $self $var [expr [string replace $color 0 0 "0x"]&0xFFFFFF] --- 3358,3362 ---- #set color [tk_chooseColor -title $title \ # -initialcolor [format "#%6.6x" [expr $c&0xFFFFFF]]] ! set color [tk_chooseColor -title $title -initialcolor $title] if {$color != ""} { color_popup_select $self $var [expr [string replace $color 0 0 "0x"]&0xFFFFFF] *************** *** 3394,3402 **** label $f.label -text $label # wtf, %6.6x sometimes gives me _8_ chars !?! ! set c $_($self:$name) ! switch -regexp -- $c { ^# { set c 0x[string trimleft $c #] } } #set c [expr $c & 0xFCFCFC] set c 0xFCFCFC ! button $f.color -text "text" -font {Courier 8} -width 10 -pady 2 \ -command [list iemgui_choose_col $w $name $label] \ -relief sunken -background [format #%6.6x $c] \ --- 3394,3402 ---- label $f.label -text $label # wtf, %6.6x sometimes gives me _8_ chars !?! ! #set c $_($self:$name) ! #switch -regexp -- $c { ^# { set c 0x[string trimleft $c #] } } #set c [expr $c & 0xFCFCFC] set c 0xFCFCFC ! button $f.color -text $look($name) -font {Courier 8} -width 10 -pady 2 \ -command [list iemgui_choose_col $w $name $label] \ -relief sunken -background [format #%6.6x $c] \ *************** *** 3756,3783 ****
set ddrc_options { ! section "" "look" ! subsection "canvas" "canvas" ! color canvasbgedit "canvas background (edit mode)" ! color canvasbgrun "canvas background (run mode)" ! subsection "object" "object" ! color objectframe1 "objectbox color" ! color objectframe2 "objectbox color" ! color objectframe3 "objectbox color" ! color objectframe4 "objectbox highlight color" ! color objectbg "object background" ! color objectfg "object foreground" ! subsection "wire" "wire" ! color wirefg "wire color" ! color wirefg2 "wire highlight" ! color wiredash "wire dash" ! subsection "others" "others" ! color inletfg "inlet color" ! color outletfg "outlet color" ! color selrect "selection box" ! section "" "poo" ! colors "iem" "col" }
- class_new ClientPrefsDialog {PagedDialog} def ClientPrefsDialog cancel {} {$self _delete} --- 3756,3782 ----
set ddrc_options { ! section section_color ! subsection canvas_color ! color canvasbgedit ! color canvasbgrun ! subsection object_color ! color objectframe1 ! color objectframe2 ! color objectframe3 ! color objectframe4 ! color objectbg ! color objectfg ! subsection wire_color ! color wirefg ! color wirefg2 ! color wiredash ! subsection others_color ! color inletfg ! color outletfg ! color selrect ! section test ! colors canvasbgedit }
class_new ClientPrefsDialog {PagedDialog} def ClientPrefsDialog cancel {} {$self _delete} *************** *** 3837,3845 **** set section 0 set subsection 0 ! foreach {type name desc} $ddrc_options { switch $type { void { set type toggle }} switch $type { section { ! $self add_section [incr section] $desc set which_section $f.main.$section set which_self $self --- 3836,3845 ---- set section 0 set subsection 0 ! foreach {type names} $ddrc_options { ! set name [lindex [split $names |] 0] switch $type { void { set type toggle }} switch $type { section { ! $self add_section [incr section] [say $name] set which_section $f.main.$section set which_self $self *************** *** 3850,3854 **** set subself $self.1.main.$section.subsections if {!$subsection} {SubPagedDialog new_as $subself} ! $subself add_section [incr subsection] $name $subself page_select 1 set which_section .$subself.main.$subsection --- 3850,3854 ---- set subself $self.1.main.$section.subsections if {!$subsection} {SubPagedDialog new_as $subself} ! $subself add_section [incr subsection] [say $name] $subself page_select 1 set which_section .$subself.main.$subsection *************** *** 3866,3874 **** # [list [lindex $name 0] "$desc" choice_color {}] properties_dialog $which_self $which_section ClientPrefsDialog_ok client \ ! [list [lindex $name 0] "$desc" choice_color {}] } colors { properties_dialog $which_self $which_section ClientPrefsDialog_ok client \ ! [list [lindex $name 0] "$desc" color {}] } default { --- 3866,3874 ---- # [list [lindex $name 0] "$desc" choice_color {}] properties_dialog $which_self $which_section ClientPrefsDialog_ok client \ ! [list [lindex $name 0] [say $name] choice_color {}] } colors { properties_dialog $which_self $which_section ClientPrefsDialog_ok client \ ! [list [lindex $name 0] [say $name] color {}] } default { *************** *** 3876,3880 **** # [list $name "$name: $desc" $type {}] properties_dialog $which_self $which_section ClientPrefsDialog_ok client \ ! [list $name $desc $type {}] } } --- 3876,3880 ---- # [list $name "$name: $desc" $type {}] properties_dialog $which_self $which_section ClientPrefsDialog_ok client \ ! [list $name [say $name] $type {}] } }