[PD-cvs] pd/src desire.tk,1.1.2.497,1.1.2.498

chunlee chunlee at users.sourceforge.net
Fri Oct 13 18:06:25 CEST 2006


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

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
tab_jump fix and others


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.497
retrieving revision 1.1.2.498
diff -C2 -d -r1.1.2.497 -r1.1.2.498
*** desire.tk	13 Oct 2006 15:57:30 -0000	1.1.2.497
--- desire.tk	13 Oct 2006 16:06:22 -0000	1.1.2.498
***************
*** 40,43 ****
--- 40,44 ----
  package require objective
  package require bgerror
+ #package require profiler
  
  #catch {package require Tclx}
***************
*** 2819,2822 ****
--- 2820,2824 ----
  
  def Canvas tab_jump {} {
+ 	if {![llength $@children]} {return}
  	set @keynav 1
  	set olength [llength $@selection]
***************
*** 2827,2830 ****
--- 2829,2833 ----
  	switch $@keynav_tab_sel {
  	object {
+ 		#if {$@keynav_current == ""} {return}
  		if {$@keynav_current == 0} {set @keynav_current [lindex $@children 0]}
  		$@keynav_current selected?= 0
***************
*** 2842,2847 ****
  		set @selection $@keynav_current
  		#set @keynav_tab_sel "wire"
! 	}
  	wire {
  		#if {![llength $@selection_wire]} {return}
  		if {[llength $@selection_wire]} {
--- 2845,2851 ----
  		set @selection $@keynav_current
  		#set @keynav_tab_sel "wire"
! 	} 
  	wire {
+ 		#if {$@keynav_current == ""} {return}
  		#if {![llength $@selection_wire]} {return}
  		if {[llength $@selection_wire]} {
***************
*** 2859,2863 ****
  			#set @keynav_current [lindex $_($obj:wires) 0]
  			if {$@keynav_last == 0} {set @keynav_last [lindex $_($obj:wires) 0]}
! 			set @keynav_current $@keynav_last
  			}
  		}
--- 2863,2867 ----
  			#set @keynav_current [lindex $_($obj:wires) 0]
  			if {$@keynav_last == 0} {set @keynav_last [lindex $_($obj:wires) 0]}
! 			#set @keynav_current $@keynav_last
  			}
  		}
***************
*** 2867,2875 ****
  	
  	}
! 	
  	$@keynav_current selected?= 1
  	#if {$@keynav_tab_sel == "object"} {set @keynav_tab_sel "wire"} else {set @keynav_tab_sel "object"}
  	#puts "-------------------------------------------"
! 	#puts "	selection:::: [$self selection]"
  	#puts "	selection_wire:::: [$self selection_wire]"
  	#puts "	keynav_current:::: $@keynav_current"
--- 2871,2880 ----
  	
  	}
! 
! 	#if {$@keynav_current != ""} {$@keynav_current selected?= 1}
  	$@keynav_current selected?= 1
  	#if {$@keynav_tab_sel == "object"} {set @keynav_tab_sel "wire"} else {set @keynav_tab_sel "object"}
  	#puts "-------------------------------------------"
!         #puts "	selection:::: [$self selection]"
  	#puts "	selection_wire:::: [$self selection_wire]"
  	#puts "	keynav_current:::: $@keynav_current"
***************
*** 3158,3163 ****
  
  def Canvas keyup {x y key iso shift} {
!     if {$iso != ""} {scan $iso %c key}
!     $@active draw
  }
  
--- 3163,3168 ----
  
  def Canvas keyup {x y key iso shift} {
! 	if {$iso != ""} {scan $iso %c key}
! 	$@active draw
  }
  
***************
*** 3171,3174 ****
--- 3176,3180 ----
  def Active draw {} {
  	set current [$@canvas keynav_current]
+ 	if {$current == ""} {return}
  	if {![string compare $current 0]} {return}
  	if {[$@canvas keynav]} {
***************
*** 4460,4464 ****
  		set colour [parse_color $@bcol]
  		set rect [list [expr $x1+2] [expr $y1+2] [expr $x2-2] [expr $y2-2]]
! 		$self item BUT oval $rect -fill [color_* [$self look bg] $colour] -tags "${self}BUT $self"
  	}
  }
--- 4466,4471 ----
  		set colour [parse_color $@bcol]
  		set rect [list [expr $x1+2] [expr $y1+2] [expr $x2-2] [expr $y2-2]]
! 		$self item BUT oval $rect -fill [color_* [$self look bg] $colour] \
! 		      -tags "${self}BUT $self"
  	}
  }
***************
*** 5616,5622 ****
  	frame $f.font.size
  	pack [label $f.font.size.label -text "Size:"] -side left
! 	pack [entry $f.font.size.entry -relief sunken -textvariable fontsize -width 4] -side left
  	bind $f.font.size.entry <KeyPress-Return> "$self font_update_size $f"
! 	pack [scrollbar $f.font.size.scroll -command "$self font_changesize $f"] -side right -fill y
  	$f.font.size.entry delete 0 end
  	$f.font.size.entry insert 0 $@size
--- 5623,5630 ----
  	frame $f.font.size
  	pack [label $f.font.size.label -text "Size:"] -side left
! 	pack [spinbox $f.font.size.entry -relief sunken -textvariable fontsize -width 4 \
! 		      -command "$self font_changesize $f %d"] -side left
  	bind $f.font.size.entry <KeyPress-Return> "$self font_update_size $f"
! 	#pack [scrollbar $f.font.size.scroll -command "$self font_changesize $f"] -side right -fill y
  	$f.font.size.entry delete 0 end
  	$f.font.size.entry insert 0 $@size
***************
*** 5648,5651 ****
--- 5656,5663 ----
  }
  
+ def Dialog spinbox_update {mode} {
+ 	puts " $mode"
+ }
+ 
  def Dialog font_get_xlfd {f name style size} {
  	set fstring ""
***************
*** 5677,5683 ****
  }
  
! def Dialog font_changesize {f y} {
  	#set f .$self
! 	set @size [expr $@size - $y]
  	$f.font.size.entry delete 0 end
  	$f.font.size.entry insert 0 $@size
--- 5689,5699 ----
  }
  
! def Dialog font_changesize {f mode} {
  	#set f .$self
! 	#set @size [expr $@size - $y]
! 	switch $mode {
! 		up {set @size [expr $@size+1]}
! 		down {set @size [expr $@size-1]}
! 	}
  	$f.font.size.entry delete 0 end
  	$f.font.size.entry insert 0 $@size





More information about the Pd-cvs mailing list