diff --git a/deluge/ui/gtkui/glade/remove_torrent_dialog2.glade b/deluge/ui/gtkui/glade/remove_torrent_dialog2.glade new file mode 100644 index 0000000..2ee3dd6 --- /dev/null +++ b/deluge/ui/gtkui/glade/remove_torrent_dialog2.glade @@ -0,0 +1,182 @@ + + + + + + False + 5 + False + True + center-on-parent + True + dialog + + + True + False + 2 + + + True + False + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + 1 + True + True + True + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + + + True + False + 0 + gtk-dialog-warning + 6 + + + False + False + 0 + + + + + True + False + + + True + False + 0 + <big><b>Remove the selected torrent?</b></big> + True + + + False + False + 3 + 0 + + + + + Include downloaded files + True + False + False + False + False + True + + + False + False + 1 + 1 + + + + + False + + + True + False + 0 + 2 + <b><small>Files will be irreversably deleted</small></b> + True + + + False + False + 0 + + + + + True + False + gtk-dialog-warning + + + False + False + 1 + + + + + False + False + 2 + + + + + True + True + 1 + + + + + True + True + 5 + 1 + + + + + True + False + + + False + True + 2 + + + + + + diff --git a/deluge/ui/gtkui/removetorrentdialog.py b/deluge/ui/gtkui/removetorrentdialog.py index 36257ee..17c1788 100644 --- a/deluge/ui/gtkui/removetorrentdialog.py +++ b/deluge/ui/gtkui/removetorrentdialog.py @@ -65,25 +65,27 @@ def __init__(self, torrent_ids): glade = gtk.glade.XML( pkg_resources.resource_filename("deluge.ui.gtkui", - "glade/remove_torrent_dialog.glade")) + "glade/remove_torrent_dialog2.glade")) self.__dialog = glade.get_widget("remove_torrent_dialog") self.__dialog.set_transient_for(component.get("MainWindow").window) self.__dialog.set_title("") + self.__original_size = self.__dialog.get_size() + + self.__delete_files = glade.get_widget("delete_files") + self.__warning_box = glade.get_widget("warning_box") + self.__delete_files.connect("toggled", self.__toggle_warning) + if len(self.__torrent_ids) > 1: # We need to pluralize the dialog - label_title = glade.get_widget("label_title") - button_ok = glade.get_widget("button_ok_label") - button_data = glade.get_widget("button_data_label") + label_title = glade.get_widget("label_title") def pluralize_torrents(text): plural_torrent = _("Torrents") return text.replace("torrent", plural_torrent.lower()).replace("Torrent", plural_torrent) label_title.set_markup(pluralize_torrents(label_title.get_label())) - button_ok.set_label(pluralize_torrents(button_ok.get_label())) - button_data.set_label(pluralize_torrents(button_data.get_label())) def __remove_torrents(self, remove_data): # Unselect all to avoid issues with the selection changed event @@ -92,19 +94,22 @@ def __remove_torrents(self, remove_data): for torrent_id in self.__torrent_ids: client.core.remove_torrent(torrent_id, remove_data) + def __toggle_warning(self, toggle_button): + active = toggle_button.get_active() + self.__warning_box.set_visible(active) + self.__dialog.resize(*self.__original_size) + def run(self): """ Shows the dialog and awaits for user input. The user can select to remove the torrent(s) from the session with or without their data. """ # Response IDs from the buttons - RESPONSE_SESSION = 1 - RESPONSE_DATA = 2 + RESPONSE_OK = 1 response = self.__dialog.run() - if response == RESPONSE_SESSION: - self.__remove_torrents(False) - elif response == RESPONSE_DATA: - self.__remove_torrents(True) + if response == RESPONSE_OK: + do_file_delete = self.__delete_files.get_active() + self.__remove_torrents(do_file_delete) self.__dialog.destroy()