diff --git a/.twander b/.twander index 83da763..dfe0610 100644 --- a/.twander +++ b/.twander @@ -1,5 +1,5 @@ # 'twander' Configuration File Example -# $Id: .twander,v 1.63 2005/01/29 04:35:10 tundra Exp $ +# $Id: .twander,v 1.64 2005/02/01 22:32:53 tundra Exp $ # # Contains list of all possible variables (and defaults, if any) for: # @@ -233,7 +233,8 @@ # Wildcard Features -# MOUSEWILD = # Pop-up Wildcard Menu +# MOUSEFILTER = # Pop-up Filter Wildcard Menu +# MOUSEWILD = # Pop-up Selection Wildcard Menu # FILTERWILD = # Filter file list with wildcard # SELWILD = # Select using wildcards # TOGFILT = # Toggle logical sense of wildcard filtering diff --git a/twander.py b/twander.py index e4f1063..9508829 100755 --- a/twander.py +++ b/twander.py @@ -6,7 +6,7 @@ # Program Information PROGNAME = "twander" -RCSID = "$Id: twander.py,v 3.187 2005/02/01 22:11:09 tundra Exp $" +RCSID = "$Id: twander.py,v 3.188 2005/02/01 22:36:33 tundra Exp $" VERSION = RCSID.split()[2] # Copyright Information @@ -193,7 +193,8 @@ # Wildcard Features -MOUSEWILD = '' # Pop-up Wildcard Menu +MOUSEFILTER = '' # Pop-up Filter Wildcard Menu +MOUSEWILD = '' # Pop-up Selection Wildcard Menu FILTERWILD = '' # Filter file list with wildcard SELWILD = '' # Select using wildcards TOGFILT = '' # Invert the filter wildcard logic @@ -485,7 +486,7 @@ # Name The Key/Mouse Assignments Which We Do Not Allow To Be Rebound In The Config File -NOREBIND = ["MOUSECTX", "MOUSEDIR", "MOUSEHIST", "MOUSESC", "MOUSESORT", "MOUSEWILD", "MOUSEBACK","MOUSEUP", "MOUSESEL"] +NOREBIND = ["MOUSECTX", "MOUSEDIR", "MOUSEHIST", "MOUSESC", "MOUSESORT", "MOUSEFILTER", "MOUSEWILD", "MOUSEBACK","MOUSEUP", "MOUSESEL"] ##### @@ -1189,6 +1190,7 @@ "SORTBYNAME":SORTBYNAME, "SORTREV":SORTREV, "SORTSEP":SORTSEP, + "MOUSEFILTER":MOUSEFILTER, "MOUSEWILD":MOUSEWILD, "FILTERWILD":FILTERWILD, "SELWILD":SELWILD, @@ -2260,7 +2262,10 @@ # Wildcard Related Keys ##### - # Bind handler to invoke Directory Menu + # Bind handler to invoke Filter Wildcard Menu + self.DirList.bind(self.KeyBindings["MOUSEFILTER"], MouseClick) + + # Bind handler to invoke Selection Wildcard Menu self.DirList.bind(self.KeyBindings["MOUSEWILD"], MouseClick) # Bind handler for "Filter With Wildcard" @@ -2496,7 +2501,11 @@ elif event.state == (Button3Mask | AltMask | ControlMask): # Alt-Control-Button-3 x, y = UI.DirList.winfo_pointerxy() # Position near mouse - PopupMenu(UI.WildBtn.menu, x, y) # Display Wildcard Menu + PopupMenu(UI.WildBtn.menu, x, y) # Display Selection Wildcard Menu + + elif event.state == (Button2Mask | AltMask | ControlMask): # Alt-Control-Button-2 + x, y = UI.DirList.winfo_pointerxy() # Position near mouse + PopupMenu(UI.WildBtn.menu, x, y) # Display Filter Wildcard Menu # End Of 'MouseClick()' @@ -3051,7 +3060,7 @@ KeySelNone(event) # Unless the user indicates otherwise, cook the regex so - # a match can occur anywhere on the line + # a match can occur anywhere on the line. if uwc[0] == STRICTMATCH: wc = uwc[1:]