[PD-cvs] pd/src desire.tk,1.1.2.179,1.1.2.180

[Mathieu Bouchard]

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

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
.


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.179
retrieving revision 1.1.2.180
diff -C2 -d -r1.1.2.179 -r1.1.2.180
*** desire.tk	22 Apr 2006 06:44:41 -0000	1.1.2.179
--- desire.tk	22 Apr 2006 07:33:29 -0000	1.1.2.180
***************
*** 771,775 ****
  
  #-----------------------------------------------------------------------------------#
! class_new View {Observable Thing}
  
  # normally ninlets/noutlets should be in class "Box", but server-side isn't smart enough
--- 771,775 ----
  
  #-----------------------------------------------------------------------------------#
! class_new View {Menuable Observable Thing}
  
  # normally ninlets/noutlets should be in class "Box", but server-side isn't smart enough
***************
*** 878,884 ****
  proc wonder {} {tk_messageBox -message "this would be a cool feature, eh?" -type yesno -icon question}
  
! def Canvas popup_properties {} {wonder}
! def Canvas popup_open {} {wonder}
! def Canvas popup_help {} {wonder}
  
  def* Canvas eval% {code} {
--- 878,885 ----
  proc wonder {} {tk_messageBox -message "this would be a cool feature, eh?" -type yesno -icon question}
  
! def Canvas     new_file {} {global main; $main  new_file}
! def Canvas    open_file {} {global main; $main open_file}
! def Canvas send_message {} {global main; $main send_message}
! def Canvas        paths {} {global main; $main paths}
  
  def* Canvas eval% {code} {
***************
*** 888,892 ****
  }
  
! def Client paths {} {pd pd start-path-dialog}
  
  proc menu_addstd {mbar} {
--- 889,899 ----
  }
  
! def Client          paths {} {pd pd start-path-dialog}
! def Client audio_settings {} {pd pd audio-properties}
! def Client  midi_settings {} {pd pd  midi-properties}
! def Client test_audio_and_midi {} {menu_doc_open doc/7.stuff/tools testtone.pd  }
! def Client          load_meter {} {menu_doc_open doc/7.stuff/tools load-meter.pd}
! def Client       latency_meter {} {menu_doc_open doc/7.stuff/tools latency.pd   }
! def Client  menu_documentation {} {pd menu_documentation}
  
  proc menu_addstd {mbar} {
***************
*** 901,911 ****
        default {
          $main populate_menu $m {
! 		{{Audio settings...} {pd pd audio-properties} {}}
! 		{{MIDI settings...}  {pd pd midi-properties}  {}}}
        }
      }
      $main populate_menu $m {{}
! 	{test_audio_and_midi {menu_doc_open doc/7.stuff/tools   testtone.pd} ""}
! 	{load_meter          {menu_doc_open doc/7.stuff/tools load-meter.pd} ""} {}}
      foreach a $pd_apilist {
      	$m add radiobutton -label [lindex $a 0] -variable pd_whichapi -value [lindex $a 1] \
--- 908,919 ----
        default {
          $main populate_menu $m {
! 		{audio_settings {} {}}
! 		{ midi_settings {} {}}}
        }
      }
      $main populate_menu $m {{}
! 	{test_audio_and_midi    {} ""}
! 	{load_meter             {} ""}
! 	{latency_meter          {} ""} {}}
      foreach a $pd_apilist {
      	$m add radiobutton -label [lindex $a 0] -variable pd_whichapi -value [lindex $a 1] \
***************
*** 919,923 ****
      $main populate_menu .mbar.help {
  	{about {} ""}
! 	{"Pure Documentation..." {pd menu_documentation} ""}
  	{class_browser {} ""}
      }
--- 927,931 ----
      $main populate_menu .mbar.help {
  	{about {} ""}
! 	{"Pure Documentation..." {} ""}
  	{class_browser {} ""}
      }
***************
*** 1021,1029 ****
      wm geometry $name $geometry
      $self new_menubar $editable
-     menu $name.popup -tearoff false
-     $self populate_menu $name.popup {
- 	{popup_properties {} ""}
- 	{popup_open       {} ""}
- 	{popup_help       {} ""}}
      wm protocol $name WM_DELETE_WINDOW "$self close"
      $self new_binds
--- 1029,1032 ----
***************
*** 1767,1778 ****
  }
  
  def* Canvas clickedit {x y b f} {
  	global look
  	set c .[$self canvas].c
  	mset {type id} [$self identify_target $x $y $b $f "click"]
! 	if {$f&8} {
! 		tk_popup .$self.popup [winfo pointerx $c] [winfo pointery $c]
! 		return
! 	}
  	if {[llength $@obj_in_edit]} {$@obj_in_edit unedit; set @obj_in_edit {}}
  	# if clicked on empty space in edit mode, draw dash sel rect
--- 1770,1797 ----
  }
  
+ def Canvas help {} {global main; $main class_browser}
+ 
+ def Canvas popup {id x y} {
+   set p .$self.popup
+   catch {destroy $p}
+   menu $p -tearoff false
+   if {$id == ""} {
+     $self populate_menu $p {
+ 	{properties {} ""}
+ 	{help       {} ""}}
+   } {
+     $id populate_menu $p {
+ 	{properties {} ""}
+ 	{open       {} ""}
+ 	{help       {} ""}}
+   }
+   tk_popup $p $x $y
+ }
+ 
  def* Canvas clickedit {x y b f} {
  	global look
  	set c .[$self canvas].c
  	mset {type id} [$self identify_target $x $y $b $f "click"]
! 	if {$f&8} {$self popup $id [winfo pointerx $c] [winfo pointery $c]; return}
  	if {[llength $@obj_in_edit]} {$@obj_in_edit unedit; set @obj_in_edit {}}
  	# if clicked on empty space in edit mode, draw dash sel rect
***************
*** 3454,3461 ****
  
  proc dropmenu_set {frame name} {
! 
! $frame.label_set configure -text $name
! puts "$name is selected in the drop down menu!!!"
! 
  }
  
--- 3473,3478 ----
  
  proc dropmenu_set {frame name} {
! 	$frame.label_set configure -text $name
! 	puts "$name is selected in the drop down menu!!!"
  }
  
***************
*** 3503,3507 ****
  }
  
- 
  class_new PagedDialog {Dialog}
  
--- 3520,3523 ----