use hbox fo...
Content-type: text/plain
Author: damoxc
Revision: 6145
Log:
re-enable a number of disabled scripts
use hbox for the buttonPanel and remove the pre ext3 hack
Diff:
Modified: trunk/deluge/ui/web/js/deluge-all/.build
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/.build 2010-01-26 13:25:44 UTC (rev
6144)
+++ trunk/deluge/ui/web/js/deluge-all/.build 2010-01-26 13:59:25 UTC (rev
6145)
@@ -32,7 +32,6 @@
add_file "Deluge.Preferences.Daemon.js"
add_file "Deluge.Preferences.Queue.js"
add_file "Deluge.Preferences.Proxy.js"
-add_file "Deluge.Preferences.Notification.js"
add_file "Deluge.Preferences.Cache.js"
add_file "Deluge.Preferences.Plugins.js"
add_file "Deluge.Remove.js"
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Details.Options.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Details.Options.js 2010-01-26
13:25:44 UTC (rev 6144)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Details.Options.js 2010-01-26
13:59:25 UTC (rev 6145)
@@ -77,7 +77,7 @@
*/
this.fieldsets.bandwidth = this.add({
xtype: 'fieldset',
- defaultType: 'uxspinner',
+ defaultType: 'spinnerfield',
bodyStyle: 'padding: 5px',
layout: 'table',
@@ -228,7 +228,7 @@
});
this.fields.stop_ratio = this.fieldsets.queue.add({
- xtype: 'uxspinner',
+ xtype: 'spinnerfield',
id: 'stop_ratio',
name: 'stop_ratio',
disabled: true,
@@ -271,7 +271,7 @@
border: false,
autoHeight: true,
style: 'margin-left: 5px',
- width: 200
+ width: 210
});
this.fieldsets.general = this.rightColumn.add({
@@ -306,24 +306,15 @@
* Buttons
*/
this.buttonPanel = this.rightColumn.add({
- layout: 'column',
+ layout: 'hbox',
xtype: 'panel',
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
*/
this.buttonPanel.add({
- xtype: 'panel',
- border: false
- }).add({
id: 'edit_trackers',
xtype: 'button',
text: _('Edit Trackers'),
@@ -339,9 +330,6 @@
* Apply button
*/
this.buttonPanel.add({
- xtype: 'panel',
- border: false
- }).add({
id: 'apply',
xtype: 'button',
text: _('Apply'),
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Bandwidth.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Bandwidth.js
2010-01-26 13:25:44 UTC (rev 6144)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Bandwidth.js
2010-01-26 13:59:25 UTC (rev 6145)
@@ -52,7 +52,7 @@
border: false,
title: _('Global Bandwidth Usage'),
labelWidth: 200,
- defaultType: 'uxspinner',
+ defaultType: 'spinnerfield',
style: 'margin-bottom: 0px; padding-bottom: 0px;',
autoHeight: true
});
@@ -157,7 +157,7 @@
border: false,
title: _('Per Torrent Bandwidth Usage'),
style: 'margin-bottom: 0px; padding-bottom: 0px;',
- defaultType: 'uxspinner',
+ defaultType: 'spinnerfield',
labelWidth: 200,
autoHeight: true
});
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Cache.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Cache.js
2010-01-26 13:25:44 UTC (rev 6144)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Cache.js
2010-01-26 13:59:25 UTC (rev 6145)
@@ -53,7 +53,7 @@
title: _('Settings'),
autoHeight: true,
labelWidth: 180,
- defaultType: 'uxspinner'
+ defaultType: 'spinnerfield'
});
optMan.bind('cache_size', fieldset.add({
fieldLabel: _('Cache Size (16 KiB Blocks)'),
@@ -81,4 +81,4 @@
}));
}
});
-Deluge.Preferences.addPage(new Ext.deluge.preferences.Cache());
\ No newline at end of file
+Deluge.Preferences.addPage(new Ext.deluge.preferences.Cache());
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Daemon.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Daemon.js
2010-01-26 13:25:44 UTC (rev 6144)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Daemon.js
2010-01-26 13:59:25 UTC (rev 6145)
@@ -52,7 +52,7 @@
border: false,
title: _('Port'),
autoHeight: true,
- defaultType: 'uxspinner'
+ defaultType: 'spinnerfield'
});
optMan.bind('daemon_port', fieldset.add({
fieldLabel: _('Daemon port'),
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Downloads.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Downloads.js
2010-01-26 13:25:44 UTC (rev 6144)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Downloads.js
2010-01-26 13:59:25 UTC (rev 6145)
@@ -99,12 +99,13 @@
labelWidth: 1,
defaultType: 'radiogroup',
style: 'margin-bottom: 5px; margin-top: 0;
padding-bottom: 5px; padding-top: 0;',
- width: 240
+ width: 240,
});
optMan.bind('compact_allocation', fieldset.add({
name: 'compact_allocation',
width: 200,
labelSeparator: '',
+ disabled: true,
defaults: {
width: 80,
height: 22,
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Interface.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Interface.js
2010-01-26 13:25:44 UTC (rev 6144)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Interface.js
2010-01-26 13:59:25 UTC (rev 6145)
@@ -131,7 +131,7 @@
style: 'margin-top: 0px; padding-top: 0px;
margin-bottom: 0px; padding-bottom: 0px',
autoHeight: true,
labelWidth: 110,
- defaultType: 'uxspinner',
+ defaultType: 'spinnerfield',
defaults: {
width: 80,
}
Deleted: trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Notification.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Notification.js
2010-01-26 13:25:44 UTC (rev 6144)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Notification.js
2010-01-26 13:59:25 UTC (rev 6145)
@@ -1,7 +0,0 @@
-/*Deluge.Preferences.addPage(_('Notification'), {
- border: false,
- xtype: 'form',
- layout: 'form',
- items: []
-});
-*/
\ No newline at end of file
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Proxy.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Proxy.js
2010-01-26 13:25:44 UTC (rev 6144)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Proxy.js
2010-01-26 13:59:25 UTC (rev 6145)
@@ -75,7 +75,7 @@
});
this.port = this.add({
- xtype: 'uxspinner',
+ xtype: 'spinnerfield',
name: 'port',
fieldLabel: _('Port'),
width: 80,
@@ -230,4 +230,4 @@
this.fireEvent('change', this, newValues, oldValues);
}
});
-Deluge.Preferences.addPage(new Ext.deluge.preferences.Proxy());
\ No newline at end of file
+Deluge.Preferences.addPage(new Ext.deluge.preferences.Proxy());
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Queue.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Queue.js
2010-01-26 13:25:44 UTC (rev 6144)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Queue.js
2010-01-26 13:59:25 UTC (rev 6145)
@@ -70,7 +70,7 @@
title: _('Active Torrents'),
autoHeight: true,
labelWidth: 150,
- defaultType: 'uxspinner',
+ defaultType: 'spinnerfield',
style: 'margin-bottom: 0px; padding-bottom: 0px;',
});
optMan.bind('max_active_limit', fieldset.add({
@@ -123,7 +123,7 @@
title: _('Seeding'),
autoHeight: true,
labelWidth: 150,
- defaultType: 'uxspinner',
+ defaultType: 'spinnerfield',
style: 'margin-bottom: 0px; padding-bottom: 0px;
margin-top: 0; padding-top: 0;',
});
optMan.bind('share_ratio_limit', fieldset.add({
@@ -186,7 +186,7 @@
optMan.bind('stop_seed_at_ratio', this.stopAtRatio);
this.stopRatio = fieldset.add({
- xtype: 'uxspinner',
+ xtype: 'spinnerfield',
name: 'stop_seed_ratio',
ctCls: 'x-deluge-indent-checkbox',
disabled: true,
Modified: trunk/deluge/ui/web/server.py
===================================================================
--- trunk/deluge/ui/web/server.py 2010-01-26 13:25:44 UTC (rev 6144)
+++ trunk/deluge/ui/web/server.py 2010-01-26 13:59:25 UTC (rev 6145)
@@ -352,25 +352,24 @@
"/js/deluge-all/Deluge.Details.Details.js",
"/js/deluge-all/Deluge.Details.Files.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.Keys.js",
"/js/deluge-all/Deluge.Login.js",
"/js/deluge-all/Deluge.MoveStorage.js",
"/js/deluge-all/Deluge.Plugin.js",
- #"/js/deluge-all/Deluge.Preferences.js",
- #"/js/deluge-all/Deluge.Preferences.Downloads.js",
+ "/js/deluge-all/Deluge.Preferences.js",
+ "/js/deluge-all/Deluge.Preferences.Downloads.js",
#"/js/deluge-all/Deluge.Preferences.Network.js",
- #"/js/deluge-all/Deluge.Preferences.Encryption.js",
- #"/js/deluge-all/Deluge.Preferences.Bandwidth.js",
- #"/js/deluge-all/Deluge.Preferences.Interface.js",
- #"/js/deluge-all/Deluge.Preferences.Other.js",
- #"/js/deluge-all/Deluge.Preferences.Daemon.js",
- #"/js/deluge-all/Deluge.Preferences.Queue.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.Plugins.js",
+ "/js/deluge-all/Deluge.Preferences.Encryption.js",
+ "/js/deluge-all/Deluge.Preferences.Bandwidth.js",
+ "/js/deluge-all/Deluge.Preferences.Interface.js",
+ "/js/deluge-all/Deluge.Preferences.Other.js",
+ "/js/deluge-all/Deluge.Preferences.Daemon.js",
+ "/js/deluge-all/Deluge.Preferences.Queue.js",
+ "/js/deluge-all/Deluge.Preferences.Proxy.js",
+ "/js/deluge-all/Deluge.Preferences.Cache.js",
+ "/js/deluge-all/Deluge.Preferences.Plugins.js",
"/js/deluge-all/Deluge.Remove.js",
"/js/deluge-all/Deluge.Sidebar.js",
"/js/deluge-all/Deluge.Statusbar.js",
--
You received this message because you are subscribed to the Google Groups
"deluge-commit" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/deluge-commit?hl=en.
