diff --git a/deluge/ui/web/js/deluge-all/.build b/deluge/ui/web/js/deluge-all/.build index f40c64251..af6a2b067 100644 --- a/deluge/ui/web/js/deluge-all/.build +++ b/deluge/ui/web/js/deluge-all/.build @@ -38,5 +38,6 @@ add_file "Deluge.Remove.js" add_file "Deluge.Sidebar.js" add_file "Deluge.Statusbar.js" add_file "Deluge.Toolbar.js" +add_file "Deluge.Torrent.js" add_file "Deluge.Torrents.js" add_file "Deluge.UI.js" diff --git a/deluge/ui/web/js/deluge-all/Deluge.Add.File.js b/deluge/ui/web/js/deluge-all/Deluge.Add.File.js index 8455f9ffb..072268148 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Add.File.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Add.File.js @@ -3,7 +3,7 @@ Script: Deluge.Add.File.js Contains the Add Torrent by file window. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Add.Infohash.js b/deluge/ui/web/js/deluge-all/Deluge.Add.Infohash.js index d50c6c7bb..127c39349 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Add.Infohash.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Add.Infohash.js @@ -3,7 +3,7 @@ Script: Deluge.Add.Infohash.js Contains the Add Torrent by infohash window. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Add.Url.js b/deluge/ui/web/js/deluge-all/Deluge.Add.Url.js index 58ee520d4..df3aca013 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Add.Url.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Add.Url.js @@ -3,7 +3,7 @@ Script: Deluge.Add.Url.js Contains the Add Torrent by url window. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Add.js b/deluge/ui/web/js/deluge-all/Deluge.Add.js index 11eee0434..14d4fe0a6 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Add.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Add.js @@ -3,7 +3,7 @@ Script: Deluge.Add.js Contains the Add Torrent window. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Client.js b/deluge/ui/web/js/deluge-all/Deluge.Client.js index 26abd441b..740f82a4b 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Client.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Client.js @@ -3,7 +3,7 @@ Script: Deluge.Client.js A JSON-RPC proxy built on top of ext-core. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.ConnectionManager.js b/deluge/ui/web/js/deluge-all/Deluge.ConnectionManager.js index 8a64583b3..8fd5c4035 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.ConnectionManager.js +++ b/deluge/ui/web/js/deluge-all/Deluge.ConnectionManager.js @@ -3,7 +3,7 @@ Script: deluge-connections.js Contains all objects and functions related to the connection manager. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Details.Details.js b/deluge/ui/web/js/deluge-all/Deluge.Details.Details.js index 98c8ef68e..7a81646ba 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Details.Details.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Details.Details.js @@ -3,7 +3,7 @@ Script: Deluge.Details.Details.js The details tab displayed in the details panel. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Details.Files.js b/deluge/ui/web/js/deluge-all/Deluge.Details.Files.js index 8a2ffab8e..79b6d25c1 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Details.Files.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Details.Files.js @@ -3,7 +3,7 @@ Script: Deluge.Details.Files.js The files tab displayed in the details panel. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Details.Options.js b/deluge/ui/web/js/deluge-all/Deluge.Details.Options.js index 302a8d687..9a0227f74 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Details.Options.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Details.Options.js @@ -3,7 +3,7 @@ Script: Deluge.Details.Options.js The options tab displayed in the details panel. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Details.Peers.js b/deluge/ui/web/js/deluge-all/Deluge.Details.Peers.js index d9d4bfbbd..2eaa7600a 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Details.Peers.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Details.Peers.js @@ -3,7 +3,7 @@ Script: Deluge.Details.Peers.js The peers tab displayed in the details panel. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Details.Status.js b/deluge/ui/web/js/deluge-all/Deluge.Details.Status.js index b718df820..10b3cddf6 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Details.Status.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Details.Status.js @@ -3,7 +3,7 @@ Script: Deluge.Details.Status.js The status tab displayed in the details panel. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Details.js b/deluge/ui/web/js/deluge-all/Deluge.Details.js index 5f9486834..39031ec11 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Details.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Details.js @@ -4,7 +4,7 @@ Script: Deluge.Details.js it's containing tabs. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.EditTrackers.js b/deluge/ui/web/js/deluge-all/Deluge.EditTrackers.js index 6c12e3662..4c4c1822a 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.EditTrackers.js +++ b/deluge/ui/web/js/deluge-all/Deluge.EditTrackers.js @@ -3,7 +3,7 @@ Script: Deluge.EditTrackers.js Contains the edit trackers window. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Events.js b/deluge/ui/web/js/deluge-all/Deluge.Events.js index f8d7490c6..858778164 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Events.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Events.js @@ -3,7 +3,7 @@ Script: Deluge.Events.js Class for holding global events that occur within the UI. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Formatters.js b/deluge/ui/web/js/deluge-all/Deluge.Formatters.js index aebb3bee2..575a57f25 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Formatters.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Formatters.js @@ -3,7 +3,7 @@ Script: Deluge.Formatters.js Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Keys.js b/deluge/ui/web/js/deluge-all/Deluge.Keys.js index a7a44a6ab..824b0a333 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Keys.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Keys.js @@ -3,7 +3,7 @@ Script: Deluge.Keys.js The torrent status keys that are commonly used around the UI. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Login.js b/deluge/ui/web/js/deluge-all/Deluge.Login.js index 8308f7247..4f88445f6 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Login.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Login.js @@ -3,7 +3,7 @@ Script: Deluge.Login.js Contains all objects and functions related to the login system. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Menus.js b/deluge/ui/web/js/deluge-all/Deluge.Menus.js index e55cf5eb9..e0cbc2ded 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Menus.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Menus.js @@ -3,7 +3,7 @@ Script: deluge-menus.js Contains all the menus contained within the UI for easy access and editing. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.MoveStorage.js b/deluge/ui/web/js/deluge-all/Deluge.MoveStorage.js index df6a30a47..f38ab986c 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.MoveStorage.js +++ b/deluge/ui/web/js/deluge-all/Deluge.MoveStorage.js @@ -3,7 +3,7 @@ Script: Deluge.MoveStorage.js Contains the move storage window. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.MultiOptionsManager.js b/deluge/ui/web/js/deluge-all/Deluge.MultiOptionsManager.js index 96f6e8b00..01b8bc698 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.MultiOptionsManager.js +++ b/deluge/ui/web/js/deluge-all/Deluge.MultiOptionsManager.js @@ -3,7 +3,7 @@ Script: Deluge.MultiOptionsManager.js Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.OptionsManager.js b/deluge/ui/web/js/deluge-all/Deluge.OptionsManager.js index 58ee98079..a1be9f646 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.OptionsManager.js +++ b/deluge/ui/web/js/deluge-all/Deluge.OptionsManager.js @@ -3,7 +3,7 @@ Script: Deluge.OptionsManager.js Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Plugin.js b/deluge/ui/web/js/deluge-all/Deluge.Plugin.js index c7b1166bd..1bf905464 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Plugin.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Plugin.js @@ -3,7 +3,7 @@ Script: Deluge.Plugin.js Contains a base class for plugins to extend. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Bandwidth.js b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Bandwidth.js index f3f28f96e..4ffb565d4 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Bandwidth.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Bandwidth.js @@ -3,7 +3,7 @@ Script: Deluge.Preferences.Bandwidth.js The bandwidth preferences page. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Cache.js b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Cache.js index a6185ff83..824a0fb7c 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Cache.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Cache.js @@ -3,7 +3,7 @@ Script: Deluge.Preferences.Cache.js The cache preferences page. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Daemon.js b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Daemon.js index d39b06cfd..cf886d1b8 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Daemon.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Daemon.js @@ -3,7 +3,7 @@ Script: Deluge.Preferences.Daemon.js The daemon preferences page. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Downloads.js b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Downloads.js index d517a1057..c2b6b8de0 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Downloads.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Downloads.js @@ -3,7 +3,7 @@ Script: Deluge.Preferences.Downloads.js The downloads preferences page. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Encryption.js b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Encryption.js index 1b62369eb..1a8fd0e74 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Encryption.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Encryption.js @@ -3,7 +3,7 @@ Script: Deluge.Preferences.Encryption.js The encryption preferences page. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Interface.js b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Interface.js index 44346b7aa..ac656701d 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Interface.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Interface.js @@ -3,7 +3,7 @@ Script: Deluge.Preferences.Interface.js The interface preferences page. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Network.js b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Network.js index 7895c3ecc..e8fc7336c 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Network.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Network.js @@ -3,7 +3,7 @@ Script: Deluge.Preferences.Network.js The network preferences page. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Other.js b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Other.js index 07e7fd88b..552b23cbd 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Other.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Other.js @@ -3,7 +3,7 @@ Script: Deluge.Preferences.Other.js The other preferences page. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Plugins.js b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Plugins.js index 8485d9b6f..563332fdd 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Plugins.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Plugins.js @@ -3,7 +3,7 @@ Script: Deluge.Preferences.Plugins.js The plugins preferences page. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Proxy.js b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Proxy.js index c9f858122..dd734615a 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Proxy.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Proxy.js @@ -3,7 +3,7 @@ Script: Deluge.Preferences.Proxy.js The proxy preferences page. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Queue.js b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Queue.js index 4c6c3bf24..77975c078 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Queue.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Queue.js @@ -3,7 +3,7 @@ Script: Deluge.Preferences.Queue.js The queue preferences page. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Preferences.js b/deluge/ui/web/js/deluge-all/Deluge.Preferences.js index 47de722f3..5a9bb8a19 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Preferences.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Preferences.js @@ -3,7 +3,7 @@ Script: Deluge.Preferences.js Contains the preferences window. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Remove.js b/deluge/ui/web/js/deluge-all/Deluge.Remove.js index eae5bd513..f584aab2e 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Remove.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Remove.js @@ -3,7 +3,7 @@ Script: Deluge.Remove.js Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Sidebar.js b/deluge/ui/web/js/deluge-all/Deluge.Sidebar.js index 12a9f2a99..8ec917055 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Sidebar.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Sidebar.js @@ -4,7 +4,7 @@ Script: deluge-bars.js sidebar. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Toolbar.js b/deluge/ui/web/js/deluge-all/Deluge.Toolbar.js index 014ccf67e..5759bbf12 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Toolbar.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Toolbar.js @@ -3,7 +3,7 @@ Script: Deluge.Toolbar.js Contains the Deluge toolbar. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) diff --git a/deluge/ui/web/js/deluge-all/Deluge.Torrent.js b/deluge/ui/web/js/deluge-all/Deluge.Torrent.js new file mode 100644 index 000000000..979587ae3 --- /dev/null +++ b/deluge/ui/web/js/deluge-all/Deluge.Torrent.js @@ -0,0 +1,94 @@ +/* +Script: Deluge.Torrent.js + Contains the Deluge.Torrent record. + +Copyright: + (C) Damien Churchill 2009-2010 + 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. + + 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. +*/ + +/** + * Deluge.Torrent record + * + * @author Damien Churchill + * @version 1.3 + * + * @class Deluge.Torrent + * @extends Ext.data.Record + * @constructor + * @param {Object} data The torrents data + */ +Deluge.Torrent = Ext.data.Record.create([{ + name: 'queue', + type: 'int' + }, { + name: 'name', + type: 'string' + }, { + name: 'total_size', + type: 'int' + }, { + name: 'state', + type: 'string' + }, { + name: 'progress', + type: 'int' + }, { + name: 'num_seeds', + type: 'int' + }, { + name: 'total_seeds', + type: 'int' + }, { + name: 'num_peers', + type: 'int' + }, { + name: 'total_peers', + type: 'int' + }, { + name: 'download_payload_rate', + type: 'int' + }, { + name: 'upload_payload_rate', + type: 'int' + }, { + name: 'eta', + type: 'int' + }, { + name: 'ratio', + type: 'float' + }, { + name: 'distributed_copies', + type: 'float' + }, { + name: 'time_added', + type: 'int' + }, { + name: 'tracker_host', + type: 'string' + } +]); diff --git a/deluge/ui/web/js/deluge-all/Deluge.Torrents.js b/deluge/ui/web/js/deluge-all/Deluge.Torrents.js index 99c12e3e7..8816630e0 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.Torrents.js +++ b/deluge/ui/web/js/deluge-all/Deluge.Torrents.js @@ -3,7 +3,7 @@ Script: Deluge.Torrents.js Contains all objects and functions related to the torrent grid. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) @@ -33,6 +33,7 @@ Copyright: */ (function() { + /* Renderers for the Torrent Grid */ function queueRenderer(value) { return (value == 99999) ? '' : value + 1; @@ -88,6 +89,10 @@ Copyright: * @param {Object} config Configuration options */ Ext.deluge.TorrentGrid = Ext.extend(Ext.grid.GridPanel, { + + // object to store contained torrent ids + torrents: {}, + constructor: function(config) { config = Ext.apply({ id: 'torrentGrid', @@ -236,7 +241,7 @@ Copyright: }, /** - * Returns the currently selected records. + * Returns the currently selected record. * @ return {Array/Ext.data.Record} The record(s) representing the rows */ getSelected: function() { @@ -248,12 +253,38 @@ Copyright: }, update: function(torrents) { - // NOTE: this isn't published in the API docs so may disappear unexpectedly - // when upgrading Ext Js. - var scroller = this.getView().scroller.dom; - var scrollTop = scroller.scrollTop; - this.getStore().loadData({"torrents": Ext.values(torrents)}); - scroller.scrollTop = scrollTop; + var store = this.getStore(); + var newTorrents = []; + + // Update and add any new torrents. + for (var t in torrents) { + var torrent = torrents[t]; + + if (this.torrents[t]) { + var record = store.getById(t); + record.beginEdit(); + for (var k in torrent) { + if (record.get(k) != torrent[k]) { + record.set(k, torrent[k]); + } + } + record.endEdit(); + } else { + var record = new Deluge.Torrent(torrent); + record.id = t; + this.torrents[t] = 1; + newTorrents.push(record); + } + } + store.add(newTorrents); + + // Remove any torrents that should not be in the store. + store.each(function(record) { + if (!torrents[record.id]) { + store.remove(record); + } + }); + store.commitChanges(); }, // private diff --git a/deluge/ui/web/js/deluge-all/Deluge.UI.js b/deluge/ui/web/js/deluge-all/Deluge.UI.js index ac6c6aee9..52c47ce01 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.UI.js +++ b/deluge/ui/web/js/deluge-all/Deluge.UI.js @@ -4,7 +4,7 @@ Script: Deluge.UI.js of the server. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) @@ -42,6 +42,8 @@ Deluge.UI = { errorCount: 0, + filters: null, + /** * @description Create all the interface components, the json-rpc client * and set up various events that the UI will utilise. diff --git a/deluge/ui/web/js/deluge-all/Deluge.js b/deluge/ui/web/js/deluge-all/Deluge.js index ca431a7a1..918482017 100644 --- a/deluge/ui/web/js/deluge-all/Deluge.js +++ b/deluge/ui/web/js/deluge-all/Deluge.js @@ -3,7 +3,7 @@ Script: Deluge.js Contains the keys for get_torrent(s)_status. Copyright: - (C) Damien Churchill 2009 + (C) Damien Churchill 2009-2010 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) @@ -48,6 +48,17 @@ Ext.state.Manager.setProvider(new Ext.state.CookieProvider()); for(var i in obj) { return false; } return true; }, + + isObjectsEqual: function(obj1, obj2) { + var equal = true; + if (!obj1 || !obj2) return false; + for (var i in obj1) { + if (obj1[i] != obj2[i]) { + equal = false; + } + } + return equal; + }, keys: function(obj) { var keys = []; diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py index 2e6d33ca8..4a03c33f6 100644 --- a/deluge/ui/web/server.py +++ b/deluge/ui/web/server.py @@ -374,6 +374,7 @@ class TopLevel(resource.Resource): "/js/deluge-all/Deluge.Sidebar.js", "/js/deluge-all/Deluge.Statusbar.js", "/js/deluge-all/Deluge.Toolbar.js", + "/js/deluge-all/Deluge.Torrent.js", "/js/deluge-all/Deluge.Torrents.js", "/js/deluge-all/Deluge.UI.js" ]