[PD-cvs] pd/src desire.tk,1.1.2.600.2.379,1.1.2.600.2.380

[chunlee]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2281

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
small fixes


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.379
retrieving revision 1.1.2.600.2.380
diff -C2 -d -r1.1.2.600.2.379 -r1.1.2.600.2.380
*** desire.tk	16 Aug 2007 03:06:46 -0000	1.1.2.600.2.379
--- desire.tk	16 Aug 2007 05:59:45 -0000	1.1.2.600.2.380
***************
*** 895,899 ****
  	frame $f.1 -borderwidth 2 -relief groove
  	canvas $f.1.mtr -width 100 -height 10 -bg #222222
! 	$f.1.mtr create line 0 0 0 0 -width 24 -fill $fill -tags m
  	canvas $f.1.clip -width 5 -height 10 -bg #222222
  	pack $f.1.mtr $f.1.clip -side left
--- 895,899 ----
  	frame $f.1 -borderwidth 2 -relief groove
  	canvas $f.1.mtr -width 100 -height 10 -bg #222222
! 	    $f.1.mtr create line [list 0 0 0 0] -width 24 -fill $fill -tags m
  	canvas $f.1.clip -width 5 -height 10 -bg #222222
  	pack $f.1.mtr $f.1.clip -side left
***************
*** 2044,2051 ****
  
  #patch editing commandline shortcuts
! def Canvas o {x y} {
  	set c [$self widget]
  	set @curpos [list [$c canvasx $x] [$c canvasy $y]]
! 	$self new_object obj
  }
  
--- 2044,2051 ----
  
  #patch editing commandline shortcuts
! def Canvas o {x y {name ""}} {
  	set c [$self widget]
  	set @curpos [list [$c canvasx $x] [$c canvasy $y]]
! 	$self new_object obj $name
  }
  
***************
*** 2636,2639 ****
--- 2636,2640 ----
  	$t insert 1.0 $@text
  	$t configure -pady 0 -padx 0
+ 	$self resize
  	focus $t
  }
***************
*** 3520,3523 ****
--- 3521,3525 ----
  	set @comp_i 0
  	set @comp_s "666"
+ 	set @show_id 0
  	$self defs
  	set f $@serf
***************
*** 3548,3551 ****
--- 3550,3555 ----
  def Runcommand pack_prompt {} {
  	set f $@serf
+ 	set @show_id [$@canvas show_id]
+ 	if {!$@show_id} {$@canvas show_id= 1}
  	if {[winfo exists .$@canvas.yscroll]} {set w .$@canvas.yscroll} else {set w .$@canvas.c}
  	pack $f -side bottom -fill x -before $w
***************
*** 3554,3557 ****
--- 3558,3562 ----
  
  def Runcommand unpack_prompt {} {
+ 	if {!$@show_id} {$@canvas show_id= 0}
  	pack forget $@serf
  	focus [$@canvas widget]
***************
*** 3701,3705 ****
  
  def Canvas paste {} {
! 	$self do_paste [expr [$self copy_times] * 15]
  	$self copy_times= [expr [$self copy_times] + 1]
  }
--- 3706,3711 ----
  
  def Canvas paste {} {
! 	if {[$self look snap_grid]} {set offset [$self look grid_size]} {set offset 15}
! 	$self do_paste [expr [$self copy_times] * $offset]
  	$self copy_times= [expr [$self copy_times] + 1]
  }
***************
*** 3751,3755 ****
  }
  
! def Canvas duplicate {} {$self do_duplicate 15}
  
  def Canvas do_duplicate {offset} {
--- 3757,3764 ----
  }
  
! def Canvas duplicate {} {
! 	if {[$self look snap_grid]} {set off [$self look grid_size]} {set off 15}
! 	$self do_duplicate $off
! }
  
  def Canvas do_duplicate {offset} {
***************
*** 4695,4699 ****
  	}
  	#if {$iso != ""} {scan $iso %c key}
- 	#if {$shift} {set motion 10} {set motion 1}
  	if {$shift} {
  		if {[$self look snap_grid]} {set motion [expr [$self look grid_size]*2]} {set motion 10}
--- 4704,4707 ----