diff --git a/twander.py b/twander.py index e4212fc..111fe85 100755 --- a/twander.py +++ b/twander.py @@ -6,7 +6,7 @@ # Program Information PROGNAME = "twander" -RCSID = "$Id: twander.py,v 3.159 2005/01/09 01:28:03 tundra Exp $" +RCSID = "$Id: twander.py,v 3.160 2005/01/12 08:20:05 tundra Exp $" VERSION = RCSID.split()[2] # Copyright Information @@ -85,8 +85,9 @@ MOUSECTX = '' # Pop-up Command Menu MOUSEDIR = '' # Pop-up Directory Menu MOUSEHIST = '' # Pop-up History Menu -MOUSEWILD = '' # Pop-up Wildcard Menu MOUSESC = '' # Pop-up Shortcut Menu +MOUSESORT = '' # Pop-up Sort Menu +MOUSEWILD = '' # Pop-up Wildcard Menu KEYPRESS = '' # Any keypress (for commands) QUITPROG = '' # Quit the program READCONF = '' # Re-read the configuration file @@ -461,7 +462,7 @@ # Name The Key/Mouse Assignments Which We Do Not Allow To Be Rebound In The Config File -NOREBIND = ["MOUSECTX", "MOUSEDIR", "MOUSEHIST", "MOUSEWILD", "MOUSESC", "MOUSEBACK","MOUSEUP", "MOUSESEL"] +NOREBIND = ["MOUSECTX", "MOUSEDIR", "MOUSEHIST", "MOUSESC", "MOUSESORT", "MOUSEWILD", "MOUSEBACK","MOUSEUP", "MOUSESEL"] ##### @@ -948,8 +949,9 @@ "MOUSECTX":MOUSECTX, "MOUSEDIR":MOUSEDIR, "MOUSEHIST":MOUSEHIST, - "MOUSEWILD":MOUSEWILD, "MOUSESC":MOUSESC, + "MOUSESORT":MOUSESORT, + "MOUSEWILD":MOUSEWILD, "KEYPRESS":KEYPRESS, "QUITPROG":QUITPROG, "READCONF":READCONF, @@ -1857,10 +1859,13 @@ self.DirList.bind(self.KeyBindings["MOUSEHIST"], MouseClick) # Bind handler to invoke Directory Menu - self.DirList.bind(self.KeyBindings["MOUSEWILD"], MouseClick) + self.DirList.bind(self.KeyBindings["MOUSESC"], MouseClick) # Bind handler to invoke Directory Menu - self.DirList.bind(self.KeyBindings["MOUSESC"], MouseClick) + self.DirList.bind(self.KeyBindings["MOUSESORT"], MouseClick) + + # Bind handler to invoke Directory Menu + self.DirList.bind(self.KeyBindings["MOUSEWILD"], MouseClick) # Bind handler for individual keystrokes self.DirList.bind(self.KeyBindings["KEYPRESS"], KeystrokeHandler) @@ -2245,14 +2250,18 @@ x, y = UI.DirList.winfo_pointerxy() # Position near mouse PopupMenu(UI.DirBtn.menu, x, y) # Display Directory Menu + elif event.state == (Button3Mask | ControlMask): # Control-Button-3 + x, y = UI.DirList.winfo_pointerxy() # Position near mouse + PopupMenu(UI.ShortBtn.menu, x, y) # Display Shortcut Menu + + elif event.state == (Button3Mask | AltMask | ShiftMask): # Alt-Shift-Button-3 + x, y = UI.DirList.winfo_pointerxy() # Position near mouse + PopupMenu(UI.SortBtn.menu, x, y) # Display Sort Menu + 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 - elif event.state == (Button3Mask | ControlMask): # Alt-Button-3 - x, y = UI.DirList.winfo_pointerxy() # Position near mouse - PopupMenu(UI.ShortBtn.menu, x, y) # Display Shortcut Menu - # End Of 'MouseClick()'