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

upgrade to ext js 3.1

This commit is contained in:
Damien Churchill 2010-01-21 21:01:02 +00:00
parent 1ac0403f05
commit cd24acd74f
10 changed files with 37664 additions and 31593 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

979
deluge/ui/web/js/Deluge.Add.js
View File

File diff suppressed because it is too large Load Diff

874
deluge/ui/web/js/Deluge.ConnectionManager.js
View File

@ -1,461 +1,461 @@
/*
Script: deluge-connections.js
Contains all objects and functions related to the connection manager.
Contains all objects and functions related to the connection manager.
Copyright:
(C) Damien Churchill 2009 <damoxc@gmail.com>
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 <damoxc@gmail.com>
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
library.
You must obey the GNU General Public License in all respects for all of
the code used other than OpenSSL. If you modify file(s) with this
exception, you may extend this exception to your version of the file(s),
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.
In addition, as a special exception, the copyright holders give
permission to link the code of portions of this program with the OpenSSL
library.
You must obey the GNU General Public License in all respects for all of
the code used other than OpenSSL. If you modify file(s) with this
exception, you may extend this exception to your version of the file(s),
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.
*/
(function() {
var hostRenderer = function(value, p, r) {
return value + ':' + r.data['port']
}
var hostRenderer = function(value, p, r) {
return value + ':' + r.data['port']
}
Ext.deluge.AddConnectionWindow = Ext.extend(Ext.Window, {
Ext.deluge.AddConnectionWindow = Ext.extend(Ext.Window, {
constructor: function(config) {
config = Ext.apply({
layout: 'fit',
width: 300,
height: 195,
bodyStyle: 'padding: 10px 5px;',
buttonAlign: 'right',
closeAction: 'hide',
closable: true,
plain: true,
title: _('Add Connection'),
iconCls: 'x-deluge-add-window-icon'
}, config);
Ext.deluge.AddConnectionWindow.superclass.constructor.call(this, config);
},
initComponent: function() {
Ext.deluge.AddConnectionWindow.superclass.initComponent.call(this);
this.addEvents('hostadded');
this.addButton(_('Close'), this.hide, this);
this.addButton(_('Add'), this.onAdd, this);
this.on('hide', this.onHide, this);
this.form = this.add({
xtype: 'form',
defaultType: 'textfield',
id: 'connectionAddForm',
baseCls: 'x-plain',
labelWidth: 55
});
this.hostField = this.form.add({
fieldLabel: _('Host'),
id: 'host',
name: 'host',
anchor: '100%',
value: ''
});
this.portField = this.form.add({
fieldLabel: _('Port'),
id: 'port',
xtype: 'uxspinner',
ctCls: 'x-form-uxspinner',
name: 'port',
strategy: {
xtype: 'number',
decimalPrecision: 0,
minValue: -1,
maxValue: 65535
},
value: '58846',
anchor: '50%'
});
this.usernameField = this.form.add({
fieldLabel: _('Username'),
id: 'username',
name: 'username',
anchor: '100%',
value: ''
});
this.passwordField = this.form.add({
fieldLabel: _('Password'),
anchor: '100%',
id: '_password',
name: '_password',
inputType: 'password',
value: ''
});
},
onAdd: function() {
var host = this.hostField.getValue();
var port = this.portField.getValue();
var username = this.usernameField.getValue();
var password = this.passwordField.getValue();
Deluge.Client.web.add_host(host, port, username, password, {
success: function(result) {
if (!result[0]) {
Ext.MessageBox.show({
title: _('Error'),
msg: "Unable to add host: " + result[1],
buttons: Ext.MessageBox.OK,
modal: false,
icon: Ext.MessageBox.ERROR,
iconCls: 'x-deluge-icon-error'
});
} else {
this.fireEvent('hostadded');
}
this.hide();
},
scope: this
});
},
onHide: function() {
this.form.getForm().reset();
}
});
constructor: function(config) {
config = Ext.apply({
layout: 'fit',
width: 300,
height: 195,
bodyStyle: 'padding: 10px 5px;',
buttonAlign: 'right',
closeAction: 'hide',
closable: true,
plain: true,
title: _('Add Connection'),
iconCls: 'x-deluge-add-window-icon'
}, config);
Ext.deluge.AddConnectionWindow.superclass.constructor.call(this, config);
},
initComponent: function() {
Ext.deluge.AddConnectionWindow.superclass.initComponent.call(this);
this.addEvents('hostadded');
this.addButton(_('Close'), this.hide, this);
this.addButton(_('Add'), this.onAddClick, this);
this.on('hide', this.onHide, this);
this.form = this.add({
xtype: 'form',
defaultType: 'textfield',
id: 'connectionAddForm',
baseCls: 'x-plain',
labelWidth: 55
});
this.hostField = this.form.add({
fieldLabel: _('Host'),
id: 'host',
name: 'host',
anchor: '100%',
value: ''
});
this.portField = this.form.add({
fieldLabel: _('Port'),
id: 'port',
xtype: 'uxspinner',
ctCls: 'x-form-uxspinner',
name: 'port',
strategy: {
xtype: 'number',
decimalPrecision: 0,
minValue: -1,
maxValue: 65535
},
value: '58846',
anchor: '50%'
});
this.usernameField = this.form.add({
fieldLabel: _('Username'),
id: 'username',
name: 'username',
anchor: '100%',
value: ''
});
this.passwordField = this.form.add({
fieldLabel: _('Password'),
anchor: '100%',
id: '_password',
name: '_password',
inputType: 'password',
value: ''
});
},
onAddClick: function() {
var host = this.hostField.getValue();
var port = this.portField.getValue();
var username = this.usernameField.getValue();
var password = this.passwordField.getValue();
Deluge.Client.web.add_host(host, port, username, password, {
success: function(result) {
if (!result[0]) {
Ext.MessageBox.show({
title: _('Error'),
msg: "Unable to add host: " + result[1],
buttons: Ext.MessageBox.OK,
modal: false,
icon: Ext.MessageBox.ERROR,
iconCls: 'x-deluge-icon-error'
});
} else {
this.fireEvent('hostadded');
}
this.hide();
},
scope: this
});
},
onHide: function() {
this.form.getForm().reset();
}
});
Ext.deluge.ConnectionManager = Ext.extend(Ext.Window, {
Ext.deluge.ConnectionManager = Ext.extend(Ext.Window, {
layout: 'fit',
width: 300,
height: 220,
bodyStyle: 'padding: 10px 5px;',
buttonAlign: 'right',
closeAction: 'hide',
closable: true,
plain: true,
title: _('Connection Manager'),
iconCls: 'x-deluge-connect-window-icon',
initComponent: function() {
Ext.deluge.ConnectionManager.superclass.initComponent.call(this);
this.on({
'hide': this.onHide,
'show': this.onShow
});
Deluge.Events.on('login', this.onLogin, this);
Deluge.Events.on('logout', this.onLogout, this);
this.addButton(_('Close'), this.onClose, this);
this.addButton(_('Connect'), this.onConnect, this);
this.grid = this.add({
xtype: 'grid',
store: new Ext.data.SimpleStore({
fields: [
{name: 'status', mapping: 3},
{name: 'host', mapping: 1},
{name: 'port', mapping: 2},
{name: 'version', mapping: 4}
],
id: 0
}),
columns: [{
header: _('Status'),
width: 65,
sortable: true,
renderer: fplain,
dataIndex: 'status'
}, {
id:'host',
header: _('Host'),
width: 150,
sortable: true,
renderer: hostRenderer,
dataIndex: 'host'
}, {
header: _('Version'),
width: 75,
sortable: true,
renderer: fplain,
dataIndex: 'version'
}],
stripeRows: true,
selModel: new Ext.grid.RowSelectionModel({
singleSelect: true,
listeners: {
'rowselect': {fn: this.onSelect, scope: this},
'selectionchange': {fn: this.onSelectionChanged, scope: this}
}
}),
autoExpandColumn: 'host',
deferredRender:false,
autoScroll:true,
margins: '0 0 0 0',
bbar: new Ext.Toolbar({
buttons: [
{
id: 'cm-add',
cls: 'x-btn-text-icon',
text: _('Add'),
icon: '/icons/add.png',
handler: this.onAdd,
scope: this
}, {
id: 'cm-remove',
cls: 'x-btn-text-icon',
text: _('Remove'),
icon: '/icons/remove.png',
handler: this.onRemove,
disabled: true,
scope: this
}, '->', {
id: 'cm-stop',
cls: 'x-btn-text-icon',
text: _('Stop Daemon'),
icon: '/icons/error.png',
handler: this.onStop,
disabled: true,
scope: this
}
]
})
});
},
layout: 'fit',
width: 300,
height: 220,
bodyStyle: 'padding: 10px 5px;',
buttonAlign: 'right',
closeAction: 'hide',
closable: true,
plain: true,
title: _('Connection Manager'),
iconCls: 'x-deluge-connect-window-icon',
initComponent: function() {
Ext.deluge.ConnectionManager.superclass.initComponent.call(this);
this.on({
'hide': this.onHide,
'show': this.onShow
});
Deluge.Events.on('login', this.onLogin, this);
Deluge.Events.on('logout', this.onLogout, this);
this.addButton(_('Close'), this.onClose, this);
this.addButton(_('Connect'), this.onConnect, this);
this.grid = this.add({
xtype: 'grid',
store: new Ext.data.SimpleStore({
fields: [
{name: 'status', mapping: 3},
{name: 'host', mapping: 1},
{name: 'port', mapping: 2},
{name: 'version', mapping: 4}
],
id: 0
}),
columns: [{
header: _('Status'),
width: 65,
sortable: true,
renderer: fplain,
dataIndex: 'status'
}, {
id:'host',
header: _('Host'),
width: 150,
sortable: true,
renderer: hostRenderer,
dataIndex: 'host'
}, {
header: _('Version'),
width: 75,
sortable: true,
renderer: fplain,
dataIndex: 'version'
}],
stripeRows: true,
selModel: new Ext.grid.RowSelectionModel({
singleSelect: true,
listeners: {
'rowselect': {fn: this.onSelect, scope: this},
'selectionchange': {fn: this.onSelectionChanged, scope: this}
}
}),
autoExpandColumn: 'host',
deferredRender:false,
autoScroll:true,
margins: '0 0 0 0',
bbar: new Ext.Toolbar({
buttons: [
{
id: 'cm-add',
cls: 'x-btn-text-icon',
text: _('Add'),
icon: '/icons/add.png',
handler: this.onAddClick,
scope: this
}, {
id: 'cm-remove',
cls: 'x-btn-text-icon',
text: _('Remove'),
icon: '/icons/remove.png',
handler: this.onRemove,
disabled: true,
scope: this
}, '->', {
id: 'cm-stop',
cls: 'x-btn-text-icon',
text: _('Stop Daemon'),
icon: '/icons/error.png',
handler: this.onStop,
disabled: true,
scope: this
}
]
})
});
},
disconnect: function() {
Deluge.Events.fire('disconnect');
},
loadHosts: function() {
Deluge.Client.web.get_hosts({
success: this.onGetHosts,
scope: this
});
},
update: function(self) {
self.grid.getStore().each(function(r) {
Deluge.Client.web.get_host_status(r.id, {
success: self.onGetHostStatus,
scope: self
});
}, this);
},
/**
* Updates the buttons in the Connection Manager UI according to the
* passed in records host state.
* @param {Ext.data.Record} record The hosts record to update the UI for
*/
updateButtons: function(record) {
var button = this.buttons[1], status = record.get('status');
// Update the Connect/Disconnect button
if (status == _('Connected')) {
button.enable();
button.setText(_('Disconnect'));
} else if (status == _('Offline')) {
button.disable();
} else {
button.enable();
button.setText(_('Connect'));
}
// Update the Stop/Start Daemon button
if (status == _('Offline')) {
if (record.get('host') == '127.0.0.1' || record.get('host') == 'localhost') {
this.stopHostButton.enable();
this.stopHostButton.setText(_('Start Daemon'));
} else {
this.stopHostButton.disable();
}
} else {
this.stopHostButton.enable();
this.stopHostButton.setText(_('Stop Daemon'));
}
},
onAdd: function(button, e) {
if (!this.addWindow) {
this.addWindow = new Ext.deluge.AddConnectionWindow();
this.addWindow.on('hostadded', this.onHostAdded, this);
}
this.addWindow.show();
},
onHostAdded: function() {
this.loadHosts();
},
onClose: function(e) {
if (this.running) window.clearInterval(this.running);
this.hide();
},
onConnect: function(e) {
var selected = this.grid.getSelectionModel().getSelected();
if (!selected) return;
if (selected.get('status') == _('Connected')) {
Deluge.Client.web.disconnect({
success: function(result) {
this.update(this);
Deluge.Events.fire('disconnect');
},
scope: this
});
} else {
var id = selected.id;
Deluge.Client.web.connect(id, {
success: function(methods) {
Deluge.Client.reloadMethods();
Deluge.Client.on('connected', function(e) {
Deluge.Events.fire('connect');
}, this, {single: true});
}
});
if (this.running) window.clearInterval(this.running);
this.hide();
}
},
disconnect: function() {
Deluge.Events.fire('disconnect');
},
loadHosts: function() {
Deluge.Client.web.get_hosts({
success: this.onGetHosts,
scope: this
});
},
update: function(self) {
self.grid.getStore().each(function(r) {
Deluge.Client.web.get_host_status(r.id, {
success: self.onGetHostStatus,
scope: self
});
}, this);
},
/**
* Updates the buttons in the Connection Manager UI according to the
* passed in records host state.
* @param {Ext.data.Record} record The hosts record to update the UI for
*/
updateButtons: function(record) {
var button = this.buttons[1], status = record.get('status');
// Update the Connect/Disconnect button
if (status == _('Connected')) {
button.enable();
button.setText(_('Disconnect'));
} else if (status == _('Offline')) {
button.disable();
} else {
button.enable();
button.setText(_('Connect'));
}
// Update the Stop/Start Daemon button
if (status == _('Offline')) {
if (record.get('host') == '127.0.0.1' || record.get('host') == 'localhost') {
this.stopHostButton.enable();
this.stopHostButton.setText(_('Start Daemon'));
} else {
this.stopHostButton.disable();
}
} else {
this.stopHostButton.enable();
this.stopHostButton.setText(_('Stop Daemon'));
}
},
onAddClick: function(button, e) {
if (!this.addWindow) {
this.addWindow = new Ext.deluge.AddConnectionWindow();
this.addWindow.on('hostadded', this.onHostAdded, this);
}
this.addWindow.show();
},
onHostAdded: function() {
this.loadHosts();
},
onClose: function(e) {
if (this.running) window.clearInterval(this.running);
this.hide();
},
onConnect: function(e) {
var selected = this.grid.getSelectionModel().getSelected();
if (!selected) return;
if (selected.get('status') == _('Connected')) {
Deluge.Client.web.disconnect({
success: function(result) {
this.update(this);
Deluge.Events.fire('disconnect');
},
scope: this
});
} else {
var id = selected.id;
Deluge.Client.web.connect(id, {
success: function(methods) {
Deluge.Client.reloadMethods();
Deluge.Client.on('connected', function(e) {
Deluge.Events.fire('connect');
}, this, {single: true});
}
});
if (this.running) window.clearInterval(this.running);
this.hide();
}
},
onGetHosts: function(hosts) {
this.grid.getStore().loadData(hosts);
Ext.each(hosts, function(host) {
Deluge.Client.web.get_host_status(host[0], {
success: this.onGetHostStatus,
scope: this
});
}, this);
},
onGetHostStatus: function(host) {
var record = this.grid.getStore().getById(host[0]);
record.set('status', host[3])
record.set('version', host[4])
record.commit();
if (this.grid.getSelectionModel().getSelected() == record) this.updateButtons(record);
},
onGetHosts: function(hosts) {
this.grid.getStore().loadData(hosts);
Ext.each(hosts, function(host) {
Deluge.Client.web.get_host_status(host[0], {
success: this.onGetHostStatus,
scope: this
});
}, this);
},
onGetHostStatus: function(host) {
var record = this.grid.getStore().getById(host[0]);
record.set('status', host[3])
record.set('version', host[4])
record.commit();
if (this.grid.getSelectionModel().getSelected() == record) this.updateButtons(record);
},
onLogin: function() {
Deluge.Client.web.connected({
success: function(connected) {
if (connected) {
Deluge.Events.fire('connect');
} else {
this.show();
}
},
scope: this
});
},
onLogin: function() {
Deluge.Client.web.connected({
success: function(connected) {
if (connected) {
Deluge.Events.fire('connect');
} else {
this.show();
}
},
scope: this
});
},
onLogout: function() {
this.disconnect();
if (!this.hidden && this.rendered) {
this.hide();
}
},
onRemove: function(button) {
var connection = this.grid.getSelectionModel().getSelected();
if (!connection) return;
Deluge.Client.web.remove_host(connection.id, {
success: function(result) {
if (!result) {
Ext.MessageBox.show({
title: _('Error'),
msg: result[1],
buttons: Ext.MessageBox.OK,
modal: false,
icon: Ext.MessageBox.ERROR,
iconCls: 'x-deluge-icon-error'
});
} else {
this.grid.getStore().remove(connection);
}
},
scope: this
});
},
onLogout: function() {
this.disconnect();
if (!this.hidden && this.rendered) {
this.hide();
}
},
onRemove: function(button) {
var connection = this.grid.getSelectionModel().getSelected();
if (!connection) return;
Deluge.Client.web.remove_host(connection.id, {
success: function(result) {
if (!result) {
Ext.MessageBox.show({
title: _('Error'),
msg: result[1],
buttons: Ext.MessageBox.OK,
modal: false,
icon: Ext.MessageBox.ERROR,
iconCls: 'x-deluge-icon-error'
});
} else {
this.grid.getStore().remove(connection);
}
},
scope: this
});
},
onSelect: function(selModel, rowIndex, record) {
this.selectedRow = rowIndex;
},
onSelect: function(selModel, rowIndex, record) {
this.selectedRow = rowIndex;
},
onSelectionChanged: function(selModel) {
var record = selModel.getSelected();
if (selModel.hasSelection()) {
this.removeHostButton.enable();
this.stopHostButton.enable();
this.stopHostButton.setText(_('Stop Daemon'));
} else {
this.removeHostButton.disable();
this.stopHostButton.disable();
}
this.updateButtons(record);
},
onSelectionChanged: function(selModel) {
var record = selModel.getSelected();
if (selModel.hasSelection()) {
this.removeHostButton.enable();
this.stopHostButton.enable();
this.stopHostButton.setText(_('Stop Daemon'));
} else {
this.removeHostButton.disable();
this.stopHostButton.disable();
}
this.updateButtons(record);
},
onShow: function() {
if (!this.addHostButton) {
var bbar = this.grid.getBottomToolbar();
this.addHostButton = bbar.items.get('cm-add');
this.removeHostButton = bbar.items.get('cm-remove');
this.stopHostButton = bbar.items.get('cm-stop');
}
this.loadHosts();
this.running = window.setInterval(this.update, 2000, this);
},
onShow: function() {
if (!this.addHostButton) {
var bbar = this.grid.getBottomToolbar();
this.addHostButton = bbar.items.get('cm-add');
this.removeHostButton = bbar.items.get('cm-remove');
this.stopHostButton = bbar.items.get('cm-stop');
}
this.loadHosts();
this.running = window.setInterval(this.update, 2000, this);
},
onStop: function(button, e) {
var connection = this.grid.getSelectionModel().getSelected();
if (!connection) return;
if (connection.get('status') == 'Offline') {
// This means we need to start the daemon
Deluge.Client.web.start_daemon(connection.get('port'));
} else {
// This means we need to stop the daemon
Deluge.Client.web.stop_daemon(connection.id, {
success: function(result) {
if (!result[0]) {
Ext.MessageBox.show({
title: _('Error'),
msg: result[1],
buttons: Ext.MessageBox.OK,
modal: false,
icon: Ext.MessageBox.ERROR,
iconCls: 'x-deluge-icon-error'
});
}
}
});
}
}
});
Deluge.ConnectionManager = new Ext.deluge.ConnectionManager();
onStop: function(button, e) {
var connection = this.grid.getSelectionModel().getSelected();
if (!connection) return;
if (connection.get('status') == 'Offline') {
// This means we need to start the daemon
Deluge.Client.web.start_daemon(connection.get('port'));
} else {
// This means we need to stop the daemon
Deluge.Client.web.stop_daemon(connection.id, {
success: function(result) {
if (!result[0]) {
Ext.MessageBox.show({
title: _('Error'),
msg: result[1],
buttons: Ext.MessageBox.OK,
modal: false,
icon: Ext.MessageBox.ERROR,
iconCls: 'x-deluge-icon-error'
});
}
}
});
}
}
});
Deluge.ConnectionManager = new Ext.deluge.ConnectionManager();
})();

54
deluge/ui/web/js/Deluge.EditTrackers.js
View File

@ -1,6 +1,6 @@
/*
Script: Deluge.EditTrackers.js
Contains the edit trackers window.
Contains the edit trackers window.
Copyright:
(C) Damien Churchill 2009 <damoxc@gmail.com>
@ -20,15 +20,15 @@ Copyright:
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
library.
You must obey the GNU General Public License in all respects for all of
the code used other than OpenSSL. If you modify file(s) with this
exception, you may extend this exception to your version of the file(s),
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.
In addition, as a special exception, the copyright holders give
permission to link the code of portions of this program with the OpenSSL
library.
You must obey the GNU General Public License in all respects for all of
the code used other than OpenSSL. If you modify file(s) with this
exception, you may extend this exception to your version of the file(s),
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.
*/
@ -54,8 +54,8 @@ Copyright:
initComponent: function() {
Ext.deluge.AddTracker.superclass.initComponent.call(this);
this.addButton(_('Cancel'), this.onCancel, this);
this.addButton(_('Add'), this.onAdd, this);
this.addButton(_('Cancel'), this.onCancelClick, this);
this.addButton(_('Add'), this.onAddClick, this);
this.addEvents('add');
this.form = this.add({
@ -71,12 +71,7 @@ Copyright:
})
},
onCancel: function() {
this.form.getForm().findField('trackers').setValue('');
this.hide();
},
onAdd: function() {
onAddClick: function() {
var trackers = this.form.getForm().findField('trackers').getValue();
trackers = trackers.split('\n');
@ -89,6 +84,11 @@ Copyright:
this.fireEvent('add', cleaned);
this.hide();
this.form.getForm().findField('trackers').setValue('');
},
onCancelClick: function() {
this.form.getForm().findField('trackers').setValue('');
this.hide();
}
});
@ -224,31 +224,31 @@ Copyright:
cls: 'x-btn-text-icon',
text: _('Up'),
icon: '/icons/up.png',
handler: this.onUp,
handler: this.onUpClick,
scope: this
}, {
cls: 'x-btn-text-icon',
text: _('Down'),
icon: '/icons/down.png',
handler: this.onDown,
handler: this.onDownClick,
scope: this
}, '->', {
cls: 'x-btn-text-icon',
text: _('Add'),
icon: '/icons/add.png',
handler: this.onAdd,
handler: this.onAddClick,
scope: this
}, {
cls: 'x-btn-text-icon',
text: _('Edit'),
icon: '/icons/edit_trackers.png',
handler: this.onEdit,
handler: this.onEditClick,
scope: this
}, {
cls: 'x-btn-text-icon',
text: _('Remove'),
icon: '/icons/remove.png',
handler: this.onRemove,
handler: this.onRemoveClick,
scope: this
}
]
@ -256,7 +256,7 @@ Copyright:
});
},
onAdd: function() {
onAddClick: function() {
this.addWindow.show();
},
@ -279,11 +279,11 @@ Copyright:
}, this);
},
onCancel: function() {
onCancelClick: function() {
this.hide();
},
onEdit: function() {
onEditClick: function() {
var r = this.grid.getSelectionModel().getSelected();
this.editWindow.show(r);
},
@ -344,4 +344,4 @@ Copyright:
}
});
Deluge.EditTrackers = new Ext.deluge.EditTrackers();
})();
})();

296
deluge/ui/web/js/Deluge.Statusbar.js
View File

@ -1,153 +1,151 @@
(function() {
Ext.deluge.Statusbar = Ext.extend(Ext.StatusBar, {
constructor: function(config) {
config = Ext.apply({
id: 'deluge-statusbar',
defaultIconCls: 'x-not-connected',
defaultText: _('Not Connected')
}, config);
Ext.deluge.Statusbar.superclass.constructor.call(this, config);
},
initComponent: function() {
Ext.deluge.Statusbar.superclass.initComponent.call(this);
Deluge.Events.on('connect', this.onConnect, this);
Deluge.Events.on('disconnect', this.onDisconnect, this);
},
createButtons: function() {
this.add({
id: 'statusbar-connections',
text: ' ',
cls: 'x-btn-text-icon',
iconCls: 'x-deluge-connections',
tooltip: _('Connections'),
menu: Deluge.Menus.Connections
}, '-', {
id: 'statusbar-downspeed',
text: ' ',
cls: 'x-btn-text-icon',
iconCls: 'x-deluge-downloading',
tooltip: _('Download Speed'),
menu: Deluge.Menus.Download
}, '-', {
id: 'statusbar-upspeed',
text: ' ',
cls: 'x-btn-text-icon',
iconCls: 'x-deluge-seeding',
tooltip: _('Upload Speed'),
menu: Deluge.Menus.Upload
}, '-', {
id: 'statusbar-traffic',
text: ' ',
cls: 'x-btn-text-icon',
iconCls: 'x-deluge-traffic',
tooltip: _('Protocol Traffic Download/Upload')
}, '-', {
id: 'statusbar-dht',
text: ' ',
cls: 'x-btn-text-icon',
iconCls: 'x-deluge-dht',
tooltip: _('DHT Nodes')
}, '-', {
id: 'statusbar-freespace',
text: ' ',
cls: 'x-btn-text-icon',
iconCls: 'x-deluge-freespace',
tooltip: _('Freespace in download location')
});
this.created = true;
},
onConnect: function() {
this.setStatus({
iconCls: 'x-connected',
text: ''
});
if (!this.created) this.createButtons();
else {
this.items.each(function(item) {
item.show();
item.enable();
});
}
},
Ext.deluge.Statusbar = Ext.extend(Ext.Toolbar, {
constructor: function(config) {
config = Ext.apply({
id: 'deluge-statusbar',
defaultIconCls: 'x-not-connected',
defaultText: _('Not Connected')
}, config);
Ext.deluge.Statusbar.superclass.constructor.call(this, config);
},
onDisconnect: function() {
this.clearStatus({useDefaults:true});
initComponent: function() {
Ext.deluge.Statusbar.superclass.initComponent.call(this);
Deluge.Events.on('connect', this.onConnect, this);
Deluge.Events.on('disconnect', this.onDisconnect, this);
},
createButtons: function() {
this.add({
id: 'statusbar-connections',
text: ' ',
cls: 'x-btn-text-icon',
iconCls: 'x-deluge-connections',
tooltip: _('Connections'),
menu: Deluge.Menus.Connections
}, '-', {
id: 'statusbar-downspeed',
text: ' ',
cls: 'x-btn-text-icon',
iconCls: 'x-deluge-downloading',
tooltip: _('Download Speed'),
menu: Deluge.Menus.Download
}, '-', {
id: 'statusbar-upspeed',
text: ' ',
cls: 'x-btn-text-icon',
iconCls: 'x-deluge-seeding',
tooltip: _('Upload Speed'),
menu: Deluge.Menus.Upload
}, '-', {
id: 'statusbar-traffic',
text: ' ',
cls: 'x-btn-text-icon',
iconCls: 'x-deluge-traffic',
tooltip: _('Protocol Traffic Download/Upload')
}, '-', {
id: 'statusbar-dht',
text: ' ',
cls: 'x-btn-text-icon',
iconCls: 'x-deluge-dht',
tooltip: _('DHT Nodes')
}, '-', {
id: 'statusbar-freespace',
text: ' ',
cls: 'x-btn-text-icon',
iconCls: 'x-deluge-freespace',
tooltip: _('Freespace in download location')
});
this.created = true;
},
onConnect: function() {
//this.setStatus({
// iconCls: 'x-connected',
// text: ''
//});
if (!this.created) this.createButtons();
else {
this.items.each(function(item) {
item.hide();
item.disable();
item.show();
item.enable();
});
},
update: function(stats) {
if (!stats) return;
function addSpeed(val) {return val + ' KiB/s'}
var updateStat = function(name, config) {
var item = this.items.get('statusbar-' + name);
if (config.limit.value > 0) {
var value = (config.value.formatter) ? config.value.formatter(config.value.value) : config.value.value;
var limit = (config.limit.formatter) ? config.limit.formatter(config.limit.value) : config.limit.value;
var str = String.format(config.format, value, limit);
} else {
var str = (config.value.formatter) ? config.value.formatter(config.value.value) : config.value.value;
}
item.setText(str);
}.bind(this);
updateStat('connections', {
value: {value: stats.num_connections},
limit: {value: stats.max_num_connections},
format: '{0} ({1})'
});
updateStat('downspeed', {
value: {
value: stats.download_rate,
formatter: Deluge.Formatters.speed
},
limit: {
value: stats.max_download,
formatter: addSpeed
},
format: '{0} ({1})'
});
updateStat('upspeed', {
value: {
value: stats.upload_rate,
formatter: Deluge.Formatters.speed
},
limit: {
value: stats.max_upload,
formatter: addSpeed
},
format: '{0} ({1})'
});
updateStat('traffic', {
value: {
value: stats.download_protocol_rate,
formatter: Deluge.Formatters.speed
},
limit: {
value: stats.upload_protocol_rate,
formatter: Deluge.Formatters.speed
},
format: '{0}/{1}'
});
this.items.get('statusbar-dht').setText(stats.dht_nodes);
this.items.get('statusbar-freespace').setText(fsize(stats.free_space));
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();
})();
},
onDisconnect: function() {
//this.clearStatus({useDefaults:true});
this.items.each(function(item) {
item.hide();
item.disable();
});
},
update: function(stats) {
if (!stats) return;
function addSpeed(val) {return val + ' KiB/s'}
var updateStat = function(name, config) {
var item = this.items.get('statusbar-' + name);
if (config.limit.value > 0) {
var value = (config.value.formatter) ? config.value.formatter(config.value.value) : config.value.value;
var limit = (config.limit.formatter) ? config.limit.formatter(config.limit.value) : config.limit.value;
var str = String.format(config.format, value, limit);
} else {
var str = (config.value.formatter) ? config.value.formatter(config.value.value) : config.value.value;
}
item.setText(str);
}.bind(this);
updateStat('connections', {
value: {value: stats.num_connections},
limit: {value: stats.max_num_connections},
format: '{0} ({1})'
});
updateStat('downspeed', {
value: {
value: stats.download_rate,
formatter: Deluge.Formatters.speed
},
limit: {
value: stats.max_download,
formatter: addSpeed
},
format: '{0} ({1})'
});
updateStat('upspeed', {
value: {
value: stats.upload_rate,
formatter: Deluge.Formatters.speed
},
limit: {
value: stats.max_upload,
formatter: addSpeed
},
format: '{0} ({1})'
});
updateStat('traffic', {
value: {
value: stats.download_protocol_rate,
formatter: Deluge.Formatters.speed
},
limit: {
value: stats.upload_protocol_rate,
formatter: Deluge.Formatters.speed
},
format: '{0}/{1}'
});
this.items.get('statusbar-dht').setText(stats.dht_nodes);
this.items.get('statusbar-freespace').setText(fsize(stats.free_space));
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();

4
deluge/ui/web/js/Deluge.Torrents.js
View File

@ -48,8 +48,8 @@ Copyright:
value = new Number(value);
var progress = value;
var text = r.data['state'] + ' ' + value.toFixed(2) + '%'
var width = new Number(this.style.match(/\w+:\s*(\d+)\w+/)[1]) - 8;
return Deluge.progressBar(value, width, text);
//var width = new Number(this.style.match(/\w+:\s*(\d+)\w+/)[1]) - 8;
return Deluge.progressBar(value, this.width - 8, text);
}
function seedsRenderer(value, p, r) {
if (r.data['total_seeds'] > -1) {

58869
deluge/ui/web/js/ext-all-debug.js
View File

File diff suppressed because it is too large Load Diff

2425
deluge/ui/web/js/ext-all.js
View File

File diff suppressed because one or more lines are too long

5519
deluge/ui/web/js/ext-base-debug.js
View File

File diff suppressed because it is too large Load Diff

235
deluge/ui/web/js/ext-base.js
View File

File diff suppressed because one or more lines are too long

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

@ -309,7 +309,7 @@ class TopLevel(resource.Resource):
]
__debug_scripts = [
"/js/ext-base.js",
"/js/ext-base-debug.js",
"/js/ext-all-debug.js",
"/js/ext-extensions-debug.js",
"/config.js",