diff --git a/deluge/ui/gtkui/addtorrentdialog.py b/deluge/ui/gtkui/addtorrentdialog.py index 35a7139dd..fa2b99e5b 100644 --- a/deluge/ui/gtkui/addtorrentdialog.py +++ b/deluge/ui/gtkui/addtorrentdialog.py @@ -210,7 +210,7 @@ class AddTorrentDialog(component.Component): if not row and new_row: self.listview_torrents.get_selection().select_iter(new_row) - self.builder.get_object("label_torrent_count").set_text("Torrents (%d)" % len(self.torrent_liststore)) + self.dialog.set_title("Add Torrents (%d)" % len(self.torrent_liststore)) if already_added: log.debug("Tried to add %d duplicate torrents!", already_added) diff --git a/deluge/ui/gtkui/glade/add_torrent_dialog.ui b/deluge/ui/gtkui/glade/add_torrent_dialog.ui index cc20975d2..b4d098ab5 100644 --- a/deluge/ui/gtkui/glade/add_torrent_dialog.ui +++ b/deluge/ui/gtkui/glade/add_torrent_dialog.ui @@ -28,7 +28,6 @@ False - 5 Add Torrents center-on-parent True @@ -43,37 +42,286 @@ True True - + True False - 0 - none + 3 + 5 + 5 - + True False - 5 - 12 - 12 + 2 - + + True + True + automatic + automatic + in + + + 71 + True + True + False + + + + + True + True + 0 + + + + + True + False + center + + + False + True + True + True + + + + True + False + 4 + + + True + False + gtk-open + 1 + + + False + False + 0 + + + + + True + False + _File + True + + + False + False + 1 + + + + + + + False + False + 0 + + + + + False + True + True + True + + + + True + False + 4 + + + True + False + gtk-network + 1 + + + False + False + 0 + + + + + True + False + _URL + True + + + False + False + 1 + + + + + + + False + False + 1 + + + + + False + True + True + True + + + + True + False + 4 + + + True + False + gtk-revert-to-saved + 1 + + + False + False + 0 + + + + + True + False + Info_hash + True + + + False + False + 1 + + + + + + + False + False + 2 + + + + + False + True + True + True + + + + True + False + 4 + + + True + False + gtk-remove + + + False + False + 0 + + + + + True + False + _Remove + True + + + False + False + 1 + + + + + + + False + False + 3 + + + + + False + False + 1 + + + + + + + False + True + + + + + True + False + 5 + 5 + + + True + True + False + 1 + + + True + True + 2 + automatic + automatic + in + + + True + True + 1 + False + True + + + + + + True False - + True - True - automatic - automatic - in - - - 100 - True - True - False - - + False + gtk-open True @@ -82,51 +330,246 @@ - + True False - center + Fi_les + True + + + True + True + 5 + 1 + + + + + False + + + + + True + False + 3 + 3 + + + True + False + 0 + none - - False + True - True - True - + False + 1 + 5 + 5 - + True False - 2 - 4 - + + + + + + + + + True + False + Download Folder + + + + + + + + False + False + 0 + + + + + True + False + 0 + none + + + True + False + 5 + 5 + + + True + False + + + False True - False - gtk-open - 1 + True + False + True + False - False + True 0 - + + + + + + + + + True + False + Move Complete Folder + + + + + + + + False + False + 1 + + + + + True + False + 10 + + + True + False + 0 + none + + + True + False + 7 + 12 + + True False - _File - True + + + Add In _Paused State + False + True + True + False + True + True + + + False + False + 0 + + + + + Prioritize First/Last Pieces + False + True + True + False + True + + + False + False + 1 + + + + + Sequential Download + False + True + True + False + True + When enabled, the piece picker will pick pieces in +sequence instead of rarest first. + +Enabling sequential download will affect the piece +distribution negatively in the swarm. It should be +used sparingly. + True + + + False + False + 2 + + + + + Skip File Hash Check + False + True + True + False + Useful if adding a complete torrent for seeding. + True + + + True + True + 3 + + + + + Preallocate Disk Space + False + True + True + False + Preallocate the disk space for the torrent files + True + + + False + False + 4 + + - - False - False - 1 - + + + True + False + General + + + + + False @@ -135,46 +578,175 @@ - - False + True - True - True - + False + 0 + none - + True False - 2 - 4 + 12 + 5 - + True False - gtk-network - 1 + 4 + 2 + 12 + + + True + True + 1 + False + False + True + True + adjustment1 + + + 1 + 2 + + + + + + + True + False + Maximum torrent download speed + 0 + Down Speed: + + + GTK_FILL + + + + + + True + False + Maximum torrent upload speed + 0 + Up Speed: + + + 1 + 2 + GTK_FILL + + + + + + True + False + Maximum torrent connections + 0 + Connections: + + + 2 + 3 + GTK_FILL + + + + + + True + False + Maximum torrent upload slots + 0 + Upload Slots: + + + 3 + 4 + GTK_FILL + + + + + + True + True + 1 + False + False + True + True + adjustment2 + if-valid + + + 1 + 2 + 1 + 2 + + + + + + + True + True + 1 + False + False + True + True + adjustment3 + + + 1 + 2 + 2 + 3 + + + + + + + True + True + 1 + False + False + True + True + adjustment4 + + + 1 + 2 + 3 + 4 + + + + - - False - False - 0 - - - - - True - False - _URL - True - - - False - False - 1 - + + + True + False + Bandwidth + + + + + False @@ -182,758 +754,174 @@ 1 - - - False - True - True - True - - - - True - False - 2 - 4 - - - True - False - gtk-revert-to-saved - 1 - - - False - False - 0 - - - - - True - False - Info_hash - True - - - False - False - 1 - - - - - - - False - False - 2 - - - - - False - True - True - True - - - - True - False - 4 - - - True - False - gtk-remove - - - False - False - 0 - - - - - True - False - _Remove - True - - - False - False - 1 - - - - - - - False - False - 3 - - False False - 1 + 2 - - - - - - - True - False - Torrents - - - - - - - - True - False - - - - - True - True - False - - - True - True - 5 - automatic - automatic - out - - - True - True - False - True - - - - - - - True - False - - - True - False - gtk-open - - - True - True - 0 - - - - - True - False - Fi_les - True - - - True - True - 5 - 1 - - - - - False - - - - - True - False - 5 - 5 - - - True - False - 0 - none - + True False - 5 - 5 - 5 + 5 - + True False + 5 - - - - - - - - - True - False - Download Folder - - - - - - - - False - False - 0 - - - - - True - False - 0 - none - - - True - False - 5 - 5 - 5 - - - True - False - - + False True True - False - True - + True + + + + True + False + + + True + False + 1 + gtk-apply + + + False + False + 0 + + + + + True + False + 0 + Apply To All + + + False + False + 5 + 1 + + + + - - False - True - 0 - - - - + + False + False + end + 0 + - - - - - True - False - Move Complete Folder - - - - - - - - False - False - 1 - - - - - True - False - 10 - - - True - False - 0 - none - + True False - 5 - 7 - 12 - + + False True - False + True + True + - - Add In _Paused State - False + True - True - False - True - True + False + + + True + False + gtk-revert-to-saved + + + False + False + 0 + + + + + True + False + Revert To Defaults + + + False + False + 5 + 1 + + - - False - False - 0 - - - - - Prioritize First/Last Pieces - False - True - True - False - True - - - False - False - 1 - - - - - Sequential Download - False - True - True - False - True - When enabled, the piece picker will pick pieces in -sequence instead of rarest first. - -Enabling sequential download will affect the piece -distribution negatively in the swarm. It should be -used sparingly. - True - - - False - False - 2 - - - - - Skip File Hash Check - False - True - True - False - Useful if adding a complete torrent for seeding. - True - - - True - True - 3 - - - - - Preallocate Disk Space - False - True - True - False - Preallocate the disk space for the torrent files - True - - - False - False - 4 - - - - - True - False - General - - - - + + False + False + end + 1 + False False + 3 + + + + + 1 + + + + + True + False + + + True + False + gtk-properties + + + True + True 0 - + True False - 0 - none - - - True - False - 5 - 12 - - - True - False - 4 - 2 - 10 - - - True - True - 1 - False - False - True - True - adjustment1 - - - 1 - 2 - - - - - - - True - False - Maximum torrent download speed - 0 - Down Speed: - - - GTK_FILL - - - - - - True - False - Maximum torrent upload speed - 0 - Up Speed: - - - 1 - 2 - GTK_FILL - - - - - - True - False - Maximum torrent connections - 0 - Connections: - - - 2 - 3 - GTK_FILL - - - - - - True - False - Maximum torrent upload slots - 0 - Upload Slots: - - - 3 - 4 - GTK_FILL - - - - - - True - True - 1 - False - False - True - True - adjustment2 - if-valid - - - 1 - 2 - 1 - 2 - - - - - - - True - True - 1 - False - False - True - True - adjustment3 - - - 1 - 2 - 2 - 3 - - - - - - - True - True - 1 - False - False - True - True - adjustment4 - - - 1 - 2 - 3 - 4 - - - - - - - - - - - True - False - Bandwidth - - - - - + _Options + True - False - False + True + True + 5 1 - False - False - 2 - - - - - True - False - 5 - - - True - False - - - False - True - True - True - - - - True - False - - - True - False - 1 - gtk-apply - - - False - False - 0 - - - - - True - False - 0 - Apply To All - - - False - False - 5 - 1 - - - - - - - - - False - False - end - 0 - - - - - True - False - - - False - True - True - True - - - - True - False - - - True - False - gtk-revert-to-saved - - - False - False - 0 - - - - - True - False - Revert To Defaults - - - False - False - 5 - 1 - - - - - - - - - False - False - end - 1 - - - - - False - False - 3 - - - - - 1 - - - - - True - False - - - True - False - gtk-properties - - - True - True - 0 - - - - - True - False - _Options - True - - - True - True - 5 1 + False - - 1 - False -