[PD-cvs] pd/src desire.tk,1.1.2.365,1.1.2.366
Mathieu Bouchard
matju at users.sourceforge.net
Fri Aug 18 06:36:07 CEST 2006
Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2845
Modified Files:
Tag: devel_0_39
desire.tk
Log Message:
IEMPropertiesDialog: more fixes
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.365
retrieving revision 1.1.2.366
diff -C2 -d -r1.1.2.365 -r1.1.2.366
*** desire.tk 18 Aug 2006 03:50:42 -0000 1.1.2.365
--- desire.tk 18 Aug 2006 04:36:04 -0000 1.1.2.366
***************
*** 3256,3263 ****
isa {list [list no yes] choice {}}
n {list "" integer {-width 4}}
! steady {list [list jump steady] choice {}}
! snd {list "" entry {-width 20}}
! rcv {list "" entry {-width 20}}
! lab {list "" entry {-width 20}}
ldx {list "" integer {-width 5}}
ldy {list "" integer {-width 5}}
--- 3256,3263 ----
isa {list [list no yes] choice {}}
n {list "" integer {-width 4}}
! steady {list [list steady_no steady_yes] choice {}}
! snd {list "" entry {-width 20}}
! rcv {list "" entry {-width 20}}
! lab {list "" entry {-width 20}}
ldx {list "" integer {-width 5}}
ldy {list "" integer {-width 5}}
***************
*** 3281,3290 ****
super $of
#X coords 0 0 1 1 100 100 1 100 200;
! foreach var {xscale yscale graphme} {set @$var $_($of:$var)}
wm title .$self "[say canvas] [say popup_properties]"
! set props {
! xscale "X units/px: " entry {-width 10}
! yscale "Y units/px: " entry {-width 10}
! }
properties_dialog $self .$self $props
pack [checkbutton .$self.graphme -text "graph on parent" \
--- 3281,3296 ----
super $of
#X coords 0 0 1 1 100 100 1 100 200;
! #foreach var {xscale yscale graphme} {set @$var $_($of:$var)}
wm title .$self "[say canvas] [say popup_properties]"
! #set props {
! # xscale "" entry {-width 10}
! # yscale "" entry {-width 10}
! #}
! "pdtk_canvas_dialog %%s %g %g %d %g %g %g %g %d %d %d %d\n",
! glist_dpixtodx(x, 1), -glist_dpixtody(x, 1),
! 1,
! x->gl_x1, x->gl_y1, x->gl_x2, x->gl_y2,
! (int)x->gl_pixwidth, (int)x->gl_pixheight,
! (int)x->gl_xmargin, (int)x->gl_ymargin);
properties_dialog $self .$self $props
pack [checkbutton .$self.graphme -text "graph on parent" \
***************
*** 3302,3315 ****
def CanvasPropertiesDialog cancel {id} {pd ".$self cancel ;"}
- set properties(gatom) {
- width "width: " entry {-width 4}
- lo "lower limit: " entry {-width 8}
- hi "upper limit: " entry {-width 8}
- label "label: " entry {-width 20}
- wherelabel "show label on: " side {}
- symto "send symbol: " entry {-width 20}
- symfrom "receive symbol: " entry {-width 20}
- }
-
proc gatom_escape {sym} {
if {[string length $sym] == 0} {
--- 3308,3311 ----
***************
*** 3347,3351 ****
wm title .$self "Atom"
global properties
! properties_dialog $self .$self $properties(gatom)
foreach name {hi lo width} {
bind .$self.$name.entry <KeyPress-Return> "$self ok"
--- 3343,3355 ----
wm title .$self "Atom"
global properties
! properties_dialog $self .$self {
! width "" entry {-width 4}
! lo "" entry {-width 8}
! hi "" entry {-width 8}
! label "" entry {-width 20}
! wherelabel "" side {}
! symto "" entry {-width 20}
! symfrom "" entry {-width 20}
! }
foreach name {hi lo width} {
bind .$self.$name.entry <KeyPress-Return> "$self ok"
***************
*** 3364,3376 ****
def GraphPropertiesDialog cancel {} {pd ".$self cancel ;"}
- set properties(graph) {
- x1 "x from: " entry {-width 7}
- x2 "x to: " entry {-width 7}
- xpix "screen width: " entry {-width 7}
- y2 "y from: " entry {-width 7}
- y1 "y to: " entry {-width 7}
- ypix "screen height: " entry {-width 7}
- }
-
def GraphPropertiesDialog init {of} {
super $of
--- 3368,3371 ----
***************
*** 3379,3383 ****
pack [label .$self.label -text "GRAPH BOUNDS"] -side top
global properties
! properties_dialog $self .$self $properties(graph)
#.$self.xrangef.x2 select from 0
#.$self.xrangef.x2 select adjust end
--- 3374,3385 ----
pack [label .$self.label -text "GRAPH BOUNDS"] -side top
global properties
! properties_dialog $self .$self {
! x1 "" entry {-width 7}
! x2 "" entry {-width 7}
! xpix "" entry {-width 7}
! y2 "" entry {-width 7}
! y1 "" entry {-width 7}
! ypix "" entry {-width 7}
! }
#.$self.xrangef.x2 select from 0
#.$self.xrangef.x2 select adjust end
***************
*** 4752,4756 ****
set text ""
set n 0
! foreach item $label {
if {$n != 0} {append text " & " [say $item]} else {set text [say $item]}
incr n
--- 4754,4758 ----
set text ""
set n 0
! foreach item $choices {
if {$n != 0} {append text " & " [say $item]} else {set text [say $item]}
incr n
***************
*** 5139,5143 ****
void -nodac
void -noadc
! radio {audio_api_choice|default|-alsa|-jack|-mmio|-portaudio|-pa|-asio|-oss}
void -32bit
--- 5141,5145 ----
void -nodac
void -noadc
! choice {audio_api_choice default -alsa -jack -mmio -portaudio -pa -asio -oss}
void -32bit
***************
*** 5187,5198 ****
global pdrc_options pdrc_options_h
foreach {type names} $pdrc_options {
! switch $type {
! radio {set name [lindex [split $names |] 0]}
! default {set name [lindex [split $names |] 0]}
! }
set @$name ""
! foreach alias [split $names |] {
! set pdrc_options_h($alias) [list $type $name]
! }
}
}
--- 5189,5195 ----
global pdrc_options pdrc_options_h
foreach {type names} $pdrc_options {
! set name [lindex $names 0]
set @$name ""
! foreach alias $names {set pdrc_options_h($alias) [list $type $name]}
}
}
***************
*** 5220,5224 ****
libraries {incr i; lappend @$name [lindex $contents $i]}
files {incr i; lappend @$name [lindex $contents $i]}
! radio { set @$name [lindex $contents $i]}
void { set @$name 1}
default {incr i; set @$name [lindex $contents $i]}
--- 5217,5221 ----
libraries {incr i; lappend @$name [lindex $contents $i]}
files {incr i; lappend @$name [lindex $contents $i]}
! choice { set @$name [lsearch $name [lindex $contents $i]}
void { set @$name 1}
default {incr i; set @$name [lindex $contents $i]}
***************
*** 5233,5240 ****
#set fd stdout; puts "WOULD SAVE:"
foreach {type names} $pdrc_options {
! switch $type {
! radio {set name [lindex [split $names |] 0]}
! default {set name [lindex [split $names |] 0]}
! }
#set v $@$name
set v $_($self:$name) ;# bug in objective.tcl ?
--- 5230,5234 ----
#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 ?
***************
*** 5243,5249 ****
libraries {foreach item $v {puts $fd "$name $item"}}
#files {foreach item $v {puts $fd "$name $item"}}
! void {if {$v != ""} {if {$v} {puts $fd $name}}}
! radio {if {$v != "" && $v != "default"} {puts $fd "$v"}}
! default {if {[string length $v]} {puts $fd "$name $v"}}
}
}
--- 5237,5243 ----
libraries {foreach item $v {puts $fd "$name $item"}}
#files {foreach item $v {puts $fd "$name $item"}}
! void {if {$v != ""} {if {$v} {puts $fd $name}}}
! choice {if {$v != "" && $v != "default"} {puts $fd "$v"}}
! default {if {[string length $v]} {puts $fd "$name $v"}}
}
}
***************
*** 5271,5288 ****
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]
switch $type { void { set type toggle }}
switch $type {
section {$self add_section [incr section] [say $name]}
! 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 [list $name $names choice {}]
! }
! default {properties_dialog $self $f.main.$section [list $name [say $name] $type {}]}
}
}
--- 5265,5275 ----
if {[string length $label] > $@max_label} {set @max_label [string length $label]}
}
foreach {type names} $pdrc_options {
! set name [lindex $names 0]
switch $type { void { set type toggle }}
switch $type {
section {$self add_section [incr section] [say $name]}
! choice {properties_dialog $self $f.main.$section [list $name [lrange $names 1 end] choice {}]}
! default {properties_dialog $self $f.main.$section [list $name "" $type {}]}
}
}
***************
*** 5356,5360 ****
section others
crosshair hairstate
! crosshair hairsnap
}
--- 5343,5347 ----
section others
crosshair hairstate
! crosshair hairsnap
}
***************
*** 5480,5486 ****
}
alias {}
! radio {
! properties_dialog $self $which_section [list [lindex $name 0] "$desc" choice {}]
! }
color {
set var ${name}path
--- 5467,5471 ----
}
alias {}
! radio {properties_dialog $self $which_section [list [lindex $name 0] "" choice {}]}
color {
set var ${name}path
***************
*** 5488,5492 ****
set @$var $which_section.$name.color
set @$name $look($name)
! properties_dialog $self $which_section [list [lindex $name 0] [say $name] color {}]
}
key {
--- 5473,5477 ----
set @$var $which_section.$name.color
set @$name $look($name)
! properties_dialog $self $which_section [list [lindex $name 0] "" color {}]
}
key {
***************
*** 5496,5500 ****
set @$var $which_section.[string tolower [lindex $name 0]].[string tolower $item]
}
! properties_dialog $self $which_section [list $name $name $type {}]
}
crosshair {
--- 5481,5485 ----
set @$var $which_section.[string tolower [lindex $name 0]].[string tolower $item]
}
! properties_dialog $self $which_section [list $name "" $type {}]
}
crosshair {
***************
*** 5503,5510 ****
set @$var $which_section.$name.color
set @$name $crosshair($name)
! properties_dialog $self $which_section [list [lindex $name 0] [say $name] toggle {}]
}
default {
! properties_dialog $self $which_section [list $name [say $name] $type {}]
}
}
--- 5488,5495 ----
set @$var $which_section.$name.color
set @$name $crosshair($name)
! properties_dialog $self $which_section [list [lindex $name 0] "" toggle {}]
}
default {
! properties_dialog $self $which_section [list $name "" $type {}]
}
}
More information about the Pd-cvs
mailing list