[PD-cvs] pd/src desire.tk,1.1.2.152,1.1.2.153

[chunlee]

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

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
added look(buttonbar) and look(statusbar) and other small changes



Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.152
retrieving revision 1.1.2.153
diff -C2 -d -r1.1.2.152 -r1.1.2.153
*** desire.tk	12 Apr 2006 16:11:14 -0000	1.1.2.152
--- desire.tk	15 Apr 2006 20:10:30 -0000	1.1.2.153
***************
*** 544,548 ****
  def client open_file {} {
      global pd_opendir
!     set hname [tk_getOpenFile -defaultextension .pd \
      	-filetypes { {{pd files} {.pd}} {{max files} {.pat}}} \
          -initialdir $pd_opendir]
--- 544,548 ----
  def client open_file {} {
      global pd_opendir
!     set filename [tk_getOpenFile -defaultextension .pd \
      	-filetypes { {{pd files} {.pd}} {{max files} {.pat}}} \
          -initialdir $pd_opendir]
***************
*** 661,665 ****
  
  def* menuable altkey {key iso} {
!     set key [if {$shift} {string toupper $key} {string tolower $key}]
      set key "Alt+$key"
      if {[dict exists $@accels $key]} {
--- 661,666 ----
  
  def* menuable altkey {key iso} {
! 	#hum, where is shift?
!     #set key [if {$shift} {string toupper $key} {string tolower $key}]
      set key "Alt+$key"
      if {[dict exists $@accels $key]} {
***************
*** 698,701 ****
--- 699,704 ----
  set look(sliderbg) #ccebff
  #set look(sliderbg) #ffeedd
+ set look(buttonbar) 1
+ set look(statusbar) 1
  
  set look(extrapix) [switch $OS {
***************
*** 994,1005 ****
  def* canvas init {{width 400} {height 300} {geometry +0+0} {editable 1}} {
      super
!     global pd_opendir pd_tearoff OS cmdline focus
      set name .$self
      set c .$self.c
      toplevel $name -menu $name.m
      wm geometry $name $geometry
!     pack [[button_bar_new $self] widget] -side top -fill x -expand no
      set @statusbar [statusbar_new $self]
!     pack [$@statusbar widget] -side bottom -fill x
      pack [scrollbar $name.xscroll -command "$c xview" -orient horizontal] -side bottom -fill x
      pack [scrollbar $name.yscroll -command "$c yview"] -side  right -fill y
--- 997,1010 ----
  def* canvas init {{width 400} {height 300} {geometry +0+0} {editable 1}} {
      super
!     global pd_opendir pd_tearoff OS cmdline focus look
      set name .$self
      set c .$self.c
      toplevel $name -menu $name.m
      wm geometry $name $geometry
!     # turn buttonbar on/off
!     if {$look(buttonbar)} {pack [[button_bar_new $self] widget] -side top -fill x -expand no}
      set @statusbar [statusbar_new $self]
!     # turn statusbar on/off
!     if {$look(statusbar)} {pack [$@statusbar widget] -side bottom -fill x}
      pack [scrollbar $name.xscroll -command "$c xview" -orient horizontal] -side bottom -fill x
      pack [scrollbar $name.yscroll -command "$c yview"] -side  right -fill y
***************
*** 1517,1521 ****
  	    	set find [lsearch $@wires_pair $wire]
  		if { $find != -1} {
! 		## remove the selected wire from the @wire_pair...
  		set @wires_pair [lreplace $@wires_pair $find $find]
  		set @wires_pair [lreplace $@wires_pair [expr $find - 1] [expr $find - 1]]
--- 1522,1526 ----
  	    	set find [lsearch $@wires_pair $wire]
  		if { $find != -1} {
! 		## remove the selected wire from the @wires_pair...
  		set @wires_pair [lreplace $@wires_pair $find $find]
  		set @wires_pair [lreplace $@wires_pair [expr $find - 1] [expr $find - 1]]
***************
*** 2790,2794 ****
  }
  
! def bang click {x y b f} {pd $self user_bang; $self bang}
  
  def bang bang {} {
--- 2795,2799 ----
  }
  
! def bang click {x y b f} {pd .$self bang; $self bang}
  
  def bang bang {} {