codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re-enable a number of disabled scripts 

use hbox for the buttonPanel and remove the pre ext3 hack
This commit is contained in:
Damien Churchill 2010-01-26 13:59:25 +00:00
parent 447cb52bf1
commit 3368c4c67d
11 changed files with 29 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deluge/ui/web/js/deluge-all/.build
View File

@ -32,7 +32,6 @@ add_file "Deluge.Preferences.Other.js"
add_file "Deluge.Preferences.Daemon.js" add_file "Deluge.Preferences.Daemon.js"
add_file "Deluge.Preferences.Queue.js" add_file "Deluge.Preferences.Queue.js"
add_file "Deluge.Preferences.Proxy.js" add_file "Deluge.Preferences.Proxy.js"
add_file "Deluge.Preferences.Notification.js"
add_file "Deluge.Preferences.Cache.js" add_file "Deluge.Preferences.Cache.js"
add_file "Deluge.Preferences.Plugins.js" add_file "Deluge.Preferences.Plugins.js"
add_file "Deluge.Remove.js" add_file "Deluge.Remove.js"

20
deluge/ui/web/js/deluge-all/Deluge.Details.Options.js
View File

@ -77,7 +77,7 @@ Ext.deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
*/ */
this.fieldsets.bandwidth = this.add({ this.fieldsets.bandwidth = this.add({
xtype: 'fieldset', xtype: 'fieldset',
defaultType: 'uxspinner', defaultType: 'spinnerfield',
bodyStyle: 'padding: 5px', bodyStyle: 'padding: 5px',
layout: 'table', layout: 'table',
@ -228,7 +228,7 @@ Ext.deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
}); });
this.fields.stop_ratio = this.fieldsets.queue.add({ this.fields.stop_ratio = this.fieldsets.queue.add({
xtype: 'uxspinner', xtype: 'spinnerfield',
id: 'stop_ratio', id: 'stop_ratio',
name: 'stop_ratio', name: 'stop_ratio',
disabled: true, disabled: true,
@ -271,7 +271,7 @@ Ext.deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
border: false, border: false,
autoHeight: true, autoHeight: true,
style: 'margin-left: 5px', style: 'margin-left: 5px',
width: 200 width: 210
}); });
this.fieldsets.general = this.rightColumn.add({ this.fieldsets.general = this.rightColumn.add({
@ -306,24 +306,15 @@ Ext.deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
* Buttons * Buttons
*/ */
this.buttonPanel = this.rightColumn.add({ this.buttonPanel = this.rightColumn.add({
layout: 'column', layout: 'hbox',
xtype: 'panel', xtype: 'panel',
border: false border: false
}); });
// The buttons below are required to be added to a panel
// first as simply adding them to the column layout throws an
// error c.getSize() does not exist. This could be intentional
// or it may possible be a bug in ext-js. Take care when upgrading
// to ext-js 3.0.
/* /*
* Edit Trackers button * Edit Trackers button
*/ */
this.buttonPanel.add({ this.buttonPanel.add({
xtype: 'panel',
border: false
}).add({
id: 'edit_trackers', id: 'edit_trackers',
xtype: 'button', xtype: 'button',
text: _('Edit Trackers'), text: _('Edit Trackers'),
@ -339,9 +330,6 @@ Ext.deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
* Apply button * Apply button
*/ */
this.buttonPanel.add({ this.buttonPanel.add({
xtype: 'panel',
border: false
}).add({
id: 'apply', id: 'apply',
xtype: 'button', xtype: 'button',
text: _('Apply'), text: _('Apply'),

4
deluge/ui/web/js/deluge-all/Deluge.Preferences.Bandwidth.js
View File

@ -52,7 +52,7 @@ Ext.deluge.preferences.Bandwidth = Ext.extend(Ext.form.FormPanel, {
border: false, border: false,
title: _('Global Bandwidth Usage'), title: _('Global Bandwidth Usage'),
labelWidth: 200, labelWidth: 200,
defaultType: 'uxspinner', defaultType: 'spinnerfield',
style: 'margin-bottom: 0px; padding-bottom: 0px;', style: 'margin-bottom: 0px; padding-bottom: 0px;',
autoHeight: true autoHeight: true
}); });
@ -157,7 +157,7 @@ Ext.deluge.preferences.Bandwidth = Ext.extend(Ext.form.FormPanel, {
border: false, border: false,
title: _('Per Torrent Bandwidth Usage'), title: _('Per Torrent Bandwidth Usage'),
style: 'margin-bottom: 0px; padding-bottom: 0px;', style: 'margin-bottom: 0px; padding-bottom: 0px;',
defaultType: 'uxspinner', defaultType: 'spinnerfield',
labelWidth: 200, labelWidth: 200,
autoHeight: true autoHeight: true
}); });

4
deluge/ui/web/js/deluge-all/Deluge.Preferences.Cache.js
View File

@ -53,7 +53,7 @@ Ext.deluge.preferences.Cache = Ext.extend(Ext.form.FormPanel, {
title: _('Settings'), title: _('Settings'),
autoHeight: true, autoHeight: true,
labelWidth: 180, labelWidth: 180,
defaultType: 'uxspinner' defaultType: 'spinnerfield'
}); });
optMan.bind('cache_size', fieldset.add({ optMan.bind('cache_size', fieldset.add({
fieldLabel: _('Cache Size (16 KiB Blocks)'), fieldLabel: _('Cache Size (16 KiB Blocks)'),
@ -81,4 +81,4 @@ Ext.deluge.preferences.Cache = Ext.extend(Ext.form.FormPanel, {
})); }));
} }
}); });
Deluge.Preferences.addPage(new Ext.deluge.preferences.Cache()); Deluge.Preferences.addPage(new Ext.deluge.preferences.Cache());

2
deluge/ui/web/js/deluge-all/Deluge.Preferences.Daemon.js
View File

@ -52,7 +52,7 @@ Ext.deluge.preferences.Daemon = Ext.extend(Ext.form.FormPanel, {
border: false, border: false,
title: _('Port'), title: _('Port'),
autoHeight: true, autoHeight: true,
defaultType: 'uxspinner' defaultType: 'spinnerfield'
}); });
optMan.bind('daemon_port', fieldset.add({ optMan.bind('daemon_port', fieldset.add({
fieldLabel: _('Daemon port'), fieldLabel: _('Daemon port'),

3
deluge/ui/web/js/deluge-all/Deluge.Preferences.Downloads.js
View File

@ -99,12 +99,13 @@ Ext.deluge.preferences.Downloads = Ext.extend(Ext.FormPanel, {
labelWidth: 1, labelWidth: 1,
defaultType: 'radiogroup', defaultType: 'radiogroup',
style: 'margin-bottom: 5px; margin-top: 0; padding-bottom: 5px; padding-top: 0;', style: 'margin-bottom: 5px; margin-top: 0; padding-bottom: 5px; padding-top: 0;',
width: 240 width: 240,
}); });
optMan.bind('compact_allocation', fieldset.add({ optMan.bind('compact_allocation', fieldset.add({
name: 'compact_allocation', name: 'compact_allocation',
width: 200, width: 200,
labelSeparator: '', labelSeparator: '',
disabled: true,
defaults: { defaults: {
width: 80, width: 80,
height: 22, height: 22,

2
deluge/ui/web/js/deluge-all/Deluge.Preferences.Interface.js
View File

@ -131,7 +131,7 @@ Ext.deluge.preferences.Interface = Ext.extend(Ext.form.FormPanel, {
style: 'margin-top: 0px; padding-top: 0px; margin-bottom: 0px; padding-bottom: 0px', style: 'margin-top: 0px; padding-top: 0px; margin-bottom: 0px; padding-bottom: 0px',
autoHeight: true, autoHeight: true,
labelWidth: 110, labelWidth: 110,
defaultType: 'uxspinner', defaultType: 'spinnerfield',
defaults: { defaults: {
width: 80, width: 80,
} }

7
deluge/ui/web/js/deluge-all/Deluge.Preferences.Notification.js
View File

@ -1,7 +0,0 @@
/*Deluge.Preferences.addPage(_('Notification'), {
border: false,
xtype: 'form',
layout: 'form',
items: []
});
*/

4
deluge/ui/web/js/deluge-all/Deluge.Preferences.Proxy.js
View File

@ -75,7 +75,7 @@ Ext.deluge.preferences.ProxyField = Ext.extend(Ext.form.FieldSet, {
}); });
this.port = this.add({ this.port = this.add({
xtype: 'uxspinner', xtype: 'spinnerfield',
name: 'port', name: 'port',
fieldLabel: _('Port'), fieldLabel: _('Port'),
width: 80, width: 80,
@ -230,4 +230,4 @@ Ext.deluge.preferences.Proxy = Ext.extend(Ext.form.FormPanel, {
this.fireEvent('change', this, newValues, oldValues); this.fireEvent('change', this, newValues, oldValues);
} }
}); });
Deluge.Preferences.addPage(new Ext.deluge.preferences.Proxy()); Deluge.Preferences.addPage(new Ext.deluge.preferences.Proxy());

6
deluge/ui/web/js/deluge-all/Deluge.Preferences.Queue.js
View File

@ -70,7 +70,7 @@ Ext.deluge.preferences.Queue = Ext.extend(Ext.form.FormPanel, {
title: _('Active Torrents'), title: _('Active Torrents'),
autoHeight: true, autoHeight: true,
labelWidth: 150, labelWidth: 150,
defaultType: 'uxspinner', defaultType: 'spinnerfield',
style: 'margin-bottom: 0px; padding-bottom: 0px;', style: 'margin-bottom: 0px; padding-bottom: 0px;',
}); });
optMan.bind('max_active_limit', fieldset.add({ optMan.bind('max_active_limit', fieldset.add({
@ -123,7 +123,7 @@ Ext.deluge.preferences.Queue = Ext.extend(Ext.form.FormPanel, {
title: _('Seeding'), title: _('Seeding'),
autoHeight: true, autoHeight: true,
labelWidth: 150, labelWidth: 150,
defaultType: 'uxspinner', defaultType: 'spinnerfield',
style: 'margin-bottom: 0px; padding-bottom: 0px; margin-top: 0; padding-top: 0;', style: 'margin-bottom: 0px; padding-bottom: 0px; margin-top: 0; padding-top: 0;',
}); });
optMan.bind('share_ratio_limit', fieldset.add({ optMan.bind('share_ratio_limit', fieldset.add({
@ -186,7 +186,7 @@ Ext.deluge.preferences.Queue = Ext.extend(Ext.form.FormPanel, {
optMan.bind('stop_seed_at_ratio', this.stopAtRatio); optMan.bind('stop_seed_at_ratio', this.stopAtRatio);
this.stopRatio = fieldset.add({ this.stopRatio = fieldset.add({
xtype: 'uxspinner', xtype: 'spinnerfield',
name: 'stop_seed_ratio', name: 'stop_seed_ratio',
ctCls: 'x-deluge-indent-checkbox', ctCls: 'x-deluge-indent-checkbox',
disabled: true, disabled: true,

25
deluge/ui/web/server.py
View File

@ -352,25 +352,24 @@ class TopLevel(resource.Resource):
"/js/deluge-all/Deluge.Details.Details.js", "/js/deluge-all/Deluge.Details.Details.js",
"/js/deluge-all/Deluge.Details.Files.js", "/js/deluge-all/Deluge.Details.Files.js",
"/js/deluge-all/Deluge.Details.Peers.js", "/js/deluge-all/Deluge.Details.Peers.js",
#"/js/deluge-all/Deluge.Details.Options.js", "/js/deluge-all/Deluge.Details.Options.js",
"/js/deluge-all/Deluge.EditTrackers.js", "/js/deluge-all/Deluge.EditTrackers.js",
"/js/deluge-all/Deluge.Keys.js", "/js/deluge-all/Deluge.Keys.js",
"/js/deluge-all/Deluge.Login.js", "/js/deluge-all/Deluge.Login.js",
"/js/deluge-all/Deluge.MoveStorage.js", "/js/deluge-all/Deluge.MoveStorage.js",
"/js/deluge-all/Deluge.Plugin.js", "/js/deluge-all/Deluge.Plugin.js",
#"/js/deluge-all/Deluge.Preferences.js", "/js/deluge-all/Deluge.Preferences.js",
#"/js/deluge-all/Deluge.Preferences.Downloads.js", "/js/deluge-all/Deluge.Preferences.Downloads.js",
#"/js/deluge-all/Deluge.Preferences.Network.js", #"/js/deluge-all/Deluge.Preferences.Network.js",
#"/js/deluge-all/Deluge.Preferences.Encryption.js", "/js/deluge-all/Deluge.Preferences.Encryption.js",
#"/js/deluge-all/Deluge.Preferences.Bandwidth.js", "/js/deluge-all/Deluge.Preferences.Bandwidth.js",
#"/js/deluge-all/Deluge.Preferences.Interface.js", "/js/deluge-all/Deluge.Preferences.Interface.js",
#"/js/deluge-all/Deluge.Preferences.Other.js", "/js/deluge-all/Deluge.Preferences.Other.js",
#"/js/deluge-all/Deluge.Preferences.Daemon.js", "/js/deluge-all/Deluge.Preferences.Daemon.js",
#"/js/deluge-all/Deluge.Preferences.Queue.js", "/js/deluge-all/Deluge.Preferences.Queue.js",
#"/js/deluge-all/Deluge.Preferences.Proxy.js", "/js/deluge-all/Deluge.Preferences.Proxy.js",
#"/js/deluge-all/Deluge.Preferences.Notification.js", "/js/deluge-all/Deluge.Preferences.Cache.js",
#"/js/deluge-all/Deluge.Preferences.Cache.js", "/js/deluge-all/Deluge.Preferences.Plugins.js",
#"/js/deluge-all/Deluge.Preferences.Plugins.js",
"/js/deluge-all/Deluge.Remove.js", "/js/deluge-all/Deluge.Remove.js",
"/js/deluge-all/Deluge.Sidebar.js", "/js/deluge-all/Deluge.Sidebar.js",
"/js/deluge-all/Deluge.Statusbar.js", "/js/deluge-all/Deluge.Statusbar.js",