[PD-cvs] pd/src desire.tk,1.1.2.600.2.361,1.1.2.600.2.362

[Mathieu Bouchard]

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

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
Visual diff (part 2)


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.361
retrieving revision 1.1.2.600.2.362
diff -C2 -d -r1.1.2.600.2.361 -r1.1.2.600.2.362
*** desire.tk	13 Aug 2007 07:11:43 -0000	1.1.2.600.2.361
--- desire.tk	13 Aug 2007 08:05:49 -0000	1.1.2.600.2.362
***************
*** 1672,1676 ****
  }
  
! def Canvas editmodeswitch {args} {$self editmode= [expr !$@editmode]}
  
  def Canvas window {} {
--- 1672,1676 ----
  }
  
! def Canvas editmodeswitch {} {$self editmode= [expr !$@editmode]}
  
  def Canvas window {} {
***************
*** 1735,1738 ****
--- 1735,1740 ----
      set @macro_q {}
      set @macro_delay 200
+     set @blinky ""
+     set @editmode 0
  }
  
***************
*** 2235,2243 ****
      $self populate_menu edit {undo redo {} cut copy paste duplicate select_all subpatcherize {} tidy_up {}}
      $self populate_menu find {find find_again find_last_error}
!     $self populate_menu view {visual_diff {} reload redraw}
      $self populate_menu put {Object Message Number Symbol Comment {} bng tgl nbx vsl hsl vradio hradio vu dropper cnv {} Graph Array}
      $self populate_menu window {{}}
!     $m.edit add checkbutton -label [say edit_mode] -selectcolor grey0 -command "$self editmode 0" \
!     	-accelerator [accel_munge "Ctrl+e"] -indicatoron 1 -variable @editmode -onvalue 1 -offvalue 0
      $m.edit   configure -postcommand "$self fix_edit_menu"
      $m.window configure -postcommand "$self fix_window_menu"
--- 2237,2247 ----
      $self populate_menu edit {undo redo {} cut copy paste duplicate select_all subpatcherize {} tidy_up {}}
      $self populate_menu find {find find_again find_last_error}
!     $m.view add checkbutton -label [say visual_diff] -selectcolor grey0 -command [list $self visual_diff] \
!     	-accelerator [accel_munge "Ctrl+e"] -indicatoron 1
!     $self populate_menu view {{} reload redraw}
      $self populate_menu put {Object Message Number Symbol Comment {} bng tgl nbx vsl hsl vradio hradio vu dropper cnv {} Graph Array}
      $self populate_menu window {{}}
!     $m.edit add checkbutton -label [say edit_mode] -selectcolor grey0 -command [list $self editmodeswitch] \
!     	-accelerator [accel_munge "Ctrl+e"] -indicatoron 1
      $m.edit   configure -postcommand "$self fix_edit_menu"
      $m.window configure -postcommand "$self fix_window_menu"
***************
*** 6567,6571 ****
  	set bb .$@canvas.bbar
  	frame $bb
! 	pack [button $bb.edit -image icon_mode_edit -border 1 -command "$@canvas editmodeswitch"] -side left
  	foreach e $::butt {
  		mset {icon name cmd} $e
--- 6571,6575 ----
  	set bb .$@canvas.bbar
  	frame $bb
! 	pack [button $bb.edit -image icon_mode_edit -border 1 -command [list $@canvas editmodeswitch]] -side left
  	foreach e $::butt {
  		mset {icon name cmd} $e
***************
*** 8670,8673 ****
--- 8674,8681 ----
  #-----------------------------------------------------------------
  def Canvas visual_diff {} {
+ 	if {$@blinky != ""} {
+ 		after cancel $@blinky
+ 		return
+ 	}
  	#regsub {\.pd} [$self name] {} filename
  	set filename [$self name]
***************
*** 8679,8682 ****
--- 8687,8691 ----
          }
  	set filename [tk_getOpenFile -defaultextension .pd -filetypes $::image_filetypes -initialdir [$self folder] -initialfile $initialfile]
+ 	if {$filename == ""} {return}
  	image create photo image_$self -file $filename
  	$self blink_image
***************
*** 8689,8693 ****
  		.$self.c create image 0 0 -image image_$self -tag BLINKY -anchor nw
  	}
! 	after 250 [list $self blink_image]
  }
  
--- 8698,8702 ----
  		.$self.c create image 0 0 -image image_$self -tag BLINKY -anchor nw
  	}
! 	set @blinky [after 250 [list $self blink_image]]
  }