[Tkabber-dev] r2100 - in trunk/tkabber-plugins: . browser floatinglog georoster gmail whiteboard

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Sun Jan 26 13:49:59 MSK 2014


Author: sergei
Date: 2014-01-26 13:49:59 +0400 (Sun, 26 Jan 2014)
New Revision: 2100

Modified:
   trunk/tkabber-plugins/ChangeLog
   trunk/tkabber-plugins/browser/browser.tcl
   trunk/tkabber-plugins/floatinglog/floatinglog.tcl
   trunk/tkabber-plugins/georoster/georoster.tcl
   trunk/tkabber-plugins/gmail/gmail.tcl
   trunk/tkabber-plugins/whiteboard/whiteboard.tcl
Log:
	* floatinglog/floatinglog.tcl, whiteboard/whiteboard.tcl,
	  browser/browser.tcl, gmail/gmail.tcl, georoster/georoster.tcl:
	  Replaced direct bindings to mouse buttons 2 and 3 by virtual
	  events <<PasteSelection>> and <<ContextMenu>>, because in MacOSX
	  and in Unix buttons 2 and 3 correspond to different mous buttons
	  (thanks to Vitaly Takmazov).


Modified: trunk/tkabber-plugins/ChangeLog
===================================================================
--- trunk/tkabber-plugins/ChangeLog	2014-01-26 09:48:25 UTC (rev 2099)
+++ trunk/tkabber-plugins/ChangeLog	2014-01-26 09:49:59 UTC (rev 2100)
@@ -14,6 +14,13 @@
 	* otr/otr.tcl: Add the corresponding OTR icon to outgoing chat
 	  messages.
 
+	* floatinglog/floatinglog.tcl, whiteboard/whiteboard.tcl,
+	  browser/browser.tcl, gmail/gmail.tcl, georoster/georoster.tcl:
+	  Replaced direct bindings to mouse buttons 2 and 3 by virtual
+	  events <<PasteSelection>> and <<ContextMenu>>, because in MacOSX
+	  and in Unix buttons 2 and 3 correspond to different mous buttons
+	  (thanks to Vitaly Takmazov).
+
 2014-01-25  Sergei Golovan <sgolovan at nes.ru>
 
 	* otr/key.tcl, otr/tclotr/crypto.tcl: Code cleanup, made DSA key

Modified: trunk/tkabber-plugins/browser/browser.tcl
===================================================================
--- trunk/tkabber-plugins/browser/browser.tcl	2014-01-26 09:48:25 UTC (rev 2099)
+++ trunk/tkabber-plugins/browser/browser.tcl	2014-01-26 09:49:59 UTC (rev 2100)
@@ -191,7 +191,7 @@
     pack $sw -side top -expand yes -fill both
     set browser(tree,$bw) $tw
     $tw bindText <Double-ButtonPress-1> [list [namespace current]::textaction $bw]
-    $tw bindText <ButtonPress-3>        [list [namespace current]::textpopup $bw]
+    $tw bindText <<ContextMenu>>        [list [namespace current]::textpopup $bw]
     balloon::setup $tw -command [list [namespace current]::textballoon $bw]
 
     bindscroll $tw.c

Modified: trunk/tkabber-plugins/floatinglog/floatinglog.tcl
===================================================================
--- trunk/tkabber-plugins/floatinglog/floatinglog.tcl	2014-01-26 09:48:25 UTC (rev 2099)
+++ trunk/tkabber-plugins/floatinglog/floatinglog.tcl	2014-01-26 09:49:59 UTC (rev 2100)
@@ -168,7 +168,7 @@
     }
 
     set_window
-    bind $winname <Button-3> [namespace current]::right_click
+    bind $winname <<ContextMenu>> [namespace current]::right_click
     bind $winname <Double-ButtonPress-1> [namespace current]::left_double_click
 }
 

Modified: trunk/tkabber-plugins/georoster/georoster.tcl
===================================================================
--- trunk/tkabber-plugins/georoster/georoster.tcl	2014-01-26 09:48:25 UTC (rev 2099)
+++ trunk/tkabber-plugins/georoster/georoster.tcl	2014-01-26 09:49:59 UTC (rev 2100)
@@ -267,7 +267,7 @@
     bind $c <ButtonRelease-1> \
 	[list [namespace current]::move_b1r [double% $c]]
 
-    bind $c <ButtonPress-2> \
+    bind $c <<PasteSelection>> \
 	[list [namespace current]::delete [double% $c] %x %y]
     bind $c <Control-ButtonPress-1> \
 	[list [namespace current]::delete [double% $c] %x %y]

Modified: trunk/tkabber-plugins/gmail/gmail.tcl
===================================================================
--- trunk/tkabber-plugins/gmail/gmail.tcl	2014-01-26 09:48:25 UTC (rev 2099)
+++ trunk/tkabber-plugins/gmail/gmail.tcl	2014-01-26 09:49:59 UTC (rev 2100)
@@ -181,7 +181,7 @@
 
     pack $sw -side top -expand yes -fill both
 
-    $tw bindText <ButtonPress-3> \
+    $tw bindText <<ContextMenu>> \
 	    [list [namespace current]::message_popup $tw]
     $tw bindText <Double-ButtonPress-1> \
 	    [list [namespace current]::message_action browse $tw]

Modified: trunk/tkabber-plugins/whiteboard/whiteboard.tcl
===================================================================
--- trunk/tkabber-plugins/whiteboard/whiteboard.tcl	2014-01-26 09:48:25 UTC (rev 2099)
+++ trunk/tkabber-plugins/whiteboard/whiteboard.tcl	2014-01-26 09:49:59 UTC (rev 2100)
@@ -644,7 +644,7 @@
     bind $c <B1-Motion> {}
     bind $c <Motion> [list [namespace current]::line_b1m [double% $c] %x %y]
     bind $c <ButtonRelease-1> {}
-    bind $c <Button-3> [list [namespace current]::line_b3 \
+    bind $c <<ContextMenu>> [list [namespace current]::line_b3 \
 			    [double% $c] [double% $chatid]]
     $c configure -cursor crosshair
 }
@@ -735,7 +735,7 @@
     bind $c <B1-Motion> {}
     bind $c <Motion> [list [namespace current]::polygon_m [double% $c] %x %y]
     bind $c <ButtonRelease-1> {}
-    bind $c <Button-3> [list [namespace current]::polygon_b3 \
+    bind $c <<ContextMenu>> [list [namespace current]::polygon_b3 \
 			    [double% $c] [double% $chatid]]
     $c configure -cursor crosshair
 }
@@ -852,7 +852,7 @@
     bind $c <Motion> {}
     bind $c <ButtonRelease-1> \
 	[list [namespace current]::rectangle_b1r [double% $c] [double% $chatid] %x %y]
-    bind $c <Button-3> {}
+    bind $c <<ContextMenu>> {}
     $c configure -cursor crosshair
 }
 
@@ -958,7 +958,7 @@
     bind $c <Motion> {}
     bind $c <ButtonRelease-1> \
 	[list [namespace current]::circle_b1r [double% $c] [double% $chatid] %x %y]
-    bind $c <Button-3> {}
+    bind $c <<ContextMenu>> {}
     $c configure -cursor crosshair
 }
 
@@ -1055,7 +1055,7 @@
 			     [double% $c] %x %y]
     bind $c <ButtonRelease-1> \
 	[list [namespace current]::freehand_b1r [double% $c] [double% $chatid]]
-    bind $c <Button-3> {}
+    bind $c <<ContextMenu>> {}
     $c configure -cursor crosshair
 }
 
@@ -1165,7 +1165,7 @@
 	 [list [namespace current]::move_b1m [double% $c] %x %y]
     bind $c <ButtonRelease-1> \
 	 [list [namespace current]::move_b1r [double% $c] [double% $chatid]]
-    bind $c <Button-3> \
+    bind $c <<ContextMenu>> \
 	 [list [namespace current]::popup_menu [double% $c] [double% $chatid] %X %Y]
     bind $c <Motion> {}
     $c configure -cursor ""
@@ -1261,7 +1261,7 @@
     bind $c <B1-Motion> {}
     bind $c <ButtonRelease-1> \
 	    [list [namespace current]::image_b1 [double% $c] [double% $chatid] %x %y]
-    bind $c <Button-3> {}
+    bind $c <<ContextMenu>> {}
     $c configure -cursor crosshair
 }
 
@@ -1336,7 +1336,7 @@
     bind $c <B1-Motion> {}
     bind $c <ButtonRelease-1> \
 	    [list [namespace current]::text_b1 [double% $c] [double% $chatid] %x %y]
-    bind $c <Button-3> {}
+    bind $c <<ContextMenu>> {}
     $c configure -cursor crosshair
 }
 



More information about the Tkabber-dev mailing list