pd/src desire.tk,1.1.2.368,1.1.2.369 - Pd-cvs

18 Aug 2006


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12981
Modified Files:
      Tag: devel_0_39
    desire.tk 
Log Message:
renamed proc properties_dialog to def Dialog add
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.368
retrieving revision 1.1.2.369
diff -C2 -d -r1.1.2.368 -r1.1.2.369
*** desire.tk	18 Aug 2006 04:59:56 -0000	1.1.2.368
--- desire.tk	18 Aug 2006 05:03:28 -0000	1.1.2.369
***************
*** 3272,3276 ****
    	default {error "huh? ($prop)"}
        }]]
! 	    properties_dialog $self .$self $d
    }
  }
--- 3272,3276 ----
    	default {error "huh? ($prop)"}
        }]]
! 	    $self add .$self $d
    }
  }
***************
*** 3293,3297 ****
                  (int)x->gl_pixwidth, (int)x->gl_pixheight,
                  (int)x->gl_xmargin, (int)x->gl_ymargin);
! 	properties_dialog $self .$self $props
    pack [checkbutton .$self.graphme -text "graph on parent" \
    	-variable @graphme -anchor w] -side top
--- 3293,3297 ----
                  (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
***************
*** 3343,3347 ****
      wm title .$self "Atom"
      global properties
!     properties_dialog $self .$self \
    {width entry -width 4} \
    {lo    entry -width 8} \
--- 3343,3347 ----
      wm title .$self "Atom"
      global properties
!     $self add .$self \
    {width entry -width 4} \
    {lo    entry -width 8} \
***************
*** 3373,3377 ****
      pack [label .$self.label -text "GRAPH BOUNDS"] -side top
      global properties
!     properties_dialog $self .$self {
    {x1   entry -width 7} \
    {x2   entry -width 7} \
--- 3373,3377 ----
      pack [label .$self.label -text "GRAPH BOUNDS"] -side top
      global properties
!     $self add .$self {
    {x1   entry -width 7} \
    {x2   entry -width 7} \
***************
*** 3402,3406 ****
      set @otherflag 0
      wm title $id "[say array] [say popup_properties]"
!     properties_dialog $self .$self {name entry} {n entry}
      pack [checkbutton .$self.saveme -text "save contents" -variable @saveit -anchor w] -side top
--- 3402,3406 ----
      set @otherflag 0
      wm title $id "[say array] [say popup_properties]"
!     $self add .$self {name entry} {n entry}
      pack [checkbutton .$self.saveme -text "save contents" -variable @saveit -anchor w] -side top
***************
*** 4678,4682 ****
  }
! proc properties_dialog {self w args} {
      global _ key
      set no_max_label 0
--- 4678,4683 ----
  }
! class_new Dialog {Thing}
! def Dialog add {w args} {
      global _ key
      set no_max_label 0
***************
*** 4949,4953 ****
   }
- class_new Dialog {Thing}
  def Dialog ok      {} {$self apply; $self cancel}
  def Dialog cancel   {} {$self _delete}
--- 4950,4953 ----
***************
*** 5272,5278 ****
      switch $type {
        section {$self add_section [incr section] [say $name]}
! 	    choice  {properties_dialog $self $f.main.$section \
    	[list $name choice -choices [lrange $names 1 end]]}
! 	    default {properties_dialog $self $f.main.$section [list $name $type]}
      }
    }
--- 5272,5278 ----
      switch $type {
        section {$self add_section [incr section] [say $name]}
! 	    choice  {$self add $f.main.$section \
    	[list $name choice -choices [lrange $names 1 end]]}
! 	    default {$self add $f.main.$section [list $name $type]}
      }
    }
***************
*** 5470,5474 ****
        }
        alias {}
! 	    choice {properties_dialog $self $which_section [list [lindex $name 0] choice]}
        color {
    	set var ${name}path
--- 5470,5474 ----
        }
        alias {}
! 	    choice {$self add $which_section [list [lindex $name 0] choice]}
        color {
    	set var ${name}path
***************
*** 5476,5480 ****
    	set @$var $which_section.$name.color
    	set @$name $look($name)
! 		properties_dialog $self $which_section [list [lindex $name 0] color]
        }
        key {
--- 5476,5480 ----
    	set @$var $which_section.$name.color
    	set @$name $look($name)
! 		$self add $which_section [list [lindex $name 0] color]
        }
        key {
***************
*** 5484,5488 ****
    	  set @$var $which_section.[string tolower [lindex $name 0]].[string tolower $item]
    	}
! 	    	properties_dialog $self $which_section [list $name $type]
        }
        crosshair {
--- 5484,5488 ----
    	  set @$var $which_section.[string tolower [lindex $name 0]].[string tolower $item]
    	}
! 	    	$self add $which_section [list $name $type]
        }
        crosshair {
***************
*** 5491,5498 ****
    	set @$var $which_section.$name.color
    	set @$name $crosshair($name)
! 		properties_dialog $self $which_section [list [lindex $name 0] toggle]
        }
        default {
! 		properties_dialog $self $which_section [list $name $type]
        }
      }
--- 5491,5498 ----
    	set @$var $which_section.$name.color
    	set @$name $crosshair($name)
! 		$self add $which_section [list [lindex $name 0] toggle]
        }
        default {
! 		$self add $which_section [list $name $type]
        }
      }