[PD-cvs] pd/src desire.tk, 1.1.2.600.2.368, 1.1.2.600.2.369 defaults.ddrc, 1.1.2.10.2.21, 1.1.2.10.2.22 ChangeLog, 1.1.4.11.2.38, 1.1.4.11.2.39

[chunlee]

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

Modified Files:
      Tag: desiredata
	desire.tk defaults.ddrc ChangeLog 
Log Message:
add object id display toggle


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.368
retrieving revision 1.1.2.600.2.369
diff -C2 -d -r1.1.2.600.2.368 -r1.1.2.600.2.369
*** desire.tk	14 Aug 2007 08:03:44 -0000	1.1.2.600.2.368
--- desire.tk	14 Aug 2007 19:14:27 -0000	1.1.2.600.2.369
***************
*** 1651,1654 ****
--- 1651,1655 ----
  def Canvas editmode= {mode} {
      if {!$mode} {$self deselect_all}
+     $self redraw
      set @editmode $mode; $self changed editmode
  #    catch {.$self.bbar.edit configure -image icon_mode_$mode}
***************
*** 1731,1734 ****
--- 1732,1736 ----
      set @blinky ""
      set @editmode 0
+     set @show_id 0
  }
  
***************
*** 4835,4842 ****
--- 4837,4862 ----
  def Box draw {} {
  	$self draw_box
+ 	if {[$@canvas show_id]} {$self draw_id} {$self item_delete ID}
  	[[$self get_canvas] widget] raise $self
  	$self update_hilite_io
  #	if {[$self class] == "Canvas"} {$self restack}
  }
+ 
+ def Canvas show_id {} {return $@show_id}
+ def Canvas show_id= {val} {set @show_id $val; $self redraw}
+ def Canvas id_toggle {} {if {$@show_id} {set @show_id 0} {set @show_id 1}; $self redraw}
+ 
+ def Box draw_id {} {
+ 	set id [$self index]:
+ 	mset {x y} [$self xy]
+ 	set fw [font measure [$self look font] 0]
+ 	if {[$@canvas editmode]} {
+ 		set col [complement [$@canvas look bgedit]]
+ 	} else {set col [complement [$@canvas look bgrun]]}
+ 	$self item ID text [list [expr $x-([string length $id]*$fw)] [expr $y+2]] \
+ 	    -font [$self look  font] -text $id \
+ 	    -fill $col -anchor nw
+ }
+ 
  def Box draw_box {} {}
  def Box edit {} {}
***************
*** 6657,6661 ****
  	set z [expr 1/[$@canvas zoom]]; set l 0; set g $@gap
  	for {set i [expr int($v1*$z)]} {$i < $v2*$z} {incr i} {
! 		if {$l%$g == $g-1} {set width 1;set dash [list 7 1]} {set width 1;set dash [list 4 4 4 4]}
  		if {![expr $i % int($@size)]} {
  			switch $tag {
--- 6677,6681 ----
  	set z [expr 1/[$@canvas zoom]]; set l 0; set g $@gap
  	for {set i [expr int($v1*$z)]} {$i < $v2*$z} {incr i} {
! 		if {$l%$g == 0} {set width 1;set dash [list 7 1]} {set width 1;set dash [list 4 4 4 4]}
  		if {![expr $i % int($@size)]} {
  			switch $tag {

Index: defaults.ddrc
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/defaults.ddrc,v
retrieving revision 1.1.2.10.2.21
retrieving revision 1.1.2.10.2.22
diff -C2 -d -r1.1.2.10.2.21 -r1.1.2.10.2.22
*** defaults.ddrc	13 Aug 2007 01:23:40 -0000	1.1.2.10.2.21
--- defaults.ddrc	14 Aug 2007 19:14:29 -0000	1.1.2.10.2.22
***************
*** 160,163 ****
--- 160,164 ----
      macro_play Ctrl+m
      macro_copy Ctrl+M
+     id_toggle Ctrl+semicolon
    }
    Client {

Index: ChangeLog
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/ChangeLog,v
retrieving revision 1.1.4.11.2.38
retrieving revision 1.1.4.11.2.39
diff -C2 -d -r1.1.4.11.2.38 -r1.1.4.11.2.39
*** ChangeLog	12 Aug 2007 18:28:52 -0000	1.1.4.11.2.38
--- ChangeLog	14 Aug 2007 19:14:29 -0000	1.1.4.11.2.39
***************
*** 14,18 ****
   * Added [clipboard] to pull the content of system clipboard
   * Fixed variable width font support and TextBox code clean up
! 
  DesireData 2007.08.04 :
  
--- 14,19 ----
   * Added [clipboard] to pull the content of system clipboard
   * Fixed variable width font support and TextBox code clean up
!  * Added object id display toggle
!  	
  DesireData 2007.08.04 :