Index: tkchat.tcl
===================================================================
RCS file: /cvsroot/tcllib/tclapps/apps/tkchat/tkchat.tcl,v
retrieving revision 1.422
diff -u -r1.422 tkchat.tcl
--- tkchat.tcl 24 Mar 2008 20:12:22 -0000 1.422
+++ tkchat.tcl 5 Apr 2008 21:08:59 -0000
@@ -4615,26 +4615,26 @@
incr buildRow_seq
}
set seq $buildRow_seq
- ::tk::label $f.nm$seq -text "$disp" -anchor w -font NAME -padx 0 -pady 0
- ::tk::radiobutton $f.def$seq -padx 0 -pady 0 -font FNT -indicatoron 0 \
+ ::tk::label $f.nm$seq -text "$disp" -anchor w -padx 0 -pady 0
+ ::tk::radiobutton $f.def$seq -padx 0 -pady 0 -indicatoron 0 \
-text "default" \
-variable ::tkchat::DlgData($idx) \
-value 1 \
-foreground "#[lindex $DlgData(Color,$idx) 1]" \
-selectcolor "#[lindex $DlgData(Color,$idx) 1]"
- ::tk::radiobutton $f.inv$seq -padx 0 -pady 0 -font FNT -indicatoron 0 \
+ ::tk::radiobutton $f.inv$seq -padx 0 -pady 0 -indicatoron 0 \
-text "inverted" \
-variable ::tkchat::DlgData($idx) \
-value 2 \
-foreground "#[lindex $DlgData(Color,$idx) 2]" \
-selectcolor "#[lindex $DlgData(Color,$idx) 2]"
- ::tk::radiobutton $f.ovr$seq -padx 0 -pady 0 -font FNT -indicatoron 0 \
+ ::tk::radiobutton $f.ovr$seq -padx 0 -pady 0 -indicatoron 0 \
-text "custom" \
-variable ::tkchat::DlgData($idx) \
-value 3 \
-foreground "#[lindex $DlgData(Color,$idx) 3]" \
-selectcolor "#[lindex $DlgData(Color,$idx) 3]"
- button $f.clr$seq -padx 0 -pady 0 -font FNT \
+ button $f.clr$seq -padx 0 -pady 0 \
-text "..." \
-command [list ::tkchat::newColor $f.ovr$seq $idx]
grid $f.nm$seq $f.def$seq $f.inv$seq $f.ovr$seq $f.clr$seq \
@@ -4848,10 +4848,10 @@
wm withdraw $t
wm title $t "Color Settings"
- label $t.l1 -text "Posting Color" -font NAME
+ label $t.l1 -text "Posting Color"
label $t.l2 -text "Example Text" -background white \
-foreground \#$DlgData(MyColor) -font ACT
- button $t.myclr -text "Change..." -font FNT -command {
+ button $t.myclr -text "Change..." -command {
set tmp [tk_chooseColor \
-title "Select Your User Color" \
-initialcolor \#$::tkchat::DlgData(MyColor)]
@@ -4861,7 +4861,7 @@
}
}
- label $t.l3 -text "Display Color Overrides" -font NAME
+ label $t.l3 -text "Display Color Overrides"
frame $t.f -relief sunken -bd 2 -height 300
canvas $t.f.cvs -yscrollcommand [list $t.f.scr set] \
-width 10 -height 300 -highlightthickness 0 -bd 0
@@ -4876,7 +4876,7 @@
[winfo parent %W] configure -width [expr {%w+5}] -scrollregion [list 0 0 %w %h]
}
foreach {key str} { 1 "All\nDefault" 2 "All\nInverted" 3 "All\nCustom"} {
- button $f.all$key -text $str -padx 0 -pady 0 -font SYS -command \
+ button $f.all$key -text $str -padx 0 -pady 0 -command \
[string map [list %val% $key] {
foreach idx [array names DlgData Color,*] {
set idx [string range $idx 6 end]
@@ -4888,7 +4888,7 @@
foreach {idx str} {MainBG Background MainFG Foreground SearchBG Searchbackgr SubjectBG Subjectbackgr} {
buildRow $f $idx $str
}
- grid [label $f.online -text "Online Users" -font SYS] - - -
+ grid [label $f.online -text "Online Users"] - - -
set UserList [list]
foreach network $OnlineUsers(networks) {
set UserList [concat $UserList $OnlineUsers($network)]
@@ -4899,7 +4899,7 @@
buildRow $f NICK-$nick $nick
}
}
- grid [label $f.offline -text "Offline Users" -font SYS] - - -
+ grid [label $f.offline -text "Offline Users"] - - -
foreach nick $Options(NickList) {
set nick [lindex $nick 0]
if { [lsearch -exact $UserList $nick] == -1 } {
@@ -4910,18 +4910,15 @@
button $t.f2.ok \
-width 8 \
-text "OK" \
- -command { set ::tkchat::DlgDone ok } \
- -font SYS
+ -command { set ::tkchat::DlgDone ok }
button $t.f2.app \
-width 8 \
-text "Apply" \
- -command { set ::tkchat::DlgDone apply } \
- -font SYS
+ -command { set ::tkchat::DlgDone apply }
button $t.f2.can \
-width 8 \
-text "Cancel" \
- -command { set ::tkchat::DlgDone cancel} \
- -font SYS
+ -command { set ::tkchat::DlgDone cancel}
pack $t.f2.ok $t.f2.app $t.f2.can -side left -expand 1 -fill none
grid $t.l1 $t.l2 $t.myclr x -padx 1 -pady 3 -sticky {}
@@ -6759,7 +6756,7 @@
-text "Show humorous entered/left messages" \
-variable ::Options(FunkyTraffic) -onvalue 1 -offvalue 0
${NS}::label $af.aal -text "Inactive message" -underline 0 \
- -anchor ne -font FNT
+ -anchor ne
${NS}::entry $af.aae -textvariable ::tkchat::EditOptions(AutoAwayMsg)
if {!$useTile} {
$af.store configure -anchor nw
@@ -6784,7 +6781,7 @@
set bf [${NS}::labelframe $page.bf -text "Preferred browser" -underline 10]
- ${NS}::label $bf.m -anchor nw -font FNT -wraplength 4i -justify left \
+ ${NS}::label $bf.m -anchor nw -wraplength 4i -justify left \
-text "Provide the command used to launch your web browser. For\
instance /opt/bin/mozilla or xterm -e links. The URL to\
be opened will be appended to the command string and for\
@@ -6810,7 +6807,7 @@
set sf [${NS}::labelframe $page.sf -text "Tk style"] ;#-padx 1 -pady 1
- ${NS}::label $sf.m -anchor nw -font FNT -wraplength 4i -justify left \
+ ${NS}::label $sf.m -anchor nw -wraplength 4i -justify left \
-text "The Tk style selection available here will apply when you \
next restart tkchat."
${NS}::radiobutton $sf.as -text "ActiveState" -underline 0 \
@@ -6874,7 +6871,7 @@
}
${NS}::label $gf.pct -text "%"
${NS}::label $gf.alabel -text Transparency -underline 1 \
- -anchor ne -font FNT
+ -anchor ne
${NS}::scale $gf.alpha -from 1 -to 100 -orient horizontal
$gf.alpha set $EditOptions(Transparency)
#[expr {int([wm attributes . -alpha] * 100)}]
Index: tkchat_clock.tcl
===================================================================
RCS file: /cvsroot/tcllib/tclapps/apps/tkchat/tkchat_clock.tcl,v
retrieving revision 1.1
diff -u -r1.1 tkchat_clock.tcl
--- tkchat_clock.tcl 4 Oct 2007 08:44:51 -0000 1.1
+++ tkchat_clock.tcl 5 Apr 2008 21:08:59 -0000
@@ -21,7 +21,7 @@
variable Options
if {$Options(Enabled)} {
if {[winfo exists .status] && ![winfo exists .status.clock]} {
- ${NS}::label .status.clock -font FNT
+ ${NS}::label .status.clock
::tkchat::StatusbarAddWidget .status .status.clock 1
if {[package provide tooltip] ne {}} {
tooltip::tooltip .status.clock $Options(Tooltip)
