Menu
▾
▴
[Amsn-commits] SF.net SVN: amsn:[10387] trunk/amsn
|
From: <lep...@us...> - 2008-08-12 21:43:24
|
Revision: 10387
http://amsn.svn.sourceforge.net/amsn/?rev=10387&view=rev
Author: lephilousophe
Date: 2008-08-12 21:43:28 +0000 (Tue, 12 Aug 2008)
Log Message:
-----------
Make mouse Mac compatible everywhere
Simplifies some places and make others work
Modified Paths:
--------------
trunk/amsn/abook.tcl
trunk/amsn/automsg.tcl
trunk/amsn/chatwindow.tcl
trunk/amsn/gui.tcl
trunk/amsn/guicontactlist.tcl
trunk/amsn/loging.tcl
trunk/amsn/msncam.tcl
trunk/amsn/msngames.tcl
trunk/amsn/plugins/winks/winks.tcl
trunk/amsn/preferences.tcl
trunk/amsn/protocol.tcl
trunk/amsn/skins.tcl
trunk/amsn/smileys.tcl
trunk/amsn/trayicon.tcl
Modified: trunk/amsn/abook.tcl
===================================================================
--- trunk/amsn/abook.tcl 2008-08-10 23:27:02 UTC (rev 10386)
+++ trunk/amsn/abook.tcl 2008-08-12 21:43:28 UTC (rev 10387)
@@ -1313,7 +1313,7 @@
labelframe $nbIdent.fBasicInfo -relief groove -text [trans identity]
label $nbIdent.fBasicInfo.displaypic -image [::skin::getDisplayPicture $email] -highlightthickness 2 -highlightbackground black -borderwidth 0
- bind $nbIdent.fBasicInfo.displaypic <ButtonPress-3> \
+ bind $nbIdent.fBasicInfo.displaypic <<Button3-Press>> \
[list ::abookGui::dp_mypicpopup_menu %X %Y\
[file join $HOME displaypic cache $email [filenoext [::abook::getContactData $email displaypicfile ""]].png] $email]
@@ -1324,7 +1324,7 @@
$nbIdent.fBasicInfo.h1 insert 0.0 $nick
$nbIdent.fBasicInfo.h1 configure -state disabled
set h1copymenu [::abook::CreateCopyMenu $nbIdent.fBasicInfo.h1]
- bind $nbIdent.fBasicInfo.h1 <Button3-ButtonRelease> "tk_popup $h1copymenu %X %Y"
+ bind $nbIdent.fBasicInfo.h1 <<Button3>> "tk_popup $h1copymenu %X %Y"
if { [::config::getKey protocol] >= 11 } {
set psm [::abook::getpsmmedia $email]
@@ -1334,7 +1334,7 @@
$nbIdent.fBasicInfo.psm1 insert 0.0 $psm
$nbIdent.fBasicInfo.psm1 configure -state disabled
set psm1copymenu [::abook::CreateCopyMenu $nbIdent.fBasicInfo.psm1]
- bind $nbIdent.fBasicInfo.psm1 <Button3-ButtonRelease> "tk_popup $psm1copymenu %X %Y"
+ bind $nbIdent.fBasicInfo.psm1 <<Button3>> "tk_popup $psm1copymenu %X %Y"
}
set h [expr {[string length $email]/50 +1}]
@@ -1343,7 +1343,7 @@
$nbIdent.fBasicInfo.e1 insert 0.0 $email
$nbIdent.fBasicInfo.e1 configure -state disabled
set e1copymenu [::abook::CreateCopyMenu $nbIdent.fBasicInfo.e1]
- bind $nbIdent.fBasicInfo.e1 <Button3-ButtonRelease> "tk_popup $e1copymenu %X %Y"
+ bind $nbIdent.fBasicInfo.e1 <<Button3>> "tk_popup $e1copymenu %X %Y"
frame $nbIdent.fBasicInfo.fGroup
label $nbIdent.fBasicInfo.fGroup.g -text "[trans group]:" -font splainf
@@ -1613,7 +1613,7 @@
# User's current display picture
# label $nbUserDPs.titlepic1 -text "[trans curdisplaypic]" -font bboldunderf
# label $nbUserDPs.displaypic -image [::skin::getDisplayPicture $email]
-# bind $nbUserDPs.displaypic <ButtonPress-3> \
+# bind $nbUserDPs.displaypic <<Button3-Press>> \
[list ::abookGui::dp_mypicpopup_menu %X %Y\
[file join $HOME displaypic cache $email [filenoext [::abook::getContactData $email displaypicfile ""]].png] $email]
Modified: trunk/amsn/automsg.tcl
===================================================================
--- trunk/amsn/automsg.tcl 2008-08-10 23:27:02 UTC (rev 10386)
+++ trunk/amsn/automsg.tcl 2008-08-12 21:43:28 UTC (rev 10387)
@@ -430,7 +430,7 @@
set state_blind 0
set msgcopypastemenu [CreateCopyPasteMenu $lfname.emsg]
- bind $lfname.emsg <Button3-ButtonRelease> "tk_popup $msgcopypastemenu %X %Y"
+ bind $lfname.emsg <<Button3>> "tk_popup $msgcopypastemenu %X %Y"
pack .editstate.1 -expand false -fill x -side top -pady 15
pack .editstate.lfname -expand 1 -fill both -side top
grid $lfname.ldesc -row 1 -column 1 -sticky w -pady 5 -padx 5
Modified: trunk/amsn/chatwindow.tcl
===================================================================
--- trunk/amsn/chatwindow.tcl 2008-08-10 23:27:02 UTC (rev 10386)
+++ trunk/amsn/chatwindow.tcl 2008-08-12 21:43:28 UTC (rev 10387)
@@ -1990,7 +1990,7 @@
# Do not bind copy command on button 1 on Mac OS X
if { ![OnMac] } {
- bind $textinner <Button1-ButtonRelease> "copy 0 $w"
+ bind $textinner <<Button1>> "copy 0 $w"
}
# When someone type something in out.text, regive the focus to in.input and insert that key,
@@ -2388,8 +2388,8 @@
pack $fontsel $smileys $voice -side left -padx 0 -pady 0
pack $block $webcam $sendfile $invite -side right -padx 0 -pady 0
- bind $voice <ButtonPress-1> "::ChatWindow::start_voice_clip $w"
- bind $voice <Button1-ButtonRelease> "::ChatWindow::stop_and_send_voice_clip $w"
+ bind $voice <<Button1-Press>> "::ChatWindow::start_voice_clip $w"
+ bind $voice <<Button1>> "::ChatWindow::stop_and_send_voice_clip $w"
# Create our bindings
bind $smileys <Enter> "$smileys configure -image [::skin::loadPixmap butsmile_hover]"
@@ -2868,11 +2868,11 @@
# Create our bindings
bind $showpic <<Button1>> "::amsn::ToggleShowPicture"
if { [::config::getKey old_dpframe 0] == 0 } {
- bind $pictureinner <Button1-ButtonRelease> "::amsn::ShowPicMenu $w %X %Y\n"
+ bind $pictureinner <<Button1>> "::amsn::ShowPicMenu $w %X %Y\n"
bind $pictureinner <<Button3>> "::amsn::ShowPicMenu $w %X %Y\n"
::dnd bindtarget $pictureinner Files <Drop> "fileDropHandler %D setdp self"
} else {
- bind $pictureinner <Button1-ButtonRelease> "::amsn::ShowOldPicMenu $w %X %Y\n"
+ bind $pictureinner <<Button1>> "::amsn::ShowOldPicMenu $w %X %Y\n"
bind $pictureinner <<Button3>> "::amsn::ShowOldPicMenu $w %X %Y\n"
}
Modified: trunk/amsn/gui.tcl
===================================================================
--- trunk/amsn/gui.tcl 2008-08-10 23:27:02 UTC (rev 10386)
+++ trunk/amsn/gui.tcl 2008-08-12 21:43:28 UTC (rev 10387)
@@ -255,18 +255,23 @@
#On Mac OS X, there's a mistake between button2 and button3
if { [OnMac] } {
event add <<Button1>> <Button1-ButtonRelease>
+ event add <<Button1-Press>> <ButtonPress-1>
+ event add <<Button1-Motion>> <B1-Motion>
event add <<Button2>> <Button3-ButtonRelease>
event add <<Button2-Press>> <ButtonPress-3>
event add <<Button2-Motion>> <B3-Motion>
event add <<Button3>> <Control-ButtonRelease>
event add <<Button3>> <Button2-ButtonRelease>
event add <<Button3-Press>> <ButtonPress-2>
+ event add <<Button3-Motion>> <B2-Motion>
event add <<Escape>> <Command-w> <Command-W>
event add <<Paste>> <Command-v> <Command-V>
event add <<Copy>> <Command-c> <Command-C>
event add <<Cut>> <Command-x> <Command-X>
} else {
event add <<Button1>> <Button1-ButtonRelease>
+ event add <<Button1-Press>> <ButtonPress-1>
+ event add <<Button1-Motion>> <B1-Motion>
event add <<Button2>> <Button2-ButtonRelease>
event add <<Button2-Press>> <ButtonPress-2>
event add <<Button2-Motion>> <B2-Motion>
@@ -556,7 +561,7 @@
- bind .about.middle.url <Button1-ButtonRelease> "launch_browser $weburl"
+ bind .about.middle.url <<Button1>> "launch_browser $weburl"
#Bottom frame (Close button)
@@ -1070,7 +1075,7 @@
-foreground #808080 -font bplainf -underline false
[::ChatWindow::GetOutText ${win_name}] tag bind ftno$cookie <Enter> ""
[::ChatWindow::GetOutText ${win_name}] tag bind ftno$cookie <Leave> ""
- [::ChatWindow::GetOutText ${win_name}] tag bind ftno$cookie <Button1-ButtonRelease> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind ftno$cookie <<Button1>> ""
[::ChatWindow::GetOutText ${win_name}] conf -cursor xterm
}
@@ -1261,13 +1266,13 @@
-foreground #808080 -font bplainf -underline false
[::ChatWindow::GetOutText ${win_name}] tag bind ftyes$cookie <Enter> ""
[::ChatWindow::GetOutText ${win_name}] tag bind ftyes$cookie <Leave> ""
- [::ChatWindow::GetOutText ${win_name}] tag bind ftyes$cookie <Button1-ButtonRelease> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind ftyes$cookie <<Button1>> ""
[::ChatWindow::GetOutText ${win_name}] tag configure ftsaveas$cookie \
-foreground #808080 -font bplainf -underline false
[::ChatWindow::GetOutText ${win_name}] tag bind ftsaveas$cookie <Enter> ""
[::ChatWindow::GetOutText ${win_name}] tag bind ftsaveas$cookie <Leave> ""
- [::ChatWindow::GetOutText ${win_name}] tag bind ftsaveas$cookie <Button1-ButtonRelease> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind ftsaveas$cookie <<Button1>> ""
DisableCancelText $cookie $chatid
@@ -1327,13 +1332,13 @@
-foreground #808080 -font bplainf -underline false
[::ChatWindow::GetOutText ${win_name}] tag bind ftyes$cookie <Enter> ""
[::ChatWindow::GetOutText ${win_name}] tag bind ftyes$cookie <Leave> ""
- [::ChatWindow::GetOutText ${win_name}] tag bind ftyes$cookie <Button1-ButtonRelease> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind ftyes$cookie <<Button1>> ""
[::ChatWindow::GetOutText ${win_name}] tag configure ftsaveas$cookie \
-foreground #808080 -font bplainf -underline false
[::ChatWindow::GetOutText ${win_name}] tag bind ftsaveas$cookie <Enter> ""
[::ChatWindow::GetOutText ${win_name}] tag bind ftsaveas$cookie <Leave> ""
- [::ChatWindow::GetOutText ${win_name}] tag bind ftsaveas$cookie <Button1-ButtonRelease> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind ftsaveas$cookie <<Button1>> ""
DisableCancelText $cookie $chatid
@@ -1695,7 +1700,7 @@
-foreground #808080 -font bplainf -underline false
[::ChatWindow::GetOutText ${win_name}] tag bind $tag <Enter> ""
[::ChatWindow::GetOutText ${win_name}] tag bind $tag <Leave> ""
- [::ChatWindow::GetOutText ${win_name}] tag bind $tag <Button1-ButtonRelease> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind $tag <<Button1>> ""
[::ChatWindow::GetOutText ${win_name}] conf -cursor xterm
}
@@ -1864,7 +1869,7 @@
SIPCallMessage $chatid [trans sipcalleeaccepted]
# Modify Hangup button to hangup instead of cancel call
- [::ChatWindow::GetOutText ${win_name}] tag bind siphangup$callid <Button1-ButtonRelease> [list ::amsn::HangupSIPCall $chatid $sip $callid]
+ [::ChatWindow::GetOutText ${win_name}] tag bind siphangup$callid <<Button1>> [list ::amsn::HangupSIPCall $chatid $sip $callid]
::ChatWindow::setHangupButton $chatid [list ::amsn::HangupSIPCall $chatid $sip $callid] [trans hangup]
}
@@ -2516,7 +2521,7 @@
-bordercolor [::skin::getKey chat_dp_border_color] \
-background [::skin::getKey chatwindowbg]
set pictureinner [$images.user_dp$idx getinnerframe]
- bind $pictureinner <Button1-ButtonRelease> [list ::amsn::ShowTopPicMenu $win $user %X %Y]
+ bind $pictureinner <<Button1>> [list ::amsn::ShowTopPicMenu $win $user %X %Y]
bind $pictureinner <<Button3>> [list ::amsn::ShowTopPicMenu $win $user %X %Y]
#TODO: support changing cusom dp's in the drophandler
# ::dnd bindtarget $pictureinner Files <Drop> "fileDropHandler %D setdp $user"
@@ -3684,9 +3689,9 @@
$textw tag bind $urlname <Leave> \
"$textw tag conf $urlname -underline true;\
$textw conf -cursor xterm"
- $textw tag bind $urlname <Button1-ButtonRelease> \
+ $textw tag bind $urlname <<Button1>> \
"$textw conf -cursor watch; launch_browser [string map {% %%} [list $urltext]]"
- $textw tag bind $urlname <Button3-ButtonRelease> [list ::amsn::SelectUrl $textw $urlname]
+ $textw tag bind $urlname <<Button3>> [list ::amsn::SelectUrl $textw $urlname]
$textw rodelete $pos $endpos
$textw roinsert $pos "$urltext" $urlname
@@ -3764,7 +3769,7 @@
[::ChatWindow::GetOutText ${win_name}] tag bind $tagid <Leave> \
"[::ChatWindow::GetOutText ${win_name}] tag conf $tagid -underline false;\
[::ChatWindow::GetOutText ${win_name}] conf -cursor xterm"
- [::ChatWindow::GetOutText ${win_name}] tag bind $tagid <Button1-ButtonRelease> "$command"
+ [::ChatWindow::GetOutText ${win_name}] tag bind $tagid <<Button1>> "$command"
[::ChatWindow::GetOutText ${win_name}] roinsert end "$txt" $tagid
if { $scrolling } { ::ChatWindow::Scroll [::ChatWindow::GetOutText ${win_name}] }
@@ -5238,7 +5243,7 @@
$clcanvas bind cancel_reconnect <Leave> \
"$clcanvas itemconfigure cancel_reconnect -fill [::skin::getKey loginurlfg] -font splainf;\
$clcanvas configure -cursor left_ptr"
- $clcanvas bind cancel_reconnect <Button1-ButtonRelease> \
+ $clcanvas bind cancel_reconnect <<Button1>> \
"preLogout \"::MSN::cancelReconnect\""
$clcanvas bind reconnect_now <Enter> \
@@ -5247,7 +5252,7 @@
$clcanvas bind reconnect_now <Leave> \
"$clcanvas itemconfigure reconnect_now -fill [::skin::getKey loginurlfg] -font splainf;\
$clcanvas configure -cursor left_ptr"
- $clcanvas bind reconnect_now <Button1-ButtonRelease> {
+ $clcanvas bind reconnect_now <<Button1>> {
after cancel ::MSN::connect
::MSN::connect
}
@@ -5301,7 +5306,7 @@
$clcanvas bind cancel_reconnect <Leave> \
"$clcanvas itemconfigure cancel_reconnect -fill [::skin::getKey loginurlfg] -font splainf;\
$clcanvas configure -cursor left_ptr"
- $clcanvas bind cancel_reconnect <Button1-ButtonRelease> \
+ $clcanvas bind cancel_reconnect <<Button1>> \
"preLogout \"::MSN::cancelReconnect\""
::guiContactList::centerItems $clcanvas
@@ -5611,7 +5616,7 @@
$tw tag add $name $imgIdx
$tw tag bind $name <Enter> "$tw image configure $imgIdx -image [::skin::loadPixmap ${image}_hover]; $tw conf -cursor hand2"
$tw tag bind $name <Leave> "$tw image configure $imgIdx -image [::skin::loadPixmap $image]; $tw conf -cursor left_ptr"
- $tw tag bind $name <Button1-ButtonRelease> "status_log \"$id\"; ::groups::ToggleStatus $id"
+ $tw tag bind $name <<Button1>> "status_log \"$id\"; ::groups::ToggleStatus $id"
}
#///////////////////////////////////////////////////////////////////////
@@ -5620,7 +5625,7 @@
set imgIdx [$tw image create end -image [::skin::loadPixmap $image] -padx $padx -pady $pady -align center]
$tw tag add $tw.$name $imgIdx
- $tw tag bind $tw.$name <Button1-ButtonRelease> $command
+ $tw tag bind $tw.$name <<Button1>> $command
$tw tag bind $tw.$name <Enter> "$tw configure -cursor hand2"
$tw tag bind $tw.$name <Leave> "$tw configure -cursor left_ptr"
}
@@ -5642,7 +5647,7 @@
$tw.$name bind mystatus_bg <Leave> [list $tw.$name itemconfigure mystatus_bg -image [::skin::loadPixmap mystatus_bg]]
}
- bind $tw.$name <Button1-ButtonRelease> $command
+ bind $tw.$name <<Button1>> $command
# Drag and Drop setting DP
::dnd bindtarget $tw.$name Files <Drop> "fileDropHandler %D setdp self"
@@ -5825,7 +5830,7 @@
-image [::skin::loadPixmap $my_image_type] \
-width [image width [::skin::loadPixmap $my_image_type]] \
-height [image height [::skin::loadPixmap $my_image_type]]
- bind $pgBuddyTop.bigstate <Button1-ButtonRelease> {kill_balloon; tk_popup .my_menu %X %Y}
+ bind $pgBuddyTop.bigstate <<Button1>> {kill_balloon; tk_popup .my_menu %X %Y}
set disppic $pgBuddyTop.bigstate
} else {
set disppic [clickableDisplayPicture $pgBuddyTop mystatus bigstate {kill_balloon; tk_popup .my_menu %X %Y} [::skin::getKey bigstate_xpad] [::skin::getKey bigstate_ypad]]
@@ -5873,7 +5878,7 @@
#Set up TAGS for mail notification
$pgBuddyTop.mail tag conf mail -fore [::skin::getKey emailfg] -underline false -font splainf
- $pgBuddyTop.mail tag bind mail <Button1-ButtonRelease> "$pgBuddyTop.mail conf -cursor watch; ::hotmail::hotmail_login"
+ $pgBuddyTop.mail tag bind mail <<Button1>> "$pgBuddyTop.mail conf -cursor watch; ::hotmail::hotmail_login"
$pgBuddyTop.mail tag bind mail <Enter> "$pgBuddyTop.mail tag conf mail -under true -fore [::skin::getKey emailhover] -background [::skin::getKey emailhoverbg];$pgBuddyTop.mail conf -cursor hand2"
$pgBuddyTop.mail tag bind mail <Leave> "$pgBuddyTop.mail tag conf mail -under false -fore [::skin::getKey emailfg] -background [::skin::getKey topcontactlistbg];$pgBuddyTop.mail conf -cursor left_ptr"
@@ -6030,13 +6035,7 @@
"[::config::getKey login]" "[trans status]: $my_state_desc"]
set fonts [list "sboldf" "sitalf" "splainf" "splainf"]
- #Change mouse button on Mac OS X
- if { [OnMac] } {
- $pgBuddyTop.mystatus bind mystatus <Button2-ButtonRelease> "kill_balloon; tk_popup .my_menu %X %Y"
- $pgBuddyTop.mystatus bind mystatus <Control-ButtonRelease> "kill_balloon; tk_popup .my_menu %X %Y"
- } else {
- $pgBuddyTop.mystatus bind mystatus <Button3-ButtonRelease> "kill_balloon; tk_popup .my_menu %X %Y"
- }
+ $pgBuddyTop.mystatus bind mystatus <<Button3>> "kill_balloon; tk_popup .my_menu %X %Y"
$pgBuddyTop.mystatus bind mystatus <Enter> \
[list ::guiContactList::underlineList $pgBuddyTop.mystatus [set underlinst(ul)] "all"]
@@ -6045,7 +6044,7 @@
+[list $pgBuddyTop.mystatus configure -cursor hand2]
$pgBuddyTop.mystatus bind mystatus <Leave> +[list $pgBuddyTop.mystatus configure -cursor left_ptr]
- $pgBuddyTop.mystatus bind mystatus <Button1-ButtonRelease> "kill_balloon; tk_popup .my_menu %X %Y"
+ $pgBuddyTop.mystatus bind mystatus <<Button1>> "kill_balloon; tk_popup .my_menu %X %Y"
$pgBuddyTop.mystatus bind mystatus <Enter> \
+[list balloon_enter %W %X %Y $balloon_message $pic_name $fonts complex]
$pgBuddyTop.mystatus bind mystatus <Leave> "+set Bulle(first) 0; kill_balloon"
@@ -6059,7 +6058,7 @@
+[list $pgBuddyTop.mystatus configure -cursor hand2]
$pgBuddyTop.mystatus bind mypsmmedia <Leave> +[list $pgBuddyTop.mystatus configure -cursor left_ptr]
- $pgBuddyTop.mystatus bind mypsmmedia <Button1-ButtonRelease> "kill_balloon; tk_popup .my_menu %X %Y"
+ $pgBuddyTop.mystatus bind mypsmmedia <<Button1>> "kill_balloon; tk_popup .my_menu %X %Y"
$pgBuddyTop.mystatus bind mypsmmedia <Enter> \
+[list balloon_enter %W %X %Y $balloon_message $pic_name $fonts complex]
$pgBuddyTop.mystatus bind mypsmmedia <Leave> "+set Bulle(first) 0; kill_balloon"
@@ -6071,13 +6070,7 @@
create_places_menu .my_places_menu
- #Change mouse button on Mac OS X
- if { [OnMac] } {
- $pgBuddyTop.mystatus bind myplaces <Button2-ButtonRelease> "kill_balloon; tk_popup .my_places_menu %X %Y"
- $pgBuddyTop.mystatus bind myplaces <Control-ButtonRelease> "kill_balloon; tk_popup .my_places_menu %X %Y"
- } else {
- $pgBuddyTop.mystatus bind myplaces <Button3-ButtonRelease> "kill_balloon; tk_popup .my_places_menu %X %Y"
- }
+ $pgBuddyTop.mystatus bind myplaces <<Button3>> "kill_balloon; tk_popup .my_places_menu %X %Y"
set ep_balloon ""
foreach ep [::abook::getEndPoints] {
@@ -6091,7 +6084,7 @@
+[list $pgBuddyTop.mystatus configure -cursor hand2]
$pgBuddyTop.mystatus bind myplaces <Leave> +[list $pgBuddyTop.mystatus configure -cursor left_ptr]
- $pgBuddyTop.mystatus bind myplaces <Button1-ButtonRelease> "kill_balloon; tk_popup .my_places_menu %X %Y"
+ $pgBuddyTop.mystatus bind myplaces <<Button1>> "kill_balloon; tk_popup .my_places_menu %X %Y"
$pgBuddyTop.mystatus bind myplaces <Enter> \
+[list balloon_enter %W %X %Y $ep_balloon "" $fonts simple]
$pgBuddyTop.mystatus bind myplaces <Leave> "+set Bulle(first) 0; kill_balloon"
@@ -6613,20 +6606,20 @@
bind $w.f.nick_entry <Return> "change_name_ok"
bind $w.f.psm_entry <Return> "change_name_ok"
bind $w.f.p4c_entry <Return> "change_name_ok"
- bind $w.f.nick_smiley <Button1-ButtonRelease> "focus $w.f.nick_entry; ::smiley::smileyMenu %X %Y $w.f.nick_entry"
- bind $w.f.psm_smiley <Button1-ButtonRelease> "focus $w.f.psm_entry; ::smiley::smileyMenu %X %Y $w.f.psm_entry"
- bind $w.f.p4c_smiley <Button1-ButtonRelease> "focus $w.f.p4c_entry; ::smiley::smileyMenu %X %Y $w.f.p4c_entry"
- bind $w.f.nick_newline <Button1-ButtonRelease> "$w.f.nick_entry insert end \"\n\""
- bind $w.f.psm_newline <Button1-ButtonRelease> "$w.f.psm_entry insert end \"\n\""
- bind $w.f.p4c_newline <Button1-ButtonRelease> "$w.f.p4c_entry insert end \"\n\""
+ bind $w.f.nick_smiley <<Button1>> "focus $w.f.nick_entry; ::smiley::smileyMenu %X %Y $w.f.nick_entry"
+ bind $w.f.psm_smiley <<Button1>> "focus $w.f.psm_entry; ::smiley::smileyMenu %X %Y $w.f.psm_entry"
+ bind $w.f.p4c_smiley <<Button1>> "focus $w.f.p4c_entry; ::smiley::smileyMenu %X %Y $w.f.p4c_entry"
+ bind $w.f.nick_newline <<Button1>> "$w.f.nick_entry insert end \"\n\""
+ bind $w.f.psm_newline <<Button1>> "$w.f.psm_entry insert end \"\n\""
+ bind $w.f.p4c_newline <<Button1>> "$w.f.p4c_entry insert end \"\n\""
bind $w.f.nick_entry <Tab> "focus $w.f.psm_entry; break"
bind $w.f.psm_entry <Tab> "focus $w.f.p4c_entry; break"
bind $w.f.p4c_entry <Tab> "focus $w.f.nick_entry; break"
bind $w.f.nick_entry <KeyRelease> "ChangeNameBarEdited $w nick"
bind $w.f.psm_entry <KeyRelease> "ChangeNameBarEdited $w psm"
- bind $w.f.nick_entry <Button2-ButtonRelease> "after 200 [list ::::ChangeNameBarEdited $w nick]"
- bind $w.f.psm_entry <Button2-ButtonRelease> "after 200 [list ::::ChangeNameBarEdited $w psm]"
+ bind $w.f.nick_entry <<Button2>> "after 200 [list ::::ChangeNameBarEdited $w nick]"
+ bind $w.f.psm_entry <<Button2>> "after 200 [list ::::ChangeNameBarEdited $w psm]"
# Make sure the smiley selector disappears with the window
bind $w <Destroy> { if {[winfo exists .smile_selector] } { wm state .smile_selector withdrawn }}
Modified: trunk/amsn/guicontactlist.tcl
===================================================================
--- trunk/amsn/guicontactlist.tcl 2008-08-10 23:27:02 UTC (rev 10386)
+++ trunk/amsn/guicontactlist.tcl 2008-08-12 21:43:28 UTC (rev 10387)
@@ -1634,7 +1634,7 @@
# Binding for right click
$canvas bind alarm_$email <<Button3>> "::alarms::configDialog \"$email\"; break;"
- $canvas bind alarm_$email <Button1-ButtonRelease> "switch_alarm \"$email\"; \
+ $canvas bind alarm_$email <<Button1>> "switch_alarm \"$email\"; \
::guiContactList::switch_alarm \"$email\" \"$canvas\" \"alarm_$email\"; break"
}
Modified: trunk/amsn/loging.tcl
===================================================================
--- trunk/amsn/loging.tcl 2008-08-10 23:27:02 UTC (rev 10386)
+++ trunk/amsn/loging.tcl 2008-08-12 21:43:28 UTC (rev 10387)
@@ -682,9 +682,9 @@
#not using -command to avoid constantly changing while user is dragging it around
#interp alias {} imgseek {} ::CAMGUI::Seek $wname [file join ${webcam_dir} ${email}.cam]
- bind $wname.position.slider <ButtonPress-1> "::CAMGUI::Pause $wname"
- #bind $wname.position.slider <Button1-ButtonRelease> {imgseek [%W get]}
- bind $wname.position.slider <ButtonRelease-1> [list ::CAMGUI::Resume $wname [file join ${webcam_dir} ${email}.cam]]
+ bind $wname.position.slider <<Button1-Press>> "::CAMGUI::Pause $wname"
+ #bind $wname.position.slider <<Button1>> {imgseek [%W get]}
+ bind $wname.position.slider <<Button1>> [list ::CAMGUI::Resume $wname [file join ${webcam_dir} ${email}.cam]]
pack $wname.top -side top -fill x
Modified: trunk/amsn/msncam.tcl
===================================================================
--- trunk/amsn/msncam.tcl 2008-08-10 23:27:02 UTC (rev 10386)
+++ trunk/amsn/msncam.tcl 2008-08-12 21:43:28 UTC (rev 10387)
@@ -139,7 +139,7 @@
if { [winfo exists $window] } {
wm protocol $window WM_DELETE_WINDOW "destroy $window"
#$window.q configure -command "destroy $window"
- #$window.canvas bind stopbut <Button1-ButtonRelease> [list destroy $window]
+ #$window.canvas bind stopbut <<Button1>> [list destroy $window]
$window.canvas delete stopbut
if { [getObjOption $sid producer] } {
@@ -1791,7 +1791,7 @@
#pack $window.paused -expand true -fill x
$canv create image 318 0 -anchor ne -image [::skin::loadPixmap pause] -state hidden -tags paused
$canv create image 318 240 -anchor se -image [::skin::loadPixmap stopbut] -activeimage [::skin::loadPixmap stopbuth] -tags stopbut
- $canv bind stopbut <Button1-ButtonRelease> [list ::MSNCAM::CancelCam $chatid $sid]
+ $canv bind stopbut <<Button1>> [list ::MSNCAM::CancelCam $chatid $sid]
$canv bind stopbut <Enter> [list balloon_enter %W %X %Y [trans stopwebcamreceive]]
$canv bind stopbut <Leave> "set Bulle(first) 0; kill_balloon"
$canv bind stopbut <Motion> [list balloon_motion %W %X %Y [trans stopwebcamreceive]]
@@ -1988,17 +1988,17 @@
set confbut [$canv create image 318 240 -anchor se -image [::skin::loadPixmap confbut] -activeimage [::skin::loadPixmap confbuth] -tags confbut]
set stopbut [$canv create image 290 240 -anchor se -image [::skin::loadPixmap stopbut] -activeimage [::skin::loadPixmap stopbuth] -tags stopbut]
set pausebut [$canv create image 262 240 -anchor se -image [::skin::loadPixmap pausebut] -activeimage [::skin::loadPixmap pausebuth] -tags pausebut]
- $canv bind stopbut <Button1-ButtonRelease> [list ::MSNCAM::CancelCam $chatid $sid]
+ $canv bind stopbut <<Button1>> [list ::MSNCAM::CancelCam $chatid $sid]
$canv bind stopbut <Enter> [list balloon_enter %W %X %Y [trans stopwebcamreceive]]
$canv bind stopbut <Leave> "set Bulle(first) 0; kill_balloon"
$canv bind stopbut <Motion> [list balloon_motion %W %X %Y [trans stopwebcamreceive]]
- $canv bind pausebut <Button1-ButtonRelease> [list ::MSNCAM::PausePlayCam $window $socket]
+ $canv bind pausebut <<Button1>> [list ::MSNCAM::PausePlayCam $window $socket]
$canv bind pausebut <Enter> [list balloon_enter %W %X %Y [trans pausewebcamsend]]
$canv bind pausebut <Leave> "set Bulle(first) 0; kill_balloon"
$canv bind pausebut <Motion> [list balloon_motion %W %X %Y [trans pausewebcamsend]]
- $canv bind confbut <Button1-ButtonRelease> [list ::CAMGUI::ShowPropertiesPage $grabber $img]
+ $canv bind confbut <<Button1>> [list ::CAMGUI::ShowPropertiesPage $grabber $img]
$canv bind confbut <Enter> [list balloon_enter %W %X %Y [trans changevideosettings]]
$canv bind confbut <Leave> "set Bulle(first) 0; kill_balloon"
$canv bind confbut <Motion> [list balloon_motion %W %X %Y [trans changevideosettings]]
@@ -2359,7 +2359,7 @@
-foreground #808080 -font bplainf -underline false
[::ChatWindow::GetOutText ${win_name}] tag bind askwebcam$chatid <Enter> ""
[::ChatWindow::GetOutText ${win_name}] tag bind askwebcam$chatid <Leave> ""
- [::ChatWindow::GetOutText ${win_name}] tag bind askwebcam$chatid <Button1-ButtonRelease> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind askwebcam$chatid <<Button1>> ""
[::ChatWindow::GetOutText ${win_name}] conf -cursor left_ptr
@@ -2380,7 +2380,7 @@
-foreground #808080 -font bplainf -underline false
[::ChatWindow::GetOutText ${win_name}] tag bind sendwebcam$chatid <Enter> ""
[::ChatWindow::GetOutText ${win_name}] tag bind sendwebcam$chatid <Leave> ""
- [::ChatWindow::GetOutText ${win_name}] tag bind sendwebcam$chatid <Button1-ButtonRelease> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind sendwebcam$chatid <<Button1>> ""
[::ChatWindow::GetOutText ${win_name}] conf -cursor left_ptr
#Send the invitation to send webcam
@@ -2399,14 +2399,14 @@
-foreground #808080 -font bplainf -underline false
[::ChatWindow::GetOutText ${win_name}] tag bind acceptwebcam$sid <Enter> ""
[::ChatWindow::GetOutText ${win_name}] tag bind acceptwebcam$sid <Leave> ""
- [::ChatWindow::GetOutText ${win_name}] tag bind acceptwebcam$sid <Button1-ButtonRelease> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind acceptwebcam$sid <<Button1>> ""
[::ChatWindow::GetOutText ${win_name}] tag configure nowebcam$sid \
-foreground #808080 -font bplainf -underline false
[::ChatWindow::GetOutText ${win_name}] tag bind nowebcam$sid <Enter> ""
[::ChatWindow::GetOutText ${win_name}] tag bind nowebcam$sid <Leave> ""
- [::ChatWindow::GetOutText ${win_name}] tag bind nowebcam$sid <Button1-ButtonRelease> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind nowebcam$sid <<Button1>> ""
[::ChatWindow::GetOutText ${win_name}] conf -cursor left_ptr
@@ -2429,14 +2429,14 @@
-foreground #808080 -font bplainf -underline false
[::ChatWindow::GetOutText ${win_name}] tag bind acceptwebcam$sid <Enter> ""
[::ChatWindow::GetOutText ${win_name}] tag bind acceptwebcam$sid <Leave> ""
- [::ChatWindow::GetOutText ${win_name}] tag bind acceptwebcam$sid <Button1-ButtonRelease> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind acceptwebcam$sid <<Button1>> ""
[::ChatWindow::GetOutText ${win_name}] tag configure nowebcam$sid \
-foreground #808080 -font bplainf -underline false
[::ChatWindow::GetOutText ${win_name}] tag bind nowebcam$sid <Enter> ""
[::ChatWindow::GetOutText ${win_name}] tag bind nowebcam$sid <Leave> ""
- [::ChatWindow::GetOutText ${win_name}] tag bind nowebcam$sid <Button1-ButtonRelease> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind nowebcam$sid <<Button1>> ""
[::ChatWindow::GetOutText ${win_name}] conf -cursor left_ptr
@@ -2460,7 +2460,7 @@
-foreground #808080 -font bplainf -underline false
[::ChatWindow::GetOutText ${win_name}] tag bind cancelwebcam$sid <Enter> ""
[::ChatWindow::GetOutText ${win_name}] tag bind cancelwebcam$sid <Leave> ""
- [::ChatWindow::GetOutText ${win_name}] tag bind cancelwebcam$sid <Button1-ButtonRelease> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind cancelwebcam$sid <<Button1>> ""
::amsn::WinWrite $chatid "\n" green
::amsn::WinWriteIcon $chatid greyline 3
@@ -2484,21 +2484,21 @@
-foreground #808080 -font bplainf -underline false
[::ChatWindow::GetOutText ${win_name}] tag bind cancelwebcam$sid <Enter> ""
[::ChatWindow::GetOutText ${win_name}] tag bind cancelwebcam$sid <Leave> ""
- [::ChatWindow::GetOutText ${win_name}] tag bind cancelwebcam$sid <Button1-ButtonRelease> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind cancelwebcam$sid <<Button1>> ""
# Disabling Accept Button
[::ChatWindow::GetOutText ${win_name}] tag configure acceptwebcam$sid \
-foreground #808080 -font bplainf -underline false
[::ChatWindow::GetOutText ${win_name}] tag bind acceptwebcam$sid <Enter> ""
[::ChatWindow::GetOutText ${win_name}] tag bind acceptwebcam$sid <Leave> ""
- [::ChatWindow::GetOutText ${win_name}] tag bind acceptwebcam$sid <Button1-ButtonRelease> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind acceptwebcam$sid <<Button1>> ""
# Disabling Decline Button
[::ChatWindow::GetOutText ${win_name}] tag configure nowebcam$sid \
-foreground #808080 -font bplainf -underline false
[::ChatWindow::GetOutText ${win_name}] tag bind nowebcam$sid <Enter> ""
[::ChatWindow::GetOutText ${win_name}] tag bind nowebcam$sid <Leave> ""
- [::ChatWindow::GetOutText ${win_name}] tag bind nowebcam$sid <Button1-ButtonRelease> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind nowebcam$sid <<Button1>> ""
::amsn::WinWrite $chatid "\n" green
::amsn::WinWriteIcon $chatid greyline 3
@@ -2767,8 +2767,8 @@
pack $lists $status $preview $settings $buttons -side top
- bind $devs.list <Button1-ButtonRelease> [list ::CAMGUI::FillChannelsLinux $devs.list $chans.list $status $devices]
- bind $chans.list <Button1-ButtonRelease> [list ::CAMGUI::StartPreviewLinux $devs.list $chans.list $status $devices $preview $settings]
+ bind $devs.list <<Button1>> [list ::CAMGUI::FillChannelsLinux $devs.list $chans.list $status $devices]
+ bind $chans.list <<Button1>> [list ::CAMGUI::StartPreviewLinux $devs.list $chans.list $status $devices $preview $settings]
foreach device $devices {
set dev [lindex $device 0]
@@ -3167,7 +3167,7 @@
pack $lists -side top -expand true -fill both
pack $status $preview $settings $buttons -side top
- bind $devs.list <Button1-ButtonRelease> "::CAMGUI::StartPreviewWindows $devs.list $status $preview $settings"
+ bind $devs.list <<Button1>> "::CAMGUI::StartPreviewWindows $devs.list $status $preview $settings"
foreach device $devices {
Modified: trunk/amsn/msngames.tcl
===================================================================
--- trunk/amsn/msngames.tcl 2008-08-10 23:27:02 UTC (rev 10386)
+++ trunk/amsn/msngames.tcl 2008-08-12 21:43:28 UTC (rev 10387)
@@ -967,7 +967,7 @@
-foreground #808080 -font bplainf -underline false
[::ChatWindow::GetOutText ${win_name}] tag bind cancelgame$sid <Enter> ""
[::ChatWindow::GetOutText ${win_name}] tag bind cancelgame$sid <Leave> ""
- [::ChatWindow::GetOutText ${win_name}] tag bind cancelgame$sid <Button1-ButtonRelease> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind cancelgame$sid <<Button1>> ""
[::ChatWindow::GetOutText ${win_name}] conf -cursor left_ptr
@@ -989,7 +989,7 @@
-foreground #808080 -font bplainf -underline false
[::ChatWindow::GetOutText ${win_name}] tag bind cancelgame$sid <Enter> ""
[::ChatWindow::GetOutText ${win_name}] tag bind cancelgame$sid <Leave> ""
- [::ChatWindow::GetOutText ${win_name}] tag bind cancelgame$sid <Button1-ButtonRelease> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind cancelgame$sid <<Button1>> ""
[::ChatWindow::GetOutText ${win_name}] conf -cursor left_ptr
@@ -1018,7 +1018,7 @@
-foreground #808080 -font bplainf -underline false
[::ChatWindow::GetOutText ${win_name}] tag bind cancelgame$sid <Enter> ""
[::ChatWindow::GetOutText ${win_name}] tag bind cancelgame$sid <Leave> ""
- [::ChatWindow::GetOutText ${win_name}] tag bind cancelgame$sid <Button1-ButtonRelease> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind cancelgame$sid <<Button1>> ""
[::ChatWindow::GetOutText ${win_name}] conf -cursor left_ptr
@@ -1079,14 +1079,14 @@
-foreground #808080 -font bplainf -underline false
[::ChatWindow::GetOutText ${win_name}] tag bind acceptgame$sid <Enter> ""
[::ChatWindow::GetOutText ${win_name}] tag bind acceptgame$sid <Leave> ""
- [::ChatWindow::GetOutText ${win_name}] tag bind acceptgame$sid <Button1-ButtonRelease> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind acceptgame$sid <<Button1>> ""
[::ChatWindow::GetOutText ${win_name}] tag configure rejectgame$sid \
-foreground #808080 -font bplainf -underline false
[::ChatWindow::GetOutText ${win_name}] tag bind rejectgame$sid <Enter> ""
[::ChatWindow::GetOutText ${win_name}] tag bind rejectgame$sid <Leave> ""
- [::ChatWindow::GetOutText ${win_name}] tag bind rejectgame$sid <Button1-ButtonRelease> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind rejectgame$sid <<Button1>> ""
[::ChatWindow::GetOutText ${win_name}] conf -cursor left_ptr
@@ -1108,14 +1108,14 @@
-foreground #808080 -font bplainf -underline false
[::ChatWindow::GetOutText ${win_name}] tag bind acceptgame$sid <Enter> ""
[::ChatWindow::GetOutText ${win_name}] tag bind acceptgame$sid <Leave> ""
- [::ChatWindow::GetOutText ${win_name}] tag bind acceptgame$sid <Button1-ButtonRelease> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind acceptgame$sid <<Button1>> ""
[::ChatWindow::GetOutText ${win_name}] tag configure rejectgame$sid \
-foreground #808080 -font bplainf -underline false
[::ChatWindow::GetOutText ${win_name}] tag bind rejectgame$sid <Enter> ""
[::ChatWindow::GetOutText ${win_name}] tag bind rejectgame$sid <Leave> ""
- [::ChatWindow::GetOutText ${win_name}] tag bind rejectgame$sid <Button1-ButtonRelease> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind rejectgame$sid <<Button1>> ""
[::ChatWindow::GetOutText ${win_name}] conf -cursor left_ptr
Modified: trunk/amsn/plugins/winks/winks.tcl
===================================================================
--- trunk/amsn/plugins/winks/winks.tcl 2008-08-10 23:27:02 UTC (rev 10386)
+++ trunk/amsn/plugins/winks/winks.tcl 2008-08-12 21:43:28 UTC (rev 10387)
@@ -701,14 +701,14 @@
#the winks menu for first time, the second click can launch
#this procedure without all winks having been created
catch {
- bind $w.c.$temp <Button1-ButtonRelease> "wm state $w withdrawn; ::MSN::ChatQueue $chatid \[list ::winks::SendWink $window_name $wink(sha1d)]"
- bind $w.c.$temp <Button2-ButtonRelease> "::winks::PlayWink \"$wink(swf)\""
- bind $w.c.$temp <Button3-ButtonRelease> "wm state $w withdrawn; ::winks::EditWinkDialog $chatid \"$wink(sha1d)\""
+ bind $w.c.$temp <<Button1>> "wm state $w withdrawn; ::MSN::ChatQueue $chatid \[list ::winks::SendWink $window_name $wink(sha1d)]"
+ bind $w.c.$temp <<Button2>> "::winks::PlayWink \"$wink(swf)\""
+ bind $w.c.$temp <<Button3>> "wm state $w withdrawn; ::winks::EditWinkDialog $chatid \"$wink(sha1d)\""
}
incr temp
}
}
- bind $w.c.new_but <Button1-ButtonRelease> "wm state $w withdrawn; ::winks::AddWinkFromMCO $window_name"
+ bind $w.c.new_but <<Button1>> "wm state $w withdrawn; ::winks::AddWinkFromMCO $window_name"
moveinscreen $w 5
event generate $w <Enter>
Modified: trunk/amsn/preferences.tcl
===================================================================
--- trunk/amsn/preferences.tcl 2008-08-10 23:27:02 UTC (rev 10386)
+++ trunk/amsn/preferences.tcl 2008-08-12 21:43:28 UTC (rev 10387)
@@ -2549,8 +2549,8 @@
pack $lfname.status $lfname.allowframe -side bottom -anchor w -fill x
pack $lfname.allowlist $lfname.buttons $lfname.blocklist -anchor w -side left -padx 10 -pady 10 -expand 1 -fill both
- bind $lfname.allowlist.box <Button3-ButtonRelease> "create_users_list_popup $lfname \"allow\" %X %Y"
- bind $lfname.blocklist.box <Button3-ButtonRelease> "create_users_list_popup $lfname \"block\" %X %Y"
+ bind $lfname.allowlist.box <<Button3>> "create_users_list_popup $lfname \"allow\" %X %Y"
+ bind $lfname.blocklist.box <<Button3>> "create_users_list_popup $lfname \"block\" %X %Y"
# Contact/Reverse lists
@@ -2608,8 +2608,8 @@
pack $lfname.status -side bottom -anchor w -fill x
pack $lfname.contactlist $lfname.buttons $lfname.reverselist -anchor w -side left -padx 10 -pady 10 -expand 1 -fill both
- bind $lfname.contactlist.box <Button3-ButtonRelease> "create_users_list_popup $lfname \"contact\" %X %Y"
- bind $lfname.reverselist.box <Button3-ButtonRelease> "create_users_list_popup $lfname \"reverse\" %X %Y"
+ bind $lfname.contactlist.box <<Button3>> "create_users_list_popup $lfname \"contact\" %X %Y"
+ bind $lfname.reverselist.box <<Button3>> "create_users_list_popup $lfname \"reverse\" %X %Y"
::Event::registerEvent contactRemoved protocol [list Fill_users_list_event $frm.lfname $frm.lfname2]
Modified: trunk/amsn/protocol.tcl
===================================================================
--- trunk/amsn/protocol.tcl 2008-08-10 23:27:02 UTC (rev 10386)
+++ trunk/amsn/protocol.tcl 2008-08-12 21:43:28 UTC (rev 10387)
@@ -8543,14 +8543,14 @@
-foreground #808080 -font bplainf -underline false
[::ChatWindow::GetOutText ${win_name}] tag bind avyes$cookie <Enter> ""
[::ChatWindow::GetOutText ${win_name}] tag bind avyes$cookie <Leave> ""
- [::ChatWindow::GetOutText ${win_name}] tag bind avyes$cookie <Button1-ButtonRelease> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind avyes$cookie <<Button1>> ""
[::ChatWindow::GetOutText ${win_name}] tag configure avno$cookie \
-foreground #808080 -font bplainf -underline false
[::ChatWindow::GetOutText ${win_name}] tag bind avno$cookie <Enter> ""
[::ChatWindow::GetOutText ${win_name}] tag bind avno$cookie <Leave> ""
- [::ChatWindow::GetOutText ${win_name}] tag bind avno$cookie <Button1-ButtonRelease> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind avno$cookie <<Button1>> ""
[::ChatWindow::GetOutText ${win_name}] conf -cursor left_ptr
@@ -8627,14 +8627,14 @@
-foreground #808080 -font bplainf -underline false
[::ChatWindow::GetOutText ${win_name}] tag bind avyes$cookie <Enter> ""
[::ChatWindow::GetOutText ${win_name}] tag bind avyes$cookie <Leave> ""
- [::ChatWindow::GetOutText ${win_name}] tag bind avyes$cookie <Button1-ButtonRelease> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind avyes$cookie <<Button1>> ""
[::ChatWindow::GetOutText ${win_name}] tag configure avno$cookie \
-foreground #808080 -font bplainf -underline false
[::ChatWindow::GetOutText ${win_name}] tag bind avno$cookie <Enter> ""
[::ChatWindow::GetOutText ${win_name}] tag bind avno$cookie <Leave> ""
- [::ChatWindow::GetOutText ${win_name}] tag bind avno$cookie <Button1-ButtonRelease> ""
+ [::ChatWindow::GetOutText ${win_name}] tag bind avno$cookie <<Button1>> ""
[::ChatWindow::GetOutText ${win_name}] conf -cursor left_ptr
Modified: trunk/amsn/skins.tcl
===================================================================
--- trunk/amsn/skins.tcl 2008-08-10 23:27:02 UTC (rev 10386)
+++ trunk/amsn/skins.tcl 2008-08-12 21:43:28 UTC (rev 10387)
@@ -1055,7 +1055,7 @@
::skinsGUI::DoPreview 1
bind $w <Destroy> "grab release $w"
- bind $w.main.right.box <Button1-ButtonRelease> "::skinsGUI::DoPreview"
+ bind $w.main.right.box <<Button1>> "::skinsGUI::DoPreview"
moveinscreen $w 30
}
Modified: trunk/amsn/smileys.tcl
===================================================================
--- trunk/amsn/smileys.tcl 2008-08-10 23:27:02 UTC (rev 10386)
+++ trunk/amsn/smileys.tcl 2008-08-12 21:43:28 UTC (rev 10387)
@@ -465,7 +465,7 @@
#this procedure without all smileys having been created
catch {
#TODO: Improve this now we know about quoting a bit more?
- bind $w.c.$temp <Button1-ButtonRelease> "catch {[list $text insert insert $symbol]\; wm state $w withdrawn; event generate $text <KeyRelease>} res"
+ bind $w.c.$temp <<Button1>> "catch {[list $text insert insert $symbol]\; wm state $w withdrawn; event generate $text <KeyRelease>} res"
}
incr temp
@@ -483,16 +483,10 @@
catch {
if { $emotion(reachable) == 1 } {
#TODO: Improve this now we know about quoting a bit more?
- bind $w.c.$temp <Button1-ButtonRelease> "catch {[list $text insert insert $symbol]\; wm state $w withdrawn; event generate $text <KeyRelease>} res"
+ bind $w.c.$temp <<Button1>> "catch {[list $text insert insert $symbol]\; wm state $w withdrawn; event generate $text <KeyRelease>} res"
}
#Add binding for custom emoticons
- if { [OnMac] } {
-
- bind $w.c.$temp <Button2-ButtonRelease> [list ::smiley::editCustomEmotion $name]
- bind $w.c.$temp <Control-ButtonRelease> [list ::smiley::editCustomEmotion $name]
- } else {
- bind $w.c.$temp <Button3-ButtonRelease> [list ::smiley::editCustomEmotion $name]
- }
+ bind $w.c.$temp <<Button3>> [list ::smiley::editCustomEmotion $name]
}
incr temp
@@ -775,7 +769,7 @@
label $w.c.custom_new -text "[trans custom_new]" -background [$w.c cget -background] -font sboldf
bind $w.c.custom_new <Enter> [list $w.c.custom_new configure -relief raised]
bind $w.c.custom_new <Leave> [list $w.c.custom_new configure -relief flat]
- bind $w.c.custom_new <Button1-ButtonRelease> "::smiley::newCustomEmoticonGUI; wm state $w withdrawn"
+ bind $w.c.custom_new <<Button1>> "::smiley::newCustomEmoticonGUI; wm state $w withdrawn"
set ypos [expr {(($rows-1)*$smih + ($smih/2))}]
$w.c create window 0 $ypos -window $w.c.custom_new -width [expr {$x_geo - 2}] -height $smih -anchor w
Modified: trunk/amsn/trayicon.tcl
===================================================================
--- trunk/amsn/trayicon.tcl 2008-08-10 23:27:02 UTC (rev 10386)
+++ trunk/amsn/trayicon.tcl 2008-08-12 21:43:28 UTC (rev 10387)
@@ -217,8 +217,8 @@
#add the icon
set statusicon [newti .si -tooltip offline -pixmap statustrayiconres -command "::trayicon_callback statustrayicon statustrayiconres"]
- bind .si <Button1-ButtonRelease> iconify_proc
- bind .si <Button3-ButtonRelease> "tk_popup $iconmenu %X %Y"
+ bind .si <<Button1>> iconify_proc
+ bind .si <<Button3>> "tk_popup $iconmenu %X %Y"
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|