Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3279
Modified Files: Tag: devel_0_39 desire.tk defaults.ddrc Log Message: removed fontwidth and fontheight, ddrc_options reindented
Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.426 retrieving revision 1.1.2.427 diff -C2 -d -r1.1.2.426 -r1.1.2.427 *** desire.tk 30 Aug 2006 03:58:36 -0000 1.1.2.426 --- desire.tk 30 Aug 2006 13:32:13 -0000 1.1.2.427 *************** *** 913,918 **** set look(View:fontstring) "$fstring-$ital-normal--$size-*" set look(View:fontstring2) "$fstring-$ital-normal--%d-*" ! set look(View:fontwidth) [font measure $look(View:fontstring) W] ! set look(View:fontheight) [font metrics $look(View:fontstring) -linespace] } #-----------------------------------------------------------------------------------# --- 913,918 ---- set look(View:fontstring) "$fstring-$ital-normal--$size-*" set look(View:fontstring2) "$fstring-$ital-normal--%d-*" ! #set look(View:fontwidth) [font measure $look(View:fontstring) W] ! #set look(View:fontheight) [font metrics $look(View:fontstring) -linespace] } #-----------------------------------------------------------------------------------# *************** *** 1633,1637 **** set n [string length $@text] set padx [$self look fontpadx];set pady [$self look fontpady] ! set width [$self look fontwidth];set height [$self look fontheight] set textwidth [expr $padx+$width*($n+$@edit)] if {[llength [.$@canvas.c gettags ${self}TEXT]]} { --- 1633,1639 ---- set n [string length $@text] set padx [$self look fontpadx];set pady [$self look fontpady] ! set width [font measure [$self look fontstring] W] ! set height [font metrics [$self look fontstring] -linespace] ! #set width [$self look fontwidth];set height [$self look fontheight] set textwidth [expr $padx+$width*($n+$@edit)] if {[llength [.$@canvas.c gettags ${self}TEXT]]} { *************** *** 3595,3599 **** if {!$@w} {set @w 5} set padx [$self look fontpadx];set pady [$self look fontpady] ! set width [$self look fontwidth];set height [$self look fontheight] set textwidth [expr $padx+$width*$@w] set topwidth [expr (2* $@ninlets-1) * [$self look iowidth]] --- 3597,3603 ---- if {!$@w} {set @w 5} set padx [$self look fontpadx];set pady [$self look fontpady] ! set width [font measure [$self look fontstring] W] ! set height [font metrics [$self look fontstring] -linespace] ! #set width [$self look fontwidth];set height [$self look fontheight] set textwidth [expr $padx+$width*$@w] set topwidth [expr (2* $@ninlets-1) * [$self look iowidth]] *************** *** 3653,3657 **** global font set padx [$self look fontpadx];set pady [$self look fontpady] ! set width [$self look fontwidth];set height [$self look fontheight] set textwidth [expr $padx+$width*[string length $@buf]] set topwidth [expr (2* $@ninlets-1) * [$self look iowidth]] --- 3657,3663 ---- global font set padx [$self look fontpadx];set pady [$self look fontpady] ! set width [font measure [$self look fontstring] W] ! set height [font metrics [$self look fontstring] -linespace] ! #set width [$self look fontwidth];set height [$self look fontheight] set textwidth [expr $padx+$width*[string length $@buf]] set topwidth [expr (2* $@ninlets-1) * [$self look iowidth]] *************** *** 5529,5600 **** #################### ClientPrefsDialog set ddrc_options { ! section Client section_color ! subsection Client canvas_color ! color Canvas bgedit ! color Canvas bgrun ! subsection Client object_color ! color View bg ! color View fg ! color View frame1 ! color View frame2 ! color View frame3 ! color Comment bg ! color Comment fg ! color Comment frame1 ! color Comment frame2 ! color Comment frame3 ! color View selectframe ! subsection Client wire_color ! color Wire fg ! color Wire dspfg ! color Wire fg2 ! color FutureWire dash ! subsection Client others_color ! color View inletfg ! color View outletfg ! color SelRect rect ! section Client keys ! subsection Client put ! key Canvas Object ! key Canvas Message ! key Canvas Number ! key Canvas Symbol ! key Canvas Comment ! key Canvas Bang ! key Canvas Toggle ! key Canvas Number2 ! key Canvas {Vslider Hslider} ! key Canvas {Vradio Hradio} ! key Canvas Canvas ! key Canvas Array ! subsection Client edit ! key Canvas {cut copy} ! key Canvas {undo redo} ! key Canvas paste ! key Canvas select_all ! key Canvas {reload redraw} ! key Canvas editmodeswitch ! subsection Client general ! key Canvas Pdwindow ! key Canvas {new_file open_file} ! key Canvas {save save_as} ! key Client {pdrc_editor ddrc_editor} ! key Canvas {close quit} ! key Canvas {find find_again} ! key Canvas {audio_on audio_off} ! key Client {audio_settings midi_settings} ! key Client test_audio_and_midi ! key Canvas {load_meter latency_meter} ! key Canvas about ! section Client font ! font Thing fontsize ! font Thing fontfamily ! font Thing fontstyle ! font Thing fontitalic ! section Client others ! crosshair Canvas hairstate ! crosshair Canvas hairsnap ! bar Canvas buttonbar ! bar Canvas statusbar }
--- 5535,5606 ---- #################### ClientPrefsDialog set ddrc_options { ! section Client section_color ! subsection Client canvas_color ! color Canvas bgedit ! color Canvas bgrun ! subsection Client object_color ! color View bg ! color View fg ! color View frame1 ! color View frame2 ! color View frame3 ! color Comment bg ! color Comment fg ! color Comment frame1 ! color Comment frame2 ! color Comment frame3 ! color View selectframe ! subsection Client wire_color ! color Wire fg ! color Wire dspfg ! color Wire fg2 ! color FutureWire dash ! subsection Client others_color ! color View inletfg ! color View outletfg ! color SelRect rect ! section Client keys ! subsection Client put ! key Canvas Object ! key Canvas Message ! key Canvas Number ! key Canvas Symbol ! key Canvas Comment ! key Canvas Bang ! key Canvas Toggle ! key Canvas Number2 ! key Canvas {Vslider Hslider} ! key Canvas {Vradio Hradio} ! key Canvas Canvas ! key Canvas Array ! subsection Client edit ! key Canvas {cut copy} ! key Canvas {undo redo} ! key Canvas paste ! key Canvas select_all ! key Canvas {reload redraw} ! key Canvas editmodeswitch ! subsection Client general ! key Canvas Pdwindow ! key Canvas {new_file open_file} ! key Canvas {save save_as} ! key Client {pdrc_editor ddrc_editor} ! key Canvas {close quit} ! key Canvas {find find_again} ! key Canvas {audio_on audio_off} ! key Client {audio_settings midi_settings} ! key Client test_audio_and_midi ! key Canvas {load_meter latency_meter} ! key Canvas about ! section Client font ! font Thing fontsize ! font Thing fontfamily ! font Thing fontstyle ! font Thing fontitalic ! section Client others ! crosshair Canvas hairstate ! crosshair Canvas hairsnap ! bar Canvas buttonbar ! bar Canvas statusbar }
Index: defaults.ddrc =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/defaults.ddrc,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** defaults.ddrc 30 Aug 2006 03:58:37 -0000 1.1.2.2 --- defaults.ddrc 30 Aug 2006 13:32:13 -0000 1.1.2.3 *************** *** 37,41 **** fg #000000 fontfamily courier - fontheight 13 fontitalic 0 fontpadx 5 --- 37,40 ---- *************** *** 45,49 **** fontstring2 *-courier-medium-r-normal--%d-* fontstyle normal - fontwidth 7 frame1 #99cccc frame2 #668888 --- 44,47 ----