Author: andar
Revision: 5426
Log:
Move 'add_peer_dialog' to peers_tab.py where it should belong..
Diff:
Modified: trunk/deluge/ui/gtkui/common.py
===================================================================
--- trunk/deluge/ui/gtkui/common.py 2009-06-27 22:30:01 UTC (rev 5425)
+++ trunk/deluge/ui/gtkui/common.py 2009-06-27 22:49:01 UTC (rev 5426)
@@ -181,27 +181,3 @@
dialog.destroy()
return value
-
-def add_peer_dialog():
- dialog_glade = gtk.glade.XML(
- pkg_resources.resource_filename("deluge.ui.gtkui",
- "glade/dgtkpopups.glade"))
- peer_dialog = dialog_glade.get_widget("connect_peer_dialog")
- txt_ip = dialog_glade.get_widget("txt_ip")
- response = peer_dialog.run()
- if response:
- value = txt_ip.get_text()
- if ']' in value:
- #ipv6
- ip = value.split("]")[0][1:]
- port = value.split("]")[1][1:]
- else:
- #ipv4
- ip = value.split(":")[0]
- port = value.split(":")[1]
- if deluge.common.is_ip(ip):
- id = component.get("TorrentView").get_selected_torrent()
- log.debug("adding peer %s to %s", value, id)
- client.core.connect_peer(id, ip, port)
- peer_dialog.destroy()
- return True
Modified: trunk/deluge/ui/gtkui/peers_tab.py
===================================================================
--- trunk/deluge/ui/gtkui/peers_tab.py 2009-06-27 22:30:01 UTC (rev 5425)
+++ trunk/deluge/ui/gtkui/peers_tab.py 2009-06-27 22:49:01 UTC (rev 5426)
@@ -46,7 +46,6 @@
import deluge.configmanager
import deluge.component as component
import deluge.common
-import deluge.ui.gtkui.common as common
from deluge.ui.gtkui.listview import cell_data_speed as cell_data_speed
from deluge.ui.gtkui.torrentdetails import Tab
from deluge.log import LOG as log
@@ -375,5 +374,24 @@
def _on_menuitem_add_peer_activate(self, menuitem):
"""This is a callback for manually adding a peer"""
log.debug("on_menuitem_add_peer")
- common.add_peer_dialog()
+ dialog_glade = gtk.glade.XML(
+ pkg_resources.resource_filename("deluge.ui.gtkui",
+ "glade/dgtkpopups.glade"))
+ peer_dialog = dialog_glade.get_widget("connect_peer_dialog")
+ txt_ip = dialog_glade.get_widget("txt_ip")
+ response = peer_dialog.run()
+ if response:
+ value = txt_ip.get_text()
+ if ']' in value:
+ #ipv6
+ ip = value.split("]")[0][1:]
+ port = value.split("]")[1][1:]
+ else:
+ #ipv4
+ ip = value.split(":")[0]
+ port = value.split(":")[1]
+ if deluge.common.is_ip(ip):
+ log.debug("adding peer %s to %s", value, self.torrent_id)
+ client.core.connect_peer(self.torrent_id, ip, port)
+ peer_dialog.destroy()
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
-~----------~----~----~----~------~----~------~--~---
