pd/src desire.tk,1.1.2.600.2.209,1.1.2.600.2.210 - Pd-cvs

9 Jul 2007


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv929
Modified Files:
      Tag: desiredata
    desire.tk 
Log Message:
remove extra backslashes (let's say maximum line length is approx 128 chars)
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.209
retrieving revision 1.1.2.600.2.210
diff -C2 -d -r1.1.2.600.2.209 -r1.1.2.600.2.210
*** desire.tk	9 Jul 2007 17:07:16 -0000	1.1.2.600.2.209
--- desire.tk	9 Jul 2007 20:10:02 -0000	1.1.2.600.2.210
***************
*** 774,779 ****
        meterbutton meters ctrls_meter_on {netsend [list pd meters $ctrls_meter_on]}
      } {
! 	pack [checkbutton .controls.$w -text [say $x] \
! 		-variable $y -anchor w -command $z] -side left
      }
      button .controls.clear -text [say console_clear] -command {.log.1 delete 0.0 end}         -padx 2 -pady 0
--- 774,778 ----
        meterbutton meters ctrls_meter_on {netsend [list pd meters $ctrls_meter_on]}
      } {
! 	pack [checkbutton .controls.$w -text [say $x] -variable $y -anchor w -command $z] -side left
      }
      button .controls.clear -text [say console_clear] -command {.log.1 delete 0.0 end}         -padx 2 -pady 0
***************
*** 993,998 ****
  def Client open_file {} {
      global pd_opendir patch_filetypes
!     set filename [tk_getOpenFile -defaultextension .pd \
!     	-filetypes $patch_filetypes -initialdir $pd_opendir]
      if {$filename != ""} {$self open_file_really $filename}
  }
--- 992,996 ----
  def Client open_file {} {
      global pd_opendir patch_filetypes
!     set filename [tk_getOpenFile -defaultextension .pd -filetypes $patch_filetypes -initialdir $pd_opendir]
      if {$filename != ""} {$self open_file_really $filename}
  }
***************
*** 1038,1043 ****
    		if {[string length $key($@_class:$name)]} {set k $key($@_class:$name)}
    	}
! 		$menu add command -label [say $name] -command "$self $name" \
! 		    -accelerator [accel_munge $k]
    }
  }
--- 1036,1040 ----
    		if {[string length $key($@_class:$name)]} {set k $key($@_class:$name)}
    	}
! 		$menu add command -label [say $name] -command "$self $name" -accelerator [accel_munge $k]
    }
  }
***************
*** 1396,1401 ****
def Canvas print {} {
!     set filename [tk_getSaveFile -initialfile pd.ps -defaultextension .ps \
!        -filetypes { {{postscript} {.ps}} }]
      if {$filename != ""} {[$self widget] postscript -file $filename}
  }
--- 1393,1397 ----
def Canvas print {} {
!     set filename [tk_getSaveFile -initialfile pd.ps -defaultextension .ps -filetypes { {{postscript} {.ps}} }]
      if {$filename != ""} {[$self widget] postscript -file $filename}
  }
***************
*** 1412,1417 ****
def Client documentation {} {
!     set filename [tk_getOpenFile -defaultextension .pd \
!         -filetypes { {{documentation} {.pd .txt .htm}} } -initialdir $::docdir]
      if {$filename != ""} {
          if {[string first .txt $filename] >= 0} {
--- 1408,1412 ----
def Client documentation {} {
!     set filename [tk_getOpenFile -defaultextension .pd -filetypes { {{documentation} {.pd .txt .htm}} } -initialdir $::docdir]
      if {$filename != ""} {
          if {[string first .txt $filename] >= 0} {
***************
*** 1457,1462 ****
      frame $w.1
      frame $w.2
!     pack [text $w.1.text -relief raised -bd 2 \
!     	-yscrollcommand "$w.1.scroll set"] -side left -fill both -expand 1
      pack [scrollbar $w.1.scroll -command "$w.1.text yview"] -side right -fill y
      pack [button $w.2.close -text [say close] -command "destroy $w"] -side right
--- 1452,1456 ----
      frame $w.1
      frame $w.2
!     pack [text $w.1.text -relief raised -bd 2 -yscrollcommand "$w.1.scroll set"] -side left -fill both -expand 1
      pack [scrollbar $w.1.scroll -command "$w.1.text yview"] -side right -fill y
      pack [button $w.2.close -text [say close] -command "destroy $w"] -side right
***************
*** 2174,2179 ****
    if {$@gop} {
    	# this was to test if a canvas is graphical array....
! 		#if {[llength $@children] != 1 && \
! 		#	[[lindex $@children 0] class] != "Array"} {$self gop_rect}
    	$self gop_rect
    }
--- 2168,2172 ----
    if {$@gop} {
    	# this was to test if a canvas is graphical array....
! 		#if {[llength $@children] != 1 && [[lindex $@children 0] class] != "Array"} {$self gop_rect}
    	$self gop_rect
    }
***************
*** 2210,2215 ****
    	set t [[$self get_canvas] widget].${self}text
    	if {![winfo exists $t]} {$self draw_edit}
! 		$self item text window [l+ $@textoffset [$self xy]] \
! 		-window $t -anchor nw -tags "${self}text $self text"
    } else {
    	set text [$self filter_text]
--- 2203,2207 ----
    	set t [[$self get_canvas] widget].${self}text
    	if {![winfo exists $t]} {$self draw_edit}
! 		$self item text window [l+ $@textoffset [$self xy]] -window $t -anchor nw -tags "${self}text $self text"
    } else {
    	set text [$self filter_text]
***************
*** 2261,2266 ****
    $@canvas focus= $self
    mset {cx cy} [$self xy]
! 	$self item text window [l+ $@textoffset [$self xy]] \
! 		-window $t -anchor nw -tags "${self}text $self text"
    $t configure -pady 0 -padx 0
    $t insert 1.0 $@text
--- 2253,2257 ----
    $@canvas focus= $self
    mset {cx cy} [$self xy]
! 	$self item text window [l+ $@textoffset [$self xy]] -window $t -anchor nw -tags "${self}text $self text"
    $t configure -pady 0 -padx 0
    $t insert 1.0 $@text
***************
*** 3020,3025 ****
      set x [expr [$c canvasx $x]/$zoom]
      set y [expr [$c canvasy $y]/$zoom]
!     set tags [$c gettags [lindex [$c find overlapping \
! 	[expr $x-2] [expr $y-2] [expr $x+2] [expr $y+2]] end]]
      set target [$@canvas identify_target $x $y -1]
      mset {type id detail} $target
--- 3011,3015 ----
      set x [expr [$c canvasx $x]/$zoom]
      set y [expr [$c canvasy $y]/$zoom]
!     set tags [$c gettags [lindex [$c find overlapping [expr $x-2] [expr $y-2] [expr $x+2] [expr $y+2]] end]]
      set target [$@canvas identify_target $x $y -1]
      mset {type id detail} $target
***************
*** 3156,3161 ****
    switch $type {
    	text {
! 			entry $f.$name -width 10 -relief flat -bg white -borderwidth 0 \
! 			    -highlightthickness 0
    		bind $f.$name <Escape> "findmodel delete"
    		bind $f.$name <Return> "$self find"
--- 3146,3150 ----
    switch $type {
    	text {
! 			entry $f.$name -width 10 -relief flat -bg white -borderwidth 0 -highlightthickness 0
    		bind $f.$name <Escape> "findmodel delete"
    		bind $f.$name <Return> "$self find"
***************
*** 3225,3230 ****
    label $f.cmd_l -text Command: -font {helvetica -10} -pady 0
    pack $f.cmd_l -side left
! 	entry $f.cmd -width 30 -relief flat -bg white -borderwidth 0 \
! 	    -highlightthickness 0
    bind $f.cmd <Escape> "$self delete"
    bind $f.cmd <Control-g> "$self delete"
--- 3214,3218 ----
    label $f.cmd_l -text Command: -font {helvetica -10} -pady 0
    pack $f.cmd_l -side left
! 	entry $f.cmd -width 30 -relief flat -bg white -borderwidth 0 -highlightthickness 0
    bind $f.cmd <Escape> "$self delete"
    bind $f.cmd <Control-g> "$self delete"
***************
*** 3734,3739 ****
    set i 0
    foreach inlet $::subpatcherize(incoming_inlet) {
! 		netsend [list #X obj [expr $i*100] 0 inlet] \
! 		    [list $self new_object_subpatcherize_inletconnect $inlet]
    	incr i
    }
--- 3722,3726 ----
    set i 0
    foreach inlet $::subpatcherize(incoming_inlet) {
! 		netsend [list #X obj [expr $i*100]  0  inlet] [list $self new_object_subpatcherize_inletconnect  $inlet]
    	incr i
    }
***************
*** 3742,3747 ****
    	mset {xcoords ycoords} [$self clipboard_coords 0]
    	set y [expr [lindex [lsort -increasing $ycoords] end] + 20]
! 		netsend [list #X obj [expr $i*100] $y outlet] \
! 		    [list $self new_object_subpatcherize_outletconnect $outlet]
    	incr i
    }
--- 3729,3733 ----
    	mset {xcoords ycoords} [$self clipboard_coords 0]
    	set y [expr [lindex [lsort -increasing $ycoords] end] + 20]
! 		netsend [list #X obj [expr $i*100] $y outlet] [list $self new_object_subpatcherize_outletconnect $outlet]
    	incr i
    }
***************
*** 5118,5123 ****
    set x2 [expr $x1+$@xs]
    set y2 [expr $y1+$@ys]
! 	set points [list $x1 $y1 [expr $x2+4] $y1 $x2 [expr $y1+4] $x2 [expr $y2-4] \
! 			[expr $x2+4] $y2 $x1 $y2 $x2 $y2 $x1 $y2]
    if {[$self selected?]} {set frcol [$self look selectframe]} {set frcol [$self look frame3]}
    $self item BASE polygon $points -fill [$self look bg] -outline $frcol -width 1
--- 5104,5108 ----
    set x2 [expr $x1+$@xs]
    set y2 [expr $y1+$@ys]
! 	set points [list $x1 $y1 [expr $x2+4] $y1 $x2 [expr $y1+4] $x2 [expr $y2-4] [expr $x2+4] $y2 $x1 $y2 $x2 $y2 $x1 $y2]
    if {[$self selected?]} {set frcol [$self look selectframe]} {set frcol [$self look frame3]}
    $self item BASE polygon $points -fill [$self look bg] -outline $frcol -width 1
***************
*** 5472,5481 ****
    	pack [frame .$self.radio] -side top
    	foreach {i label} {0 "in new graph" 1 "in last graph"} {
! 			pack [radiobutton .$self.radio.radio$i -value $i -variable @otherflag -text $label] \
! 			    -side top -anchor w
    	}
    } else {
! 		pack [checkbutton .$self.deleteme -text "delete me" \
! 			  -variable @otherflag -anchor w] -side top
    }
    if {$newone} {.$self.buttonframe.apply configure -state disabled}
--- 5457,5464 ----
    	pack [frame .$self.radio] -side top
    	foreach {i label} {0 "in new graph" 1 "in last graph"} {
! 			pack [radiobutton .$self.radio.radio$i -value $i -variable @otherflag -text $label] -side top -anchor w
    	}
    } else {
! 		pack [checkbutton .$self.deleteme -text "delete me" -variable @otherflag -anchor w] -side top
    }
    if {$newone} {.$self.buttonframe.apply configure -state disabled}
***************
*** 5940,5945 ****
    set c [lindex $vu_col [expr int($@peak)]]
    set y [expr $y1 + ($led_size+1)*(41-$@peak) - ($led_size+1)/2]
! 	$self item PEAK rectangle [list $x1 $y $x2 [expr $y+$led_size]] \
! 	    -fill [parse_color $c] -width 0
  }
--- 5923,5927 ----
    set c [lindex $vu_col [expr int($@peak)]]
    set y [expr $y1 + ($led_size+1)*(41-$@peak) - ($led_size+1)/2]
! 	$self item PEAK rectangle [list $x1 $y $x2 [expr $y+$led_size]] -fill [parse_color $c] -width 0
  }
***************
*** 5972,5980 ****
    	canvas $c.${self}DROP -width $xs -height $xs -bg $colour \
    	    -highlightbackground $lcolour -highlightcolor $colour
! 		$c create window [expr $x1 + 7] [expr $y1 - 2] \
! 		    -window $c.${self}DROP -anchor nw -tags $c.${self}window
    	if {[catch {
! 			dnd bindtarget $c.${self}DROP text/uri-list <Drop> \
! 			    "pd "x[list ${self}] symbol [ enquote %D ] ;""
    	}]} {
    		post "dropper: dnd not installed"
--- 5954,5960 ----
    	canvas $c.${self}DROP -width $xs -height $xs -bg $colour \
    	    -highlightbackground $lcolour -highlightcolor $colour
! 		$c create window [expr $x1+7] [expr $y1-2] -window $c.${self}DROP -anchor nw -tags $c.${self}window
    	if {[catch {
! 			dnd bindtarget $c.${self}DROP text/uri-list <Drop> "pd "x[list ${self}] symbol [ enquote %D ] ;""
    	}]} {
    		post "dropper: dnd not installed"
***************
*** 5993,5998 ****
  def Cnv draw {} {
    mset {x1 y1} [$self xy]
! 	$self item BASE rectangle [list $x1 $y1 [expr $x1+$@w] [expr $y1+$@h]] \
! 	    -fill [parse_color $@bcol]
    super
  }
--- 5973,5977 ----
  def Cnv draw {} {
    mset {x1 y1} [$self xy]
! 	$self item BASE rectangle [list $x1 $y1 [expr $x1+$@w] [expr $y1+$@h]] -fill [parse_color $@bcol]
    super
  }
***************
*** 6039,6044 ****
    		set x2 [expr $x1 + $width]
    		set line [list $x1 $y $x2 $y]
! 			$self item elem${i} line $line -fill [$@canvas look compfg] -width 2 \
! 			    -tags "$self ${self}elem${i}"
    		#.$self.c raise ${self}elem${i}
    		incr i
--- 6018,6022 ----
    		set x2 [expr $x1 + $width]
    		set line [list $x1 $y $x2 $y]
! 			$self item elem${i} line $line -fill [$@canvas look compfg] -width 2 -tags "$self ${self}elem${i}"
    		#.$self.c raise ${self}elem${i}
    		incr i
***************
*** 6256,6261 ****
    foreach e $butt {
    	mset {icon name cmd} $e
! 		pack [button $bb._$name -image icon_$icon -border 1 \
! 			-command "$@canvas new_object $cmd"] -side left
    	balloon $bb._$name [say $name]
    }
--- 6234,6238 ----
    foreach e $butt {
    	mset {icon name cmd} $e
! 		pack [button $bb._$name -image icon_$icon -border 1 -command "$@canvas new_object $cmd"] -side left
    	balloon $bb._$name [say $name]
    }
***************
*** 6452,6457 ****
    global class_list
    super $s
! 	.$self.title configure -text [format [say how_many_object_classes] \
! 					  [$@listbox size] [llength $class_list]]
  }
--- 6429,6433 ----
    global class_list
    super $s
! 	.$self.title configure -text [format [say how_many_object_classes] [$@listbox size] [llength $class_list]]
  }
***************
*** 6762,6767 ****
    set i 0
    foreach part $choices {
! 		$f.menu add command -label [say $part] \
! 		    -command [list $self dropmenu_set $f $name $part $i]
    	incr i
    }
--- 6738,6742 ----
    set i 0
    foreach part $choices {
! 		$f.menu add command -label [say $part] -command [list $self dropmenu_set $f $name $part $i]
    	incr i
    }
***************
*** 6896,6901 ****
    set part none ;# in case there are none
    foreach part $@$trim_name {
! 		$f.menu add command -label $part \
! 		    -command [list $self dropmenu_set $f $name $part $i]
    	incr i
    }
--- 6871,6875 ----
    set part none ;# in case there are none
    foreach part $@$trim_name {
! 		$f.menu add command -label $part -command [list $self dropmenu_set $f $name $part $i]
    	incr i
    }
***************
*** 7153,7162 ****
    	unsupported1 style $top floating sideTitlebar
    }
! 	pack [message $top.txt -aspect 10000 -bg lightyellow \
! 		  -font fixed -text $arg]
    set wmx [expr [winfo rootx $w]+[winfo width $w]]
    set wmy       [winfo rooty $w]
! 	wm geometry $top \
! 	    [winfo reqwidth $top.txt]x[winfo reqheight $top.txt]+$wmx+$wmy
    raise $top
  }
--- 7127,7134 ----
    	unsupported1 style $top floating sideTitlebar
    }
! 	pack [message $top.txt -aspect 10000 -bg lightyellow -font fixed -text $arg]
    set wmx [expr [winfo rootx $w]+[winfo width $w]]
    set wmy       [winfo rooty $w]
! 	wm geometry $top [winfo reqwidth $top.txt]x[winfo reqheight $top.txt]+$wmx+$wmy
    raise $top
  }
***************
*** 7229,7234 ****
    for {set i 0} {$i<[llength $preset_colors]} {incr i} {
    	set c [lindex $preset_colors $i]
! 		$w add command -label "     " \
! 		    -background "#$c" -activebackground "#$c" \
    	    -command [list $self color_popup_select $frame $var [expr 0x$c]]
    }
--- 7201,7205 ----
    for {set i 0} {$i<[llength $preset_colors]} {incr i} {
    	set c [lindex $preset_colors $i]
! 		$w add command -label "     " -background "#$c" -activebackground "#$c" \
    	    -command [list $self color_popup_select $frame $var [expr 0x$c]]
    }
***************
*** 7837,7842 ****
    # "$w.1.scroll set"
    # i'd like a scrollable frame
! 	pack [scrollbar .$self.1.scroll \
! 		  -command "ClientClassTreeDialog_scroll $self"] -side left -fill y -expand y
    place [frame .$self.1.1.tree] -x 0 -y 0
    set w .$self.1.1.tree.1
--- 7808,7812 ----
    # "$w.1.scroll set"
    # i'd like a scrollable frame
! 	pack [scrollbar .$self.1.scroll -command "ClientClassTreeDialog_scroll $self"] -side left -fill y -expand y
    place [frame .$self.1.1.tree] -x 0 -y 0
    set w .$self.1.1.tree.1
***************
*** 7994,7998 ****
def Wire deconstruct {{selcanvas ""}} {
- 	global obj_index_sel
    # the selcanvas system could be abstracted out using an ObjectList such that
    #   Canvas<ObjectList and $selection class == ObjectList
--- 7964,7967 ----
***************
*** 8003,8008 ****
    } {
    	list #X connect \
! 		    $obj_index_sel($@canvas:$@obj1) $@port1 \
! 		    $obj_index_sel($@canvas:$@obj2) $@port2
    }
  }
--- 7972,7977 ----
    } {
    	list #X connect \
! 		    $::obj_index_sel($@canvas:$@obj1) $@port1 \
! 		    $::obj_index_sel($@canvas:$@obj2) $@port2
    }
  }