add a new window for removing torrents that allows the torrent data to be also removed

deluge/ui/web/js/Deluge.Menus.js

@@ -70,12 +70,7 @@ Deluge.Menus = {
 				});
 				break;
 			case 'remove':
-				Deluge.Events.fire('torrentRemoved', ids);
+				Deluge.RemoveWindow.show(ids);
-				Deluge.Client.core.remove_torrent(ids, null, {
-					success: function() {
-						Deluge.UI.update();
-					}
-				});
 				break;
 			case 'recheck':
 				Deluge.Client.core.force_recheck(ids, {

deluge/ui/web/js/Deluge.Remove.js

@@ -0,0 +1,98 @@
+/*
+Script:
+	Deluge.Remove.js
+
+Copyright:
+	(C) Damien Churchill 2009 <damoxc@gmail.com>
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3, or (at your option)
+	any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, write to:
+		The Free Software Foundation, Inc.,
+		51 Franklin Street, Fifth Floor
+		Boston, MA  02110-1301, USA.
+
+	In addition, as a special exception, the copyright holders give
+	permission to link the code of portions of this program with the OpenSSL
+	library.
+	You must obey the GNU General Public License in all respects for all of
+	the code used other than OpenSSL. If you modify file(s) with this
+	exception, you may extend this exception to your version of the file(s),
+	but you are not obligated to do so. If you do not wish to do so, delete
+	this exception statement from your version. If you delete this exception
+	statement from all source files in the program, then also delete it here.
+*/
+
+Ext.deluge.RemoveWindow = Ext.extend(Ext.Window, {
+
+	constructor: function(config) {
+		config = Ext.apply({
+			title: _('Remove Torrent'),
+			layout: 'fit',
+			width: 350,
+			height: 90,
+			buttonAlign: 'right',
+			closeAction: 'hide',
+			closable: true,
+			plain: true,
+			iconCls: 'x-deluge-remove-window-icon'
+		}, config);
+		Ext.deluge.RemoveWindow.superclass.constructor.call(this, config);
+	},
+	
+	initComponent: function() {
+		Ext.deluge.RemoveWindow.superclass.initComponent.call(this);
+		this.addButton(_('Cancel'), this.onCancel, this);
+		this.addButton(_('Remove'), this.onRemove, this);
+		this.addButton(_('Remove with data'), this.onRemoveData, this);
+		
+		this.add({
+			border: false,
+			bodyStyle: 'padding: 5px;',
+			html: '<span>Are you sure you wish to remove the torrent(s)?</span>'
+		});
+	},
+	
+	show: function(ids) {
+		Ext.deluge.RemoveWindow.superclass.show.call(this);
+		this.torrentIds = ids;
+	},
+	
+	onCancel: function() {
+		this.hide();
+		this.torrentIds = null;
+		this.chkgrp.setValue([false, false]);
+	},
+	
+	onRemove: function() {
+		Deluge.Client.core.remove_torrent(this.torrentIds, false, {
+			success: this.onRemoved,
+			scope: this
+		});
+	},
+	
+	onRemoveData: function() {
+		Deluge.Client.core.remove_torrent(this.torrentIds, true, {
+			success: this.onRemoved,
+			scope: this
+		});
+	},
+	
+	onRemoved: function() {
+		Deluge.Events.fire('torrentRemoved', this.torrentIds);
+		this.torrentIds = null;
+		this.hide();
+		this.chkgrp.setValue([false, false]);
+		Deluge.UI.update();
+	}
+});
+
+Deluge.RemoveWindow = new Ext.deluge.RemoveWindow();

deluge/ui/web/js/Deluge.Toolbar.js

@@ -171,12 +171,7 @@ Copyright:
 			
 			switch (item.id) {
 				case 'remove':
-					Deluge.Events.fire('torrentRemoved', ids);
+					Deluge.RemoveWindow.show(ids);
-					Deluge.Client.core.remove_torrent(ids, null, {
-						success: function() {
-							Deluge.UI.update();
-						}
-					});
 					break;
 				case 'pause':
 				case 'resume':

deluge/ui/web/js/build.sh

@@ -1,4 +1,4 @@
-DELUGE_FILES="Deluge.js Deluge.Formatters.js Deluge.Menus.js Deluge.Events.js Deluge.OptionsManager.js Deluge.Add.js Deluge.Add.File.js Deluge.Add.Url.js Deluge.Client.js Deluge.ConnectionManager.js Deluge.Details.js Deluge.Details.Status.js Deluge.Details.Details.js Deluge.Details.Files.js Deluge.Details.Peers.js Deluge.Details.Options.js Deluge.EditTrackers.js Deluge.Keys.js Deluge.Login.js Deluge.Preferences.js Deluge.Preferences.Downloads.js Deluge.Preferences.Network.js Deluge.Preferences.Bandwidth.js Deluge.Preferences.Interface.js Deluge.Preferences.Other.js Deluge.Preferences.Daemon.js Deluge.Preferences.Queue.js Deluge.Preferences.Proxy.js Deluge.Preferences.Notification.js Deluge.Preferences.Plugins.js Deluge.Sidebar.js Deluge.Statusbar.js Deluge.Toolbar.js Deluge.Torrents.js Deluge.UI.js"
+DELUGE_FILES="Deluge.js Deluge.Formatters.js Deluge.Menus.js Deluge.Events.js Deluge.OptionsManager.js Deluge.Add.js Deluge.Add.File.js Deluge.Add.Url.js Deluge.Client.js Deluge.ConnectionManager.js Deluge.Details.js Deluge.Details.Status.js Deluge.Details.Details.js Deluge.Details.Files.js Deluge.Details.Peers.js Deluge.Details.Options.js Deluge.EditTrackers.js Deluge.Keys.js Deluge.Login.js Deluge.Preferences.js Deluge.Preferences.Downloads.js Deluge.Preferences.Network.js Deluge.Preferences.Bandwidth.js Deluge.Preferences.Interface.js Deluge.Preferences.Other.js Deluge.Preferences.Daemon.js Deluge.Preferences.Queue.js Deluge.Preferences.Proxy.js Deluge.Preferences.Notification.js Deluge.Preferences.Plugins.js Deluge.Remove.js Deluge.Sidebar.js Deluge.Statusbar.js Deluge.Toolbar.js Deluge.Torrents.js Deluge.UI.js"
 ALL_FILES="ext-extensions-debug.js $DELUGE_FILES"
 
 [ -e /usr/bin/jsdoc_toolkit ] && JSDOC="/usr/bin/jsdoc_toolkit"