Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv845
Modified Files:
Tag: desiredata
desire.tk defaults.ddrc
Log Message:
-lang now in ClientPrefsDialog
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.92
retrieving revision 1.1.2.600.2.93
diff -C2 -d -r1.1.2.600.2.92 -r1.1.2.600.2.93
*** desire.tk 15 Dec 2006 01:28:47 -0000 1.1.2.600.2.92
--- desire.tk 15 Dec 2006 14:49:05 -0000 1.1.2.600.2.93
***************
*** 558,561 ****
--- 558,562 ----
#set cmdline(server) \"$cmdline(server)\"
+ set langoptions {english francais deutsh catala espanol portugues italiano norsk chinese}
set langfile locale/[switch -regexp -- $cmdline(lang) {
en|english|C {list english}
***************
*** 4626,4630 ****
}
! def IEMPropertiesDialog dropmenu_open {f name part} {super $f}
def IEMPropertiesDialog dropmenu_set {frame var part val} {
set tmp ${var}list
--- 4627,4631 ----
}
! def IEMPropertiesDialog dropmenu_open {f name} {super $f}
def IEMPropertiesDialog dropmenu_set {frame var part val} {
set tmp ${var}list
***************
*** 5991,5997 ****
! def Dialog add_choice {f name label choices options} {
$self add_stuff $f $name $label
- set v $_($self:$name) ;# bug in poetcl
menu $f.menu -tearoff 0
set i 0
--- 5992,5997 ----
! def Dialog add_choice {f name label choices} {
$self add_stuff $f $name $label
menu $f.menu -tearoff 0
set i 0
***************
*** 6002,6011 ****
}
set trim_name [string trimleft $name "-"]
- if {[lsearch $choices $v] < 0} {set v [lindex $choices 0]}
- #label $f.butt -text [say $v] -relief raised -width 20
label $f.butt -textvariable _($self:${name}2) -relief raised -width 20
balloon $f.butt "click to change setting"
pack $f.label $f.butt -side left
! bind $f.butt <1> [list $self dropmenu_open $f $name $part]
}
--- 6002,6009 ----
}
set trim_name [string trimleft $name "-"]
label $f.butt -textvariable _($self:${name}2) -relief raised -width 20
balloon $f.butt "click to change setting"
pack $f.label $f.butt -side left
! bind $f.butt <1> [list $self dropmenu_open $f $name]
}
***************
*** 6141,6145 ****
balloon $f.butt "click to change setting"
pack $f.label $f.butt -side left
! bind $f.butt <1> [list $self dropmenu_open $f $name $part]
}
--- 6139,6143 ----
balloon $f.butt "click to change setting"
pack $f.label $f.butt -side left
! bind $f.butt <1> [list $self dropmenu_open $f $name]
}
***************
*** 6179,6183 ****
set label "[say $name]: "
set k [lsearch $options -choices]
- #puts " name: $name | type: $type | option: $options | k: $k"
if {$k>=0} {
set choices [lindex $options [expr $k+1]]
--- 6177,6180 ----
***************
*** 6189,6193 ****
side {$self add_side $f $name $label}
color {$self add_color $f $name $label}
! choice {$self add_choice $f $name $label $choices $options}
key {set f $w.[string tolower [lindex $name 0]]
$self add_key $f $name $label}
--- 6186,6190 ----
side {$self add_side $f $name $label}
color {$self add_color $f $name $label}
! choice {$self add_choice $f $name $label $choices}
key {set f $w.[string tolower [lindex $name 0]]
$self add_key $f $name $label}
***************
*** 6790,6794 ****
}
#used by choice and devlist
! def ServerPrefsDialog dropmenu_open {f name part} {
global pd_apilist pd_apilist2 _
set trim_name [string trimleft $name "-"]
--- 6787,6791 ----
}
#used by choice and devlist
! def ServerPrefsDialog dropmenu_open {f name} {
global pd_apilist pd_apilist2 _
set trim_name [string trimleft $name "-"]
***************
*** 6881,6884 ****
--- 6878,6882 ----
toggle Wire wirearrow
integer Client console
+ choice Client lang
}
***************
*** 6913,6917 ****
close $fd
}
!
#this retrives the values set in the editor
def ClientPrefsDialog get_val {} {
--- 6911,6915 ----
close $fd
}
!
#this retrives the values set in the editor
def ClientPrefsDialog get_val {} {
***************
*** 6950,6959 ****
set look($class:$name) $_($self:$var)
}
! font {
! set look(View:font) $@str
! }
! integer {
! set look($class:$name) $@$name
! }
}
}
--- 6948,6954 ----
set look($class:$name) $_($self:$var)
}
! font {set look(View:font) $@str}
! integer {set look($class:$name) $@$name}
! choice {set look($class:$name) $@$name}
}
}
***************
*** 6969,6973 ****
def ClientPrefsDialog init {} {
! global ddrc_options look key bar
$self read
super cancel apply ok
--- 6964,6968 ----
def ClientPrefsDialog init {} {
! global ddrc_options look key langoptions
$self read
super cancel apply ok
***************
*** 7001,7005 ****
}
alias {}
! choice {$self add $which_section [list [lindex $name 0] choice]}
color {
set str [string tolower $class$name]
--- 6996,7006 ----
}
alias {}
! choice {
! if {$name == "lang"} {
! set _($self:${name}2) $look(Client:lang); # textvariable for the button
! set ops $langoptions
! }
! $self add $which_section [list $name choice -choices $ops]
! }
color {
set str [string tolower $class$name]
***************
*** 7043,7046 ****
--- 7044,7056 ----
}
+ def ClientPrefsDialog dropmenu_set {frame var part val} {
+ set @$var $part
+ set _($self:${var}2) $part
+ }
+
+ def ClientPrefsDialog dropmenu_open {f name} {
+ super $f
+ }
+
############ find dialog ###########
Index: defaults.ddrc
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/defaults.ddrc,v
retrieving revision 1.1.2.10.2.8
retrieving revision 1.1.2.10.2.9
diff -C2 -d -r1.1.2.10.2.8 -r1.1.2.10.2.9
*** defaults.ddrc 15 Dec 2006 01:28:49 -0000 1.1.2.10.2.8
--- defaults.ddrc 15 Dec 2006 14:49:07 -0000 1.1.2.10.2.9
***************
*** 2,5 ****
--- 2,6 ----
Client {
console 666
+ lang english
}
Box {