Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3069
Modified Files:
Tag: desiredata
desire.tk defaults.ddrc
Log Message:
some of the changes to language handling (but not all)
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.96
retrieving revision 1.1.2.600.2.97
diff -C2 -d -r1.1.2.600.2.96 -r1.1.2.600.2.97
*** desire.tk 17 Dec 2006 16:40:27 -0000 1.1.2.600.2.96
--- desire.tk 18 Dec 2006 00:03:34 -0000 1.1.2.600.2.97
***************
*** 485,494 ****
proc say {k args} {
! global text leet
if {[llength $args]} {
set text($k) [lindex $args 0]
! } {
if {[info exist text($k)]} {
! if {$leet} {
return [string map -nocase {a 4 e 3 t 7 s 5 i 1 o 0 g 9} $text($k)]
} else {
--- 485,494 ----
proc say {k args} {
! global text
if {[llength $args]} {
set text($k) [lindex $args 0]
! } else {
if {[info exist text($k)]} {
! if {$::leet} {
return [string map -nocase {a 4 e 3 t 7 s 5 i 1 o 0 g 9} $text($k)]
} else {
***************
*** 558,562 ****
set cmdline(gdbconsole) 1
set cmdline(valgrind) 0
! set cmdline(lang) [guess_lang]
set files_to_open {}
--- 558,567 ----
set cmdline(gdbconsole) 1
set cmdline(valgrind) 0
! if {$look(View:language) eq "auto"} {
! set language [guess_lang]
! } else {
! set language $look(View:language)
! }
!
set files_to_open {}
***************
*** 565,571 ****
-serverargs (for future use)
-server select the executable for the pd server
- -lang language: english francais deutsch catala ...
- ... espanol portugues italiano bokmal
- -console set number of scrollback lines in console (0 = disable)
-gdb run pd server through gdb
-manualgdb run gdb in the terminal
--- 570,573 ----
***************
*** 580,585 ****
^-serverargs\$ {error "not supported yet"}
^-server\$ {incr i; set cmdline(server) [lindex $argv $i]}
- ^-lang\$ {incr i; set cmdline(lang) [lindex $argv $i]}
- ^-console\$ {incr i; set cmdline(console) [lindex $argv $i]}
^-gdb\$ {set cmdline(gdb) 1}
^-manualgdb\$ {set cmdline(gdbconsole) 0}
--- 582,585 ----
***************
*** 593,608 ****
#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}
! fr|francais {list francais}
! de|deutsch {list deutsch}
! ca|catala {list catala}
! es|espanol {list espanol}
! pt|portugues {list portugues}
! it|italiano {list italiano}
! nb|norsk|bokmal {list bokmal}
! ch|chinese {list chinese}
! default {error huh??? unknown lang (locale)}
}].tcl
--- 593,608 ----
#set cmdline(server) \"$cmdline(server)\"
! set langoptions {english francais deutsch catala espanol portugues italiano bokmal chinese}
! set langfile locale/[switch -regexp -- $language {
! ^(en|english|C)$ {list english}
! ^(fr|francais)$ {list francais}
! ^(de|deutsch)$ {list deutsch}
! ^(ca|catala)$ {list catala}
! ^(es|espanol)$ {list espanol}
! ^(pt|portugues)$ {list portugues}
! ^(it|italiano)$ {list italiano}
! ^(nb|norsk|bokmal)$ {list bokmal}
! ^(ch|chinese)$ {list chinese}
! default {error "huh??? unknown language (locale)"}
}].tcl
***************
*** 5994,5997 ****
--- 5994,5998 ----
}
set trim_name [string trimleft $name "-"]
+ set _($self:${name}2) [say $@$name]
label $f.butt -textvariable _($self:${name}2) -relief raised -width 20
balloon $f.butt "click to change setting"
***************
*** 6948,6952 ****
def ClientPrefsDialog init {} {
! global ddrc_options look key langoptions
$self read
super cancel apply ok
--- 6949,6953 ----
def ClientPrefsDialog init {} {
! global ddrc_options look key
$self read
super cancel apply ok
***************
*** 6980,6989 ****
}
choice {
! if {$name == "lang"} {
! set @$name $look(Client:lang)
! set _($self:${name}2) $look(Client:lang); # textvariable for the button
! set ops $langoptions
! }
! $self add $which_section [list $name $type -choices $ops]
}
color {
--- 6981,6986 ----
}
choice {
! set @$name $look(View:language)
! $self add $which_section [list $name $type -choices $::langoptions]
}
color {
Index: defaults.ddrc
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/defaults.ddrc,v
retrieving revision 1.1.2.10.2.9
retrieving revision 1.1.2.10.2.10
diff -C2 -d -r1.1.2.10.2.9 -r1.1.2.10.2.10
*** defaults.ddrc 15 Dec 2006 14:49:07 -0000 1.1.2.10.2.9
--- defaults.ddrc 18 Dec 2006 00:03:36 -0000 1.1.2.10.2.10
***************
*** 1,6 ****
look {
Client {
console 666
- lang english
}
Box {
--- 1,11 ----
look {
+ TextBox {
+ bgedit #ffffff
+ }
+ View {
+ language english
+ }
Client {
console 666
}
Box {