Module: deluge Branch: master Commit: ac7a1f0065ef6ad94db68dba64f3b52ea120742d
Author: Damien Churchill <[email protected]> Date: Thu Apr 1 08:28:50 2010 +0100 fix bug showing the menu via key in the torrentview (Closes #1191) --- deluge/ui/gtkui/torrentview.py | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py index be3f3d3..0862aae 100644 --- a/deluge/ui/gtkui/torrentview.py +++ b/deluge/ui/gtkui/torrentview.py @@ -243,7 +243,7 @@ class TorrentView(listview.ListView, component.Component): self.on_selection_changed) self.treeview.connect("drag-drop", self.on_drag_drop) - self.treeview.connect("key_press_event", self.on_key_press_event) + self.treeview.connect("key-press-event", self.on_key_press_event) client.register_event_handler("TorrentStateChangedEvent", self.on_torrentstatechanged_event) client.register_event_handler("TorrentAddedEvent", self.on_torrentadded_event) @@ -492,18 +492,6 @@ class TorrentView(listview.ListView, component.Component): torrentmenu.popup(None, None, None, event.button, event.time) return True - def on_key_press_event(self, widget, event): - # Menu key - if gtk.gdk.keyval_name(event.keyval) != "Menu": - return - - if not self.get_selected_torrent(): - return - - torrentmenu = component.get("MenuBar").torrentmenu - torrentmenu.popup(None, None, None, 3, event.time) - return True - def on_selection_changed(self, treeselection): """This callback is know when the selection has changed.""" log.debug("on_selection_changed") @@ -546,10 +534,19 @@ class TorrentView(listview.ListView, component.Component): keyname = gtk.gdk.keyval_name(event.keyval) func = getattr(self, 'keypress_' + keyname, None) if func: - return func() + return func(event) - def keypress_Delete(self): + def keypress_Delete(self, event): log.debug("keypress_Delete") torrents = self.get_selected_torrents() if torrents: RemoveTorrentDialog(torrents).run() + + def keypress_Menu(self, event): + log.debug("keypress_Menu") + if not self.get_selected_torrent(): + return + + torrentmenu = component.get("MenuBar").torrentmenu + torrentmenu.popup(None, None, None, 3, event.time) + return True -- You received this message because you are subscribed to the Google Groups "deluge-commit" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/deluge-commit?hl=en.
