Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7801
Modified Files: Tag: impd_0_37 u_main.tk Log Message: ...
Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.1.1.4.2.7.4.38 retrieving revision 1.1.1.4.2.7.4.39 diff -C2 -d -r1.1.1.4.2.7.4.38 -r1.1.1.4.2.7.4.39 *** u_main.tk 10 Apr 2004 19:02:49 -0000 1.1.1.4.2.7.4.38 --- u_main.tk 10 Apr 2004 19:53:11 -0000 1.1.1.4.2.7.4.39 *************** *** 1428,1433 **** set self [string trimleft $id .] global iemgui_define_min_fontsize ! if {$_($self:gn_fs) < $iemgui_define_min_fontsize} { ! set _($self:gn_fs) $iemgui_define_min_fontsize } } --- 1428,1433 ---- set self [string trimleft $id .] global iemgui_define_min_fontsize ! if {$_($self:fs) < $iemgui_define_min_fontsize} { ! set _($self:fs) $iemgui_define_min_fontsize } } *************** *** 1442,1458 **** iemgui_sched_rng $id iemgui_clip_fontsize $id ! if {$_($self:snd) == ""} {set hhhsnd "empty"} {set hhhsnd $_($self:snd)} ! if {$_($self:rcv) == ""} {set hhhrcv "empty"} {set hhhrcv $_($self:rcv)} ! if {$_($self:gui_nam) == ""} {set hhhgui_nam "empty"} {set hhhgui_nam $_($self:gui_nam)} ! if {[string index $hhhsnd 0] == "$"} { set hhhsnd [string replace $hhhsnd 0 0 #] } ! if {[string index $hhhrcv 0] == "$"} { set hhhrcv [string replace $hhhrcv 0 0 #] } ! if {[string index $hhhgui_nam 0] == "$"} { set hhhgui_nam [string replace $hhhgui_nam 0 0 #] } pd "$id dialog \ $_($self:w) $_($self:h) \ $_($self:min_rng) $_($self:max_rng) \ $_($self:lin0_log1) $_($self:loadbang) \ ! $_($self:num) $hhhsnd $hhhrcv $hhhgui_nam \ ! $_($self:gn_dx) $_($self:gn_dy) \ ! $_($self:gn_f) $_($self:gn_fs) \ $_($self:bcol) $_($self:fcol) $_($self:lcol) \ $_($self:steady) ;" --- 1442,1458 ---- iemgui_sched_rng $id iemgui_clip_fontsize $id ! if {$_($self:snd) == ""} {set snd "empty"} {set snd $_($self:snd)} ! if {$_($self:rcv) == ""} {set rcv "empty"} {set rcv $_($self:rcv)} ! if {$_($self:lab) == ""} {set lab "empty"} {set lab $_($self:lab)} ! if {[string index $snd 0] == "$"} { set snd [string replace $snd 0 0 #] } ! if {[string index $rcv 0] == "$"} { set rcv [string replace $rcv 0 0 #] } ! if {[string index $lab 0] == "$"} { set lab [string replace $lab 0 0 #] } pd "$id dialog \ $_($self:w) $_($self:h) \ $_($self:min_rng) $_($self:max_rng) \ $_($self:lin0_log1) $_($self:loadbang) \ ! $_($self:num) $snd $rcv $lab \ ! $_($self:ldx) $_($self:ldy) \ ! $_($self:fstyle) $_($self:fs) \ $_($self:bcol) $_($self:fcol) $_($self:lcol) \ $_($self:steady) ;" *************** *** 1468,1472 **** rng_header min_rng min_rng_label max_rng max_rng_label rng_sched \ lin0_log1 lilo0_label lilo1_label loadbang steady num_label num \ ! snd rcv gui_name gn_dx gn_dy gn_f gn_fs bcol fcol lcol} { global _ set self [string trimleft $id .] --- 1468,1474 ---- rng_header min_rng min_rng_label max_rng max_rng_label rng_sched \ lin0_log1 lilo0_label lilo1_label loadbang steady num_label num \ ! snd rcv lab ldx ldy fstyle fs bcol fcol lcol} { ! ! # snd rcv lab ldx ldy fstyle fs bcol fcol lcol global _ set self [string trimleft $id .] *************** *** 1484,1495 **** switch -- $snd { empty {set snd ""}} switch -- $rcv { empty {set rcv ""}} ! switch -- $gui_name { empty {set gui_name ""}} set _($self:snd) $snd set _($self:rcv) $rcv ! set _($self:gui_nam) $gui_name ! set _($self:gn_dx) $gn_dx ! set _($self:gn_dy) $gn_dy ! set _($self:gn_f) $gn_f ! set _($self:gn_fs) $gn_fs set _($self:bcol) $bcol set _($self:fcol) $fcol --- 1486,1497 ---- switch -- $snd { empty {set snd ""}} switch -- $rcv { empty {set rcv ""}} ! switch -- $lab { empty {set lab ""}} set _($self:snd) $snd set _($self:rcv) $rcv ! set _($self:lab) $lab ! set _($self:ldx) $ldx ! set _($self:ldy) $ldy ! set _($self:fstyle) $fstyle ! set _($self:fs) $fs set _($self:bcol) $bcol set _($self:fcol) $fcol *************** *** 1530,1538 **** if {$snd != "nosndno"} {lappend props snd "send-symbol: " entry {-width 20}} if {$rcv != "norcvno"} {lappend props rcv "receive-symbol: " entry {-width 20}} ! lappend props gui_nam "label: " entry {-width 29} ! lappend props gn_dx "label x offset: " entry {-width 5} ! lappend props gn_dy "label y offset: " entry {-width 5} ! lappend props gn_f {"courier (typewriter)" "helvetica (sansserif)" "times (serif)"} choice {} ! lappend props gn_fs "font size: " entry {-width 5} lappend props bcol "background color" color {} lappend props fcol "foreground color" color {} --- 1532,1540 ---- if {$snd != "nosndno"} {lappend props snd "send-symbol: " entry {-width 20}} if {$rcv != "norcvno"} {lappend props rcv "receive-symbol: " entry {-width 20}} ! lappend props lab "label: " entry {-width 29} ! lappend props ldx "label x offset: " entry {-width 5} ! lappend props ldy "label y offset: " entry {-width 5} ! lappend props fstyle {"courier (typewriter)" "helvetica (sansserif)" "times (serif)"} choice {} ! lappend props fs "font size: " entry {-width 5} lappend props bcol "background color" color {} lappend props fcol "foreground color" color {} *************** *** 2093,2097 ****
proc make_console {} { ! global cmdline set errMsg "" catch { --- 2095,2099 ----
proc make_console {} { ! global cmdline pd_nt set errMsg "" catch { *************** *** 2110,2122 **** pack .log -fill both -expand yes .log.2 set 0.0 1.0 } } errMsg if {[string compare "" $errMsg] != 0} {puts stderr "ERROR: $errMsg"} - global pd_nt - switch $pd_nt { 2 { - bind .log.1 <MouseWheel> { - .log.1 yview scroll [expr -2-abs(%D)/%D] units - } - }} }
--- 2112,2123 ---- pack .log -fill both -expand yes .log.2 set 0.0 1.0 + switch $pd_nt { 2 { + bind .log.1 <MouseWheel> { + .log.1 yview scroll [expr -2-abs(%D)/%D] units + } + }} } } errMsg if {[string compare "" $errMsg] != 0} {puts stderr "ERROR: $errMsg"} }