Author: damoxc
Revision: 5851
Log:
fix setting bandwidth limits via the statusbar
Diff:
Modified: branches/1.2_RC/ChangeLog
===================================================================
--- branches/1.2_RC/ChangeLog 2009-10-20 21:53:54 UTC (rev 5850)
+++ branches/1.2_RC/ChangeLog 2009-10-20 22:33:18 UTC (rev 5851)
@@ -11,6 +11,7 @@
* Fix changing of the allocation in the preferences.
* Fix updating the Connection Manager when a host is added.
* Add a --fork option to allow forking the webui to the background
+ * Fix the statusbar menu limits
==== Misc ====
* Add man pages for deluge-console, deluge-gtk and deluge-web
Modified: branches/1.2_RC/deluge/ui/web/js/Deluge.Menus.js
===================================================================
--- branches/1.2_RC/deluge/ui/web/js/Deluge.Menus.js 2009-10-20 21:53:54 UTC
(rev 5850)
+++ branches/1.2_RC/deluge/ui/web/js/Deluge.Menus.js 2009-10-20 22:33:18 UTC
(rev 5851)
@@ -243,7 +243,18 @@
}]
});
-Deluge.Menus.Connections = new Ext.menu.Menu({
+Ext.deluge.StatusbarMenu = Ext.extend(Ext.menu.Menu, {
+
+ setValue: function(value) {
+ var item = this.items.get(value);
+ if (!item) item = this.items.get('other')
+ item.suspendEvents();
+ item.setChecked(true);
+ item.resumeEvents();
+ }
+});
+
+Deluge.Menus.Connections = new Ext.deluge.StatusbarMenu({
id: 'connectionsMenu',
items: [{
id: '50',
@@ -290,7 +301,7 @@
}]
});
-Deluge.Menus.Download = new Ext.menu.Menu({
+Deluge.Menus.Download = new Ext.deluge.StatusbarMenu({
id: 'downspeedMenu',
items: [{
id: '5',
@@ -337,7 +348,7 @@
}]
});
-Deluge.Menus.Upload = new Ext.menu.Menu({
+Deluge.Menus.Upload = new Ext.deluge.StatusbarMenu({
id: 'upspeedMenu',
items: [{
id: '5',
@@ -414,7 +425,7 @@
});
function onLimitChanged(item, checked) {
- /*if (item.id == "other") {
+ if (item.id == "other") {
} else {
config = {}
config[item.group] = item.id
@@ -423,5 +434,5 @@
Deluge.UI.update();
}
});
- }*/
+ }
}
\ No newline at end of file
Modified: branches/1.2_RC/deluge/ui/web/js/Deluge.Statusbar.js
===================================================================
--- branches/1.2_RC/deluge/ui/web/js/Deluge.Statusbar.js 2009-10-20
21:53:54 UTC (rev 5850)
+++ branches/1.2_RC/deluge/ui/web/js/Deluge.Statusbar.js 2009-10-20
22:33:18 UTC (rev 5851)
@@ -131,18 +131,10 @@
});
this.items.get('statusbar-dht').setText(stats.dht_nodes);
-
- function updateMenu(menu, stat) {
- var item = menu.items.get(stat)
- if (!item) {
- item = menu.items.get('other')
- }
- item.setChecked(true);
- }
- updateMenu(Deluge.Menus.Connections,
stats.max_num_connections);
- updateMenu(Deluge.Menus.Download, stats.max_download);
- updateMenu(Deluge.Menus.Upload, stats.max_upload);
+
Deluge.Menus.Connections.setValue(stats.max_num_connections);
+ Deluge.Menus.Download.setValue(stats.max_download);
+ Deluge.Menus.Upload.setValue(stats.max_upload);
}
});
Deluge.Statusbar = new Ext.deluge.Statusbar();
Modified: trunk/deluge/ui/web/js/Deluge.Menus.js
===================================================================
--- trunk/deluge/ui/web/js/Deluge.Menus.js 2009-10-20 21:53:54 UTC (rev
5850)
+++ trunk/deluge/ui/web/js/Deluge.Menus.js 2009-10-20 22:33:18 UTC (rev
5851)
@@ -243,7 +243,18 @@
}]
});
-Deluge.Menus.Connections = new Ext.menu.Menu({
+Ext.deluge.StatusbarMenu = Ext.extend(Ext.menu.Menu, {
+
+ setValue: function(value) {
+ var item = this.items.get(value);
+ if (!item) item = this.items.get('other')
+ item.suspendEvents();
+ item.setChecked(true);
+ item.resumeEvents();
+ }
+});
+
+Deluge.Menus.Connections = new Ext.deluge.StatusbarMenu({
id: 'connectionsMenu',
items: [{
id: '50',
@@ -290,7 +301,7 @@
}]
});
-Deluge.Menus.Download = new Ext.menu.Menu({
+Deluge.Menus.Download = new Ext.deluge.StatusbarMenu({
id: 'downspeedMenu',
items: [{
id: '5',
@@ -337,7 +348,7 @@
}]
});
-Deluge.Menus.Upload = new Ext.menu.Menu({
+Deluge.Menus.Upload = new Ext.deluge.StatusbarMenu({
id: 'upspeedMenu',
items: [{
id: '5',
@@ -414,7 +425,7 @@
});
function onLimitChanged(item, checked) {
- /*if (item.id == "other") {
+ if (item.id == "other") {
} else {
config = {}
config[item.group] = item.id
@@ -423,5 +434,5 @@
Deluge.UI.update();
}
});
- }*/
+ }
}
\ No newline at end of file
Modified: trunk/deluge/ui/web/js/Deluge.Statusbar.js
===================================================================
--- trunk/deluge/ui/web/js/Deluge.Statusbar.js 2009-10-20 21:53:54 UTC (rev
5850)
+++ trunk/deluge/ui/web/js/Deluge.Statusbar.js 2009-10-20 22:33:18 UTC (rev
5851)
@@ -131,18 +131,10 @@
});
this.items.get('statusbar-dht').setText(stats.dht_nodes);
-
- function updateMenu(menu, stat) {
- var item = menu.items.get(stat)
- if (!item) {
- item = menu.items.get('other')
- }
- item.setChecked(true);
- }
- updateMenu(Deluge.Menus.Connections,
stats.max_num_connections);
- updateMenu(Deluge.Menus.Download, stats.max_download);
- updateMenu(Deluge.Menus.Upload, stats.max_upload);
+
Deluge.Menus.Connections.setValue(stats.max_num_connections);
+ Deluge.Menus.Download.setValue(stats.max_download);
+ Deluge.Menus.Upload.setValue(stats.max_upload);
}
});
Deluge.Statusbar = new Ext.deluge.Statusbar();
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
