mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-04 15:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move 'add_peer_dialog' to peers_tab.py where it should belong..

Browse source
This commit is contained in:
Andrew Resch 2009-06-27 22:49:01 +00:00
commit 2ccebaca3b
2 changed files with 20 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

24
deluge/ui/gtkui/common.py
View file

@ -181,27 +181,3 @@ def show_other_dialog(header, type_str, image_stockid=None, image_filename=None,
dialog.destroy() dialog.destroy()
return value 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

22
deluge/ui/gtkui/peers_tab.py
View file

@ -46,7 +46,6 @@ from deluge.configmanager import ConfigManager
import deluge.configmanager import deluge.configmanager
import deluge.component as component import deluge.component as component
import deluge.common 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.listview import cell_data_speed as cell_data_speed
from deluge.ui.gtkui.torrentdetails import Tab from deluge.ui.gtkui.torrentdetails import Tab
from deluge.log import LOG as log from deluge.log import LOG as log
@ -375,5 +374,24 @@ class PeersTab(Tab):
def _on_menuitem_add_peer_activate(self, menuitem): def _on_menuitem_add_peer_activate(self, menuitem):
"""This is a callback for manually adding a peer""" """This is a callback for manually adding a peer"""
log.debug("on_menuitem_add_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 return True