Update Changelog, webui gettext, gitignore & compress js

This commit is contained in:
Calum Lind 2012-12-22 02:24:25 +00:00
parent 444740709a
commit 2fde78f236
5 changed files with 167 additions and 142 deletions

2
.gitignore vendored
View File

@ -9,4 +9,4 @@ dist
_trial_temp
deluge/i18n/*/
*.desktop
.build_data
.build_data*

View File

@ -1,14 +1,17 @@
=== Deluge 1.3.6 (In Development) ===
==== Core ====
* Catch & log KeyError when removing a torrent from the queued torrents set
* Fix moving/renaming torrents with non-ascii characters in libtorrent 0.16
* Fix moving/renaming torrents issues when using libtorrent 0.16
* Make sure queue order is preserved when restarting
* #2160: Disable use of python bindings for libtorrent extensions and replace with session flag
* #2163: Fix unable add torrent file with empty (0:) encoding tag
* #2201: Fix error in authmanager if auth file has extra newlines
* #2109: Fix the Proxy settings not being cleared by setting None
* #2110: Fix accepting magnet uris with xt param anywhere within them
* #2204: Fix daemon shutdown hang
* #2204: Fix daemon shutdown hang with large numbers of torrents
==== Client ====
* Fix keyerrors after removing torrents from UIs
==== GtkUI ====
* Add move completed option to add torrent dialog
@ -24,6 +27,10 @@
* Fix torrent names on libtorrent 0.16 on windows
* #2147: Fix missing translations for plugin preferences page
* #1474: Fix the on_show_prefs hook not being executed immediatly after enabling a plugin
* #1946: Fix ReactorNotRestartable error when set as startup application
* #2130: Fix same name can be given to different files in Add Torrent dialog
* #2129: Fix empty filename able to be set in AddTorrent dialog
* #2228: Fix Apply-To-All in AddTorrent Dialog copying file renames to other torrents
==== Console ====
* LP#1004793: Enable use of connect command in non-interactive mode
@ -39,6 +46,11 @@
* #2120: Fix manually entered values not being saved in spinners
* #2212: Fix unable to scroll in proxy preferences page
* Fix autoconnecting to the default host
* #2046: Fix plugins not enabling properly until after refreshing page
* #2125: Fix plugin methods not being available when enabled until restart
* #2085: Fix not showing torrents in sidebar for categories other than 'All' in classic mode
* #2232: Fix flag icon path in Peers Tab missing deluge.config.base
* Fix submenus closing upon mouse click
==== Windows OS ====
* Hide the cmd windows when running deluged.exe or deluge-web.exe

View File

@ -32,49 +32,49 @@ GetText.add('#', '${escape(_("#"))}')
// DetailsTab.js:50
GetText.add('# of files', '${escape(_("# of files"))}')
// Menus.js:161
// Menus.js:166
GetText.add('0', '${escape(_("0"))}')
// Menus.js:163
// Menus.js:168
GetText.add('1', '${escape(_("1"))}')
// Menus.js:109, Menus.js:127
// Menus.js:111, Menus.js:130
GetText.add('10 KiB/s', '${escape(_("10 KiB/s"))}')
// Menus.js:145
// Menus.js:149
GetText.add('100', '${escape(_("100"))}')
// Menus.js:165
// Menus.js:170
GetText.add('2', '${escape(_("2"))}')
// Menus.js:147
// Menus.js:151
GetText.add('200', '${escape(_("200"))}')
// Menus.js:167
// Menus.js:172
GetText.add('3', '${escape(_("3"))}')
// Menus.js:111, Menus.js:129
// Menus.js:113, Menus.js:132
GetText.add('30 KiB/s', '${escape(_("30 KiB/s"))}')
// Menus.js:149
// Menus.js:153
GetText.add('300', '${escape(_("300"))}')
// Menus.js:115, Menus.js:133
// Menus.js:117, Menus.js:136
GetText.add('300 KiB/s', '${escape(_("300 KiB/s"))}')
// Menus.js:169
// Menus.js:174
GetText.add('5', '${escape(_("5"))}')
// Menus.js:107, Menus.js:125
// Menus.js:109, Menus.js:128
GetText.add('5 KiB/s', '${escape(_("5 KiB/s"))}')
// Menus.js:143
// Menus.js:147
GetText.add('50', '${escape(_("50"))}')
// Menus.js:151
// Menus.js:155
GetText.add('500', '${escape(_("500"))}')
// Menus.js:113, Menus.js:131
// Menus.js:115, Menus.js:134
GetText.add('80 KiB/s', '${escape(_("80 KiB/s"))}')
// QueuePage.js:69
@ -86,7 +86,7 @@ GetText.add('Add', '${escape(_("Add"))}')
// AddConnectionWindow.js:40
GetText.add('Add Connection', '${escape(_("Add Connection"))}')
// OptionsTab.js:147
// OptionsTab.js:144
GetText.add('Add In Paused State', '${escape(_("Add In Paused State"))}')
// AddWindow.js:37
@ -122,7 +122,7 @@ GetText.add('Allow the use of multiple filters at once', '${escape(_("Allow the
// OptionsTab.js:347, PreferencesWindow.js:107
GetText.add('Apply', '${escape(_("Apply"))}')
// Menus.js:176, OptionsTab.js:215
// Menus.js:181, OptionsTab.js:215
GetText.add('Auto Managed', '${escape(_("Auto Managed"))}')
// DownloadsPage.js:91
@ -140,7 +140,7 @@ GetText.add('Bandwidth', '${escape(_("Bandwidth"))}')
// OtherPage.js:66
GetText.add('Be alerted about new releases', '${escape(_("Be alerted about new releases"))}')
// Menus.js:204
// Menus.js:210
GetText.add('Bottom', '${escape(_("Bottom"))}')
// MoveStorage.js:73, FileWindow.js:70, InstallPluginWindow.js:69
@ -188,7 +188,7 @@ GetText.add('Connect', '${escape(_("Connect"))}')
// ConnectionManager.js:177, ConnectionManager.js:225
GetText.add('Connected', '${escape(_("Connected"))}')
// Menus.js:139
// Menus.js:142
GetText.add('Connection Limit', '${escape(_("Connection Limit"))}')
// ConnectionManager.js:43, Toolbar.js:100
@ -209,7 +209,7 @@ GetText.add('Copy of .torrent files to', '${escape(_("Copy of .torrent files to"
// Toolbar.js:52
GetText.add('Create', '${escape(_("Create"))}')
// Menus.js:103
// Menus.js:104
GetText.add('D/L Speed Limit', '${escape(_("D/L Speed Limit"))}')
// NetworkPage.js:225, ProxyPage.js:70
@ -236,13 +236,13 @@ GetText.add('Disabled', '${escape(_("Disabled"))}')
// ConnectionManager.js:179
GetText.add('Disconnect', '${escape(_("Disconnect"))}')
// Menus.js:251, Deluge.js:156
// Menus.js:257, Deluge.js:156
GetText.add('Do Not Download', '${escape(_("Do Not Download"))}')
// QueuePage.js:107
GetText.add('Do not count slow torrents', '${escape(_("Do not count slow torrents"))}')
// EditTrackersWindow.js:107, Menus.js:198, Toolbar.js:89
// EditTrackersWindow.js:107, Menus.js:204, Toolbar.js:89
GetText.add('Down', '${escape(_("Down"))}')
// TorrentGrid.js:211
@ -278,7 +278,7 @@ GetText.add('Edit', '${escape(_("Edit"))}')
// EditTrackerWindow.js:40
GetText.add('Edit Tracker', '${escape(_("Edit Tracker"))}')
// EditTrackersWindow.js:40, Menus.js:218, OptionsTab.js:332
// EditTrackersWindow.js:40, Menus.js:224, OptionsTab.js:332
GetText.add('Edit Trackers', '${escape(_("Edit Trackers"))}')
// EncryptionPage.js:99
@ -293,12 +293,18 @@ GetText.add('Encrypt entire stream', '${escape(_("Encrypt entire stream"))}')
// EncryptionPage.js:41
GetText.add('Encryption', '${escape(_("Encryption"))}')
// ConnectionManager.js:308, ConnectionManager.js:364, AddConnectionWindow.js:103, AddWindow.js:209
// ConnectionManager.js:308, ConnectionManager.js:364, AddConnectionWindow.js:103, UrlWindow.js:116, FileWindow.js:103, AddWindow.js:211
GetText.add('Error', '${escape(_("Error"))}')
// Menus.js:247
// Menus.js:253
GetText.add('Expand All', '${escape(_("Expand All"))}')
// UrlWindow.js:117
GetText.add('Failed to download torrent', '${escape(_("Failed to download torrent"))}')
// FileWindow.js:104
GetText.add('Failed to upload torrent', '${escape(_("Failed to upload torrent"))}')
// FileWindow.js:67, AddWindow.js:98
GetText.add('File', '${escape(_("File"))}')
@ -323,7 +329,7 @@ GetText.add('Find More', '${escape(_("Find More"))}')
// DownloadsPage.js:57
GetText.add('Folders', '${escape(_("Folders"))}')
// Menus.js:230
// Menus.js:236
GetText.add('Force Recheck', '${escape(_("Force Recheck"))}')
// EncryptionPage.js:63, EncryptionPage.js:80
@ -341,7 +347,7 @@ GetText.add('Full', '${escape(_("Full"))}')
// EncryptionPage.js:98
GetText.add('Full Stream', '${escape(_("Full Stream"))}')
// OptionsTab.js:293, OptionsTab.js:140, QueuePage.js:52
// OptionsTab.js:293, OptionsTab.js:137, QueuePage.js:52
GetText.add('General', '${escape(_("General"))}')
// OtherPage.js:97
@ -365,10 +371,10 @@ GetText.add('Hash', '${escape(_("Hash"))}')
// Toolbar.js:107
GetText.add('Help', '${escape(_("Help"))}')
// Menus.js:261, Deluge.js:158
// Menus.js:267, Deluge.js:158
GetText.add('High Priority', '${escape(_("High Priority"))}')
// Menus.js:266, Deluge.js:159
// Menus.js:272, Deluge.js:159
GetText.add('Highest Priority', '${escape(_("Highest Priority"))}')
// FileBrowser.js:56
@ -431,10 +437,10 @@ GetText.add('Login Failed', '${escape(_("Login Failed"))}')
// Toolbar.js:114
GetText.add('Logout', '${escape(_("Logout"))}')
// OptionsTab.js:150, OptionsTab.js:127
// OptionsTab.js:150, OptionsTab.js:126
GetText.add('Max Connections', '${escape(_("Max Connections"))}')
// OptionsTab.js:115
// OptionsTab.js:116
GetText.add('Max Down Speed', '${escape(_("Max Down Speed"))}')
// OptionsTab.js:97
@ -443,7 +449,7 @@ GetText.add('Max Download Speed', '${escape(_("Max Download Speed"))}')
// OptionsTab.js:121
GetText.add('Max Up Speed', '${escape(_("Max Up Speed"))}')
// OptionsTab.js:173, OptionsTab.js:133
// OptionsTab.js:173, OptionsTab.js:131
GetText.add('Max Upload Slots', '${escape(_("Max Upload Slots"))}')
// OptionsTab.js:123
@ -473,7 +479,7 @@ GetText.add('Move', '${escape(_("Move"))}')
// OptionsTab.js:262
GetText.add('Move Completed', '${escape(_("Move Completed"))}')
// Menus.js:236, MoveStorage.js:38
// Menus.js:242, MoveStorage.js:38
GetText.add('Move Storage', '${escape(_("Move Storage"))}')
// DownloadsPage.js:75
@ -500,13 +506,13 @@ GetText.add('New Password', '${escape(_("New Password"))}')
// ProxyField.js:55
GetText.add('None', '${escape(_("None"))}')
// Menus.js:256, Deluge.js:157
// Menus.js:262, Deluge.js:157
GetText.add('Normal Priority', '${escape(_("Normal Priority"))}')
// Statusbar.js:39
GetText.add('Not Connected', '${escape(_("Not Connected"))}')
// AddWindow.js:210
// AddWindow.js:212
GetText.add('Not a valid torrent', '${escape(_("Not a valid torrent"))}')
// ConnectionManager.js:180, ConnectionManager.js:188
@ -575,7 +581,7 @@ GetText.add('Preferences', '${escape(_("Preferences"))}')
// OptionsTab.js:308
GetText.add('Prioritize First/Last', '${escape(_("Prioritize First/Last"))}')
// OptionsTab.js:153
// OptionsTab.js:150
GetText.add('Prioritize First/Last Pieces', '${escape(_("Prioritize First/Last Pieces"))}')
// DownloadsPage.js:140
@ -599,7 +605,7 @@ GetText.add('Protocol Traffic Download/Upload', '${escape(_("Protocol Traffic Do
// ProxyPage.js:42
GetText.add('Proxy', '${escape(_("Proxy"))}')
// Menus.js:181, OptionsTab.js:196, QueuePage.js:41
// Menus.js:186, OptionsTab.js:196, QueuePage.js:41
GetText.add('Queue', '${escape(_("Queue"))}')
// QueuePage.js:62
@ -614,7 +620,7 @@ GetText.add('Ratio', '${escape(_("Ratio"))}')
// EditTrackersWindow.js:122, ConnectionManager.js:107, Toolbar.js:64, AddWindow.js:112
GetText.add('Remove', '${escape(_("Remove"))}')
// Menus.js:224, RemoveWindow.js:39, RemoveWindow.js:57
// Menus.js:230, RemoveWindow.js:39, RemoveWindow.js:57
GetText.add('Remove Torrent', '${escape(_("Remove Torrent"))}')
// RemoveWindow.js:56
@ -719,7 +725,7 @@ GetText.add('TOS', '${escape(_("TOS"))}')
// EditTrackersWindow.js:76
GetText.add('Tier', '${escape(_("Tier"))}')
// Menus.js:186
// Menus.js:192
GetText.add('Top', '${escape(_("Top"))}')
// QueuePage.js:76
@ -746,7 +752,7 @@ GetText.add('Trackers', '${escape(_("Trackers"))}')
// ProxyField.js:48
GetText.add('Type', '${escape(_("Type"))}')
// Menus.js:121
// Menus.js:123
GetText.add('U/L Speed Limit', '${escape(_("U/L Speed Limit"))}')
// NetworkPage.js:199
@ -755,10 +761,10 @@ GetText.add('UPnP', '${escape(_("UPnP"))}')
// OptionsPanel.js:142
GetText.add('Unable to set file priority!', '${escape(_("Unable to set file priority!"))}')
// Statusbar.js:85, Statusbar.js:133, Statusbar.js:181, Menus.js:117, Menus.js:135, Menus.js:153, Menus.js:171
// Statusbar.js:85, Statusbar.js:133, Statusbar.js:181, Menus.js:119, Menus.js:138, Menus.js:157, Menus.js:176
GetText.add('Unlimited', '${escape(_("Unlimited"))}')
// EditTrackersWindow.js:102, Menus.js:192, Toolbar.js:83, FileBrowser.js:53
// EditTrackersWindow.js:102, Menus.js:198, Toolbar.js:83, FileBrowser.js:53
GetText.add('Up', '${escape(_("Up"))}')
// TorrentGrid.js:218
@ -767,13 +773,13 @@ GetText.add('Up Limit', '${escape(_("Up Limit"))}')
// TorrentGrid.js:136
GetText.add('Up Speed', '${escape(_("Up Speed"))}')
// Menus.js:212
// Menus.js:218
GetText.add('Update Tracker', '${escape(_("Update Tracker"))}')
// OtherPage.js:56
GetText.add('Updates', '${escape(_("Updates"))}')
// Menus.js:157
// Menus.js:161
GetText.add('Upload Slot Limit', '${escape(_("Upload Slot Limit"))}')
// Statusbar.js:152

View File

@ -1131,7 +1131,7 @@ Deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
if (!value.replace(' ', '').replace(' ', '')){
return '';
}
return String.format('<img src="flag/{0}" />', value);
return String.format('<img src="{0}flag/{1}" />', deluge.config.base, value);
}
function peerAddressRenderer(value, p, record) {
var seed = (record.data['seed'] == 1024) ? 'x-deluge-seed' : 'x-deluge-peer';
@ -1808,7 +1808,7 @@ Deluge.add.FileWindow = Ext.extend(Deluge.add.Window, {
});
/*!
* Deluge.add.FilesTab.js
*
*
* Copyright (c) Damien Churchill 2009-2010 <damoxc@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
@ -1848,7 +1848,7 @@ Deluge.add.FilesTab = Ext.extend(Ext.ux.tree.TreeGrid, {
layout: 'fit',
title: _('Files'),
autoScroll: true,
autoScroll: false,
animate: false,
border: false,
disabled: true,
@ -2124,7 +2124,7 @@ Deluge.add.OptionsPanel = Ext.extend(Ext.TabPanel, {
});
/*!
* Deluge.add.OptionsPanel.js
*
*
* Copyright (c) Damien Churchill 2009-2010 <damoxc@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
@ -2191,7 +2191,7 @@ Deluge.add.OptionsTab = Ext.extend(Ext.form.FormPanel, {
width: 400,
labelSeparator: ''
}));
var panel = this.add({
border: false,
layout: 'column',
@ -2202,7 +2202,6 @@ Deluge.add.OptionsTab = Ext.extend(Ext.form.FormPanel, {
border: false,
autoHeight: true,
defaultType: 'radio',
width: 100
});
this.optionsManager.bind('compact_allocation', fieldset.add({
@ -2210,6 +2209,7 @@ Deluge.add.OptionsTab = Ext.extend(Ext.form.FormPanel, {
columns: 1,
vertical: true,
labelSeparator: '',
width: 80,
items: [{
name: 'compact_allocation',
value: false,
@ -2231,35 +2231,32 @@ Deluge.add.OptionsTab = Ext.extend(Ext.form.FormPanel, {
title: _('Bandwidth'),
border: false,
autoHeight: true,
labelWidth: 100,
bodyStyle: 'margin-left: 7px',
labelWidth: 105,
width: 200,
defaultType: 'spinnerfield'
});
this.optionsManager.bind('max_download_speed', fieldset.add({
fieldLabel: _('Max Down Speed'),
labelStyle: 'margin-left: 10px',
name: 'max_download_speed',
width: 60
}));
this.optionsManager.bind('max_upload_speed', fieldset.add({
fieldLabel: _('Max Up Speed'),
labelStyle: 'margin-left: 10px',
name: 'max_upload_speed',
width: 60
}));
this.optionsManager.bind('max_connections', fieldset.add({
fieldLabel: _('Max Connections'),
labelStyle: 'margin-left: 10px',
name: 'max_connections',
width: 60
}));
this.optionsManager.bind('max_upload_slots', fieldset.add({
fieldLabel: _('Max Upload Slots'),
labelStyle: 'margin-left: 10px',
name: 'max_upload_slots',
width: 60
}));
fieldset = panel.add({
title: _('General'),
border: false,
@ -5404,9 +5401,6 @@ Ext.ux.util.RpcClient = Ext.extend(Ext.util.Observable, {
},
reloadMethods: function() {
Ext.each(this._components, function(component) {
delete this[component];
}, this);
this._execute('system.listMethods', {
success: this._setMethods,
scope: this
@ -5515,7 +5509,7 @@ Ext.ux.util.RpcClient = Ext.extend(Ext.util.Observable, {
var fn = function() {
var options = self._parseArgs(arguments);
return self._execute(method, options);
}
};
component[parts[1]] = fn;
components[parts[0]] = component;
});
@ -5523,7 +5517,11 @@ Ext.ux.util.RpcClient = Ext.extend(Ext.util.Observable, {
for (var name in components) {
self[name] = components[name];
}
Ext.each(this._components, function(component) {
if (!component in components) {
delete this[component];
}
}, this);
this._components = Ext.keys(components);
this.fireEvent('connected', this);
}
@ -6511,13 +6509,15 @@ Deluge.EventsManager = Ext.extend(Ext.util.Observable, {
},
onGetEventsSuccess: function(events) {
if (!events) return;
Ext.each(events, function(event) {
var name = event[0], args = event[1];
args.splice(0, 0, name);
this.fireEvent.apply(this, args);
}, this);
if (this.running) this.getEvents();
if (!this.running) return;
if (events) {
Ext.each(events, function(event) {
var name = event[0], args = event[1];
args.splice(0, 0, name);
this.fireEvent.apply(this, args);
}, this);
}
this.getEvents();
},
// private
@ -7227,7 +7227,7 @@ Deluge.LoginWindow = Ext.extend(Ext.Window, {
});
/*!
* Deluge.Menus.js
*
*
* Copyright (c) Damien Churchill 2009-2010 <damoxc@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
@ -7261,7 +7261,7 @@ deluge.menus = {
onTorrentAction: function(item, e) {
var ids = deluge.torrents.getSelectedIds();
var action = item.initialConfig.torrentAction;
switch (action) {
case 'pause':
case 'resume':
@ -7296,7 +7296,7 @@ deluge.menus = {
break;
case 'recheck':
deluge.client.core.force_recheck(ids, {
success: function() {
success: function() {
deluge.ui.update();
}
});
@ -7325,10 +7325,12 @@ deluge.menus.torrent = new Ext.menu.Menu({
}, '-', {
text: _('Options'),
iconCls: 'icon-options',
hideOnClick: false,
menu: new Ext.menu.Menu({
items: [{
text: _('D/L Speed Limit'),
iconCls: 'x-deluge-downloading',
hideOnClick: false,
menu: new Ext.menu.Menu({
items: [{
text: _('5 KiB/s')
@ -7347,6 +7349,7 @@ deluge.menus.torrent = new Ext.menu.Menu({
}, {
text: _('U/L Speed Limit'),
iconCls: 'x-deluge-seeding',
hideOnClick: false,
menu: new Ext.menu.Menu({
items: [{
text: _('5 KiB/s')
@ -7365,6 +7368,7 @@ deluge.menus.torrent = new Ext.menu.Menu({
}, {
text: _('Connection Limit'),
iconCls: 'x-deluge-connections',
hideOnClick: false,
menu: new Ext.menu.Menu({
items: [{
text: _('50')
@ -7383,6 +7387,7 @@ deluge.menus.torrent = new Ext.menu.Menu({
}, {
text: _('Upload Slot Limit'),
iconCls: 'icon-upload-slots',
hideOnClick: false,
menu: new Ext.menu.Menu({
items: [{
text: _('0')
@ -7407,6 +7412,7 @@ deluge.menus.torrent = new Ext.menu.Menu({
}, '-', {
text: _('Queue'),
iconCls: 'icon-queue',
hideOnClick: false,
menu: new Ext.menu.Menu({
items: [{
torrentAction: 'top',
@ -7991,6 +7997,7 @@ Deluge.Plugin = Ext.extend(Ext.util.Observable, {
* then executes the plugins setup method, onEnabled.
*/
enable: function() {
deluge.client.reloadMethods();
this.fireEvent("enable", this);
if (this.onEnable) this.onEnable();
},
@ -9500,7 +9507,7 @@ deluge.ui = {
},
onPluginDisabled: function(pluginName) {
deluge.plugins[pluginName].disable();
if (deluge.plugins[pluginName]) deluge.plugins[pluginName].disable();
},
onPluginLoaded: function(options) {

File diff suppressed because one or more lines are too long