[PD-cvs] pd/src desire.tk,1.1.2.412,1.1.2.413
chunlee
chunlee at users.sourceforge.net
Mon Aug 28 04:30:26 CEST 2006
Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30894
Modified Files:
Tag: devel_0_39
desire.tk
Log Message:
trivial commit to font editor
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.412
retrieving revision 1.1.2.413
diff -C2 -d -r1.1.2.412 -r1.1.2.413
*** desire.tk 27 Aug 2006 00:15:47 -0000 1.1.2.412
--- desire.tk 28 Aug 2006 02:30:23 -0000 1.1.2.413
***************
*** 5120,5124 ****
}
! def* Dialog add_fontbomb {f args} {
set no_max_label 0
bind all <KeyPress-F1> help
--- 5120,5124 ----
}
! def Dialog add_fontbomb {f args} {
set no_max_label 0
bind all <KeyPress-F1> help
***************
*** 5135,5139 ****
pack [label $f.font.label -text "Name:" -anchor w] -side top -fill x
frame $f.font.list
- puts " $f.font.list.box"
pack [listbox $f.font.list.box -relief sunken -yscrollcommand "$f.font.list.scroll set"] -side left
pack [scrollbar $f.font.list.scroll -relief sunken -command "$f.font.list.box yview"] -side right -fill y
--- 5135,5138 ----
***************
*** 5159,5196 ****
frame $f.font2.preview
pack [label $f.font2.preview.label -text "Preview:"] -side left -fill y
! pack [canvas $f.font2.preview.canvas -width 200 -height 50 -relief sunken -borderwidth 1] -side right
$f.font2.preview.canvas create text 10 25 -tags ${self}TEXT -anchor w -text "DesireData" -font $@fstr
-
- pack $f.font.list -side left -fill y
- pack $f.font.size -side top -fill x
- pack $f.font.style -side top -fill x
- pack $f.font2.preview -side bottom
- pack $f.font -side top
- pack $f.font2 -side bottom
- #foreach row $args {
- #set name [lindex $row 0]
- #set type [lindex $row 1]
- #set options [lrange $row 2 end]
- #set f $w.$name
- #set label "[say $name]: "
- #set k [lsearch $options -choices]
- #puts " name: $name | type: $type | option: $options | k: $k"
- #if {$k>=0} {
- # set choices [lindex $options [expr $k+1]]
- # set options [lreplace $options $k [expr $k+1]]
- #}
- #set v $@$name
- #set v $_($self:$name) ;# bug in objtcl
-
- #pack $f -side top -fill x
! #if {!$no_max_label} {
! # catch {$f.label configure -width $_($self:max_label) -anchor e}
! #}
! #}
}
! def* Dialog font_get_xlfd {f name style size} {
set fstring ""
set list_pos [$f.font.list.box curselection]
--- 5158,5180 ----
frame $f.font2.preview
pack [label $f.font2.preview.label -text "Preview:"] -side left -fill y
! pack [canvas $f.font2.preview.canvas -width 200 -height 50 -relief sunken -borderwidth 1] -side left -fill x
$f.font2.preview.canvas create text 10 25 -tags ${self}TEXT -anchor w -text "DesireData" -font $@fstr
+ set parent [string range $f 1 [expr [string first "." $f 1]-1]]
+ if {$parent == "ddrc"} {
+ set padx 150; set pady 20; set padx2 50; set pady2 5
+ } else {
+ set padx 0; set pady 0; set padx2 0; set pady2 0
+ }
! pack $f.font.list -side left -fill y
! pack $f.font.size -side top -fill x -padx $padx2 -pady $pady2
! pack $f.font.style -side top -fill x -padx $padx2 -pady $pady2
! pack $f.font2.preview -side bottom -fill x
! pack $f.font -side top -fill both -padx $padx -pady $pady
! pack $f.font2 -side bottom -fill x -padx $padx -pady $pady
}
! def Dialog font_get_xlfd {f name style size} {
set fstring ""
set list_pos [$f.font.list.box curselection]
***************
*** 5215,5219 ****
}
! def* Dialog font_update {f} {
global font
$self font_get_xlfd $f $@font $@style $@size
--- 5199,5203 ----
}
! def Dialog font_update {f} {
global font
$self font_get_xlfd $f $@font $@style $@size
***************
*** 5221,5225 ****
}
! def* Dialog font_changesize {f y} {
#set f .$self
set @size [expr $@size - $y]
--- 5205,5209 ----
}
! def Dialog font_changesize {f y} {
#set f .$self
set @size [expr $@size - $y]
***************
*** 5229,5233 ****
}
! def* Dialog font_style {f style} {
if {$style != "italic"} {
if {$style == $@style} { set @style "normal" } else { set @style $style}
--- 5213,5217 ----
}
! def Dialog font_style {f style} {
if {$style != "italic"} {
if {$style == $@style} { set @style "normal" } else { set @style $style}
***************
*** 5236,5240 ****
}
! def* Dialog font_update_size {f} {
set size [$f.font.size.entry get]
if [regexp {^[0-9]+$} $size] {set @size $size}
--- 5220,5224 ----
}
! def Dialog font_update_size {f} {
set size [$f.font.size.entry get]
if [regexp {^[0-9]+$} $size] {set @size $size}
***************
*** 5761,5765 ****
#proc car {l} { lindex $l 0} }
#proc cdr {l} { lindex $l 1 }
!
#this writes the ddrc
def* ClientPrefsDialog write {} {
--- 5745,5749 ----
#proc car {l} { lindex $l 0} }
#proc cdr {l} { lindex $l 1 }
!
#this writes the ddrc
def* ClientPrefsDialog write {} {
***************
*** 5788,5792 ****
while {$x>=0} {
foreach y [lindex $tmp [expr $x+1]] {
! if {$sub != "key"} {set str "look($class:$y)"
} else {set str "key($class:$y)"}
if {[info exists $str]} {
--- 5772,5776 ----
while {$x>=0} {
foreach y [lindex $tmp [expr $x+1]] {
! if {$sub != "key"} {set str "look($class:$y)"; puts "$class:$y"
} else {set str "key($class:$y)"}
if {[info exists $str]} {
***************
*** 5794,5798 ****
#lappend tmp2 $y
#lappend tmp2 [set [set str]]
! }
}
set x [lsearch -start [expr $x+1] $tmp $class]
--- 5778,5782 ----
#lappend tmp2 $y
#lappend tmp2 [set [set str]]
! } else {puts "not exists::: $str"}
}
set x [lsearch -start [expr $x+1] $tmp $class]
***************
*** 6021,6025 ****
def* FontBombDialog apply {} {
global look
! $self get_xlfd $@font $@style $@size
set look(Thing:fontsize) $@size
set look(Thing:fontfamily) $@font
--- 6005,6009 ----
def* FontBombDialog apply {} {
global look
! $self font_get_xlfd .$self $@font $@style $@size
set look(Thing:fontsize) $@size
set look(Thing:fontfamily) $@font
More information about the Pd-cvs
mailing list