[Tkabber-dev] r1381 - in trunk/tkabber: . ifacetk plugins/richtext

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Mon Mar 3 00:52:38 MSK 2008


Author: sergei
Date: 2008-03-03 00:52:38 +0300 (Mon, 03 Mar 2008)
New Revision: 1381

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/ifacetk/iroster.tcl
   trunk/tkabber/plugins/richtext/stylecodes.tcl
   trunk/tkabber/richtext.tcl
Log:
	* idefault.tcl, iface.tcl, ifacetk/iroster.tcl,
	  plugins/richtext/stylecodes.tcl, richtext.tcl: Partially rolled back
	  the change in font options for Tcl/Tk on UNIX with disabled Xft.
	  Removed use of named fonts wherever possible. Also,
	  ifacetk::options(font) variable can't be used for roster and chats
	  font setup. Use *Chat*Text.font resource instead.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2008-03-02 21:36:15 UTC (rev 1380)
+++ trunk/tkabber/ChangeLog	2008-03-02 21:52:38 UTC (rev 1381)
@@ -14,11 +14,12 @@
 	  should either add option *font or use ifacetk::options(font)
 	  variable.
 
-	* idefault.tcl, iface.tcl: Partially rolled back the change in font
-	  options for Tcl/Tk on UNIX with disabled Xft. Removed use of named
-	  fonts wherever possible. Also, ifacetk::options(font) variable can't
-	  be used for roster and chats font setup. Use *Chat*Text.font
-	  resource instead.
+	* idefault.tcl, iface.tcl, ifacetk/iroster.tcl,
+	  plugins/richtext/stylecodes.tcl, richtext.tcl: Partially rolled back
+	  the change in font options for Tcl/Tk on UNIX with disabled Xft.
+	  Removed use of named fonts wherever possible. Also,
+	  ifacetk::options(font) variable can't be used for roster and chats
+	  font setup. Use *Chat*Text.font resource instead.
 
 2008-02-21  Sergei Golovan  <sgolovan at nes.ru>
 

Modified: trunk/tkabber/ifacetk/iroster.tcl
===================================================================
--- trunk/tkabber/ifacetk/iroster.tcl	2008-03-02 21:36:15 UTC (rev 1380)
+++ trunk/tkabber/ifacetk/iroster.tcl	2008-03-02 21:52:38 UTC (rev 1381)
@@ -955,7 +955,7 @@
     set grouptag [jid_to_tag $group]
 
     set ypad 1
-    set linespace [font metric font -linespace]
+    set linespace [font metric $::font -linespace]
     set lineheight [expr {$linespace + $ypad}]
 
     set uy $iroster($w,ypos)
@@ -1058,11 +1058,11 @@
 	    set foreground $config(foreground)
 	}
     }
-    $c create text $x $uy -text $text -anchor nw -font font \
+    $c create text $x $uy -text $text -anchor nw -font $::font \
 	-fill $foreground -tags [list jid$tag group$grouptag $type text]
 
     set iroster($w,width) [max $iroster($w,width) \
-			      [expr {$x + [font measure font $text]}]]
+			      [expr {$x + [font measure $::font $text]}]]
 
 
     $c bind jid$tag <Any-Enter> \

Modified: trunk/tkabber/plugins/richtext/stylecodes.tcl
===================================================================
--- trunk/tkabber/plugins/richtext/stylecodes.tcl	2008-03-02 21:36:15 UTC (rev 1380)
+++ trunk/tkabber/plugins/richtext/stylecodes.tcl	2008-03-02 21:52:38 UTC (rev 1381)
@@ -204,9 +204,9 @@
 	$w tag configure overstricken -overstrike 1
     } else {
 	$w tag configure stylecode -elide 0
-	$w tag configure bold -font font
-	$w tag configure italic -font font
-	$w tag configure bold_italic -font font
+	$w tag configure bold -font $::font
+	$w tag configure italic -font $::font
+	$w tag configure bold_italic -font $::font
 	$w tag configure underlined -underline 0
 	$w tag configure overstricken -overstrike 0
     }

Modified: trunk/tkabber/richtext.tcl
===================================================================
--- trunk/tkabber/richtext.tcl	2008-03-02 21:36:15 UTC (rev 1380)
+++ trunk/tkabber/richtext.tcl	2008-03-02 21:52:38 UTC (rev 1381)
@@ -149,7 +149,7 @@
     set w [eval text $args]
     config $w
     install_selection_handlers $w
-    $w configure -state disabled -font font
+    $w configure -state disabled -font $::font
 }
 
 # TODO get rid of "deftag"



More information about the Tkabber-dev mailing list