[PD-cvs] pd/src desire.tk,1.1.2.463,1.1.2.464

[chunlee]

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

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
fixes to CanvasPropertiesDialog init


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.463
retrieving revision 1.1.2.464
diff -C2 -d -r1.1.2.463 -r1.1.2.464
*** desire.tk	6 Sep 2006 01:24:43 -0000	1.1.2.463
--- desire.tk	8 Sep 2006 13:42:25 -0000	1.1.2.464
***************
*** 28,32 ****
  #
  #-----------------------------------------------------------------------------------#
! 
  # this command rebuilds the package index: echo pkg_mkIndex . | tclsh
  
--- 28,32 ----
  #
  #-----------------------------------------------------------------------------------#
!    
  # this command rebuilds the package index: echo pkg_mkIndex . | tclsh
  
***************
*** 2490,2494 ****
  	set @click_at [list $x $y]
  	
! 	if {$f&8} {$self popup $id [winfo pointerx $c] [winfo pointery $c]; return}
  	if {!$@editmode} {
  		if {[llength $id]} {
--- 2490,2494 ----
  	set @click_at [list $x $y]
  	
! 	if {$f&8} {set c [$self widget];$self popup $id [winfo pointerx $c] [winfo pointery $c]; return}
  	if {!$@editmode} {
  		if {[llength $id]} {
***************
*** 3550,3553 ****
--- 3550,3555 ----
  
  def CanvasPropertiesDialog init {of} {
+ 	global fields classinfo
+ 	#set class [$of class]
  	super $of
  	#X coords 0 0 1 1 100 100 1 100 200;
***************
*** 3563,3574 ****
  	#(int)x->gl_pixwidth, (int)x->gl_pixheight,
  	#(int)x->gl_xmargin, (int)x->gl_ymargin);
! $self add .$self $props
! pack [checkbutton .$self.graphme -text "graph on parent" \
! 	  -variable @graphme -anchor w] -side top
! set e .$self.xscale.entry
! #bind $e <KeyPress-Return> "canvas_ok $id"
! $e select from 0
! $e select adjust end
! focus $e
  }
  
--- 3565,3602 ----
  	#(int)x->gl_pixwidth, (int)x->gl_pixheight,
  	#(int)x->gl_xmargin, (int)x->gl_ymargin);
! 
! 	#puts "[lrange $fields($class) 0 end]"
! 	#$self add .$self $props
! 	set @gop 0; #dummy
! 	set @properties [list "gop" "width" "height" "xmargin" "ymargin"]
! 	foreach prop $@properties {
! 		set label [say $prop]
! 		if {[string length $label] > $@max_label} {set @max_label [string length $label]}
! 	}
! 
! 	$self add .$self [list gop toggle -command "$self gop_setting"]
! 	$self add .$self [list width integer -width 7]
! 	$self add .$self [list height integer -width 7]
! 	$self add .$self [list xmargin integer -width 7]
! 	$self add .$self [list ymargin integer -width 7]
! 	$self gop_setting
! 	#pack [checkbutton .$self.graphme -text "graph on parent" \
! 	#	  -variable @graphme -anchor w] -side top
! 	#set e .$self.xscale.entry
! 	#bind $e <KeyPress-Return> "canvas_ok $id"
! 	#$e select from 0
! 	#$e select adjust end
! 	#focus $e
! }
! 
! def CanvasPropertiesDialog gop_setting {} {
! 	set entries [lrange $@properties 1 end]
! 	foreach entry $entries {
! 		if {!$@gop} {
! 		.$self.$entry.entry configure -state disable
! 		} else {
! 		.$self.$entry.entry configure -state normal
! 		}
! 	}
  }
  
***************
*** 5078,5084 ****
  				frame $f
  				label $f.label -text $label
! 				checkbutton $f.toggle -variable @$name
  				pack $f.label -side left
  				pack $f.toggle -side left
  			}
  			section {
--- 5106,5113 ----
  				frame $f
  				label $f.label -text $label
! 				eval "checkbutton $f.toggle -variable @$name $options"
  				pack $f.label -side left
  				pack $f.toggle -side left
+ 				#pack $f.label -side right
  			}
  			section {