Pd-cvs June 2006

pd-cvs@lists.iem.at

13 participants
225 discussions

packages/linux_make Makefile,1.8,1.9
by Hans-Christoph Steiner 14 Jun '06

14 Jun '06

Update of /cvsroot/pure-data/packages/linux_make In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1308/linux_make Modified Files: Makefile Log Message: removed duplicate version in package name Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/packages/linux_make/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile 18 Feb 2006 19:46:39 -0000 1.8 --- Makefile 14 Jun 2006 15:03:42 -0000 1.9 *************** *** 68,72 **** package: tarbz2 ! PACKAGE_NAME = Pd-$(PD_VERSION)-$(PACKAGE_VERSION)-$(OS_NAME)-$(shell uname -m) tarbz2: installer_makefile installer_readme mv $(DESTDIR)$(prefix) $(DESTDIR)$(PACKAGE_NAME) --- 68,72 ---- package: tarbz2 ! PACKAGE_NAME = Pd-$(PD_VERSION)-$(OS_NAME)-$(shell uname -m) tarbz2: installer_makefile installer_readme mv $(DESTDIR)$(prefix) $(DESTDIR)$(PACKAGE_NAME)

1 0

packages/patches number_bug_list_bug-0.39.2.patch, NONE, 1.1 TODO, 1.1, 1.2
by Hans-Christoph Steiner 14 Jun '06

14 Jun '06

Update of /cvsroot/pure-data/packages/patches In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31939 Modified Files: TODO Added Files: number_bug_list_bug-0.39.2.patch Log Message: added patch that's already been accepted into 0.40 --- NEW FILE: number_bug_list_bug-0.39.2.patch --- Index: g_text.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_text.c,v retrieving revision 1.11 diff -u -w -r1.11 g_text.c --- g_text.c 15 Sep 2005 03:17:27 -0000 1.11 +++ g_text.c 14 Jun 2006 14:56:36 -0000 @@ -566,6 +566,19 @@ gatom_bang(x); } + /* We need a list method because, since there's both an "inlet" and a + "nofirstin" flag, the standard list behavior gets confused. */ +static void gatom_list(t_gatom *x, t_symbol *s, int argc, t_atom *argv) +{ + if (!argc) + gatom_bang(x); + else if (argv->a_type == A_FLOAT) + gatom_float(x, argv->a_w.w_float); + else if (argv->a_type == A_SYMBOL) + gatom_symbol(x, argv->a_w.w_symbol); + else pd_error(x, "gatom_list: need float or symbol"); +} + static void gatom_motion(void *z, t_floatarg dx, t_floatarg dy) { t_gatom *x = (t_gatom *)z; @@ -1349,6 +1362,7 @@ class_addbang(gatom_class, gatom_bang); class_addfloat(gatom_class, gatom_float); class_addsymbol(gatom_class, gatom_symbol); + class_addlist(gatom_class, gatom_list); class_addmethod(gatom_class, (t_method)gatom_set, gensym("set"), A_GIMME, 0); class_addmethod(gatom_class, (t_method)gatom_click, gensym("click"), Index: TODO =================================================================== RCS file: /cvsroot/pure-data/packages/patches/TODO,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TODO 27 Feb 2006 05:19:27 -0000 1.1 --- TODO 14 Jun 2006 14:59:49 -0000 1.2 *************** *** 1,3 **** ! - port packages/patches/libdir-0.38.4.patch to 0.39.2 --- 1,12 ---- ! - check out Mac/Intel patches ! ! ! ---------------------- ! Patches accepted into 0.40 ! ---------------------- ! ! - number_bug_list_bug-0.39.2.patch ! - help_browser-0.39.2.patch ! - mingw_fixes-0.39-2.patch

1 0

externals Makefile,1.61,1.62
by Hans-Christoph Steiner 14 Jun '06

14 Jun '06

Update of /cvsroot/pure-data/externals In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20825 Modified Files: Makefile Log Message: added corelibs to the default build; started devellibs section; fixed pmpd targets since Cyrille changed pmpd to single-object-single-file Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/Makefile,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** Makefile 27 May 2006 10:53:14 -0000 1.61 --- Makefile 14 Jun 2006 13:13:47 -0000 1.62 *************** *** 112,116 **** # Pd-extended. For libraries that build on all platforms, add them directly # below, otherwise add to the correct platforms below. ! LIB_TARGETS = bsaylor buildsrc creb cxc cyclone ext13 freeverb ggee hardware iem_ambi iem_bin_ambi iemlib iemmatrix loaders mapping markex maxlib mjlib motex oscx pddp pdogg pmpd sigpack smlib toxy unauthorized vbap zexy # this is for libraries that don't compile (yet) on all platforms --- 112,116 ---- # Pd-extended. For libraries that build on all platforms, add them directly # below, otherwise add to the correct platforms below. ! LIB_TARGETS = bsaylor buildsrc corelibs creb cxc cyclone ext13 freeverb ggee hardware iem_ambi iem_bin_ambi iemlib iemmatrix loaders mapping markex maxlib mjlib motex oscx pddp pdogg pmpd sigpack smlib toxy unauthorized vbap zexy # this is for libraries that don't compile (yet) on all platforms *************** *** 295,303 **** install -d $(objectsdir)/$(CORELIBS_NAME) $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(CORELIBS_NAME) \ ! --author "" \ ! --description "" \ ! --license "" \ --version "" ! install -p $(CORELIBS_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)/$(CORELIBS_NAME) install -d $(helpdir)/$(CORELIBS_NAME) install -p $(externals_src)/corelibs/help/*.pd \ --- 295,304 ---- install -d $(objectsdir)/$(CORELIBS_NAME) $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(CORELIBS_NAME) \ ! --author "Miller Puckette and others" \ ! --description "core libraries stripped out of Pd" \ ! --license "BSD" \ --version "" ! install -p $(CORELIBS_OBJECTS:.c=.$(EXTENSION)) ! $(objectsdir)/$(CORELIBS_NAME) install -d $(helpdir)/$(CORELIBS_NAME) install -p $(externals_src)/corelibs/help/*.pd \ *************** *** 421,424 **** --- 422,461 ---- + #------------------------------------------------------------------------------# + # DEVELLIBS + DEVELLIBS_NAME=devellibs + DEVELLIBS_OBJECTS := $(wildcard $(externals_src)/devellibs/*.c) + devellibs: $(DEVELLIBS_OBJECTS:.c=.$(EXTENSION)) + + devellibs_install: devellibs + install -d $(objectsdir)/$(DEVELLIBS_NAME) + $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(DEVELLIBS_NAME) \ + --author "Miller Puckette and others" \ + --description "core libraries stripped out of Pd-devel" \ + --license "BSD" \ + --version "" + install -p $(DEVELLIBS_OBJECTS:.c=.$(EXTENSION)) + $(objectsdir)/$(DEVELLIBS_NAME) + install -d $(helpdir)/$(DEVELLIBS_NAME) + install -p $(externals_src)/devellibs/help/*.pd \ + $(helpdir)/$(DEVELLIBS_NAME) + # install -d $(manualsdir)/$(DEVELLIBS_NAME) + # install -p $(externals_src)/devellibs/manual.txt \ + # $(manualsdir)/$(DEVELLIBS_NAME) + install -p $(externals_src)/devellibs/README \ + $(readmesdir)/$(DEVELLIBS_NAME).txt + install -d $(examplesdir)/$(DEVELLIBS_NAME) + install -p $(externals_src)/devellibs/examples/*.pd \ + $(examplesdir)/$(DEVELLIBS_NAME) + + devellibs_clean: + -rm -f -- $(DEVELLIBS_OBJECTS:.c=.$(EXTENSION)) + -rm -f -- $(DEVELLIBS_OBJECTS:.c=.o) + -rm -f -- $(externals_src)/devellibs/*.bak + -rm -f -- $(externals_src)/devellibs/*.*~ + + + + #------------------------------------------------------------------------------# *************** *** 703,711 **** $(CC) $(LDFLAGS) -o $(externals_src)/hcs/hid/hid.$(EXTENSION) \ $(HID_OBJECTS) $(HID_LIBS) ! $(STRIP) $(externals_src)/hcs/hid/hid.$(EXTENSION) hid: $(externals_src)/hcs/hid/hid.$(EXTENSION) - hid_install: hid install -d $(objectsdir)/$(HID_NAME) --- 740,747 ---- $(CC) $(LDFLAGS) -o $(externals_src)/hcs/hid/hid.$(EXTENSION) \ $(HID_OBJECTS) $(HID_LIBS) ! # $(STRIP) $(externals_src)/hcs/hid/hid.$(EXTENSION) hid: $(externals_src)/hcs/hid/hid.$(EXTENSION) hid_install: hid install -d $(objectsdir)/$(HID_NAME) *************** *** 1321,1325 **** # PMPD PMPD_NAME=pmpd ! PMPD_OBJECTS := $(wildcard $(externals_src)/pmpd/src/[a-lq-z]*.c) pmpd: $(PMPD_OBJECTS:.c=.$(EXTENSION)) --- 1357,1362 ---- # PMPD PMPD_NAME=pmpd ! PMPD_OBJECTS := $(wildcard $(externals_src)/pmpd/src/[a-oq-z]*.c) \ ! $(externals_src)/pmpd/src/pmpd~.c pmpd: $(PMPD_OBJECTS:.c=.$(EXTENSION)) *************** *** 1343,1349 **** pmpd_clean: -rm -f -- $(PMPD_OBJECTS:.c=.$(EXTENSION)) ! -find $(externals_src)/pmpd -name '*.o' | xargs rm -f -- ! -find $(externals_src)/pmpd -name '*.bak' | xargs rm -f -- ! -find $(externals_src)/pmpd -name '*~' | xargs rm -f -- --- 1380,1386 ---- pmpd_clean: -rm -f -- $(PMPD_OBJECTS:.c=.$(EXTENSION)) ! -rm -f -- $(externals_src)/pmpd/*/*.o ! -rm -f -- $(externals_src)/pmpd/*/*.bak ! -rm -f -- $(externals_src)/pmpd/*/*~

1 0

externals/build/src iAmbient2D.c, NONE, 1.1 iAmbient3D.c, NONE, 1.1 iCircle2D.c, NONE, 1.1 iCircle3D.c, NONE, 1.1 iCylinder3D.c, NONE, 1.1 iLine2D.c, NONE, 1.1 iPlane3D.c, NONE, 1.1 iSeg2D.c, NONE, 1.1 iSphere3D.c, NONE, 1.1 link.c, NONE, 1.1 link2D.c, NONE, 1.1 link3D.c, NONE, 1.1 mass.c, NONE, 1.1 mass2D.c, NONE, 1.1 mass3D.c, NONE, 1.1 pmpd~.c, NONE, 1.1 tCircle2D.c, NONE, 1.1 tCircle3D.c, NONE, 1.1 tCube3D.c, NONE, 1.1 tCylinder3D.c, NONE, 1.1 tLine2D.c, NONE, 1.1 tLink2D.c, NONE, 1.1 tLink3D.c
by cyrille 14 Jun '06

14 Jun '06

Update of /cvsroot/pure-data/externals/build/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11716 Added Files: iAmbient2D.c iAmbient3D.c iCircle2D.c iCircle3D.c iCylinder3D.c iLine2D.c iPlane3D.c iSeg2D.c iSphere3D.c link.c link2D.c link3D.c mass.c mass2D.c mass3D.c pmpd~.c tCircle2D.c tCircle3D.c tCube3D.c tCylinder3D.c tLine2D.c tLink2D.c tLink3D.c tPlane3D.c tSeg2D.c tSphere3D.c tSquare2D.c Log Message: --- NEW FILE: tCircle2D.c --- #include "../../pmpd/src/tCircle2D.c" --- NEW FILE: mass3D.c --- #include "../../pmpd/src/mass3D.c" --- NEW FILE: link2D.c --- #include "../../pmpd/src/link2D.c" --- NEW FILE: tSeg2D.c --- #include "../../pmpd/src/tSeg2D.c" --- NEW FILE: mass.c --- #include "../../pmpd/src/mass.c" --- NEW FILE: tSquare2D.c --- #include "../../pmpd/src/tSquare2D.c" --- NEW FILE: tCircle3D.c --- #include "../../pmpd/src/tCircle3D.c" --- NEW FILE: tLink3D.c --- #include "../../pmpd/src/tLink3D.c" --- NEW FILE: link3D.c --- #include "../../pmpd/src/link3D.c" --- NEW FILE: iLine2D.c --- #include "../../pmpd/src/iLine2D.c" --- NEW FILE: mass2D.c --- #include "../../pmpd/src/mass2D.c" --- NEW FILE: pmpd~.c --- #include "../../pmpd/src/pmpd~.c" --- NEW FILE: tSphere3D.c --- #include "../../pmpd/src/tSphere3D.c" --- NEW FILE: tCylinder3D.c --- #include "../../pmpd/src/tCylinder3D.c" --- NEW FILE: iCircle3D.c --- #include "../../pmpd/src/iCircle3D.c" --- NEW FILE: iAmbient3D.c --- #include "../../pmpd/src/iAmbient3D.c" --- NEW FILE: tLink2D.c --- #include "../../pmpd/src/tLink2D.c" --- NEW FILE: iCircle2D.c --- #include "../../pmpd/src/iCircle2D.c" --- NEW FILE: tLine2D.c --- #include "../../pmpd/src/tLine2D.c" --- NEW FILE: tCube3D.c --- #include "../../pmpd/src/tCube3D.c" --- NEW FILE: iCylinder3D.c --- #include "../../pmpd/src/iCylinder3D.c" --- NEW FILE: iPlane3D.c --- #include "../../pmpd/src/iPlane3D.c" --- NEW FILE: iAmbient2D.c --- #include "../../pmpd/src/iAmbient2D.c" --- NEW FILE: iSeg2D.c --- #include "../../pmpd/src/iSeg2D.c" --- NEW FILE: iSphere3D.c --- #include "../../pmpd/src/iSphere3D.c" --- NEW FILE: tPlane3D.c --- #include "../../pmpd/src/tPlane3D.c" --- NEW FILE: link.c --- #include "../../pmpd/src/link.c"

1 0

externals/pmpd/src tLia2D.c, 1.1.1.1, NONE tLia3D.c, 1.1.1.1, NONE
by cyrille 14 Jun '06

14 Jun '06

Update of /cvsroot/pure-data/externals/pmpd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7082 Removed Files: tLia2D.c tLia3D.c Log Message: --- tLia2D.c DELETED --- --- tLia3D.c DELETED ---

1 0

externals/corelibs README,NONE,1.1
by Hans-Christoph Steiner 14 Jun '06

14 Jun '06

Update of /cvsroot/pure-data/externals/corelibs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2357 Added Files: README Log Message: dashed out a quick readme --- NEW FILE: README --- These are just the objects included in Miller's Pd compiled as stand-alone libraries based on their source files. Its a quick and dirty hack to strip Pd down to the bare essentials so that the namespace will be fully functional. These files are generated using the included script, generate.sh. They should not be modified directly.

1 0

pd/src t_tkcmd.c,1.2.4.1.2.9,1.2.4.1.2.10
by Thomas Grill 14 Jun '06

14 Jun '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21165/src Modified Files: Tag: devel_0_39 t_tkcmd.c Log Message: fixed GUI loading on MacOS Index: t_tkcmd.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/t_tkcmd.c,v retrieving revision 1.2.4.1.2.9 retrieving revision 1.2.4.1.2.10 diff -C2 -d -r1.2.4.1.2.9 -r1.2.4.1.2.10 *** t_tkcmd.c 30 Nov 2005 13:36:58 -0000 1.2.4.1.2.9 --- t_tkcmd.c 14 Jun 2006 01:03:02 -0000 1.2.4.1.2.10 *************** *** 622,629 **** argument. If so. we're to connect to a previously running pd (i.e., pd got started first). If not, we start Pd from here. */ ! #ifdef MSW if (argv && (portno = atoi(argv)) > 1) #else char *firstspace; if (argv && (firstspace = strchr(argv, ' ')) && (portno = atoi(firstspace)) > 1) #endif --- 622,630 ---- argument. If so. we're to connect to a previously running pd (i.e., pd got started first). If not, we start Pd from here. */ ! #if defined(MSW) || defined(__APPLE__) if (argv && (portno = atoi(argv)) > 1) #else char *firstspace; + if (argv && (firstspace = strchr(argv, ' ')) && (portno = atoi(firstspace)) > 1) #endif

1 0

pd/src/locale english.tcl,1.1.2.14,1.1.2.15
by chunlee 14 Jun '06

14 Jun '06

Update of /cvsroot/pure-data/pd/src/locale In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26053/locale Modified Files: Tag: devel_0_39 english.tcl Log Message: properties_dialog related fixes Index: english.tcl =================================================================== RCS file: /cvsroot/pure-data/pd/src/locale/Attic/english.tcl,v retrieving revision 1.1.2.14 retrieving revision 1.1.2.15 diff -C2 -d -r1.1.2.14 -r1.1.2.15 *** english.tcl 2 Jun 2006 21:10:06 -0000 1.1.2.14 --- english.tcl 13 Jun 2006 23:18:59 -0000 1.1.2.15 *************** *** 79,82 **** --- 79,115 ---- say Array "Array" + ### for IEMproperties + say w "width(px): " + say h "height(px): " + say hold "hold time(ms): " + say break "break time(ms): " + say min "minimum value: " + say max "maximum value: " + say is_log "mode: " + say linear "linear" + say logarithmic "logarithmic" + say isa "init: " + say n "n: " + say steady "Steadiness: " + say jump "jump on click" + say steady "steady on click" + say snd "send-symbol: " + say rcv "receive-symbol: " + say lab "label: " + say ldx "label x offset: " + say ldy "label y offset: " + say fstyle "Typeface: " + say fs "font size: " + say bcol "background color: " + say fcol "forground color: " + say lcol "label color: " + say 1 "yes" + say 0 "no" + say yes "yes" + say no "no" + say courier "courier (typewriter)" + say helvetica "helvetica (sansserif)" + say times "times (serif)" + ### Main Window *************** *** 317,320 **** --- 350,354 ---- say -oss "use OSS audio API" say -32bit "allow 32 bit OSS audio (for RME Hammerfall)" + say {} "default" say section_midi "MIDI"

1 0

pd/src desire.tk,1.1.2.243,1.1.2.244
by chunlee 14 Jun '06

14 Jun '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26053 Modified Files: Tag: devel_0_39 desire.tk Log Message: properties_dialog related fixes Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.243 retrieving revision 1.1.2.244 diff -C2 -d -r1.1.2.243 -r1.1.2.244 *** desire.tk 13 Jun 2006 21:21:58 -0000 1.1.2.243 --- desire.tk 13 Jun 2006 23:18:59 -0000 1.1.2.244 *************** *** 2962,2972 **** #clone values foreach var $fields($class) { ! set val $_($of:$var) switch -- $val { empty {set val ""}} if {[regexp -nocase {^([a-z])col$} $var]} {set val [parse_color $val]} set @$var $val } ! set @loadbang [expr $@isa & 1] ! set @scale [expr ($@isa>>20) & 1] set @class $_($of:class) # the longest label is... --- 2962,2982 ---- #clone values foreach var $fields($class) { ! puts "$var ---------- $_($of:$var)" ! switch $var { ! is_log {if {$_($of:$var)} {set val "linear"} else { set val "logarithmic"}} ! isa {if {$_($of:$var)} {set val "yes"} else { set val "no"}} ! steady {if {$_($of:$var)} {set val "jump"} else { set val "steady"}} ! fstyle {if {$_($of:$var)} {set val "yes"} else { set val "no"}} ! default {set val $_($of:$var); puts "here............."} ! } ! #set val $_($of:$var) switch -- $val { empty {set val ""}} if {[regexp -nocase {^([a-z])col$} $var]} {set val [parse_color $val]} set @$var $val } ! ! ! #set @loadbang [expr $@isa & 1] ! #set @scale [expr ($@isa>>20) & 1] set @class $_($of:class) # the longest label is... *************** *** 2990,2999 **** } isa { ! set options [list [say $propertie] [say yes] [say no]] properties_dialog $self .$self iemgui_ok [list $propertie $options choice {}] } n {properties_dialog $self .$self iemgui_ok [list $propertie [say $propertie] integer {-width 4}]} steady { ! set options [list [say $propertie] [say jump] [say steady]] properties_dialog $self .$self iemgui_ok [list $propertie $options choice {}] } --- 3000,3009 ---- } isa { ! set options [list [say $propertie] [say 1] [say 0]] properties_dialog $self .$self iemgui_ok [list $propertie $options choice {}] } n {properties_dialog $self .$self iemgui_ok [list $propertie [say $propertie] integer {-width 4}]} steady { ! set options [list [say $propertie] "jump" "steady"] properties_dialog $self .$self iemgui_ok [list $propertie $options choice {}] } *************** *** 3004,3008 **** laby {properties_dialog $self .$self iemgui_ok [list $propertie [say $propertie] entry {-width 5}]} fstyle { ! set options [list [say $propertie] "courier (typewriter)" "helvetica (sansserif)" "times (serif)"] properties_dialog $self .$self iemgui_ok [list $propertie $options choice {}] } --- 3014,3018 ---- laby {properties_dialog $self .$self iemgui_ok [list $propertie [say $propertie] entry {-width 5}]} fstyle { ! set options [list [say $propertie] "courier" "helvetica" "times"] properties_dialog $self .$self iemgui_ok [list $propertie $options choice {}] } *************** *** 4211,4218 **** set m [menu $f.$name -tearoff 0] foreach part [lrange $label 1 end] { ! $m add command -label $part -command [list dropmenu_set $f $part] } ! label $f.label_set -text "default" -relief raised balloon $f.label_set "click to change setting" pack $f.label $f.label_set -side left --- 4221,4229 ---- set m [menu $f.$name -tearoff 0] foreach part [lrange $label 1 end] { ! $m add command -label [say $part] -command [list dropmenu_set $f [say $part]] } ! puts "name ________ $name" ! label $f.label_set -text [say $_($self:$name)] -relief raised -width 20 balloon $f.label_set "click to change setting" pack $f.label $f.label_set -side left *************** *** 4572,4575 **** --- 4583,4597 ---- set f .$self.1 set section 0 + + foreach {type names} $pdrc_options { + set label "" + if {[llength $names] > 1} { + set label [say [lindex $names 0]] + } else { + set label [say $names] + } + if {[string length $label] > $@max_label} {set @max_label [string length $label]} + } + puts "max_label:::: $@max_label" foreach {type names} $pdrc_options { set name [lindex [split $names |] 0] *************** *** 4579,4583 **** radio { set babble {} ! foreach subname $names {lappend babble [say [lindex [split $subname |] 0]]} puts "babble :::: $babble" properties_dialog $self $f.main.$section ServerPrefsDialog_ok \ --- 4601,4606 ---- radio { set babble {} ! #foreach subname $names {lappend babble [say [lindex [split $subname |] 0]]} ! foreach subname $names {lappend babble [lindex [split $subname |] 0]} puts "babble :::: $babble" properties_dialog $self $f.main.$section ServerPrefsDialog_ok \ *************** *** 4769,4773 **** foreach {type names} $ddrc_options { set label "" - if {[llength $names] > 1} { foreach name $names { --- 4792,4795 ---- *************** *** 4777,4781 **** set label [say $names] } ! if {[string length $label] > $@max_label} {set @max_label [string length $label]} } --- 4799,4803 ---- set label [say $names] } ! if {[string length $label] > $@max_label} {set @max_label [expr [string length $label] + 20]} }

1 0

pd/src desire.tk,1.1.2.242,1.1.2.243
by chunlee 13 Jun '06

13 Jun '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32180 Modified Files: Tag: devel_0_39 desire.tk Log Message: rewrite def* IEMPropertiesDialog init Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.242 retrieving revision 1.1.2.243 diff -C2 -d -r1.1.2.242 -r1.1.2.243 *** desire.tk 13 Jun 2006 17:52:24 -0000 1.1.2.242 --- desire.tk 13 Jun 2006 21:21:58 -0000 1.1.2.243 *************** *** 956,980 **** } ! def* View popup_properties {} { ! global fields ! set class $@class ! if {![info exists fields($class)]} {set class obj} ! puts "this is a $@class class" ! puts "it has [llength $fields($class)] properties" ! ! PagedDialog new_as ${self}prefs ! ! #set f .$self.1 ! #set section 0 ! #set subsection 0 ! #foreach propertie $fields($class) { ! #switch $propertie { ! # bcol { ! # properties_dialog $which_self $which_section ClientPrefsDialog_ok \ ! # [list [lindex $name 0] [say $name] color {}] ! # } ! #} ! #} ! } # in the future, one View may have several canvases. (??) --- 956,968 ---- } ! #def* View popup_properties {} { ! # global fields ! # set class $@class ! # if {![info exists fields($class)]} {set class obj} ! # puts "this is a $@class class" ! # puts "it has [llength $fields($class)] properties" ! # ! # PagedDialog new_as ${self}prefs ! #} # in the future, one View may have several canvases. (??) *************** *** 2953,2957 **** } ! def BlueBox popup_properties {} {IEMPropertiesDialog new $self} class_new PropertiesDialog {Dialog} --- 2941,2945 ---- } ! def* BlueBox popup_properties {} {IEMPropertiesDialog new $self} class_new PropertiesDialog {Dialog} *************** *** 2964,3032 **** class_new IEMPropertiesDialog {PropertiesDialog} ! def IEMPropertiesDialog init {of} { ! global classinfo fields ! super $of ! ! # cloning contents of the $of object, except for some little exceptions ! foreach var {snd rcv lab} { ! catch {set val $_($@of:$var); switch -- $val { empty {set val ""}}; set @$var $val} ! } ! foreach var {w h hold break ldx ldy fstyle fs is_log steady min max ! on nonzero val change log_height hh isa} { ! catch {set @$var $_($of:$var)} ! } ! foreach var {bcol fcol lcol} { ! catch {set @$var [parse_color $_($of:$var)]} ! } ! ! set @loadbang [expr $@isa & 1] ! set @scale [expr ($@isa>>20) & 1] ! ! set @class $_($of:class) ! post %s "$self = IEMPropertiesDialog $of" ! set id .$self ! wm title $id "$classinfo($@class) Properties" ! wm protocol $id WM_DELETE_WINDOW "iemgui_cancel $id" ! set props {} ! ! set fi $fields($@class) ! ! if {[lsearch $fi w]>=0} {lappend props w "width(px): " integer {-width 7}} ! if {[lsearch $fi h]>=0} {lappend props h "height(px): " integer {-width 7}} ! if {[lsearch $fi hold]>=0} {lappend props hold "hold time(ms): " float {-width 9}} ! if {[lsearch $fi break]>=0} {lappend props break "break time(ms): " float {-width 9}} ! if {[lsearch $fi min]>=0} {lappend props min "minimum value: " float {-width 9}} ! if {[lsearch $fi max]>=0} {lappend props max "maximum value: " float {-width 9}} ! if {[lsearch $fi is_log]>=0} {lappend props is_log [list "Mode: " "linear" "logarithmic"] choice {}} ! if {[lsearch $fi isa]>=0} {lappend props loadbang "init" toggle {}} ! if {[lsearch $fi n]>=0} {lappend props n "n: " integer {-width 4}} ! if {[lsearch $fi steady]>=0} {lappend props steady [list "Steadiness: " "jump on click" "steady on click"] choice {}} ! properties_dialog $self .$self iemgui_ok $props ! set props {} ! if {[lsearch $fi snd]>=0} {lappend props snd "send-symbol: " entry {-width 20}} ! if {[lsearch $fi rcv]>=0} {lappend props rcv "receive-symbol: " entry {-width 20}} ! lappend props lab "label: " entry {-width 20} ! lappend props ldx "label x offset: " entry {-width 5} ! lappend props ldy "label y offset: " entry {-width 5} ! lappend props fstyle {"Typeface: " "courier (typewriter)" "helvetica (sansserif)" "times (serif)"} choice {} ! lappend props fs "font size: " fontsize {-width 5} ! lappend props bcol "background color: " color {} ! if {[lsearch $fi fcol]>=0} {lappend props fcol "foreground color: " color {}} ! lappend props lcol "label color: " color {} ! properties_dialog $self .$self iemgui_ok $props ! ! 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]} ! } ! catch { ! $id.w.entry select from 0 ! $id.w.entry select adjust end ! } ! focus $id.w.entry } --- 2952,3019 ---- class_new IEMPropertiesDialog {PropertiesDialog} ! def* IEMPropertiesDialog init {of} { ! global classinfo fields ! super $of ! set class $_($of:class) ! if {![info exists fields($class)]} {set class obj} ! puts "this is a $_($of:class) class" ! puts "it has [llength $fields($class)] properties" ! #clone values ! foreach var $fields($class) { ! set val $_($of:$var) ! switch -- $val { empty {set val ""}} ! if {[regexp -nocase {^([a-z])col$} $var]} {set val [parse_color $val]} ! set @$var $val ! } ! set @loadbang [expr $@isa & 1] ! set @scale [expr ($@isa>>20) & 1] ! set @class $_($of:class) ! # the longest label is... ! foreach propertie $fields($class) { ! set label [say $propertie] ! if {[string length $label] > $@max_label} {set @max_label [string length $label]} ! } ! ! foreach propertie $fields($class) { ! #puts "propertie ::: $propertie" ! switch $propertie { ! w {properties_dialog $self .$self iemgui_ok [list $propertie [say $propertie] integer {-width 7}]} ! h {properties_dialog $self .$self iemgui_ok [list $propertie [say $propertie] integer {-width 7}]} ! hold {properties_dialog $self .$self iemgui_ok [list $propertie [say $propertie] float {-width 9}]} ! break {properties_dialog $self .$self iemgui_ok [list $propertie [say $propertie] float {-width 9}]} ! min {properties_dialog $self .$self iemgui_ok [list $propertie [say $propertie] float {-width 9}]} ! max {properties_dialog $self .$self iemgui_ok [list $propertie [say $propertie] float {-width 9}]} ! is_log { ! set options [list [say $propertie] [say linear] [say logarithmic]] ! properties_dialog $self .$self iemgui_ok [list $propertie $options choice {}] ! } ! isa { ! set options [list [say $propertie] [say yes] [say no]] ! properties_dialog $self .$self iemgui_ok [list $propertie $options choice {}] ! } ! n {properties_dialog $self .$self iemgui_ok [list $propertie [say $propertie] integer {-width 4}]} ! steady { ! set options [list [say $propertie] [say jump] [say steady]] ! properties_dialog $self .$self iemgui_ok [list $propertie $options choice {}] ! } ! snd {properties_dialog $self .$self iemgui_ok [list $propertie [say $propertie] entry {-width 20}]} ! rcv {properties_dialog $self .$self iemgui_ok [list $propertie [say $propertie] entry {-width 20}]} ! lab {properties_dialog $self .$self iemgui_ok [list $propertie [say $propertie] entry {-width 20}]} ! labx {properties_dialog $self .$self iemgui_ok [list $propertie [say $propertie] entry {-width 5}]} ! laby {properties_dialog $self .$self iemgui_ok [list $propertie [say $propertie] entry {-width 5}]} ! fstyle { ! set options [list [say $propertie] "courier (typewriter)" "helvetica (sansserif)" "times (serif)"] ! properties_dialog $self .$self iemgui_ok [list $propertie $options choice {}] ! } ! fs {properties_dialog $self .$self iemgui_ok [list $propertie [say $propertie] fontsize {-width 5}]} ! bcol {properties_dialog $self .$self iemgui_ok [list $propertie [say $propertie] color {}]} ! fcol {properties_dialog $self .$self iemgui_ok [list $propertie [say $propertie] color {}]} ! lcol {properties_dialog $self .$self iemgui_ok [list $propertie [say $propertie] color {}]} ! } ! } ! ! ! #puts "$self = IEMPropertiesDialog $of" } *************** *** 4219,4223 **** frame $f set i 0 ! pack [label $f.label -text [lindex $label 0]] $f -side left # this which is not good, need to sort it out... set m [menu $f.$name -tearoff 0] --- 4206,4211 ---- frame $f set i 0 ! label $f.label -text [lindex $label 0] ! #pack [label $f.label -text [lindex $label 0]] $f -side left # this which is not good, need to sort it out... set m [menu $f.$name -tearoff 0] *************** *** 4228,4232 **** label $f.label_set -text "default" -relief raised balloon $f.label_set "click to change setting" ! pack $f.label_set -side top -fill x # need to sort this out....... bind $f.label_set <1> "tk_popup $f.$name \[expr %X - 100\] %Y" --- 4216,4220 ---- label $f.label_set -text "default" -relief raised balloon $f.label_set "click to change setting" ! pack $f.label $f.label_set -side left # need to sort this out....... bind $f.label_set <1> "tk_popup $f.$name \[expr %X - 100\] %Y" *************** *** 4301,4306 **** } pack $f -side top -fill x ! catch {$f.label configure -width 45 -anchor e} } } --- 4289,4296 ---- } pack $f -side top -fill x ! #catch {$f.label configure -width 45 -anchor e} ! catch {$f.label configure -width $_($self:max_label) -anchor e} } + } *************** *** 4381,4384 **** --- 4371,4375 ---- def Dialog init {} { set f .$self + set @max_label 0 toplevel $f frame $f.buttonsep -height 2 -borderwidth 1 -relief sunken *************** *** 4589,4592 **** --- 4580,4584 ---- set babble {} foreach subname $names {lappend babble [say [lindex [split $subname |] 0]]} + puts "babble :::: $babble" properties_dialog $self $f.main.$section ServerPrefsDialog_ok \ [list [lindex $name 0] $babble choice {}] *************** *** 4774,4777 **** --- 4766,4783 ---- set section 0 set subsection 0 + + foreach {type names} $ddrc_options { + set label "" + + if {[llength $names] > 1} { + foreach name $names { + append label " [say $name]" + } + } else { + set label [say $names] + } + if {[string length $label] > $@max_label} {set @max_label [string length $label]} + } + foreach {type names} $ddrc_options { set name [lindex [split $names |] 0]

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
23
Older →

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 June 2006