pd/src desire.tk,1.1.2.180,1.1.2.181 - Pd-cvs

22 Apr 2006


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17532
Modified Files:
      Tag: devel_0_39
    desire.tk 
Log Message:
started working on the ddrc editor
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.180
retrieving revision 1.1.2.181
diff -C2 -d -r1.1.2.180 -r1.1.2.181
*** desire.tk	22 Apr 2006 07:33:29 -0000	1.1.2.180
--- desire.tk	22 Apr 2006 16:39:11 -0000	1.1.2.181
***************
*** 3372,3381 ****
proc properties_dialog {self w ok which struct} {
!     global _
! 	#set label_width 0
!     #foreach {name label type options} $struct {
! 	#	set label_w [string length $label]
! 	#	if {$label_w > $label_width} {set label_width $label_w}
! 	#}
      foreach {name label type options} $struct {
    	set f $w.$name
--- 3372,3376 ----
proc properties_dialog {self w ok which struct} {
!     global _ look
      foreach {name label type options} $struct {
    	set f $w.$name
***************
*** 3414,3418 ****
    	set i 0
    	pack [label $f.label -text [lindex $label 0]] $f -side left
! 		
    	set m [menu .$which -tearoff 0]
    	foreach part [lrange $label 1 end] {
--- 3409,3413 ----
    	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 .$which -tearoff 0]
    	foreach part [lrange $label 1 end] {
***************
*** 3425,3429 ****
    	balloon $f.label_set "click to change setting"
    	pack $f.label_set -side top -fill x
! 		bind $f.label_set <1> {tk_popup .$which [expr %X - 100] %Y}
    	
        }
--- 3420,3435 ----
    	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 .server [expr %X - 100] %Y}
! 		
! 	    }
! 	    choice_color {
! 		frame $f
! 		pack [label $f.label -text $label] -side left
! 		
! 		#button .$f.color_chooser -bg [tk_chooseColor -initialcolor gray -title "Choose color"]
! 		button $f.color_chooser -bg $look($name) -activebackground $look($name) -command "color_popup $f $look($name)" \
! 					-width 17 
! 		pack $f.color_chooser -side left
    	
        }
***************
*** 3470,3473 ****
--- 3476,3486 ----
  }
+ proc color_popup {frame init_color} {
+ set color [tk_chooseColor -initialcolor $init_color -title "Choose color"]
+ puts "color :: $color"
+ $frame.color_chooser configure -bg $color -activebackground $color
+ 
+ }
+ 
  ############ .pdrc editor
***************
*** 3691,3757 ****
set ddrc_options {
! section "" "DDRC"
!   integer -r "sample rate"
!   devlist -soundindev|-audioindev "audio in devices"
!   devlist -soundoutdev|-audiooutdev "audio out devices"
!   alias -sounddev|-audiodev {list -soundindev %1 -soundoutdev %1}
!   devlist -inchannels "audio input channels (by device, like "2" or "16,8")"
!   devlist -outchannels "number of audio out channels (same)"
!   alias -channels {list -inchannels %1 -outchannels %1}
!   integer -audiobuf|-soundbuf "specify size of audio buffer in msec"
!   integer -blocksize "specify audio I/O block size in sample frames"
!   integer -sleepgrain "specify number of milliseconds to sleep when idle"
!   void -nodac "suppress audio output"
!   void -noadc "suppress audio input"
!   alias -noaudio|-nosound {list -nodac -noadc}
!   radio {"" -alsa -jack -mmio -portaudio|-pa|-asio -oss} {
!     "Sound API: "
!     "default"
!     "use ALSA audio API"
!     "use JACK audio API"
!     "use MMIO audio API (default for Windows)"
!     "use ASIO audio driver (via Portaudio)"
!     "use OSS audio API"
!   }
!   void -32bit "allow 32 bit OSS audio (for RME Hammerfall)"
! 
! section "" "MIDI"
!   void -nomidiin "suppress MIDI input"
!   void -nomidiout "suppress MIDI output"
!   alias -nomidi {list -nomidiin -nomidiout}
!   devlist -midiindev  "midi in device list; e.g., "1,3" for first and third"
!   devlist -midioutdev "midi out device list, same format"
!   alias -mididev {list -midindev %1 -midioutdev %1}
! 
! section "" "Externals"
!   folders -path     "add to file search path"
!   folders -helppath "add to help file search path"
!   files -lib "load object library(s)"
! 
! section "" "Gooey"
!   void -nogui "suppress starting the GUI (caution)"
!   string -guicmd "substitute another GUI program (e.g., rsh)"
!   integer -console "console scrollback lines (0 = disable console)"
!   folder -look "folder containing buttonbar icons"
!   void -statusbar "enable statusbar"
!   integer -font "specify default font size in points"
! 
! section "" "Other"
!   files -open "open file(s) on startup"
!   void -verbose "extra printout on startup and when searching for files"
!   integer -d "debug level"
!   void -noloadbang "disable the effect of [loadbang]"
!   string -send "send a message at startup (after patches are loaded)"
!   void -listdev "list audio and MIDI devices upon startup"
!   void -rt|-realtime "use real-time priority (needs root privilege)"
! section "" "Look"
!   files -open "open file(s) on startup"
!   void -verbose "extra printout on startup and when searching for files"
!   integer -d "debug level"
!   void -noloadbang "disable the effect of [loadbang]"
!   string -send "send a message at startup (after patches are loaded)"
!   void -listdev "list audio and MIDI devices upon startup"
!   void -rt|-realtime "use real-time priority (needs root privilege)"
  }
--- 3704,3724 ----
set ddrc_options {
! section "" "look"
!   color canvasbgedit "canvas background (edit mode)"
!   color canvasbgrun "canvas background (run mode)"
!   color objectframe1 "objectbox color"
!   color objectframe2 "objectbox color"
!   color objectframe3 "objectbox color"
!   color objectframe4 "objectbox highlight color"
!   color objectbg "object background"
!   color objectfg "object foreground"
!   color inletfg "inlet color"
!   color outletfg "outlet color"
!   color wirefg "wire color"
!   color wirefg2 "wire highlight"
!   color wiredash "wire dash"
!   color selrect "selection box"
! 
  }
***************
*** 3822,3825 ****
--- 3789,3796 ----
    		[list [lindex $name 0] "$desc" choice {}]
        }
+ 	    color {
+ 		properties_dialog $self $f.main.$section ClientPrefsDialog_ok client \
+ 			[list [lindex $name 0] "$desc" choice_color {}]
+ 	    }
        default {
    	#properties_dialog $self $f.main.$section ClientPrefsDialog_ok \