diff --git a/deluge/ui/web/js/deluge-details.js b/deluge/ui/web/js/deluge-details.js index 948b96923..6379ab389 100644 --- a/deluge/ui/web/js/deluge-details.js +++ b/deluge/ui/web/js/deluge-details.js @@ -118,7 +118,7 @@ Deluge.Details.Status = { getFields: function() { var panel = this.panel.items.get('status-details'); this.fields = new Hash(); - panel.body.dom.getElements('dd').each(function(item) { + $(panel.body.dom).getElements('dd').each(function(item) { this.fields[item.getProperty('class')] = item; }, this); }, @@ -141,7 +141,8 @@ Deluge.Details.Status = { Deluge.Details.Details = { onRender: function(panel) { - this.panel = panel.load({ + this.panel = panel; + panel.load({ url: '/render/tab_details.html', text: _('Loading') + '...', callback: this.onLoaded.bindWithEvent(this) @@ -177,7 +178,7 @@ Deluge.Details.Details = { getFields: function() { this.fields = new Hash(); - this.panel.body.dom.getElements('dd').each(function(item) { + $(this.panel.body.dom.firstChild).getElements('dd').each(function(item) { this.fields[item.getProperty('class')] = item; }, this); }, @@ -342,6 +343,12 @@ Deluge.Details.Peers = { } } +Deluge.Details.Options = { + onRender: function(panel) { + + } +} + function flag(value) { return String.format('', value); } @@ -403,12 +410,22 @@ Deluge.Details.Panel = new Ext.TabPanel({ items: [{ id: 'status', title: _('Status'), - listeners: {'render': {fn: Deluge.Details.Status.onRender, scope: Deluge.Details.Status}} - },{ + listeners: { + 'render': { + fn: Deluge.Details.Status.onRender, + scope: Deluge.Details.Status + } + } + }, { id: 'details', title: _('Details'), cls: 'deluge-status', - listeners: {'render': {fn: Deluge.Details.Details.onRender, scope: Deluge.Details.Details}} + listeners: { + 'render': { + fn: Deluge.Details.Details.onRender, + scope: Deluge.Details.Details + } + } }, new Ext.tree.ColumnTree({ id: 'files', title: _('Files'), @@ -420,17 +437,17 @@ Deluge.Details.Panel = new Ext.TabPanel({ header: _('Filename'), width: 330, dataIndex: 'filename' - },{ + }, { header: _('Size'), width: 150, dataIndex: 'size', renderer: fsize - },{ + }, { header: _('Progress'), width: 150, dataIndex: 'progress', renderer: progress_renderer - },{ + }, { header: _('Priority'), width: 150, dataIndex: 'priority', @@ -467,38 +484,57 @@ Deluge.Details.Panel = new Ext.TabPanel({ deferredRender:false, autoScroll:true, margins: '0 0 0 0', - listeners: {'render': {fn: Deluge.Details.Peers.onRender, scope: Deluge.Details.Peers}} + listeners: { + 'render': { + fn: Deluge.Details.Peers.onRender, + scope: Deluge.Details.Peers + } + } }), new Ext.form.FormPanel({ id: 'options', title: _('Options'), frame: true, + autoScroll:true, + deferredRender:false, items: [{ layout: 'column', border: false, defaults: { - columnWidth: '.33', + columnWidth: '.25', border: false }, items: [{ - bodyStyle: 'padding-right:5px;', + bodyStyle: 'padding-left: 5px; padding-right:5px;', items: [{ xtype: 'fieldset', title: _('Bandwidth'), + layout: 'table', + bodyStyle:'padding:5px', + layoutConfig: {columns: 2}, autoHeight: true, + labelWidth: 150, defaultType: 'uxspinner', items: [{ fieldLabel: _('Max Download Speed'), - name: 'max_download_speed' + name: 'max_download_speed', + html: '1,1' + }, { + xtype: 'label', + text: 'KiB/s', + html: '1,2' }, { fieldLabel: _('Max Upload Speed'), - name: 'max_upload_speed' + name: 'max_upload_speed', + width: 100 }, { fieldLabel: _('Max Connections'), - name: 'max_connections' + name: 'max_connections', + width: 100 }, { fieldLabel: _('Max Upload Slots'), - name: 'max_upload_slots' + name: 'max_upload_slots', + width: 100 }] }] }, { @@ -507,21 +543,26 @@ Deluge.Details.Panel = new Ext.TabPanel({ xtype: 'fieldset', title: _('Queue'), autoHeight: true, + labelWidth: 10, defaultType: 'checkbox', items: [{ fieldLabel: '', + labelSeparator: '', boxLabel: _('Auto Managed'), name: 'auto_managed' }, { fieldLabel: '', + labelSeparator: '', boxLabel: _('Stop seed at ratio'), name: 'stop_ratio' }, { fieldLabel: '', + labelSeparator: '', boxLabel: _('Remove at ratio'), name: 'remove_ratio' }, { fieldLabel: '', + labelSeparator: '', boxLabel: _('Move Completed'), name: 'move_completed' }] @@ -535,16 +576,24 @@ Deluge.Details.Panel = new Ext.TabPanel({ defaultType: 'checkbox', items: [{ fieldLabel: '', + labelSeparator: '', boxLabel: _('Private'), name: 'private' }, { fieldLabel: '', + labelSeparator: '', boxLabel: _('Prioritize First/Last'), name: 'prioritize_first' }] }] }], - }] + }], + listeners: { + 'render': { + fn: Deluge.Details.Options.onRender, + scope: Deluge.Details.Options + } + } })], listeners: { 'render': {fn: Deluge.Details.onRender, scope: Deluge.Details}, diff --git a/deluge/ui/web/js/deluge-ext.js b/deluge/ui/web/js/deluge-ext.js index 60e6c2654..fab643e4f 100644 --- a/deluge/ui/web/js/deluge-ext.js +++ b/deluge/ui/web/js/deluge-ext.js @@ -21,12 +21,6 @@ Copyright: Boston, MA 02110-1301, USA. */ -Deluge.FilesTreeLoader = Ext.extend(Ext.tree.TreeLoader, { - initComponent: function() { - Deluge.FilesTreeLoader.superclass.initComponent.call(this); - }, -}); - Deluge.ProgressBar = Ext.extend(Ext.ProgressBar, { initComponent: function() { Deluge.ProgressBar.superclass.initComponent.call(this); diff --git a/deluge/ui/web/js/deluge-menus.js b/deluge/ui/web/js/deluge-menus.js index 433e8f0dd..3965756b5 100644 --- a/deluge/ui/web/js/deluge-menus.js +++ b/deluge/ui/web/js/deluge-menus.js @@ -97,15 +97,15 @@ Deluge.Menus.Torrent = new Ext.menu.Menu({ iconCls: 'x-deluge-downloading', menu: new Ext.menu.Menu({ items: [{ - text: _('5 KiB/s'), + text: _('5 KiB/s') }, { - text: _('10 KiB/s'), + text: _('10 KiB/s') }, { - text: _('30 KiB/s'), + text: _('30 KiB/s') }, { - text: _('80 KiB/s'), + text: _('80 KiB/s') }, { - text: _('300 KiB/s'), + text: _('300 KiB/s') },{ text: _('Unlimited') }] @@ -115,15 +115,15 @@ Deluge.Menus.Torrent = new Ext.menu.Menu({ iconCls: 'x-deluge-seeding', menu: new Ext.menu.Menu({ items: [{ - text: _('5 KiB/s'), + text: _('5 KiB/s') }, { - text: _('10 KiB/s'), + text: _('10 KiB/s') }, { - text: _('30 KiB/s'), + text: _('30 KiB/s') }, { - text: _('80 KiB/s'), + text: _('80 KiB/s') }, { - text: _('300 KiB/s'), + text: _('300 KiB/s') },{ text: _('Unlimited') }] @@ -133,15 +133,15 @@ Deluge.Menus.Torrent = new Ext.menu.Menu({ iconCls: 'x-deluge-connections', menu: new Ext.menu.Menu({ items: [{ - text: _('50'), + text: _('50') }, { - text: _('100'), + text: _('100') }, { - text: _('200'), + text: _('200') }, { - text: _('300'), + text: _('300') }, { - text: _('500'), + text: _('500') },{ text: _('Unlimited') }] @@ -151,15 +151,15 @@ Deluge.Menus.Torrent = new Ext.menu.Menu({ icon: '/icons/upload_slots.png', menu: new Ext.menu.Menu({ items: [{ - text: _('0'), + text: _('0') }, { - text: _('1'), + text: _('1') }, { - text: _('2'), + text: _('2') }, { - text: _('3'), + text: _('3') }, { - text: _('5'), + text: _('5') },{ text: _('Unlimited') }]