Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10523
Modified Files:
Tag: branch-v0-39-2-extended
u_main.tk
Log Message:
switched to DejaVu Sans Mono; brought back the Apply button on Mac, we'll deal with that later; tweaked properties panel
Index: u_main.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v
retrieving revision 1.17.2.5
retrieving revision 1.17.2.6
diff -C2 -d -r1.17.2.5 -r1.17.2.6
*** u_main.tk 8 Jan 2007 06:08:56 -0000 1.17.2.5
--- u_main.tk 30 Jan 2007 00:57:07 -0000 1.17.2.6
***************
*** 45,54 ****
# turn on James Tittle II's fast drawing
set tk::mac::useCGDrawing 1
! # set minimum line size for anti-aliasing. If set to 1 or 0, then every
! # line will be anti-aliased. While this makes connections and circles in
! # [bng] and such look really good, it makes boxes and messages look out of
! # focus. Setting this to 2 makes it so the thick audio rate connections
! # are anti-aliased. <hans(a)at.or.at> 2005-06-09
! set tk::mac::CGAntialiasLimit 2
global pd_guidir
global pd_tearoff
--- 45,50 ----
# turn on James Tittle II's fast drawing
set tk::mac::useCGDrawing 1
! # anti-alias all lines that need it
! set tk::mac::CGAntialiasLimit 0
global pd_guidir
global pd_tearoff
***************
*** 173,177 ****
frame .printout
! text .printout.text -relief raised -bd 2 -font {{Bitstream Vera Sans Mono} 12 normal} \
-yscrollcommand ".printout.scroll set" -width 80
# .printout.text insert end "\n\n\n\n\n\n\n\n\n\n"
--- 169,173 ----
frame .printout
! text .printout.text -relief raised -bd 2 -font {{DejaVu Sans Mono} 12 normal} \
-yscrollcommand ".printout.scroll set" -width 80
# .printout.text insert end "\n\n\n\n\n\n\n\n\n\n"
***************
*** 1267,1271 ****
-selectmode extended \
-relief solid -background white -borderwidth 1 \
! -font [format {{Bitstream Vera Sans Mono} %d normal} \
$font] \
-yscrollcommand "$windowName.lb.sb set"]
--- 1263,1267 ----
-selectmode extended \
-relief solid -background white -borderwidth 1 \
! -font [format {{DejaVu Sans Mono} %d normal} \
$font] \
-yscrollcommand "$windowName.lb.sb set"]
***************
*** 1386,1390 ****
set y [expr [lindex $bbox 1] - 4]
set $lbName.entry [entry $lbName.entry \
! -font [format {{Bitstream Vera Sans Mono} %d normal} $font]]
$lbName.entry insert 0 []
place configure $lbName.entry -relx 0 -y $y -relwidth 1
--- 1382,1386 ----
set y [expr [lindex $bbox 1] - 4]
set $lbName.entry [entry $lbName.entry \
! -font [format {{DejaVu Sans Mono} %d normal} $font]]
$lbName.entry insert 0 []
place configure $lbName.entry -relx 0 -y $y -relwidth 1
***************
*** 1918,1922 ****
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
--- 1914,1918 ----
labelframe $id.limits -text "limits" -padx 15 -pady 4 -borderwidth 1 \
! -font {{DejaVu Sans Mono} 12 bold}
pack $id.limits -side top -fill x
frame $id.limits.lower
***************
*** 1937,1941 ****
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
--- 1933,1937 ----
labelframe $id.label -text "label" -padx 5 -pady 4 -borderwidth 1 \
! -font {{DejaVu Sans Mono} 12 bold}
pack $id.label -side top -fill x
frame $id.label.name
***************
*** 1966,1970 ****
labelframe $id.s_r -text "messages" -padx 5 -pady 4 -borderwidth 1 \
! -font {{Bitstream Vera Sans Mono} 12 bold}
pack $id.s_r -side top -fill x
frame $id.s_r.paramsymto
--- 1962,1966 ----
labelframe $id.s_r -text "messages" -padx 5 -pady 4 -borderwidth 1 \
! -font {{DejaVu Sans Mono} 12 bold}
pack $id.s_r -side top -fill x
frame $id.s_r.paramsymto
***************
*** 1985,1994 ****
-command "dogatom_cancel $id"
pack $id.buttonframe.cancel -side left -expand 1
- # Mac OS X doesn't use Apply buttons
- if {$pd_nt != 2} {
button $id.buttonframe.apply -text {Apply}\
-command "dogatom_apply $id"
pack $id.buttonframe.apply -side left -expand 1
- }
button $id.buttonframe.ok -text {OK}\
-command "dogatom_ok $id"
--- 1981,1987 ----
***************
*** 2272,2276 ****
switch -- $gn_f {
! 0 { set current_font "Bitstream Vera Sans Mono"}
1 { set current_font "Helvetica" }
2 { set current_font "Times" }
--- 2265,2269 ----
switch -- $gn_f {
! 0 { set current_font "DejaVu Sans Mono"}
1 { set current_font "Helvetica" }
2 { set current_font "Times" }
***************
*** 2278,2284 ****
set current_font_spec "{$current_font} 12 normal"
! $id.label.font.popup_label configure -text $current_font \
-font $current_font_spec
! $id.label.name.entry configure -font $current_font_spec
$id.colors.sections.fr_bk configure -font $current_font_spec
$id.colors.sections.lb_bk configure -font $current_font_spec
--- 2271,2277 ----
set current_font_spec "{$current_font} 12 normal"
! $id.label.fontpopup_label configure -text $current_font \
-font $current_font_spec
! $id.label.name_entry configure -font $current_font_spec
$id.colors.sections.fr_bk configure -font $current_font_spec
$id.colors.sections.lb_bk configure -font $current_font_spec
***************
*** 2585,2590 ****
labelframe $id.s_r -borderwidth 1 -pady 4 -text "messages" \
! -font {{Bitstream Vera Sans Mono} 12 bold}
! pack $id.s_r -side top -fill x
frame $id.s_r.send
pack $id.s_r.send -side top
--- 2578,2583 ----
labelframe $id.s_r -borderwidth 1 -pady 4 -text "messages" \
! -font {{DejaVu Sans Mono} 12 bold}
! pack $id.s_r -side top -fill x -ipadx 5
frame $id.s_r.send
pack $id.s_r.send -side top
***************
*** 2602,2606 ****
# 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" }
--- 2595,2599 ----
# get the current font name from the int given from C-space (gn_f)
! set current_font "DejaVu Sans Mono"
if {[eval concat $$var_iemgui_gn_f] == 1} \
{ set current_font "Helvetica" }
***************
*** 2612,2646 ****
labelframe $id.label -borderwidth 1 -text "label" -pady 4 \
! -font {{Bitstream Vera Sans Mono} 12 bold}
pack $id.label -side top -fill x
! frame $id.label.name
! pack $id.label.name -side top
! label $id.label.name.label -text "name:" -width 4 -pady 6
! entry $id.label.name.entry -textvariable $var_iemgui_gui_nam -width 30 \
-font [list $current_font 12 normal]
! pack $id.label.name.label $id.label.name.entry -side left
frame $id.label.xy -padx 27 -pady 1
pack $id.label.xy -side top
! label $id.label.xy.x_lab -text "x_off:" -width 6
entry $id.label.xy.x_entry -textvariable $var_iemgui_gn_dx -width 5
label $id.label.xy.dummy1 -text " " -width 2
! label $id.label.xy.y_lab -text "y_off:" -width 6
entry $id.label.xy.y_entry -textvariable $var_iemgui_gn_dy -width 5
pack $id.label.xy.x_lab $id.label.xy.x_entry $id.label.xy.dummy1 \
! $id.label.xy.y_lab $id.label.xy.y_entry -side left
! frame $id.label.font
! pack $id.label.font -side top
! label $id.label.font.popup_label -text $current_font -width 25 \
! -relief groove -font {$current_font 12 normal} -padx 0 -pady 1
! label $id.label.font.size_label -text "size:" -width 4 -pady 6
! entry $id.label.font.size_entry -textvariable $var_iemgui_gn_fs -width 4
! pack $id.label.font.popup_label $id.label.font.size_label \
! $id.label.font.size_entry -side left
menu $id.popup
$id.popup add command \
! -label "Bitstream Vera Sans Mono" \
! -font {{Bitstream Vera Sans Mono} 12 normal} \
-command "iemgui_toggle_font $id 0"
$id.popup add command \
--- 2605,2635 ----
labelframe $id.label -borderwidth 1 -text "label" -pady 4 \
! -font {{DejaVu Sans Mono} 12 bold}
pack $id.label -side top -fill x
! entry $id.label.name_entry -textvariable $var_iemgui_gui_nam -width 30 \
-font [list $current_font 12 normal]
! pack $id.label.name_entry -side top -expand yes -fill both -padx 5
frame $id.label.xy -padx 27 -pady 1
pack $id.label.xy -side top
! label $id.label.xy.x_lab -text "x offset" -width 6
entry $id.label.xy.x_entry -textvariable $var_iemgui_gn_dx -width 5
label $id.label.xy.dummy1 -text " " -width 2
! label $id.label.xy.y_lab -text "y offset" -width 6
entry $id.label.xy.y_entry -textvariable $var_iemgui_gn_dy -width 5
pack $id.label.xy.x_lab $id.label.xy.x_entry $id.label.xy.dummy1 \
! $id.label.xy.y_lab $id.label.xy.y_entry -side left -anchor e
! label $id.label.fontpopup_label -text $current_font \
! -relief groove -font {$current_font 12 normal} -padx 5
! pack $id.label.fontpopup_label -side left -anchor w -expand yes -fill x
! label $id.label.fontsize_label -text "size" -width 4
! entry $id.label.fontsize_entry -textvariable $var_iemgui_gn_fs -width 5
! pack $id.label.fontsize_entry $id.label.fontsize_label \
! -side right -anchor e -padx 5 -pady 5
menu $id.popup
$id.popup add command \
! -label "DejaVu Sans Mono" \
! -font {{DejaVu Sans Mono} 12 normal} \
-command "iemgui_toggle_font $id 0"
$id.popup add command \
***************
*** 2652,2656 ****
-font {Times 12 normal} \
-command "iemgui_toggle_font $id 2"
! bind $id.label.font.popup_label <Button> \
[list tk_popup $id.popup %X %Y]
--- 2641,2645 ----
-font {Times 12 normal} \
-command "iemgui_toggle_font $id 2"
! bind $id.label.fontpopup_label <Button> \
[list tk_popup $id.popup %X %Y]
***************
*** 2658,2664 ****
pack $id.spacer2 -side top
! labelframe $id.colors -borderwidth 1 -pady 4 -text "colors" \
! -font {{Bitstream Vera Sans Mono} 12 bold}
! pack $id.colors -fill x
frame $id.colors.select
--- 2647,2653 ----
pack $id.spacer2 -side top
! labelframe $id.colors -borderwidth 1 -text "colors" \
! -font {{DejaVu Sans Mono} 12 bold}
! pack $id.colors -fill x -ipadx 5 -ipady 4
frame $id.colors.select
***************
*** 2673,2683 ****
pack $id.colors.select.radio0 $id.colors.select.radio1 \
$id.colors.select.radio2 -side left
! } else {pack $id.colors.select.radio0 $id.colors.select.radio2 -side left}
frame $id.colors.sections
pack $id.colors.sections -side top
button $id.colors.sections.but -text "compose color" -width 12 \
! -command "iemgui_choose_col_bkfrlb $id" -pady 5
! label $id.colors.sections.dummy1 -text "" -width 1
if { [eval concat $$var_iemgui_fcol] >= 0 } {
label $id.colors.sections.fr_bk -text "o=||=o" -width 6 \
--- 2662,2675 ----
pack $id.colors.select.radio0 $id.colors.select.radio1 \
$id.colors.select.radio2 -side left
! } else {
! pack $id.colors.select.radio0 $id.colors.select.radio2 -side left \
! }
frame $id.colors.sections
pack $id.colors.sections -side top
button $id.colors.sections.but -text "compose color" -width 12 \
! -command "iemgui_choose_col_bkfrlb $id"
! pack $id.colors.sections.but -side left -anchor w -padx 10 -pady 5 \
! -expand yes -fill x
if { [eval concat $$var_iemgui_fcol] >= 0 } {
label $id.colors.sections.fr_bk -text "o=||=o" -width 6 \
***************
*** 2701,2711 ****
-activeforeground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] \
-font {$current_font 12 normal} -padx 2 -pady 2 -relief ridge
!
! pack $id.colors.sections.but $id.colors.sections.dummy1 \
! $id.colors.sections.fr_bk $id.colors.sections.lb_bk -side left
!
! frame $id.colors.preset_spacer -pady 7
! pack $id.colors.preset_spacer -side top
!
frame $id.colors.r1
pack $id.colors.r1 -side top
--- 2693,2699 ----
-activeforeground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] \
-font {$current_font 12 normal} -padx 2 -pady 2 -relief ridge
! pack $id.colors.sections.lb_bk $id.colors.sections.fr_bk \
! -side right -anchor e -expand yes -fill both -pady 7
!
frame $id.colors.r1
pack $id.colors.r1 -side top
***************
*** 2766,2780 ****
-command "iemgui_cancel $id"
label $id.cao.dummy1 -text "" -width 3
! # Mac OS X doesn't use Apply buttons
! if {$pd_nt != 2 } {
! button $id.cao.apply -text {Apply} -width 6 -command "iemgui_apply $id"
! label $id.cao.dummy2 -text "" -width 3
! }
button $id.cao.ok -text {OK} -width 6 \
-command "iemgui_ok $id"
pack $id.cao.cancel $id.cao.dummy1 -side left
! # Mac OS X doesn't use Apply buttons
! if {$pd_nt != 2 } { pack $id.cao.apply $id.cao.dummy2 -side left }
pack $id.cao.ok -side left
--- 2754,2764 ----
-command "iemgui_cancel $id"
label $id.cao.dummy1 -text "" -width 3
! button $id.cao.apply -text {Apply} -width 6 -command "iemgui_apply $id"
! label $id.cao.dummy2 -text "" -width 3
button $id.cao.ok -text {OK} -width 6 \
-command "iemgui_ok $id"
pack $id.cao.cancel $id.cao.dummy1 -side left
! pack $id.cao.apply $id.cao.dummy2 -side left
pack $id.cao.ok -side left
***************
*** 2794,2801 ****
bind $id.s_r.send.ent <KeyPress-Return> [concat iemgui_ok $id]
bind $id.s_r.receive.ent <KeyPress-Return> [concat iemgui_ok $id]
! bind $id.label.name.entry <KeyPress-Return> [concat iemgui_ok $id]
bind $id.label.xy.x_entry <KeyPress-Return> [concat iemgui_ok $id]
bind $id.label.xy.y_entry <KeyPress-Return> [concat iemgui_ok $id]
! bind $id.label.font.size_entry <KeyPress-Return> [concat iemgui_ok $id]
bind $id.cao.ok <KeyPress-Return> [concat iemgui_ok $id]
pdtk_standardkeybindings $id.dim.w_ent
--- 2778,2785 ----
bind $id.s_r.send.ent <KeyPress-Return> [concat iemgui_ok $id]
bind $id.s_r.receive.ent <KeyPress-Return> [concat iemgui_ok $id]
! bind $id.label.name_entry <KeyPress-Return> [concat iemgui_ok $id]
bind $id.label.xy.x_entry <KeyPress-Return> [concat iemgui_ok $id]
bind $id.label.xy.y_entry <KeyPress-Return> [concat iemgui_ok $id]
! bind $id.label.fontsize_entry <KeyPress-Return> [concat iemgui_ok $id]
bind $id.cao.ok <KeyPress-Return> [concat iemgui_ok $id]
pdtk_standardkeybindings $id.dim.w_ent
***************
*** 2806,2813 ****
pdtk_standardkeybindings $id.s_r.send.ent
pdtk_standardkeybindings $id.s_r.receive.ent
! pdtk_standardkeybindings $id.label.name.entry
pdtk_standardkeybindings $id.label.xy.x_entry
pdtk_standardkeybindings $id.label.xy.y_entry
! pdtk_standardkeybindings $id.label.font.size_entry
pdtk_standardkeybindings $id.cao.ok
--- 2790,2797 ----
pdtk_standardkeybindings $id.s_r.send.ent
pdtk_standardkeybindings $id.s_r.receive.ent
! pdtk_standardkeybindings $id.label.name_entry
pdtk_standardkeybindings $id.label.xy.x_entry
pdtk_standardkeybindings $id.label.xy.y_entry
! pdtk_standardkeybindings $id.label.fontsize_entry
pdtk_standardkeybindings $id.cao.ok
***************
*** 2922,2935 ****
if {$newone != 0} {
! frame $id.label.radio
! pack $id.label.radio -side top
! radiobutton $id.label.radio.radio0 -value 0 \
-variable $var_array_otherflag \
-text "in new graph"
! radiobutton $id.label.radio.radio1 -value 1 \
-variable $var_array_otherflag \
-text "in last graph"
! pack $id.label.radio.radio0 -side top -anchor w
! pack $id.label.radio.radio1 -side top -anchor w
} else {
checkbutton $id.deleteme -text {delete me} \
--- 2906,2919 ----
if {$newone != 0} {
! frame $id.radio
! pack $id.radio -side top
! radiobutton $id.radio.radio0 -value 0 \
-variable $var_array_otherflag \
-text "in new graph"
! radiobutton $id.radio.radio1 -value 1 \
-variable $var_array_otherflag \
-text "in last graph"
! pack $id.radio.radio0 -side top -anchor w
! pack $id.radio.radio1 -side top -anchor w
} else {
checkbutton $id.deleteme -text {delete me} \
***************
*** 3282,3287 ****
############ 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
--- 3266,3271 ----
############ 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 {{DejaVu Sans Mono} %d normal} $font]}
! # if {$font >= 13} {set fontname [format {{DejaVu Sans Mono} %d normal} $font]}
global pd_font1 pd_font2 pd_font3 pd_font4 pd_font5 pd_font6 pd_font7
