begin the makings of the togglefield widget that allows enabling of move completed/copy torrent files/auto add torrent files fields

deluge/ui/web/js/Deluge.Preferences.Downloads.js

@@ -1,131 +1,151 @@
 /*
 Script: Deluge.Preferences.Downloads.js
-    The downloads preferences page.
+	The downloads preferences page.
 
 Copyright:
-    (C) Damien Churchill 2009 <damoxc@gmail.com>
+	(C) Damien Churchill 2009 <damoxc@gmail.com>
-    This program is free software; you can redistribute it and/or modify
+	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
+	it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3, or (at your option)
+	the Free Software Foundation; either version 3, or (at your option)
-    any later version.
+	any later version.
 
-    This program is distributed in the hope that it will be useful,
+	This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+	GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
+	You should have received a copy of the GNU General Public License
-    along with this program.  If not, write to:
+	along with this program.  If not, write to:
-        The Free Software Foundation, Inc.,
+		The Free Software Foundation, Inc.,
-        51 Franklin Street, Fifth Floor
+		51 Franklin Street, Fifth Floor
-        Boston, MA  02110-1301, USA.
+		Boston, MA  02110-1301, USA.
 
-    In addition, as a special exception, the copyright holders give
+	In addition, as a special exception, the copyright holders give
-    permission to link the code of portions of this program with the OpenSSL
+	permission to link the code of portions of this program with the OpenSSL
-    library.
+	library.
-    You must obey the GNU General Public License in all respects for all of
+	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
+	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),
+	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
+	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
+	this exception statement from your version. If you delete this exception
-    statement from all source files in the program, then also delete it here.
+	statement from all source files in the program, then also delete it here.
 */
 
 Ext.namespace('Ext.deluge.preferences');
 Ext.deluge.preferences.Downloads = Ext.extend(Ext.FormPanel, {
-    constructor: function(config) {
+	constructor: function(config) {
-        config = Ext.apply({
+		config = Ext.apply({
-            border: false,
+			border: false,
-            title: _('Downloads'),
+			title: _('Downloads'),
-            layout: 'form',
+			layout: 'form',
-            autoHeight: true
+			autoHeight: true,
-        }, config);
+			width: 300
-        Ext.deluge.preferences.Downloads.superclass.constructor.call(this, config);
+		}, config);
-    },
+		Ext.deluge.preferences.Downloads.superclass.constructor.call(this, config);
+	},
 
-    initComponent: function() {
+	initComponent: function() {
-        Ext.deluge.preferences.Downloads.superclass.initComponent.call(this);
+		Ext.deluge.preferences.Downloads.superclass.initComponent.call(this);
 
-        var optMan = Deluge.Preferences.getOptionsManager();
+		var optMan = Deluge.Preferences.getOptionsManager();
-        var fieldset = this.add({
+		var fieldset = this.add({
-            xtype: 'fieldset',
+			xtype: 'fieldset',
-            border: false,
+			border: false,
-            title: _('Folders'),
+			title: _('Folders'),
-            labelWidth: 150,
+			labelWidth: 150,
-            defaultType: 'textfield',
+			defaultType: 'togglefield',
-            autoHeight: true,
+			autoHeight: true,
-            labelAlign: 'top',
+			labelAlign: 'top',
-            width: 260,
+			width: 260,
-            style: 'margin-bottom: 5px; padding-bottom: 5px;'
+			style: 'margin-bottom: 5px; padding-bottom: 5px;'
-        });
+		});
-        optMan.bind('download_location', fieldset.add({
-            name: 'download_location',
-            fieldLabel: _('Download to'),
-            width: 240
-        }));
-        optMan.bind('move_completed_path', fieldset.add({
-            name: 'move_completed_path',
-            fieldLabel: _('Move completed to'),
-            width: 240,
-            disabled: true
-        }));
-        optMan.bind('torrentfiles_location', fieldset.add({
-            name: 'torrentfiles_location',
-            fieldLabel: _('Copy of .torrent files to'),
-            width: 240,
-            disabled: true
-        }));
-        optMan.bind('autoadd_location', fieldset.add({
-            name: 'autoadd_location',
-            fieldLabel: _('Autoadd .torrent files from'),
-            width: 240,
-            disabled: true
-        }));
 
-        fieldset = this.add({
+		optMan.bind('download_location', fieldset.add({
-            xtype: 'fieldset',
+			xtype: 'textfield',
-            border: false,
+			name: 'download_location',
-            title: _('Allocation'),
+			fieldLabel: _('Download to'),
-            autoHeight: true,
+			width: 240
-            labelWidth: 1,
+		}));
-            defaultType: 'radiogroup',
-            style: 'margin-bottom: 5px; padding-bottom: 5px;',
-            width: 260
-        });
-        optMan.bind('compact_allocation', fieldset.add({
-            name: 'compact_allocation',
-            labelSeparator: '',
-            items: [
-                {boxLabel: _('Compact') + '&nbsp;', inputValue: true, name: 'compact_allocation'},
-                {boxLabel: _('Full'), inputValue: false, name: 'compact_allocation'}
-            ]
-        }));
 
-        fieldset = this.add({
+		var field = fieldset.add({
-            xtype: 'fieldset',
+			name: 'move_completed_path',
-            border: false,
+			fieldLabel: _('Move completed to'),
-            title: _('Options'),
+			width: 240
-            autoHeight: true,
+		});
-            labelWidth: 1,
+		optMan.bind('move_completed', field.toggle);
-            defaultType: 'checkbox',
+		optMan.bind('move_completed_path', field.input);
-            width: 260
-        });
-        optMan.bind('prioritize_first_last_pieces', fieldset.add({
-            name: 'prioritize_first_last_pieces',
-            labelSeparator: '',
-            boxLabel: _('Prioritize first and last pieces of torrent')
-        }));
-        optMan.bind('add_paused', fieldset.add({
-            name: 'add_paused',
-            labelSeparator: '',
-            boxLabel: _('Add torrents in Paused state')
-        }));
 
-        this.on('show', this.onShow, this);
+		field = fieldset.add({
-    },
+			name: 'torrentfiles_location',
+			fieldLabel: _('Copy of .torrent files to'),
+			width: 240
+		});
+		optMan.bind('copy_torrent_file', field.toggle);
+		optMan.bind('torrentfiles_location', field.input);
 
-    onShow: function() {
+		field = fieldset.add({
-        Ext.deluge.preferences.Downloads.superclass.onShow.call(this);
+			name: 'autoadd_location',
-    }
+			fieldLabel: _('Autoadd .torrent files from'),
+			width: 240
+		});
+		optMan.bind('autoadd_enable', field.toggle);
+		optMan.bind('autoadd_location', field.input);
+	
+		fieldset = this.add({
+			xtype: 'fieldset',
+			border: false,
+			title: _('Allocation'),
+			autoHeight: true,
+			labelWidth: 1,
+			defaultType: 'radiogroup',
+			style: 'margin-bottom: 5px; padding-bottom: 5px;',
+			width: 260
+		});
+		optMan.bind('compact_allocation', fieldset.add({
+			name: 'compact_allocation',
+			width: 200,
+			labelSeparator: '',
+			defaults: {
+				width: 80,
+				height: 25,
+				name: 'compact_allocation'
+			},
+			items: [{
+				boxLabel: _('Use Full'),
+				inputValue: false
+			}, {
+				boxLabel: _('Use Compact'),
+				inputValue: true
+			}]
+		}));
+	
+		fieldset = this.add({
+			xtype: 'fieldset',
+			border: false,
+			title: _('Options'),
+			autoHeight: true,
+			labelWidth: 1,
+			defaultType: 'checkbox',
+			width: 280
+		});
+		optMan.bind('prioritize_first_last_pieces', fieldset.add({
+			name: 'prioritize_first_last_pieces',
+			labelSeparator: '',
+			height: 24,
+			boxLabel: _('Prioritize first and last pieces of torrent')
+		}));
+		optMan.bind('add_paused', fieldset.add({
+			name: 'add_paused',
+			labelSeparator: '',
+			height: 24,
+			boxLabel: _('Add torrents in Paused state')
+		}));
+	
+		this.on('show', this.onShow, this);
+	},
+
+	onShow: function() {
+		Ext.deluge.preferences.Downloads.superclass.onShow.call(this);
+	}
 });
 Deluge.Preferences.addPage(new Ext.deluge.preferences.Downloads());

deluge/ui/web/js/ext-extensions-debug.js

@@ -2,27 +2,90 @@
  * Copyright (c) 2008, Steven Chim
  * All rights reserved.
  * 
- * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are 
+ * met:
  * 
- *     * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ *  * Redistributions of source code must retain the above copyright 
- *     * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
  *     * The names of its contributors may not be used to endorse or promote products derived from this software without specific prior written permission.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+Ext.namespace("Ext.ux.form");
+
+/**
+  * Ext.ux.form.ToggleField class
+  *
+  * @author Damien Churchill
+  * @version v0.1
+  *
+  * @class Ext.ux.form.ToggleField
+  * @extends Ext.form.TriggerField
+  */
+Ext.ux.form.ToggleField = Ext.extend(Ext.form.Field, {
+
+	cls: 'x-toggle-field',
+
+	initComponent: function() {
+		Ext.ux.form.ToggleField.superclass.initComponent.call(this);
+
+		this.toggle = new Ext.form.Checkbox({
+			region: 'west'
+		});
+		this.toggle.on('check', this.onToggleCheck, this);
+
+		this.input = new Ext.form.TextField({
+			region: 'center',
+			disabled: true
+		});
+	},
+
+	onRender: function(ct, position) {
+		if (!this.el) {
+			this.panel = new Ext.Panel({
+				cls: this.groupCls,
+				layout: 'border',
+				border: false,
+				renderTo: ct
+			});
+			this.panel.ownerCt = this;
+			this.el = this.panel.getEl();
+
+			this.toggle.ownerCt = this.panel;
+			this.toggle.render(this.el);
+
+			this.input.ownerCt = this.panel;
+			this.input.render(this.el);
+
+			this.panel.doLayout();
+		}
+		Ext.ux.form.ToggleField.superclass.onRender.call(this, ct, position);
+	},
+
+	// private
+	onResize: function(w, h) {
+		this.panel.setSize(w, h);
+		this.panel.doLayout();
+	},
+
+	onToggleCheck: function(toggle, checked) {
+		this.input.setDisabled(!checked);
+	}
+});
+Ext.reg('togglefield', Ext.ux.form.ToggleField);
+
 /**
   * Ext.ux.form.Spinner Class
-	*
+  *
-	* @author  Steven Chim
+  * @author  Steven Chim
-	* @version Spinner.js 2008-08-27 v0.35
+  * @version Spinner.js 2008-08-27 v0.35
   *
   * @class Ext.ux.form.Spinner
   * @extends Ext.form.TriggerField
   */
-
-Ext.namespace("Ext.ux.form");
-
 Ext.ux.form.Spinner = function(config){
 	Ext.ux.form.Spinner.superclass.constructor.call(this, config);
 	this.addEvents({