pd/src desire.tk,1.1.2.437,1.1.2.438 - Pd-cvs

31 Aug 2006


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29573
Modified Files:
      Tag: devel_0_39
    desire.tk 
Log Message:
fixed problem with right-click on object.
rehabilitated floatatom,symbolatom properties dialogs.
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.437
retrieving revision 1.1.2.438
diff -C2 -d -r1.1.2.437 -r1.1.2.438
*** desire.tk	31 Aug 2006 19:14:24 -0000	1.1.2.437
--- desire.tk	31 Aug 2006 19:20:25 -0000	1.1.2.438
***************
*** 38,42 ****
  package require objective
! if {[catch {source profdd.tcl}]} {error_dump}
  if {[file exists debug.tcl]} {
    source debug.tcl
--- 38,42 ----
  package require objective
! #if {[catch {source profdd.tcl}]} {error_dump}
  if {[file exists debug.tcl]} {
    source debug.tcl
***************
*** 813,819 ****
    foreach name $list {
    	if {$name == ""} {$menu add separator; continue}
! 		#if {[llength [array names key $name]]} {set k $key($@_class:$name); puts "here"} {set k ""}
    	if {[info exists key($@_class:$name)]} {
! 		if {[string length $key($@_class:$name)]} {set k $key($@_class:$name)} {set k ""}
    	}
    	$menu add command -label [say $name] -command "$self $name" \
--- 813,819 ----
    foreach name $list {
    	if {$name == ""} {$menu add separator; continue}
! 		set k ""
    	if {[info exists key($@_class:$name)]} {
! 			if {[string length $key($@_class:$name)]} {set k $key($@_class:$name)}
    	}
    	$menu add command -label [say $name] -command "$self $name" \
***************
*** 1244,1248 ****
  }
- def Canvas getscroll {args} {} ;# what's this for, again?
  def Canvas window {} {return .$self}
  def Canvas widget {} {return .$self.c}
--- 1244,1247 ----
***************
*** 3392,3396 ****
    global classinfo fields
    super $of
! 	
    set class $_($of:class)
    wm title .$self "[$class] [say popup_properties]"
--- 3391,3395 ----
    global classinfo fields
    super $of
! 
    set class $_($of:class)
    wm title .$self "[$class] [say popup_properties]"
***************
*** 3467,3472 ****
  }
- def CanvasPropertiesDialog cancel {id} {pd ".$self cancel ;"}
- 
  proc gatom_escape {sym} {
    if {[string length $sym] == 0} {
--- 3466,3469 ----
***************
*** 3489,3521 ****
  }
! class_new GAtomPropertiesDialog {Dialog}
def GAtomPropertiesDialog apply {} {
! 	pd ".$self param $@width $@lo $@hi [gatom_escape $@label] $@wherelabel \
! 		[gatom_escape $@symfrom] [gatom_escape $@symto] ;"
  }
- def GAtomPropertiesDialog cancel {} {pd ".$self cancel ;"}
- 
  def GAtomPropertiesDialog init {of} {
    super $of
! 	foreach var {width lo hi wherelabel} {set @$var $_($of:$var)}
! 	foreach var {label symfrom symto} {set @$var [gatom_unescape $_($of:$var)]}
    wm title .$self "Atom"
    global properties
    $self add .$self \
! 	    {width entry -width 4} \
! 	    {lo    entry -width 8} \
! 	    {hi    entry -width 8} \
! 	    {label entry -width 20} \
! 	    {wherelabel side} \
! 	    {symto      entry -width 20} \
! 	    {symfrom    entry -width 20}
! 	foreach name {hi lo width} {
! 		bind .$self.$name.entry <KeyPress-Return> "$self ok"
! 	}
! 	.$self.width.entry select from 0
! 	.$self.width.entry select adjust end
! 	focus .$self.width.entry
  }
--- 3486,3516 ----
  }
! class_new GAtomPropertiesDialog {PropertiesDialog}
! 
! def AtomBox popup_properties {} {GAtomPropertiesDialog new $self}
def GAtomPropertiesDialog apply {} {
! 	pd ".$@of param $@w $@min $@max [gatom_escape $@lab] $@pos \
! 		[gatom_escape $@rcv] [gatom_escape $@snd] ;"
  }
def GAtomPropertiesDialog init {of} {
    super $of
! 	foreach var {w min max pos} {set @$var $_($of:$var)}
! 	foreach var {lab snd rcv} {set @$var [gatom_unescape $_($of:$var)]}
    wm title .$self "Atom"
    global properties
    $self add .$self \
! 	    {w   entry -width 4} \
! 	    {min entry -width 8} \
! 	    {max entry -width 8} \
! 	    {lab entry -width 20} \
! 	    {pos side} \
! 	    {snd entry -width 20} \
! 	    {rcv entry -width 20}
! 	foreach name {w min max} {bind .$self.$name.entry <KeyPress-Return> "$self ok"}
! 	.$self.w.entry select from 0
! 	.$self.w.entry select adjust end
! 	focus .$self.w.entry
  }
***************
*** 3526,3531 ****
  }
- def GraphPropertiesDialog cancel {} {pd ".$self cancel ;"}
- 
  def GraphPropertiesDialog init {of} {
    super $of
--- 3521,3524 ----
***************
*** 3556,3561 ****
  }
- def ArrayPropertiesDialog cancel {} {pd ".$self cancel ;"}
- 
  def ArrayPropertiesDialog init {of} {
    super $of
--- 3549,3552 ----