[PD-cvs] pd/src u_main.tk,1.17.2.14,1.17.2.15

19 May 2007


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29206
Modified Files:
      Tag: branch-v0-39-2-extended
    u_main.tk 
Log Message:
made the properties panel show the actual font in use; fixed some other minor inconsistencies
Index: u_main.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v
retrieving revision 1.17.2.14
retrieving revision 1.17.2.15
diff -C2 -d -r1.17.2.14 -r1.17.2.15
*** u_main.tk	19 May 2007 05:35:15 -0000	1.17.2.14
--- u_main.tk	19 May 2007 14:49:23 -0000	1.17.2.15
***************
*** 32,40 ****
# this font is for the Pd Window console text
! font create consoleFont -family $defaultFontFamily -size 12 -weight normal
  # this font is for text in Pd windows
! font create textFont -family {Times} -size 14 -weight normal
  # for text in Properties Panels and other panes
! font create highlightFont -family $defaultFontFamily -size 14 -weight bold
# end Pd-extended font hacks -----------------------------
--- 32,40 ----
# this font is for the Pd Window console text
! font create console_font -family $defaultFontFamily -size 12 -weight normal
  # this font is for text in Pd windows
! font create text_font -family {Times} -size 14 -weight normal
  # for text in Properties Panels and other panes
! font create highlight_font -family $defaultFontFamily -size 14 -weight bold
# end Pd-extended font hacks -----------------------------
***************
*** 200,204 ****
frame .printout
! text .printout.text -relief raised -bd 2 -font consoleFont \
      -yscrollcommand ".printout.scroll set" -width 80
  # .printout.text insert end "\n\n\n\n\n\n\n\n\n\n"
--- 200,204 ----
frame .printout
! text .printout.text -relief raised -bd 2 -font console_font \
      -yscrollcommand ".printout.scroll set" -width 80
  # .printout.text insert end "\n\n\n\n\n\n\n\n\n\n"
***************
*** 383,387 ****
      set name [format ".help%d" $doc_number]
      toplevel $name
!     text $name.text -relief raised -bd 2 -font textFont \
          -yscrollcommand "$name.scroll set" -background white
      scrollbar $name.scroll -command "$name.text yview"
--- 383,387 ----
      set name [format ".help%d" $doc_number]
      toplevel $name
!     text $name.text -relief raised -bd 2 -font text_font \
          -yscrollcommand "$name.scroll set" -background white
      scrollbar $name.scroll -command "$name.text yview"
***************
*** 1293,1297 ****
      global pd_array_listview_page
      global pd_array_listview_id
! 	 global fontweight
      set pd_array_listview_page($arrayName) $page
      set pd_array_listview_id($arrayName) $id
--- 1293,1297 ----
      global pd_array_listview_page
      global pd_array_listview_id
! 	 global fontname fontweight
      set pd_array_listview_page($arrayName) $page
      set pd_array_listview_id($arrayName) $id
***************
*** 1307,1312 ****
                          -selectmode extended \
                          -relief solid -background white -borderwidth 1 \
!                         -font [format {{Bitstream Vera Sans Mono} %d \
!                                %s} $font $fontweight] \
                          -yscrollcommand "$windowName.lb.sb set"]
      set $windowName.lb.sb [scrollbar $windowName.lb.sb \
--- 1307,1311 ----
                          -selectmode extended \
                          -relief solid -background white -borderwidth 1 \
!                         -font [format {{%s} %d %s} $fontname $font $fontweight]\
                          -yscrollcommand "$windowName.lb.sb set"]
      set $windowName.lb.sb [scrollbar $windowName.lb.sb \
***************
*** 1412,1416 ****
      global pd_array_listview_entry
      global pd_nt
! 	 global fontweight
      set lbName [format ".%sArrayWindow.lb" $arrayName]
      if {[winfo exists $lbName.entry]} {
--- 1411,1415 ----
      global pd_array_listview_entry
      global pd_nt
! 	 global fontname fontweight
      set lbName [format ".%sArrayWindow.lb" $arrayName]
      if {[winfo exists $lbName.entry]} {
***************
*** 1424,1428 ****
      set y [expr [lindex $bbox 1] - 4]
      set $lbName.entry [entry $lbName.entry \
!                        -font [format {{Bitstream Vera Sans Mono} %d %s} $font $fontweight]]
      $lbName.entry insert 0 []
      place configure $lbName.entry -relx 0 -y $y -relwidth 1
--- 1423,1427 ----
      set y [expr [lindex $bbox 1] - 4]
      set $lbName.entry [entry $lbName.entry \
!                        -font [format {{%s} %d %s} $fontname $font $fontweight]]
      $lbName.entry insert 0 []
      place configure $lbName.entry -relx 0 -y $y -relwidth 1
***************
*** 1956,1960 ****
labelframe $id.limits -text "limits" -padx 15 -pady 4 -borderwidth 1 \
! 		  -font {{Bitstream Vera Sans Mono} 12 bold}
     pack $id.limits -side top -fill x
      frame $id.limits.lower
--- 1955,1959 ----
labelframe $id.limits -text "limits" -padx 15 -pady 4 -borderwidth 1 \
! 		  -font highlight_font
     pack $id.limits -side top -fill x
      frame $id.limits.lower
***************
*** 1975,1979 ****
labelframe $id.label -text "label" -padx 5 -pady 4 -borderwidth 1 \
! 		  -font {{Bitstream Vera Sans Mono} 12 bold}
     pack $id.label -side top -fill x
      frame $id.label.name
--- 1974,1978 ----
labelframe $id.label -text "label" -padx 5 -pady 4 -borderwidth 1 \
! 		  -font highlight_font
     pack $id.label -side top -fill x
      frame $id.label.name
***************
*** 2004,2008 ****
labelframe $id.s_r -text "messages" -padx 5 -pady 4 -borderwidth 1 \
! 		  -font highlightFont
     pack $id.s_r -side top -fill x
      frame $id.s_r.paramsymto
--- 2003,2007 ----
labelframe $id.s_r -text "messages" -padx 5 -pady 4 -borderwidth 1 \
! 		  -font highlight_font
     pack $id.s_r -side top -fill x
      frame $id.s_r.paramsymto
***************
*** 2303,2312 ****
      set var_iemgui_gn_f [concat iemgui_gn_f_$vid]
      global $var_iemgui_gn_f
! 	 global fontweight
set $var_iemgui_gn_f $gn_f
switch -- $gn_f {
! 		  0 { set current_font "Bitstream Vera Sans Mono"}
    	  1 { set current_font "Helvetica" }
    	  2 { set current_font "Times" }
--- 2302,2311 ----
      set var_iemgui_gn_f [concat iemgui_gn_f_$vid]
      global $var_iemgui_gn_f
! 	 global fontname fontweight
set $var_iemgui_gn_f $gn_f
switch -- $gn_f {
! 		  0 { set current_font $fontname}
    	  1 { set current_font "Helvetica" }
    	  2 { set current_font "Times" }
***************
*** 2465,2469 ****
global pd_nt
! 	 global fontweight
set var_iemgui_wdt [concat iemgui_wdt_$vid]
--- 2464,2468 ----
global pd_nt
! 	 global fontname fontweight
set var_iemgui_wdt [concat iemgui_wdt_$vid]
***************
*** 2621,2625 ****
     pack $id.spacer0 -side top
! 	 labelframe $id.s_r -borderwidth 1 -pady 4 -text "messages" -font highlightFont
     pack $id.s_r -side top -fill x -ipadx 5
      frame $id.s_r.send
--- 2620,2625 ----
     pack $id.spacer0 -side top
! 	 labelframe $id.s_r -borderwidth 1 -pady 4 -text "messages" \
!         -font highlight_font
     pack $id.s_r -side top -fill x -ipadx 5
      frame $id.s_r.send
***************
*** 2638,2642 ****
# get the current font name from the int given from C-space (gn_f)
! 	 set current_font "Bitstream Vera Sans Mono"
      if {[eval concat $$var_iemgui_gn_f] == 1} \
    	  { set current_font "Helvetica" }
--- 2638,2642 ----
# get the current font name from the int given from C-space (gn_f)
! 	 set current_font $fontname
      if {[eval concat $$var_iemgui_gn_f] == 1} \
    	  { set current_font "Helvetica" }
***************
*** 2648,2652 ****
labelframe $id.label -borderwidth 1 -text "label" -pady 4 \
! 		  -font highlightFont
     pack $id.label -side top -fill x
      entry $id.label.name_entry -textvariable $var_iemgui_gui_nam -width 30 \
--- 2648,2652 ----
labelframe $id.label -borderwidth 1 -text "label" -pady 4 \
! 		  -font highlight_font
     pack $id.label -side top -fill x
      entry $id.label.name_entry -textvariable $var_iemgui_gui_nam -width 30 \
***************
*** 2673,2678 ****
     menu $id.popup
     $id.popup add command \
! 		  -label "Bitstream Vera Sans Mono" \
! 		  -font [format {{Bitstream Vera Sans Mono} 12 %s} $fontweight] \
    	  -command "iemgui_toggle_font $id 0" 
     $id.popup add command \
--- 2673,2678 ----
     menu $id.popup
     $id.popup add command \
! 		  -label $fontname \
! 		  -font [format {{%s} 12 %s} $fontname $fontweight] \
    	  -command "iemgui_toggle_font $id 0" 
     $id.popup add command \
***************
*** 2690,2694 ****
     pack $id.spacer2 -side top
!     labelframe $id.colors -borderwidth 1 -text "colors" -font highlightFont
      pack $id.colors -fill x -ipadx 5 -ipady 4
--- 2690,2694 ----
     pack $id.spacer2 -side top
!     labelframe $id.colors -borderwidth 1 -text "colors" -font highlight_font
      pack $id.colors -fill x -ipadx 5 -ipady 4
***************
*** 3309,3314 ****
  ############ pdtk_text_new -- create a new text object #2###########
  proc pdtk_text_new {canvasname myname x y text font color} {
- #    if {$font < 13} {set fontname [format {{Bitstream Vera Sans Mono} %d normal} $font]}
- #    if {$font >= 13} {set fontname [format {{Bitstream Vera Sans Mono} %d normal} $font]}
global pd_font1 pd_font2 pd_font3 pd_font4 pd_font5 pd_font6 pd_font7 
--- 3309,3312 ----
***************
*** 3356,3360 ****
# tb: user defined typefaces
! proc pdtk_pd_startup {apilist midiapilist fontname fontweight_from_pd} {
  #    puts stderr [concat $apilist $midiapilist $fontname]
      global pd_apilist pd_midiapilist 
--- 3354,3358 ----
# tb: user defined typefaces
! proc pdtk_pd_startup {apilist midiapilist fontname_from_pd fontweight_from_pd} {
  #    puts stderr [concat $apilist $midiapilist $fontname]
      global pd_apilist pd_midiapilist 
***************
*** 3362,3366 ****
      set pd_midiapilist $midiapilist
      global pd_font1 pd_font2 pd_font3 pd_font4 pd_font5 pd_font6 pd_font7
! 	 global fontweight
     set fontweight $fontweight_from_pd
--- 3360,3365 ----
      set pd_midiapilist $midiapilist
      global pd_font1 pd_font2 pd_font3 pd_font4 pd_font5 pd_font6 pd_font7
! 	 global fontname fontweight
! 	 set fontname $fontname_from_pd
     set fontweight $fontweight_from_pd

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

[PD-cvs] pd/src u_main.tk,1.17.2.14,1.17.2.15