From 0a9cccb5e81eaec8e66d27f98f6694d4319e4749 Mon Sep 17 00:00:00 2001 From: Damien Churchill Date: Thu, 1 Oct 2009 10:51:27 +0000 Subject: [PATCH] Fix up the sizing of the downloads preference page --- deluge/ui/web/js/Deluge.Client.js | 1 - .../ui/web/js/Deluge.Preferences.Downloads.js | 211 +++++++++--------- 2 files changed, 108 insertions(+), 104 deletions(-) diff --git a/deluge/ui/web/js/Deluge.Client.js b/deluge/ui/web/js/Deluge.Client.js index a2152838d..e82528f92 100644 --- a/deluge/ui/web/js/Deluge.Client.js +++ b/deluge/ui/web/js/Deluge.Client.js @@ -29,7 +29,6 @@ Copyright: 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.namespace('Ext.ux.util'); diff --git a/deluge/ui/web/js/Deluge.Preferences.Downloads.js b/deluge/ui/web/js/Deluge.Preferences.Downloads.js index 170872204..78b5e7b24 100644 --- a/deluge/ui/web/js/Deluge.Preferences.Downloads.js +++ b/deluge/ui/web/js/Deluge.Preferences.Downloads.js @@ -3,22 +3,22 @@ Script: Deluge.Preferences.Downloads.js The downloads preferences page. Copyright: - (C) Damien Churchill 2009 - 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. + (C) Damien Churchill 2009 + 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. + 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. + 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 @@ -33,94 +33,99 @@ Copyright: Ext.namespace('Ext.deluge.preferences'); Ext.deluge.preferences.Downloads = Ext.extend(Ext.FormPanel, { - constructor: function(config) { - config = Ext.apply({ - border: false, - title: _('Downloads'), - layout: 'form', - autoHeight: true - }, config); - Ext.deluge.preferences.Downloads.superclass.constructor.call(this, config); - }, - - initComponent: function() { - Ext.deluge.preferences.Downloads.superclass.initComponent.call(this); - - var optMan = Deluge.Preferences.getOptionsManager(); - var fieldset = this.add({ - xtype: 'fieldset', - border: false, - title: _('Folders'), - labelWidth: 150, - defaultType: 'textfield', - autoHeight: true, - labelAlign: 'top' - }); - 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({ - xtype: 'fieldset', - border: false, - title: _('Allocation'), - autoHeight: true, - labelWidth: 1, - defaultType: 'radiogroup' - }); - optMan.bind('compact_allocation', fieldset.add({ - name: 'compact_allocation', - labelSeparator: '', - items: [ - {boxLabel: _('Compact') + ' ', inputValue: true}, - {boxLabel: _('Full'), inputValue: false} - ] - })); - - fieldset = this.add({ - xtype: 'fieldset', - border: false, - title: _('Options'), - autoHeight: true, - labelWidth: 1, - defaultType: 'checkbox' - }); - 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); - }, - - onShow: function() { - Ext.deluge.preferences.Downloads.superclass.onShow.call(this); - } + constructor: function(config) { + config = Ext.apply({ + border: false, + title: _('Downloads'), + layout: 'form', + autoHeight: true + }, config); + Ext.deluge.preferences.Downloads.superclass.constructor.call(this, config); + }, + + initComponent: function() { + Ext.deluge.preferences.Downloads.superclass.initComponent.call(this); + + var optMan = Deluge.Preferences.getOptionsManager(); + var fieldset = this.add({ + xtype: 'fieldset', + border: false, + title: _('Folders'), + labelWidth: 150, + defaultType: 'textfield', + autoHeight: true, + labelAlign: 'top', + width: 260, + 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({ + 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', + labelSeparator: '', + items: [ + {boxLabel: _('Compact') + ' ', inputValue: true}, + {boxLabel: _('Full'), inputValue: false} + ] + })); + + fieldset = this.add({ + xtype: 'fieldset', + border: false, + title: _('Options'), + autoHeight: true, + labelWidth: 1, + defaultType: 'checkbox', + 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); + }, + + onShow: function() { + Ext.deluge.preferences.Downloads.superclass.onShow.call(this); + } }); Deluge.Preferences.addPage(new Ext.deluge.preferences.Downloads()); \ No newline at end of file