Pd-cvs February 2009

pd-cvs@lists.iem.at

18 participants
170 discussions

autobuild: pd-devel macosx105-i386 2009-02-03 01.00.34
by pd＠macosx105-i386.idmi.poly.edu 03 Feb '09

03 Feb '09

allhammers.c:75: error: previous declaration of 'universal_setup' was here allhammers.c:156: error: conflicting types for 'urn_setup' allhammers.c:76: error: previous declaration of 'urn_setup' was here allhammers.c:157: error: conflicting types for 'xbendin_setup' allhammers.c:77: error: previous declaration of 'xbendin_setup' was here allhammers.c:158: error: conflicting types for 'xbendin2_setup' allhammers.c:78: error: previous declaration of 'xbendin2_setup' was here allhammers.c:159: error: conflicting types for 'xbendout_setup' allhammers.c:79: error: previous declaration of 'xbendout_setup' was here allhammers.c:160: error: conflicting types for 'xbendout2_setup' allhammers.c:80: error: previous declaration of 'xbendout2_setup' was here allhammers.c:161: error: conflicting types for 'xnotein_setup' allhammers.c:81: error: previous declaration of 'xnotein_setup' was here allhammers.c:162: error: conflicting types for 'xnoteout_setup' allhammers.c:82: error: previous declaration of 'xnoteout_setup' was here allhammers.c:163: error: conflicting types for 'zl_setup' allhammers.c:83: error: previous declaration of 'zl_setup' was here allhammers.c:164: error: syntax error before '}' token rsync error: errors selecting input/output files, dirs (code 3) at main.c(565) [receiver=2.6.9] rsync error: error in rsync protocol data stream (code 12) at /SourceCache/rsync/rsync-35.2/rsync/io.c(452) [sender=2.6.9] the full logfile - if it has been succesfully uploaded - can be viewed at: http://autobuild.puredata.info/auto-build/2009-02-03/logs/2009-02-03_01.00.…

1 0

SF.net SVN: pure-data:[10723] branches/pd-devel/0.41.4/src
by eighthave＠users.sourceforge.net 03 Feb '09

03 Feb '09

Revision: 10723 http://pure-data.svn.sourceforge.net/pure-data/?rev=10723&view=rev Author: eighthave Date: 2009-02-03 05:45:42 +0000 (Tue, 03 Feb 2009) Log Message: ----------- renamed things inside gatom and pd_iemgui to follow the new attempt at a panel naming scheme; also, renamed $id to $mytoplevel in iemgui to match the rest of the code Modified Paths: -------------- branches/pd-devel/0.41.4/src/gatom_panel.tcl branches/pd-devel/0.41.4/src/iemgui_panel.tcl branches/pd-devel/0.41.4/src/pd.tk branches/pd-devel/0.41.4/src/pkgIndex.tcl Modified: branches/pd-devel/0.41.4/src/gatom_panel.tcl =================================================================== --- branches/pd-devel/0.41.4/src/gatom_panel.tcl 2009-02-03 05:40:41 UTC (rev 10722) +++ branches/pd-devel/0.41.4/src/gatom_panel.tcl 2009-02-03 05:45:42 UTC (rev 10723) @@ -1,9 +1,9 @@ -package provide gatom 0.1 +package provide gatom_panel 0.1 package require wheredoesthisgo -namespace eval ::gatom:: { +namespace eval ::gatom_panel:: { namespace export pdtk_gatom_dialog } @@ -22,7 +22,7 @@ # [eval concat $$variablename]. There should be an easier way but I don't see # it yet. -proc ::gatom::escape {sym} { +proc ::gatom_panel::escape {sym} { if {[string length $sym] == 0} { set ret "-" } else { @@ -35,7 +35,7 @@ return [unspace_text $ret] } -proc ::gatom::unescape {sym} { +proc ::gatom_panel::unescape {sym} { if {[string equal -length 1 $sym "-"]} { set ret [string replace $sym 0 0 ""] } else { @@ -47,29 +47,29 @@ proc gatom_apply {mytoplevel} { # TODO kludge!! until a common approach to ::pd_bindings::panel_bindings # is sorted out - ::gatom::apply $mytoplevel + ::gatom_panel::apply $mytoplevel } -proc ::gatom::apply {mytoplevel} { +proc ::gatom_panel::apply {mytoplevel} { global gatomlabel_position pdsend "$mytoplevel param \ [$mytoplevel.width.entry get] \ [$mytoplevel.limits.lower.entry get] \ [$mytoplevel.limits.upper.entry get] \ - [::gatom::escape [$mytoplevel.gatomlabel.name.entry get]] \ + [::gatom_panel::escape [$mytoplevel.gatomlabel.name.entry get]] \ $gatomlabel_position($mytoplevel) \ - [::gatom::escape [$mytoplevel.s_r.send.entry get]] \ - [::gatom::escape [$mytoplevel.s_r.receive.entry get]]" + [::gatom_panel::escape [$mytoplevel.s_r.send.entry get]] \ + [::gatom_panel::escape [$mytoplevel.s_r.receive.entry get]]" } proc gatom_cancel {mytoplevel} { # TODO kludge!! until a common approach to ::pd_bindings::panel_bindings # is sorted out - ::gatom::cancel $mytoplevel + ::gatom_panel::cancel $mytoplevel } -proc ::gatom::cancel {mytoplevel} { +proc ::gatom_panel::cancel {mytoplevel} { pdsend "$mytoplevel cancel" } @@ -77,15 +77,15 @@ proc gatom_ok {mytoplevel} { # TODO kludge!! until a common approach to ::pd_bindings::panel_bindings # is sorted out - ::gatom::ok $mytoplevel + ::gatom_panel::ok $mytoplevel } -proc ::gatom::ok {mytoplevel} { - ::gatom::apply $mytoplevel - ::gatom::cancel $mytoplevel +proc ::gatom_panel::ok {mytoplevel} { + ::gatom_panel::apply $mytoplevel + ::gatom_panel::cancel $mytoplevel } # set up the panel with the info from pd -proc ::gatom::pdtk_gatom_dialog {mytoplevel initwidth initlower initupper \ +proc ::gatom_panel::pdtk_gatom_dialog {mytoplevel initwidth initlower initupper \ initgatomlabel_position \ initgatomlabel initsend initreceive} { global gatomlabel_position @@ -113,7 +113,7 @@ } } -proc ::gatom::create_panel {mytoplevel} { +proc ::gatom_panel::create_panel {mytoplevel} { global gatomlabel_position toplevel $mytoplevel -background $::panel_background @@ -124,7 +124,7 @@ #wm attributes $mytoplevel -transparent 1 #$mytoplevel configure -highlightthickness 1 } - wm protocol $mytoplevel WM_DELETE_WINDOW "::gatom::cancel $mytoplevel" + wm protocol $mytoplevel WM_DELETE_WINDOW "::gatom_panel::cancel $mytoplevel" ::pd_bindings::panel_bindings $mytoplevel "gatom" @@ -200,13 +200,13 @@ frame $mytoplevel.buttonframe -pady 5 -background $::panel_background pack $mytoplevel.buttonframe -side top -fill x -pady 2m button $mytoplevel.buttonframe.cancel -text {Cancel} \ - -command "::gatom::cancel $mytoplevel" -highlightbackground $::panel_background + -command "::gatom_panel::cancel $mytoplevel" -highlightbackground $::panel_background pack $mytoplevel.buttonframe.cancel -side left -expand 1 button $mytoplevel.buttonframe.apply -text {Apply} \ - -command "::gatom::apply $mytoplevel" -highlightbackground $::panel_background + -command "::gatom_panel::apply $mytoplevel" -highlightbackground $::panel_background pack $mytoplevel.buttonframe.apply -side left -expand 1 button $mytoplevel.buttonframe.ok -text {OK} \ - -command "::gatom::ok $mytoplevel" -highlightbackground $::panel_background + -command "::gatom_panel::ok $mytoplevel" -highlightbackground $::panel_background pack $mytoplevel.buttonframe.ok -side left -expand 1 $mytoplevel.width.entry select from 0 Modified: branches/pd-devel/0.41.4/src/iemgui_panel.tcl =================================================================== --- branches/pd-devel/0.41.4/src/iemgui_panel.tcl 2009-02-03 05:40:41 UTC (rev 10722) +++ branches/pd-devel/0.41.4/src/iemgui_panel.tcl 2009-02-03 05:45:42 UTC (rev 10723) @@ -2,9 +2,9 @@ # WARRANTIES, see the file, "LICENSE.txt," in this distribution. # Copyright (c) 1997-2009 Miller Puckette. -package provide pd_iemgui 0.1 +package provide iemgui_panel 0.1 -namespace eval ::pd_iemgui:: { +namespace eval ::iemgui_panel:: { variable define_min_flashhold 50 variable define_min_flashbreak 10 variable define_min_fontsize 4 @@ -12,10 +12,10 @@ namespace export pdtk_iemgui_dialog } -# TODO rename $id to $mytoplevel +# TODO rename $mytoplevel to $mytoplevel -proc ::pd_iemgui::clip_dim {id} { - set vid [string trimleft $id .] +proc ::iemgui_panel::clip_dim {mytoplevel} { + set vid [string trimleft $mytoplevel .] set var_iemgui_wdt [concat iemgui_wdt_$vid] global $var_iemgui_wdt @@ -28,32 +28,32 @@ if {[eval concat $$var_iemgui_wdt] < [eval concat $$var_iemgui_min_wdt]} { set $var_iemgui_wdt [eval concat $$var_iemgui_min_wdt] - $id.dim.w_ent configure -textvariable $var_iemgui_wdt + $mytoplevel.dim.w_ent configure -textvariable $var_iemgui_wdt } if {[eval concat $$var_iemgui_hgt] < [eval concat $$var_iemgui_min_hgt]} { set $var_iemgui_hgt [eval concat $$var_iemgui_min_hgt] - $id.dim.h_ent configure -textvariable $var_iemgui_hgt + $mytoplevel.dim.h_ent configure -textvariable $var_iemgui_hgt } } -proc ::pd_iemgui::clip_num {id} { - set vid [string trimleft $id .] +proc ::iemgui_panel::clip_num {mytoplevel} { + set vid [string trimleft $mytoplevel .] set var_iemgui_num [concat iemgui_num_$vid] global $var_iemgui_num if {[eval concat $$var_iemgui_num] > 2000} { set $var_iemgui_num 2000 - $id.para.num_ent configure -textvariable $var_iemgui_num + $mytoplevel.para.num_ent configure -textvariable $var_iemgui_num } if {[eval concat $$var_iemgui_num] < 1} { set $var_iemgui_num 1 - $id.para.num_ent configure -textvariable $var_iemgui_num + $mytoplevel.para.num_ent configure -textvariable $var_iemgui_num } } -proc ::pd_iemgui::sched_rng {id} { - set vid [string trimleft $id .] +proc ::iemgui_panel::sched_rng {mytoplevel} { + set vid [string trimleft $mytoplevel .] set var_iemgui_min_rng [concat iemgui_min_rng_$vid] global $var_iemgui_min_rng @@ -70,27 +70,27 @@ set hhh [eval concat $$var_iemgui_min_rng] set $var_iemgui_min_rng [eval concat $$var_iemgui_max_rng] set $var_iemgui_max_rng $hhh - $id.rng.max_ent configure -textvariable $var_iemgui_max_rng - $id.rng.min_ent configure -textvariable $var_iemgui_min_rng } + $mytoplevel.rng.max_ent configure -textvariable $var_iemgui_max_rng + $mytoplevel.rng.min_ent configure -textvariable $var_iemgui_min_rng } if {[eval concat $$var_iemgui_max_rng] < $define_min_flashhold} { set $var_iemgui_max_rng $iemgui_define_min_flashhold - $id.rng.max_ent configure -textvariable $var_iemgui_max_rng + $mytoplevel.rng.max_ent configure -textvariable $var_iemgui_max_rng } if {[eval concat $$var_iemgui_min_rng] < $define_min_flashbreak} { set $var_iemgui_min_rng $define_min_flashbreak - $id.rng.min_ent configure -textvariable $var_iemgui_min_rng + $mytoplevel.rng.min_ent configure -textvariable $var_iemgui_min_rng } } if {[eval concat $$var_iemgui_rng_sch] == 1} { if {[eval concat $$var_iemgui_min_rng] == 0.0} { set $var_iemgui_min_rng 1.0 - $id.rng.min_ent configure -textvariable $var_iemgui_min_rng + $mytoplevel.rng.min_ent configure -textvariable $var_iemgui_min_rng } } } -proc ::pd_iemgui::verify_rng {id} { - set vid [string trimleft $id .] +proc ::iemgui_panel::verify_rng {mytoplevel} { + set vid [string trimleft $mytoplevel .] set var_iemgui_min_rng [concat iemgui_min_rng_$vid] global $var_iemgui_min_rng @@ -102,24 +102,24 @@ if {[eval concat $$var_iemgui_lin0_log1] == 1} { if {[eval concat $$var_iemgui_max_rng] == 0.0 && [eval concat $$var_iemgui_min_rng] == 0.0} { set $var_iemgui_max_rng 1.0 - $id.rng.max_ent configure -textvariable $var_iemgui_max_rng + $mytoplevel.rng.max_ent configure -textvariable $var_iemgui_max_rng } if {[eval concat $$var_iemgui_max_rng] > 0} { if {[eval concat $$var_iemgui_min_rng] <= 0} { set $var_iemgui_min_rng [expr [eval concat $$var_iemgui_max_rng] * 0.01] - $id.rng.min_ent configure -textvariable $var_iemgui_min_rng + $mytoplevel.rng.min_ent configure -textvariable $var_iemgui_min_rng } } else { if {[eval concat $$var_iemgui_min_rng] > 0} { set $var_iemgui_max_rng [expr [eval concat $$var_iemgui_min_rng] * 0.01] - $id.rng.max_ent configure -textvariable $var_iemgui_max_rng + $mytoplevel.rng.max_ent configure -textvariable $var_iemgui_max_rng } } } } -proc ::pd_iemgui::clip_fontsize {id} { - set vid [string trimleft $id .] +proc ::iemgui_panel::clip_fontsize {mytoplevel} { + set vid [string trimleft $mytoplevel .] set var_iemgui_gn_fs [concat iemgui_gn_fs_$vid] global $var_iemgui_gn_fs @@ -128,12 +128,12 @@ if {[eval concat $$var_iemgui_gn_fs] < $define_min_fontsize} { set $var_iemgui_gn_fs $define_min_fontsize - $id.label.fs_ent configure -textvariable $var_iemgui_gn_fs + $mytoplevel.label.fs_ent configure -textvariable $var_iemgui_gn_fs } } -proc ::pd_iemgui::set_col_example {id} { - set vid [string trimleft $id .] +proc ::iemgui_panel::set_col_example {mytoplevel} { + set vid [string trimleft $mytoplevel .] set var_iemgui_bcol [concat iemgui_bcol_$vid] global $var_iemgui_bcol @@ -142,28 +142,28 @@ set var_iemgui_lcol [concat iemgui_lcol_$vid] global $var_iemgui_lcol - $id.colors.sections.lb_bk configure \ + $mytoplevel.colors.sections.lb_bk configure \ -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -foreground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] \ -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] if { [eval concat $$var_iemgui_fcol] >= 0 } { - $id.colors.sections.fr_bk configure \ + $mytoplevel.colors.sections.fr_bk configure \ -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -foreground [format "#%6.6x" [eval concat $$var_iemgui_fcol]] \ -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_fcol]] } else { - $id.colors.sections.fr_bk configure \ + $mytoplevel.colors.sections.fr_bk configure \ -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -foreground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_bcol]]} } -proc ::pd_iemgui::preset_col {id presetcol} { - set vid [string trimleft $id .] +proc ::iemgui_panel::preset_col {mytoplevel presetcol} { + set vid [string trimleft $mytoplevel .] set var_iemgui_l2_f1_b0 [concat iemgui_l2_f1_b0_$vid] global $var_iemgui_l2_f1_b0 @@ -177,11 +177,11 @@ if { [eval concat $$var_iemgui_l2_f1_b0] == 0 } { set $var_iemgui_bcol $presetcol } if { [eval concat $$var_iemgui_l2_f1_b0] == 1 } { set $var_iemgui_fcol $presetcol } if { [eval concat $$var_iemgui_l2_f1_b0] == 2 } { set $var_iemgui_lcol $presetcol } - ::pd_iemgui::set_col_example $id + ::iemgui_panel::set_col_example $mytoplevel } -proc ::pd_iemgui::choose_col_bkfrlb {id} { - set vid [string trimleft $id .] +proc ::iemgui_panel::choose_col_bkfrlb {mytoplevel} { + set vid [string trimleft $mytoplevel .] set var_iemgui_l2_f1_b0 [concat iemgui_l2_f1_b0_$vid] global $var_iemgui_l2_f1_b0 @@ -213,11 +213,11 @@ set $var_iemgui_lcol [string replace $helpstring 0 0 "0x"] set $var_iemgui_lcol [expr [eval concat $$var_iemgui_lcol] & 0xFCFCFC] } } - ::pd_iemgui::set_col_example $id + ::iemgui_panel::set_col_example $mytoplevel } -proc ::pd_iemgui::lilo {id} { - set vid [string trimleft $id .] +proc ::iemgui_panel::lilo {mytoplevel} { + set vid [string trimleft $mytoplevel .] set var_iemgui_lin0_log1 [concat iemgui_lin0_log1_$vid] global $var_iemgui_lin0_log1 @@ -226,21 +226,21 @@ set var_iemgui_lilo1 [concat iemgui_lilo1_$vid] global $var_iemgui_lilo1 - ::pd_iemgui::sched_rng $id + ::iemgui_panel::sched_rng $mytoplevel if {[eval concat $$var_iemgui_lin0_log1] == 0} { set $var_iemgui_lin0_log1 1 - $id.para.lilo configure -text [eval concat $$var_iemgui_lilo1] - ::pd_iemgui::verify_rng $id - ::pd_iemgui::sched_rng $id + $mytoplevel.para.lilo configure -text [eval concat $$var_iemgui_lilo1] + ::iemgui_panel::verify_rng $mytoplevel + ::iemgui_panel::sched_rng $mytoplevel } else { set $var_iemgui_lin0_log1 0 - $id.para.lilo configure -text [eval concat $$var_iemgui_lilo0] + $mytoplevel.para.lilo configure -text [eval concat $$var_iemgui_lilo0] } } -proc ::pd_iemgui::toggle_font {id gn_f} { - set vid [string trimleft $id .] +proc ::iemgui_panel::toggle_font {mytoplevel gn_f} { + set vid [string trimleft $mytoplevel .] set var_iemgui_gn_f [concat iemgui_gn_f_$vid] global $var_iemgui_gn_f @@ -254,45 +254,45 @@ } set current_font_spec "{$current_font} 12 $::font_weight" - $id.label.fontpopup_label configure -text $current_font \ + $mytoplevel.label.fontpopup_label configure -text $current_font \ -font $current_font_spec - $id.label.name_entry configure -font $current_font_spec - $id.colors.sections.fr_bk configure -font $current_font_spec - $id.colors.sections.lb_bk configure -font $current_font_spec + $mytoplevel.label.name_entry configure -font $current_font_spec + $mytoplevel.colors.sections.fr_bk configure -font $current_font_spec + $mytoplevel.colors.sections.lb_bk configure -font $current_font_spec } -proc ::pd_iemgui::lb {id} { - set vid [string trimleft $id .] +proc ::iemgui_panel::lb {mytoplevel} { + set vid [string trimleft $mytoplevel .] set var_iemgui_loadbang [concat iemgui_loadbang_$vid] global $var_iemgui_loadbang if {[eval concat $$var_iemgui_loadbang] == 0} { set $var_iemgui_loadbang 1 - $id.para.lb configure -text "init" + $mytoplevel.para.lb configure -text "init" } else { set $var_iemgui_loadbang 0 - $id.para.lb configure -text "no init" + $mytoplevel.para.lb configure -text "no init" } } -proc ::pd_iemgui::stdy_jmp {id} { - set vid [string trimleft $id .] +proc ::iemgui_panel::stdy_jmp {mytoplevel} { + set vid [string trimleft $mytoplevel .] set var_iemgui_steady [concat iemgui_steady_$vid] global $var_iemgui_steady if {[eval concat $$var_iemgui_steady]} { set $var_iemgui_steady 0 - $id.para.stdy_jmp configure -text "jump on click" + $mytoplevel.para.stdy_jmp configure -text "jump on click" } else { set $var_iemgui_steady 1 - $id.para.stdy_jmp configure -text "steady on click" + $mytoplevel.para.stdy_jmp configure -text "steady on click" } } -proc ::pd_iemgui::apply {id} { - set vid [string trimleft $id .] +proc ::iemgui_panel::apply {mytoplevel} { + set vid [string trimleft $mytoplevel .] set var_iemgui_wdt [concat iemgui_wdt_$vid] global $var_iemgui_wdt @@ -339,12 +339,12 @@ set var_iemgui_lcol [concat iemgui_lcol_$vid] global $var_iemgui_lcol - ::pd_iemgui::clip_dim $id - ::pd_iemgui::clip_num $id - ::pd_iemgui::sched_rng $id - ::pd_iemgui::verify_rng $id - ::pd_iemgui::sched_rng $id - ::pd_iemgui::clip_fontsize $id + ::iemgui_panel::clip_dim $mytoplevel + ::iemgui_panel::clip_num $mytoplevel + ::iemgui_panel::sched_rng $mytoplevel + ::iemgui_panel::verify_rng $mytoplevel + ::iemgui_panel::sched_rng $mytoplevel + ::iemgui_panel::clip_fontsize $mytoplevel if {[eval concat $$var_iemgui_snd] == ""} {set hhhsnd "empty"} else {set hhhsnd [eval concat $$var_iemgui_snd]} if {[eval concat $$var_iemgui_rcv] == ""} {set hhhrcv "empty"} else {set hhhrcv [eval concat $$var_iemgui_rcv]} @@ -363,7 +363,7 @@ set hhhrcv [unspace_text $hhhrcv] set hhhgui_nam [unspace_text $hhhgui_nam] - pdsend [concat $id dialog \ + pdsend [concat $mytoplevel dialog \ [eval concat $$var_iemgui_wdt] \ [eval concat $$var_iemgui_hgt] \ [eval concat $$var_iemgui_min_rng] \ @@ -388,23 +388,23 @@ proc iemgui_cancel {mytoplevel} { # TODO kludge!! until a common approach to ::pd_bindings::panel_bindings # is sorted out - ::pd_iemgui::cancel $mytoplevel + ::iemgui_panel::cancel $mytoplevel } -proc ::pd_iemgui::cancel {id} { - pdsend "$id cancel" +proc ::iemgui_panel::cancel {mytoplevel} { + pdsend "$mytoplevel cancel" } proc iemgui_ok {mytoplevel} { # TODO kludge!! until a common approach to ::pd_bindings::panel_bindings # is sorted out - ::pd_iemgui::ok $mytoplevel + ::iemgui_panel::ok $mytoplevel } -proc ::pd_iemgui::ok {id} { - ::pd_iemgui::apply $id - ::pd_iemgui::cancel $id +proc ::iemgui_panel::ok {mytoplevel} { + ::iemgui_panel::apply $mytoplevel + ::iemgui_panel::cancel $mytoplevel } -proc ::pd_iemgui::pdtk_iemgui_dialog {id mainheader dim_header \ +proc ::iemgui_panel::pdtk_iemgui_dialog {mytoplevel mainheader dim_header \ wdt min_wdt wdt_label \ hgt min_hgt hgt_label \ rng_header min_rng min_rng_label max_rng \ @@ -416,7 +416,7 @@ gn_dx gn_dy gn_f gn_fs \ bcol fcol lcol} { - set vid [string trimleft $id .] + set vid [string trimleft $mytoplevel .] set var_iemgui_wdt [concat iemgui_wdt_$vid] global $var_iemgui_wdt @@ -504,108 +504,108 @@ set $var_iemgui_l2_f1_b0 0 - toplevel $id -background $::panel_background - wm title $id [format "%s Properties" $mainheader] - wm resizable $id 0 0 - wm protocol $id WM_DELETE_WINDOW [concat ::pd_iemgui::cancel $id] + toplevel $mytoplevel -background $::panel_background + wm title $mytoplevel [format "%s Properties" $mainheader] + wm resizable $mytoplevel 0 0 + wm protocol $mytoplevel WM_DELETE_WINDOW [concat ::iemgui_panel::cancel $mytoplevel] - ::pd_bindings::panel_bindings $id "iemgui" + ::pd_bindings::panel_bindings $mytoplevel "iemgui" - frame $id.dim -background $::panel_background - pack $id.dim -side top - label $id.dim.head -text $dim_header -background $::panel_background - label $id.dim.w_lab -text $wdt_label -width 6 -background $::panel_background - entry $id.dim.w_ent -textvariable $var_iemgui_wdt -width 5 \ + frame $mytoplevel.dim -background $::panel_background + pack $mytoplevel.dim -side top + label $mytoplevel.dim.head -text $dim_header -background $::panel_background + label $mytoplevel.dim.w_lab -text $wdt_label -width 6 -background $::panel_background + entry $mytoplevel.dim.w_ent -textvariable $var_iemgui_wdt -width 5 \ -highlightbackground $::panel_background - label $id.dim.dummy1 -text " " -width 10 -background $::panel_background - label $id.dim.h_lab -text $hgt_label -width 6 -background $::panel_background - entry $id.dim.h_ent -textvariable $var_iemgui_hgt -width 5 \ + label $mytoplevel.dim.dummy1 -text " " -width 10 -background $::panel_background + label $mytoplevel.dim.h_lab -text $hgt_label -width 6 -background $::panel_background + entry $mytoplevel.dim.h_ent -textvariable $var_iemgui_hgt -width 5 \ -highlightbackground $::panel_background - pack $id.dim.head -side top - pack $id.dim.w_lab $id.dim.w_ent $id.dim.dummy1 -side left + pack $mytoplevel.dim.head -side top + pack $mytoplevel.dim.w_lab $mytoplevel.dim.w_ent $mytoplevel.dim.dummy1 -side left if { $hgt_label != "empty" } { - pack $id.dim.h_lab $id.dim.h_ent -side left} + pack $mytoplevel.dim.h_lab $mytoplevel.dim.h_ent -side left} - frame $id.rng -background $::panel_background - pack $id.rng -side top - label $id.rng.head -text $rng_header -background $::panel_background - label $id.rng.min_lab -text $min_rng_label -width 6 -background $::panel_background - entry $id.rng.min_ent -textvariable $var_iemgui_min_rng -width 9 \ + frame $mytoplevel.rng -background $::panel_background + pack $mytoplevel.rng -side top + label $mytoplevel.rng.head -text $rng_header -background $::panel_background + label $mytoplevel.rng.min_lab -text $min_rng_label -width 6 -background $::panel_background + entry $mytoplevel.rng.min_ent -textvariable $var_iemgui_min_rng -width 9 \ -highlightbackground $::panel_background - label $id.rng.dummy1 -text " " -width 1 -background $::panel_background - label $id.rng.max_lab -text $max_rng_label -width 8 -background $::panel_background - entry $id.rng.max_ent -textvariable $var_iemgui_max_rng -width 9 \ + label $mytoplevel.rng.dummy1 -text " " -width 1 -background $::panel_background + label $mytoplevel.rng.max_lab -text $max_rng_label -width 8 -background $::panel_background + entry $mytoplevel.rng.max_ent -textvariable $var_iemgui_max_rng -width 9 \ -highlightbackground $::panel_background if { $rng_header != "empty" } { - pack $id.rng.head -side top + pack $mytoplevel.rng.head -side top if { $min_rng_label != "empty" } { - pack $id.rng.min_lab $id.rng.min_ent -side left} + pack $mytoplevel.rng.min_lab $mytoplevel.rng.min_ent -side left} if { $max_rng_label != "empty" } { - pack $id.rng.dummy1 \ - $id.rng.max_lab $id.rng.max_ent -side left} } + pack $mytoplevel.rng.dummy1 \ + $mytoplevel.rng.max_lab $mytoplevel.rng.max_ent -side left} } if { [eval concat $$var_iemgui_lin0_log1] >= 0 || [eval concat $$var_iemgui_loadbang] >= 0 || [eval concat $$var_iemgui_num] > 0 || [eval concat $$var_iemgui_steady] >= 0 } { - label $id.space1 -text "" -background $::panel_background - pack $id.space1 -side top } + label $mytoplevel.space1 -text "" -background $::panel_background + pack $mytoplevel.space1 -side top } - frame $id.para -background $::panel_background - pack $id.para -side top - label $id.para.dummy2 -text "" -width 1 -background $::panel_background - label $id.para.dummy3 -text "" -width 1 -background $::panel_background + frame $mytoplevel.para -background $::panel_background + pack $mytoplevel.para -side top + label $mytoplevel.para.dummy2 -text "" -width 1 -background $::panel_background + label $mytoplevel.para.dummy3 -text "" -width 1 -background $::panel_background if {[eval concat $$var_iemgui_lin0_log1] == 0} { - button $id.para.lilo -text [eval concat $$var_iemgui_lilo0] -width 5 \ - -command "::pd_iemgui::lilo $id" -highlightbackground $::panel_background } + button $mytoplevel.para.lilo -text [eval concat $$var_iemgui_lilo0] -width 5 \ + -command "::iemgui_panel::lilo $mytoplevel" -highlightbackground $::panel_background } if {[eval concat $$var_iemgui_lin0_log1] == 1} { - button $id.para.lilo -text [eval concat $$var_iemgui_lilo1] -width 5 \ - -command "::pd_iemgui::lilo $id" -highlightbackground $::panel_background } + button $mytoplevel.para.lilo -text [eval concat $$var_iemgui_lilo1] -width 5 \ + -command "::iemgui_panel::lilo $mytoplevel" -highlightbackground $::panel_background } if {[eval concat $$var_iemgui_loadbang] == 0} { - button $id.para.lb -text "no init" -width 5 \ - -command "::pd_iemgui::lb $id" -highlightbackground $::panel_background } + button $mytoplevel.para.lb -text "no init" -width 5 \ + -command "::iemgui_panel::lb $mytoplevel" -highlightbackground $::panel_background } if {[eval concat $$var_iemgui_loadbang] == 1} { - button $id.para.lb -text "init" -width 5 \ - -command "::pd_iemgui::lb $id" -highlightbackground $::panel_background } - label $id.para.num_lab -text $num_label -width 9 -background $::panel_background - entry $id.para.num_ent -textvariable $var_iemgui_num -width 4 \ + button $mytoplevel.para.lb -text "init" -width 5 \ + -command "::iemgui_panel::lb $mytoplevel" -highlightbackground $::panel_background } + label $mytoplevel.para.num_lab -text $num_label -width 9 -background $::panel_background + entry $mytoplevel.para.num_ent -textvariable $var_iemgui_num -width 4 \ -highlightbackground $::panel_background if {[eval concat $$var_iemgui_steady] == 0} { - button $id.para.stdy_jmp -command "::pd_iemgui::stdy_jmp $id" \ + button $mytoplevel.para.stdy_jmp -command "::iemgui_panel::stdy_jmp $mytoplevel" \ -text "jump on click" -width 11 -highlightbackground $::panel_background } if {[eval concat $$var_iemgui_steady] == 1} { - button $id.para.stdy_jmp -command "::pd_iemgui::stdy_jmp $id" \ + button $mytoplevel.para.stdy_jmp -command "::iemgui_panel::stdy_jmp $mytoplevel" \ -text "steady on click" -width 11 -highlightbackground $::panel_background } if {[eval concat $$var_iemgui_lin0_log1] >= 0} { - pack $id.para.lilo -side left -expand 1} + pack $mytoplevel.para.lilo -side left -expand 1} if {[eval concat $$var_iemgui_loadbang] >= 0} { - pack $id.para.dummy2 $id.para.lb -side left -expand 1} + pack $mytoplevel.para.dummy2 $mytoplevel.para.lb -side left -expand 1} if {[eval concat $$var_iemgui_num] > 0} { - pack $id.para.dummy3 $id.para.num_lab $id.para.num_ent -side left -expand 1} + pack $mytoplevel.para.dummy3 $mytoplevel.para.num_lab $mytoplevel.para.num_ent -side left -expand 1} if {[eval concat $$var_iemgui_steady] >= 0} { - pack $id.para.dummy3 $id.para.stdy_jmp -side left -expand 1} + pack $mytoplevel.para.dummy3 $mytoplevel.para.stdy_jmp -side left -expand 1} - frame $id.spacer0 -height 4 -background $::panel_background - pack $id.spacer0 -side top + frame $mytoplevel.spacer0 -height 4 -background $::panel_background + pack $mytoplevel.spacer0 -side top - labelframe $id.s_r -borderwidth 1 -pady 4 -text "messages" \ + labelframe $mytoplevel.s_r -borderwidth 1 -pady 4 -text "messages" \ -font highlight_font -background $::panel_background - pack $id.s_r -side top -fill x -ipadx 5 - frame $id.s_r.send -background $::panel_background - pack $id.s_r.send -side top - label $id.s_r.send.lab -text " send-symbol:" -width 12 -justify right \ + pack $mytoplevel.s_r -side top -fill x -ipadx 5 + frame $mytoplevel.s_r.send -background $::panel_background + pack $mytoplevel.s_r.send -side top + label $mytoplevel.s_r.send.lab -text " send-symbol:" -width 12 -justify right \ -background $::panel_background - entry $id.s_r.send.ent -textvariable $var_iemgui_snd -width 22 \ + entry $mytoplevel.s_r.send.ent -textvariable $var_iemgui_snd -width 22 \ -highlightbackground $::panel_background if { $snd != "nosndno" } { - pack $id.s_r.send.lab $id.s_r.send.ent -side left} + pack $mytoplevel.s_r.send.lab $mytoplevel.s_r.send.ent -side left} - frame $id.s_r.receive -background $::panel_background - pack $id.s_r.receive -side top - label $id.s_r.receive.lab -text "receive-symbol:" -width 12 -justify right \ + frame $mytoplevel.s_r.receive -background $::panel_background + pack $mytoplevel.s_r.receive -side top + label $mytoplevel.s_r.receive.lab -text "receive-symbol:" -width 12 -justify right \ -background $::panel_background - entry $id.s_r.receive.ent -textvariable $var_iemgui_rcv -width 22 \ + entry $mytoplevel.s_r.receive.ent -textvariable $var_iemgui_rcv -width 22 \ -highlightbackground $::panel_background if { $rcv != "norcvno" } { - pack $id.s_r.receive.lab $id.s_r.receive.ent -side left} + pack $mytoplevel.s_r.receive.lab $mytoplevel.s_r.receive.ent -side left} # get the current font name from the int given from C-space (gn_f) set current_font $::font_family @@ -614,181 +614,181 @@ if {[eval concat $$var_iemgui_gn_f] == 2} \ { set current_font "Times" } - frame $id.spacer1 -height 7 -background $::panel_background - pack $id.spacer1 -side top + frame $mytoplevel.spacer1 -height 7 -background $::panel_background + pack $mytoplevel.spacer1 -side top - labelframe $id.label -borderwidth 1 -text "label" -pady 4 \ + labelframe $mytoplevel.label -borderwidth 1 -text "label" -pady 4 \ -font highlight_font -background $::panel_background - pack $id.label -side top -fill x - entry $id.label.name_entry -textvariable $var_iemgui_gui_nam -width 30 \ + pack $mytoplevel.label -side top -fill x + entry $mytoplevel.label.name_entry -textvariable $var_iemgui_gui_nam -width 30 \ -font [list $current_font 12 $::font_weight] \ -highlightbackground $::panel_background - pack $id.label.name_entry -side top -expand yes -fill both -padx 5 + pack $mytoplevel.label.name_entry -side top -expand yes -fill both -padx 5 - frame $id.label.xy -padx 27 -pady 1 -background $::panel_background - pack $id.label.xy -side top - label $id.label.xy.x_lab -text "x offset" -width 6 -background $::panel_background - entry $id.label.xy.x_entry -textvariable $var_iemgui_gn_dx -width 5 \ + frame $mytoplevel.label.xy -padx 27 -pady 1 -background $::panel_background + pack $mytoplevel.label.xy -side top + label $mytoplevel.label.xy.x_lab -text "x offset" -width 6 -background $::panel_background + entry $mytoplevel.label.xy.x_entry -textvariable $var_iemgui_gn_dx -width 5 \ -highlightbackground $::panel_background - label $id.label.xy.dummy1 -text " " -width 2 -background $::panel_background - label $id.label.xy.y_lab -text "y offset" -width 6 -background $::panel_background - entry $id.label.xy.y_entry -textvariable $var_iemgui_gn_dy -width 5 \ + label $mytoplevel.label.xy.dummy1 -text " " -width 2 -background $::panel_background + label $mytoplevel.label.xy.y_lab -text "y offset" -width 6 -background $::panel_background + entry $mytoplevel.label.xy.y_entry -textvariable $var_iemgui_gn_dy -width 5 \ -highlightbackground $::panel_background - pack $id.label.xy.x_lab $id.label.xy.x_entry $id.label.xy.dummy1 \ - $id.label.xy.y_lab $id.label.xy.y_entry -side left -anchor e + pack $mytoplevel.label.xy.x_lab $mytoplevel.label.xy.x_entry $mytoplevel.label.xy.dummy1 \ + $mytoplevel.label.xy.y_lab $mytoplevel.label.xy.y_entry -side left -anchor e - label $id.label.fontpopup_label -text $current_font \ + label $mytoplevel.label.fontpopup_label -text $current_font \ -relief groove -font [list $current_font 12 $::font_weight] -padx 5 - pack $id.label.fontpopup_label -side left -anchor w -expand yes -fill x - label $id.label.fontsize_label -text "size" -width 4 -background $::panel_background - entry $id.label.fontsize_entry -textvariable $var_iemgui_gn_fs -width 5 \ + pack $mytoplevel.label.fontpopup_label -side left -anchor w -expand yes -fill x + label $mytoplevel.label.fontsize_label -text "size" -width 4 -background $::panel_background + entry $mytoplevel.label.fontsize_entry -textvariable $var_iemgui_gn_fs -width 5 \ -highlightbackground $::panel_background - pack $id.label.fontsize_entry $id.label.fontsize_label \ + pack $mytoplevel.label.fontsize_entry $mytoplevel.label.fontsize_label \ -side right -anchor e -padx 5 -pady 5 - menu $id.popup - $id.popup add command \ + menu $mytoplevel.popup + $mytoplevel.popup add command \ -label $::font_family \ -font [format {{%s} 12 %s} $::font_family $::font_weight] \ - -command "::pd_iemgui::toggle_font $id 0" - $id.popup add command \ + -command "::iemgui_panel::toggle_font $mytoplevel 0" + $mytoplevel.popup add command \ -label "Helvetica" \ -font [format {Helvetica 12 %s} $::font_weight] \ - -command "::pd_iemgui::toggle_font $id 1" - $id.popup add command \ + -command "::iemgui_panel::toggle_font $mytoplevel 1" + $mytoplevel.popup add command \ -label "Times" \ -font [format {Times 12 %s} $::font_weight] \ - -command "::pd_iemgui::toggle_font $id 2" - bind $id.label.fontpopup_label <Button> \ - [list tk_popup $id.popup %X %Y] + -command "::iemgui_panel::toggle_font $mytoplevel 2" + bind $mytoplevel.label.fontpopup_label <Button> \ + [list tk_popup $mytoplevel.popup %X %Y] - frame $id.spacer2 -height 7 -background $::panel_background - pack $id.spacer2 -side top + frame $mytoplevel.spacer2 -height 7 -background $::panel_background + pack $mytoplevel.spacer2 -side top - labelframe $id.colors -borderwidth 1 -text "colors" -font highlight_font \ + labelframe $mytoplevel.colors -borderwidth 1 -text "colors" -font highlight_font \ -background $::panel_background - pack $id.colors -fill x -ipadx 5 -ipady 4 + pack $mytoplevel.colors -fill x -ipadx 5 -ipady 4 - frame $id.colors.select -background $::panel_background - pack $id.colors.select -side top - radiobutton $id.colors.select.radio0 -value 0 -variable \ + frame $mytoplevel.colors.select -background $::panel_background + pack $mytoplevel.colors.select -side top + radiobutton $mytoplevel.colors.select.radio0 -value 0 -variable \ $var_iemgui_l2_f1_b0 -text "background" -width 10 -justify left \ -background $::panel_background - radiobutton $id.colors.select.radio1 -value 1 -variable \ + radiobutton $mytoplevel.colors.select.radio1 -value 1 -variable \ $var_iemgui_l2_f1_b0 -text "front" -width 5 -justify left \ -background $::panel_background - radiobutton $id.colors.select.radio2 -value 2 -variable \ + radiobutton $mytoplevel.colors.select.radio2 -value 2 -variable \ $var_iemgui_l2_f1_b0 -text "label" -width 5 -justify left \ -background $::panel_background if { [eval concat $$var_iemgui_fcol] >= 0 } { - pack $id.colors.select.radio0 $id.colors.select.radio1 \ - $id.colors.select.radio2 -side left + pack $mytoplevel.colors.select.radio0 $mytoplevel.colors.select.radio1 \ + $mytoplevel.colors.select.radio2 -side left } else { - pack $id.colors.select.radio0 $id.colors.select.radio2 -side left + pack $mytoplevel.colors.select.radio0 $mytoplevel.colors.select.radio2 -side left } - frame $id.colors.sections -background $::panel_background - pack $id.colors.sections -side top - button $id.colors.sections.but -command "::pd_iemgui::choose_col_bkfrlb $id" \ + frame $mytoplevel.colors.sections -background $::panel_background + pack $mytoplevel.colors.sections -side top + button $mytoplevel.colors.sections.but -command "::iemgui_panel::choose_col_bkfrlb $mytoplevel" \ -text "compose color" -width 12 -highlightbackground $::panel_background - pack $id.colors.sections.but -side left -anchor w -padx 10 -pady 5 \ + pack $mytoplevel.colors.sections.but -side left -anchor w -padx 10 -pady 5 \ -expand yes -fill x if { [eval concat $$var_iemgui_fcol] >= 0 } { - label $id.colors.sections.fr_bk -text "o=||=o" -width 6 \ + label $mytoplevel.colors.sections.fr_bk -text "o=||=o" -width 6 \ -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -foreground [format "#%6.6x" [eval concat $$var_iemgui_fcol]] \ -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_fcol]] \ -font [list $current_font 12 $::font_weight] -padx 2 -pady 2 -relief ridge } else { - label $id.colors.sections.fr_bk -text "o=||=o" -width 6 \ + label $mytoplevel.colors.sections.fr_bk -text "o=||=o" -width 6 \ -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -foreground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -font [list $current_font 12 $::font_weight] -padx 2 -pady 2 -relief ridge } - label $id.colors.sections.lb_bk -text "testlabel" -width 9 \ + label $mytoplevel.colors.sections.lb_bk -text "testlabel" -width 9 \ -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -foreground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] \ -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] \ -font [list $current_font 12 $::font_weight] -padx 2 -pady 2 -relief ridge - pack $id.colors.sections.lb_bk $id.colors.sections.fr_bk \ + pack $mytoplevel.colors.sections.lb_bk $mytoplevel.colors.sections.fr_bk \ -side right -anchor e -expand yes -fill both -pady 7 # color scheme by Mary Ann Benedetto http://piR2.org - frame $id.colors.r1 -background $::panel_background - pack $id.colors.r1 -side top + frame $mytoplevel.colors.r1 -background $::panel_background + pack $mytoplevel.colors.r1 -side top foreach i { 0 1 2 3 4 5 6 7 8 9} \ hexcol { 0xFFFFFF 0xDFDFDF 0xBBBBBB 0xFFC7C6 0xFFE3C6 \ 0xFEFFC6 0xC6FFC7 0xc6FEFF 0xC7C6FF 0xE3C6FF } \ { - label $id.colors.r1.c$i -background [format "#%6.6x" $hexcol] \ + label $mytoplevel.colors.r1.c$i -background [format "#%6.6x" $hexcol] \ -activebackground [format "#%6.6x" $hexcol] -relief ridge \ -padx 7 -pady 0 - bind $id.colors.r1.c$i <Button> [format "::pd_iemgui::preset_col %s %d" $id $hexcol] + bind $mytoplevel.colors.r1.c$i <Button> [format "::iemgui_panel::preset_col %s %d" $mytoplevel $hexcol] } - pack $id.colors.r1.c0 $id.colors.r1.c1 $id.colors.r1.c2 $id.colors.r1.c3 \ - $id.colors.r1.c4 $id.colors.r1.c5 $id.colors.r1.c6 $id.colors.r1.c7 \ - $id.colors.r1.c8 $id.colors.r1.c9 -side left + pack $mytoplevel.colors.r1.c0 $mytoplevel.colors.r1.c1 $mytoplevel.colors.r1.c2 $mytoplevel.colors.r1.c3 \ + $mytoplevel.colors.r1.c4 $mytoplevel.colors.r1.c5 $mytoplevel.colors.r1.c6 $mytoplevel.colors.r1.c7 \ + $mytoplevel.colors.r1.c8 $mytoplevel.colors.r1.c9 -side left - frame $id.colors.r2 -background $::panel_background - pack $id.colors.r2 -side top + frame $mytoplevel.colors.r2 -background $::panel_background + pack $mytoplevel.colors.r2 -side top foreach i { 0 1 2 3 4 5 6 7 8 9 } \ hexcol { 0x9F9F9F 0x7C7C7C 0x606060 0xFF0400 0xFF8300 \ 0xFAFF00 0x00FF04 0x00FAFF 0x0400FF 0x9C00FF } \ { - label $id.colors.r2.c$i -background [format "#%6.6x" $hexcol] \ + label $mytoplevel.colors.r2.c$i -background [format "#%6.6x" $hexcol] \ -activebackground [format "#%6.6x" $hexcol] -relief ridge \ -padx 7 -pady 0 - bind $id.colors.r2.c$i <Button> \ - [format "::pd_iemgui::preset_col %s %d" $id $hexcol] + bind $mytoplevel.colors.r2.c$i <Button> \ + [format "::iemgui_panel::preset_col %s %d" $mytoplevel $hexcol] } - pack $id.colors.r2.c0 $id.colors.r2.c1 $id.colors.r2.c2 $id.colors.r2.c3 \ - $id.colors.r2.c4 $id.colors.r2.c5 $id.colors.r2.c6 $id.colors.r2.c7 \ - $id.colors.r2.c8 $id.colors.r2.c9 -side left + pack $mytoplevel.colors.r2.c0 $mytoplevel.colors.r2.c1 $mytoplevel.colors.r2.c2 $mytoplevel.colors.r2.c3 \ + $mytoplevel.colors.r2.c4 $mytoplevel.colors.r2.c5 $mytoplevel.colors.r2.c6 $mytoplevel.colors.r2.c7 \ + $mytoplevel.colors.r2.c8 $mytoplevel.colors.r2.c9 -side left - frame $id.colors.r3 -background $::panel_background - pack $id.colors.r3 -side top + frame $mytoplevel.colors.r3 -background $::panel_background + pack $mytoplevel.colors.r3 -side top foreach i { 0 1 2 3 4 5 6 7 8 9 } \ hexcol { 0x404040 0x202020 0x000000 0x551312 0x553512 \ 0x535512 0x0F4710 0x0E4345 0x131255 0x2F004D } \ { - label $id.colors.r3.c$i -background [format "#%6.6x" $hexcol] \ + label $mytoplevel.colors.r3.c$i -background [format "#%6.6x" $hexcol] \ -activebackground [format "#%6.6x" $hexcol] -relief ridge \ -padx 7 -pady 0 - bind $id.colors.r3.c$i <Button> \ - [format "::pd_iemgui::preset_col %s %d" $id $hexcol] + bind $mytoplevel.colors.r3.c$i <Button> \ + [format "::iemgui_panel::preset_col %s %d" $mytoplevel $hexcol] } - pack $id.colors.r3.c0 $id.colors.r3.c1 $id.colors.r3.c2 $id.colors.r3.c3 \ - $id.colors.r3.c4 $id.colors.r3.c5 $id.colors.r3.c6 $id.colors.r3.c7 \ - $id.colors.r3.c8 $id.colors.r3.c9 -side left + pack $mytoplevel.colors.r3.c0 $mytoplevel.colors.r3.c1 $mytoplevel.colors.r3.c2 $mytoplevel.colors.r3.c3 \ + $mytoplevel.colors.r3.c4 $mytoplevel.colors.r3.c5 $mytoplevel.colors.r3.c6 $mytoplevel.colors.r3.c7 \ + $mytoplevel.colors.r3.c8 $mytoplevel.colors.r3.c9 -side left - frame $id.cao -pady 10 -background $::panel_background - pack $id.cao -side top - button $id.cao.cancel -command "::pd_iemgui::cancel $id" \ + frame $mytoplevel.cao -pady 10 -background $::panel_background + pack $mytoplevel.cao -side top + button $mytoplevel.cao.cancel -command "::iemgui_panel::cancel $mytoplevel" \ -text "Cancel" -width 6 -highlightbackground $::panel_background - label $id.cao.dummy1 -text "" -width 3 -background $::panel_background - button $id.cao.apply -text "Apply" -width 6 -command "::pd_iemgui::apply $id" \ + label $mytoplevel.cao.dummy1 -text "" -width 3 -background $::panel_background + button $mytoplevel.cao.apply -text "Apply" -width 6 -command "::iemgui_panel::apply $mytoplevel" \ -highlightbackground $::panel_background - label $id.cao.dummy2 -text "" -width 3 -background $::panel_background - button $id.cao.ok -text {OK} -width 6 -command "::pd_iemgui::ok $id" \ + label $mytoplevel.cao.dummy2 -text "" -width 3 -background $::panel_background + button $mytoplevel.cao.ok -text {OK} -width 6 -command "::iemgui_panel::ok $mytoplevel" \ -highlightbackground $::panel_background - pack $id.cao.cancel $id.cao.dummy1 -side left - pack $id.cao.apply $id.cao.dummy2 -side left - pack $id.cao.ok -side left + pack $mytoplevel.cao.cancel $mytoplevel.cao.dummy1 -side left + pack $mytoplevel.cao.apply $mytoplevel.cao.dummy2 -side left + pack $mytoplevel.cao.ok -side left if {[info tclversion] < 8.4} { - bind $id <Key-Tab> {tkTabToWindow [tk_focusNext %W]} - bind $id <<PrevWindow>> {tkTabToWindow [tk_focusPrev %W]} + bind $mytoplevel <Key-Tab> {tkTabToWindow [tk_focusNext %W]} + bind $mytoplevel <<PrevWindow>> {tkTabToWindow [tk_focusPrev %W]} } else { - bind $id <Key-Tab> {tk::TabToWindow [tk_focusNext %W]} - bind $id <<PrevWindow>> {tk::TabToWindow [tk_focusPrev %W]} + bind $mytoplevel <Key-Tab> {tk::TabToWindow [tk_focusNext %W]} + bind $mytoplevel <<PrevWindow>> {tk::TabToWindow [tk_focusPrev %W]} } - $id.dim.w_ent select from 0 - $id.dim.w_ent select adjust end - focus $id.dim.w_ent + $mytoplevel.dim.w_ent select from 0 + $mytoplevel.dim.w_ent select adjust end + focus $mytoplevel.dim.w_ent } Modified: branches/pd-devel/0.41.4/src/pd.tk =================================================================== --- branches/pd-devel/0.41.4/src/pd.tk 2009-02-03 05:40:41 UTC (rev 10722) +++ branches/pd-devel/0.41.4/src/pd.tk 2009-02-03 05:45:42 UTC (rev 10723) @@ -61,8 +61,8 @@ package require pd_bindings package require pd_post package require font_panel -package require gatom -package require pd_iemgui +package require gatom_panel +package require iemgui_panel package require pdtk_array package require pdtk_canvas package require pdtk_text @@ -72,9 +72,9 @@ # import into the global namespace for backwards compatibility namespace import ::pd_connect::pdsend namespace import ::pd_post::pdtk_post -namespace import ::pd_iemgui::pdtk_iemgui_dialog -namespace import ::gatom::pdtk_gatom_dialog namespace import ::font_panel::pdtk_canvas_dofont +namespace import ::gatom_panel::pdtk_gatom_dialog +namespace import ::iemgui_panel::pdtk_iemgui_dialog #------------------------------------------------------------------------------# # coding style Modified: branches/pd-devel/0.41.4/src/pkgIndex.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pkgIndex.tcl 2009-02-03 05:40:41 UTC (rev 10722) +++ branches/pd-devel/0.41.4/src/pkgIndex.tcl 2009-02-03 05:45:42 UTC (rev 10723) @@ -13,8 +13,8 @@ package ifneeded pd_connect 0.1 [list source [file join $dir pd_connect.tcl]] package ifneeded find_panel 0.1 [list source [file join $dir find_panel.tcl]] package ifneeded font_panel 0.1 [list source [file join $dir font_panel.tcl]] -package ifneeded gatom 0.1 [list source [file join $dir gatom.tcl]] -package ifneeded pd_iemgui 0.1 [list source [file join $dir pd_iemgui.tcl]] +package ifneeded gatom_panel 0.1 [list source [file join $dir gatom_panel.tcl]] +package ifneeded iemgui_panel 0.1 [list source [file join $dir iemgui_panel.tcl]] package ifneeded pd_menucommands 0.1 [list source [file join $dir pd_menucommands.tcl]] package ifneeded pd_menus 0.1 [list source [file join $dir pd_menus.tcl]] package ifneeded pd_post 0.1 [list source [file join $dir pd_post.tcl]] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10722] branches/pd-devel/0.41.4/src
by eighthave＠users.sourceforge.net 03 Feb '09

03 Feb '09

Revision: 10722 http://pure-data.svn.sourceforge.net/pure-data/?rev=10722&view=rev Author: eighthave Date: 2009-02-03 05:40:41 +0000 (Tue, 03 Feb 2009) Log Message: ----------- - renamed files to the new attempt at a standard for panels Added Paths: ----------- branches/pd-devel/0.41.4/src/gatom_panel.tcl branches/pd-devel/0.41.4/src/iemgui_panel.tcl Removed Paths: ------------- branches/pd-devel/0.41.4/src/gatom.tcl branches/pd-devel/0.41.4/src/pd_iemgui.tcl Deleted: branches/pd-devel/0.41.4/src/gatom.tcl =================================================================== --- branches/pd-devel/0.41.4/src/gatom.tcl 2009-02-03 05:34:51 UTC (rev 10721) +++ branches/pd-devel/0.41.4/src/gatom.tcl 2009-02-03 05:40:41 UTC (rev 10722) @@ -1,215 +0,0 @@ - -package provide gatom 0.1 - -package require wheredoesthisgo - -namespace eval ::gatom:: { - namespace export pdtk_gatom_dialog -} - -# hashtable for communicating the position of the radiobuttons (Tk's -# radiobutton widget requires this to be global) -global gatomlabel_position - -############ pdtk_gatom_dialog -- run a gatom dialog ######### - -# dialogs like this one can come up in many copies; but in TK the easiest -# way to get data from an "entry", etc., is to set an associated variable -# name. This is especially true for grouped "radio buttons". So we have -# to synthesize variable names for each instance of the dialog. The dialog -# gets a TK pathname $id, from which it strips the leading "." to make a -# variable suffix $vid. Then you can get the actual value out by asking for -# [eval concat $$variablename]. There should be an easier way but I don't see -# it yet. - -proc ::gatom::escape {sym} { - if {[string length $sym] == 0} { - set ret "-" - } else { - if {[string equal -length 1 $sym "-"]} { - set ret [string replace $sym 0 0 "--"] - } else { - set ret [string map {"$" "#"} $sym] - } - } - return [unspace_text $ret] -} - -proc ::gatom::unescape {sym} { - if {[string equal -length 1 $sym "-"]} { - set ret [string replace $sym 0 0 ""] - } else { - set ret [string map {"#" "$"} $sym] - } - return $ret -} - -proc gatom_apply {mytoplevel} { - # TODO kludge!! until a common approach to ::pd_bindings::panel_bindings - # is sorted out - ::gatom::apply $mytoplevel -} - -proc ::gatom::apply {mytoplevel} { - global gatomlabel_position - - pdsend "$mytoplevel param \ - [$mytoplevel.width.entry get] \ - [$mytoplevel.limits.lower.entry get] \ - [$mytoplevel.limits.upper.entry get] \ - [::gatom::escape [$mytoplevel.gatomlabel.name.entry get]] \ - $gatomlabel_position($mytoplevel) \ - [::gatom::escape [$mytoplevel.s_r.send.entry get]] \ - [::gatom::escape [$mytoplevel.s_r.receive.entry get]]" -} - - -proc gatom_cancel {mytoplevel} { - # TODO kludge!! until a common approach to ::pd_bindings::panel_bindings - # is sorted out - ::gatom::cancel $mytoplevel -} -proc ::gatom::cancel {mytoplevel} { - pdsend "$mytoplevel cancel" -} - - -proc gatom_ok {mytoplevel} { - # TODO kludge!! until a common approach to ::pd_bindings::panel_bindings - # is sorted out - ::gatom::ok $mytoplevel -} -proc ::gatom::ok {mytoplevel} { - ::gatom::apply $mytoplevel - ::gatom::cancel $mytoplevel -} - -# set up the panel with the info from pd -proc ::gatom::pdtk_gatom_dialog {mytoplevel initwidth initlower initupper \ - initgatomlabel_position \ - initgatomlabel initsend initreceive} { - global gatomlabel_position - set gatomlabel_position($mytoplevel) $initgatomlabel_position - - if {[winfo exists $mytoplevel]} { - wm deiconify $mytoplevel - raise $mytoplevel - } else { - create_panel $mytoplevel - } - - $mytoplevel.width.entry insert 0 $initwidth - $mytoplevel.limits.lower.entry insert 0 $initlower - $mytoplevel.limits.upper.entry insert 0 $initupper - if {$initgatomlabel ne "-"} { - $mytoplevel.gatomlabel.name.entry insert 0 $initgatomlabel - } - set gatomlabel_position($mytoplevel) $initgatomlabel_position - if {$initsend ne "-"} { - $mytoplevel.s_r.send.entry insert 0 $initsend - } - if {$initreceive ne "-"} { - $mytoplevel.s_r.receive.entry insert 0 $initreceive - } -} - -proc ::gatom::create_panel {mytoplevel} { - global gatomlabel_position - - toplevel $mytoplevel -background $::panel_background - wm title $mytoplevel "atom box properties" - wm resizable $mytoplevel 0 0 - catch { # not all platforms/Tcls versions have these options - wm attributes $mytoplevel -topmost 1 - #wm attributes $mytoplevel -transparent 1 - #$mytoplevel configure -highlightthickness 1 - } - wm protocol $mytoplevel WM_DELETE_WINDOW "::gatom::cancel $mytoplevel" - - ::pd_bindings::panel_bindings $mytoplevel "gatom" - - frame $mytoplevel.width -height 7 -background $::panel_background - pack $mytoplevel.width -side top - label $mytoplevel.width.label -text "width" -background $::panel_background - entry $mytoplevel.width.entry -width 4 -highlightbackground $::panel_background - pack $mytoplevel.width.label $mytoplevel.width.entry -side left - - labelframe $mytoplevel.limits -text "limits" -padx 15 -pady 4 -borderwidth 1 \ - -font highlight_font -background $::panel_background - pack $mytoplevel.limits -side top -fill x - frame $mytoplevel.limits.lower -background $::panel_background - pack $mytoplevel.limits.lower -side left - label $mytoplevel.limits.lower.label -text "lower" -background $::panel_background - entry $mytoplevel.limits.lower.entry -width 8 -highlightbackground $::panel_background - pack $mytoplevel.limits.lower.label $mytoplevel.limits.lower.entry -side left - frame $mytoplevel.limits.upper -background $::panel_background - pack $mytoplevel.limits.upper -side left - frame $mytoplevel.limits.upper.spacer -width 20 -background $::panel_background - label $mytoplevel.limits.upper.label -text "upper" -background $::panel_background - entry $mytoplevel.limits.upper.entry -width 8 -highlightbackground $::panel_background - pack $mytoplevel.limits.upper.spacer $mytoplevel.limits.upper.label \ - $mytoplevel.limits.upper.entry -side left - - frame $mytoplevel.spacer1 -height 7 -background $::panel_background - pack $mytoplevel.spacer1 -side top - - labelframe $mytoplevel.gatomlabel -text "label" -padx 5 -pady 4 -borderwidth 1 \ - -font highlight_font -background $::panel_background - pack $mytoplevel.gatomlabel -side top -fill x - frame $mytoplevel.gatomlabel.name -background $::panel_background - pack $mytoplevel.gatomlabel.name -side top - entry $mytoplevel.gatomlabel.name.entry -width 33 -highlightbackground $::panel_background - pack $mytoplevel.gatomlabel.name.entry -side left - frame $mytoplevel.gatomlabel.radio -background $::panel_background - pack $mytoplevel.gatomlabel.radio -side top - radiobutton $mytoplevel.gatomlabel.radio.left -value 0 -text "left " \ - -variable gatomlabel_position($mytoplevel) -background $::panel_background \ - -justify left -takefocus 0 - radiobutton $mytoplevel.gatomlabel.radio.right -value 1 -text "right" \ - -variable gatomlabel_position($mytoplevel) -background $::panel_background \ - -justify left -takefocus 0 - radiobutton $mytoplevel.gatomlabel.radio.top -value 2 -text "top" \ - -variable gatomlabel_position($mytoplevel) -background $::panel_background \ - -justify left -takefocus 0 - radiobutton $mytoplevel.gatomlabel.radio.bottom -value 3 -text "bottom" \ - -variable gatomlabel_position($mytoplevel) -background $::panel_background \ - -justify left -takefocus 0 - pack $mytoplevel.gatomlabel.radio.left -side left -anchor w - pack $mytoplevel.gatomlabel.radio.right -side right -anchor w - pack $mytoplevel.gatomlabel.radio.top -side top -anchor w - pack $mytoplevel.gatomlabel.radio.bottom -side bottom -anchor w - - frame $mytoplevel.spacer2 -height 7 -background $::panel_background - pack $mytoplevel.spacer2 -side top - - labelframe $mytoplevel.s_r -text "messages" -padx 5 -pady 4 -borderwidth 1 \ - -font highlight_font -background $::panel_background - pack $mytoplevel.s_r -side top -fill x - frame $mytoplevel.s_r.send -background $::panel_background - pack $mytoplevel.s_r.send -side top -anchor e - label $mytoplevel.s_r.send.label -text "send symbol" -background $::panel_background - entry $mytoplevel.s_r.send.entry -width 21 -highlightbackground $::panel_background - pack $mytoplevel.s_r.send.entry $mytoplevel.s_r.send.label -side right - - frame $mytoplevel.s_r.receive -background $::panel_background - pack $mytoplevel.s_r.receive -side top -anchor e - label $mytoplevel.s_r.receive.label -text "receive symbol" -background $::panel_background - entry $mytoplevel.s_r.receive.entry -width 21 -highlightbackground $::panel_background - pack $mytoplevel.s_r.receive.entry $mytoplevel.s_r.receive.label -side right - - frame $mytoplevel.buttonframe -pady 5 -background $::panel_background - pack $mytoplevel.buttonframe -side top -fill x -pady 2m - button $mytoplevel.buttonframe.cancel -text {Cancel} \ - -command "::gatom::cancel $mytoplevel" -highlightbackground $::panel_background - pack $mytoplevel.buttonframe.cancel -side left -expand 1 - button $mytoplevel.buttonframe.apply -text {Apply} \ - -command "::gatom::apply $mytoplevel" -highlightbackground $::panel_background - pack $mytoplevel.buttonframe.apply -side left -expand 1 - button $mytoplevel.buttonframe.ok -text {OK} \ - -command "::gatom::ok $mytoplevel" -highlightbackground $::panel_background - pack $mytoplevel.buttonframe.ok -side left -expand 1 - - $mytoplevel.width.entry select from 0 - $mytoplevel.width.entry select adjust end - focus $mytoplevel.width.entry -} Copied: branches/pd-devel/0.41.4/src/gatom_panel.tcl (from rev 10721, branches/pd-devel/0.41.4/src/gatom.tcl) =================================================================== --- branches/pd-devel/0.41.4/src/gatom_panel.tcl (rev 0) +++ branches/pd-devel/0.41.4/src/gatom_panel.tcl 2009-02-03 05:40:41 UTC (rev 10722) @@ -0,0 +1,215 @@ + +package provide gatom 0.1 + +package require wheredoesthisgo + +namespace eval ::gatom:: { + namespace export pdtk_gatom_dialog +} + +# hashtable for communicating the position of the radiobuttons (Tk's +# radiobutton widget requires this to be global) +global gatomlabel_position + +############ pdtk_gatom_dialog -- run a gatom dialog ######### + +# dialogs like this one can come up in many copies; but in TK the easiest +# way to get data from an "entry", etc., is to set an associated variable +# name. This is especially true for grouped "radio buttons". So we have +# to synthesize variable names for each instance of the dialog. The dialog +# gets a TK pathname $id, from which it strips the leading "." to make a +# variable suffix $vid. Then you can get the actual value out by asking for +# [eval concat $$variablename]. There should be an easier way but I don't see +# it yet. + +proc ::gatom::escape {sym} { + if {[string length $sym] == 0} { + set ret "-" + } else { + if {[string equal -length 1 $sym "-"]} { + set ret [string replace $sym 0 0 "--"] + } else { + set ret [string map {"$" "#"} $sym] + } + } + return [unspace_text $ret] +} + +proc ::gatom::unescape {sym} { + if {[string equal -length 1 $sym "-"]} { + set ret [string replace $sym 0 0 ""] + } else { + set ret [string map {"#" "$"} $sym] + } + return $ret +} + +proc gatom_apply {mytoplevel} { + # TODO kludge!! until a common approach to ::pd_bindings::panel_bindings + # is sorted out + ::gatom::apply $mytoplevel +} + +proc ::gatom::apply {mytoplevel} { + global gatomlabel_position + + pdsend "$mytoplevel param \ + [$mytoplevel.width.entry get] \ + [$mytoplevel.limits.lower.entry get] \ + [$mytoplevel.limits.upper.entry get] \ + [::gatom::escape [$mytoplevel.gatomlabel.name.entry get]] \ + $gatomlabel_position($mytoplevel) \ + [::gatom::escape [$mytoplevel.s_r.send.entry get]] \ + [::gatom::escape [$mytoplevel.s_r.receive.entry get]]" +} + + +proc gatom_cancel {mytoplevel} { + # TODO kludge!! until a common approach to ::pd_bindings::panel_bindings + # is sorted out + ::gatom::cancel $mytoplevel +} +proc ::gatom::cancel {mytoplevel} { + pdsend "$mytoplevel cancel" +} + + +proc gatom_ok {mytoplevel} { + # TODO kludge!! until a common approach to ::pd_bindings::panel_bindings + # is sorted out + ::gatom::ok $mytoplevel +} +proc ::gatom::ok {mytoplevel} { + ::gatom::apply $mytoplevel + ::gatom::cancel $mytoplevel +} + +# set up the panel with the info from pd +proc ::gatom::pdtk_gatom_dialog {mytoplevel initwidth initlower initupper \ + initgatomlabel_position \ + initgatomlabel initsend initreceive} { + global gatomlabel_position + set gatomlabel_position($mytoplevel) $initgatomlabel_position + + if {[winfo exists $mytoplevel]} { + wm deiconify $mytoplevel + raise $mytoplevel + } else { + create_panel $mytoplevel + } + + $mytoplevel.width.entry insert 0 $initwidth + $mytoplevel.limits.lower.entry insert 0 $initlower + $mytoplevel.limits.upper.entry insert 0 $initupper + if {$initgatomlabel ne "-"} { + $mytoplevel.gatomlabel.name.entry insert 0 $initgatomlabel + } + set gatomlabel_position($mytoplevel) $initgatomlabel_position + if {$initsend ne "-"} { + $mytoplevel.s_r.send.entry insert 0 $initsend + } + if {$initreceive ne "-"} { + $mytoplevel.s_r.receive.entry insert 0 $initreceive + } +} + +proc ::gatom::create_panel {mytoplevel} { + global gatomlabel_position + + toplevel $mytoplevel -background $::panel_background + wm title $mytoplevel "atom box properties" + wm resizable $mytoplevel 0 0 + catch { # not all platforms/Tcls versions have these options + wm attributes $mytoplevel -topmost 1 + #wm attributes $mytoplevel -transparent 1 + #$mytoplevel configure -highlightthickness 1 + } + wm protocol $mytoplevel WM_DELETE_WINDOW "::gatom::cancel $mytoplevel" + + ::pd_bindings::panel_bindings $mytoplevel "gatom" + + frame $mytoplevel.width -height 7 -background $::panel_background + pack $mytoplevel.width -side top + label $mytoplevel.width.label -text "width" -background $::panel_background + entry $mytoplevel.width.entry -width 4 -highlightbackground $::panel_background + pack $mytoplevel.width.label $mytoplevel.width.entry -side left + + labelframe $mytoplevel.limits -text "limits" -padx 15 -pady 4 -borderwidth 1 \ + -font highlight_font -background $::panel_background + pack $mytoplevel.limits -side top -fill x + frame $mytoplevel.limits.lower -background $::panel_background + pack $mytoplevel.limits.lower -side left + label $mytoplevel.limits.lower.label -text "lower" -background $::panel_background + entry $mytoplevel.limits.lower.entry -width 8 -highlightbackground $::panel_background + pack $mytoplevel.limits.lower.label $mytoplevel.limits.lower.entry -side left + frame $mytoplevel.limits.upper -background $::panel_background + pack $mytoplevel.limits.upper -side left + frame $mytoplevel.limits.upper.spacer -width 20 -background $::panel_background + label $mytoplevel.limits.upper.label -text "upper" -background $::panel_background + entry $mytoplevel.limits.upper.entry -width 8 -highlightbackground $::panel_background + pack $mytoplevel.limits.upper.spacer $mytoplevel.limits.upper.label \ + $mytoplevel.limits.upper.entry -side left + + frame $mytoplevel.spacer1 -height 7 -background $::panel_background + pack $mytoplevel.spacer1 -side top + + labelframe $mytoplevel.gatomlabel -text "label" -padx 5 -pady 4 -borderwidth 1 \ + -font highlight_font -background $::panel_background + pack $mytoplevel.gatomlabel -side top -fill x + frame $mytoplevel.gatomlabel.name -background $::panel_background + pack $mytoplevel.gatomlabel.name -side top + entry $mytoplevel.gatomlabel.name.entry -width 33 -highlightbackground $::panel_background + pack $mytoplevel.gatomlabel.name.entry -side left + frame $mytoplevel.gatomlabel.radio -background $::panel_background + pack $mytoplevel.gatomlabel.radio -side top + radiobutton $mytoplevel.gatomlabel.radio.left -value 0 -text "left " \ + -variable gatomlabel_position($mytoplevel) -background $::panel_background \ + -justify left -takefocus 0 + radiobutton $mytoplevel.gatomlabel.radio.right -value 1 -text "right" \ + -variable gatomlabel_position($mytoplevel) -background $::panel_background \ + -justify left -takefocus 0 + radiobutton $mytoplevel.gatomlabel.radio.top -value 2 -text "top" \ + -variable gatomlabel_position($mytoplevel) -background $::panel_background \ + -justify left -takefocus 0 + radiobutton $mytoplevel.gatomlabel.radio.bottom -value 3 -text "bottom" \ + -variable gatomlabel_position($mytoplevel) -background $::panel_background \ + -justify left -takefocus 0 + pack $mytoplevel.gatomlabel.radio.left -side left -anchor w + pack $mytoplevel.gatomlabel.radio.right -side right -anchor w + pack $mytoplevel.gatomlabel.radio.top -side top -anchor w + pack $mytoplevel.gatomlabel.radio.bottom -side bottom -anchor w + + frame $mytoplevel.spacer2 -height 7 -background $::panel_background + pack $mytoplevel.spacer2 -side top + + labelframe $mytoplevel.s_r -text "messages" -padx 5 -pady 4 -borderwidth 1 \ + -font highlight_font -background $::panel_background + pack $mytoplevel.s_r -side top -fill x + frame $mytoplevel.s_r.send -background $::panel_background + pack $mytoplevel.s_r.send -side top -anchor e + label $mytoplevel.s_r.send.label -text "send symbol" -background $::panel_background + entry $mytoplevel.s_r.send.entry -width 21 -highlightbackground $::panel_background + pack $mytoplevel.s_r.send.entry $mytoplevel.s_r.send.label -side right + + frame $mytoplevel.s_r.receive -background $::panel_background + pack $mytoplevel.s_r.receive -side top -anchor e + label $mytoplevel.s_r.receive.label -text "receive symbol" -background $::panel_background + entry $mytoplevel.s_r.receive.entry -width 21 -highlightbackground $::panel_background + pack $mytoplevel.s_r.receive.entry $mytoplevel.s_r.receive.label -side right + + frame $mytoplevel.buttonframe -pady 5 -background $::panel_background + pack $mytoplevel.buttonframe -side top -fill x -pady 2m + button $mytoplevel.buttonframe.cancel -text {Cancel} \ + -command "::gatom::cancel $mytoplevel" -highlightbackground $::panel_background + pack $mytoplevel.buttonframe.cancel -side left -expand 1 + button $mytoplevel.buttonframe.apply -text {Apply} \ + -command "::gatom::apply $mytoplevel" -highlightbackground $::panel_background + pack $mytoplevel.buttonframe.apply -side left -expand 1 + button $mytoplevel.buttonframe.ok -text {OK} \ + -command "::gatom::ok $mytoplevel" -highlightbackground $::panel_background + pack $mytoplevel.buttonframe.ok -side left -expand 1 + + $mytoplevel.width.entry select from 0 + $mytoplevel.width.entry select adjust end + focus $mytoplevel.width.entry +} Copied: branches/pd-devel/0.41.4/src/iemgui_panel.tcl (from rev 10721, branches/pd-devel/0.41.4/src/pd_iemgui.tcl) =================================================================== --- branches/pd-devel/0.41.4/src/iemgui_panel.tcl (rev 0) +++ branches/pd-devel/0.41.4/src/iemgui_panel.tcl 2009-02-03 05:40:41 UTC (rev 10722) @@ -0,0 +1,794 @@ +# For information on usage and redistribution, and for a DISCLAIMER OF ALL +# WARRANTIES, see the file, "LICENSE.txt," in this distribution. +# Copyright (c) 1997-2009 Miller Puckette. + +package provide pd_iemgui 0.1 + +namespace eval ::pd_iemgui:: { + variable define_min_flashhold 50 + variable define_min_flashbreak 10 + variable define_min_fontsize 4 + + namespace export pdtk_iemgui_dialog +} + +# TODO rename $id to $mytoplevel + +proc ::pd_iemgui::clip_dim {id} { + set vid [string trimleft $id .] + + set var_iemgui_wdt [concat iemgui_wdt_$vid] + global $var_iemgui_wdt + set var_iemgui_min_wdt [concat iemgui_min_wdt_$vid] + global $var_iemgui_min_wdt + set var_iemgui_hgt [concat iemgui_hgt_$vid] + global $var_iemgui_hgt + set var_iemgui_min_hgt [concat iemgui_min_hgt_$vid] + global $var_iemgui_min_hgt + + if {[eval concat $$var_iemgui_wdt] < [eval concat $$var_iemgui_min_wdt]} { + set $var_iemgui_wdt [eval concat $$var_iemgui_min_wdt] + $id.dim.w_ent configure -textvariable $var_iemgui_wdt + } + if {[eval concat $$var_iemgui_hgt] < [eval concat $$var_iemgui_min_hgt]} { + set $var_iemgui_hgt [eval concat $$var_iemgui_min_hgt] + $id.dim.h_ent configure -textvariable $var_iemgui_hgt + } +} + +proc ::pd_iemgui::clip_num {id} { + set vid [string trimleft $id .] + + set var_iemgui_num [concat iemgui_num_$vid] + global $var_iemgui_num + + if {[eval concat $$var_iemgui_num] > 2000} { + set $var_iemgui_num 2000 + $id.para.num_ent configure -textvariable $var_iemgui_num + } + if {[eval concat $$var_iemgui_num] < 1} { + set $var_iemgui_num 1 + $id.para.num_ent configure -textvariable $var_iemgui_num + } +} + +proc ::pd_iemgui::sched_rng {id} { + set vid [string trimleft $id .] + + set var_iemgui_min_rng [concat iemgui_min_rng_$vid] + global $var_iemgui_min_rng + set var_iemgui_max_rng [concat iemgui_max_rng_$vid] + global $var_iemgui_max_rng + set var_iemgui_rng_sch [concat iemgui_rng_sch_$vid] + global $var_iemgui_rng_sch + + variable define_min_flashhold + variable define_min_flashbreak + + if {[eval concat $$var_iemgui_rng_sch] == 2} { + if {[eval concat $$var_iemgui_max_rng] < [eval concat $$var_iemgui_min_rng]} { + set hhh [eval concat $$var_iemgui_min_rng] + set $var_iemgui_min_rng [eval concat $$var_iemgui_max_rng] + set $var_iemgui_max_rng $hhh + $id.rng.max_ent configure -textvariable $var_iemgui_max_rng + $id.rng.min_ent configure -textvariable $var_iemgui_min_rng } + if {[eval concat $$var_iemgui_max_rng] < $define_min_flashhold} { + set $var_iemgui_max_rng $iemgui_define_min_flashhold + $id.rng.max_ent configure -textvariable $var_iemgui_max_rng + } + if {[eval concat $$var_iemgui_min_rng] < $define_min_flashbreak} { + set $var_iemgui_min_rng $define_min_flashbreak + $id.rng.min_ent configure -textvariable $var_iemgui_min_rng + } + } + if {[eval concat $$var_iemgui_rng_sch] == 1} { + if {[eval concat $$var_iemgui_min_rng] == 0.0} { + set $var_iemgui_min_rng 1.0 + $id.rng.min_ent configure -textvariable $var_iemgui_min_rng + } + } +} + +proc ::pd_iemgui::verify_rng {id} { + set vid [string trimleft $id .] + + set var_iemgui_min_rng [concat iemgui_min_rng_$vid] + global $var_iemgui_min_rng + set var_iemgui_max_rng [concat iemgui_max_rng_$vid] + global $var_iemgui_max_rng + set var_iemgui_lin0_log1 [concat iemgui_lin0_log1_$vid] + global $var_iemgui_lin0_log1 + + if {[eval concat $$var_iemgui_lin0_log1] == 1} { + if {[eval concat $$var_iemgui_max_rng] == 0.0 && [eval concat $$var_iemgui_min_rng] == 0.0} { + set $var_iemgui_max_rng 1.0 + $id.rng.max_ent configure -textvariable $var_iemgui_max_rng + } + if {[eval concat $$var_iemgui_max_rng] > 0} { + if {[eval concat $$var_iemgui_min_rng] <= 0} { + set $var_iemgui_min_rng [expr [eval concat $$var_iemgui_max_rng] * 0.01] + $id.rng.min_ent configure -textvariable $var_iemgui_min_rng + } + } else { + if {[eval concat $$var_iemgui_min_rng] > 0} { + set $var_iemgui_max_rng [expr [eval concat $$var_iemgui_min_rng] * 0.01] + $id.rng.max_ent configure -textvariable $var_iemgui_max_rng + } + } + } +} + +proc ::pd_iemgui::clip_fontsize {id} { + set vid [string trimleft $id .] + + set var_iemgui_gn_fs [concat iemgui_gn_fs_$vid] + global $var_iemgui_gn_fs + + variable define_min_fontsize + + if {[eval concat $$var_iemgui_gn_fs] < $define_min_fontsize} { + set $var_iemgui_gn_fs $define_min_fontsize + $id.label.fs_ent configure -textvariable $var_iemgui_gn_fs + } +} + +proc ::pd_iemgui::set_col_example {id} { + set vid [string trimleft $id .] + + set var_iemgui_bcol [concat iemgui_bcol_$vid] + global $var_iemgui_bcol + set var_iemgui_fcol [concat iemgui_fcol_$vid] + global $var_iemgui_fcol + set var_iemgui_lcol [concat iemgui_lcol_$vid] + global $var_iemgui_lcol + + $id.colors.sections.lb_bk configure \ + -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ + -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ + -foreground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] \ + -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] + + if { [eval concat $$var_iemgui_fcol] >= 0 } { + $id.colors.sections.fr_bk configure \ + -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ + -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ + -foreground [format "#%6.6x" [eval concat $$var_iemgui_fcol]] \ + -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_fcol]] + } else { + $id.colors.sections.fr_bk configure \ + -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ + -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ + -foreground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ + -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_bcol]]} +} + +proc ::pd_iemgui::preset_col {id presetcol} { + set vid [string trimleft $id .] + + set var_iemgui_l2_f1_b0 [concat iemgui_l2_f1_b0_$vid] + global $var_iemgui_l2_f1_b0 + set var_iemgui_bcol [concat iemgui_bcol_$vid] + global $var_iemgui_bcol + set var_iemgui_fcol [concat iemgui_fcol_$vid] + global $var_iemgui_fcol + set var_iemgui_lcol [concat iemgui_lcol_$vid] + global $var_iemgui_lcol + + if { [eval concat $$var_iemgui_l2_f1_b0] == 0 } { set $var_iemgui_bcol $presetcol } + if { [eval concat $$var_iemgui_l2_f1_b0] == 1 } { set $var_iemgui_fcol $presetcol } + if { [eval concat $$var_iemgui_l2_f1_b0] == 2 } { set $var_iemgui_lcol $presetcol } + ::pd_iemgui::set_col_example $id +} + +proc ::pd_iemgui::choose_col_bkfrlb {id} { + set vid [string trimleft $id .] + + set var_iemgui_l2_f1_b0 [concat iemgui_l2_f1_b0_$vid] + global $var_iemgui_l2_f1_b0 + set var_iemgui_bcol [concat iemgui_bcol_$vid] + global $var_iemgui_bcol + set var_iemgui_fcol [concat iemgui_fcol_$vid] + global $var_iemgui_fcol + set var_iemgui_lcol [concat iemgui_lcol_$vid] + global $var_iemgui_lcol + + if {[eval concat $$var_iemgui_l2_f1_b0] == 0} { + set $var_iemgui_bcol [expr [eval concat $$var_iemgui_bcol] & 0xFCFCFC] + set helpstring [tk_chooseColor -title "Background-Color" -initialcolor [format "#%6.6x" [eval concat $$var_iemgui_bcol]]] + if { $helpstring != "" } { + set $var_iemgui_bcol [string replace $helpstring 0 0 "0x"] + set $var_iemgui_bcol [expr [eval concat $$var_iemgui_bcol] & 0xFCFCFC] } + } + if {[eval concat $$var_iemgui_l2_f1_b0] == 1} { + set $var_iemgui_fcol [expr [eval concat $$var_iemgui_fcol] & 0xFCFCFC] + set helpstring [tk_chooseColor -title "Front-Color" -initialcolor [format "#%6.6x" [eval concat $$var_iemgui_fcol]]] + if { $helpstring != "" } { + set $var_iemgui_fcol [string replace $helpstring 0 0 "0x"] + set $var_iemgui_fcol [expr [eval concat $$var_iemgui_fcol] & 0xFCFCFC] } + } + if {[eval concat $$var_iemgui_l2_f1_b0] == 2} { + set $var_iemgui_lcol [expr [eval concat $$var_iemgui_lcol] & 0xFCFCFC] + set helpstring [tk_chooseColor -title "Label-Color" -initialcolor [format "#%6.6x" [eval concat $$var_iemgui_lcol]]] + if { $helpstring != "" } { + set $var_iemgui_lcol [string replace $helpstring 0 0 "0x"] + set $var_iemgui_lcol [expr [eval concat $$var_iemgui_lcol] & 0xFCFCFC] } + } + ::pd_iemgui::set_col_example $id +} + +proc ::pd_iemgui::lilo {id} { + set vid [string trimleft $id .] + + set var_iemgui_lin0_log1 [concat iemgui_lin0_log1_$vid] + global $var_iemgui_lin0_log1 + set var_iemgui_lilo0 [concat iemgui_lilo0_$vid] + global $var_iemgui_lilo0 + set var_iemgui_lilo1 [concat iemgui_lilo1_$vid] + global $var_iemgui_lilo1 + + ::pd_iemgui::sched_rng $id + + if {[eval concat $$var_iemgui_lin0_log1] == 0} { + set $var_iemgui_lin0_log1 1 + $id.para.lilo configure -text [eval concat $$var_iemgui_lilo1] + ::pd_iemgui::verify_rng $id + ::pd_iemgui::sched_rng $id + } else { + set $var_iemgui_lin0_log1 0 + $id.para.lilo configure -text [eval concat $$var_iemgui_lilo0] + } +} + +proc ::pd_iemgui::toggle_font {id gn_f} { + set vid [string trimleft $id .] + + set var_iemgui_gn_f [concat iemgui_gn_f_$vid] + global $var_iemgui_gn_f + + set $var_iemgui_gn_f $gn_f + + switch -- $gn_f { + 0 { set current_font $::font_family} + 1 { set current_font "Helvetica" } + 2 { set current_font "Times" } + } + set current_font_spec "{$current_font} 12 $::font_weight" + + $id.label.fontpopup_label configure -text $current_font \ + -font $current_font_spec + $id.label.name_entry configure -font $current_font_spec + $id.colors.sections.fr_bk configure -font $current_font_spec + $id.colors.sections.lb_bk configure -font $current_font_spec +} + +proc ::pd_iemgui::lb {id} { + set vid [string trimleft $id .] + + set var_iemgui_loadbang [concat iemgui_loadbang_$vid] + global $var_iemgui_loadbang + + if {[eval concat $$var_iemgui_loadbang] == 0} { + set $var_iemgui_loadbang 1 + $id.para.lb configure -text "init" + } else { + set $var_iemgui_loadbang 0 + $id.para.lb configure -text "no init" + } +} + +proc ::pd_iemgui::stdy_jmp {id} { + set vid [string trimleft $id .] + + set var_iemgui_steady [concat iemgui_steady_$vid] + global $var_iemgui_steady + + if {[eval concat $$var_iemgui_steady]} { + set $var_iemgui_steady 0 + $id.para.stdy_jmp configure -text "jump on click" + } else { + set $var_iemgui_steady 1 + $id.para.stdy_jmp configure -text "steady on click" + } +} + +proc ::pd_iemgui::apply {id} { + set vid [string trimleft $id .] + + set var_iemgui_wdt [concat iemgui_wdt_$vid] + global $var_iemgui_wdt + set var_iemgui_min_wdt [concat iemgui_min_wdt_$vid] + global $var_iemgui_min_wdt + set var_iemgui_hgt [concat iemgui_hgt_$vid] + global $var_iemgui_hgt + set var_iemgui_min_hgt [concat iemgui_min_hgt_$vid] + global $var_iemgui_min_hgt + set var_iemgui_min_rng [concat iemgui_min_rng_$vid] + global $var_iemgui_min_rng + set var_iemgui_max_rng [concat iemgui_max_rng_$vid] + global $var_iemgui_max_rng + set var_iemgui_lin0_log1 [concat iemgui_lin0_log1_$vid] + global $var_iemgui_lin0_log1 + set var_iemgui_lilo0 [concat iemgui_lilo0_$vid] + global $var_iemgui_lilo0 + set var_iemgui_lilo1 [concat iemgui_lilo1_$vid] + global $var_iemgui_lilo1 + set var_iemgui_loadbang [concat iemgui_loadbang_$vid] + global $var_iemgui_loadbang + set var_iemgui_num [concat iemgui_num_$vid] + global $var_iemgui_num + set var_iemgui_steady [concat iemgui_steady_$vid] + global $var_iemgui_steady + set var_iemgui_snd [concat iemgui_snd_$vid] + global $var_iemgui_snd + set var_iemgui_rcv [concat iemgui_rcv_$vid] + global $var_iemgui_rcv + set var_iemgui_gui_nam [concat iemgui_gui_nam_$vid] + global $var_iemgui_gui_nam + set var_iemgui_gn_dx [concat iemgui_gn_dx_$vid] + global $var_iemgui_gn_dx + set var_iemgui_gn_dy [concat iemgui_gn_dy_$vid] + global $var_iemgui_gn_dy + set var_iemgui_gn_f [concat iemgui_gn_f_$vid] + global $var_iemgui_gn_f + set var_iemgui_gn_fs [concat iemgui_gn_fs_$vid] + global $var_iemgui_gn_fs + set var_iemgui_bcol [concat iemgui_bcol_$vid] + global $var_iemgui_bcol + set var_iemgui_fcol [concat iemgui_fcol_$vid] + global $var_iemgui_fcol + set var_iemgui_lcol [concat iemgui_lcol_$vid] + global $var_iemgui_lcol + + ::pd_iemgui::clip_dim $id + ::pd_iemgui::clip_num $id + ::pd_iemgui::sched_rng $id + ::pd_iemgui::verify_rng $id + ::pd_iemgui::sched_rng $id + ::pd_iemgui::clip_fontsize $id + + if {[eval concat $$var_iemgui_snd] == ""} {set hhhsnd "empty"} else {set hhhsnd [eval concat $$var_iemgui_snd]} + if {[eval concat $$var_iemgui_rcv] == ""} {set hhhrcv "empty"} else {set hhhrcv [eval concat $$var_iemgui_rcv]} + if {[eval concat $$var_iemgui_gui_nam] == ""} {set hhhgui_nam "empty" + } else { + set hhhgui_nam [eval concat $$var_iemgui_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 #] } + + set hhhsnd [unspace_text $hhhsnd] + set hhhrcv [unspace_text $hhhrcv] + set hhhgui_nam [unspace_text $hhhgui_nam] + + pdsend [concat $id dialog \ + [eval concat $$var_iemgui_wdt] \ + [eval concat $$var_iemgui_hgt] \ + [eval concat $$var_iemgui_min_rng] \ + [eval concat $$var_iemgui_max_rng] \ + [eval concat $$var_iemgui_lin0_log1] \ + [eval concat $$var_iemgui_loadbang] \ + [eval concat $$var_iemgui_num] \ + $hhhsnd \ + $hhhrcv \ + $hhhgui_nam \ + [eval concat $$var_iemgui_gn_dx] \ + [eval concat $$var_iemgui_gn_dy] \ + [eval concat $$var_iemgui_gn_f] \ + [eval concat $$var_iemgui_gn_fs] \ + [eval concat $$var_iemgui_bcol] \ + [eval concat $$var_iemgui_fcol] \ + [eval concat $$var_iemgui_lcol] \ + [eval concat $$var_iemgui_steady]] +} + + +proc iemgui_cancel {mytoplevel} { + # TODO kludge!! until a common approach to ::pd_bindings::panel_bindings + # is sorted out + ::pd_iemgui::cancel $mytoplevel +} +proc ::pd_iemgui::cancel {id} { + pdsend "$id cancel" +} + +proc iemgui_ok {mytoplevel} { + # TODO kludge!! until a common approach to ::pd_bindings::panel_bindings + # is sorted out + ::pd_iemgui::ok $mytoplevel +} +proc ::pd_iemgui::ok {id} { + ::pd_iemgui::apply $id + ::pd_iemgui::cancel $id +} + +proc ::pd_iemgui::pdtk_iemgui_dialog {id mainheader dim_header \ + wdt min_wdt wdt_label \ + hgt min_hgt hgt_label \ + 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} { + + set vid [string trimleft $id .] + + set var_iemgui_wdt [concat iemgui_wdt_$vid] + global $var_iemgui_wdt + set var_iemgui_min_wdt [concat iemgui_min_wdt_$vid] + global $var_iemgui_min_wdt + set var_iemgui_hgt [concat iemgui_hgt_$vid] + global $var_iemgui_hgt + set var_iemgui_min_hgt [concat iemgui_min_hgt_$vid] + global $var_iemgui_min_hgt + set var_iemgui_min_rng [concat iemgui_min_rng_$vid] + global $var_iemgui_min_rng + set var_iemgui_max_rng [concat iemgui_max_rng_$vid] + global $var_iemgui_max_rng + set var_iemgui_rng_sch [concat iemgui_rng_sch_$vid] + global $var_iemgui_rng_sch + set var_iemgui_lin0_log1 [concat iemgui_lin0_log1_$vid] + global $var_iemgui_lin0_log1 + set var_iemgui_lilo0 [concat iemgui_lilo0_$vid] + global $var_iemgui_lilo0 + set var_iemgui_lilo1 [concat iemgui_lilo1_$vid] + global $var_iemgui_lilo1 + set var_iemgui_loadbang [concat iemgui_loadbang_$vid] + global $var_iemgui_loadbang + set var_iemgui_num [concat iemgui_num_$vid] + global $var_iemgui_num + set var_iemgui_steady [concat iemgui_steady_$vid] + global $var_iemgui_steady + set var_iemgui_snd [concat iemgui_snd_$vid] + global $var_iemgui_snd + set var_iemgui_rcv [concat iemgui_rcv_$vid] + global $var_iemgui_rcv + set var_iemgui_gui_nam [concat iemgui_gui_nam_$vid] + global $var_iemgui_gui_nam + set var_iemgui_gn_dx [concat iemgui_gn_dx_$vid] + global $var_iemgui_gn_dx + set var_iemgui_gn_dy [concat iemgui_gn_dy_$vid] + global $var_iemgui_gn_dy + set var_iemgui_gn_f [concat iemgui_gn_f_$vid] + global $var_iemgui_gn_f + set var_iemgui_gn_fs [concat iemgui_gn_fs_$vid] + global $var_iemgui_gn_fs + set var_iemgui_l2_f1_b0 [concat iemgui_l2_f1_b0_$vid] + global $var_iemgui_l2_f1_b0 + set var_iemgui_bcol [concat iemgui_bcol_$vid] + global $var_iemgui_bcol + set var_iemgui_fcol [concat iemgui_fcol_$vid] + global $var_iemgui_fcol + set var_iemgui_lcol [concat iemgui_lcol_$vid] + global $var_iemgui_lcol + + set $var_iemgui_wdt $wdt + set $var_iemgui_min_wdt $min_wdt + set $var_iemgui_hgt $hgt + set $var_iemgui_min_hgt $min_hgt + set $var_iemgui_min_rng $min_rng + set $var_iemgui_max_rng $max_rng + set $var_iemgui_rng_sch $rng_sched + set $var_iemgui_lin0_log1 $lin0_log1 + set $var_iemgui_lilo0 $lilo0_label + set $var_iemgui_lilo1 $lilo1_label + set $var_iemgui_loadbang $loadbang + set $var_iemgui_num $num + set $var_iemgui_steady $steady + if {$snd == "empty"} {set $var_iemgui_snd [format ""] + } else {set $var_iemgui_snd [format "%s" $snd]} + if {$rcv == "empty"} {set $var_iemgui_rcv [format ""] + } else {set $var_iemgui_rcv [format "%s" $rcv]} + if {$gui_name == "empty"} {set $var_iemgui_gui_nam [format ""] + } else {set $var_iemgui_gui_nam [format "%s" $gui_name]} + + if {[string index [eval concat $$var_iemgui_snd] 0] == "#"} { + set $var_iemgui_snd [string replace [eval concat $$var_iemgui_snd] 0 0 $] } + if {[string index [eval concat $$var_iemgui_rcv] 0] == "#"} { + set $var_iemgui_rcv [string replace [eval concat $$var_iemgui_rcv] 0 0 $] } + if {[string index [eval concat $$var_iemgui_gui_nam] 0] == "#"} { + set $var_iemgui_gui_nam [string replace [eval concat $$var_iemgui_gui_nam] 0 0 $] } + set $var_iemgui_gn_dx $gn_dx + set $var_iemgui_gn_dy $gn_dy + set $var_iemgui_gn_f $gn_f + set $var_iemgui_gn_fs $gn_fs + + set $var_iemgui_bcol $bcol + set $var_iemgui_fcol $fcol + set $var_iemgui_lcol $lcol + + set $var_iemgui_l2_f1_b0 0 + + toplevel $id -background $::panel_background + wm title $id [format "%s Properties" $mainheader] + wm resizable $id 0 0 + wm protocol $id WM_DELETE_WINDOW [concat ::pd_iemgui::cancel $id] + + ::pd_bindings::panel_bindings $id "iemgui" + + frame $id.dim -background $::panel_background + pack $id.dim -side top + label $id.dim.head -text $dim_header -background $::panel_background + label $id.dim.w_lab -text $wdt_label -width 6 -background $::panel_background + entry $id.dim.w_ent -textvariable $var_iemgui_wdt -width 5 \ + -highlightbackground $::panel_background + label $id.dim.dummy1 -text " " -width 10 -background $::panel_background + label $id.dim.h_lab -text $hgt_label -width 6 -background $::panel_background + entry $id.dim.h_ent -textvariable $var_iemgui_hgt -width 5 \ + -highlightbackground $::panel_background + pack $id.dim.head -side top + pack $id.dim.w_lab $id.dim.w_ent $id.dim.dummy1 -side left + if { $hgt_label != "empty" } { + pack $id.dim.h_lab $id.dim.h_ent -side left} + + frame $id.rng -background $::panel_background + pack $id.rng -side top + label $id.rng.head -text $rng_header -background $::panel_background + label $id.rng.min_lab -text $min_rng_label -width 6 -background $::panel_background + entry $id.rng.min_ent -textvariable $var_iemgui_min_rng -width 9 \ + -highlightbackground $::panel_background + label $id.rng.dummy1 -text " " -width 1 -background $::panel_background + label $id.rng.max_lab -text $max_rng_label -width 8 -background $::panel_background + entry $id.rng.max_ent -textvariable $var_iemgui_max_rng -width 9 \ + -highlightbackground $::panel_background + if { $rng_header != "empty" } { + pack $id.rng.head -side top + if { $min_rng_label != "empty" } { + pack $id.rng.min_lab $id.rng.min_ent -side left} + if { $max_rng_label != "empty" } { + pack $id.rng.dummy1 \ + $id.rng.max_lab $id.rng.max_ent -side left} } + + if { [eval concat $$var_iemgui_lin0_log1] >= 0 || [eval concat $$var_iemgui_loadbang] >= 0 || [eval concat $$var_iemgui_num] > 0 || [eval concat $$var_iemgui_steady] >= 0 } { + label $id.space1 -text "" -background $::panel_background + pack $id.space1 -side top } + + frame $id.para -background $::panel_background + pack $id.para -side top + label $id.para.dummy2 -text "" -width 1 -background $::panel_background + label $id.para.dummy3 -text "" -width 1 -background $::panel_background + if {[eval concat $$var_iemgui_lin0_log1] == 0} { + button $id.para.lilo -text [eval concat $$var_iemgui_lilo0] -width 5 \ + -command "::pd_iemgui::lilo $id" -highlightbackground $::panel_background } + if {[eval concat $$var_iemgui_lin0_log1] == 1} { + button $id.para.lilo -text [eval concat $$var_iemgui_lilo1] -width 5 \ + -command "::pd_iemgui::lilo $id" -highlightbackground $::panel_background } + if {[eval concat $$var_iemgui_loadbang] == 0} { + button $id.para.lb -text "no init" -width 5 \ + -command "::pd_iemgui::lb $id" -highlightbackground $::panel_background } + if {[eval concat $$var_iemgui_loadbang] == 1} { + button $id.para.lb -text "init" -width 5 \ + -command "::pd_iemgui::lb $id" -highlightbackground $::panel_background } + label $id.para.num_lab -text $num_label -width 9 -background $::panel_background + entry $id.para.num_ent -textvariable $var_iemgui_num -width 4 \ + -highlightbackground $::panel_background + + if {[eval concat $$var_iemgui_steady] == 0} { + button $id.para.stdy_jmp -command "::pd_iemgui::stdy_jmp $id" \ + -text "jump on click" -width 11 -highlightbackground $::panel_background } + if {[eval concat $$var_iemgui_steady] == 1} { + button $id.para.stdy_jmp -command "::pd_iemgui::stdy_jmp $id" \ + -text "steady on click" -width 11 -highlightbackground $::panel_background } + if {[eval concat $$var_iemgui_lin0_log1] >= 0} { + pack $id.para.lilo -side left -expand 1} + if {[eval concat $$var_iemgui_loadbang] >= 0} { + pack $id.para.dummy2 $id.para.lb -side left -expand 1} + if {[eval concat $$var_iemgui_num] > 0} { + pack $id.para.dummy3 $id.para.num_lab $id.para.num_ent -side left -expand 1} + if {[eval concat $$var_iemgui_steady] >= 0} { + pack $id.para.dummy3 $id.para.stdy_jmp -side left -expand 1} + + frame $id.spacer0 -height 4 -background $::panel_background + pack $id.spacer0 -side top + + labelframe $id.s_r -borderwidth 1 -pady 4 -text "messages" \ + -font highlight_font -background $::panel_background + pack $id.s_r -side top -fill x -ipadx 5 + frame $id.s_r.send -background $::panel_background + pack $id.s_r.send -side top + label $id.s_r.send.lab -text " send-symbol:" -width 12 -justify right \ + -background $::panel_background + entry $id.s_r.send.ent -textvariable $var_iemgui_snd -width 22 \ + -highlightbackground $::panel_background + if { $snd != "nosndno" } { + pack $id.s_r.send.lab $id.s_r.send.ent -side left} + + frame $id.s_r.receive -background $::panel_background + pack $id.s_r.receive -side top + label $id.s_r.receive.lab -text "receive-symbol:" -width 12 -justify right \ + -background $::panel_background + entry $id.s_r.receive.ent -textvariable $var_iemgui_rcv -width 22 \ + -highlightbackground $::panel_background + if { $rcv != "norcvno" } { + pack $id.s_r.receive.lab $id.s_r.receive.ent -side left} + + # get the current font name from the int given from C-space (gn_f) + set current_font $::font_family + if {[eval concat $$var_iemgui_gn_f] == 1} \ + { set current_font "Helvetica" } + if {[eval concat $$var_iemgui_gn_f] == 2} \ + { set current_font "Times" } + + frame $id.spacer1 -height 7 -background $::panel_background + pack $id.spacer1 -side top + + labelframe $id.label -borderwidth 1 -text "label" -pady 4 \ + -font highlight_font -background $::panel_background + pack $id.label -side top -fill x + entry $id.label.name_entry -textvariable $var_iemgui_gui_nam -width 30 \ + -font [list $current_font 12 $::font_weight] \ + -highlightbackground $::panel_background + pack $id.label.name_entry -side top -expand yes -fill both -padx 5 + + frame $id.label.xy -padx 27 -pady 1 -background $::panel_background + pack $id.label.xy -side top + label $id.label.xy.x_lab -text "x offset" -width 6 -background $::panel_background + entry $id.label.xy.x_entry -textvariable $var_iemgui_gn_dx -width 5 \ + -highlightbackground $::panel_background + label $id.label.xy.dummy1 -text " " -width 2 -background $::panel_background + label $id.label.xy.y_lab -text "y offset" -width 6 -background $::panel_background + entry $id.label.xy.y_entry -textvariable $var_iemgui_gn_dy -width 5 \ + -highlightbackground $::panel_background + pack $id.label.xy.x_lab $id.label.xy.x_entry $id.label.xy.dummy1 \ + $id.label.xy.y_lab $id.label.xy.y_entry -side left -anchor e + + label $id.label.fontpopup_label -text $current_font \ + -relief groove -font [list $current_font 12 $::font_weight] -padx 5 + pack $id.label.fontpopup_label -side left -anchor w -expand yes -fill x + label $id.label.fontsize_label -text "size" -width 4 -background $::panel_background + entry $id.label.fontsize_entry -textvariable $var_iemgui_gn_fs -width 5 \ + -highlightbackground $::panel_background + pack $id.label.fontsize_entry $id.label.fontsize_label \ + -side right -anchor e -padx 5 -pady 5 + menu $id.popup + $id.popup add command \ + -label $::font_family \ + -font [format {{%s} 12 %s} $::font_family $::font_weight] \ + -command "::pd_iemgui::toggle_font $id 0" + $id.popup add command \ + -label "Helvetica" \ + -font [format {Helvetica 12 %s} $::font_weight] \ + -command "::pd_iemgui::toggle_font $id 1" + $id.popup add command \ + -label "Times" \ + -font [format {Times 12 %s} $::font_weight] \ + -command "::pd_iemgui::toggle_font $id 2" + bind $id.label.fontpopup_label <Button> \ + [list tk_popup $id.popup %X %Y] + + frame $id.spacer2 -height 7 -background $::panel_background + pack $id.spacer2 -side top + + labelframe $id.colors -borderwidth 1 -text "colors" -font highlight_font \ + -background $::panel_background + pack $id.colors -fill x -ipadx 5 -ipady 4 + + frame $id.colors.select -background $::panel_background + pack $id.colors.select -side top + radiobutton $id.colors.select.radio0 -value 0 -variable \ + $var_iemgui_l2_f1_b0 -text "background" -width 10 -justify left \ + -background $::panel_background + radiobutton $id.colors.select.radio1 -value 1 -variable \ + $var_iemgui_l2_f1_b0 -text "front" -width 5 -justify left \ + -background $::panel_background + radiobutton $id.colors.select.radio2 -value 2 -variable \ + $var_iemgui_l2_f1_b0 -text "label" -width 5 -justify left \ + -background $::panel_background + if { [eval concat $$var_iemgui_fcol] >= 0 } { + pack $id.colors.select.radio0 $id.colors.select.radio1 \ + $id.colors.select.radio2 -side left + } else { + pack $id.colors.select.radio0 $id.colors.select.radio2 -side left + } + + frame $id.colors.sections -background $::panel_background + pack $id.colors.sections -side top + button $id.colors.sections.but -command "::pd_iemgui::choose_col_bkfrlb $id" \ + -text "compose color" -width 12 -highlightbackground $::panel_background + pack $id.colors.sections.but -side left -anchor w -padx 10 -pady 5 \ + -expand yes -fill x + if { [eval concat $$var_iemgui_fcol] >= 0 } { + label $id.colors.sections.fr_bk -text "o=||=o" -width 6 \ + -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ + -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ + -foreground [format "#%6.6x" [eval concat $$var_iemgui_fcol]] \ + -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_fcol]] \ + -font [list $current_font 12 $::font_weight] -padx 2 -pady 2 -relief ridge + } else { + label $id.colors.sections.fr_bk -text "o=||=o" -width 6 \ + -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ + -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ + -foreground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ + -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ + -font [list $current_font 12 $::font_weight] -padx 2 -pady 2 -relief ridge + } + label $id.colors.sections.lb_bk -text "testlabel" -width 9 \ + -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ + -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ + -foreground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] \ + -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] \ + -font [list $current_font 12 $::font_weight] -padx 2 -pady 2 -relief ridge + pack $id.colors.sections.lb_bk $id.colors.sections.fr_bk \ + -side right -anchor e -expand yes -fill both -pady 7 + + # color scheme by Mary Ann Benedetto http://piR2.org + frame $id.colors.r1 -background $::panel_background + pack $id.colors.r1 -side top + foreach i { 0 1 2 3 4 5 6 7 8 9} \ + hexcol { 0xFFFFFF 0xDFDFDF 0xBBBBBB 0xFFC7C6 0xFFE3C6 \ + 0xFEFFC6 0xC6FFC7 0xc6FEFF 0xC7C6FF 0xE3C6FF } \ + { + label $id.colors.r1.c$i -background [format "#%6.6x" $hexcol] \ + -activebackground [format "#%6.6x" $hexcol] -relief ridge \ + -padx 7 -pady 0 + bind $id.colors.r1.c$i <Button> [format "::pd_iemgui::preset_col %s %d" $id $hexcol] + } + pack $id.colors.r1.c0 $id.colors.r1.c1 $id.colors.r1.c2 $id.colors.r1.c3 \ + $id.colors.r1.c4 $id.colors.r1.c5 $id.colors.r1.c6 $id.colors.r1.c7 \ + $id.colors.r1.c8 $id.colors.r1.c9 -side left + + frame $id.colors.r2 -background $::panel_background + pack $id.colors.r2 -side top + foreach i { 0 1 2 3 4 5 6 7 8 9 } \ + hexcol { 0x9F9F9F 0x7C7C7C 0x606060 0xFF0400 0xFF8300 \ + 0xFAFF00 0x00FF04 0x00FAFF 0x0400FF 0x9C00FF } \ + { + label $id.colors.r2.c$i -background [format "#%6.6x" $hexcol] \ + -activebackground [format "#%6.6x" $hexcol] -relief ridge \ + -padx 7 -pady 0 + bind $id.colors.r2.c$i <Button> \ + [format "::pd_iemgui::preset_col %s %d" $id $hexcol] + } + pack $id.colors.r2.c0 $id.colors.r2.c1 $id.colors.r2.c2 $id.colors.r2.c3 \ + $id.colors.r2.c4 $id.colors.r2.c5 $id.colors.r2.c6 $id.colors.r2.c7 \ + $id.colors.r2.c8 $id.colors.r2.c9 -side left + + frame $id.colors.r3 -background $::panel_background + pack $id.colors.r3 -side top + foreach i { 0 1 2 3 4 5 6 7 8 9 } \ + hexcol { 0x404040 0x202020 0x000000 0x551312 0x553512 \ + 0x535512 0x0F4710 0x0E4345 0x131255 0x2F004D } \ + { + label $id.colors.r3.c$i -background [format "#%6.6x" $hexcol] \ + -activebackground [format "#%6.6x" $hexcol] -relief ridge \ + -padx 7 -pady 0 + bind $id.colors.r3.c$i <Button> \ + [format "::pd_iemgui::preset_col %s %d" $id $hexcol] + } + pack $id.colors.r3.c0 $id.colors.r3.c1 $id.colors.r3.c2 $id.colors.r3.c3 \ + $id.colors.r3.c4 $id.colors.r3.c5 $id.colors.r3.c6 $id.colors.r3.c7 \ + $id.colors.r3.c8 $id.colors.r3.c9 -side left + + frame $id.cao -pady 10 -background $::panel_background + pack $id.cao -side top + button $id.cao.cancel -command "::pd_iemgui::cancel $id" \ + -text "Cancel" -width 6 -highlightbackground $::panel_background + label $id.cao.dummy1 -text "" -width 3 -background $::panel_background + button $id.cao.apply -text "Apply" -width 6 -command "::pd_iemgui::apply $id" \ + -highlightbackground $::panel_background + label $id.cao.dummy2 -text "" -width 3 -background $::panel_background + button $id.cao.ok -text {OK} -width 6 -command "::pd_iemgui::ok $id" \ + -highlightbackground $::panel_background + + pack $id.cao.cancel $id.cao.dummy1 -side left + pack $id.cao.apply $id.cao.dummy2 -side left + pack $id.cao.ok -side left + + if {[info tclversion] < 8.4} { + bind $id <Key-Tab> {tkTabToWindow [tk_focusNext %W]} + bind $id <<PrevWindow>> {tkTabToWindow [tk_focusPrev %W]} + } else { + bind $id <Key-Tab> {tk::TabToWindow [tk_focusNext %W]} + bind $id <<PrevWindow>> {tk::TabToWindow [tk_focusPrev %W]} + } + + $id.dim.w_ent select from 0 + $id.dim.w_ent select adjust end + focus $id.dim.w_ent +} + Deleted: branches/pd-devel/0.41.4/src/pd_iemgui.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_iemgui.tcl 2009-02-03 05:34:51 UTC (rev 10721) +++ branches/pd-devel/0.41.4/src/pd_iemgui.tcl 2009-02-03 05:40:41 UTC (rev 10722) @@ -1,794 +0,0 @@ -# For information on usage and redistribution, and for a DISCLAIMER OF ALL -# WARRANTIES, see the file, "LICENSE.txt," in this distribution. -# Copyright (c) 1997-2009 Miller Puckette. - -package provide pd_iemgui 0.1 - -namespace eval ::pd_iemgui:: { - variable define_min_flashhold 50 - variable define_min_flashbreak 10 - variable define_min_fontsize 4 - - namespace export pdtk_iemgui_dialog -} - -# TODO rename $id to $mytoplevel - -proc ::pd_iemgui::clip_dim {id} { - set vid [string trimleft $id .] - - set var_iemgui_wdt [concat iemgui_wdt_$vid] - global $var_iemgui_wdt - set var_iemgui_min_wdt [concat iemgui_min_wdt_$vid] - global $var_iemgui_min_wdt - set var_iemgui_hgt [concat iemgui_hgt_$vid] - global $var_iemgui_hgt - set var_iemgui_min_hgt [concat iemgui_min_hgt_$vid] - global $var_iemgui_min_hgt - - if {[eval concat $$var_iemgui_wdt] < [eval concat $$var_iemgui_min_wdt]} { - set $var_iemgui_wdt [eval concat $$var_iemgui_min_wdt] - $id.dim.w_ent configure -textvariable $var_iemgui_wdt - } - if {[eval concat $$var_iemgui_hgt] < [eval concat $$var_iemgui_min_hgt]} { - set $var_iemgui_hgt [eval concat $$var_iemgui_min_hgt] - $id.dim.h_ent configure -textvariable $var_iemgui_hgt - } -} - -proc ::pd_iemgui::clip_num {id} { - set vid [string trimleft $id .] - - set var_iemgui_num [concat iemgui_num_$vid] - global $var_iemgui_num - - if {[eval concat $$var_iemgui_num] > 2000} { - set $var_iemgui_num 2000 - $id.para.num_ent configure -textvariable $var_iemgui_num - } - if {[eval concat $$var_iemgui_num] < 1} { - set $var_iemgui_num 1 - $id.para.num_ent configure -textvariable $var_iemgui_num - } -} - -proc ::pd_iemgui::sched_rng {id} { - set vid [string trimleft $id .] - - set var_iemgui_min_rng [concat iemgui_min_rng_$vid] - global $var_iemgui_min_rng - set var_iemgui_max_rng [concat iemgui_max_rng_$vid] - global $var_iemgui_max_rng - set var_iemgui_rng_sch [concat iemgui_rng_sch_$vid] - global $var_iemgui_rng_sch - - variable define_min_flashhold - variable define_min_flashbreak - - if {[eval concat $$var_iemgui_rng_sch] == 2} { - if {[eval concat $$var_iemgui_max_rng] < [eval concat $$var_iemgui_min_rng]} { - set hhh [eval concat $$var_iemgui_min_rng] - set $var_iemgui_min_rng [eval concat $$var_iemgui_max_rng] - set $var_iemgui_max_rng $hhh - $id.rng.max_ent configure -textvariable $var_iemgui_max_rng - $id.rng.min_ent configure -textvariable $var_iemgui_min_rng } - if {[eval concat $$var_iemgui_max_rng] < $define_min_flashhold} { - set $var_iemgui_max_rng $iemgui_define_min_flashhold - $id.rng.max_ent configure -textvariable $var_iemgui_max_rng - } - if {[eval concat $$var_iemgui_min_rng] < $define_min_flashbreak} { - set $var_iemgui_min_rng $define_min_flashbreak - $id.rng.min_ent configure -textvariable $var_iemgui_min_rng - } - } - if {[eval concat $$var_iemgui_rng_sch] == 1} { - if {[eval concat $$var_iemgui_min_rng] == 0.0} { - set $var_iemgui_min_rng 1.0 - $id.rng.min_ent configure -textvariable $var_iemgui_min_rng - } - } -} - -proc ::pd_iemgui::verify_rng {id} { - set vid [string trimleft $id .] - - set var_iemgui_min_rng [concat iemgui_min_rng_$vid] - global $var_iemgui_min_rng - set var_iemgui_max_rng [concat iemgui_max_rng_$vid] - global $var_iemgui_max_rng - set var_iemgui_lin0_log1 [concat iemgui_lin0_log1_$vid] - global $var_iemgui_lin0_log1 - - if {[eval concat $$var_iemgui_lin0_log1] == 1} { - if {[eval concat $$var_iemgui_max_rng] == 0.0 && [eval concat $$var_iemgui_min_rng] == 0.0} { - set $var_iemgui_max_rng 1.0 - $id.rng.max_ent configure -textvariable $var_iemgui_max_rng - } - if {[eval concat $$var_iemgui_max_rng] > 0} { - if {[eval concat $$var_iemgui_min_rng] <= 0} { - set $var_iemgui_min_rng [expr [eval concat $$var_iemgui_max_rng] * 0.01] - $id.rng.min_ent configure -textvariable $var_iemgui_min_rng - } - } else { - if {[eval concat $$var_iemgui_min_rng] > 0} { - set $var_iemgui_max_rng [expr [eval concat $$var_iemgui_min_rng] * 0.01] - $id.rng.max_ent configure -textvariable $var_iemgui_max_rng - } - } - } -} - -proc ::pd_iemgui::clip_fontsize {id} { - set vid [string trimleft $id .] - - set var_iemgui_gn_fs [concat iemgui_gn_fs_$vid] - global $var_iemgui_gn_fs - - variable define_min_fontsize - - if {[eval concat $$var_iemgui_gn_fs] < $define_min_fontsize} { - set $var_iemgui_gn_fs $define_min_fontsize - $id.label.fs_ent configure -textvariable $var_iemgui_gn_fs - } -} - -proc ::pd_iemgui::set_col_example {id} { - set vid [string trimleft $id .] - - set var_iemgui_bcol [concat iemgui_bcol_$vid] - global $var_iemgui_bcol - set var_iemgui_fcol [concat iemgui_fcol_$vid] - global $var_iemgui_fcol - set var_iemgui_lcol [concat iemgui_lcol_$vid] - global $var_iemgui_lcol - - $id.colors.sections.lb_bk configure \ - -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -foreground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] \ - -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] - - if { [eval concat $$var_iemgui_fcol] >= 0 } { - $id.colors.sections.fr_bk configure \ - -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -foreground [format "#%6.6x" [eval concat $$var_iemgui_fcol]] \ - -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_fcol]] - } else { - $id.colors.sections.fr_bk configure \ - -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -foreground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_bcol]]} -} - -proc ::pd_iemgui::preset_col {id presetcol} { - set vid [string trimleft $id .] - - set var_iemgui_l2_f1_b0 [concat iemgui_l2_f1_b0_$vid] - global $var_iemgui_l2_f1_b0 - set var_iemgui_bcol [concat iemgui_bcol_$vid] - global $var_iemgui_bcol - set var_iemgui_fcol [concat iemgui_fcol_$vid] - global $var_iemgui_fcol - set var_iemgui_lcol [concat iemgui_lcol_$vid] - global $var_iemgui_lcol - - if { [eval concat $$var_iemgui_l2_f1_b0] == 0 } { set $var_iemgui_bcol $presetcol } - if { [eval concat $$var_iemgui_l2_f1_b0] == 1 } { set $var_iemgui_fcol $presetcol } - if { [eval concat $$var_iemgui_l2_f1_b0] == 2 } { set $var_iemgui_lcol $presetcol } - ::pd_iemgui::set_col_example $id -} - -proc ::pd_iemgui::choose_col_bkfrlb {id} { - set vid [string trimleft $id .] - - set var_iemgui_l2_f1_b0 [concat iemgui_l2_f1_b0_$vid] - global $var_iemgui_l2_f1_b0 - set var_iemgui_bcol [concat iemgui_bcol_$vid] - global $var_iemgui_bcol - set var_iemgui_fcol [concat iemgui_fcol_$vid] - global $var_iemgui_fcol - set var_iemgui_lcol [concat iemgui_lcol_$vid] - global $var_iemgui_lcol - - if {[eval concat $$var_iemgui_l2_f1_b0] == 0} { - set $var_iemgui_bcol [expr [eval concat $$var_iemgui_bcol] & 0xFCFCFC] - set helpstring [tk_chooseColor -title "Background-Color" -initialcolor [format "#%6.6x" [eval concat $$var_iemgui_bcol]]] - if { $helpstring != "" } { - set $var_iemgui_bcol [string replace $helpstring 0 0 "0x"] - set $var_iemgui_bcol [expr [eval concat $$var_iemgui_bcol] & 0xFCFCFC] } - } - if {[eval concat $$var_iemgui_l2_f1_b0] == 1} { - set $var_iemgui_fcol [expr [eval concat $$var_iemgui_fcol] & 0xFCFCFC] - set helpstring [tk_chooseColor -title "Front-Color" -initialcolor [format "#%6.6x" [eval concat $$var_iemgui_fcol]]] - if { $helpstring != "" } { - set $var_iemgui_fcol [string replace $helpstring 0 0 "0x"] - set $var_iemgui_fcol [expr [eval concat $$var_iemgui_fcol] & 0xFCFCFC] } - } - if {[eval concat $$var_iemgui_l2_f1_b0] == 2} { - set $var_iemgui_lcol [expr [eval concat $$var_iemgui_lcol] & 0xFCFCFC] - set helpstring [tk_chooseColor -title "Label-Color" -initialcolor [format "#%6.6x" [eval concat $$var_iemgui_lcol]]] - if { $helpstring != "" } { - set $var_iemgui_lcol [string replace $helpstring 0 0 "0x"] - set $var_iemgui_lcol [expr [eval concat $$var_iemgui_lcol] & 0xFCFCFC] } - } - ::pd_iemgui::set_col_example $id -} - -proc ::pd_iemgui::lilo {id} { - set vid [string trimleft $id .] - - set var_iemgui_lin0_log1 [concat iemgui_lin0_log1_$vid] - global $var_iemgui_lin0_log1 - set var_iemgui_lilo0 [concat iemgui_lilo0_$vid] - global $var_iemgui_lilo0 - set var_iemgui_lilo1 [concat iemgui_lilo1_$vid] - global $var_iemgui_lilo1 - - ::pd_iemgui::sched_rng $id - - if {[eval concat $$var_iemgui_lin0_log1] == 0} { - set $var_iemgui_lin0_log1 1 - $id.para.lilo configure -text [eval concat $$var_iemgui_lilo1] - ::pd_iemgui::verify_rng $id - ::pd_iemgui::sched_rng $id - } else { - set $var_iemgui_lin0_log1 0 - $id.para.lilo configure -text [eval concat $$var_iemgui_lilo0] - } -} - -proc ::pd_iemgui::toggle_font {id gn_f} { - set vid [string trimleft $id .] - - set var_iemgui_gn_f [concat iemgui_gn_f_$vid] - global $var_iemgui_gn_f - - set $var_iemgui_gn_f $gn_f - - switch -- $gn_f { - 0 { set current_font $::font_family} - 1 { set current_font "Helvetica" } - 2 { set current_font "Times" } - } - set current_font_spec "{$current_font} 12 $::font_weight" - - $id.label.fontpopup_label configure -text $current_font \ - -font $current_font_spec - $id.label.name_entry configure -font $current_font_spec - $id.colors.sections.fr_bk configure -font $current_font_spec - $id.colors.sections.lb_bk configure -font $current_font_spec -} - -proc ::pd_iemgui::lb {id} { - set vid [string trimleft $id .] - - set var_iemgui_loadbang [concat iemgui_loadbang_$vid] - global $var_iemgui_loadbang - - if {[eval concat $$var_iemgui_loadbang] == 0} { - set $var_iemgui_loadbang 1 - $id.para.lb configure -text "init" - } else { - set $var_iemgui_loadbang 0 - $id.para.lb configure -text "no init" - } -} - -proc ::pd_iemgui::stdy_jmp {id} { - set vid [string trimleft $id .] - - set var_iemgui_steady [concat iemgui_steady_$vid] - global $var_iemgui_steady - - if {[eval concat $$var_iemgui_steady]} { - set $var_iemgui_steady 0 - $id.para.stdy_jmp configure -text "jump on click" - } else { - set $var_iemgui_steady 1 - $id.para.stdy_jmp configure -text "steady on click" - } -} - -proc ::pd_iemgui::apply {id} { - set vid [string trimleft $id .] - - set var_iemgui_wdt [concat iemgui_wdt_$vid] - global $var_iemgui_wdt - set var_iemgui_min_wdt [concat iemgui_min_wdt_$vid] - global $var_iemgui_min_wdt - set var_iemgui_hgt [concat iemgui_hgt_$vid] - global $var_iemgui_hgt - set var_iemgui_min_hgt [concat iemgui_min_hgt_$vid] - global $var_iemgui_min_hgt - set var_iemgui_min_rng [concat iemgui_min_rng_$vid] - global $var_iemgui_min_rng - set var_iemgui_max_rng [concat iemgui_max_rng_$vid] - global $var_iemgui_max_rng - set var_iemgui_lin0_log1 [concat iemgui_lin0_log1_$vid] - global $var_iemgui_lin0_log1 - set var_iemgui_lilo0 [concat iemgui_lilo0_$vid] - global $var_iemgui_lilo0 - set var_iemgui_lilo1 [concat iemgui_lilo1_$vid] - global $var_iemgui_lilo1 - set var_iemgui_loadbang [concat iemgui_loadbang_$vid] - global $var_iemgui_loadbang - set var_iemgui_num [concat iemgui_num_$vid] - global $var_iemgui_num - set var_iemgui_steady [concat iemgui_steady_$vid] - global $var_iemgui_steady - set var_iemgui_snd [concat iemgui_snd_$vid] - global $var_iemgui_snd - set var_iemgui_rcv [concat iemgui_rcv_$vid] - global $var_iemgui_rcv - set var_iemgui_gui_nam [concat iemgui_gui_nam_$vid] - global $var_iemgui_gui_nam - set var_iemgui_gn_dx [concat iemgui_gn_dx_$vid] - global $var_iemgui_gn_dx - set var_iemgui_gn_dy [concat iemgui_gn_dy_$vid] - global $var_iemgui_gn_dy - set var_iemgui_gn_f [concat iemgui_gn_f_$vid] - global $var_iemgui_gn_f - set var_iemgui_gn_fs [concat iemgui_gn_fs_$vid] - global $var_iemgui_gn_fs - set var_iemgui_bcol [concat iemgui_bcol_$vid] - global $var_iemgui_bcol - set var_iemgui_fcol [concat iemgui_fcol_$vid] - global $var_iemgui_fcol - set var_iemgui_lcol [concat iemgui_lcol_$vid] - global $var_iemgui_lcol - - ::pd_iemgui::clip_dim $id - ::pd_iemgui::clip_num $id - ::pd_iemgui::sched_rng $id - ::pd_iemgui::verify_rng $id - ::pd_iemgui::sched_rng $id - ::pd_iemgui::clip_fontsize $id - - if {[eval concat $$var_iemgui_snd] == ""} {set hhhsnd "empty"} else {set hhhsnd [eval concat $$var_iemgui_snd]} - if {[eval concat $$var_iemgui_rcv] == ""} {set hhhrcv "empty"} else {set hhhrcv [eval concat $$var_iemgui_rcv]} - if {[eval concat $$var_iemgui_gui_nam] == ""} {set hhhgui_nam "empty" - } else { - set hhhgui_nam [eval concat $$var_iemgui_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 #] } - - set hhhsnd [unspace_text $hhhsnd] - set hhhrcv [unspace_text $hhhrcv] - set hhhgui_nam [unspace_text $hhhgui_nam] - - pdsend [concat $id dialog \ - [eval concat $$var_iemgui_wdt] \ - [eval concat $$var_iemgui_hgt] \ - [eval concat $$var_iemgui_min_rng] \ - [eval concat $$var_iemgui_max_rng] \ - [eval concat $$var_iemgui_lin0_log1] \ - [eval concat $$var_iemgui_loadbang] \ - [eval concat $$var_iemgui_num] \ - $hhhsnd \ - $hhhrcv \ - $hhhgui_nam \ - [eval concat $$var_iemgui_gn_dx] \ - [eval concat $$var_iemgui_gn_dy] \ - [eval concat $$var_iemgui_gn_f] \ - [eval concat $$var_iemgui_gn_fs] \ - [eval concat $$var_iemgui_bcol] \ - [eval concat $$var_iemgui_fcol] \ - [eval concat $$var_iemgui_lcol] \ - [eval concat $$var_iemgui_steady]] -} - - -proc iemgui_cancel {mytoplevel} { - # TODO kludge!! until a common approach to ::pd_bindings::panel_bindings - # is sorted out - ::pd_iemgui::cancel $mytoplevel -} -proc ::pd_iemgui::cancel {id} { - pdsend "$id cancel" -} - -proc iemgui_ok {mytoplevel} { - # TODO kludge!! until a common approach to ::pd_bindings::panel_bindings - # is sorted out - ::pd_iemgui::ok $mytoplevel -} -proc ::pd_iemgui::ok {id} { - ::pd_iemgui::apply $id - ::pd_iemgui::cancel $id -} - -proc ::pd_iemgui::pdtk_iemgui_dialog {id mainheader dim_header \ - wdt min_wdt wdt_label \ - hgt min_hgt hgt_label \ - 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} { - - set vid [string trimleft $id .] - - set var_iemgui_wdt [concat iemgui_wdt_$vid] - global $var_iemgui_wdt - set var_iemgui_min_wdt [concat iemgui_min_wdt_$vid] - global $var_iemgui_min_wdt - set var_iemgui_hgt [concat iemgui_hgt_$vid] - global $var_iemgui_hgt - set var_iemgui_min_hgt [concat iemgui_min_hgt_$vid] - global $var_iemgui_min_hgt - set var_iemgui_min_rng [concat iemgui_min_rng_$vid] - global $var_iemgui_min_rng - set var_iemgui_max_rng [concat iemgui_max_rng_$vid] - global $var_iemgui_max_rng - set var_iemgui_rng_sch [concat iemgui_rng_sch_$vid] - global $var_iemgui_rng_sch - set var_iemgui_lin0_log1 [concat iemgui_lin0_log1_$vid] - global $var_iemgui_lin0_log1 - set var_iemgui_lilo0 [concat iemgui_lilo0_$vid] - global $var_iemgui_lilo0 - set var_iemgui_lilo1 [concat iemgui_lilo1_$vid] - global $var_iemgui_lilo1 - set var_iemgui_loadbang [concat iemgui_loadbang_$vid] - global $var_iemgui_loadbang - set var_iemgui_num [concat iemgui_num_$vid] - global $var_iemgui_num - set var_iemgui_steady [concat iemgui_steady_$vid] - global $var_iemgui_steady - set var_iemgui_snd [concat iemgui_snd_$vid] - global $var_iemgui_snd - set var_iemgui_rcv [concat iemgui_rcv_$vid] - global $var_iemgui_rcv - set var_iemgui_gui_nam [concat iemgui_gui_nam_$vid] - global $var_iemgui_gui_nam - set var_iemgui_gn_dx [concat iemgui_gn_dx_$vid] - global $var_iemgui_gn_dx - set var_iemgui_gn_dy [concat iemgui_gn_dy_$vid] - global $var_iemgui_gn_dy - set var_iemgui_gn_f [concat iemgui_gn_f_$vid] - global $var_iemgui_gn_f - set var_iemgui_gn_fs [concat iemgui_gn_fs_$vid] - global $var_iemgui_gn_fs - set var_iemgui_l2_f1_b0 [concat iemgui_l2_f1_b0_$vid] - global $var_iemgui_l2_f1_b0 - set var_iemgui_bcol [concat iemgui_bcol_$vid] - global $var_iemgui_bcol - set var_iemgui_fcol [concat iemgui_fcol_$vid] - global $var_iemgui_fcol - set var_iemgui_lcol [concat iemgui_lcol_$vid] - global $var_iemgui_lcol - - set $var_iemgui_wdt $wdt - set $var_iemgui_min_wdt $min_wdt - set $var_iemgui_hgt $hgt - set $var_iemgui_min_hgt $min_hgt - set $var_iemgui_min_rng $min_rng - set $var_iemgui_max_rng $max_rng - set $var_iemgui_rng_sch $rng_sched - set $var_iemgui_lin0_log1 $lin0_log1 - set $var_iemgui_lilo0 $lilo0_label - set $var_iemgui_lilo1 $lilo1_label - set $var_iemgui_loadbang $loadbang - set $var_iemgui_num $num - set $var_iemgui_steady $steady - if {$snd == "empty"} {set $var_iemgui_snd [format ""] - } else {set $var_iemgui_snd [format "%s" $snd]} - if {$rcv == "empty"} {set $var_iemgui_rcv [format ""] - } else {set $var_iemgui_rcv [format "%s" $rcv]} - if {$gui_name == "empty"} {set $var_iemgui_gui_nam [format ""] - } else {set $var_iemgui_gui_nam [format "%s" $gui_name]} - - if {[string index [eval concat $$var_iemgui_snd] 0] == "#"} { - set $var_iemgui_snd [string replace [eval concat $$var_iemgui_snd] 0 0 $] } - if {[string index [eval concat $$var_iemgui_rcv] 0] == "#"} { - set $var_iemgui_rcv [string replace [eval concat $$var_iemgui_rcv] 0 0 $] } - if {[string index [eval concat $$var_iemgui_gui_nam] 0] == "#"} { - set $var_iemgui_gui_nam [string replace [eval concat $$var_iemgui_gui_nam] 0 0 $] } - set $var_iemgui_gn_dx $gn_dx - set $var_iemgui_gn_dy $gn_dy - set $var_iemgui_gn_f $gn_f - set $var_iemgui_gn_fs $gn_fs - - set $var_iemgui_bcol $bcol - set $var_iemgui_fcol $fcol - set $var_iemgui_lcol $lcol - - set $var_iemgui_l2_f1_b0 0 - - toplevel $id -background $::panel_background - wm title $id [format "%s Properties" $mainheader] - wm resizable $id 0 0 - wm protocol $id WM_DELETE_WINDOW [concat ::pd_iemgui::cancel $id] - - ::pd_bindings::panel_bindings $id "iemgui" - - frame $id.dim -background $::panel_background - pack $id.dim -side top - label $id.dim.head -text $dim_header -background $::panel_background - label $id.dim.w_lab -text $wdt_label -width 6 -background $::panel_background - entry $id.dim.w_ent -textvariable $var_iemgui_wdt -width 5 \ - -highlightbackground $::panel_background - label $id.dim.dummy1 -text " " -width 10 -background $::panel_background - label $id.dim.h_lab -text $hgt_label -width 6 -background $::panel_background - entry $id.dim.h_ent -textvariable $var_iemgui_hgt -width 5 \ - -highlightbackground $::panel_background - pack $id.dim.head -side top - pack $id.dim.w_lab $id.dim.w_ent $id.dim.dummy1 -side left - if { $hgt_label != "empty" } { - pack $id.dim.h_lab $id.dim.h_ent -side left} - - frame $id.rng -background $::panel_background - pack $id.rng -side top - label $id.rng.head -text $rng_header -background $::panel_background - label $id.rng.min_lab -text $min_rng_label -width 6 -background $::panel_background - entry $id.rng.min_ent -textvariable $var_iemgui_min_rng -width 9 \ - -highlightbackground $::panel_background - label $id.rng.dummy1 -text " " -width 1 -background $::panel_background - label $id.rng.max_lab -text $max_rng_label -width 8 -background $::panel_background - entry $id.rng.max_ent -textvariable $var_iemgui_max_rng -width 9 \ - -highlightbackground $::panel_background - if { $rng_header != "empty" } { - pack $id.rng.head -side top - if { $min_rng_label != "empty" } { - pack $id.rng.min_lab $id.rng.min_ent -side left} - if { $max_rng_label != "empty" } { - pack $id.rng.dummy1 \ - $id.rng.max_lab $id.rng.max_ent -side left} } - - if { [eval concat $$var_iemgui_lin0_log1] >= 0 || [eval concat $$var_iemgui_loadbang] >= 0 || [eval concat $$var_iemgui_num] > 0 || [eval concat $$var_iemgui_steady] >= 0 } { - label $id.space1 -text "" -background $::panel_background - pack $id.space1 -side top } - - frame $id.para -background $::panel_background - pack $id.para -side top - label $id.para.dummy2 -text "" -width 1 -background $::panel_background - label $id.para.dummy3 -text "" -width 1 -background $::panel_background - if {[eval concat $$var_iemgui_lin0_log1] == 0} { - button $id.para.lilo -text [eval concat $$var_iemgui_lilo0] -width 5 \ - -command "::pd_iemgui::lilo $id" -highlightbackground $::panel_background } - if {[eval concat $$var_iemgui_lin0_log1] == 1} { - button $id.para.lilo -text [eval concat $$var_iemgui_lilo1] -width 5 \ - -command "::pd_iemgui::lilo $id" -highlightbackground $::panel_background } - if {[eval concat $$var_iemgui_loadbang] == 0} { - button $id.para.lb -text "no init" -width 5 \ - -command "::pd_iemgui::lb $id" -highlightbackground $::panel_background } - if {[eval concat $$var_iemgui_loadbang] == 1} { - button $id.para.lb -text "init" -width 5 \ - -command "::pd_iemgui::lb $id" -highlightbackground $::panel_background } - label $id.para.num_lab -text $num_label -width 9 -background $::panel_background - entry $id.para.num_ent -textvariable $var_iemgui_num -width 4 \ - -highlightbackground $::panel_background - - if {[eval concat $$var_iemgui_steady] == 0} { - button $id.para.stdy_jmp -command "::pd_iemgui::stdy_jmp $id" \ - -text "jump on click" -width 11 -highlightbackground $::panel_background } - if {[eval concat $$var_iemgui_steady] == 1} { - button $id.para.stdy_jmp -command "::pd_iemgui::stdy_jmp $id" \ - -text "steady on click" -width 11 -highlightbackground $::panel_background } - if {[eval concat $$var_iemgui_lin0_log1] >= 0} { - pack $id.para.lilo -side left -expand 1} - if {[eval concat $$var_iemgui_loadbang] >= 0} { - pack $id.para.dummy2 $id.para.lb -side left -expand 1} - if {[eval concat $$var_iemgui_num] > 0} { - pack $id.para.dummy3 $id.para.num_lab $id.para.num_ent -side left -expand 1} - if {[eval concat $$var_iemgui_steady] >= 0} { - pack $id.para.dummy3 $id.para.stdy_jmp -side left -expand 1} - - frame $id.spacer0 -height 4 -background $::panel_background - pack $id.spacer0 -side top - - labelframe $id.s_r -borderwidth 1 -pady 4 -text "messages" \ - -font highlight_font -background $::panel_background - pack $id.s_r -side top -fill x -ipadx 5 - frame $id.s_r.send -background $::panel_background - pack $id.s_r.send -side top - label $id.s_r.send.lab -text " send-symbol:" -width 12 -justify right \ - -background $::panel_background - entry $id.s_r.send.ent -textvariable $var_iemgui_snd -width 22 \ - -highlightbackground $::panel_background - if { $snd != "nosndno" } { - pack $id.s_r.send.lab $id.s_r.send.ent -side left} - - frame $id.s_r.receive -background $::panel_background - pack $id.s_r.receive -side top - label $id.s_r.receive.lab -text "receive-symbol:" -width 12 -justify right \ - -background $::panel_background - entry $id.s_r.receive.ent -textvariable $var_iemgui_rcv -width 22 \ - -highlightbackground $::panel_background - if { $rcv != "norcvno" } { - pack $id.s_r.receive.lab $id.s_r.receive.ent -side left} - - # get the current font name from the int given from C-space (gn_f) - set current_font $::font_family - if {[eval concat $$var_iemgui_gn_f] == 1} \ - { set current_font "Helvetica" } - if {[eval concat $$var_iemgui_gn_f] == 2} \ - { set current_font "Times" } - - frame $id.spacer1 -height 7 -background $::panel_background - pack $id.spacer1 -side top - - labelframe $id.label -borderwidth 1 -text "label" -pady 4 \ - -font highlight_font -background $::panel_background - pack $id.label -side top -fill x - entry $id.label.name_entry -textvariable $var_iemgui_gui_nam -width 30 \ - -font [list $current_font 12 $::font_weight] \ - -highlightbackground $::panel_background - pack $id.label.name_entry -side top -expand yes -fill both -padx 5 - - frame $id.label.xy -padx 27 -pady 1 -background $::panel_background - pack $id.label.xy -side top - label $id.label.xy.x_lab -text "x offset" -width 6 -background $::panel_background - entry $id.label.xy.x_entry -textvariable $var_iemgui_gn_dx -width 5 \ - -highlightbackground $::panel_background - label $id.label.xy.dummy1 -text " " -width 2 -background $::panel_background - label $id.label.xy.y_lab -text "y offset" -width 6 -background $::panel_background - entry $id.label.xy.y_entry -textvariable $var_iemgui_gn_dy -width 5 \ - -highlightbackground $::panel_background - pack $id.label.xy.x_lab $id.label.xy.x_entry $id.label.xy.dummy1 \ - $id.label.xy.y_lab $id.label.xy.y_entry -side left -anchor e - - label $id.label.fontpopup_label -text $current_font \ - -relief groove -font [list $current_font 12 $::font_weight] -padx 5 - pack $id.label.fontpopup_label -side left -anchor w -expand yes -fill x - label $id.label.fontsize_label -text "size" -width 4 -background $::panel_background - entry $id.label.fontsize_entry -textvariable $var_iemgui_gn_fs -width 5 \ - -highlightbackground $::panel_background - pack $id.label.fontsize_entry $id.label.fontsize_label \ - -side right -anchor e -padx 5 -pady 5 - menu $id.popup - $id.popup add command \ - -label $::font_family \ - -font [format {{%s} 12 %s} $::font_family $::font_weight] \ - -command "::pd_iemgui::toggle_font $id 0" - $id.popup add command \ - -label "Helvetica" \ - -font [format {Helvetica 12 %s} $::font_weight] \ - -command "::pd_iemgui::toggle_font $id 1" - $id.popup add command \ - -label "Times" \ - -font [format {Times 12 %s} $::font_weight] \ - -command "::pd_iemgui::toggle_font $id 2" - bind $id.label.fontpopup_label <Button> \ - [list tk_popup $id.popup %X %Y] - - frame $id.spacer2 -height 7 -background $::panel_background - pack $id.spacer2 -side top - - labelframe $id.colors -borderwidth 1 -text "colors" -font highlight_font \ - -background $::panel_background - pack $id.colors -fill x -ipadx 5 -ipady 4 - - frame $id.colors.select -background $::panel_background - pack $id.colors.select -side top - radiobutton $id.colors.select.radio0 -value 0 -variable \ - $var_iemgui_l2_f1_b0 -text "background" -width 10 -justify left \ - -background $::panel_background - radiobutton $id.colors.select.radio1 -value 1 -variable \ - $var_iemgui_l2_f1_b0 -text "front" -width 5 -justify left \ - -background $::panel_background - radiobutton $id.colors.select.radio2 -value 2 -variable \ - $var_iemgui_l2_f1_b0 -text "label" -width 5 -justify left \ - -background $::panel_background - if { [eval concat $$var_iemgui_fcol] >= 0 } { - pack $id.colors.select.radio0 $id.colors.select.radio1 \ - $id.colors.select.radio2 -side left - } else { - pack $id.colors.select.radio0 $id.colors.select.radio2 -side left - } - - frame $id.colors.sections -background $::panel_background - pack $id.colors.sections -side top - button $id.colors.sections.but -command "::pd_iemgui::choose_col_bkfrlb $id" \ - -text "compose color" -width 12 -highlightbackground $::panel_background - pack $id.colors.sections.but -side left -anchor w -padx 10 -pady 5 \ - -expand yes -fill x - if { [eval concat $$var_iemgui_fcol] >= 0 } { - label $id.colors.sections.fr_bk -text "o=||=o" -width 6 \ - -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -foreground [format "#%6.6x" [eval concat $$var_iemgui_fcol]] \ - -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_fcol]] \ - -font [list $current_font 12 $::font_weight] -padx 2 -pady 2 -relief ridge - } else { - label $id.colors.sections.fr_bk -text "o=||=o" -width 6 \ - -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -foreground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -font [list $current_font 12 $::font_weight] -padx 2 -pady 2 -relief ridge - } - label $id.colors.sections.lb_bk -text "testlabel" -width 9 \ - -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -foreground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] \ - -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] \ - -font [list $current_font 12 $::font_weight] -padx 2 -pady 2 -relief ridge - pack $id.colors.sections.lb_bk $id.colors.sections.fr_bk \ - -side right -anchor e -expand yes -fill both -pady 7 - - # color scheme by Mary Ann Benedetto http://piR2.org - frame $id.colors.r1 -background $::panel_background - pack $id.colors.r1 -side top - foreach i { 0 1 2 3 4 5 6 7 8 9} \ - hexcol { 0xFFFFFF 0xDFDFDF 0xBBBBBB 0xFFC7C6 0xFFE3C6 \ - 0xFEFFC6 0xC6FFC7 0xc6FEFF 0xC7C6FF 0xE3C6FF } \ - { - label $id.colors.r1.c$i -background [format "#%6.6x" $hexcol] \ - -activebackground [format "#%6.6x" $hexcol] -relief ridge \ - -padx 7 -pady 0 - bind $id.colors.r1.c$i <Button> [format "::pd_iemgui::preset_col %s %d" $id $hexcol] - } - pack $id.colors.r1.c0 $id.colors.r1.c1 $id.colors.r1.c2 $id.colors.r1.c3 \ - $id.colors.r1.c4 $id.colors.r1.c5 $id.colors.r1.c6 $id.colors.r1.c7 \ - $id.colors.r1.c8 $id.colors.r1.c9 -side left - - frame $id.colors.r2 -background $::panel_background - pack $id.colors.r2 -side top - foreach i { 0 1 2 3 4 5 6 7 8 9 } \ - hexcol { 0x9F9F9F 0x7C7C7C 0x606060 0xFF0400 0xFF8300 \ - 0xFAFF00 0x00FF04 0x00FAFF 0x0400FF 0x9C00FF } \ - { - label $id.colors.r2.c$i -background [format "#%6.6x" $hexcol] \ - -activebackground [format "#%6.6x" $hexcol] -relief ridge \ - -padx 7 -pady 0 - bind $id.colors.r2.c$i <Button> \ - [format "::pd_iemgui::preset_col %s %d" $id $hexcol] - } - pack $id.colors.r2.c0 $id.colors.r2.c1 $id.colors.r2.c2 $id.colors.r2.c3 \ - $id.colors.r2.c4 $id.colors.r2.c5 $id.colors.r2.c6 $id.colors.r2.c7 \ - $id.colors.r2.c8 $id.colors.r2.c9 -side left - - frame $id.colors.r3 -background $::panel_background - pack $id.colors.r3 -side top - foreach i { 0 1 2 3 4 5 6 7 8 9 } \ - hexcol { 0x404040 0x202020 0x000000 0x551312 0x553512 \ - 0x535512 0x0F4710 0x0E4345 0x131255 0x2F004D } \ - { - label $id.colors.r3.c$i -background [format "#%6.6x" $hexcol] \ - -activebackground [format "#%6.6x" $hexcol] -relief ridge \ - -padx 7 -pady 0 - bind $id.colors.r3.c$i <Button> \ - [format "::pd_iemgui::preset_col %s %d" $id $hexcol] - } - pack $id.colors.r3.c0 $id.colors.r3.c1 $id.colors.r3.c2 $id.colors.r3.c3 \ - $id.colors.r3.c4 $id.colors.r3.c5 $id.colors.r3.c6 $id.colors.r3.c7 \ - $id.colors.r3.c8 $id.colors.r3.c9 -side left - - frame $id.cao -pady 10 -background $::panel_background - pack $id.cao -side top - button $id.cao.cancel -command "::pd_iemgui::cancel $id" \ - -text "Cancel" -width 6 -highlightbackground $::panel_background - label $id.cao.dummy1 -text "" -width 3 -background $::panel_background - button $id.cao.apply -text "Apply" -width 6 -command "::pd_iemgui::apply $id" \ - -highlightbackground $::panel_background - label $id.cao.dummy2 -text "" -width 3 -background $::panel_background - button $id.cao.ok -text {OK} -width 6 -command "::pd_iemgui::ok $id" \ - -highlightbackground $::panel_background - - pack $id.cao.cancel $id.cao.dummy1 -side left - pack $id.cao.apply $id.cao.dummy2 -side left - pack $id.cao.ok -side left - - if {[info tclversion] < 8.4} { - bind $id <Key-Tab> {tkTabToWindow [tk_focusNext %W]} - bind $id <<PrevWindow>> {tkTabToWindow [tk_focusPrev %W]} - } else { - bind $id <Key-Tab> {tk::TabToWindow [tk_focusNext %W]} - bind $id <<PrevWindow>> {tk::TabToWindow [tk_focusPrev %W]} - } - - $id.dim.w_ent select from 0 - $id.dim.w_ent select adjust end - focus $id.dim.w_ent -} - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10721] branches/pd-devel/0.41.4/src
by eighthave＠users.sourceforge.net 03 Feb '09

03 Feb '09

Revision: 10721 http://pure-data.svn.sourceforge.net/pure-data/?rev=10721&view=rev Author: eighthave Date: 2009-02-03 05:34:51 +0000 (Tue, 03 Feb 2009) Log Message: ----------- - separated the find and font panels into their own packages, the other panels will soon be done this way too - created generic map, unmap, focusin procs where the specific procs can all be registered. Then those specific procs go in the related package. I think this should be easier to follow. - For gatom and font, separated create_panel and the message from Pd into separate procs. Then all panels will have a create_panel - made iemgui panel have a customizable background like the others and replaced the big binding kludge with panel_bindings Modified Paths: -------------- branches/pd-devel/0.41.4/src/gatom.tcl branches/pd-devel/0.41.4/src/pd.tk branches/pd-devel/0.41.4/src/pd_bindings.tcl branches/pd-devel/0.41.4/src/pd_iemgui.tcl branches/pd-devel/0.41.4/src/pd_menucommands.tcl branches/pd-devel/0.41.4/src/pdtk_canvas.tcl branches/pd-devel/0.41.4/src/pkgIndex.tcl branches/pd-devel/0.41.4/src/wheredoesthisgo.tcl Added Paths: ----------- branches/pd-devel/0.41.4/src/find_panel.tcl branches/pd-devel/0.41.4/src/font_panel.tcl Added: branches/pd-devel/0.41.4/src/find_panel.tcl =================================================================== --- branches/pd-devel/0.41.4/src/find_panel.tcl (rev 0) +++ branches/pd-devel/0.41.4/src/find_panel.tcl 2009-02-03 05:34:51 UTC (rev 10721) @@ -0,0 +1,85 @@ + +package provide find_panel 0.1 + +package require pd_bindings + +namespace eval ::find_panel:: { + namespace export menu_find_panel +} + +# TODO figure out findagain +# TODO make targetlabel into a popup menu +# TODO make panel go away after a find + +proc ::find_panel::ok {mytoplevel} { + # find will be on top, so use the previous window that was on top + set search_window [lindex [wm stackorder .] end-1] + if {$search_window eq "."} { + puts "search pd window not implemented yet" + } else { + puts "search_window $search_window" + set find_string [.find.entry get] + if {$find_string ne ""} { + pdsend "$search_window find $find_string" + } + } +} + +proc ::find_panel::cancel {mytoplevel} { + wm withdraw .find +} + +proc ::find_panel::focusin {mytoplevel} { + if {[winfo exists .find.frame.targetlabel]} { + set focusedwindow [winfo toplevel [lindex [wm stackorder .] end]] + if {$focusedwindow eq ".find"} { + set focusedwindow [winfo toplevel [lindex [wm stackorder .] end - 1]] + } + # TODO this text should be based on $::menu_windowlist + .find.frame.targetlabel configure -text [wm title $focusedwindow] + } +} + +# the find panel is opened from the menu and key bindings +proc ::find_panel::menu_find_panel {mytoplevel} { + if {[winfo exists .find]} { + wm deiconify .find + raise .find + } else { + create_panel $mytoplevel + } +} + +proc ::find_panel::create_panel {mytoplevel} { + toplevel .find + wm title .find [_ "Find"] + wm geometry .find =475x125+150+150 + wm resizable .find 0 0 + if {[catch {wm attributes .find -topmost}]} {puts stderr ".find -topmost failed"} + .find configure -background $::panel_background + ::pd_bindings::panel_bindings .find "find" + + frame .find.frame -background $::panel_background + pack .find.frame -side top -fill x -pady 7 + label .find.frame.searchin -text [_ "Search in:"] -background $::panel_background + label .find.frame.targetlabel -background $::panel_background \ + -text [wm title $mytoplevel] + label .find.frame.for -background $::panel_background -text [_ "for:"] + pack .find.frame.searchin .find.frame.targetlabel .find.frame.for -side left + entry .find.entry -width 54 -font 18 -relief sunken \ + -highlightthickness 3 -highlightcolor blue \ + -highlightbackground $::panel_background + focus .find.entry + pack .find.entry -side top -padx 10 + + frame .find.buttonframe -background yellow + button .find.button -text [_ "Find"] -default active -width 9 \ + -highlightbackground $::panel_background -command "find_ok $mytoplevel" + if {$::windowingsystem eq "x11"} { + button .find.close -text [_ "Close"] -default normal -width 9 \ + -highlightbackground $::panel_background -command "find_cancel $mytoplevel" + pack .find.buttonframe .find.button .find.close -side right -padx 10 -pady 15 + } else { + pack .find.buttonframe .find.button -side right -padx 10 -pady 15 + } +} Added: branches/pd-devel/0.41.4/src/font_panel.tcl =================================================================== --- branches/pd-devel/0.41.4/src/font_panel.tcl (rev 0) +++ branches/pd-devel/0.41.4/src/font_panel.tcl 2009-02-03 05:34:51 UTC (rev 10721) @@ -0,0 +1,107 @@ + +package provide font_panel 0.1 + +namespace eval ::font_panel:: { + variable fontsize 0 + variable dofont_fontsize 0 + variable stretchval 0 + variable whichstretch 0 + + namespace export pdtk_canvas_dofont +} + +proc ::font_panel::apply {mytoplevel myfontsize} { + pdsend "$mytoplevel font $myfontsize $stretchval $whichstretch" +} + +proc ::font_panel::close {mytoplevel} { + pdsend "$mytoplevel cancel" +} + +proc ::font_panel::cancel {mytoplevel} { + ::font_panel::apply $mytoplevel $fontsize ;# reinstate previous font size + pdsend "$mytoplevel cancel" +} + +proc ::font_panel::ok {mytoplevel} { + set fontsize $::font_panel::fontsize + ::font_panel::apply $mytoplevel $fontsize + ::font_panel::close $mytoplevel +} + +# this should be called pdtk_font_dialog like the rest of the panels, but it +# is called from the C side, so we'll leave it be +proc ::font_panel::pdtk_canvas_dofont {mytoplevel initsize} { + create_panel $mytoplevel $initsize +} + +proc ::font_panel::create_panel {mytoplevel initsize} { + set fontsize $initsize + set dofont_fontsize $initsize + set stretchval 100 + set whichstretch 1 + + toplevel $mytoplevel + wm title $mytoplevel {Patch Font} + wm protocol $mytoplevel WM_DELETE_WINDOW "::font_panel::cancel $mytoplevel" + + pdtk_panelkeybindings $mytoplevel font + + frame $mytoplevel.buttonframe + pack $mytoplevel.buttonframe -side bottom -fill x -pady 2m + button $mytoplevel.buttonframe.cancel -text "Cancel" \ + -command "::font_panel::cancel $mytoplevel" + button $mytoplevel.buttonframe.ok -text "OK" \ + -command "::font_panel::ok $mytoplevel" + pack $mytoplevel.buttonframe.cancel -side left -expand 1 + pack $mytoplevel.buttonframe.ok -side left -expand 1 + + frame $mytoplevel.radiof + pack $mytoplevel.radiof -side left + + label $mytoplevel.radiof.label -text {Font Size:} + pack $mytoplevel.radiof.label -side top + + radiobutton $mytoplevel.radiof.radio8 -value 8 -variable ::font_panel::fontsize -text "8" \ + -command "::font_panel::apply $mytoplevel 8" + radiobutton $mytoplevel.radiof.radio10 -value 10 -variable ::font_panel::fontsize -text "10" \ + -command "::font_panel::apply $mytoplevel 10" + radiobutton $mytoplevel.radiof.radio12 -value 12 -variable ::font_panel::fontsize -text "12" \ + -command "::font_panel::apply $mytoplevel 12" + radiobutton $mytoplevel.radiof.radio16 -value 16 -variable ::font_panel::fontsize -text "16" \ + -command "::font_panel::apply $mytoplevel 16" + radiobutton $mytoplevel.radiof.radio24 -value 24 -variable ::font_panel::fontsize -text "24" \ + -command "::font_panel::apply $mytoplevel 24" + radiobutton $mytoplevel.radiof.radio36 -value 36 -variable ::font_panel::fontsize -text "36" \ + -command "::font_panel::apply $mytoplevel 36" + pack $mytoplevel.radiof.radio8 -side top -anchor w + pack $mytoplevel.radiof.radio10 -side top -anchor w + pack $mytoplevel.radiof.radio12 -side top -anchor w + pack $mytoplevel.radiof.radio16 -side top -anchor w + pack $mytoplevel.radiof.radio24 -side top -anchor w + pack $mytoplevel.radiof.radio36 -side top -anchor w + + set current_radiobutton [format "$mytoplevel.radiof.radio%d" $initsize] + $current_radiobutton select + + frame $mytoplevel.stretchf + pack $mytoplevel.stretchf -side left + + label $mytoplevel.stretchf.label -text "Stretch:" + pack $mytoplevel.stretchf.label -side top + + entry $mytoplevel.stretchf.entry -textvariable stretchval -width 5 + pack $mytoplevel.stretchf.entry -side left + + radiobutton $mytoplevel.stretchf.radio1 \ + -value 1 -variable whichstretch -text "X and Y" + radiobutton $mytoplevel.stretchf.radio2 \ + -value 2 -variable whichstretch -text "X only" + radiobutton $mytoplevel.stretchf.radio3 \ + -value 3 -variable whichstretch -text "Y only" + + pack $mytoplevel.stretchf.radio1 -side top -anchor w + pack $mytoplevel.stretchf.radio2 -side top -anchor w + pack $mytoplevel.stretchf.radio3 -side top -anchor w + +} Modified: branches/pd-devel/0.41.4/src/gatom.tcl =================================================================== --- branches/pd-devel/0.41.4/src/gatom.tcl 2009-02-03 01:07:34 UTC (rev 10720) +++ branches/pd-devel/0.41.4/src/gatom.tcl 2009-02-03 05:34:51 UTC (rev 10721) @@ -84,114 +84,131 @@ ::gatom::cancel $mytoplevel } +# set up the panel with the info from pd proc ::gatom::pdtk_gatom_dialog {mytoplevel initwidth initlower initupper \ initgatomlabel_position \ initgatomlabel initsend initreceive} { global gatomlabel_position set gatomlabel_position($mytoplevel) $initgatomlabel_position - toplevel $mytoplevel -class PdPanel + if {[winfo exists $mytoplevel]} { + wm deiconify $mytoplevel + raise $mytoplevel + } else { + create_panel $mytoplevel + } + + $mytoplevel.width.entry insert 0 $initwidth + $mytoplevel.limits.lower.entry insert 0 $initlower + $mytoplevel.limits.upper.entry insert 0 $initupper + if {$initgatomlabel ne "-"} { + $mytoplevel.gatomlabel.name.entry insert 0 $initgatomlabel + } + set gatomlabel_position($mytoplevel) $initgatomlabel_position + if {$initsend ne "-"} { + $mytoplevel.s_r.send.entry insert 0 $initsend + } + if {$initreceive ne "-"} { + $mytoplevel.s_r.receive.entry insert 0 $initreceive + } +} + +proc ::gatom::create_panel {mytoplevel} { + global gatomlabel_position + + toplevel $mytoplevel -background $::panel_background wm title $mytoplevel "atom box properties" wm resizable $mytoplevel 0 0 + catch { # not all platforms/Tcls versions have these options + wm attributes $mytoplevel -topmost 1 + #wm attributes $mytoplevel -transparent 1 + #$mytoplevel configure -highlightthickness 1 + } wm protocol $mytoplevel WM_DELETE_WINDOW "::gatom::cancel $mytoplevel" ::pd_bindings::panel_bindings $mytoplevel "gatom" - frame $mytoplevel.width -height 7 + frame $mytoplevel.width -height 7 -background $::panel_background pack $mytoplevel.width -side top - label $mytoplevel.width.label -text "width" - entry $mytoplevel.width.entry -width 4 - pack $mytoplevel.width.label $mytoplevel.width.entry -side left + label $mytoplevel.width.label -text "width" -background $::panel_background + entry $mytoplevel.width.entry -width 4 -highlightbackground $::panel_background + pack $mytoplevel.width.label $mytoplevel.width.entry -side left labelframe $mytoplevel.limits -text "limits" -padx 15 -pady 4 -borderwidth 1 \ - -font highlight_font + -font highlight_font -background $::panel_background pack $mytoplevel.limits -side top -fill x - frame $mytoplevel.limits.lower + frame $mytoplevel.limits.lower -background $::panel_background pack $mytoplevel.limits.lower -side left - label $mytoplevel.limits.lower.label -text "lower" - entry $mytoplevel.limits.lower.entry -width 8 + label $mytoplevel.limits.lower.label -text "lower" -background $::panel_background + entry $mytoplevel.limits.lower.entry -width 8 -highlightbackground $::panel_background pack $mytoplevel.limits.lower.label $mytoplevel.limits.lower.entry -side left - frame $mytoplevel.limits.upper + frame $mytoplevel.limits.upper -background $::panel_background pack $mytoplevel.limits.upper -side left - frame $mytoplevel.limits.upper.spacer -width 20 - label $mytoplevel.limits.upper.label -text "upper" - entry $mytoplevel.limits.upper.entry -width 8 + frame $mytoplevel.limits.upper.spacer -width 20 -background $::panel_background + label $mytoplevel.limits.upper.label -text "upper" -background $::panel_background + entry $mytoplevel.limits.upper.entry -width 8 -highlightbackground $::panel_background pack $mytoplevel.limits.upper.spacer $mytoplevel.limits.upper.label \ $mytoplevel.limits.upper.entry -side left - frame $mytoplevel.spacer1 -height 7 + frame $mytoplevel.spacer1 -height 7 -background $::panel_background pack $mytoplevel.spacer1 -side top labelframe $mytoplevel.gatomlabel -text "label" -padx 5 -pady 4 -borderwidth 1 \ - -font highlight_font + -font highlight_font -background $::panel_background pack $mytoplevel.gatomlabel -side top -fill x - frame $mytoplevel.gatomlabel.name + frame $mytoplevel.gatomlabel.name -background $::panel_background pack $mytoplevel.gatomlabel.name -side top - entry $mytoplevel.gatomlabel.name.entry -width 33 + entry $mytoplevel.gatomlabel.name.entry -width 33 -highlightbackground $::panel_background pack $mytoplevel.gatomlabel.name.entry -side left - frame $mytoplevel.gatomlabel.radio + frame $mytoplevel.gatomlabel.radio -background $::panel_background pack $mytoplevel.gatomlabel.radio -side top - radiobutton $mytoplevel.gatomlabel.radio.left -value 0 \ - -variable gatomlabel_position($mytoplevel) \ - -text "left " -justify left -takefocus 0 - radiobutton $mytoplevel.gatomlabel.radio.right -value 1 \ - -variable gatomlabel_position($mytoplevel) \ - -text "right" -justify left -takefocus 0 - radiobutton $mytoplevel.gatomlabel.radio.top -value 2 \ - -variable gatomlabel_position($mytoplevel) \ - -text "top" -justify left -takefocus 0 - radiobutton $mytoplevel.gatomlabel.radio.bottom -value 3 \ - -variable gatomlabel_position($mytoplevel) \ - -text "bottom" -justify left -takefocus 0 + radiobutton $mytoplevel.gatomlabel.radio.left -value 0 -text "left " \ + -variable gatomlabel_position($mytoplevel) -background $::panel_background \ + -justify left -takefocus 0 + radiobutton $mytoplevel.gatomlabel.radio.right -value 1 -text "right" \ + -variable gatomlabel_position($mytoplevel) -background $::panel_background \ + -justify left -takefocus 0 + radiobutton $mytoplevel.gatomlabel.radio.top -value 2 -text "top" \ + -variable gatomlabel_position($mytoplevel) -background $::panel_background \ + -justify left -takefocus 0 + radiobutton $mytoplevel.gatomlabel.radio.bottom -value 3 -text "bottom" \ + -variable gatomlabel_position($mytoplevel) -background $::panel_background \ + -justify left -takefocus 0 pack $mytoplevel.gatomlabel.radio.left -side left -anchor w pack $mytoplevel.gatomlabel.radio.right -side right -anchor w pack $mytoplevel.gatomlabel.radio.top -side top -anchor w pack $mytoplevel.gatomlabel.radio.bottom -side bottom -anchor w - frame $mytoplevel.spacer2 -height 7 + frame $mytoplevel.spacer2 -height 7 -background $::panel_background pack $mytoplevel.spacer2 -side top labelframe $mytoplevel.s_r -text "messages" -padx 5 -pady 4 -borderwidth 1 \ - -font highlight_font + -font highlight_font -background $::panel_background pack $mytoplevel.s_r -side top -fill x - frame $mytoplevel.s_r.send + frame $mytoplevel.s_r.send -background $::panel_background pack $mytoplevel.s_r.send -side top -anchor e - label $mytoplevel.s_r.send.label -text "send symbol" - entry $mytoplevel.s_r.send.entry -width 21 + label $mytoplevel.s_r.send.label -text "send symbol" -background $::panel_background + entry $mytoplevel.s_r.send.entry -width 21 -highlightbackground $::panel_background pack $mytoplevel.s_r.send.entry $mytoplevel.s_r.send.label -side right - frame $mytoplevel.s_r.receive + frame $mytoplevel.s_r.receive -background $::panel_background pack $mytoplevel.s_r.receive -side top -anchor e - label $mytoplevel.s_r.receive.label -text "receive symbol" - entry $mytoplevel.s_r.receive.entry -width 21 + label $mytoplevel.s_r.receive.label -text "receive symbol" -background $::panel_background + entry $mytoplevel.s_r.receive.entry -width 21 -highlightbackground $::panel_background pack $mytoplevel.s_r.receive.entry $mytoplevel.s_r.receive.label -side right - frame $mytoplevel.buttonframe -pady 5 + frame $mytoplevel.buttonframe -pady 5 -background $::panel_background pack $mytoplevel.buttonframe -side top -fill x -pady 2m button $mytoplevel.buttonframe.cancel -text {Cancel} \ - -command "::gatom::cancel $mytoplevel" + -command "::gatom::cancel $mytoplevel" -highlightbackground $::panel_background pack $mytoplevel.buttonframe.cancel -side left -expand 1 button $mytoplevel.buttonframe.apply -text {Apply} \ - -command "::gatom::apply $mytoplevel" + -command "::gatom::apply $mytoplevel" -highlightbackground $::panel_background pack $mytoplevel.buttonframe.apply -side left -expand 1 button $mytoplevel.buttonframe.ok -text {OK} \ - -command "::gatom::ok $mytoplevel" + -command "::gatom::ok $mytoplevel" -highlightbackground $::panel_background pack $mytoplevel.buttonframe.ok -side left -expand 1 - $mytoplevel.width.entry insert 0 $initwidth - $mytoplevel.limits.lower.entry insert 0 $initlower - $mytoplevel.limits.upper.entry insert 0 $initupper - if {$initgatomlabel ne "-"} { - $mytoplevel.gatomlabel.name.entry insert 0 $initgatomlabel - } - set gatomlabel_position($mytoplevel) $initgatomlabel_position - if {$initsend ne "-"} { - $mytoplevel.s_r.send.entry insert 0 $initsend - } - if {$initreceive ne "-"} { - $mytoplevel.s_r.receive.entry insert 0 $initreceive - } - $mytoplevel.width.entry select from 0 $mytoplevel.width.entry select adjust end focus $mytoplevel.width.entry Modified: branches/pd-devel/0.41.4/src/pd.tk =================================================================== --- branches/pd-devel/0.41.4/src/pd.tk 2009-02-03 01:07:34 UTC (rev 10720) +++ branches/pd-devel/0.41.4/src/pd.tk 2009-02-03 05:34:51 UTC (rev 10721) @@ -60,6 +60,7 @@ package require pd_menus package require pd_bindings package require pd_post +package require font_panel package require gatom package require pd_iemgui package require pdtk_array @@ -73,6 +74,7 @@ namespace import ::pd_post::pdtk_post namespace import ::pd_iemgui::pdtk_iemgui_dialog namespace import ::gatom::pdtk_gatom_dialog +namespace import ::font_panel::pdtk_canvas_dofont #------------------------------------------------------------------------------# # coding style Modified: branches/pd-devel/0.41.4/src/pd_bindings.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_bindings.tcl 2009-02-03 01:07:34 UTC (rev 10720) +++ branches/pd-devel/0.41.4/src/pd_bindings.tcl 2009-02-03 05:34:51 UTC (rev 10721) @@ -2,6 +2,7 @@ package require pd_menucommands package require pd_post +package require find_panel namespace eval ::pd_bindings:: { variable modifier @@ -13,10 +14,10 @@ proc ::pd_bindings::class_bindings {} { # binding by class is not recursive, so its useful for certain things - bind CanvasWindow <Map> "pdsend_map %W" - bind CanvasWindow <Unmap> "pdsend_unmap %W" + bind CanvasWindow <Map> "::pd_bindings::map %W" + bind CanvasWindow <Unmap> "::pd_bindings::unmap %W" bind CanvasWindow <Configure> "pdtk_canvas_getscroll %W" - bind CanvasWindow <FocusIn> "window_focusin %W" + bind CanvasWindow <FocusIn> "::pd_bindings::window_focusin %W" } proc ::pd_bindings::window_bindings {mytoplevel} { @@ -65,7 +66,7 @@ wm protocol $mytoplevel WM_DELETE_WINDOW "pdsend \"pd verifyquit\"" # do window maintenance when entering the Pd window (Window menu, scrollbars, etc) - bind $mytoplevel <FocusIn> "window_focusin %W" + bind $mytoplevel <FocusIn> "::pd_bindings::window_focusin %W" } # this is for the panels: find, font, sendmessage, gatom properties, array @@ -166,3 +167,25 @@ wm protocol $mytoplevel WM_DELETE_WINDOW "pdsend \"$mytoplevel menuclose 0\"" } + +#------------------------------------------------------------------------------# +# event handlers + +# do tasks when changing focus (Window menu, scrollbars, etc.) +proc ::pd_bindings::window_focusin {mytoplevel} { + ::find_panel::focusin $mytoplevel +} + +# "map" event tells us when the canvas becomes visible, and "unmap", +# invisible. Invisibility means the Window Manager has minimized us. We +# don't get a final "unmap" event when we destroy the window. +proc ::pd_bindings::map {mytoplevel} { + pdsend "$mytoplevel map 1" + #[regsub -- "" [wm title $mytoplevel]] + #set ::pd_untitleddir $dirname +} + +proc ::pd_bindings::unmap {mytoplevel} { + puts "unmap" + pdsend "$mytoplevel map 0" +} Modified: branches/pd-devel/0.41.4/src/pd_iemgui.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_iemgui.tcl 2009-02-03 01:07:34 UTC (rev 10720) +++ branches/pd-devel/0.41.4/src/pd_iemgui.tcl 2009-02-03 05:34:51 UTC (rev 10721) @@ -12,9 +12,8 @@ namespace export pdtk_iemgui_dialog } -############ pdtk_iemgui_dialog -- dialog window for iem guis ######### +# TODO rename $id to $mytoplevel - proc ::pd_iemgui::clip_dim {id} { set vid [string trimleft $id .] @@ -385,10 +384,21 @@ [eval concat $$var_iemgui_steady]] } + +proc iemgui_cancel {mytoplevel} { + # TODO kludge!! until a common approach to ::pd_bindings::panel_bindings + # is sorted out + ::pd_iemgui::cancel $mytoplevel +} proc ::pd_iemgui::cancel {id} { pdsend "$id cancel" } +proc iemgui_ok {mytoplevel} { + # TODO kludge!! until a common approach to ::pd_bindings::panel_bindings + # is sorted out + ::pd_iemgui::ok $mytoplevel +} proc ::pd_iemgui::ok {id} { ::pd_iemgui::apply $id ::pd_iemgui::cancel $id @@ -494,32 +504,38 @@ set $var_iemgui_l2_f1_b0 0 - toplevel $id + toplevel $id -background $::panel_background wm title $id [format "%s Properties" $mainheader] wm resizable $id 0 0 wm protocol $id WM_DELETE_WINDOW [concat ::pd_iemgui::cancel $id] - - frame $id.dim + + ::pd_bindings::panel_bindings $id "iemgui" + + frame $id.dim -background $::panel_background pack $id.dim -side top - label $id.dim.head -text $dim_header - label $id.dim.w_lab -text $wdt_label -width 6 - entry $id.dim.w_ent -textvariable $var_iemgui_wdt -width 5 - label $id.dim.dummy1 -text " " -width 10 - label $id.dim.h_lab -text $hgt_label -width 6 - entry $id.dim.h_ent -textvariable $var_iemgui_hgt -width 5 + label $id.dim.head -text $dim_header -background $::panel_background + label $id.dim.w_lab -text $wdt_label -width 6 -background $::panel_background + entry $id.dim.w_ent -textvariable $var_iemgui_wdt -width 5 \ + -highlightbackground $::panel_background + label $id.dim.dummy1 -text " " -width 10 -background $::panel_background + label $id.dim.h_lab -text $hgt_label -width 6 -background $::panel_background + entry $id.dim.h_ent -textvariable $var_iemgui_hgt -width 5 \ + -highlightbackground $::panel_background pack $id.dim.head -side top pack $id.dim.w_lab $id.dim.w_ent $id.dim.dummy1 -side left if { $hgt_label != "empty" } { pack $id.dim.h_lab $id.dim.h_ent -side left} - frame $id.rng + frame $id.rng -background $::panel_background pack $id.rng -side top - label $id.rng.head -text $rng_header - label $id.rng.min_lab -text $min_rng_label -width 6 - entry $id.rng.min_ent -textvariable $var_iemgui_min_rng -width 9 - label $id.rng.dummy1 -text " " -width 1 - label $id.rng.max_lab -text $max_rng_label -width 8 - entry $id.rng.max_ent -textvariable $var_iemgui_max_rng -width 9 + label $id.rng.head -text $rng_header -background $::panel_background + label $id.rng.min_lab -text $min_rng_label -width 6 -background $::panel_background + entry $id.rng.min_ent -textvariable $var_iemgui_min_rng -width 9 \ + -highlightbackground $::panel_background + label $id.rng.dummy1 -text " " -width 1 -background $::panel_background + label $id.rng.max_lab -text $max_rng_label -width 8 -background $::panel_background + entry $id.rng.max_ent -textvariable $var_iemgui_max_rng -width 9 \ + -highlightbackground $::panel_background if { $rng_header != "empty" } { pack $id.rng.head -side top if { $min_rng_label != "empty" } { @@ -529,27 +545,35 @@ $id.rng.max_lab $id.rng.max_ent -side left} } if { [eval concat $$var_iemgui_lin0_log1] >= 0 || [eval concat $$var_iemgui_loadbang] >= 0 || [eval concat $$var_iemgui_num] > 0 || [eval concat $$var_iemgui_steady] >= 0 } { - label $id.space1 -text "" + label $id.space1 -text "" -background $::panel_background pack $id.space1 -side top } - frame $id.para + frame $id.para -background $::panel_background pack $id.para -side top - label $id.para.dummy2 -text "" -width 1 - label $id.para.dummy3 -text "" -width 1 + label $id.para.dummy2 -text "" -width 1 -background $::panel_background + label $id.para.dummy3 -text "" -width 1 -background $::panel_background if {[eval concat $$var_iemgui_lin0_log1] == 0} { - button $id.para.lilo -text [eval concat $$var_iemgui_lilo0] -width 5 -command "::pd_iemgui::lilo $id" } + button $id.para.lilo -text [eval concat $$var_iemgui_lilo0] -width 5 \ + -command "::pd_iemgui::lilo $id" -highlightbackground $::panel_background } if {[eval concat $$var_iemgui_lin0_log1] == 1} { - button $id.para.lilo -text [eval concat $$var_iemgui_lilo1] -width 5 -command "::pd_iemgui::lilo $id" } + button $id.para.lilo -text [eval concat $$var_iemgui_lilo1] -width 5 \ + -command "::pd_iemgui::lilo $id" -highlightbackground $::panel_background } if {[eval concat $$var_iemgui_loadbang] == 0} { - button $id.para.lb -text "no init" -width 5 -command "::pd_iemgui::lb $id" } + button $id.para.lb -text "no init" -width 5 \ + -command "::pd_iemgui::lb $id" -highlightbackground $::panel_background } if {[eval concat $$var_iemgui_loadbang] == 1} { - button $id.para.lb -text "init" -width 5 -command "::pd_iemgui::lb $id" } - label $id.para.num_lab -text $num_label -width 9 - entry $id.para.num_ent -textvariable $var_iemgui_num -width 4 + button $id.para.lb -text "init" -width 5 \ + -command "::pd_iemgui::lb $id" -highlightbackground $::panel_background } + label $id.para.num_lab -text $num_label -width 9 -background $::panel_background + entry $id.para.num_ent -textvariable $var_iemgui_num -width 4 \ + -highlightbackground $::panel_background + if {[eval concat $$var_iemgui_steady] == 0} { - button $id.para.stdy_jmp -text "jump on click" -width 11 -command "::pd_iemgui::stdy_jmp $id" } + button $id.para.stdy_jmp -command "::pd_iemgui::stdy_jmp $id" \ + -text "jump on click" -width 11 -highlightbackground $::panel_background } if {[eval concat $$var_iemgui_steady] == 1} { - button $id.para.stdy_jmp -text "steady on click" -width 11 -command "::pd_iemgui::stdy_jmp $id" } + button $id.para.stdy_jmp -command "::pd_iemgui::stdy_jmp $id" \ + -text "steady on click" -width 11 -highlightbackground $::panel_background } if {[eval concat $$var_iemgui_lin0_log1] >= 0} { pack $id.para.lilo -side left -expand 1} if {[eval concat $$var_iemgui_loadbang] >= 0} { @@ -559,23 +583,27 @@ if {[eval concat $$var_iemgui_steady] >= 0} { pack $id.para.dummy3 $id.para.stdy_jmp -side left -expand 1} - frame $id.spacer0 -height 4 + frame $id.spacer0 -height 4 -background $::panel_background pack $id.spacer0 -side top labelframe $id.s_r -borderwidth 1 -pady 4 -text "messages" \ - -font highlight_font + -font highlight_font -background $::panel_background pack $id.s_r -side top -fill x -ipadx 5 - frame $id.s_r.send + frame $id.s_r.send -background $::panel_background pack $id.s_r.send -side top - label $id.s_r.send.lab -text " send-symbol:" -width 12 -justify right - entry $id.s_r.send.ent -textvariable $var_iemgui_snd -width 22 + label $id.s_r.send.lab -text " send-symbol:" -width 12 -justify right \ + -background $::panel_background + entry $id.s_r.send.ent -textvariable $var_iemgui_snd -width 22 \ + -highlightbackground $::panel_background if { $snd != "nosndno" } { pack $id.s_r.send.lab $id.s_r.send.ent -side left} - frame $id.s_r.receive + frame $id.s_r.receive -background $::panel_background pack $id.s_r.receive -side top - label $id.s_r.receive.lab -text "receive-symbol:" -width 12 -justify right - entry $id.s_r.receive.ent -textvariable $var_iemgui_rcv -width 22 + label $id.s_r.receive.lab -text "receive-symbol:" -width 12 -justify right \ + -background $::panel_background + entry $id.s_r.receive.ent -textvariable $var_iemgui_rcv -width 22 \ + -highlightbackground $::panel_background if { $rcv != "norcvno" } { pack $id.s_r.receive.lab $id.s_r.receive.ent -side left} @@ -586,31 +614,35 @@ if {[eval concat $$var_iemgui_gn_f] == 2} \ { set current_font "Times" } - frame $id.spacer1 -height 7 + frame $id.spacer1 -height 7 -background $::panel_background pack $id.spacer1 -side top labelframe $id.label -borderwidth 1 -text "label" -pady 4 \ - -font highlight_font + -font highlight_font -background $::panel_background pack $id.label -side top -fill x entry $id.label.name_entry -textvariable $var_iemgui_gui_nam -width 30 \ - -font [list $current_font 12 $::font_weight] + -font [list $current_font 12 $::font_weight] \ + -highlightbackground $::panel_background pack $id.label.name_entry -side top -expand yes -fill both -padx 5 - frame $id.label.xy -padx 27 -pady 1 + frame $id.label.xy -padx 27 -pady 1 -background $::panel_background pack $id.label.xy -side top - label $id.label.xy.x_lab -text "x offset" -width 6 - entry $id.label.xy.x_entry -textvariable $var_iemgui_gn_dx -width 5 - label $id.label.xy.dummy1 -text " " -width 2 - label $id.label.xy.y_lab -text "y offset" -width 6 - entry $id.label.xy.y_entry -textvariable $var_iemgui_gn_dy -width 5 + label $id.label.xy.x_lab -text "x offset" -width 6 -background $::panel_background + entry $id.label.xy.x_entry -textvariable $var_iemgui_gn_dx -width 5 \ + -highlightbackground $::panel_background + label $id.label.xy.dummy1 -text " " -width 2 -background $::panel_background + label $id.label.xy.y_lab -text "y offset" -width 6 -background $::panel_background + entry $id.label.xy.y_entry -textvariable $var_iemgui_gn_dy -width 5 \ + -highlightbackground $::panel_background pack $id.label.xy.x_lab $id.label.xy.x_entry $id.label.xy.dummy1 \ $id.label.xy.y_lab $id.label.xy.y_entry -side left -anchor e label $id.label.fontpopup_label -text $current_font \ -relief groove -font [list $current_font 12 $::font_weight] -padx 5 pack $id.label.fontpopup_label -side left -anchor w -expand yes -fill x - label $id.label.fontsize_label -text "size" -width 4 - entry $id.label.fontsize_entry -textvariable $var_iemgui_gn_fs -width 5 + label $id.label.fontsize_label -text "size" -width 4 -background $::panel_background + entry $id.label.fontsize_entry -textvariable $var_iemgui_gn_fs -width 5 \ + -highlightbackground $::panel_background pack $id.label.fontsize_entry $id.label.fontsize_label \ -side right -anchor e -padx 5 -pady 5 menu $id.popup @@ -629,31 +661,35 @@ bind $id.label.fontpopup_label <Button> \ [list tk_popup $id.popup %X %Y] - frame $id.spacer2 -height 7 + frame $id.spacer2 -height 7 -background $::panel_background pack $id.spacer2 -side top - labelframe $id.colors -borderwidth 1 -text "colors" -font highlight_font + labelframe $id.colors -borderwidth 1 -text "colors" -font highlight_font \ + -background $::panel_background pack $id.colors -fill x -ipadx 5 -ipady 4 - frame $id.colors.select + frame $id.colors.select -background $::panel_background pack $id.colors.select -side top radiobutton $id.colors.select.radio0 -value 0 -variable \ - $var_iemgui_l2_f1_b0 -text "background" -width 10 -justify left + $var_iemgui_l2_f1_b0 -text "background" -width 10 -justify left \ + -background $::panel_background radiobutton $id.colors.select.radio1 -value 1 -variable \ - $var_iemgui_l2_f1_b0 -text "front" -width 5 -justify left + $var_iemgui_l2_f1_b0 -text "front" -width 5 -justify left \ + -background $::panel_background radiobutton $id.colors.select.radio2 -value 2 -variable \ - $var_iemgui_l2_f1_b0 -text "label" -width 5 -justify left + $var_iemgui_l2_f1_b0 -text "label" -width 5 -justify left \ + -background $::panel_background if { [eval concat $$var_iemgui_fcol] >= 0 } { pack $id.colors.select.radio0 $id.colors.select.radio1 \ $id.colors.select.radio2 -side left } else { - pack $id.colors.select.radio0 $id.colors.select.radio2 -side left \ - } + pack $id.colors.select.radio0 $id.colors.select.radio2 -side left + } - frame $id.colors.sections + frame $id.colors.sections -background $::panel_background pack $id.colors.sections -side top - button $id.colors.sections.but -text "compose color" -width 12 \ - -command "::pd_iemgui::choose_col_bkfrlb $id" + button $id.colors.sections.but -command "::pd_iemgui::choose_col_bkfrlb $id" \ + -text "compose color" -width 12 -highlightbackground $::panel_background pack $id.colors.sections.but -side left -anchor w -padx 10 -pady 5 \ -expand yes -fill x if { [eval concat $$var_iemgui_fcol] >= 0 } { @@ -681,7 +717,7 @@ -side right -anchor e -expand yes -fill both -pady 7 # color scheme by Mary Ann Benedetto http://piR2.org - frame $id.colors.r1 + frame $id.colors.r1 -background $::panel_background pack $id.colors.r1 -side top foreach i { 0 1 2 3 4 5 6 7 8 9} \ hexcol { 0xFFFFFF 0xDFDFDF 0xBBBBBB 0xFFC7C6 0xFFE3C6 \ @@ -696,7 +732,7 @@ $id.colors.r1.c4 $id.colors.r1.c5 $id.colors.r1.c6 $id.colors.r1.c7 \ $id.colors.r1.c8 $id.colors.r1.c9 -side left - frame $id.colors.r2 + frame $id.colors.r2 -background $::panel_background pack $id.colors.r2 -side top foreach i { 0 1 2 3 4 5 6 7 8 9 } \ hexcol { 0x9F9F9F 0x7C7C7C 0x606060 0xFF0400 0xFF8300 \ @@ -712,7 +748,7 @@ $id.colors.r2.c4 $id.colors.r2.c5 $id.colors.r2.c6 $id.colors.r2.c7 \ $id.colors.r2.c8 $id.colors.r2.c9 -side left - frame $id.colors.r3 + frame $id.colors.r3 -background $::panel_background pack $id.colors.r3 -side top foreach i { 0 1 2 3 4 5 6 7 8 9 } \ hexcol { 0x404040 0x202020 0x000000 0x551312 0x553512 \ @@ -728,15 +764,16 @@ $id.colors.r3.c4 $id.colors.r3.c5 $id.colors.r3.c6 $id.colors.r3.c7 \ $id.colors.r3.c8 $id.colors.r3.c9 -side left - frame $id.cao -pady 10 + frame $id.cao -pady 10 -background $::panel_background pack $id.cao -side top - button $id.cao.cancel -text {Cancel} -width 6 \ - -command "::pd_iemgui::cancel $id" - label $id.cao.dummy1 -text "" -width 3 - button $id.cao.apply -text {Apply} -width 6 -command "::pd_iemgui::apply $id" - label $id.cao.dummy2 -text "" -width 3 - button $id.cao.ok -text {OK} -width 6 \ - -command "::pd_iemgui::ok $id" + button $id.cao.cancel -command "::pd_iemgui::cancel $id" \ + -text "Cancel" -width 6 -highlightbackground $::panel_background + label $id.cao.dummy1 -text "" -width 3 -background $::panel_background + button $id.cao.apply -text "Apply" -width 6 -command "::pd_iemgui::apply $id" \ + -highlightbackground $::panel_background + label $id.cao.dummy2 -text "" -width 3 -background $::panel_background + button $id.cao.ok -text {OK} -width 6 -command "::pd_iemgui::ok $id" \ + -highlightbackground $::panel_background pack $id.cao.cancel $id.cao.dummy1 -side left pack $id.cao.apply $id.cao.dummy2 -side left @@ -750,31 +787,6 @@ bind $id <<PrevWindow>> {tk::TabToWindow [tk_focusPrev %W]} } - bind $id.dim.w_ent <KeyPress-Return> [concat ::pd_iemgui::ok $id] - bind $id.dim.h_ent <KeyPress-Return> [concat ::pd_iemgui::ok $id] - bind $id.rng.min_ent <KeyPress-Return> [concat ::pd_iemgui::ok $id] - bind $id.rng.max_ent <KeyPress-Return> [concat ::pd_iemgui::ok $id] - bind $id.para.num_ent <KeyPress-Return> [concat ::pd_iemgui::ok $id] - bind $id.s_r.send.ent <KeyPress-Return> [concat ::pd_iemgui::ok $id] - bind $id.s_r.receive.ent <KeyPress-Return> [concat ::pd_iemgui::ok $id] - bind $id.label.name_entry <KeyPress-Return> [concat ::pd_iemgui::ok $id] - bind $id.label.xy.x_entry <KeyPress-Return> [concat ::pd_iemgui::ok $id] - bind $id.label.xy.y_entry <KeyPress-Return> [concat ::pd_iemgui::ok $id] - bind $id.label.fontsize_entry <KeyPress-Return> [concat ::pd_iemgui::ok $id] - bind $id.cao.ok <KeyPress-Return> [concat ::pd_iemgui::ok $id] - pdtk_standardkeybindings $id.dim.w_ent - pdtk_standardkeybindings $id.dim.h_ent - pdtk_standardkeybindings $id.rng.min_ent - pdtk_standardkeybindings $id.rng.max_ent - pdtk_standardkeybindings $id.para.num_ent - pdtk_standardkeybindings $id.s_r.send.ent - pdtk_standardkeybindings $id.s_r.receive.ent - pdtk_standardkeybindings $id.label.name_entry - pdtk_standardkeybindings $id.label.xy.x_entry - pdtk_standardkeybindings $id.label.xy.y_entry - pdtk_standardkeybindings $id.label.fontsize_entry - pdtk_standardkeybindings $id.cao.ok - $id.dim.w_ent select from 0 $id.dim.w_ent select adjust end focus $id.dim.w_ent Modified: branches/pd-devel/0.41.4/src/pd_menucommands.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_menucommands.tcl 2009-02-03 01:07:34 UTC (rev 10720) +++ branches/pd-devel/0.41.4/src/pd_menucommands.tcl 2009-02-03 05:34:51 UTC (rev 10721) @@ -44,15 +44,11 @@ } } +# panel types: +# global (only one): find, sendmessage, prefs, helpbrowser +# per-canvas: font, canvas properties (created with a message from pd) +# per object: gatom, iemgui, array, data structures (created with a message from pd) -proc ::pd_menucommands::menu_showpanel {panelname mytoplevel} { - if {[winfo exists .$panelname]} { - wm deiconify .$panelname - raise .$panelname - } else { - ::${panelname}::create_panel $mytoplevel - } -} # ------------------------------------------------------------------------------ # send message panel Modified: branches/pd-devel/0.41.4/src/pdtk_canvas.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pdtk_canvas.tcl 2009-02-03 01:07:34 UTC (rev 10720) +++ branches/pd-devel/0.41.4/src/pdtk_canvas.tcl 2009-02-03 05:34:51 UTC (rev 10721) @@ -102,15 +102,7 @@ pdtk_pastetext } - #------------------------------------------------------------------------------# -# canvas font - -proc pdtk_canvas_dofont {mytoplevel initsize} { - # TODO this should just bring up the Font panel -} - -#------------------------------------------------------------------------------# # canvas popup menu proc popup_action {mytoplevel action} { @@ -139,19 +131,6 @@ #------------------------------------------------------------------------------# # procs for canvas events -# "map" event tells us when the canvas becomes visible (arg is "0") or -# invisible (arg is ""). Invisibility means the Window Manager has minimized -# us. We don't get a final "unmap" event when we destroy the window. -proc pdsend_map {mytoplevel} { - pdsend "$mytoplevel map 1" - #[regsub -- "" [wm title $mytoplevel]] - #set ::pd_untitleddir $dirname -} - -proc pdsend_unmap {mytoplevel} { - pdsend "$mytoplevel map 0" -} - # check or uncheck the "edit" menu item proc pdtk_canvas_editval {mytoplevel value} { # TODO make this work Modified: branches/pd-devel/0.41.4/src/pkgIndex.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pkgIndex.tcl 2009-02-03 01:07:34 UTC (rev 10720) +++ branches/pd-devel/0.41.4/src/pkgIndex.tcl 2009-02-03 05:34:51 UTC (rev 10721) @@ -11,6 +11,8 @@ package ifneeded apple_events 0.1 [list source [file join $dir apple_events.tcl]] package ifneeded pd_bindings 0.1 [list source [file join $dir pd_bindings.tcl]] package ifneeded pd_connect 0.1 [list source [file join $dir pd_connect.tcl]] +package ifneeded find_panel 0.1 [list source [file join $dir find_panel.tcl]] +package ifneeded font_panel 0.1 [list source [file join $dir font_panel.tcl]] package ifneeded gatom 0.1 [list source [file join $dir gatom.tcl]] package ifneeded pd_iemgui 0.1 [list source [file join $dir pd_iemgui.tcl]] package ifneeded pd_menucommands 0.1 [list source [file join $dir pd_menucommands.tcl]] Modified: branches/pd-devel/0.41.4/src/wheredoesthisgo.tcl =================================================================== --- branches/pd-devel/0.41.4/src/wheredoesthisgo.tcl 2009-02-03 01:07:34 UTC (rev 10720) +++ branches/pd-devel/0.41.4/src/wheredoesthisgo.tcl 2009-02-03 05:34:51 UTC (rev 10721) @@ -66,18 +66,6 @@ pdsend "[winfo toplevel $mycanvas] key $state $key $shift" } -# do window maintenance when entering a window (Window menu, scrollbars...) -proc window_focusin {mytoplevel} { - if {[winfo exists .find.frame.targetlabel]} { - set topwindow [winfo toplevel [lindex [wm stackorder .] end]] - if {$topwindow eq ".find"} { - set topwindow [winfo toplevel [lindex [wm stackorder .] end - 1]] - } - # TODO this text should be based on $::menu_windowlist - .find.frame.targetlabel configure -text [wm title $topwindow] - } -} - # ------------------------------------------------------------------------------ # lost pdtk functions... This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10720] trunk/abstractions/sfruit/sfruit
by lukeiannini＠users.sourceforge.net 03 Feb '09

03 Feb '09

Revision: 10720 http://pure-data.svn.sourceforge.net/pure-data/?rev=10720&view=rev Author: lukeiannini Date: 2009-02-03 01:07:34 +0000 (Tue, 03 Feb 2009) Log Message: ----------- deadzone for making a dead area in joysticks, color.hasedcolor for generating a random but consistent color from an input string Modified Paths: -------------- trunk/abstractions/sfruit/sfruit/OSCout.pd trunk/abstractions/sfruit/sfruit/castsymbol.pd Added Paths: ----------- trunk/abstractions/sfruit/sfruit/color.hashedcolor-help.pd trunk/abstractions/sfruit/sfruit/color.hashedcolor.pd trunk/abstractions/sfruit/sfruit/deadzone-help.pd trunk/abstractions/sfruit/sfruit/deadzone.pd Modified: trunk/abstractions/sfruit/sfruit/OSCout.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/OSCout.pd 2009-02-02 19:17:30 UTC (rev 10719) +++ trunk/abstractions/sfruit/sfruit/OSCout.pd 2009-02-03 01:07:34 UTC (rev 10720) @@ -1,14 +1,15 @@ -#N canvas 0 22 367 215 10; +#N canvas 369 22 367 215 10; #X obj 52 133 udpsend; -#X obj 52 103 packOSC; +#X obj 52 63 packOSC; #X obj 124 75 loadbang; #X obj 124 96 list append connect \$1 \$2; -#X obj 52 61 r OSCOUT; -#X obj 78 175 print; +#X obj 52 21 r OSCOUT; #X obj 124 116 list trim; -#X connect 0 0 5 0; -#X connect 1 0 0 0; +#X obj 52 104 spigot; +#X connect 0 0 6 1; +#X connect 1 0 6 0; #X connect 2 0 3 0; -#X connect 3 0 6 0; +#X connect 3 0 5 0; #X connect 4 0 1 0; +#X connect 5 0 0 0; #X connect 6 0 0 0; Modified: trunk/abstractions/sfruit/sfruit/castsymbol.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/castsymbol.pd 2009-02-02 19:17:30 UTC (rev 10719) +++ trunk/abstractions/sfruit/sfruit/castsymbol.pd 2009-02-03 01:07:34 UTC (rev 10720) @@ -1,11 +1,13 @@ -#N canvas 660 453 201 199 10; +#N canvas 453 458 228 207 10; #X obj 36 29 inlet; -#X obj 66 80 list prepend set; #X obj 36 56 t b a; -#X msg 36 108; -#X obj 36 138 outlet; -#X connect 0 0 2 0; -#X connect 1 0 3 0; +#X msg 36 138; +#X obj 36 168 outlet; +#X obj 63 104 list trim; +#X obj 63 80 list prepend set symbol; +#X connect 0 0 1 0; +#X connect 1 0 2 0; +#X connect 1 1 5 0; #X connect 2 0 3 0; -#X connect 2 1 1 0; -#X connect 3 0 4 0; +#X connect 4 0 2 0; +#X connect 5 0 4 0; Added: trunk/abstractions/sfruit/sfruit/color.hashedcolor-help.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/color.hashedcolor-help.pd (rev 0) +++ trunk/abstractions/sfruit/sfruit/color.hashedcolor-help.pd 2009-02-03 01:07:34 UTC (rev 10720) @@ -0,0 +1,21 @@ +#N canvas 611 22 448 384 10; +#X obj 106 170 color.hashedcolor; +#X msg 87 70 telescope; +#X msg 58 108 spyglass; +#X msg 132 108 binoculars; +#X text 8 10 [color.hashedcolor] - generate a random but consistent +color based on any input string.; +#X obj 106 192 color.rgb2pd24; +#X obj 106 274 bng 50 250 50 0 empty empty empty 17 7 0 10 -198190 +-1 -262144; +#X msg 106 242 color \$1; +#X text 294 332 2009 Luke Iannini; +#X text 310 349 proyekto.net; +#X msg 160 134 microscope; +#X connect 0 0 5 0; +#X connect 1 0 0 0; +#X connect 2 0 0 0; +#X connect 3 0 0 0; +#X connect 5 0 7 0; +#X connect 7 0 6 0; +#X connect 10 0 0 0; Added: trunk/abstractions/sfruit/sfruit/color.hashedcolor.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/color.hashedcolor.pd (rev 0) +++ trunk/abstractions/sfruit/sfruit/color.hashedcolor.pd 2009-02-03 01:07:34 UTC (rev 10720) @@ -0,0 +1,28 @@ +#N canvas 943 431 197 345 10; +#X msg 80 176 seed \$1; +#X obj 50 265 list-extend; +#X obj 29 289 list; +#X obj 29 151 t b b b b a b; +#X obj 50 211 random 255; +#X obj 50 239 / 255; +#X obj 29 316 outlet; +#X obj 29 50 inlet; +#X obj 29 129 list-reduce; +#X obj 103 129 +; +#X obj 29 88 moocow/any2string; +#X connect 0 0 4 0; +#X connect 1 0 2 1; +#X connect 2 0 6 0; +#X connect 3 0 2 0; +#X connect 3 1 4 0; +#X connect 3 2 4 0; +#X connect 3 3 4 0; +#X connect 3 4 0 0; +#X connect 3 5 1 1; +#X connect 4 0 5 0; +#X connect 5 0 1 0; +#X connect 7 0 10 0; +#X connect 8 0 3 0; +#X connect 8 1 9 0; +#X connect 9 0 8 1; +#X connect 10 0 8 0; Added: trunk/abstractions/sfruit/sfruit/deadzone-help.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/deadzone-help.pd (rev 0) +++ trunk/abstractions/sfruit/sfruit/deadzone-help.pd 2009-02-03 01:07:34 UTC (rev 10720) @@ -0,0 +1,14 @@ +#N canvas 686 25 450 300 10; +#X obj 129 123 deadzone 5; +#X obj 116 79 hsl 128 15 -20 20 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 12700 1; +#X obj 116 169 hsl 128 15 -20 20 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 12700 1; +#X floatatom 140 148 5 0 0 0 - - -; +#X text 16 18 [deadzone] converts all input within the range -N...0...N +to 0 Useful with joysticks.; +#X text 252 240 2009 Luke Iannini; +#X text 252 260 proyekto.net; +#X connect 0 0 2 0; +#X connect 0 0 3 0; +#X connect 1 0 0 0; Added: trunk/abstractions/sfruit/sfruit/deadzone.pd =================================================================== --- trunk/abstractions/sfruit/sfruit/deadzone.pd (rev 0) +++ trunk/abstractions/sfruit/sfruit/deadzone.pd 2009-02-03 01:07:34 UTC (rev 10720) @@ -0,0 +1,30 @@ +#N canvas 736 493 252 332 10; +#X obj 46 41 inlet; +#X obj 46 105 > \$1; +#X obj 108 106 <; +#X obj 123 83 * -1; +#X obj 123 62 \$1; +#X obj 123 40 loadbang; +#X obj 82 41 inlet; +#X obj 72 178 sel 0 1; +#X obj 46 71 t a a a; +#X obj 120 228 f; +#X obj 72 271 outlet; +#X obj 72 142 ||; +#X msg 72 228 0; +#X connect 0 0 8 0; +#X connect 1 0 11 0; +#X connect 2 0 11 1; +#X connect 3 0 2 1; +#X connect 4 0 3 0; +#X connect 5 0 4 0; +#X connect 6 0 4 0; +#X connect 6 0 1 1; +#X connect 7 0 12 0; +#X connect 7 1 9 0; +#X connect 8 0 1 0; +#X connect 8 1 2 0; +#X connect 8 2 9 1; +#X connect 9 0 10 0; +#X connect 11 0 7 0; +#X connect 12 0 10 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10719] branches/pd-devel/0.41.4
by eighthave＠users.sourceforge.net 02 Feb '09

02 Feb '09

Revision: 10719 http://pure-data.svn.sourceforge.net/pure-data/?rev=10719&view=rev Author: eighthave Date: 2009-02-02 19:17:30 +0000 (Mon, 02 Feb 2009) Log Message: ----------- updated TODO and sketched out some comments and panel code Modified Paths: -------------- branches/pd-devel/0.41.4/devel_doc/TODO branches/pd-devel/0.41.4/src/gatom.tcl branches/pd-devel/0.41.4/src/pd_menucommands.tcl Modified: branches/pd-devel/0.41.4/devel_doc/TODO =================================================================== --- branches/pd-devel/0.41.4/devel_doc/TODO 2009-02-02 19:13:22 UTC (rev 10718) +++ branches/pd-devel/0.41.4/devel_doc/TODO 2009-02-02 19:17:30 UTC (rev 10719) @@ -4,9 +4,16 @@ [ ] performance testing to make sure the Tcl networking is up to snuff [ ] overall naming/organization scheme for variables, functions, and packages [ ] implement checking to see if another Pd is already running follwoing this code example: http://tcl.tk/man/tcl8.4/TkCmd/send.htm -[ ] search path for startup.tcl and load, this is a file for GUI customizations +[ ] search path for startup.tcl and load, this is a file for GUI +customizations +[ ] create pd_panels.tcl with the code for creating the various panels, or +maybe it should be like font_panel.tcl, find_panel.tcl, etc. +[ ] make pd_menucommands only have the commands that are called form the +menus, the meat of the code should go into more approriate places +[ ] make pdtk_* procs just serve as message passing, since that is what they +are doing. the real world should be more cleanly laid out by functionality. +For example, the font panel should be created by Tk, then the - gui logic --------- [ ] figure out Undo/Redo/Cut/Copy/Paste state changes for menus @@ -14,11 +21,18 @@ [ ] canvas scrollbar logic [ ] flash menu when accelerator hits (i.e. flash Edit when Ctrl-E) [ ] make File->New default dir the dir of the current top window (pdsend_map) -[ ] use gnocl for GNOME feel +[ ] made "performance mode" on menu which disables closing of toplevel + windows, probably using binding/unbinding to toplevel classes +[ ] if pd_*dir for panels no longer exists, step down one level at a time + until a still-existing directory is found. +[ ] add DIO error option to the Media menu +[ ] add "edit" option to canvas popup to edit the text on GUI objects +[ ] use "system" colors to use colors from the OS's preferences panels ------ -[ ] find panel +[ ] add findagain support to find panel +[ ] make text entry in find/sendmessage panels a popup menu with the history [ ] send message panel [ ] restructure Pd window for cleaner UI and code [ ] font panel @@ -30,22 +44,12 @@ http://lists.puredata.info/pipermail/pd-list/2008-05/062630.html - -post-GUI rewrite -================ - -These are things to address once the initial Tcl-only GUI rewrite is complete. - -[ ] streamline pdsend_key and the C side of things, using %N -[ ] implement [wm attributes -titlepath] on Mac OS X and change pdsend_map -[ ] move sys_font setting from 'pd' to 'pd-gui', probably in pdtk_pd_startup -[ ] switch pdtk_canvas_getscroll to mytoplevel and bind <Configure> to a -class - +using toplevel classes +---------------------- - switch to using toplevel classes instead of creating the bindings each time bind MyCanvas bind MyToplevel - [2:07pm] ijchain: <patthoyts> If you bind to the classname of the toplevel you;ll only get the Map event from that toplevel. [2:07pm] ijchain: <patthoyts> eg: bind Dialog <Map> {puts "map %W"} ; toplevel .t -class Dialog; pack [canvas .t.c]; wm withdraw .t; wm deiconify .t [2:08pm] ijchain: <patthoyts> will only show a Map from .t @@ -66,3 +70,16 @@ [2:12pm] ijchain: <patthoyts> Instead you can do the binding to the class name once in the initialization for the application. [2:13pm] ijchain: <patthoyts> Then any toplevel created with that class will automatically get the correct bindings. [2:14pm] ijchain: <patthoyts> If you look at the code in tk/library/*.tcl where the widget bindings are all setup you can see thats how its done for Tk's own stuff. Mostly anyway. + +================ +post-GUI rewrite +================ + +These are things to address once the initial Tcl-only GUI rewrite is complete. + +[ ] streamline pdsend_key and the C side of things, using %N +[ ] implement [wm attributes -titlepath] on Mac OS X and change pdsend_map +[ ] move sys_font setting from 'pd' to 'pd-gui', probably in pdtk_pd_startup +[ ] switch pdtk_canvas_getscroll to mytoplevel and bind <Configure> to a -class +[ ] use gnocl for GNOME feel +[ ] fix X11 copy/paste custom code (i.e. not [clipboard get] http://wiki.tcl.tk/1217 Modified: branches/pd-devel/0.41.4/src/gatom.tcl =================================================================== --- branches/pd-devel/0.41.4/src/gatom.tcl 2009-02-02 19:13:22 UTC (rev 10718) +++ branches/pd-devel/0.41.4/src/gatom.tcl 2009-02-02 19:17:30 UTC (rev 10719) @@ -7,7 +7,8 @@ namespace export pdtk_gatom_dialog } -# the radiobutton widget requires this to be global +# hashtable for communicating the position of the radiobuttons (Tk's +# radiobutton widget requires this to be global) global gatomlabel_position ############ pdtk_gatom_dialog -- run a gatom dialog ######### Modified: branches/pd-devel/0.41.4/src/pd_menucommands.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_menucommands.tcl 2009-02-02 19:13:22 UTC (rev 10718) +++ branches/pd-devel/0.41.4/src/pd_menucommands.tcl 2009-02-02 19:17:30 UTC (rev 10719) @@ -44,6 +44,15 @@ } } + +proc ::pd_menucommands::menu_showpanel {panelname mytoplevel} { + if {[winfo exists .$panelname]} { + wm deiconify .$panelname + raise .$panelname + } else { + ::${panelname}::create_panel $mytoplevel + } +} # ------------------------------------------------------------------------------ # send message panel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10718] branches/pd-devel/0.41.4/src/gatom.tcl
by eighthave＠users.sourceforge.net 02 Feb '09

02 Feb '09

Revision: 10718 http://pure-data.svn.sourceforge.net/pure-data/?rev=10718&view=rev Author: eighthave Date: 2009-02-02 19:13:22 +0000 (Mon, 02 Feb 2009) Log Message: ----------- - replaced the very obtuse code where there were global variables that had variable names in it with a system where the widgets themselves are queried for their values. -Unfortunately, you still need a global variable with the radiobuttons, so I switched that to a hash rather than global variables holding variable names -This line, and those below, will be ignored-- M gatom.tcl Modified Paths: -------------- branches/pd-devel/0.41.4/src/gatom.tcl Modified: branches/pd-devel/0.41.4/src/gatom.tcl =================================================================== --- branches/pd-devel/0.41.4/src/gatom.tcl 2009-02-02 17:22:20 UTC (rev 10717) +++ branches/pd-devel/0.41.4/src/gatom.tcl 2009-02-02 19:13:22 UTC (rev 10718) @@ -7,6 +7,9 @@ namespace export pdtk_gatom_dialog } +# the radiobutton widget requires this to be global +global gatomlabel_position + ############ pdtk_gatom_dialog -- run a gatom dialog ######### # dialogs like this one can come up in many copies; but in TK the easiest @@ -28,7 +31,7 @@ set ret [string map {"$" "#"} $sym] } } - return unspace_text $ret + return [unspace_text $ret] } proc ::gatom::unescape {sym} { @@ -47,40 +50,16 @@ } proc ::gatom::apply {mytoplevel} { - set vid [string trimleft $mytoplevel .] - - # TODO replace this $$/global stuff by setting the values that were given - # to use by Pd directly to the entry boxes, then when calling the apply - # proc, use [$myentry get] - set var_gatomwidth [concat gatomwidth_$vid] - global $var_gatomwidth - set var_gatomlo [concat gatomlo_$vid] - global $var_gatomlo - set var_gatomhi [concat gatomhi_$vid] - global $var_gatomhi - set var_gatomwherelabel [concat gatomwherelabel_$vid] - global $var_gatomwherelabel - set var_gatomlabel [concat gatomlabel_$vid] - global $var_gatomlabel - set var_gatomsymfrom [concat gatomsymfrom_$vid] - global $var_gatomsymfrom - set var_gatomsymto [concat gatomsymto_$vid] - global $var_gatomsymto - - # set cmd [concat $id param $gatomwidth $gatomlo $gatomhi \;] - - set cmd [concat $mytoplevel param \ - [eval concat $$var_gatomwidth] \ - [eval concat $$var_gatomlo] \ - [eval concat $$var_gatomhi] \ - [eval ::gatom::escape $$var_gatomlabel] \ - [eval concat $$var_gatomwherelabel] \ - [eval ::gatom::escape $$var_gatomsymfrom] \ - [eval ::gatom::escape $$var_gatomsymto] \ - \;] - - # puts stderr $cmd - pdsend $cmd + global gatomlabel_position + + pdsend "$mytoplevel param \ + [$mytoplevel.width.entry get] \ + [$mytoplevel.limits.lower.entry get] \ + [$mytoplevel.limits.upper.entry get] \ + [::gatom::escape [$mytoplevel.gatomlabel.name.entry get]] \ + $gatomlabel_position($mytoplevel) \ + [::gatom::escape [$mytoplevel.s_r.send.entry get]] \ + [::gatom::escape [$mytoplevel.s_r.receive.entry get]]" } @@ -104,94 +83,69 @@ ::gatom::cancel $mytoplevel } -proc ::gatom::pdtk_gatom_dialog {mytoplevel initwidth initlo inithi \ - wherelabel label symfrom symto} { +proc ::gatom::pdtk_gatom_dialog {mytoplevel initwidth initlower initupper \ + initgatomlabel_position \ + initgatomlabel initsend initreceive} { + global gatomlabel_position + set gatomlabel_position($mytoplevel) $initgatomlabel_position - set vid [string trimleft $mytoplevel .] - - # TODO replace this $$/global stuff by setting the values that were given - # to use by Pd directly to the entry boxes, then when calling the apply - # proc, use [$myentry get] - set var_gatomwidth [concat gatomwidth_$vid] - global $var_gatomwidth - set var_gatomlo [concat gatomlo_$vid] - global $var_gatomlo - set var_gatomhi [concat gatomhi_$vid] - global $var_gatomhi - set var_gatomwherelabel [concat gatomwherelabel_$vid] - global $var_gatomwherelabel - set var_gatomlabel [concat gatomlabel_$vid] - global $var_gatomlabel - set var_gatomsymfrom [concat gatomsymfrom_$vid] - global $var_gatomsymfrom - set var_gatomsymto [concat gatomsymto_$vid] - global $var_gatomsymto - - set $var_gatomwidth $initwidth - set $var_gatomlo $initlo - set $var_gatomhi $inithi - set $var_gatomwherelabel $wherelabel - set $var_gatomlabel [::gatom::unescape $label] - set $var_gatomsymfrom [::gatom::unescape $symfrom] - set $var_gatomsymto [::gatom::unescape $symto] - - toplevel $mytoplevel + toplevel $mytoplevel -class PdPanel wm title $mytoplevel "atom box properties" wm resizable $mytoplevel 0 0 wm protocol $mytoplevel WM_DELETE_WINDOW "::gatom::cancel $mytoplevel" ::pd_bindings::panel_bindings $mytoplevel "gatom" - frame $mytoplevel.params -height 7 - pack $mytoplevel.params -side top - label $mytoplevel.params.entryname -text "width" - entry $mytoplevel.params.entry -textvariable $var_gatomwidth -width 4 - pack $mytoplevel.params.entryname $mytoplevel.params.entry -side left + frame $mytoplevel.width -height 7 + pack $mytoplevel.width -side top + label $mytoplevel.width.label -text "width" + entry $mytoplevel.width.entry -width 4 + pack $mytoplevel.width.label $mytoplevel.width.entry -side left labelframe $mytoplevel.limits -text "limits" -padx 15 -pady 4 -borderwidth 1 \ -font highlight_font pack $mytoplevel.limits -side top -fill x frame $mytoplevel.limits.lower pack $mytoplevel.limits.lower -side left - label $mytoplevel.limits.lower.entryname -text "lower" - entry $mytoplevel.limits.lower.entry -textvariable $var_gatomlo -width 8 - pack $mytoplevel.limits.lower.entryname $mytoplevel.limits.lower.entry -side left + label $mytoplevel.limits.lower.label -text "lower" + entry $mytoplevel.limits.lower.entry -width 8 + pack $mytoplevel.limits.lower.label $mytoplevel.limits.lower.entry -side left frame $mytoplevel.limits.upper pack $mytoplevel.limits.upper -side left frame $mytoplevel.limits.upper.spacer -width 20 - label $mytoplevel.limits.upper.entryname -text "upper" - entry $mytoplevel.limits.upper.entry -textvariable $var_gatomhi -width 8 - pack $mytoplevel.limits.upper.spacer $mytoplevel.limits.upper.entryname \ + label $mytoplevel.limits.upper.label -text "upper" + entry $mytoplevel.limits.upper.entry -width 8 + pack $mytoplevel.limits.upper.spacer $mytoplevel.limits.upper.label \ $mytoplevel.limits.upper.entry -side left frame $mytoplevel.spacer1 -height 7 pack $mytoplevel.spacer1 -side top - labelframe $mytoplevel.label -text "label" -padx 5 -pady 4 -borderwidth 1 \ + labelframe $mytoplevel.gatomlabel -text "label" -padx 5 -pady 4 -borderwidth 1 \ -font highlight_font - pack $mytoplevel.label -side top -fill x - frame $mytoplevel.label.name - pack $mytoplevel.label.name -side top - entry $mytoplevel.label.name.entry -textvariable $var_gatomlabel -width 33 - pack $mytoplevel.label.name.entry -side left - frame $mytoplevel.label.radio - pack $mytoplevel.label.radio -side top - radiobutton $mytoplevel.label.radio.left -value 0 \ - -variable $var_gatomwherelabel \ - -text "left " -justify left - radiobutton $mytoplevel.label.radio.right -value 1 \ - -variable $var_gatomwherelabel \ - -text "right" -justify left - radiobutton $mytoplevel.label.radio.top -value 2 \ - -variable $var_gatomwherelabel \ - -text "top" -justify left - radiobutton $mytoplevel.label.radio.bottom -value 3 \ - -variable $var_gatomwherelabel \ - -text "bottom" -justify left - pack $mytoplevel.label.radio.left -side left -anchor w - pack $mytoplevel.label.radio.right -side right -anchor w - pack $mytoplevel.label.radio.top -side top -anchor w - pack $mytoplevel.label.radio.bottom -side bottom -anchor w + pack $mytoplevel.gatomlabel -side top -fill x + frame $mytoplevel.gatomlabel.name + pack $mytoplevel.gatomlabel.name -side top + entry $mytoplevel.gatomlabel.name.entry -width 33 + pack $mytoplevel.gatomlabel.name.entry -side left + frame $mytoplevel.gatomlabel.radio + pack $mytoplevel.gatomlabel.radio -side top + radiobutton $mytoplevel.gatomlabel.radio.left -value 0 \ + -variable gatomlabel_position($mytoplevel) \ + -text "left " -justify left -takefocus 0 + radiobutton $mytoplevel.gatomlabel.radio.right -value 1 \ + -variable gatomlabel_position($mytoplevel) \ + -text "right" -justify left -takefocus 0 + radiobutton $mytoplevel.gatomlabel.radio.top -value 2 \ + -variable gatomlabel_position($mytoplevel) \ + -text "top" -justify left -takefocus 0 + radiobutton $mytoplevel.gatomlabel.radio.bottom -value 3 \ + -variable gatomlabel_position($mytoplevel) \ + -text "bottom" -justify left -takefocus 0 + pack $mytoplevel.gatomlabel.radio.left -side left -anchor w + pack $mytoplevel.gatomlabel.radio.right -side right -anchor w + pack $mytoplevel.gatomlabel.radio.top -side top -anchor w + pack $mytoplevel.gatomlabel.radio.bottom -side bottom -anchor w frame $mytoplevel.spacer2 -height 7 pack $mytoplevel.spacer2 -side top @@ -199,31 +153,45 @@ labelframe $mytoplevel.s_r -text "messages" -padx 5 -pady 4 -borderwidth 1 \ -font highlight_font pack $mytoplevel.s_r -side top -fill x - frame $mytoplevel.s_r.paramsymto - pack $mytoplevel.s_r.paramsymto -side top -anchor e - label $mytoplevel.s_r.paramsymto.entryname -text "send symbol" - entry $mytoplevel.s_r.paramsymto.entry -textvariable $var_gatomsymto -width 21 - pack $mytoplevel.s_r.paramsymto.entry $mytoplevel.s_r.paramsymto.entryname -side right + frame $mytoplevel.s_r.send + pack $mytoplevel.s_r.send -side top -anchor e + label $mytoplevel.s_r.send.label -text "send symbol" + entry $mytoplevel.s_r.send.entry -width 21 + pack $mytoplevel.s_r.send.entry $mytoplevel.s_r.send.label -side right - frame $mytoplevel.s_r.paramsymfrom - pack $mytoplevel.s_r.paramsymfrom -side top -anchor e - label $mytoplevel.s_r.paramsymfrom.entryname -text "receive symbol" - entry $mytoplevel.s_r.paramsymfrom.entry -textvariable $var_gatomsymfrom -width 21 - pack $mytoplevel.s_r.paramsymfrom.entry $mytoplevel.s_r.paramsymfrom.entryname -side right + frame $mytoplevel.s_r.receive + pack $mytoplevel.s_r.receive -side top -anchor e + label $mytoplevel.s_r.receive.label -text "receive symbol" + entry $mytoplevel.s_r.receive.entry -width 21 + pack $mytoplevel.s_r.receive.entry $mytoplevel.s_r.receive.label -side right frame $mytoplevel.buttonframe -pady 5 pack $mytoplevel.buttonframe -side top -fill x -pady 2m - button $mytoplevel.buttonframe.cancel -text {Cancel}\ + button $mytoplevel.buttonframe.cancel -text {Cancel} \ -command "::gatom::cancel $mytoplevel" pack $mytoplevel.buttonframe.cancel -side left -expand 1 - button $mytoplevel.buttonframe.apply -text {Apply}\ + button $mytoplevel.buttonframe.apply -text {Apply} \ -command "::gatom::apply $mytoplevel" pack $mytoplevel.buttonframe.apply -side left -expand 1 - button $mytoplevel.buttonframe.ok -text {OK}\ + button $mytoplevel.buttonframe.ok -text {OK} \ -command "::gatom::ok $mytoplevel" pack $mytoplevel.buttonframe.ok -side left -expand 1 - $mytoplevel.params.entry select from 0 - $mytoplevel.params.entry select adjust end - focus $mytoplevel.params.entry + $mytoplevel.width.entry insert 0 $initwidth + $mytoplevel.limits.lower.entry insert 0 $initlower + $mytoplevel.limits.upper.entry insert 0 $initupper + if {$initgatomlabel ne "-"} { + $mytoplevel.gatomlabel.name.entry insert 0 $initgatomlabel + } + set gatomlabel_position($mytoplevel) $initgatomlabel_position + if {$initsend ne "-"} { + $mytoplevel.s_r.send.entry insert 0 $initsend + } + if {$initreceive ne "-"} { + $mytoplevel.s_r.receive.entry insert 0 $initreceive + } + + $mytoplevel.width.entry select from 0 + $mytoplevel.width.entry select adjust end + focus $mytoplevel.width.entry } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10717] trunk/abstractions/footils/rtc-lib/rtc
by fbar＠users.sourceforge.net 02 Feb '09

02 Feb '09

Revision: 10717 http://pure-data.svn.sourceforge.net/pure-data/?rev=10717&view=rev Author: fbar Date: 2009-02-02 17:22:20 +0000 (Mon, 02 Feb 2009) Log Message: ----------- added anti-bis help, fixed depth first bug in anti-x objects Modified Paths: -------------- trunk/abstractions/footils/rtc-lib/rtc/anti-bis&osc.pd trunk/abstractions/footils/rtc-lib/rtc/anti-bis.pd trunk/abstractions/footils/rtc-lib/rtc/anti-osc.pd Added Paths: ----------- trunk/abstractions/footils/rtc-lib/rtc/anti-bis-help.pd Modified: trunk/abstractions/footils/rtc-lib/rtc/anti-bis&osc.pd =================================================================== (Binary files differ) Added: trunk/abstractions/footils/rtc-lib/rtc/anti-bis-help.pd =================================================================== --- trunk/abstractions/footils/rtc-lib/rtc/anti-bis-help.pd (rev 0) +++ trunk/abstractions/footils/rtc-lib/rtc/anti-bis-help.pd 2009-02-02 17:22:20 UTC (rev 10717) @@ -0,0 +1,54 @@ +#N canvas 453 191 608 468 10; +#X floatatom 56 268 0 0 0 0 - - -; +#X obj 56 144 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 +1; +#X obj 56 168 metro 250; +#X obj 56 235 anti-bis; +#X obj 109 257 bng 15 100 50 0 empty empty empty 17 7 0 10 -262144 +-1 -1; +#X text 135 268 flashes when a repetition would have occured; +#N canvas 63 44 210 190 play-it 0; +#X obj 38 84 + 60; +#X obj 38 118 play 127 150; +#X obj 38 54 inlet; +#X connect 0 0 1 0; +#X connect 2 0 0 0; +#X restore 56 301 pd play-it; +#X text 26 343 1992 by IRCAM; +#X text 26 28 anti-bis; +#X text 26 111 see also:; +#X text 26 61 Filters out immediate repetitions of integers. Right +output sends a bang whenever this occurs.; +#X obj 105 112 anti-osc; +#X obj 178 113 anti-bis&osc; +#X msg 162 321 1 0 2 0 2 0 2 1 2 1; +#X obj 56 202 random 3; +#N canvas 0 0 842 581 last10 0; +#X obj 153 175 cnv 15 150 80 empty empty empty 20 12 0 14 -233017 -66577 +0; +#X text 311 195 Right outlet is responsible to first fill the list +; +#X text 312 211 Left outlet then only lets the smaller list pass.; +#X obj 180 183 list; +#X obj 180 149 inlet; +#X obj 180 302 outlet; +#X obj 180 258 list prepend set; +#X obj 180 279 list trim; +#X obj 180 228 list split 10; +#X connect 3 0 8 0; +#X connect 4 0 3 0; +#X connect 6 0 7 0; +#X connect 7 0 5 0; +#X connect 8 0 3 1; +#X connect 8 0 6 0; +#X connect 8 2 3 1; +#X restore 162 299 pd last10; +#X connect 0 0 6 0; +#X connect 1 0 2 0; +#X connect 2 0 14 0; +#X connect 3 0 0 0; +#X connect 3 0 15 0; +#X connect 3 1 4 0; +#X connect 3 1 14 0; +#X connect 14 0 3 0; +#X connect 15 0 13 0; Modified: trunk/abstractions/footils/rtc-lib/rtc/anti-bis.pd =================================================================== (Binary files differ) Modified: trunk/abstractions/footils/rtc-lib/rtc/anti-osc.pd =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10716] branches/pd-devel/0.41.4/src
by eighthave＠users.sourceforge.net 02 Feb '09

02 Feb '09

Revision: 10716 http://pure-data.svn.sourceforge.net/pure-data/?rev=10716&view=rev Author: eighthave Date: 2009-02-02 16:35:29 +0000 (Mon, 02 Feb 2009) Log Message: ----------- - copied over gatom code from u_main.tk and got it running. It still needs some serious cleanup. - cleaned up the importing of pd_connect::pdsend. It is now imported into the global namespace in pd.tk since pdsend is used in every package - cleaned up some variable names and formatting, added comments Modified Paths: -------------- branches/pd-devel/0.41.4/src/pd.tk branches/pd-devel/0.41.4/src/pd_bindings.tcl branches/pd-devel/0.41.4/src/pd_menucommands.tcl branches/pd-devel/0.41.4/src/pdtk_array.tcl branches/pd-devel/0.41.4/src/pdtk_canvas.tcl branches/pd-devel/0.41.4/src/pkgIndex.tcl Added Paths: ----------- branches/pd-devel/0.41.4/src/gatom.tcl Added: branches/pd-devel/0.41.4/src/gatom.tcl =================================================================== --- branches/pd-devel/0.41.4/src/gatom.tcl (rev 0) +++ branches/pd-devel/0.41.4/src/gatom.tcl 2009-02-02 16:35:29 UTC (rev 10716) @@ -0,0 +1,229 @@ + +package provide gatom 0.1 + +package require wheredoesthisgo + +namespace eval ::gatom:: { + namespace export pdtk_gatom_dialog +} + +############ pdtk_gatom_dialog -- run a gatom dialog ######### + +# dialogs like this one can come up in many copies; but in TK the easiest +# way to get data from an "entry", etc., is to set an associated variable +# name. This is especially true for grouped "radio buttons". So we have +# to synthesize variable names for each instance of the dialog. The dialog +# gets a TK pathname $id, from which it strips the leading "." to make a +# variable suffix $vid. Then you can get the actual value out by asking for +# [eval concat $$variablename]. There should be an easier way but I don't see +# it yet. + +proc ::gatom::escape {sym} { + if {[string length $sym] == 0} { + set ret "-" + } else { + if {[string equal -length 1 $sym "-"]} { + set ret [string replace $sym 0 0 "--"] + } else { + set ret [string map {"$" "#"} $sym] + } + } + return unspace_text $ret +} + +proc ::gatom::unescape {sym} { + if {[string equal -length 1 $sym "-"]} { + set ret [string replace $sym 0 0 ""] + } else { + set ret [string map {"#" "$"} $sym] + } + return $ret +} + +proc gatom_apply {mytoplevel} { + # TODO kludge!! until a common approach to ::pd_bindings::panel_bindings + # is sorted out + ::gatom::apply $mytoplevel +} + +proc ::gatom::apply {mytoplevel} { + set vid [string trimleft $mytoplevel .] + + # TODO replace this $$/global stuff by setting the values that were given + # to use by Pd directly to the entry boxes, then when calling the apply + # proc, use [$myentry get] + set var_gatomwidth [concat gatomwidth_$vid] + global $var_gatomwidth + set var_gatomlo [concat gatomlo_$vid] + global $var_gatomlo + set var_gatomhi [concat gatomhi_$vid] + global $var_gatomhi + set var_gatomwherelabel [concat gatomwherelabel_$vid] + global $var_gatomwherelabel + set var_gatomlabel [concat gatomlabel_$vid] + global $var_gatomlabel + set var_gatomsymfrom [concat gatomsymfrom_$vid] + global $var_gatomsymfrom + set var_gatomsymto [concat gatomsymto_$vid] + global $var_gatomsymto + + # set cmd [concat $id param $gatomwidth $gatomlo $gatomhi \;] + + set cmd [concat $mytoplevel param \ + [eval concat $$var_gatomwidth] \ + [eval concat $$var_gatomlo] \ + [eval concat $$var_gatomhi] \ + [eval ::gatom::escape $$var_gatomlabel] \ + [eval concat $$var_gatomwherelabel] \ + [eval ::gatom::escape $$var_gatomsymfrom] \ + [eval ::gatom::escape $$var_gatomsymto] \ + \;] + + # puts stderr $cmd + pdsend $cmd +} + + +proc gatom_cancel {mytoplevel} { + # TODO kludge!! until a common approach to ::pd_bindings::panel_bindings + # is sorted out + ::gatom::cancel $mytoplevel +} +proc ::gatom::cancel {mytoplevel} { + pdsend "$mytoplevel cancel" +} + + +proc gatom_ok {mytoplevel} { + # TODO kludge!! until a common approach to ::pd_bindings::panel_bindings + # is sorted out + ::gatom::ok $mytoplevel +} +proc ::gatom::ok {mytoplevel} { + ::gatom::apply $mytoplevel + ::gatom::cancel $mytoplevel +} + +proc ::gatom::pdtk_gatom_dialog {mytoplevel initwidth initlo inithi \ + wherelabel label symfrom symto} { + + set vid [string trimleft $mytoplevel .] + + # TODO replace this $$/global stuff by setting the values that were given + # to use by Pd directly to the entry boxes, then when calling the apply + # proc, use [$myentry get] + set var_gatomwidth [concat gatomwidth_$vid] + global $var_gatomwidth + set var_gatomlo [concat gatomlo_$vid] + global $var_gatomlo + set var_gatomhi [concat gatomhi_$vid] + global $var_gatomhi + set var_gatomwherelabel [concat gatomwherelabel_$vid] + global $var_gatomwherelabel + set var_gatomlabel [concat gatomlabel_$vid] + global $var_gatomlabel + set var_gatomsymfrom [concat gatomsymfrom_$vid] + global $var_gatomsymfrom + set var_gatomsymto [concat gatomsymto_$vid] + global $var_gatomsymto + + set $var_gatomwidth $initwidth + set $var_gatomlo $initlo + set $var_gatomhi $inithi + set $var_gatomwherelabel $wherelabel + set $var_gatomlabel [::gatom::unescape $label] + set $var_gatomsymfrom [::gatom::unescape $symfrom] + set $var_gatomsymto [::gatom::unescape $symto] + + toplevel $mytoplevel + wm title $mytoplevel "atom box properties" + wm resizable $mytoplevel 0 0 + wm protocol $mytoplevel WM_DELETE_WINDOW "::gatom::cancel $mytoplevel" + + ::pd_bindings::panel_bindings $mytoplevel "gatom" + + frame $mytoplevel.params -height 7 + pack $mytoplevel.params -side top + label $mytoplevel.params.entryname -text "width" + entry $mytoplevel.params.entry -textvariable $var_gatomwidth -width 4 + pack $mytoplevel.params.entryname $mytoplevel.params.entry -side left + + labelframe $mytoplevel.limits -text "limits" -padx 15 -pady 4 -borderwidth 1 \ + -font highlight_font + pack $mytoplevel.limits -side top -fill x + frame $mytoplevel.limits.lower + pack $mytoplevel.limits.lower -side left + label $mytoplevel.limits.lower.entryname -text "lower" + entry $mytoplevel.limits.lower.entry -textvariable $var_gatomlo -width 8 + pack $mytoplevel.limits.lower.entryname $mytoplevel.limits.lower.entry -side left + frame $mytoplevel.limits.upper + pack $mytoplevel.limits.upper -side left + frame $mytoplevel.limits.upper.spacer -width 20 + label $mytoplevel.limits.upper.entryname -text "upper" + entry $mytoplevel.limits.upper.entry -textvariable $var_gatomhi -width 8 + pack $mytoplevel.limits.upper.spacer $mytoplevel.limits.upper.entryname \ + $mytoplevel.limits.upper.entry -side left + + frame $mytoplevel.spacer1 -height 7 + pack $mytoplevel.spacer1 -side top + + labelframe $mytoplevel.label -text "label" -padx 5 -pady 4 -borderwidth 1 \ + -font highlight_font + pack $mytoplevel.label -side top -fill x + frame $mytoplevel.label.name + pack $mytoplevel.label.name -side top + entry $mytoplevel.label.name.entry -textvariable $var_gatomlabel -width 33 + pack $mytoplevel.label.name.entry -side left + frame $mytoplevel.label.radio + pack $mytoplevel.label.radio -side top + radiobutton $mytoplevel.label.radio.left -value 0 \ + -variable $var_gatomwherelabel \ + -text "left " -justify left + radiobutton $mytoplevel.label.radio.right -value 1 \ + -variable $var_gatomwherelabel \ + -text "right" -justify left + radiobutton $mytoplevel.label.radio.top -value 2 \ + -variable $var_gatomwherelabel \ + -text "top" -justify left + radiobutton $mytoplevel.label.radio.bottom -value 3 \ + -variable $var_gatomwherelabel \ + -text "bottom" -justify left + pack $mytoplevel.label.radio.left -side left -anchor w + pack $mytoplevel.label.radio.right -side right -anchor w + pack $mytoplevel.label.radio.top -side top -anchor w + pack $mytoplevel.label.radio.bottom -side bottom -anchor w + + frame $mytoplevel.spacer2 -height 7 + pack $mytoplevel.spacer2 -side top + + labelframe $mytoplevel.s_r -text "messages" -padx 5 -pady 4 -borderwidth 1 \ + -font highlight_font + pack $mytoplevel.s_r -side top -fill x + frame $mytoplevel.s_r.paramsymto + pack $mytoplevel.s_r.paramsymto -side top -anchor e + label $mytoplevel.s_r.paramsymto.entryname -text "send symbol" + entry $mytoplevel.s_r.paramsymto.entry -textvariable $var_gatomsymto -width 21 + pack $mytoplevel.s_r.paramsymto.entry $mytoplevel.s_r.paramsymto.entryname -side right + + frame $mytoplevel.s_r.paramsymfrom + pack $mytoplevel.s_r.paramsymfrom -side top -anchor e + label $mytoplevel.s_r.paramsymfrom.entryname -text "receive symbol" + entry $mytoplevel.s_r.paramsymfrom.entry -textvariable $var_gatomsymfrom -width 21 + pack $mytoplevel.s_r.paramsymfrom.entry $mytoplevel.s_r.paramsymfrom.entryname -side right + + frame $mytoplevel.buttonframe -pady 5 + pack $mytoplevel.buttonframe -side top -fill x -pady 2m + button $mytoplevel.buttonframe.cancel -text {Cancel}\ + -command "::gatom::cancel $mytoplevel" + pack $mytoplevel.buttonframe.cancel -side left -expand 1 + button $mytoplevel.buttonframe.apply -text {Apply}\ + -command "::gatom::apply $mytoplevel" + pack $mytoplevel.buttonframe.apply -side left -expand 1 + button $mytoplevel.buttonframe.ok -text {OK}\ + -command "::gatom::ok $mytoplevel" + pack $mytoplevel.buttonframe.ok -side left -expand 1 + + $mytoplevel.params.entry select from 0 + $mytoplevel.params.entry select adjust end + focus $mytoplevel.params.entry +} Modified: branches/pd-devel/0.41.4/src/pd.tk =================================================================== --- branches/pd-devel/0.41.4/src/pd.tk 2009-02-02 14:14:28 UTC (rev 10715) +++ branches/pd-devel/0.41.4/src/pd.tk 2009-02-02 16:35:29 UTC (rev 10716) @@ -60,6 +60,7 @@ package require pd_menus package require pd_bindings package require pd_post +package require gatom package require pd_iemgui package require pdtk_array package require pdtk_canvas @@ -68,9 +69,10 @@ package require wheredoesthisgo # import into the global namespace for backwards compatibility +namespace import ::pd_connect::pdsend namespace import ::pd_post::pdtk_post -namespace import ::pd_connect::pdsend namespace import ::pd_iemgui::pdtk_iemgui_dialog +namespace import ::gatom::pdtk_gatom_dialog #------------------------------------------------------------------------------# # coding style Modified: branches/pd-devel/0.41.4/src/pd_bindings.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_bindings.tcl 2009-02-02 14:14:28 UTC (rev 10715) +++ branches/pd-devel/0.41.4/src/pd_bindings.tcl 2009-02-02 16:35:29 UTC (rev 10716) @@ -68,6 +68,9 @@ bind $mytoplevel <FocusIn> "window_focusin %W" } +# this is for the panels: find, font, sendmessage, gatom properties, array +# properties, iemgui properties, canvas properties, data structures +# properties, Audio setup, and MIDI setup proc ::pd_bindings::panel_bindings {mytoplevel panelname} { variable modifier Modified: branches/pd-devel/0.41.4/src/pd_menucommands.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_menucommands.tcl 2009-02-02 14:14:28 UTC (rev 10715) +++ branches/pd-devel/0.41.4/src/pd_menucommands.tcl 2009-02-02 16:35:29 UTC (rev 10716) @@ -7,7 +7,6 @@ variable untitled_number "1" namespace export menu_* - } # ------------------------------------------------------------------------------ @@ -91,7 +90,8 @@ wm deiconify .find raise .find } else { - # TODO insert real find panel here + # TODO figure out findagain + # TODO make targetlabel into a popup menu toplevel .find wm title .find [_ "Find"] wm geometry .find =475x125+150+150 Modified: branches/pd-devel/0.41.4/src/pdtk_array.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pdtk_array.tcl 2009-02-02 14:14:28 UTC (rev 10715) +++ branches/pd-devel/0.41.4/src/pdtk_array.tcl 2009-02-02 16:35:29 UTC (rev 10716) @@ -1,7 +1,5 @@ package provide pdtk_array 0.1 -package require pd_connect - #### jsarlo ##### proc pdtk_array_listview_setpage {arrayName page} { global pd_array_listview_page Modified: branches/pd-devel/0.41.4/src/pdtk_canvas.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pdtk_canvas.tcl 2009-02-02 14:14:28 UTC (rev 10715) +++ branches/pd-devel/0.41.4/src/pdtk_canvas.tcl 2009-02-02 16:35:29 UTC (rev 10716) @@ -102,11 +102,19 @@ pdtk_pastetext } + #------------------------------------------------------------------------------# +# canvas font + +proc pdtk_canvas_dofont {mytoplevel initsize} { + # TODO this should just bring up the Font panel +} + +#------------------------------------------------------------------------------# # canvas popup menu -proc popup_action {name action} { - pdsend "$name done-popup $action $::popup_xpix $::popup_ypix" +proc popup_action {mytoplevel action} { + pdsend "$mytoplevel done-popup $action $::popup_xpix $::popup_ypix" } proc pdtk_canvas_popup {mytoplevel xpix ypix hasproperties hasopen} { Modified: branches/pd-devel/0.41.4/src/pkgIndex.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pkgIndex.tcl 2009-02-02 14:14:28 UTC (rev 10715) +++ branches/pd-devel/0.41.4/src/pkgIndex.tcl 2009-02-02 16:35:29 UTC (rev 10716) @@ -11,6 +11,7 @@ package ifneeded apple_events 0.1 [list source [file join $dir apple_events.tcl]] package ifneeded pd_bindings 0.1 [list source [file join $dir pd_bindings.tcl]] package ifneeded pd_connect 0.1 [list source [file join $dir pd_connect.tcl]] +package ifneeded gatom 0.1 [list source [file join $dir gatom.tcl]] package ifneeded pd_iemgui 0.1 [list source [file join $dir pd_iemgui.tcl]] package ifneeded pd_menucommands 0.1 [list source [file join $dir pd_menucommands.tcl]] package ifneeded pd_menus 0.1 [list source [file join $dir pd_menus.tcl]] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10715] trunk/externals/build/src/pbank.c
by nusmuk＠users.sourceforge.net 02 Feb '09

02 Feb '09

Revision: 10715 http://pure-data.svn.sourceforge.net/pure-data/?rev=10715&view=rev Author: nusmuk Date: 2009-02-02 14:14:28 +0000 (Mon, 02 Feb 2009) Log Message: ----------- add pbank to the build system Added Paths: ----------- trunk/externals/build/src/pbank.c Added: trunk/externals/build/src/pbank.c =================================================================== --- trunk/externals/build/src/pbank.c (rev 0) +++ trunk/externals/build/src/pbank.c 2009-02-02 14:14:28 UTC (rev 10715) @@ -0,0 +1 @@ +#include "../../nusmuk/pbank/pbank.c" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs February 2009