[Tkabber-dev] r135 - trunk/plugins/filter_add

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Sun Sep 28 20:53:38 MSD 2008


Author: archimed
Date: 2008-09-28 20:53:37 +0400 (Sun, 28 Sep 2008)
New Revision: 135

Modified:
   trunk/plugins/filter_add/iroster.tcl.diff
Log:
filter_add/iroster.tcl.diff
 patch in unidiff format

Modified: trunk/plugins/filter_add/iroster.tcl.diff
===================================================================
--- trunk/plugins/filter_add/iroster.tcl.diff	2008-09-28 16:19:21 UTC (rev 134)
+++ trunk/plugins/filter_add/iroster.tcl.diff	2008-09-28 16:53:37 UTC (rev 135)
@@ -1,26 +1,63 @@
-56d55
-< puts [namespace current]
-65a65,68
->     custom::defvar show_only_online_in_filter_mode 0 \
-> 	[::msgcat::mc "Show only online users in roster when filter is present."] \
-> 	-type boolean -group Roster \
-> 	-command [namespace current]::redraw_after_idle
-291a295
->     variable show_only_online_in_filter_mode
-532a537
-> 		    ( $show_only_online_in_filter_mode && $options(use_filter) && $options(filter) != "" ) || \
-558a564
-> 			( $show_only_online_in_filter_mode && $options(use_filter) && $options(filter) != "" ) || \
-1294,1295c1300,1308
-< 
-<     set show_only_online [expr {!$show_only_online}]
----
->     variable use_filter
->     variable options
->     variable show_only_online_in_filter_mode
->     
->     if { ( $options(use_filter) && $options(filter) != "" ) } {
-> 	set show_only_online_in_filter_mode [expr {!$show_only_online_in_filter_mode}]
->     } else {
-> 	set show_only_online [expr {!$show_only_online}]
->     }
+--- iroster.tcl	Sun Sep 28 17:53:55 2008
++++ iroster_.tcl	Sun Sep 28 19:46:02 2008
+@@ -53,7 +53,6 @@
+ unset tbackground tforeground bbackground bactiveBackground
+ 
+ namespace eval roster {
+-puts [namespace current]
+     custom::defgroup Roster [::msgcat::mc "Roster options."] -group Tkabber
+     custom::defvar use_aliases 1 \
+ 	[::msgcat::mc "Use aliases to show multiple users in one roster item."] \
+@@ -63,6 +62,10 @@
+ 	[::msgcat::mc "Show only online users in roster."] \
+ 	-type boolean -group Roster \
+ 	-command [namespace current]::redraw_after_idle
++    custom::defvar show_only_online_in_filter_mode 0 \
++	[::msgcat::mc "Show only online users in roster when filter is present."] \
++	-type boolean -group Roster \
++	-command [namespace current]::redraw_after_idle
+     custom::defvar show_transport_icons 0 \
+ 	[::msgcat::mc "Show native icons for transports/services in roster."] \
+ 	-type boolean -group Roster \
+@@ -289,6 +292,7 @@
+     variable own_resources_group_name
+     variable collapsed
+     variable show_offline
++    variable show_only_online_in_filter_mode
+ 
+     clear .roster 0
+     
+@@ -530,6 +534,7 @@
+ 	    }
+ 	    if {!$show_only_online || $show_offline_group || \
+ 		    $roster(show_offline,$gid) || \
++		    ( $show_only_online_in_filter_mode && $options(use_filter) && $options(filter) != "" ) || \
+ 		    $online + $not_users + $sub_jids > 0} {
+ 		if {$users} {
+ 		    addline .roster group "$group_name ($online/$users)" \
+@@ -556,6 +561,7 @@
+ 		    }
+ 		    set cjid [list $connid $jid]
+ 		    if {!$show_only_online || $show_offline_users || $roster(show_offline,$gid) || \
++			( $show_only_online_in_filter_mode && $options(use_filter) && $options(filter) != "" ) || \
+ 			    ![info exists useronline($jid)] || $useronline($jid)} {
+ 			lassign [::roster::get_category_and_subtype $connid $jid] category type
+ 			set jids [get_jids_of_user $connid $jid]
+@@ -1291,8 +1297,15 @@
+ 
+ proc roster::switch_only_online {args} {
+     variable show_only_online
+-
+-    set show_only_online [expr {!$show_only_online}]
++    variable use_filter
++    variable options
++    variable show_only_online_in_filter_mode
++    
++    if { ( $options(use_filter) && $options(filter) != "" ) } {
++	set show_only_online_in_filter_mode [expr {!$show_only_online_in_filter_mode}]
++    } else {
++	set show_only_online [expr {!$show_only_online}]
++    }
+ }
+ 
+ proc roster::is_online {connid jid} {



More information about the Tkabber-dev mailing list