[PD-cvs] pd/src desire.tk,1.1.2.600.2.14,1.1.2.600.2.15

[Mathieu Bouchard]

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

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
simplified ButtonBar


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.14
retrieving revision 1.1.2.600.2.15
diff -C2 -d -r1.1.2.600.2.14 -r1.1.2.600.2.15
*** desire.tk	5 Dec 2006 03:29:14 -0000	1.1.2.600.2.14
--- desire.tk	5 Dec 2006 04:07:04 -0000	1.1.2.600.2.15
***************
*** 1826,1834 ****
  def Canvas Symbol  {} {$self new_object symbolatom}
  def Canvas Comment {} {$self new_object text}
  def Canvas Bang    {} {$self new_object obj bng}
  def Canvas Toggle  {} {$self new_object obj tgl}
  def Canvas Number2 {} {$self new_object obj nbx}
! def Canvas Vslider {} {$self new_object obj vslider}
! def Canvas Hslider {} {$self new_object obj hslider}
  def Canvas Vradio  {} {$self new_object obj vradio}
  def Canvas Hradio  {} {$self new_object obj hradio}
--- 1826,1836 ----
  def Canvas Symbol  {} {$self new_object symbolatom}
  def Canvas Comment {} {$self new_object text}
+ 
+ #!@#$ these 9 should be harmonised with the class list instead of having special names
  def Canvas Bang    {} {$self new_object obj bng}
  def Canvas Toggle  {} {$self new_object obj tgl}
  def Canvas Number2 {} {$self new_object obj nbx}
! def Canvas Vslider {} {$self new_object obj vsl}
! def Canvas Hslider {} {$self new_object obj hsl}
  def Canvas Vradio  {} {$self new_object obj vradio}
  def Canvas Hradio  {} {$self new_object obj hradio}
***************
*** 1836,1839 ****
--- 1838,1842 ----
  def Canvas dropper {} {$self new_object obj dropper}
  def Canvas Canvas  {} {$self new_object obj cnv}
+ 
  def Canvas Graph   {} {$self editmode= 1; pd .x$self graph    }
  def Canvas Array   {} {$self editmode= 1; pd .x$self menuarray}
***************
*** 5645,5664 ****
  
  set butt {
! 	{object  Object     {pd .%W obj 0}}
! 	{message Message    {pd .%W msg 0}}
! 	{number  Number     {pd .%W floatatom 0}}
! 	{symbol  Symbol     {pd .%W symbolatom 0}}
! 	{comment Comment    {pd .%W text 0}}
! 	{bang    bng        {%W new_object obj bng}}
! 	{toggle  tgl        {%W new_object obj tgl 0}}
! 	{number2 nbx        {%W new_object obj nbx 0}}
! 	{vslider vsl        {%W new_object obj vsl 0}}
! 	{hslider hsl        {%W new_object obj hsl 0}}
! 	{vradio  vradio     {%W new_object obj vradio 0}}
! 	{hradio  hradio     {%W new_object obj hradio 0}}
! 	{vu      vu         {%W new_object obj vumeter 0}}
! 	{canvas  cnv        {%W new_object obj cnv 0}}
! 	{graph   graph      {pd .%W graph}}
! 	{array   array      {pd .%W menuarray 0}}
  }
  #	{dropper dropper    {pd %W dropper 0}}
--- 5648,5667 ----
  
  set butt {
! 	{object  Object     {obj}}
! 	{message Message    {msg}}
! 	{number  Number     {floatatom}}
! 	{symbol  Symbol     {symbolatom}}
! 	{comment Comment    {text}}
! 	{bang    bng        {obj bng}}
! 	{toggle  tgl        {obj tgl}}
! 	{number2 nbx        {obj nbx}}
! 	{vslider vsl        {obj vsl}}
! 	{hslider hsl        {obj hsl}}
! 	{vradio  vradio     {obj vradio}}
! 	{hradio  hradio     {obj hradio}}
! 	{vu      vu         {obj vumeter}}
! 	{canvas  cnv        {obj cnv}}
! 	{graph   graph      {graph}}
! 	{array   array      {menuarray 0}}
  }
  #	{dropper dropper    {pd %W dropper 0}}
***************
*** 5694,5698 ****
  		mset {icon name cmd} $e
  		pack [button $bb._$name -image icon_$icon -border 1 \
! 			-command "$@canvas editmode= 1; [regsub -all -- %W $cmd $@canvas]"] -side left
  		balloon $bb._$name [say $name]
  	}
--- 5697,5701 ----
  		mset {icon name cmd} $e
  		pack [button $bb._$name -image icon_$icon -border 1 \
! 			-command "$@canvas new_object $cmd"] -side left
  		balloon $bb._$name [say $name]
  	}