[Tkabber-dev] r785 - in trunk/tkabber: . doc examples/configs

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Sun Nov 5 01:42:48 MSK 2006


Author: sergei
Date: 2006-11-05 01:42:43 +0300 (Sun, 05 Nov 2006)
New Revision: 785

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/README
   trunk/tkabber/doc/tkabber.html
   trunk/tkabber/doc/tkabber.xml
   trunk/tkabber/examples/configs/badlop-config.tcl
   trunk/tkabber/examples/configs/config.tcl
   trunk/tkabber/examples/configs/mtr-config.tcl
   trunk/tkabber/examples/configs/teo-config.tcl
   trunk/tkabber/richtext.tcl
Log:
	* README, doc/tkabber.html, doc/tkabber.xml, richtext.tcl,
	  examples/configs/badlop-config.tcl, examples/configs/config.tcl,
	  examples/configs/mtr-config.tcl, examples/configs/teo-config.tcl:
	  Changed emoticons interface in docs and examples.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2006-11-04 21:15:36 UTC (rev 784)
+++ trunk/tkabber/ChangeLog	2006-11-04 22:42:43 UTC (rev 785)
@@ -1,5 +1,10 @@
 2006-11-04  Sergei Golovan  <sgolovan at nes.ru>
 
+	* README, doc/tkabber.html, doc/tkabber.xml, richtext.tcl,
+	  examples/configs/badlop-config.tcl, examples/configs/config.tcl,
+	  examples/configs/mtr-config.tcl, examples/configs/teo-config.tcl:
+	  Changed emoticons interface in docs and examples.
+
 	* filetransfer.tcl, plugins/filetransfer/http.tcl,
 	  plugins/filetransfer/jidlink.tcl, plugins/filetransfer/si.tcl:
 	  Moved send file user interface to filetransfer.tcl (unfinished
@@ -3471,7 +3476,7 @@
 
 	* msgs/pt.msg: Updated (thanks to Miguel)
 
-	* plugins/chat/draw_info.tcl: Now info messages have emoteicons
+	* plugins/chat/draw_info.tcl: Now info messages have emoticons
 	and clickable URLs (thanks to Sergei Golovan)
 
 	* plugins/chat/completion.tcl: If after completion at the end of
@@ -6586,7 +6591,7 @@
 
 2002-08-03  Alexey Shchepin  <alexey at sevcom.net>
 
-	* emoticons.tcl: Changed emoteicons API
+	* emoticons.tcl: Changed emoticons API
 
 	* userinfo.tcl: Bugfix
 

Modified: trunk/tkabber/README
===================================================================
--- trunk/tkabber/README	2006-11-04 21:15:36 UTC (rev 784)
+++ trunk/tkabber/README	2006-11-04 22:42:43 UTC (rev 785)
@@ -960,7 +960,8 @@
 
    # the emoticon module
 
-       emoteicons::load_dir ~/.tkabber/emoticons/rythmbox
+       set plugins::emoticons::options(theme) \
+           [file normalize ~/.tkabber/emoticons/rythmbox]
 
 
    # the file transfer module
@@ -1003,7 +1004,6 @@
 
 
 
-
 Shchepin, et al.                                               [Page 18]
 
                              Tkabber v0.9.9                     May 2006
@@ -1249,24 +1249,24 @@
 
 4.2.8.  The Emoticons Module
 
-   The procedure called _emoteicons::load_dir_ is used to load emoticon
-   definitions from a directory.  The directory contains a file called
-   ""icondef.xml"", which defines the mapping between each image and its
-   textual emoticon (To find out what this file looks like, go to where
-   you installed _Tkabber_ and take a look at the file called
+   The procedure called _plugins::emoticons::load_dir_ is used to load
+   emoticon definitions from a directory.  The directory contains a file
+   called ""icondef.xml"", which defines the mapping between each image
+   and its textual emoticon (To find out what this file looks like, go
+   to where you installed _Tkabber_ and take a look at the file called
    ""emoticons-tkabber/icondef.xml"" or read XEP-0038 [21].)
 
    If you have just a few icons, and you don't want to create a
    directory and a textual mapping, you can use the procedure called
-   "emoteicons::add", e.g.,
+   "plugins::emoticons::add", e.g.,
 
-       emoteicons::add ":beer:" \
-                       [image create photo -file ~/.tkabber/beer.gif]
+       plugins::emoticons::add ":beer:" \
+           [image create photo -file ~/.tkabber/beer.gif]
 
-   If you want to disable all emoticons, you can use the following
-   trick.  Put in postload function
+   If you want to disable all emoticons, you can simply load empty
+   directory.  Put in postload function
 
-       array unset emoteicons::emoteicons
+       plugins::emoticons::load_dir ""
 
 4.2.9.  The File Transfer Module
 
@@ -2201,7 +2201,7 @@
 
    o  History now splitted by month
 
-   o  Animated emoteicons support
+   o  Animated emoticons support
 
    o  Many user interface improvements
 

Modified: trunk/tkabber/doc/tkabber.html
===================================================================
--- trunk/tkabber/doc/tkabber.html	2006-11-04 21:15:36 UTC (rev 784)
+++ trunk/tkabber/doc/tkabber.html	2006-11-04 22:42:43 UTC (rev 785)
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en"><head><title>Tkabber v0.9.9</title>
-<meta http-equiv="Expires" content="Tue, 15 Aug 2006 21:12:02 +0000">
+<meta http-equiv="Expires" content="Sat, 04 Nov 2006 22:40:07 +0000">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="description" content="Tkabber v0.9.9">
 <meta name="generator" content="xml2rfc v1.30 (http://xml.resource.org/)">
@@ -1033,7 +1033,8 @@
 
 # the emoticon module
 
-    emoteicons::load_dir ~/.tkabber/emoticons/rythmbox
+    set plugins::emoticons::options(theme) \
+	[file normalize ~/.tkabber/emoticons/rythmbox]
 
 
 # the file transfer module
@@ -1344,26 +1345,25 @@
 <a name="rfc.section.4.2.8"></a><h3>4.2.8.&nbsp;The Emoticons Module</h3>
 
 <p>
-	    The procedure called <span class="emph">emoteicons::load_dir</span> is used to load
+	    The procedure called <span class="emph">plugins::emoticons::load_dir</span> is used to load
 	    emoticon definitions from a directory.  The directory contains a
 	    file called <span class="verb">"icondef.xml"</span>, which defines the mapping between
 	    each image and its textual emoticon (To find out what this file
 	    looks like, go to where you installed <span class="emph">Tkabber</span> and take a look at
-	    the file called <span class="verb">"emoticons-tkabber/icondef.xml"</span>
-	    or read <a href="http://www.xmpp.org/extensions/xep-0038.html">XEP-0038</a>.)
+	    the file called <span class="verb">"emoticons-tkabber/icondef.xml"</span> or read <a href="http://www.xmpp.org/extensions/xep-0038.html">XEP-0038</a>.)
 	  
 </p>
 <p>If you have just a few icons,
 and you don't want to create a directory and a textual mapping,
-you can use the procedure called <span class="verb">emoteicons::add</span>, e.g.,
+you can use the procedure called <span class="verb">plugins::emoticons::add</span>, e.g.,
 </p><pre>
-    emoteicons::add ":beer:" \
-                    [image create photo -file ~/.tkabber/beer.gif]
+    plugins::emoticons::add ":beer:" \
+        [image create photo -file ~/.tkabber/beer.gif]
 </pre>
-<p>If you want to disable all emoticons, you can use the following trick.
+<p>If you want to disable all emoticons, you can simply load empty directory.
 Put in postload function
 </p><pre>
-    array unset emoteicons::emoteicons
+    plugins::emoticons::load_dir ""
 </pre>
 <a name="s.postload-filexfer"></a><br /><hr />
 <table summary="layout" cellpadding="0" cellspacing="2" class="bug" align="right"><tr><td class="bug"><a href="#toc" class="link2">&nbsp;TOC&nbsp;</a></td></tr></table>
@@ -2352,7 +2352,7 @@
 </li>
 <li>History now splitted by month
 </li>
-<li>Animated emoteicons support
+<li>Animated emoticons support
 </li>
 <li>Many user interface improvements
 </li>

Modified: trunk/tkabber/doc/tkabber.xml
===================================================================
--- trunk/tkabber/doc/tkabber.xml	2006-11-04 21:15:36 UTC (rev 784)
+++ trunk/tkabber/doc/tkabber.xml	2006-11-04 22:42:43 UTC (rev 785)
@@ -769,7 +769,8 @@
 
 # the emoticon module
 
-    emoteicons::load_dir ~/.tkabber/emoticons/rythmbox
+    set plugins::emoticons::options(theme) \
+	[file normalize ~/.tkabber/emoticons/rythmbox]
 
 
 # the file transfer module
@@ -1075,7 +1076,7 @@
 
 	<section anchor='s.postload-emoti' title='The Emoticons Module'>
 	  <t>
-	    The procedure called <spanx>emoteicons::load_dir</spanx> is used to load
+	    The procedure called <spanx>plugins::emoticons::load_dir</spanx> is used to load
 	    emoticon definitions from a directory.  The directory contains a
 	    file called <spanx style='verb'>"icondef.xml"</spanx>, which defines the mapping between
 	    each image and its textual emoticon (To find out what this file
@@ -1087,17 +1088,17 @@
 <figure>
 <preamble>If you have just a few icons,
 and you don't want to create a directory and a textual mapping,
-you can use the procedure called <spanx style='verb'>emoteicons::add</spanx>, e.g.,</preamble>
+you can use the procedure called <spanx style='verb'>plugins::emoticons::add</spanx>, e.g.,</preamble>
 <artwork><![CDATA[
-    emoteicons::add ":beer:" \
-                    [image create photo -file ~/.tkabber/beer.gif]
+    plugins::emoticons::add ":beer:" \
+        [image create photo -file ~/.tkabber/beer.gif]
 ]]></artwork>
 </figure>
 <figure>
-<preamble>If you want to disable all emoticons, you can use the following trick.
+<preamble>If you want to disable all emoticons, you can simply load empty directory.
 Put in postload function</preamble>
 <artwork><![CDATA[
-    array unset emoteicons::emoteicons
+    plugins::emoticons::load_dir ""
 ]]></artwork>
 </figure>
 </section>
@@ -2042,7 +2043,7 @@
 	  <list style='symbols'>
 	    <t>Multiple logins support</t>
 	    <t>History now splitted by month</t>
-	    <t>Animated emoteicons support</t>
+	    <t>Animated emoticons support</t>
 	    <t>Many user interface improvements</t>
 	    <t>More XMPP support</t>
 	    <t>More translations</t>

Modified: trunk/tkabber/examples/configs/badlop-config.tcl
===================================================================
--- trunk/tkabber/examples/configs/badlop-config.tcl	2006-11-04 21:15:36 UTC (rev 784)
+++ trunk/tkabber/examples/configs/badlop-config.tcl	2006-11-04 22:42:43 UTC (rev 785)
@@ -183,7 +183,7 @@
 
 # 2.2.8 The Emoticons Module
 
-#	emoteicons::load_dir $::rootdir/emoticons/rhymbox-1.0
+#	plugins::emoticons::load_dir $::rootdir/emoticons/rhymbox-1.0
 
 # 2.2.9 The File Transfer Module
 
@@ -304,7 +304,7 @@
 
 #    set plugins::xhtml::options(enable)			1
 
-#    emoteicons::load_dir ~/.tkabber/cool-emoticon-theme
+#    plugins::emoticons::load_dir ~/.tkabber/cool-emoticon-theme
     
 # Set theme for chess plugin
 

Modified: trunk/tkabber/examples/configs/config.tcl
===================================================================
--- trunk/tkabber/examples/configs/config.tcl	2006-11-04 21:15:36 UTC (rev 784)
+++ trunk/tkabber/examples/configs/config.tcl	2006-11-04 22:42:43 UTC (rev 785)
@@ -58,5 +58,5 @@
 
     # If you download some emoticons theme, and untar it e.g. in
     # ~/.tkabber/cool-emoticon-theme, then you can load it as follow:
-    #emoteicons::load_dir ~/.tkabber/cool-emoticon-theme
-}
\ No newline at end of file
+    #plugins::emoticons::load_dir ~/.tkabber/cool-emoticon-theme
+}

Modified: trunk/tkabber/examples/configs/mtr-config.tcl
===================================================================
--- trunk/tkabber/examples/configs/mtr-config.tcl	2006-11-04 21:15:36 UTC (rev 784)
+++ trunk/tkabber/examples/configs/mtr-config.tcl	2006-11-04 22:42:43 UTC (rev 785)
@@ -111,7 +111,7 @@
 proc config_postload {} {
 # the emoticon module
 
-    emoteicons::load_dir ~/.tkabber/emoticons/rythmbox
+    plugins::emoticons::load_dir ~/.tkabber/emoticons/rythmbox
 
 
 # the georoster module

Modified: trunk/tkabber/examples/configs/teo-config.tcl
===================================================================
--- trunk/tkabber/examples/configs/teo-config.tcl	2006-11-04 21:15:36 UTC (rev 784)
+++ trunk/tkabber/examples/configs/teo-config.tcl	2006-11-04 22:42:43 UTC (rev 785)
@@ -100,12 +100,7 @@
     set plugins::ispell::options(dictionary_encoding) koi8-r
 
 # Define the set of emoticons (empty set)
-    unset  emoteicons::emoteicons
-    array set emoteicons::emoteicons {}
-
-# Set theme for chess plugin
-    set plugins::chess::theme 1
-
+    set plugins::emoticons::options(theme) ""
 }
 
 # Debug window handling (mostly taken from MTR config file)

Modified: trunk/tkabber/richtext.tcl
===================================================================
--- trunk/tkabber/richtext.tcl	2006-11-04 21:15:36 UTC (rev 784)
+++ trunk/tkabber/richtext.tcl	2006-11-04 22:42:43 UTC (rev 785)
@@ -4,7 +4,7 @@
 # * Parse plain text messages with registered parsers (in order of their priorities);
 # * Render the resulting chunks of text with the appropriate renderers;
 # * Get back the original text from PRIMARY and CLIPBOARD selections acquired from such Text widget.
-# This scheme supports URL highlighting, emoteicons and such.
+# This scheme supports URL highlighting, emoticons and such.
 
 namespace eval richtext {
     variable registered



More information about the Tkabber-dev mailing list