codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bug showing the menu via key in the torrentview (Closes #1191)

This commit is contained in:
Damien Churchill 2010-04-01 08:28:50 +01:00
parent 772653d872
commit ac7a1f0065
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
deluge/ui/gtkui/torrentview.py
View File

@ -243,7 +243,7 @@ class TorrentView(listview.ListView, component.Component):
self.on_selection_changed) self.on_selection_changed)
self.treeview.connect("drag-drop", self.on_drag_drop) 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("TorrentStateChangedEvent", self.on_torrentstatechanged_event)
client.register_event_handler("TorrentAddedEvent", self.on_torrentadded_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) torrentmenu.popup(None, None, None, event.button, event.time)
return True 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): def on_selection_changed(self, treeselection):
"""This callback is know when the selection has changed.""" """This callback is know when the selection has changed."""
log.debug("on_selection_changed") log.debug("on_selection_changed")
@ -546,10 +534,19 @@ class TorrentView(listview.ListView, component.Component):
keyname = gtk.gdk.keyval_name(event.keyval) keyname = gtk.gdk.keyval_name(event.keyval)
func = getattr(self, 'keypress_' + keyname, None) func = getattr(self, 'keypress_' + keyname, None)
if func: if func:
return func() return func(event)
def keypress_Delete(self): def keypress_Delete(self, event):
log.debug("keypress_Delete") log.debug("keypress_Delete")
torrents = self.get_selected_torrents() torrents = self.get_selected_torrents()
if torrents: if torrents:
RemoveTorrentDialog(torrents).run() 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