summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Resch <andrewresch@gmail.com>2009-12-14 18:46:08 +0000
committerAndrew Resch <andrewresch@gmail.com>2009-12-14 18:46:08 +0000
commitcc3f3495b64e78615a7276e8f9cb2dd617f1baef (patch)
tree30eabea9ba1e0f834affd5ca3818c069319796d0
parent4bd00aa33117e8ff89503d8ae2a90ad397259bbc (diff)
downloaddeluge-cc3f3495b64e78615a7276e8f9cb2dd617f1baef.tar.gz
deluge-cc3f3495b64e78615a7276e8f9cb2dd617f1baef.tar.bz2
deluge-cc3f3495b64e78615a7276e8f9cb2dd617f1baef.zip
Fix #768 save tracker list for create torrent dialog
-rw-r--r--ChangeLog1
-rw-r--r--deluge/ui/gtkui/createtorrentdialog.py11
-rw-r--r--deluge/ui/gtkui/gtkui.py3
3 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5fbb88434..9885b6cf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,7 @@
* Fix #594 tray password dialog freeze in Windows
* Made the password dialog prettier
* Fix #1086 deprecated gtk.Tooltips usage
+ * Fix #768 save tracker list for create torrent dialog
==== Console ====
* Fix using the console in Windows, but only in command-line mode
diff --git a/deluge/ui/gtkui/createtorrentdialog.py b/deluge/ui/gtkui/createtorrentdialog.py
index 2201a9c9a..7fcc18345 100644
--- a/deluge/ui/gtkui/createtorrentdialog.py
+++ b/deluge/ui/gtkui/createtorrentdialog.py
@@ -118,7 +118,7 @@ class CreateTorrentDialog:
psize = int(psize) * 1024
if metric[0] == 'M':
psize *= 1024
-
+
return psize
def adjust_piece_size(self):
@@ -322,7 +322,7 @@ class CreateTorrentDialog:
def hide_progress(result):
self.glade.get_widget("progress_dialog").hide_all()
-
+
deferToThread(self.create_torrent,
path,
tracker,
@@ -389,7 +389,10 @@ class CreateTorrentDialog:
dialog = glade.get_widget("add_tracker_dialog")
dialog.set_transient_for(self.dialog)
textview = glade.get_widget("textview_trackers")
- textview.get_buffer().set_text("")
+ if self.config["createtorrent.trackers"]:
+ textview.get_buffer().set_text("\n".join(self.config["createtorrent.trackers"]))
+ else:
+ textview.get_buffer().set_text("")
textview.grab_focus()
response = dialog.run()
@@ -398,6 +401,8 @@ class CreateTorrentDialog:
trackers = []
b = textview.get_buffer()
lines = b.get_text(b.get_start_iter(), b.get_end_iter()).strip().split("\n")
+ self.config["createtorrent.trackers"] = lines
+ log.debug("lines: %s", lines)
for l in lines:
if deluge.common.is_url(l):
trackers.append(l)
diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py
index 96f43f5be..edcab6a80 100644
--- a/deluge/ui/gtkui/gtkui.py
+++ b/deluge/ui/gtkui/gtkui.py
@@ -152,7 +152,8 @@ DEFAULT_PREFS = {
"sidebar_show_zero": False,
"sidebar_show_trackers": True,
"sidebar_position": 170,
- "show_rate_in_title": False
+ "show_rate_in_title": False,
+ "createtorrent.trackers": []
}
class GtkUI(object):