[PD-cvs] pd/src u_main.tk,1.4.4.10.2.2,1.4.4.10.2.3

[carmen rocco]

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

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


Index: u_main.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v
retrieving revision 1.4.4.10.2.2
retrieving revision 1.4.4.10.2.3
diff -C2 -d -r1.4.4.10.2.2 -r1.4.4.10.2.3
*** u_main.tk	19 Jun 2005 03:18:59 -0000	1.4.4.10.2.2
--- u_main.tk	19 Jun 2005 05:05:03 -0000	1.4.4.10.2.3
***************
*** 96,99 ****
--- 96,100 ----
  # the menus are instantiated here for the main window
  # for the patch windows, they are created by pdtk_canvas_new
+ option add *font {{Bitstream Vera Sans} 10}
  menu .mbar
  canvas .dummy -height 2p -width 6c
***************
*** 212,221 ****
  
  namespace eval ::pdtheme {
!     set ::pdtheme::arrow last
!     array set colors "border purple bg white box green line gray50 object green message orange inlet purple outlet red atom yellow graph red text black selected #ff049b lasso green"
!     foreach element [array names colors] {
! 	eval "set ::pdtheme::$element $colors($element)"
!     }
! }
  
  ################ utility functions #########################
--- 213,219 ----
  
  namespace eval ::pdtheme {
!     array set theme "border purple bg white box green line gray50 arrow last object green message orange inlet purple outlet red atom yellow graph red text black selected #ff049b lasso green fontweight normal"
!     foreach element [array names theme] {
! 	eval "set ::pdtheme::$element $theme($element)"}}
  
  ################ utility functions #########################
***************
*** 3212,3222 ****
  	global pd_font1 pd_font2 pd_font3 pd_font4 pd_font5 pd_font6 pd_font7
  
! 	set pd_font1 [format -*-%s-bold--normal--8-* $fontname]
! 	set pd_font2 [format -*-%s-bold--normal--10-* $fontname]
!  	set pd_font3 [format -*-%s-bold--normal--12-* $fontname]
!  	set pd_font4 [format -*-%s-bold--normal--14-* $fontname]
! 	set pd_font5 [format -*-%s-bold--normal--16-* $fontname]
! 	set pd_font6 [format -*-%s-bold--normal--24-* $fontname]
! 	set pd_font7 [format -*-%s-bold--normal--36-* $fontname]
  
      set width1 [font measure  $pd_font1 x]
--- 3210,3221 ----
  	global pd_font1 pd_font2 pd_font3 pd_font4 pd_font5 pd_font6 pd_font7
  
!     
! 	set pd_font1 [format -*-%s-$::pdtheme::fontweight--normal--8-* $fontname]
! 	set pd_font2 [format -*-%s-$::pdtheme::fontweight--normal--10-* $fontname]
!  	set pd_font3 [format -*-%s-$::pdtheme::fontweight--normal--12-* $fontname]
!  	set pd_font4 [format -*-%s-$::pdtheme::fontweight--normal--14-* $fontname]
! 	set pd_font5 [format -*-%s-$::pdtheme::fontweight--normal--16-* $fontname]
! 	set pd_font6 [format -*-%s-$::pdtheme::fontweight--normal--24-* $fontname]
! 	set pd_font7 [format -*-%s-$::pdtheme::fontweight--normal--36-* $fontname]
  
      set width1 [font measure  $pd_font1 x]