[PD-cvs] pd/src desire.tk,1.1.2.214,1.1.2.215

chunlee chunlee at users.sourceforge.net
Thu Jun 1 01:32:37 CEST 2006


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

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
continuing with the key binding editor


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.214
retrieving revision 1.1.2.215
diff -C2 -d -r1.1.2.214 -r1.1.2.215
*** desire.tk	30 May 2006 00:15:11 -0000	1.1.2.214
--- desire.tk	31 May 2006 23:32:34 -0000	1.1.2.215
***************
*** 700,704 ****
  	if {[llength $e]==0} {$menu add separator; return}
  	mset {text cmd accel} $e
! 	set accel [accel_munge $key($text)]
  	if {![llength $cmd]} {
  		set cmd "%W $text"
--- 700,708 ----
  	if {[llength $e]==0} {$menu add separator; return}
  	mset {text cmd accel} $e
! 	
! 	if {$accel != ""} {
! 		set key($text) $accel
! 	} else {set accel [accel_munge $key($text)]}
! 	
  	if {![llength $cmd]} {
  		set cmd "%W $text"
***************
*** 729,745 ****
  def Client init_menus {} {
      $self populate_menu .mbar.file {
!         {new_file     {} "Ctrl+n"}
! 	{open_file    {} "Ctrl+o"}
  	{}
! 	{pdrc_editor  {} "Ctrl+p"}
! 	{ddrc_editor  {} "Ctrl+l"}
! 	{send_message {} "Ctrl+m"}
  	{paths        {} ""}
  	{}
! 	{quit         {} "Ctrl+q"}}
  
      $self populate_menu .mbar.find {
! 	{find {} "Ctrl+f"}
! 	{find_again {} "Ctrl+g"}
      	{find_last_error {} {}}}
  
--- 733,749 ----
  def Client init_menus {} {
      $self populate_menu .mbar.file {
!         {new_file     {} ""}
! 	{open_file    {} ""}
  	{}
! 	{pdrc_editor  {} ""}
! 	{ddrc_editor  {} ""}
! 	{send_message {} ""}
  	{paths        {} ""}
  	{}
! 	{quit         {} ""}}
  
      $self populate_menu .mbar.find {
! 	{find {} ""}
! 	{find_again {} ""}
      	{find_last_error {} {}}}
  
***************
*** 1006,1011 ****
      set m .mbar.media
      $main populate_menu $m {
! 	{audio_on  {} "Ctrl+/"}
! 	{audio_off {} "Ctrl+."}
  	{}}
      switch $OS {
--- 1010,1015 ----
      set m .mbar.media
      $main populate_menu $m {
! 	{audio_on  {} ""}
! 	{audio_off {} ""}
  	{}}
      switch $OS {
***************
*** 1250,1276 ****
      foreach x {file edit view put window help} {menu $m.$x -tearoff $pd_tearoff}
      $self populate_menu file {
! 	{new_file     {} "Ctrl+n"}
! 	{open_file    {} "Ctrl+o"}
  	{}
! 	{send_message {} "Ctrl+m"}
  	{paths        {} ""}
  	{}
! 	{close        {} "Ctrl+w"}
! 	{save         {} "Ctrl+s"}
! 	{save_as      {} "Ctrl+S"}
! 	{print        {} "Ctrl+p"}
  	{}
! 	{quit         {} "Ctrl+q"}}
      $self populate_menu edit {
! 	{undo       {} "Ctrl+z"}
! 	{redo       {} "Ctrl+Z"}
  	{}
! 	{cut        {} "Ctrl+x"}
! 	{copy       {} "Ctrl+c"}
! 	{paste      {} "Ctrl+v"}
! 	{duplicate  {} "Ctrl+d"}
! 	{select_all {} "Ctrl+a"}
  	{}
! 	{text_editor {} "Ctrl+t"}
  	{font_bomb   {} {}}
  	{tidy_up     {} {}}
--- 1254,1280 ----
      foreach x {file edit view put window help} {menu $m.$x -tearoff $pd_tearoff}
      $self populate_menu file {
! 	{new_file     {} ""}
! 	{open_file    {} ""}
  	{}
! 	{send_message {} ""}
  	{paths        {} ""}
  	{}
! 	{close        {} ""}
! 	{save         {} ""}
! 	{save_as      {} ""}
! 	{print        {} ""}
  	{}
! 	{quit         {} ""}}
      $self populate_menu edit {
! 	{undo       {} ""}
! 	{redo       {} ""}
  	{}
! 	{cut        {} ""}
! 	{copy       {} ""}
! 	{paste      {} ""}
! 	{duplicate  {} ""}
! 	{select_all {} ""}
  	{}
! 	{text_editor {} ""}
  	{font_bomb   {} {}}
  	{tidy_up     {} {}}
***************
*** 1281,1300 ****
  #	{crosshair {global crosshair; set crosshair [expr !!$crosshair]} "" toggle}
      $self populate_menu put {
! 	{Object  {[%W canvas] editmode= 1;pd .%W obj        %X %Y} "Ctrl+1"}
! 	{Message {[%W canvas] editmode= 1;pd .%W msg        %X %Y} "Ctrl+2"}
! 	{Number  {[%W canvas] editmode= 1;pd .%W floatatom  %X %Y} "Ctrl+3"}
! 	{Symbol  {[%W canvas] editmode= 1;pd .%W symbolatom %X %Y} "Ctrl+4"}
! 	{Comment {[%W canvas] editmode= 1;pd .%W text       %X %Y} "Ctrl+5"}
  	{}
! 	{Bang    {[%W canvas] editmode= 1;pd .%W bng     %X %Y} "Alt+b"}
!         {Toggle  {[%W canvas] editmode= 1;pd .%W toggle  %X %Y} "Alt+t"}
!         {Number2 {[%W canvas] editmode= 1;pd .%W numbox  %X %Y} "Alt+n"}
!         {Vslider {[%W canvas] editmode= 1;pd .%W vslider %X %Y} "Alt+v"}
!         {Hslider {[%W canvas] editmode= 1;pd .%W hslider %X %Y} "Alt+h"}
!         {Vradio  {[%W canvas] editmode= 1;pd .%W vradio  %X %Y} "Alt+d"}
!         {Hradio  {[%W canvas] editmode= 1;pd .%W hradio  %X %Y} "Alt+i"}
! 	{VU      {[%W canvas] editmode= 1;pd .%W vumeter %X %Y} "Alt+u"}
! 	{dropper {[%W canvas] editmode= 1;pd .%W dropper %X %Y} "Alt+x"}
!         {Canvas  {[%W canvas] editmode= 1;pd .%W mycnv   %X %Y} "Alt+c"}
  	{}
  	{Graph   {[%W canvas] editmode= 1;pd .%W graph    } {}}
--- 1285,1304 ----
  #	{crosshair {global crosshair; set crosshair [expr !!$crosshair]} "" toggle}
      $self populate_menu put {
! 	{Object  {[%W canvas] editmode= 1;pd .%W obj        %X %Y} ""}
! 	{Message {[%W canvas] editmode= 1;pd .%W msg        %X %Y} ""}
! 	{Number  {[%W canvas] editmode= 1;pd .%W floatatom  %X %Y} ""}
! 	{Symbol  {[%W canvas] editmode= 1;pd .%W symbolatom %X %Y} ""}
! 	{Comment {[%W canvas] editmode= 1;pd .%W text       %X %Y} ""}
  	{}
! 	{Bang    {[%W canvas] editmode= 1;pd .%W bng     %X %Y} ""}
!         {Toggle  {[%W canvas] editmode= 1;pd .%W toggle  %X %Y} ""}
!         {Number2 {[%W canvas] editmode= 1;pd .%W numbox  %X %Y} ""}
!         {Vslider {[%W canvas] editmode= 1;pd .%W vslider %X %Y} ""}
!         {Hslider {[%W canvas] editmode= 1;pd .%W hslider %X %Y} ""}
!         {Vradio  {[%W canvas] editmode= 1;pd .%W vradio  %X %Y} ""}
!         {Hradio  {[%W canvas] editmode= 1;pd .%W hradio  %X %Y} ""}
! 	{VU      {[%W canvas] editmode= 1;pd .%W vumeter %X %Y} ""}
! 	{dropper {[%W canvas] editmode= 1;pd .%W dropper %X %Y} ""}
!         {Canvas  {[%W canvas] editmode= 1;pd .%W mycnv   %X %Y} ""}
  	{}
  	{Graph   {[%W canvas] editmode= 1;pd .%W graph    } {}}
***************
*** 3777,3781 ****
  
  proc properties_dialog {self w ok struct} {
!     global _ look
      foreach {name label type options} $struct {
  		set f $w.$name
--- 3781,3785 ----
  
  proc properties_dialog {self w ok struct} {
!     global _ look key
      foreach {name label type options} $struct {
  		set f $w.$name
***************
*** 3843,3850 ****
  	        label $f -text $label -bg "#0000aa" -fg "#ffff55" -font {helvetica -10 bold}
  	    }
  	    default {
  		frame $f
- 		#pack [label $f.label -text $label] -side left
- 		#label $f.label -text $label -wraplength 200 -justify left
  		
  		pack [label $f.label -text $label] -side left
--- 3847,3864 ----
  	        label $f -text $label -bg "#0000aa" -fg "#ffff55" -font {helvetica -10 bold}
  	    }
+ 	    key {
+ 		set f $w.[string tolower [lindex $name 0]]
+ 		frame $f
+ 		pack [label $f.label -text $label] -side left
+ 		#balloon $f.label $name
+ 		foreach item $name {
+ 			set item_lower [string tolower $item]
+ 			eval "entry $f.$item_lower -textvariable key($item) -width 15"
+ 			pack $f.$item_lower -side left
+ 			#bind $f.$item <Return> ""
+ 		}
+ 	    }
  	    default {
  		frame $f
  		
  		pack [label $f.label -text $label] -side left
***************
*** 4208,4212 ****
    color selrect
  section keys
!   string put
  }
  
--- 4222,4238 ----
    color selrect
  section keys
!  subsection put
!   key Object
!   key Message
!   key Number
!   key Symbol
!   key Comment
!   key Bang
!   key Toggle
!   key Number2
!   key {Vslider Hslider}
!   key {Vradio Hradio}
!   key Canvas
!   key Array
  }
  
***************
*** 4326,4329 ****
--- 4352,4359 ----
  			[list [lindex $name 0] [say $name] color {}]
  	    }
+ 	    key {
+ 	    	properties_dialog $which_self $which_section ClientPrefsDialog_ok \
+ 			[list $name $name $type {}]    
+ 	    }
  	    default {
  		properties_dialog $which_self $which_section ClientPrefsDialog_ok \





More information about the Pd-cvs mailing list