- tagged v1.2.0beta3 release

- Improved transfer list update for queued torrents
- Allow to show/hide top toolbar
- top toolbar is now hidden as a default
- Connection status is now displayed in status bar (bottom)
- Removed "Disconnected" connection status (bad detection)
- Added increase/decrease priority actions to Edit menu
- Added keyboard shortcuts for increase/decrease priority actions

AUTHORS

@@ -3,3 +3,69 @@ Author:
 
 Contributors:
 * Arnaud Demaizière <arnaud@qbittorrent.org>
+* Ishan Arora <ishan@qbittorrent.org>
+* Grigis Gaëtan <cipher16@gmail.com>
+
+Images Authors:
+* files: src/Icons/*.png
+  copyright: Gnome Icon Theme
+  license: GPLv2
+  url: http://ftp.acc.umu.se/pub/GNOME/sources/gnome-icon-theme
+
+* files: src/Icons/flags/*.png
+  copyright: Open Clip Art Library
+  license: Creative Commons Public Domain Dedication
+  url: http://www.openclipart.org
+
+* files: src/Icons/skins/*.png
+  copyright: Mateusz Tobola <tobejodok@qbittorrent.org>
+  license: GPLv2
+
+* files: src/menuicons/YYxYY/*.png
+  copyright: Mateusz Tobola <tobejodok@qbittorrent.org>
+  license: GPLv2
+
+* file: src/search_engine/engines/btjunkie.png
+  copyright: Downloaded from btjunkie.org
+
+* file: src/search_engine/engines/isohunt.png
+  copyright: Downloaded from isohunt.com
+
+* file: src/search_engine/engines/mininova.png
+  copyright: Downloaded from mininova.org
+
+* file: src/search_engine/engines/piratebay.png
+  copyright: Downloaded from thepiratebay.org
+
+* file: src/search_engine/engines/torrentreactor.png
+  copyright: Downloaded from torrentreactor.net
+
+Translations authors:
+* files: src/lang/*.ts
+  copyright:
+  - Brazilian: Nick Marinho (nickmarinho@gmail.com)
+  - Bulgarian: Tsvetan & Boiko Bankov (emerge_life@users.sourceforge.net)
+  - Catalan: Gekko Dam Beer (gekko04@users.sourceforge.net)
+  - Chinese (Simplified): Guo Yue (guoyue0418@hotmail.com)
+  - Danish: Mathias Nielsen (comoneo@gmail.com)
+  - Dutch: Joost Schipper (heavyjoost@users.sourceforge.net)
+  - English: Christophe Dumez (chris@qbittorrent.org)
+  - Finnish: Niklas Laxström (nikerabbit@users.sourceforge.net)
+  - French: Christophe Dumez (chris@qbittorrent.org)
+  - German: Niels Hoffmann (zentralmaschine@users.sourceforge.net)
+  - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net)
+  - Hungarian: Majoros Péter (majoros.j.p@t-online.hu)
+  - Italian: Mirko Ferrari (mirkoferrari@gmail.com) and Ferraro Luciano (luciano.ferraro@gmail.com)
+  - Japanese: Nardog (nardog@e2umail.com)
+  - Korean: Jin Woo Sin (jin828sin@users.sourceforge.net)
+  - Norwegian: Lars-Erik Labori (hamil@users.sourceforge.net)
+  - Polish: Jarek Smieja (ajep9691@wp.pl)
+  - Portuguese: Nick Marinho (nickmarinho@gmail.com)
+  - Romanian: Obada Denis (obadadenis@users.sourceforge.net)
+  - Russian: Nick Khazov (m2k3d0n at users.sourceforge.net)
+  - Slovak:  helix84
+  - Spanish: Vicente Raul Plata Fonseca (silverxnt@users.sourceforge.net)
+  - Swedish: Daniel Nylander (po@danielnylander.se)
+  - Turkish: Erdem Bingöl (erdem84@gmail.com)
+  - Ukrainian: Andrey Shpachenko (masterfix@users.sourceforge.net)
+  license: GPLv2

Changelog

@@ -1,4 +1,47 @@
-* Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.0.0
+* Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.2.0
+    - FEATURE: Torrent queueing system (with priorities)
+    - FEATURE: DHT is always ON (no longer used as fallback)
+    - FEATURE: The number of DHT nodes is displayed
+    - FEATURE: RSS can now be disabled from program preferences
+    - BUGFIX: Disable ETA calculation when ETA column is hidden
+    - BUGFIX: Removed "disconnected" connection state, detection was far from perfect
+    - COSMETIC: Transfer speed, ratio, connection status and DHT nodes are displayed in status bar    
+    - COSMETIC: RSS Tab is now hidden as a default
+    - COSMETIC: Allow to hide or display top toolbar
+    - COSMETIC: Top toolbar is now hidden as a default
+
+* Fri Aug 01 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.1.0
+    - FEATURE: Web interface to control qbittorrent (Ishan Arora)
+    - FEATURE: Can spoof Azureus peer id to avoid ban
+    - FEATURE: Allow to hide/show some columns in download and seeding lists
+    - FEATURE: Option to start qBittorrent minimized in systray
+    - FEATURE: Multi-tab support in search engine (Grigis Gaëtan)
+    - FEATURE: Allow to define double-click actions in torrents lists
+    - FEATURE: Allow to open torrent destination folder
+    - FEATURE: Real progress bar in torrent properties that displays downloaded pieces
+    - FEATURE: Allow to buy downloads using ShareMonkey
+    - FEATURE: Display if UPnP/NAT-PMP was successful or not
+    - FEATURE: Threadified torrent creation
+    - FEATURE: Improved eMule DAT ip filter parser
+    - FEATURE: Added support for PeerGuardian p2p filters (text)
+    - FEATURE: Added support for PeerGuardian p2b filters (binary)
+    - FEATURE: Allow to customize folder scan interval
+    - FEATURE: Allow to add several trackers at once
+    - BUGFIX: Allow to run one instance of qBittorrent per user
+    - BUGFIX: Do not display seeds number in seeding list (always 0)
+    - BUGFIX: Threadified IP filter file parser to avoid GUI freeze
+    - BUGFIX: Ask if we want to redownload if content was deleted from hard drive
+    - BUGFIX: Added missing copyright/licensing information for some files
+    - BUGFIX: qBittorrent is no longer conflicting with rTorrent (libtorrent renamed to libtorrent-rasterbar)
+    - COSMETIC: Do not display progress bar in seeding list (always 100%)
+    - COSMETIC: Added a progress bar for torrent creation
+    - COSMETIC: Display tracker errors in a cleaner way
+    - COSMETIC: Display "unpaused/total_torrent" in download/upload tabs
+    - COSMETIC: Allow to resize RSS column
+    - COSMETIC: Global UP/DL speeds and ratio are displayed above tabs
+    - COSMETIC: Use infinity symbol for ETA when time is infinite
+
+* Fri Apr 11 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.0.0
     - FEATURE: Based on new libtorrent v0.13
     - FEATURE: Added UPnP / NAT-PMP port forwarding support
     - FEATURE: Added encryption support (compatible with Azureus)
@@ -41,25 +84,21 @@
     - FEATURE: Added an option to automatically delete torrents when they reach a given ratio (>= 1.0)
     - FEATURE: Added an option to display current transfer speeds in title bar
     - FEATURE: Torrent content is now displayed as a tree
-    - FEATURE: Better media file preview (player detected automatically)
-    - FEATURE: Greatly improved ETA calculation algorithm (use GASA)
     - I18N: Added Hungarian translation
     - I18N: Added Brazilian translation
     - BUGFIX: Progress of paused torrents is now correct on restart
-    - BUGFIX: clear the results of a search stops searching
     - BUGFIX: Progress column gets sorted on restart it is was during last execution
+    - BUGFIX: Made ETA more reliable using stats instead of instant values
     - BUGFIX: Remove torrent from hard drive used to delete parent folder if empty
     - BUGFIX: Fixed a crash when filtering all the files in a torrent
     - BUGFIX: Reload torrent only when necessary (properties)
     - BUGFIX: qBittorrent is not exiting anymore when a dialog is closed and main window is hidden
-    - BUGFIX: Catch all possible exceptions when adding a torrent to avoid crashing
     - BUGFIX: Search plugin update is not making the GUI freeze anymore (moved to a thread)
     - BUGFIX: DHT settings were not saved correctly
     - BUGFIX: Workaround to build on Fedora system (pkg-config problem)
     - BUGFIX: search plugin update - do not display only last version changelog
     - BUGFIX: Search plugin update - fixed missing new lines in changelog
     - BUGFIX: The number of search results was not reset when clicking on 'Clear' button
-    - BUGFIX: Fixed systray integration when qbittorrent is launched on system startup
     - BUGFIX: Update torrent progress when its content changed (filtered files)
     - BUGFIX: Improved the way menu icons are installed to avoid problems on some systems
     - BUGFIX: Improved incremental download
@@ -70,8 +109,6 @@
     - BUGFIX: Fixed drag'n drop on non-KDE systems
     - BUGFIX: Removed build dependency on Python
     - BUGFIX: Catching DHT exception in case there is a problem
-    - BUGFIX: Remember properties window size and position
-    - BUGFIX: Improved proxy support in search engine (HTTP only)
     - COSMETIC: Redesigned torrent properties a little
     - COSMETIC: Totally redesigned program preferences
     - COSMETIC: Display more logs messages concerning features

INSTALL

@@ -15,13 +15,12 @@ will install and execute qBittorrent hopefully without any problems.
 
 Dependencies:
 - Qt >= 4.3.0 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml)
+  Qt >= 4.4.0 is advised
 
-- rblibtorrent by Arvid Norberg (>= v0.13 REQUIRED)
+- libtorrent-rasterbar by Arvid Norberg (>= v0.13.1 REQUIRED)
     -> http://www.qbittorrent.org/download.php (advised)
     -> http://www.libtorrent.net
-    Be careful: another library (the one used by rTorrent) use the same name.
-    These are TWO different libraries and qBittorrent will only work with the one provided
-    on sourceforge (created by Arvid Norberg). The two libraries conflicts with each other.
+    Be careful: another library (the one used by rTorrent) uses a similar name.
 
 - libboost: libboost-filesystem, libboost-date-time, libboost-thread, libboost-serialization
 

TODO

@@ -1,49 +1,4 @@
-// Easy
-- Translations into as many languages as possible
-- Use Launchpad/Rosetta for translations once it supports TS files
-
-// Intermediate
-- Port on MacOS, Windows (and create an installer for Windows) - Slow progress
-- Add some transparency (menus,...), improve look / usabilty
-- Skins support? (contact Mateusz)
-
-// Harder
-- Torrent scheduler ala µtorrent/Bitcomet
-
-// Waiting for libtorrent
-- Allow to prioritize torrents (may code this in qBittorrent?)
-
-// Unsure
-- Display the peers we are connected to for each torrent with infos (like flag, dl/up speeds, ...)
-- Azureus spoofing to prevent ban from trackers?
-- Option to shutdown computer when downloads are finished
-- NAT checker/Tester
-- Display hard drive space left?
-- Make use of dbus on Linux for the single instance instead of socket communication?
-  (http://techbase.kde.org/Development/Tutorials/D-Bus/Accessing_Interfaces)
-- When favicon can't be downloaded, try to parse the webpage for:
-  <link rel="icon" href="http://example.com/favicon.ico" type="image/vnd.microsoft.icon">
-    * Be carefull, the link can be relative
+See https://blueprints.launchpad.net/qbittorrent/
 
 // in v1.2.0
-- Allow user to organize the downloads into categories/folders?
-
-// in v1.1.0
-- Tabs support in search
-- Allow to scan multiple directories? (useful?)
-- Web interface (turbogears? php? python?)
-  * Webserver? Try to write a webserver as a plugin for qBittorrent in Python
-    * http://fragments.turtlemeat.com/pythonwebserver.php
-- improve and test tracker authentication code (remember login/pass) (need a tracker to test this)
-- support zipped torrents? (useful?)
-- Allow to limit the number of downloading torrents simultaneously (other are paused until a download finishes)
-- Improve search plugin install (choose in a list taken from plugins.qbittorrent.org)
-- Display the number of DHT node if possible
-- When adding a duplicate torrent, check if the trackers are different from the existing one and ask the user if he wants to add them
-- Display in torrent addition dialog:
-   * free disk space on selected drive
-   * free disk space after torrent download (and/or torrent size)
-
-rc11 -> final? changelog:
-BUGFIX: Fixed systray integration when qbittorrent is launched on system startup
-BUGFIX: Catch all possible exceptions when adding a torrent to avoid crashing
+- Split download and uploads in Web UI (Ishan Ahora)

configure

@@ -18,9 +18,11 @@ Main options:
   --help              This help text.
 
 Dependency options:
-  --with-libtorrent-inc=[path]            Path to libtorrent include files
-  --with-libtorrent-lib=[path]            Path to libtorrent library files
-  --with-libtorrent-static-lib=[path]     Path to libtorrent .a file
+  --with-libtorrent-inc=[path]            Path to libtorrent-rasterbar include
+                                         files
+  --with-libtorrent-lib=[path]            Path to libtorrent-rasterbar library
+                                         files
+  --with-libtorrent-static-lib=[path]     Path to libtorrent-rasterbar .a file
   --with-libboost-inc=[path]              Path to libboost include files
   --with-libcurl-inc=[path]               Path to libcurl include files
   --with-libcurl-lib=[path]               Path to libcurl library files
@@ -354,24 +356,28 @@ public:
 	QString shortname() const { return "Qt 4.3"; }
 	bool exec()
 	{
+		if(QT_VERSION >= 0x040400) {
+			conf->addDefine("QT_4_4");
+		}
 		return(QT_VERSION >= 0x040300);
+		
 	}
 };
-#line 1 "libtorrent.qcm"
+#line 1 "libtorrent-rasterbar.qcm"
 /*
 -----BEGIN QCMOD-----
-name: libtorrent
-arg: with-libtorrent-inc=[path], Path to libtorrent include files
-arg: with-libtorrent-lib=[path], Path to libtorrent library files
-arg: with-libtorrent-static-lib=[path], Path to libtorrent .a file
+name: libtorrent-rasterbar
+arg: with-libtorrent-inc=[path], Path to libtorrent-rasterbar include files
+arg: with-libtorrent-lib=[path], Path to libtorrent-rasterbar library files
+arg: with-libtorrent-static-lib=[path], Path to libtorrent-rasterbar .a file
 -----END QCMOD-----
 */
-class qc_libtorrent : public ConfObj
+class qc_libtorrent_rasterbar : public ConfObj
 {
 public:
-	qc_libtorrent(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent >= 0.13"; }
-	QString shortname() const { return "libtorrent"; }
+	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
+	QString name() const { return "libtorrent-rasterbar >= 0.13"; }
+	QString shortname() const { return "libtorrent-rasterbar"; }
 	bool exec(){
         	QString s;
 		s = conf->getenv("QC_WITH_LIBTORRENT_INC");
@@ -405,7 +411,7 @@ public:
 
 		s = conf->getenv("QC_WITH_LIBTORRENT_LIB");
 		if(!s.isEmpty()) {
-      			if(!conf->checkLibrary(s, "torrent")) {
+      			if(!conf->checkLibrary(s, "torrent-rasterbar")) {
 			        return false;
 			}
       			conf->addLib(QString("-L") + s);
@@ -417,7 +423,7 @@ public:
 			sl << "/usr/local/lib64/";
 			bool found = false;
 			foreach(s, sl){
-				if(conf->checkLibrary(s, "torrent")){
+				if(conf->checkLibrary(s, "torrent-rasterbar")){
 					found = true;
 					break;
 				}
@@ -705,7 +711,7 @@ cat >$1/modules_new.cpp <<EOT
     o = new qc_qt4(conf);
     o->required = true;
     o->disabled = false;
-    o = new qc_libtorrent(conf);
+    o = new qc_libtorrent_rasterbar(conf);
     o->required = true;
     o->disabled = false;
     o = new qc_libboost(conf);

doc/qbittorrent.1

@@ -0,0 +1,28 @@
+.\" This manpage has been automatically generated by docbook2man
+.\" from a DocBook document.  This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>.
+.TH "QBITTORRENT" "1" "September 1st 2007" "Bittorrent client written in C++ / Qt4" ""
+
+.SH NAME
+qBittorrent \- a Bittorrent client written in C++ / Qt4
+.SH SYNOPSIS
+
+\fBqbittorrent\fR [FILE | URL] [FILE | URL...]
+
+\fBqbittorrent\fR \-\-help
+
+\fBqbittorrent\fR \-\-version
+.PP
+.SH "DESCRIPTION"
+
+\fBqBittorrent\fR is an advanced Bittorrent client written in C++ / Qt4,
+using the \fBrblibtorrent\fR library by Arvid Norberg. qBittorrent aims
+to be a good alternative to all other bittorrent clients out there. qBittorrent
+is fast, stable, light, it supports unicode and it provides a good integrated search engine.
+It also comes with UPnP port forwarding / NAT-PMP, encryption (Azureus compatible), FAST extension (mainline) and PeX support (utorrent compatible).
+
+Please report any problem to http://bugs.qbittorrent.org
+.PP
+.SH "AUTHOR"
+
+Christophe Dumez <chris@qbittorrent.org>

packaging/debian-unstable/debian/changelog

@@ -1,134 +0,0 @@
-qbittorrent (0.6.1-1) unstable; urgency=low
-
-  * Disabled debug mode
-
- -- Christophe Dumez <chris@qbittorrent.org>  Mon, 28 Aug 2006 21:22:48 +0200
-
-qbittorrent (0.6.1-0) unstable; urgency=low
-  * BUGFIX: Fixed possible segfaults when using context menus
-  * BUGFIX: Cleanup up context menus code
-  * BUGFIX: Used best gzip compressing for manpage
-
- -- Christophe Dumez <chris@qbittorrent.org>  Thu,  24 Aug 2006 19:53:32 +0200
-
-qbittorrent (0.6.0) unstable; urgency=low
-  * FEATURE: Rewritten the download list from scratch (more flexible)
-  * FEATURE: Rewritten the search results list from scratch (more flexible)
-  * FEATURE: Rewritten the torrent properties list from scratch (more flexible)
-  * FEATURE: Improved and cleaned up search engine code
-  * FEATURE: Search results are now displayed in real time (not sequentially)
-  * FEATURE: Added two command lines parameters (--version, --help)
-  * FEATURE: Added a popup menu for download list
-  * FEATURE: Double-click on an item now toggles the paused state of a download
-  * FEATURE: Improved code to be more portable (Windows & MacOS versions should arrive soon)
-  * FEATURE: Allow to toggle selected state of a file within a torrent using double-click
-  * FEATURE: Remember columns width in download and search results lists
-  * BUGFIX: Don't use pkg-config for libcurl anymore (easier to compile)
-  * BUGFIX: Fixed ETA calculation when downloading while connecting
-  * BUGFIX: Download progress is now displayed correctly during first seconds of execution (was 0% before)
-  * BUGFIX: Code cleanup & optimization
-  * BUGFIX: Fixed sorting in download list
-  * BUGFIX: Fixed sorting in search results list
-  * BUGFIX: Fixed Parameters passing between instances
-  * BUGFIX: Fixed missing icon for clear action in infoBar popup menu
-  * BUGFIX: Fixed truncated lines in search results
-  * BUGFIX: Don't refresh download list when user is in search tab (save CPU)
-  * BUGFIX: Don't update Progress/DL Speed/ETA for finished downloads (save CPU)
-  * BUGFIX: Save selected search engines only when they have changed (faster program exit)
-  * COSMETIC: Increased icon size in toolbar from 24px to 32px
-  * COSMETIC: Display a progress bar to visualize each download progress
-  * COSMETIC: Size of each result in search are displayed in user friendly units
-  * COSMETIC: Display a progress bar to visualize each file progress within a torrent
-  * COSMETIC: Renamed 'ratio' to 'Session ratio' (makes more sense)
-  * COSMETIC: Improved layout of torrent properties window when maximized
-  * COSMETIC: Now number of search results is updated in real time
-  * COSMETIC: Remember last window size
-  * COSMETIC: Improved splash screen look
-  * COSMETIC: Improved default width of columns in download and search results lists
-
- -- Christophe Dumez <chris@qbittorrent.org>  Wed,  22 Aug 2006 10:42:37 +0200
-
-qbittorrent (0.5.0) unstable; urgency=low
-  * Improved "Download from url" feature (now supports https, ftp & redirections)
-  * Added a torrent creation tool
-  * Display progress for each file within a torrent
-  * Based on new libtorrent v0.10 (lot of improvements)
-  * Now possible to clear log textbox (popup menu)
-  * Added two search engines (isohunt, torrentreactor)
-  * Now Display share ratio on main window
-  * Use OSD (On Screen Display) when a download or a search is finished
-  * Allow only one instance of qBittorrent (and add new parameters to download list)
-  * Remember last selected search engines in search tab
-  * Improved search engines status output (Aborted, timed out, finished, no results)
-  * qBittorrent can now update search plugin from qbittorrent.org
-  * Added Slovak, Italian, Portuguese, Romanian and Traditional Chinese languages
-  * Fixed ThePirateBay parser for search engine (website had changed)
-  * Fixed filenames for results from ThePirateBay search engine
-  * Fixed unicode support for ThePirateBay search engine
-  * Now search results are sorted by seeds
-  * Overwrite nova.py search plugin only if it is outdated
-  * Fixed possible division by 0 in ETA calculation
-  * Improved ETA calculation precision
-  * Fixed default tab in options
-  * When saving options, reconnect only when listening ports changed
-  * qBittorrent has now its own new logo
-  * Display status "downloading" if DL Speed > 0 (even when tracker is down)
-  * Added a splashscreen
-  * qBittorrent has new cute icons
-  * Display number of results in search tab
-  * Added icons for each item in download list according to its state
-  * Redesigned Locale settings
-  * Fixed search engines names width (were cut on the right)
-  * Moved search engines to the left of the window (better ui)
-
- -- Christophe Dumez <chris@qbittorrent.org>  Wed,  2 Aug 2006 19:46:32 +0200
-
-qbittorrent (0.4.1) unstable; urgency=low
-  * Not counting "protocol chatter" in UP/DL speed anymore
-  * Download speed is now 0 when download is finished
-  * Paused torrents remain paused when qbittorrent is re-started
-  * Added option "go to systray when minimizing"
-  * Added option "Clear finished downloads on exit"
-  * Added option "Ask user for confirmation on exit"
-  * Added "Stalled" status for downloads (colored in orange, paused are in red and finished in green)
-  * Fixed Search window layout on maximizing
-  * Fixed a bug that caused upload limit not to be always applied
-  * Added Bulgarian translation
-  * Updated Translations
-  * Code optimization
-
- -- Christophe Dumez <chris@qbittorrent.org>  Thu,  22 Jun 2006 20:14:27 +0200
-
-qbittorrent (0.4.0) unstable; urgency=low
-
-  * Added a search engine (supports Mininova & thepiratebay websites)
-  * Fixed critical bug: some options were not applied correctly to BT session
-  * Possibility to download a torrent file from an URL
-  * Added confirmation dialog on qbittorrent exit
-  * Enabled sorting in Download list
-  * Added Ukrainian translation
-  * Support urls as program parameters
-  * Added more actions to trayicon menu
-  * Fixed exception catching when retrieving fastresume data
-  * use Binary prefix standards from IEC 60027-2 for units (B, KiB, MiB, GiB, TiB)
-  * Iconification to systray when minimizing
-  * Code Cleanup & optimization
-
- -- Christophe Dumez <chris@qbittorrent.org>  Wed,  14 Jun 2006 14:47:27 +0200
-
-qbittorrent (0.3.1) unstable; urgency=low
-
-  * Fixed toolbar layout (spacing).
-  * Added Russian translation.
-  * Resume also finished files on startup (for seeding).
-  * Added colors corresponding to download state.
-  * Fixed a segfault when deleting a download (if no scan dir is set).
-
- -- Christophe Dumez <chris@qbittorrent.org>  Sat,  6 Jun 2006 21:36:27 +0200
-
-
-qbittorrent (0.3) unstable; urgency=low
-
-  * Initial Release.
-
- -- Christophe Dumez <chris@qbittorrent.org>  Sat,  3 Jun 2006 21:57:27 +0200

packaging/debian-unstable/debian/compat

@@ -1 +0,0 @@
-4

packaging/debian-unstable/debian/control

@@ -1,15 +0,0 @@
-Source: qbittorrent
-Section: net
-Priority: optional
-Maintainer: Christophe Dumez <chris@qbittorrent.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, libqt4-core (>= 4.1.0), libqt4-dev (>= 4.1.0), libqt4-gui (>= 4.1.0), rb-libtorrent (>= 0.10), libcurl3-dev
-Standards-Version: 3.6.2
-
-Package: qbittorrent
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, rb-libtorrent (>= 0.10), python (>= 2.3)
-Description: Bittorrent client in Qt4.1 / C++
- qBittorrent is a bittorrent client programmed in C++ / Qt4.1
- using rb_libtorrent by Arvid Norberg. It aims to be a good 
- alternative to other bittorrent client out there. It is fast,
- stable and provides unicode support.

packaging/debian-unstable/debian/copyright

@@ -1,26 +0,0 @@
-This is qbittorrent, written and maintained by Christophe Dumez <chris@qbittorrent.org>
-on Sat,  3 Jun 2006 21:57:27 +0200.
-
-The original source can always be found at:
-	ftp://ftp.debian.org/dists/unstable/main/source/
-
-Copyright (C) 2006  Christophe Dumez
-
-License:
-
-  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 2 of the License, 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 package; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.

packaging/debian-unstable/debian/dirs

@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin

packaging/debian-unstable/debian/docs

@@ -1,3 +0,0 @@
-NEWS
-README
-TODO

packaging/debian-unstable/debian/rules

@@ -1,107 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --prefix=/usr
-
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-	#docbook-to-man debian/qbittorrent.sgml > qbittorrent.1
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/qbittorrent.
-	$(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/qbittorrent
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs Changelog
-	dh_installdocs
-	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 

packaging/mandriva/qbittorrent.spec

@@ -1,249 +0,0 @@
-
-%define name qbittorrent
-%define major 0
-%define minor 6
-%define patch 1
-%define version	%{major}.%{minor}.%{patch}
-%define release %mkrel 2
-%define _iconsdir %{_datadir}/icons
-%define _mandir %_datadir/man
-
-Name:           %{name}
-Summary:        A Bittorrent Client using C++ / Qt4
-Version:        %{version}
-Release:        %{release}
-Source0:        http://sourceforge.net/projects/qbittorrent/%{name}-%{version}.tar.gz
-URL:            http://sourceforge.net/projects/qbittorrent
-Vendor:			http://qbittorrent.sourceforge.net/
-Group:          Internet/File Transfer
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-License:        GPL
-BuildRequires:	libqt4-devel >= 4.1.2, libqtgui4 >= 4.1.2, libqtcore4 >= 4.1.2, libqtxml4 >= 4.1.2, libqtnetwork4 >= 4.1.2, rb_libtorrent-devel >= 0.10-3, libcurl3-devel
-Requires:		libqtgui4 >= 4.1.2, libqtcore4 >= 4.1.2, libqtxml4 >= 4.1.2, libqtnetwork4 >= 4.1.2, librb_libtorrent0 >= 0.10-3, python >= 2.3, libcurl3
-
-%description
-A Bittorrent client using C++ / libtorrent and a Qt4 Graphical User Interface.
-It aims to be as fast as possible and to provide multi-OS, unicode support.
-
-%prep
-%setup
-
-%build
-# Export the Environment variables
-export QTDIR=%_prefix/%_lib/qt4
-export KDEDIR=%_prefix
-export LD_LIBRARY_PATH=$QTDIR/%_lib:$KDEDIR/%_lib:$LD_LIBRARY_PATH
-export PATH=$QTDIR/bin:$KDEDIR/bin:$PATH
-
-
-# Change to the Source directory and configure
-#cd src
-CFLAGS="%optflags" CXXFLAGS="%optflags" \
-./configure --prefix=%{buildroot}%{_prefix}
-
-# Necessary to remove old compiled files.. if they exist
-make clean
-
-%make
-
-%install
-%makeinstall --directory=src
-
-
-# Create the menu directory
-install -d %{buildroot}%{_menudir}
-
-# Build the Menu
-#<package> <section> <file_in> <file_out> [requires] [title]
-kdedesktop2mdkmenu.pl %{name} "%{group}" %{buildroot}%{_datadir}/applications/qBittorrent.desktop %{buildroot}%{_menudir}/%{name}
-
-%clean
-%{__rm} -rf %{buildroot}
-
-%post
-/sbin/ldconfig
-%{update_menus}
-
-%postun
-/sbin/ldconfig
-%{clean_menus}
-
-
-%files
-%defattr(-,root,root)
-%doc README INSTALL NEWS COPYING AUTHORS TODO Changelog
-%doc %{_mandir}/man1/*.bz2
-
-
-# The binaries
-%_bindir/*
-
-
-# Icon files
-# Hi and Lo colour icons various sizes
-%_iconsdir/hicolor/128x128/apps/qbittorrent.png
-%_iconsdir/hicolor/16x16/apps/qbittorrent.png
-%_iconsdir/hicolor/192x192/apps/qbittorrent.png
-%_iconsdir/hicolor/22x22/apps/qbittorrent.png
-%_iconsdir/hicolor/24x24/apps/qbittorrent.png
-%_iconsdir/hicolor/32x32/apps/qbittorrent.png
-%_iconsdir/hicolor/36x36/apps/qbittorrent.png
-%_iconsdir/hicolor/48x48/apps/qbittorrent.png
-%_iconsdir/hicolor/64x64/apps/qbittorrent.png
-%_iconsdir/hicolor/72x72/apps/qbittorrent.png
-%_iconsdir/hicolor/96x96/apps/qbittorrent.png
-## %_iconsdir/hicolor/scalable/apps/qbittorrent.svgz
-
-
-# Desktop Link
-%_datadir/applications/qBittorrent.desktop
-
-# The qbittorrent Menu directory
-%dir %{_menudir}
-%{_menudir}/%{name}
-
-
-%changelog
-
-* Wed Aug 23 2006 - Christophe Dumez <chris@qbittorrent.org> - 0.6.0-0.1.2006mdk
-- FEATURE: Rewritten the download list from scratch (more flexible)
-- FEATURE: Rewritten the search results list from scratch (more flexible)
-- FEATURE: Rewritten the torrent properties list from scratch (more flexible)
-- FEATURE: Improved and cleaned up search engine code
-- FEATURE: Search results are now displayed in real time (not sequentially)
-- FEATURE: Added two command lines parameters (--version, --help)
-- FEATURE: Added a popup menu for download list
-- FEATURE: Double-click on an item now toggles the paused state of a download
-- FEATURE: Improved code to be more portable (Windows & MacOS versions should arrive soon)
-- FEATURE: Allow to toggle selected state of a file within a torrent using double-click
-- FEATURE: Remember columns width in download and search results lists
-- BUGFIX: Don't use pkg-config for libcurl anymore (easier to compile)
-- BUGFIX: Fixed ETA calculation when downloading while connecting
-- BUGFIX: Download progress is now displayed correctly during first seconds of execution (was 0% before)
-- BUGFIX: Code cleanup & optimization
-- BUGFIX: Fixed sorting in download list
-- BUGFIX: Fixed sorting in search results list
-- BUGFIX: Fixed Parameters passing between instances
-- BUGFIX: Fixed missing icon for clear action in infoBar popup menu
-- BUGFIX: Fixed truncated lines in search results
-- BUGFIX: Don't refresh download list when user is in search tab (save CPU)
-- BUGFIX: Don't update Progress/DL Speed/ETA for finished downloads (save CPU)
-- BUGFIX: Save selected search engines only when they have changed (faster program exit)
-- COSMETIC: Increased icon size in toolbar from 24px to 32px
-- COSMETIC: Display a progress bar to visualize each download progress
-- COSMETIC: Size of each result in search are displayed in user friendly units
-- COSMETIC: Display a progress bar to visualize each file progress within a torrent
-- COSMETIC: Renamed 'ratio' to 'Session ratio' (makes more sense)
-- COSMETIC: Improved layout of torrent properties window when maximized
-- COSMETIC: Now number of search results is updated in real time
-- COSMETIC: Remember last window size
-- COSMETIC: Improved splash screen look
-- COSMETIC: Improved default width of columns in download and search results lists
-
-* Tue Aug 08 2006 - Christophe Dumez <chris@qbittorrent.org> - 0.5.0-0.1.20060mdk
- - FEATURE: Improved "Download from url" feature (now supports https, ftp & redirections)
- - FEATURE: Added a torrent creation tool
- - FEATURE: Display progress for each file within a torrent
- - FEATURE: Based on new libtorrent v0.10 (lot of improvements)
- - FEATURE: Now possible to clear log textbox (popup menu)
- - FEATURE: Added two search engines (isohunt, torrentreactor)
- - FEATURE: Now Display share ratio on main window
- - FEATURE: Use OSD (On Screen Display) when a download or a search is finished
- - FEATURE: Allow only one instance of qBittorrent (and add new parameters to download list)
- - FEATURE: Remember last selected search engines in search tab
- - FEATURE: Improved search engines status output (Aborted, timed out, finished, no results)
- - FEATURE: qBittorrent can now update search plugin from qbittorrent.org
- - I18N: Added Slovak, Italian, Portuguese, Romanian and Traditional Chinese languages
- - BUGFIX: Fixed ThePirateBay parser for search engine (website had changed)
- - BUGFIX: Fixed filenames for results from ThePirateBay search engine
- - BUGFIX: Fixed unicode support for ThePirateBay search engine
- - BUGFIX: Now search results are sorted by seeds
- - BUGFIX: Overwrite nova.py search plugin only if it is outdated
- - BUGFIX: Fixed possible division by 0 in ETA calculation
- - BUGFIX: Improved ETA calculation precision
- - BUGFIX: Fixed default tab in options
- - BUGFIX: When saving options, reconnect only when listening ports changed
- - COSMETIC: qBittorrent has now its own new logo
- - COSMETIC: Display status "downloading" if DL Speed > 0 (even when tracker is down)
- - COSMETIC: Added a splashscreen
- - COSMETIC: qBittorrent has new cute icons
- - COSMETIC: Display number of results in search tab
- - COSMETIC: Added icons for each item in download list according to its state
- - COSMETIC: Redesigned Locale settings
- - COSMETIC: Fixed search engines names width (were cut on the right)
- - COSMETIC: Moved search engines to the left of the window (better ui)
-
-* Fri Jun 23 2006 - Christophe Dumez <chris@qbittorrent.org> - 0.4.1-0.1.20060mdk
-- Not counting "protocol chatter" in UP/DL speed anymore
-- Download speed is now 0 when download is finished
-- Paused torrents remain paused when qbittorrent is re-started
-- Added option "go to systray when minimizing"
-- Added option "Clear finished downloads on exit"
-- Added option "Ask user for confirmation on exit"
-- Added "Stalled" status for downloads (colored in orange, paused are in red and finished in green)
-- Fixed Search window layout on maximizing
-- Fixed a bug that caused upload limit not to be always applied
-- Added Bulgarian translation
-- Updated Translations
-- Code optimization
-
-* Tue Jun 13 2006 - Christophe Dumez <chris@qbittorrent.org> - 0.4.0-0.1.20060mdk
-- Added a search engine (supports Mininova & thepiratebay websites)
-- Fixed critical bug: some options were not applied correctly to BT session
-- Possibility to download a torrent file from an URL
-- Added confirmation dialog on qbittorrent exit
-- Enabled sorting in Download list
-- Added Ukrainian translation
-- Support urls as program parameters
-- Added more actions to trayicon menu
-- Fixed exception catching when retrieving fastresume data
-- use Binary prefix standards from IEC 60027-2 for units (B, KiB, MiB, GiB, TiB)
-- Iconification to systray when minimizing
-- Code Cleanup & optimization
-
-* Tue Jun 06 2006 - Christophe Dumez <chris@qbittorrent.org> - 0.3.1-0.1.20060mdk
-- Fixed toolbar layout (spacing)
-- Added Russian translation
-- Resume also finished files on startup (for seeding)
-- Added colors corresponding to download state
-- Fixed a segfault when deleting a download (if no scan dir is set)
-
-* Mon Jun 05 2006 - Christophe Dumez <chris@qbittorrent.org> - 0.3-0.1.20060mdk
-- Fixed auto-resume (worked only once)
-- Fixed BT_Backup dir creation on first startup (thanks Peter)
-- Now min port and max port are inverted if (min port > max port)
-- Fixed memory leaks
-- Added qbittorrent man page
-- Allow to disable max connections limit (default is disabled)
-- Disable upload limit by default
-- Added Menu Entry with icon (thanks Peter)
-- Restructured directory, now Makefile is in main directory (not src/)
-- Updated README / INSTALL
-
-* Fri Jun 02 2006 - Christophe Dumez <chris@qbittorrent.org> 0.2.3-0.1.20060mdk
-- Fixed ports checking function (user couldn't type the value he wanted)
-- Check tracker errors list size and clear it if it becomes too big.
-- qBittorrent does not remove .torrent file from scanned directory anymore
-- Small cosmetic change
-
-* Wed May 31 2006 Christophe Dumez <chris@qbittorrent.org> 0.2.2-0.1.20060mdk
-- Fixed missing icons
-
-* Sat May 27 2006 Jeffery Fernandez <developer@jefferyfernandez.id.au> 0.2.1-0.1.20060mdk
-- Initial Build for Mandriva Linux
-
-* Thu May 25 2006 Christophe Dumez <chris@qbittorrent.org>
-- Fixed "make install" rule
-- Disabled debug mode 
-
-* Thu May 25 2006 Christophe Dumez <chris@qbittorrent.org> - v0.2
-- Fixed a compatibility problem with some versions of qmake
-- Added translations : Greek, Swedish
-- Fixed Polish translation selection
-- Fixed come warning because of two unexisting slots
-- Improved "Apply" button behaviour in options
-- Windows are now resizable
-
-* Tue May 16 2006 Christophe Dumez <chris@qbittorrent.org> - v0.1
-- Initial release (lack features & still need a lot of improvements)
-

packaging/mandriva/rb_libtorrent.spec

@@ -1,147 +0,0 @@
-
-%define package_name	rb_libtorrent
-%define orig_name libtorrent
-%define major 0
-%define minor .10
-%define patch .1
-%define version	%{major}%{minor}
-%define candidate -rc1
-%define lib_name %mklibname %{package_name} %{major}
-%define release	%mkrel 4
-
-Summary     	: libtorrent is a C++ bittorrent library.
-Name			: %{package_name}
-Version			: %{version}
-Release			: %{release}
-License			: GPL
-Group       	: Development/C++
-Source0			: http://www.rasterbar.com/products/libtorrent/libtorrent-%{version}.tar.gz
-URL				: http://www.rasterbar.com
-BuildRequires	: boost >= 1.33.1
-BuildRoot		:  %{_tmppath}/%{orig_name}-%{version}-%{release}-root
-Patch0			: file_progress_arvid.patch.bz2
-
-%description
- libtorrent is a C++ library that aims to be a good alternative 
-to all the other bittorrent implementations around.
-
-
-%package -n %{package_name}-devel
-Group			: Development/C++
-Summary			: Development files for %{package_name}
-Conflicts		: libtorrent7-devel
-
-%description -n %{package_name}-devel
- Development files for %{package_name}
-
-%package -n %{lib_name}
-Group			: Development/C++
-Summary			: Library files for %{package_name}
-Conflicts		: libtorrent7
-
-%description -n %{lib_name}
- Library files for %{package_name}
-
-%prep
-%setup -n %{orig_name}-%{version}
-
-%build
-%configure --prefix=%{_prefix}
-%make
-
-
-%install
-%makeinstall
-
-# Create directories for the package 
-install -d %{buildroot}%{_includedir}/%{orig_name}
-install -d %{buildroot}%{_libdir}/pkgconfig
-
-%clean
-rm -rf %{buildroot}
-
-# The binaries
-%files  %(orig_name)
-%defattr(0644, root, root, 0755)
-%{_bindir}/*
-
-# Documentation
-%defattr(-, root, root)
-%doc README AUTHORS INSTALL COPYING ChangeLog NEWS
-%doc docs/*
-
-
-# Devel Package
-%files -n %{package_name}-devel
-%defattr(-,root,root,-)
-%dir %{_includedir}/%{orig_name}/
-%dir %{_includedir}/%{orig_name}/asio/
-%dir %{_includedir}/%{orig_name}/asio/detail/
-%dir %{_includedir}/%{orig_name}/asio/impl/
-%dir %{_includedir}/%{orig_name}/asio/ip/
-%dir %{_includedir}/%{orig_name}/asio/ip/detail/
-%dir %{_includedir}/%{orig_name}/asio/ssl/
-%dir %{_includedir}/%{orig_name}/asio/ssl/detail/
-%{_includedir}/%{orig_name}/*.hpp
-%{_includedir}/%{orig_name}/asio/*.hpp
-%{_includedir}/%{orig_name}/asio/detail/*.hpp
-%{_includedir}/%{orig_name}/asio/impl/*.ipp
-%{_includedir}/%{orig_name}/asio/ip/*.hpp
-%{_includedir}/%{orig_name}/asio/ip/detail/*.hpp
-%{_includedir}/%{orig_name}/asio/ssl/*.hpp
-%{_includedir}/%{orig_name}/asio/ssl/detail/*.hpp
-
-
-
-
-
-%{_libdir}/%{orig_name}.a
-%{_libdir}/%{orig_name}.la
-%{_libdir}/%{orig_name}.so
-%{_libdir}/pkgconfig/libtorrent.pc
-
-
-# Library Package
-%files -n %{lib_name}
-%defattr(-,root,root,-)
-%_libdir/%{orig_name}.so.*
-
-
-%changelog
-
-* Wed Aug 23 2006 Christophe Dumez <chris@qbittorrent.org> 10.0.1-2006mdk
-- Added patch for Torrent Properties crash fix
-
-* Sat Jul 1 2006 %{packager} %{version}-%{release}
-- fixed a bug where the requested number of peers in a tracker request could
-  be too big.
-- fixed a bug where empty files were not created in full allocation mode.
-- fixed a bug in storage that would, in rare cases, fail to do a
-  complete check.
-- exposed more settings for tweaking parameters in the piece-picker,
-  downloader and uploader (http_settings replaced by session_settings).
-- tweaked default settings to improve high bandwidth transfers.
-- improved the piece picker performance and made it possible to download
-  popular pieces in sequence to improve disk performance.
-- added the possibility to control upload and download limits per peer.
-- fixed problem with re-requesting skipped pieces when peer was sending pieces
-  out of fifo-order.
-- added support for http seeding (the GetRight protocol)
-- renamed identifiers called 'id' in the public interface to support linking
-  with Objective.C++
-- changed the extensions protocol to use the new one, which is also
-  implemented by uTorrent.
-- factorized the peer_connection and added web_peer_connection which is
-  able to download from http-sources.
-- converted the network code to use asio (resulted in slight api changes
-  dealing with network addresses).
-- made libtorrent build in vc7 (patches from Allen Zhao)
-- fixed bug caused when binding outgoing connections to a non-local interface.
-- add_torrent() will now throw if called while the session object is
-  being closed.
-- added the ability to limit the number of simultaneous half-open
-  TCP connections. Flags in peer_info has been added.
-
-
-* Thu Jun 1 2006 %{packager} %{version}-%{release}
-- Initial Build for Mandriva Linux 

packaging/ubuntu-dapper/debian/changelog

@@ -1,134 +0,0 @@
-qbittorrent (0.6.1-0ubuntu2) dapper; urgency=low
-
-  * Disabled debug mode
-
- -- Christophe Dumez <chris@qbittorrent.org>  Mon, 28 Aug 2006 19:29:17 +0000
-
-qbittorrent (0.6.1-0ubuntu1) dapper; urgency=low
-  * BUGFIX: Fixed possible segfaults when using context menus
-  * BUGFIX: Cleanup up context menus code
-  * BUGFIX: Used best gzip compressing for manpage
-
- -- Christophe Dumez <chris@qbittorrent.org>  Thu,  24 Aug 2006 19:53:32 +0200
-
-qbittorrent (0.6.0) dapper; urgency=low
-  * FEATURE: Rewritten the download list from scratch (more flexible)
-  * FEATURE: Rewritten the search results list from scratch (more flexible)
-  * FEATURE: Rewritten the torrent properties list from scratch (more flexible)
-  * FEATURE: Improved and cleaned up search engine code
-  * FEATURE: Search results are now displayed in real time (not sequentially)
-  * FEATURE: Added two command lines parameters (--version, --help)
-  * FEATURE: Added a popup menu for download list
-  * FEATURE: Double-click on an item now toggles the paused state of a download
-  * FEATURE: Improved code to be more portable (Windows & MacOS versions should arrive soon)
-  * FEATURE: Allow to toggle selected state of a file within a torrent using double-click
-  * FEATURE: Remember columns width in download and search results lists
-  * BUGFIX: Don't use pkg-config for libcurl anymore (easier to compile)
-  * BUGFIX: Fixed ETA calculation when downloading while connecting
-  * BUGFIX: Download progress is now displayed correctly during first seconds of execution (was 0% before)
-  * BUGFIX: Code cleanup & optimization
-  * BUGFIX: Fixed sorting in download list
-  * BUGFIX: Fixed sorting in search results list
-  * BUGFIX: Fixed Parameters passing between instances
-  * BUGFIX: Fixed missing icon for clear action in infoBar popup menu
-  * BUGFIX: Fixed truncated lines in search results
-  * BUGFIX: Don't refresh download list when user is in search tab (save CPU)
-  * BUGFIX: Don't update Progress/DL Speed/ETA for finished downloads (save CPU)
-  * BUGFIX: Save selected search engines only when they have changed (faster program exit)
-  * COSMETIC: Increased icon size in toolbar from 24px to 32px
-  * COSMETIC: Display a progress bar to visualize each download progress
-  * COSMETIC: Size of each result in search are displayed in user friendly units
-  * COSMETIC: Display a progress bar to visualize each file progress within a torrent
-  * COSMETIC: Renamed 'ratio' to 'Session ratio' (makes more sense)
-  * COSMETIC: Improved layout of torrent properties window when maximized
-  * COSMETIC: Now number of search results is updated in real time
-  * COSMETIC: Remember last window size
-  * COSMETIC: Improved splash screen look
-  * COSMETIC: Improved default width of columns in download and search results lists
-
- -- Christophe Dumez <chris@qbittorrent.org>  Wed,  22 Aug 2006 10:42:37 +0200
-
-qbittorrent (0.5.0) dapper; urgency=low
-  * Improved "Download from url" feature (now supports https, ftp & redirections)
-  * Added a torrent creation tool
-  * Display progress for each file within a torrent
-  * Based on new libtorrent v0.10 (lot of improvements)
-  * Now possible to clear log textbox (popup menu)
-  * Added two search engines (isohunt, torrentreactor)
-  * Now Display share ratio on main window
-  * Use OSD (On Screen Display) when a download or a search is finished
-  * Allow only one instance of qBittorrent (and add new parameters to download list)
-  * Remember last selected search engines in search tab
-  * Improved search engines status output (Aborted, timed out, finished, no results)
-  * qBittorrent can now update search plugin from qbittorrent.org
-  * Added Slovak, Italian, Portuguese, Romanian and Traditional Chinese languages
-  * Fixed ThePirateBay parser for search engine (website had changed)
-  * Fixed filenames for results from ThePirateBay search engine
-  * Fixed unicode support for ThePirateBay search engine
-  * Now search results are sorted by seeds
-  * Overwrite nova.py search plugin only if it is outdated
-  * Fixed possible division by 0 in ETA calculation
-  * Improved ETA calculation precision
-  * Fixed default tab in options
-  * When saving options, reconnect only when listening ports changed
-  * qBittorrent has now its own new logo
-  * Display status "downloading" if DL Speed > 0 (even when tracker is down)
-  * Added a splashscreen
-  * qBittorrent has new cute icons
-  * Display number of results in search tab
-  * Added icons for each item in download list according to its state
-  * Redesigned Locale settings
-  * Fixed search engines names width (were cut on the right)
-  * Moved search engines to the left of the window (better ui)
-
- -- Christophe Dumez <chris@qbittorrent.org>  Wed,  2 Aug 2006 19:46:32 +0200
-
-qbittorrent (0.4.1) dapper; urgency=low
-  * Not counting "protocol chatter" in UP/DL speed anymore
-  * Download speed is now 0 when download is finished
-  * Paused torrents remain paused when qbittorrent is re-started
-  * Added option "go to systray when minimizing"
-  * Added option "Clear finished downloads on exit"
-  * Added option "Ask user for confirmation on exit"
-  * Added "Stalled" status for downloads (colored in orange, paused are in red and finished in green)
-  * Fixed Search window layout on maximizing
-  * Fixed a bug that caused upload limit not to be always applied
-  * Added Bulgarian translation
-  * Updated Translations
-  * Code optimization
-
- -- Christophe Dumez <chris@qbittorrent.org>  Thu,  22 Jun 2006 20:14:27 +0200
-
-qbittorrent (0.4.0) dapper; urgency=low
-
-  * Added a search engine (supports Mininova & thepiratebay websites)
-  * Fixed critical bug: some options were not applied correctly to BT session
-  * Possibility to download a torrent file from an URL
-  * Added confirmation dialog on qbittorrent exit
-  * Enabled sorting in Download list
-  * Added Ukrainian translation
-  * Support urls as program parameters
-  * Added more actions to trayicon menu
-  * Fixed exception catching when retrieving fastresume data
-  * use Binary prefix standards from IEC 60027-2 for units (B, KiB, MiB, GiB, TiB)
-  * Iconification to systray when minimizing
-  * Code Cleanup & optimization
-
- -- Christophe Dumez <chris@qbittorrent.org>  Wed,  14 Jun 2006 14:47:27 +0200
-
-qbittorrent (0.3.1) dapper; urgency=low
-
-  * Fixed toolbar layout (spacing).
-  * Added Russian translation.
-  * Resume also finished files on startup (for seeding).
-  * Added colors corresponding to download state.
-  * Fixed a segfault when deleting a download (if no scan dir is set).
-
- -- Christophe Dumez <chris@qbittorrent.org>  Sat,  6 Jun 2006 21:36:27 +0200
-
-
-qbittorrent (0.3) dapper; urgency=low
-
-  * Initial Release.
-
- -- Christophe Dumez <chris@qbittorrent.org>  Sat,  3 Jun 2006 21:57:27 +0200

packaging/ubuntu-dapper/debian/compat

@@ -1 +0,0 @@
-4

packaging/ubuntu-dapper/debian/control

@@ -1,15 +0,0 @@
-Source: qbittorrent
-Section: net
-Priority: optional
-Maintainer: Christophe Dumez <chris@qbittorrent.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, libqt4-core (>= 4.1.0), libqt4-dev (>= 4.1.0), libqt4-gui (>= 4.1.0), rb-libtorrent (>= 0.10), libcurl3-dev
-Standards-Version: 3.6.2
-
-Package: qbittorrent
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, rb-libtorrent (>= 0.10), python (>= 2.3)
-Description: Bittorrent client in Qt4.1 / C++
- qBittorrent is a bittorrent client programmed in C++ / Qt4.1
- using rb_libtorrent by Arvid Norberg. It aims to be a good 
- alternative to other bittorrent client out there. It is fast,
- stable and provides unicode support.

packaging/ubuntu-dapper/debian/copyright

@@ -1,26 +0,0 @@
-This is qbittorrent, written and maintained by Christophe Dumez <chris@qbittorrent.org>
-on Sat,  3 Jun 2006 21:57:27 +0200.
-
-The original source can always be found at:
-	ftp://ftp.debian.org/dists/unstable/main/source/
-
-Copyright (C) 2006  Christophe Dumez
-
-License:
-
-  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 2 of the License, 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 package; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.

packaging/ubuntu-dapper/debian/dirs

@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin

packaging/ubuntu-dapper/debian/docs

@@ -1,3 +0,0 @@
-NEWS
-README
-TODO

packaging/ubuntu-dapper/debian/files

@@ -1 +0,0 @@
-qbittorrent_0.6.1-0ubuntu2_i386.deb net optional

packaging/ubuntu-dapper/debian/qbittorrent.substvars

@@ -1 +0,0 @@
-shlibs:Depends=libboost-date-time1.33.1, libboost-filesystem1.33.1, libboost-thread1.33.1, libc6 (>= 2.3.4-1), libcurl3 (>= 7.15.0-1), libgcc1 (>= 1:4.0.2), libqt4-core (>= 4.1.2), libqt4-gui (>= 4.1.2), libstdc++6 (>= 4.0.2-4), libx11-6, libxext6, zlib1g (>= 1:1.2.1)

packaging/ubuntu-dapper/debian/rules

@@ -1,107 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --prefix=/usr
-
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-	#docbook-to-man debian/qbittorrent.sgml > qbittorrent.1
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/qbittorrent.
-	$(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/qbittorrent
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs Changelog
-	dh_installdocs
-	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 

packaging/ubuntu-edgy/debian/changelog

@@ -1,134 +0,0 @@
-qbittorrent (0.6.1-0ubuntu2) edgy; urgency=low
-
-  * Disabled debug mode
-
- -- Christophe Dumez <chris@qbittorrent.org>  Mon, 28 Aug 2006 21:22:48 +0200
-
-qbittorrent (0.6.1-0ubuntu1) edgy; urgency=low
-  * BUGFIX: Fixed possible segfaults when using context menus
-  * BUGFIX: Cleanup up context menus code
-  * BUGFIX: Used best gzip compressing for manpage
-
- -- Christophe Dumez <chris@qbittorrent.org>  Thu,  24 Aug 2006 19:53:32 +0200
-
-qbittorrent (0.6.0) edgy; urgency=low
-  * FEATURE: Rewritten the download list from scratch (more flexible)
-  * FEATURE: Rewritten the search results list from scratch (more flexible)
-  * FEATURE: Rewritten the torrent properties list from scratch (more flexible)
-  * FEATURE: Improved and cleaned up search engine code
-  * FEATURE: Search results are now displayed in real time (not sequentially)
-  * FEATURE: Added two command lines parameters (--version, --help)
-  * FEATURE: Added a popup menu for download list
-  * FEATURE: Double-click on an item now toggles the paused state of a download
-  * FEATURE: Improved code to be more portable (Windows & MacOS versions should arrive soon)
-  * FEATURE: Allow to toggle selected state of a file within a torrent using double-click
-  * FEATURE: Remember columns width in download and search results lists
-  * BUGFIX: Don't use pkg-config for libcurl anymore (easier to compile)
-  * BUGFIX: Fixed ETA calculation when downloading while connecting
-  * BUGFIX: Download progress is now displayed correctly during first seconds of execution (was 0% before)
-  * BUGFIX: Code cleanup & optimization
-  * BUGFIX: Fixed sorting in download list
-  * BUGFIX: Fixed sorting in search results list
-  * BUGFIX: Fixed Parameters passing between instances
-  * BUGFIX: Fixed missing icon for clear action in infoBar popup menu
-  * BUGFIX: Fixed truncated lines in search results
-  * BUGFIX: Don't refresh download list when user is in search tab (save CPU)
-  * BUGFIX: Don't update Progress/DL Speed/ETA for finished downloads (save CPU)
-  * BUGFIX: Save selected search engines only when they have changed (faster program exit)
-  * COSMETIC: Increased icon size in toolbar from 24px to 32px
-  * COSMETIC: Display a progress bar to visualize each download progress
-  * COSMETIC: Size of each result in search are displayed in user friendly units
-  * COSMETIC: Display a progress bar to visualize each file progress within a torrent
-  * COSMETIC: Renamed 'ratio' to 'Session ratio' (makes more sense)
-  * COSMETIC: Improved layout of torrent properties window when maximized
-  * COSMETIC: Now number of search results is updated in real time
-  * COSMETIC: Remember last window size
-  * COSMETIC: Improved splash screen look
-  * COSMETIC: Improved default width of columns in download and search results lists
-
- -- Christophe Dumez <chris@qbittorrent.org>  Wed,  22 Aug 2006 10:42:37 +0200
-
-qbittorrent (0.5.0) edgy; urgency=low
-  * Improved "Download from url" feature (now supports https, ftp & redirections)
-  * Added a torrent creation tool
-  * Display progress for each file within a torrent
-  * Based on new libtorrent v0.10 (lot of improvements)
-  * Now possible to clear log textbox (popup menu)
-  * Added two search engines (isohunt, torrentreactor)
-  * Now Display share ratio on main window
-  * Use OSD (On Screen Display) when a download or a search is finished
-  * Allow only one instance of qBittorrent (and add new parameters to download list)
-  * Remember last selected search engines in search tab
-  * Improved search engines status output (Aborted, timed out, finished, no results)
-  * qBittorrent can now update search plugin from qbittorrent.org
-  * Added Slovak, Italian, Portuguese, Romanian and Traditional Chinese languages
-  * Fixed ThePirateBay parser for search engine (website had changed)
-  * Fixed filenames for results from ThePirateBay search engine
-  * Fixed unicode support for ThePirateBay search engine
-  * Now search results are sorted by seeds
-  * Overwrite nova.py search plugin only if it is outdated
-  * Fixed possible division by 0 in ETA calculation
-  * Improved ETA calculation precision
-  * Fixed default tab in options
-  * When saving options, reconnect only when listening ports changed
-  * qBittorrent has now its own new logo
-  * Display status "downloading" if DL Speed > 0 (even when tracker is down)
-  * Added a splashscreen
-  * qBittorrent has new cute icons
-  * Display number of results in search tab
-  * Added icons for each item in download list according to its state
-  * Redesigned Locale settings
-  * Fixed search engines names width (were cut on the right)
-  * Moved search engines to the left of the window (better ui)
-
- -- Christophe Dumez <chris@qbittorrent.org>  Wed,  2 Aug 2006 19:46:32 +0200
-
-qbittorrent (0.4.1) edgy; urgency=low
-  * Not counting "protocol chatter" in UP/DL speed anymore
-  * Download speed is now 0 when download is finished
-  * Paused torrents remain paused when qbittorrent is re-started
-  * Added option "go to systray when minimizing"
-  * Added option "Clear finished downloads on exit"
-  * Added option "Ask user for confirmation on exit"
-  * Added "Stalled" status for downloads (colored in orange, paused are in red and finished in green)
-  * Fixed Search window layout on maximizing
-  * Fixed a bug that caused upload limit not to be always applied
-  * Added Bulgarian translation
-  * Updated Translations
-  * Code optimization
-
- -- Christophe Dumez <chris@qbittorrent.org>  Thu,  22 Jun 2006 20:14:27 +0200
-
-qbittorrent (0.4.0) edgy; urgency=low
-
-  * Added a search engine (supports Mininova & thepiratebay websites)
-  * Fixed critical bug: some options were not applied correctly to BT session
-  * Possibility to download a torrent file from an URL
-  * Added confirmation dialog on qbittorrent exit
-  * Enabled sorting in Download list
-  * Added Ukrainian translation
-  * Support urls as program parameters
-  * Added more actions to trayicon menu
-  * Fixed exception catching when retrieving fastresume data
-  * use Binary prefix standards from IEC 60027-2 for units (B, KiB, MiB, GiB, TiB)
-  * Iconification to systray when minimizing
-  * Code Cleanup & optimization
-
- -- Christophe Dumez <chris@qbittorrent.org>  Wed,  14 Jun 2006 14:47:27 +0200
-
-qbittorrent (0.3.1) edgy; urgency=low
-
-  * Fixed toolbar layout (spacing).
-  * Added Russian translation.
-  * Resume also finished files on startup (for seeding).
-  * Added colors corresponding to download state.
-  * Fixed a segfault when deleting a download (if no scan dir is set).
-
- -- Christophe Dumez <chris@qbittorrent.org>  Sat,  6 Jun 2006 21:36:27 +0200
-
-
-qbittorrent (0.3) edgy; urgency=low
-
-  * Initial Release.
-
- -- Christophe Dumez <chris@qbittorrent.org>  Sat,  3 Jun 2006 21:57:27 +0200

packaging/ubuntu-edgy/debian/compat

@@ -1 +0,0 @@
-4

packaging/ubuntu-edgy/debian/control

@@ -1,15 +0,0 @@
-Source: qbittorrent
-Section: net
-Priority: optional
-Maintainer: Christophe Dumez <chris@qbittorrent.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, libqt4-core (>= 4.1.0), libqt4-dev (>= 4.1.0), libqt4-gui (>= 4.1.0), rb-libtorrent (>= 0.10), libcurl3-dev
-Standards-Version: 3.6.2
-
-Package: qbittorrent
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, rb-libtorrent (>= 0.10), python (>= 2.3)
-Description: Bittorrent client in Qt4.1 / C++
- qBittorrent is a bittorrent client programmed in C++ / Qt4.1
- using rb_libtorrent by Arvid Norberg. It aims to be a good 
- alternative to other bittorrent client out there. It is fast,
- stable and provides unicode support.

packaging/ubuntu-edgy/debian/copyright

@@ -1,26 +0,0 @@
-This is qbittorrent, written and maintained by Christophe Dumez <chris@qbittorrent.org>
-on Sat,  3 Jun 2006 21:57:27 +0200.
-
-The original source can always be found at:
-	ftp://ftp.debian.org/dists/unstable/main/source/
-
-Copyright (C) 2006  Christophe Dumez
-
-License:
-
-  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 2 of the License, 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 package; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.

packaging/ubuntu-edgy/debian/dirs

@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin

packaging/ubuntu-edgy/debian/docs

@@ -1,3 +0,0 @@
-NEWS
-README
-TODO

packaging/ubuntu-edgy/debian/files

@@ -1 +0,0 @@
-qbittorrent_0.6.1-0ubuntu2_i386.deb net optional

packaging/ubuntu-edgy/debian/qbittorrent.substvars

@@ -1 +0,0 @@
-shlibs:Depends=libboost-date-time1.33.1, libboost-filesystem1.33.1, libboost-thread1.33.1, libc6 (>= 2.4-1), libcurl3 (>= 7.15.4-1), libgcc1 (>= 1:4.1.1-11ubuntu1), libqt4-core (>= 4.1.4), libqt4-gui (>= 4.1.4), libstdc++6 (>= 4.1.1-11ubuntu1), libx11-6, libxext6, zlib1g (>= 1:1.2.1)

packaging/ubuntu-edgy/debian/rules

@@ -1,107 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --prefix=/usr
-
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-	#docbook-to-man debian/qbittorrent.sgml > qbittorrent.1
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/qbittorrent.
-	$(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/qbittorrent
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs Changelog
-	dh_installdocs
-	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 

qBittorrent.kdevelop

@@ -94,13 +94,12 @@
       <includestyle>4</includestyle>
       <designerintegration>ExternalDesigner</designerintegration>
       <root>/usr/lib/qt4</root>
-      <qmake>/usr/bin/qmake-qt4</qmake>
-      <designer>/usr/bin/designer-qt4</designer>
+      <qmake>/usr/bin/qmake</qmake>
+      <designer>/usr/bin/designer</designer>
       <designerpluginpaths/>
     </qt>
     <references>
-      <pcs>automatic_%2Fhome%2Fchris%2Fqbittorrent_svn%2Ftrunk</pcs>
-      <pcs>Qt4</pcs>
+      <pcs>automatic_%2Fhome%2Fishanarora%2Fprojects%2Fqbittorrent</pcs>
     </references>
     <codecompletion>
       <automaticCodeCompletion>true</automaticCodeCompletion>
@@ -149,14 +148,14 @@
   </kdevfilecreate>
   <kdevtrollproject>
     <general>
-      <activedir></activedir>
+      <activedir>src</activedir>
     </general>
     <run>
       <directoryradio>executable</directoryradio>
-      <mainprogram>/home/chris/qbittorrent_svn/trunk/src/qbittorrent</mainprogram>
+      <mainprogram>/home/ishanarora/projects/qbittorrent/src/qbittorrent</mainprogram>
       <programargs/>
       <globaldebugarguments/>
-      <globalcwd>/home/chris/qbittorrent_svn/trunk</globalcwd>
+      <globalcwd>/home/ishanarora/projects/qbittorrent</globalcwd>
       <useglobalprogram>true</useglobalprogram>
       <terminal>false</terminal>
       <autocompile>true</autocompile>
@@ -187,7 +186,7 @@
   </cppsupportpart>
   <ctagspart>
     <customArguments/>
-    <customTagfilePath>/home/chris/qbittorrent_svn/trunk/tags</customTagfilePath>
+    <customTagfilePath>/home/ishanarora/projects/qbittorrent/tags</customTagfilePath>
     <activeTagsFiles/>
   </ctagspart>
   <kdevdocumentation>

qbittorrent.qc

@@ -6,7 +6,7 @@
   <dep type='qt4'>
     <required/>
   </dep>
-  <dep type='libtorrent'>
+  <dep type='libtorrent-rasterbar'>
     <required/>
   </dep>
   <dep type='libboost'>

qcm/libtorrent-rasterbar.qcm

@@ -1,17 +1,17 @@
 /*
 -----BEGIN QCMOD-----
-name: libtorrent
-arg: with-libtorrent-inc=[path], Path to libtorrent include files
-arg: with-libtorrent-lib=[path], Path to libtorrent library files
-arg: with-libtorrent-static-lib=[path], Path to libtorrent .a file
+name: libtorrent-rasterbar
+arg: with-libtorrent-inc=[path], Path to libtorrent-rasterbar include files
+arg: with-libtorrent-lib=[path], Path to libtorrent-rasterbar library files
+arg: with-libtorrent-static-lib=[path], Path to libtorrent-rasterbar .a file
 -----END QCMOD-----
 */
-class qc_libtorrent : public ConfObj
+class qc_libtorrent_rasterbar : public ConfObj
 {
 public:
-	qc_libtorrent(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent >= 0.13"; }
-	QString shortname() const { return "libtorrent"; }
+	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
+	QString name() const { return "libtorrent-rasterbar >= 0.13"; }
+	QString shortname() const { return "libtorrent-rasterbar"; }
 	bool exec(){
         	QString s;
 		s = conf->getenv("QC_WITH_LIBTORRENT_INC");
@@ -45,7 +45,7 @@ public:
 
 		s = conf->getenv("QC_WITH_LIBTORRENT_LIB");
 		if(!s.isEmpty()) {
-      			if(!conf->checkLibrary(s, "torrent")) {
+      			if(!conf->checkLibrary(s, "torrent-rasterbar")) {
 			        return false;
 			}
       			conf->addLib(QString("-L") + s);
@@ -57,7 +57,7 @@ public:
 			sl << "/usr/local/lib64/";
 			bool found = false;
 			foreach(s, sl){
-				if(conf->checkLibrary(s, "torrent")){
+				if(conf->checkLibrary(s, "torrent-rasterbar")){
 					found = true;
 					break;
 				}

qcm/qt4.qcm

@@ -11,6 +11,10 @@ public:
 	QString shortname() const { return "Qt 4.3"; }
 	bool exec()
 	{
+		if(QT_VERSION >= 0x040400) {
+			conf->addDefine("QT_4_4");
+		}
 		return(QT_VERSION >= 0x040300);
+		
 	}
 };

src/DLListDelegate.h

@@ -40,7 +40,8 @@
 #define SEEDSLEECH 5
 #define RATIO 6
 #define ETA 7
-#define HASH 8
+#define PRIORITY 8
+#define HASH 9
 
 class DLListDelegate: public QItemDelegate {
   Q_OBJECT

src/FinishedListDelegate.h

@@ -34,10 +34,10 @@
 // Defines for download list list columns
 #define F_NAME 0
 #define F_SIZE 1
-#define F_PROGRESS 2
-#define F_UPSPEED 3
-#define F_SEEDSLEECH 4
-#define F_RATIO 5
+#define F_UPSPEED 2
+#define F_LEECH 3
+#define F_RATIO 4
+#define F_PRIORITY 5
 #define F_HASH 6
 
 class FinishedListDelegate: public QItemDelegate {
@@ -67,20 +67,6 @@ class FinishedListDelegate: public QItemDelegate {
           QItemDelegate::drawDisplay(painter, opt, opt.rect, QString(QByteArray::number(ratio, 'f', 1)));
           break;
         }
-        case F_PROGRESS:{
-          QStyleOptionProgressBarV2 newopt;
-          double progress = index.data().toDouble()*100.;
-          newopt.rect = opt.rect;
-          newopt.text = QString(QByteArray::number(progress, 'f', 1))+QString::fromUtf8("%");
-          newopt.progress = (int)progress;
-          newopt.maximum = 100;
-          newopt.minimum = 0;
-          newopt.state |= QStyle::State_Enabled;
-          newopt.textVisible = true;
-          QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt,
-          painter);
-          break;
-        }
         default:
           QItemDelegate::paint(painter, option, index);
       }

src/FinishedTorrents.cpp

@@ -31,6 +31,7 @@
 #include <QStandardItemModel>
 #include <QHeaderView>
 #include <QMenu>
+#include <QMessageBox>
 
 FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : parent(parent), BTSession(BTSession), nbFinished(0){
   setupUi(this);
@@ -40,12 +41,15 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
   finishedListModel = new QStandardItemModel(0,7);
   finishedListModel->setHeaderData(F_NAME, Qt::Horizontal, tr("Name", "i.e: file name"));
   finishedListModel->setHeaderData(F_SIZE, Qt::Horizontal, tr("Size", "i.e: file size"));
-  finishedListModel->setHeaderData(F_PROGRESS, Qt::Horizontal, tr("Progress", "i.e: % downloaded"));
   finishedListModel->setHeaderData(F_UPSPEED, Qt::Horizontal, tr("UP Speed", "i.e: Upload speed"));
-  finishedListModel->setHeaderData(F_SEEDSLEECH, Qt::Horizontal, tr("Seeds/Leechs", "i.e: full/partial sources"));
+  finishedListModel->setHeaderData(F_LEECH, Qt::Horizontal, tr("Leechers", "i.e: full/partial sources"));
   finishedListModel->setHeaderData(F_RATIO, Qt::Horizontal, tr("Ratio"));
+  finishedListModel->setHeaderData(F_PRIORITY, Qt::Horizontal, tr("Priority"));
   finishedList->setModel(finishedListModel);
-  // Hide ETA & hash column
+  loadHiddenColumns();
+  // Hide priority column
+  finishedList->hideColumn(F_PRIORITY);
+  // Hide hash column
   finishedList->hideColumn(F_HASH);
   // Load last columns width for download list
   if(!loadColWidthFinishedList()){
@@ -58,7 +62,10 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
   finishedListDelegate = new FinishedListDelegate(finishedList);
   finishedList->setItemDelegate(finishedListDelegate);
   connect(finishedList, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayFinishedListMenu(const QPoint&)));
+  finishedList->header()->setContextMenuPolicy(Qt::CustomContextMenu);
+  connect(finishedList->header(), SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayFinishedHoSMenu(const QPoint&)));
   connect(finishedList, SIGNAL(doubleClicked(const QModelIndex&)), this, SLOT(notifyTorrentDoubleClicked(const QModelIndex&)));
+  connect(BTSession, SIGNAL(forceFinishedListUpdate()), this, SLOT(updateFinishedList()));
   actionDelete->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/delete.png")));
   actionPreview_file->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/preview.png")));
   actionDelete_Permanently->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/delete_perm.png")));
@@ -67,13 +74,25 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
   connect(actionPause, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionPause_triggered()));
   connect(actionStart, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionStart_triggered()));
   connect(actionDelete, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionDelete_triggered()));
+  connect(actionIncreasePriority, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionIncreasePriority_triggered()));
+  connect(actionDecreasePriority, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionDecreasePriority_triggered()));
   connect(actionPreview_file, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionPreview_file_triggered()));
   connect(actionDelete_Permanently, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionDelete_Permanently_triggered()));
+  connect(actionOpen_destination_folder, SIGNAL(triggered()), (GUI*)parent, SLOT(openDestinationFolder()));
+  connect(actionBuy_it, SIGNAL(triggered()), (GUI*)parent, SLOT(goBuyPage()));
   connect(actionTorrent_Properties, SIGNAL(triggered()), this, SLOT(propertiesSelection()));
+
+  connect(actionHOSColName, SIGNAL(triggered()), this, SLOT(hideOrShowColumnName()));
+  connect(actionHOSColSize, SIGNAL(triggered()), this, SLOT(hideOrShowColumnSize()));
+  connect(actionHOSColUpSpeed, SIGNAL(triggered()), this, SLOT(hideOrShowColumnUpSpeed()));
+  connect(actionHOSColLeechers, SIGNAL(triggered()), this, SLOT(hideOrShowColumnLeechers()));
+  connect(actionHOSColRatio, SIGNAL(triggered()), this, SLOT(hideOrShowColumnRatio()));
+  connect(actionHOSColPriority, SIGNAL(triggered()), this, SLOT(hideOrShowColumnPriority()));
 }
 
 FinishedTorrents::~FinishedTorrents(){
   saveColWidthFinishedList();
+  saveHiddenColumns();
   delete finishedListDelegate;
   delete finishedListModel;
 }
@@ -81,7 +100,11 @@ FinishedTorrents::~FinishedTorrents(){
 void FinishedTorrents::notifyTorrentDoubleClicked(const QModelIndex& index) {
   unsigned int row = index.row();
   QString hash = getHashFromRow(row);
-  emit torrentDoubleClicked(hash);
+  emit torrentDoubleClicked(hash, true);
+}
+
+void FinishedTorrents::hidePriorityColumn(bool hide) {
+  finishedList->setColumnHidden(F_PRIORITY, hide);
 }
 
 void FinishedTorrents::addTorrent(QString hash){
@@ -97,10 +120,11 @@ void FinishedTorrents::addTorrent(QString hash){
   finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(h.name()));
   finishedListModel->setData(finishedListModel->index(row, F_SIZE), QVariant((qlonglong)h.actual_size()));
   finishedListModel->setData(finishedListModel->index(row, F_UPSPEED), QVariant((double)0.));
-  finishedListModel->setData(finishedListModel->index(row, F_SEEDSLEECH), QVariant("0/0"));
+  finishedListModel->setData(finishedListModel->index(row, F_LEECH), QVariant("0"));
   finishedListModel->setData(finishedListModel->index(row, F_RATIO), QVariant(QString::fromUtf8(misc::toString(BTSession->getRealRatio(hash)).c_str())));
+  if(BTSession->isQueueingEnabled())
+    finishedListModel->setData(finishedListModel->index(row, F_PRIORITY), QVariant((int)BTSession->getUpTorrentPriority(hash)));
   finishedListModel->setData(finishedListModel->index(row, F_HASH), QVariant(hash));
-  finishedListModel->setData(finishedListModel->index(row, F_PROGRESS), QVariant((double)1.));
   if(h.is_paused()) {
     finishedListModel->setData(finishedListModel->index(row, F_NAME), QIcon(":/Icons/skin/paused.png"), Qt::DecorationRole);
     setRowColor(row, "red");
@@ -156,7 +180,7 @@ bool FinishedTorrents::loadColWidthFinishedList(){
   if(line.isEmpty())
     return false;
   QStringList width_list = line.split(' ');
-  if(width_list.size() != finishedListModel->columnCount()-1)
+  if(width_list.size() < finishedListModel->columnCount()-1)
     return false;
   unsigned int listSize = width_list.size();
   for(unsigned int i=0; i<listSize; ++i){
@@ -172,11 +196,27 @@ void FinishedTorrents::saveColWidthFinishedList() const{
   qDebug("Saving columns width in finished list");
   QSettings settings("qBittorrent", "qBittorrent");
   QStringList width_list;
-  unsigned int nbColumns = finishedListModel->columnCount()-1;
-  for(unsigned int i=0; i<nbColumns; ++i){
-    width_list << QString::fromUtf8(misc::toString(finishedList->columnWidth(i)).c_str());
+  QStringList new_width_list;
+  short nbColumns = finishedListModel->columnCount()-1;
+
+  QString line = settings.value("FinishedListColsWidth", QString()).toString();
+  if(!line.isEmpty()) {
+    width_list = line.split(' ');
   }
-  settings.setValue("FinishedListColsWidth", width_list.join(" "));
+  for(short i=0; i<nbColumns; ++i){
+    if(finishedList->columnWidth(i)<1 && width_list.size() == finishedListModel->columnCount()-1 && width_list.at(i).toInt()>=1) {
+      // load the former width
+      new_width_list << width_list.at(i);
+    } else if(finishedList->columnWidth(i)>=1) { 
+      // usual case, save the current width
+      new_width_list << QString::fromUtf8(misc::toString(finishedList->columnWidth(i)).c_str());
+    } else { 
+      // default width
+      finishedList->resizeColumnToContents(i);
+      new_width_list << QString::fromUtf8(misc::toString(finishedList->columnWidth(i)).c_str());
+    }
+  }
+  settings.setValue("FinishedListColsWidth", new_width_list.join(" "));
   qDebug("Finished list columns width saved");
 }
 
@@ -209,31 +249,49 @@ void FinishedTorrents::updateFinishedList(){
       row = getRowFromHash(hash);
     }
     Q_ASSERT(row != -1);
+    // Update priority
+    if(BTSession->isQueueingEnabled()) {
+      finishedListModel->setData(finishedListModel->index(row, F_PRIORITY), QVariant((int)BTSession->getUpTorrentPriority(hash)));
+      if(h.is_paused() && BTSession->isUploadQueued(hash)) {
+        finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/queued.png"))), Qt::DecorationRole);
+        setRowColor(row, QString::fromUtf8("grey"));
+      }
+    }
     if(h.is_paused()) continue;
     if(BTSession->getTorrentsToPauseAfterChecking().indexOf(hash) != -1) {
-      finishedListModel->setData(finishedListModel->index(row, F_PROGRESS), QVariant((double)h.progress()));
       continue;
     }
     if(h.state() == torrent_status::downloading || (h.state() != torrent_status::checking_files && h.state() != torrent_status::queued_for_checking && h.progress() < 1.)) {
       // What are you doing here? go back to download tab!
-      qDebug("Info: a torrent was moved from finished to download tab");
-      deleteTorrent(hash);
-      BTSession->setFinishedTorrent(hash);
-      emit torrentMovedFromFinishedList(hash);
+      int reponse = QMessageBox::question(this, tr("Incomplete torrent in seeding list"), tr("It appears that the state of '%1' torrent changed from 'seeding' to 'downloading'. Would you like to move it back to download list? (otherwise the torrent will simply be deleted)").arg(h.name()), QMessageBox::Yes | QMessageBox::No);
+      if (reponse == QMessageBox::Yes) {
+        qDebug("Info: a torrent was moved from finished to download tab");
+        deleteTorrent(hash);
+        BTSession->setUnfinishedTorrent(hash);
+        emit torrentMovedFromFinishedList(hash);
+      }
+      else if (reponse == QMessageBox::No) {
+		    qDebug("Deleted from the finished");
+		    BTSession->deleteTorrent(hash, true);
+      }
       continue;
     }
     if(h.state() == torrent_status::checking_files){
       finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/time.png"))), Qt::DecorationRole);
       setRowColor(row, QString::fromUtf8("grey"));
-      finishedListModel->setData(finishedListModel->index(row, F_PROGRESS), QVariant((double)h.progress()));
       continue;
     }
     setRowColor(row, QString::fromUtf8("orange"));
     finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png"))), Qt::DecorationRole);
-    finishedListModel->setData(finishedListModel->index(row, F_UPSPEED), QVariant((double)h.upload_payload_rate()));
-    finishedListModel->setData(finishedListModel->index(row, F_SEEDSLEECH), QVariant(misc::toQString(h.num_seeds(), true)+"/"+misc::toQString(h.num_peers() - h.num_seeds(), true)));
-    finishedListModel->setData(finishedListModel->index(row, F_RATIO), QVariant(misc::toQString(BTSession->getRealRatio(hash))));
-    finishedListModel->setData(finishedListModel->index(row, F_PROGRESS), QVariant((double)1.));
+    if(!finishedList->isColumnHidden(F_UPSPEED)) {
+      finishedListModel->setData(finishedListModel->index(row, F_UPSPEED), QVariant((double)h.upload_payload_rate()));
+    }
+    if(!finishedList->isColumnHidden(F_LEECH)) {
+      finishedListModel->setData(finishedListModel->index(row, F_LEECH), misc::toQString(h.num_peers() - h.num_seeds(), true));
+    }
+    if(!finishedList->isColumnHidden(F_RATIO)) {
+      finishedListModel->setData(finishedListModel->index(row, F_RATIO), QVariant(misc::toQString(BTSession->getRealRatio(hash))));
+    }
   }
 }
 
@@ -250,10 +308,11 @@ int FinishedTorrents::getRowFromHash(QString hash) const{
 // Note: does not actually pause the torrent in BT Session
 void FinishedTorrents::pauseTorrent(QString hash) {
   int row = getRowFromHash(hash);
-  Q_ASSERT(row != -1);
+  if(row == -1)
+    return;
   finishedListModel->setData(finishedListModel->index(row, F_UPSPEED), QVariant((double)0.0));
   finishedListModel->setData(finishedListModel->index(row, F_NAME), QIcon(QString::fromUtf8(":/Icons/skin/paused.png")), Qt::DecorationRole);
-  finishedListModel->setData(finishedListModel->index(row, F_SEEDSLEECH), QVariant(QString::fromUtf8("0/0")));
+  finishedListModel->setData(finishedListModel->index(row, F_LEECH), QVariant(QString::fromUtf8("0")));
   setRowColor(row, QString::fromUtf8("red"));
 }
 
@@ -283,11 +342,14 @@ void FinishedTorrents::deleteTorrent(QString hash){
 
 // Show torrent properties dialog
 void FinishedTorrents::showProperties(const QModelIndex &index){
-  int row = index.row();
-  QString hash = finishedListModel->data(finishedListModel->index(row, F_HASH)).toString();
+  showPropertiesFromHash(finishedListModel->data(finishedListModel->index(index.row(), F_HASH)).toString());
+}
+
+void FinishedTorrents::showPropertiesFromHash(QString hash){
   QTorrentHandle h = BTSession->getTorrentHandle(hash);
   properties *prop = new properties(this, BTSession, h);
   connect(prop, SIGNAL(filteredFilesChanged(QString)), this, SLOT(updateFileSize(QString)));
+  connect(prop, SIGNAL(trackersChanged(QString)), BTSession, SLOT(saveTrackerFile(QString)));
   prop->show();
 }
 
@@ -345,12 +407,168 @@ void FinishedTorrents::displayFinishedListMenu(const QPoint& pos){
   myFinishedListMenu.addSeparator();
   myFinishedListMenu.addAction(actionSet_upload_limit);
   myFinishedListMenu.addSeparator();
+  myFinishedListMenu.addAction(actionOpen_destination_folder);
   myFinishedListMenu.addAction(actionTorrent_Properties);
+  if(BTSession->isQueueingEnabled()) {
+    myFinishedListMenu.addSeparator();
+    myFinishedListMenu.addAction(actionIncreasePriority);
+    myFinishedListMenu.addAction(actionDecreasePriority);
+  }
+  myFinishedListMenu.addSeparator();
+  myFinishedListMenu.addAction(actionBuy_it);
+
   // Call menu
   // XXX: why mapToGlobal() is not enough?
-  myFinishedListMenu.exec(mapToGlobal(pos)+QPoint(10,55));
+  myFinishedListMenu.exec(mapToGlobal(pos)+QPoint(10,58));
 }
 
+
+/*
+ * Hiding Columns functions
+ */
+
+// hide/show columns menu
+void FinishedTorrents::displayFinishedHoSMenu(const QPoint& pos){
+  QMenu hideshowColumn(this);
+  hideshowColumn.setTitle(tr("Hide or Show Column"));
+  int lastCol;
+  if(BTSession->isQueueingEnabled()) {
+    lastCol = F_PRIORITY;
+  } else {
+    lastCol = F_RATIO;
+  }
+  for(int i=0; i<=F_RATIO; i++) {
+    hideshowColumn.addAction(getActionHoSCol(i));
+  }
+  // Call menu
+  hideshowColumn.exec(mapToGlobal(pos)+QPoint(10,34));
+}
+
+// toggle hide/show a column
+void FinishedTorrents::hideOrShowColumn(int index) {
+  unsigned int nbVisibleColumns = 0;
+  unsigned int nbCols = finishedListModel->columnCount();
+  // Count visible columns
+  for(unsigned int i=0; i<nbCols; ++i) {
+    if(!finishedList->isColumnHidden(i))
+      ++nbVisibleColumns;
+  }
+  if(!finishedList->isColumnHidden(index)) {
+    // User wants to hide the column
+    // Is there at least one other visible column?
+    if(nbVisibleColumns <= 1) return;
+    // User can hide the column, do it.
+    finishedList->setColumnHidden(index, true);
+    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_cancel.png")));
+    --nbVisibleColumns;
+  } else {
+    // User want to display the column
+    finishedList->setColumnHidden(index, false);
+    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_ok.png")));
+    ++nbVisibleColumns;
+  }
+  //resize all others non-hidden columns
+  for(unsigned int i=0; i<nbCols; ++i) {
+    if(!finishedList->isColumnHidden(i)) {
+      finishedList->setColumnWidth(i, (int)ceil(finishedList->columnWidth(i)+(finishedList->columnWidth(index)/nbVisibleColumns)));
+    }
+  }
+}
+
+void FinishedTorrents::hideOrShowColumnName() {
+  hideOrShowColumn(F_NAME);
+}
+
+void FinishedTorrents::hideOrShowColumnSize() {
+  hideOrShowColumn(F_SIZE);
+}
+
+void FinishedTorrents::hideOrShowColumnUpSpeed() {
+  hideOrShowColumn(F_UPSPEED);
+}
+
+void FinishedTorrents::hideOrShowColumnLeechers() {
+  hideOrShowColumn(F_LEECH);
+}
+
+void FinishedTorrents::hideOrShowColumnRatio() {
+  hideOrShowColumn(F_RATIO);
+}
+
+void FinishedTorrents::hideOrShowColumnPriority() {
+  hideOrShowColumn(F_PRIORITY);
+}
+
+// load the previous settings, and hide the columns
+bool FinishedTorrents::loadHiddenColumns() {
+  bool loaded = false;
+  QSettings settings("qBittorrent", "qBittorrent");
+  QString line = settings.value("FinishedListColsHoS", QString()).toString();
+  QStringList ishidden_list;
+  if(!line.isEmpty()) {
+    ishidden_list = line.split(' ');
+    if(ishidden_list.size() == finishedListModel->columnCount()-1) {
+      unsigned int listSize = ishidden_list.size();
+      for(unsigned int i=0; i<listSize; ++i){
+            finishedList->header()->resizeSection(i, ishidden_list.at(i).toInt());
+      }
+      loaded = true;
+    }
+  }
+  for(int i=0; i<finishedListModel->columnCount()-1; i++) {
+    if(loaded && ishidden_list.at(i) == "0") {
+      finishedList->setColumnHidden(i, true);
+      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_cancel.png")));
+    } else {
+      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_ok.png")));
+    }
+  }
+  return loaded;
+}
+
+// save the hidden columns in settings
+void FinishedTorrents::saveHiddenColumns() {
+  QSettings settings("qBittorrent", "qBittorrent");
+  QStringList ishidden_list;
+  short nbColumns = finishedListModel->columnCount()-1;
+
+  for(short i=0; i<nbColumns; ++i){
+    if(finishedList->isColumnHidden(i)) {
+      ishidden_list << QString::fromUtf8(misc::toString(0).c_str());
+    } else {
+      ishidden_list << QString::fromUtf8(misc::toString(1).c_str());
+    }
+  }
+  settings.setValue("FinishedListColsHoS", ishidden_list.join(" "));
+}
+
+// getter, return the action hide or show whose id is index
+QAction* FinishedTorrents::getActionHoSCol(int index) {
+  switch(index) {
+    case F_NAME :
+      return actionHOSColName;
+      break;
+    case F_SIZE :
+      return actionHOSColSize;
+      break;
+    case F_UPSPEED :
+      return actionHOSColUpSpeed;
+      break;
+    case F_LEECH :
+      return actionHOSColLeechers;
+      break;
+    case F_RATIO :
+      return actionHOSColRatio;
+      break;
+    case F_PRIORITY :
+      return actionHOSColPriority;
+      break;
+    default :
+      return NULL;
+  }
+}
+
+
 /*
  * Sorting functions
  */
@@ -368,7 +586,6 @@ void FinishedTorrents::sortFinishedList(int index){
   switch(index){
     case F_SIZE:
     case F_UPSPEED:
-    case F_PROGRESS:
       sortFinishedListFloat(index, sortOrder);
       break;
     default:

src/FinishedTorrents.h

@@ -39,6 +39,10 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     FinishedListDelegate *finishedListDelegate;
     QStandardItemModel *finishedListModel;
     unsigned int nbFinished;
+    void hideOrShowColumn(int index);
+    bool loadHiddenColumns();
+    void saveHiddenColumns();
+    QAction* getActionHoSCol(int index);
 
   public:
     FinishedTorrents(QObject *parent, bittorrent *BTSession);
@@ -53,6 +57,7 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
   protected slots:
     void showProperties(const QModelIndex &index);
     void displayFinishedListMenu(const QPoint&);
+    void displayFinishedHoSMenu(const QPoint&);
     void setRowColor(int row, QString color);
     void saveColWidthFinishedList() const;
     void sortFinishedList(int index);
@@ -62,6 +67,12 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     void torrentAdded(QString path, QTorrentHandle& h, bool fastResume);
     void on_actionSet_upload_limit_triggered();
     void notifyTorrentDoubleClicked(const QModelIndex& index);
+    void hideOrShowColumnName();
+    void hideOrShowColumnSize();
+    void hideOrShowColumnUpSpeed();
+    void hideOrShowColumnLeechers();
+    void hideOrShowColumnRatio();
+    void hideOrShowColumnPriority();
 
   public slots:
     void addTorrent(QString hash);
@@ -70,10 +81,12 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     void resumeTorrent(QString hash);
     void propertiesSelection();
     void deleteTorrent(QString hash);
+    void showPropertiesFromHash(QString hash);
+    void hidePriorityColumn(bool hide);
 
   signals:
     void torrentMovedFromFinishedList(QString);
-    void torrentDoubleClicked(QString hash);
+    void torrentDoubleClicked(QString hash, bool finished);
     void finishedTorrentsNumberChanged(unsigned int);
 
 };

src/GUI.cpp

@@ -23,14 +23,25 @@
 #include <QDesktopWidget>
 #include <QTimer>
 #include <QDesktopServices>
-#include <QTcpServer>
-#include <QTcpSocket>
+#include <QStatusBar>
+#include <QFrame>
+#ifdef QT_4_4
+  #include <QLocalServer>
+  #include <QLocalSocket>
+  #include <unistd.h>
+  #include <sys/types.h>
+#else
+  #include <QTcpServer>
+  #include <QTcpSocket>
+#endif
+
 #include <QCloseEvent>
 #include <QShortcut>
 #include <QLabel>
 #include <QModelIndex>
 
 #include "GUI.h"
+#include "httpserver.h"
 #include "downloadingTorrents.h"
 #include "misc.h"
 #include "createtorrent_imp.h"
@@ -98,11 +109,10 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
   actionSet_global_upload_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png")));
   actionSet_global_download_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/downloading.png")));
   actionDocumentation->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/qb_question.png")));
-  connecStatusLblIcon = new QLabel();
-  connecStatusLblIcon->setFrameShape(QFrame::NoFrame);
-  connecStatusLblIcon->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/disconnected.png")));
-  connecStatusLblIcon->setToolTip(QString::fromUtf8("<b>")+tr("Connection status:")+QString::fromUtf8("</b><br>")+tr("Offline")+QString::fromUtf8("<br><i>")+tr("No peers found...")+QString::fromUtf8("</i>"));
-  toolBar->addWidget(connecStatusLblIcon);
+  prioSeparator = toolBar->insertSeparator(actionDecreasePriority);
+  prioSeparator2 = menu_Edit->insertSeparator(actionDecreasePriority);
+  prioSeparator->setVisible(false);
+  prioSeparator2->setVisible(false);
   actionDelete_Permanently->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/delete_perm.png")));
   actionTorrent_Properties->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/properties.png")));
   actionCreate_torrent->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/new.png")));
@@ -119,22 +129,33 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
   connect(BTSession, SIGNAL(scanDirFoundTorrents(const QStringList&)), this, SLOT(processScannedFiles(const QStringList&)));
   connect(BTSession, SIGNAL(newDownloadedTorrent(QString, QString)), this, SLOT(processDownloadedFiles(QString, QString)));
   connect(BTSession, SIGNAL(downloadFromUrlFailure(QString, QString)), this, SLOT(handleDownloadFromUrlFailure(QString, QString)));
-  connect(BTSession, SIGNAL(torrent_deleted(QString, QString, bool)), this, SLOT(deleteTorrent(QString, QString, bool)));
+  connect(BTSession, SIGNAL(deletedTorrent(QString)), this, SLOT(deleteTorrent(QString)));
+  connect(BTSession, SIGNAL(torrent_ratio_deleted(QString)), this, SLOT(deleteRatioTorrent(QString)));
+  connect(BTSession, SIGNAL(pausedTorrent(QString)), this, SLOT(pauseTorrent(QString)));
+  connect(BTSession, SIGNAL(updateUnfinishedTorrentNumber()), this, SLOT(updateUnfinishedTorrentNumberCalc()));
+  connect(BTSession, SIGNAL(updateFinishedTorrentNumber()), this, SLOT(updateFinishedTorrentNumberCalc()));
   qDebug("create tabWidget");
   tabs = new QTabWidget();
   // Download torrents tab
   downloadingTorrentTab = new DownloadingTorrents(this, BTSession);
-  tabs->addTab(downloadingTorrentTab, tr("Downloads") + QString::fromUtf8(" (0)"));
+  tabs->addTab(downloadingTorrentTab, tr("Downloads") + QString::fromUtf8(" (0/0)"));
   tabs->setTabIcon(0, QIcon(QString::fromUtf8(":/Icons/skin/downloading.png")));
   vboxLayout->addWidget(tabs);
   connect(downloadingTorrentTab, SIGNAL(unfinishedTorrentsNumberChanged(unsigned int)), this, SLOT(updateUnfinishedTorrentNumber(unsigned int)));
-  connect(downloadingTorrentTab, SIGNAL(torrentDoubleClicked(QString)), this, SLOT(togglePausedState(QString)));
+  connect(downloadingTorrentTab, SIGNAL(torrentDoubleClicked(QString, bool)), this, SLOT(torrentDoubleClicked(QString, bool)));
   // Finished torrents tab
   finishedTorrentTab = new FinishedTorrents(this, BTSession);
-  tabs->addTab(finishedTorrentTab, tr("Finished") + QString::fromUtf8(" (0)"));
+  tabs->addTab(finishedTorrentTab, tr("Finished") + QString::fromUtf8(" (0/0)"));
   tabs->setTabIcon(1, QIcon(QString::fromUtf8(":/Icons/skin/seeding.png")));
-  connect(finishedTorrentTab, SIGNAL(torrentDoubleClicked(QString)), this, SLOT(togglePausedState(QString)));
+  connect(finishedTorrentTab, SIGNAL(torrentDoubleClicked(QString, bool)), this, SLOT(torrentDoubleClicked(QString, bool)));
   connect(finishedTorrentTab, SIGNAL(finishedTorrentsNumberChanged(unsigned int)), this, SLOT(updateFinishedTorrentNumber(unsigned int)));
+  // Search engine tab
+  searchEngine = new SearchEngine(BTSession, myTrayIcon, systrayIntegration);
+  tabs->addTab(searchEngine, tr("Search"));
+  tabs->setTabIcon(2, QIcon(QString::fromUtf8(":/Icons/skin/search.png")));
+  readSettings();
+  // RSS Tab
+  rssWidget = 0;
   // Smooth torrent switching between tabs Downloading <--> Finished
   connect(downloadingTorrentTab, SIGNAL(torrentFinished(QString)), finishedTorrentTab, SLOT(addTorrent(QString)));
   connect(finishedTorrentTab, SIGNAL(torrentMovedFromFinishedList(QString)), downloadingTorrentTab, SLOT(addTorrent(QString)));
@@ -146,43 +167,96 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
   configureSession(true);
   // Resume unfinished torrents
   BTSession->resumeUnfinishedTorrents();
-  // Search engine tab
-  searchEngine = new SearchEngine(BTSession, myTrayIcon, systrayIntegration);
-  tabs->addTab(searchEngine, tr("Search"));
-  tabs->setTabIcon(2, QIcon(QString::fromUtf8(":/Icons/skin/search.png")));
-  // RSS tab
-  rssWidget = new RSSImp();
-  tabs->addTab(rssWidget, tr("RSS"));
-  tabs->setTabIcon(3, QIcon(QString::fromUtf8(":/Icons/rss32.png")));
-  readSettings();
   // Add torrent given on command line
   processParams(torrentCmdLine);
+  // Initialize Web UI
+  httpServer = 0;
+  if(settings.value("Preferences/WebUI/Enabled", false).toBool())
+  {
+    quint16 port = settings.value("Preferences/WebUI/Port", 8080).toUInt();
+    QString username = settings.value("Preferences/WebUI/Username", "").toString();
+    QString password = settings.value("Preferences/WebUI/Password", "").toString();
+    initWebUi(username, password, port);
+  }
   // Use a tcp server to allow only one instance of qBittorrent
-  tcpServer = new QTcpServer();
-  if (!tcpServer->listen(QHostAddress::LocalHost, 1666)) {
+#ifdef QT_4_4
+  localServer = new QLocalServer();
+  QString uid = QString::number(getuid());
+  if (!localServer->listen("qBittorrent-"+uid)) {
+#else
+  localServer = new QTcpServer();
+  if (!localServer->listen(QHostAddress::LocalHost)) {
+#endif
     std::cerr  << "Couldn't create socket, single instance mode won't work...\n";
   }
-  connect(tcpServer, SIGNAL(newConnection()), this, SLOT(acceptConnection()));
+#ifndef QT_4_4  
+  else {
+    QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+    settings.setValue(QString::fromUtf8("uniqueInstancePort"), localServer->serverPort());
+  }
+#endif
+  connect(localServer, SIGNAL(newConnection()), this, SLOT(acceptConnection()));
   // Start connection checking timer
   checkConnect = new QTimer(this);
   connect(checkConnect, SIGNAL(timeout()), this, SLOT(checkConnectionStatus()));
   checkConnect->start(5000);
   // Accept drag 'n drops
   setAcceptDrops(true);
-  show();
+  if(!settings.value(QString::fromUtf8("Preferences/General/StartMinimized"), false).toBool()) {
+    show();
+  }
   createKeyboardShortcuts();
+  connecStatusLblIcon = new QLabel();
+  connecStatusLblIcon->setFrameShape(QFrame::NoFrame);
+  connecStatusLblIcon->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/firewalled.png")));
+  connecStatusLblIcon->setToolTip(QString::fromUtf8("<b>")+tr("Connection status:")+QString::fromUtf8("</b><br>")+QString::fromUtf8("<i>")+tr("No direct connections. This may indicate network configuration problems.")+QString::fromUtf8("</i>"));
+  dlSpeedLbl = new QLabel(tr("DL: %1 KiB/s").arg("0.0"));
+  upSpeedLbl = new QLabel(tr("UP: %1 KiB/s").arg("0.0"));
+  ratioLbl = new QLabel(tr("Ratio: %1").arg("1.0"));
+  DHTLbl = new QLabel(tr("DHT: %1 nodes").arg(0));
+  statusSep1 = new QFrame();
+  statusSep1->setFixedWidth(1);
+  statusSep1->setFrameStyle(QFrame::Box);
+  statusSep2 = new QFrame();
+  statusSep2->setFixedWidth(1);
+  statusSep2->setFrameStyle(QFrame::Box);
+  statusSep3 = new QFrame();
+  statusSep3->setFixedWidth(1);
+  statusSep3->setFrameStyle(QFrame::Box);
+  statusSep4 = new QFrame();
+  statusSep4->setFixedWidth(1);
+  statusSep4->setFrameStyle(QFrame::Box);
+  QMainWindow::statusBar()->addPermanentWidget(DHTLbl);
+  QMainWindow::statusBar()->addPermanentWidget(statusSep1);
+  QMainWindow::statusBar()->addPermanentWidget(connecStatusLblIcon);
+  QMainWindow::statusBar()->addPermanentWidget(statusSep2);
+  QMainWindow::statusBar()->addPermanentWidget(dlSpeedLbl);
+  QMainWindow::statusBar()->addPermanentWidget(statusSep3);
+  QMainWindow::statusBar()->addPermanentWidget(upSpeedLbl);
+  QMainWindow::statusBar()->addPermanentWidget(statusSep4);
+  QMainWindow::statusBar()->addPermanentWidget(ratioLbl);
   qDebug("GUI Built");
 }
 
 // Destructor
 GUI::~GUI() {
   qDebug("GUI destruction");
-  delete rssWidget;
+  delete dlSpeedLbl;
+  delete upSpeedLbl;
+  delete ratioLbl;
+  delete DHTLbl;
+  delete statusSep1;
+  delete statusSep2;
+  delete statusSep3;
+  delete statusSep4;
+  if(rssWidget != 0)
+    delete rssWidget;
   delete searchEngine;
   delete refresher;
   delete downloadingTorrentTab;
   delete finishedTorrentTab;
   delete checkConnect;
+  qDebug("1");
   if(systrayCreator) {
     delete systrayCreator;
   }
@@ -190,16 +264,56 @@ GUI::~GUI() {
     delete myTrayIcon;
     delete myTrayIconMenu;
   }
-  delete tcpServer;
+  qDebug("2");
+  delete localServer;
   delete connecStatusLblIcon;
   delete tabs;
+  // HTTP Server
+  if(httpServer)
+    delete httpServer;
+  qDebug("3");
   // Keyboard shortcuts
   delete switchSearchShortcut;
   delete switchSearchShortcut2;
   delete switchDownShortcut;
   delete switchUpShortcut;
   delete switchRSSShortcut;
+  qDebug("4");
   delete BTSession;
+  qDebug("5");
+}
+
+void GUI::displayRSSTab(bool enable) {
+  if(enable) {
+    // RSS tab
+    rssWidget = new RSSImp();
+    tabs->addTab(rssWidget, tr("RSS"));
+    tabs->setTabIcon(3, QIcon(QString::fromUtf8(":/Icons/rss32.png")));
+  } else {
+    if(rssWidget != 0) {
+      delete rssWidget;
+      rssWidget = 0;
+    }
+  }
+}
+
+void GUI::updateRatio() {
+  // Update ratio info
+  float ratio = 1.;
+  session_status sessionStatus = BTSession->getSessionStatus();
+  if(sessionStatus.total_payload_download == 0) {
+    if(sessionStatus.total_payload_upload == 0)
+      ratio = 1.;
+    else
+      ratio = 10.;
+  }else{
+    ratio = (double)sessionStatus.total_payload_upload / (double)sessionStatus.total_payload_download;
+    if(ratio > 10.)
+      ratio = 10.;
+  }
+  ratioLbl->setText(tr("Ratio: %1").arg(QString(QByteArray::number(ratio, 'f', 1))));
+  // Update DHT nodes
+  DHTLbl->setText(tr("DHT: %1 nodes").arg(QString::number(sessionStatus.dht_nodes)));
 }
 
 void GUI::on_actionWebsite_triggered() const {
@@ -307,6 +421,8 @@ void GUI::createKeyboardShortcuts() {
   actionStart_All->setShortcut(QKeySequence(QString::fromUtf8("Ctrl+Shift+S")));
   actionPause->setShortcut(QKeySequence(QString::fromUtf8("Ctrl+P")));
   actionPause_All->setShortcut(QKeySequence(QString::fromUtf8("Ctrl+Shift+P")));
+  actionDecreasePriority->setShortcut(QKeySequence(QString::fromUtf8("Ctrl+-")));
+  actionIncreasePriority->setShortcut(QKeySequence(QString::fromUtf8("Ctrl++")));
 }
 
 // Keyboard shortcuts slots
@@ -348,7 +464,7 @@ void GUI::balloonClicked() {
 }
 
 void GUI::acceptConnection() {
-  clientConnection = tcpServer->nextPendingConnection();
+  clientConnection = localServer->nextPendingConnection();
   connect(clientConnection, SIGNAL(disconnected()), this, SLOT(readParamsOnSocket()));
   qDebug("accepted connection from another instance");
 }
@@ -394,6 +510,50 @@ void GUI::on_actionPreview_file_triggered() {
   new previewSelect(this, h);
 }
 
+void GUI::openDestinationFolder() const {
+  QStringList hashes;
+  switch(tabs->currentIndex()){
+    case 0:
+      hashes = downloadingTorrentTab->getSelectedTorrents(true);
+      break;
+    case 1:
+      hashes = finishedTorrentTab->getSelectedTorrents(true);
+      break;
+    default:
+      return;
+  }
+  QString hash;
+  QStringList pathsList;
+  foreach(hash, hashes) {
+    QTorrentHandle h = BTSession->getTorrentHandle(hash);
+    QString savePath = h.save_path();
+    if(!pathsList.contains(savePath)) {
+      pathsList.append(savePath);
+      QDesktopServices::openUrl(QString("file://")+savePath);
+    }
+  }
+}
+
+void GUI::goBuyPage() const {
+  QStringList hashes;
+  switch(tabs->currentIndex()){
+    case 0:
+      hashes = downloadingTorrentTab->getSelectedTorrents(true);
+      break;
+    case 1:
+      hashes = finishedTorrentTab->getSelectedTorrents(true);
+      break;
+    default:
+      return;
+  }
+  QString hash;
+  QStringList pathsList;
+  foreach(hash, hashes) {
+    QTorrentHandle h = BTSession->getTorrentHandle(hash);
+    QDesktopServices::openUrl("http://match.sharemonkey.com/?info_hash="+hash+"&n="+h.name()+"&cid=33");
+  }
+}
+
 // Necessary if we want to close the window
 // in one time if "close to systray" is enabled
 void GUI::on_actionExit_triggered() {
@@ -505,15 +665,18 @@ void GUI::on_actionCreate_torrent_triggered() {
   connect(ct, SIGNAL(torrent_to_seed(QString)), this, SLOT(addTorrent(QString)));
 }
 
-// Called when we minimize the program
-void GUI::hideEvent(QHideEvent *e) {
-  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
-  if(systrayIntegration && settings.value(QString::fromUtf8("Preferences/General/MinimizeToTray"), false).toBool()) {
-    // Hide window
-    hide();
+bool GUI::event(QEvent * e) {
+  if(e->type() == QEvent::WindowStateChange) {
+    //Now check to see if the window is minimised
+    if(isMinimized()) {
+      qDebug("minimisation");
+      QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+      if(systrayIntegration && settings.value(QString::fromUtf8("Preferences/General/MinimizeToTray"), false).toBool()) {
+        hide();
+      }
+    }
   }
-  // Accept hiding
-  e->accept();
+  return QMainWindow::event(e);
 }
 
 // Action executed when a file is dropped
@@ -640,27 +803,22 @@ void GUI::on_actionDelete_Permanently_triggered() {
     QString fileName = h.name();
     // Remove the torrent
     BTSession->deleteTorrent(hash, true);
-    // Delete item from list
-    if(inDownloadList) {
-      downloadingTorrentTab->deleteTorrent(hash);
-    } else {
-      finishedTorrentTab->deleteTorrent(hash);
-    }
     // Update info bar
     downloadingTorrentTab->setInfoBar(tr("'%1' was removed permanently.", "'xxx.avi' was removed permanently.").arg(fileName));
   }
 }
 
-void GUI::deleteTorrent(QString hash, QString fileName, bool finished) {
-  if(finished) {
-    finishedTorrentTab->deleteTorrent(hash);
-  } else {
-    downloadingTorrentTab->deleteTorrent(hash);
-  }
+void GUI::deleteRatioTorrent(QString fileName) {
   // Update info bar
   downloadingTorrentTab->setInfoBar(tr("'%1' was removed because its ratio reached the maximum value you set.", "%1 is a file name").arg(fileName));
 }
 
+void GUI::deleteTorrent(QString hash) {
+  // Delete item from list
+  downloadingTorrentTab->deleteTorrent(hash);
+  finishedTorrentTab->deleteTorrent(hash);
+}
+
 // delete selected items in the list
 void GUI::on_actionDelete_triggered() {
   QStringList hashes;
@@ -705,12 +863,6 @@ void GUI::on_actionDelete_triggered() {
     QString fileName = h.name();
     // Remove the torrent
     BTSession->deleteTorrent(hash, false);
-    // Delete item from list
-    if(inDownloadList) {
-      downloadingTorrentTab->deleteTorrent(hash);
-    } else {
-      finishedTorrentTab->deleteTorrent(hash);
-    }
     // Update info bar
     downloadingTorrentTab->setInfoBar(tr("'%1' was removed.", "'xxx.avi' was removed.").arg(fileName));
   }
@@ -784,6 +936,11 @@ void GUI::configureSession(bool deleteOptions) {
     setWindowTitle(tr("qBittorrent %1", "e.g: qBittorrent v0.x").arg(QString::fromUtf8(VERSION)));
   }
   displaySpeedInTitle = new_displaySpeedInTitle;
+  if(options->isToolbarDisplayed()) {
+    toolBar->setVisible(true);
+  } else {
+    toolBar->setVisible(false);
+  }
   unsigned int new_refreshInterval = options->getRefreshInterval();
   if(refreshInterval != new_refreshInterval) {
     refreshInterval = new_refreshInterval;
@@ -798,6 +955,8 @@ void GUI::configureSession(bool deleteOptions) {
   if(options->getScanDir().isNull()) {
     BTSession->disableDirectoryScanning();
   }else{
+    //Interval first
+    BTSession->setTimerScanInterval(options->getFolderScanInterval());
     BTSession->enableDirectoryScanning(options->getScanDir());
   }
   // Connection
@@ -887,7 +1046,13 @@ void GUI::configureSession(bool deleteOptions) {
   BTSession->setProxySettings(proxySettings, options->useProxyForTrackers(), options->useProxyForPeers(), options->useProxyForWebseeds(), options->useProxyForDHT());
   // * Session settings
   session_settings sessionSettings;
-  sessionSettings.user_agent = "qBittorrent "VERSION;
+  if(options->shouldSpoofAzureus()) {
+    sessionSettings.user_agent = "Azureus 3.0.5.2";
+  } else {
+    sessionSettings.user_agent = "qBittorrent "VERSION;
+  }
+  sessionSettings.upnp_ignore_nonrouters = true;
+  sessionSettings.use_dht_as_fallback = false;
   BTSession->setSessionSettings(sessionSettings);
   // Bittorrent
   // * Max connections limit
@@ -960,6 +1125,42 @@ void GUI::configureSession(bool deleteOptions) {
     BTSession->disableIPFilter();
     downloadingTorrentTab->setBottomTabEnabled(1, false);
   }
+  // RSS
+  if(options->isRSSEnabled()) {
+    displayRSSTab(true);
+  } else {
+    displayRSSTab(false);
+  }
+  // Queueing System
+  if(options->isQueueingSystemEnabled()) {
+    if(!BTSession->isQueueingEnabled()) {
+      downloadingTorrentTab->hidePriorityColumn(false);
+      finishedTorrentTab->hidePriorityColumn(false);
+      actionDecreasePriority->setVisible(true);
+      actionIncreasePriority->setVisible(true);
+      prioSeparator->setVisible(true);
+      prioSeparator2->setVisible(true);
+      toolBar->layout()->setSpacing(7);
+    }
+    int max_torrents = options->getMaxActiveTorrents();
+    int max_downloads = options->getMaxActiveDownloads();
+    if(max_torrents < max_downloads)
+      max_torrents = max_downloads;
+    BTSession->setMaxActiveTorrents(max_torrents);
+    BTSession->setMaxActiveDownloads(max_downloads);
+    BTSession->setQueueingEnabled(true);
+  } else {
+    if(BTSession->isQueueingEnabled()) {
+      BTSession->setQueueingEnabled(false);
+      downloadingTorrentTab->hidePriorityColumn(true);
+      finishedTorrentTab->hidePriorityColumn(true);
+      actionDecreasePriority->setVisible(false);
+      actionIncreasePriority->setVisible(false);
+      prioSeparator->setVisible(false);
+      prioSeparator2->setVisible(false);
+      toolBar->layout()->setSpacing(7);
+    }
+  }
   // Clean up
   if(deleteOptions) {
     delete options;
@@ -968,11 +1169,57 @@ void GUI::configureSession(bool deleteOptions) {
 }
 
 void GUI::updateUnfinishedTorrentNumber(unsigned int nb) {
-  tabs->setTabText(0, tr("Downloads") +QString::fromUtf8(" (")+misc::toQString(nb)+QString::fromUtf8(")"));
+  unsigned int paused = BTSession->getUnfinishedPausedTorrentsNb();
+  tabs->setTabText(0, tr("Downloads") +QString::fromUtf8(" (")+misc::toQString(nb-paused)+"/"+misc::toQString(nb)+QString::fromUtf8(")"));
+}
+
+void GUI::updateUnfinishedTorrentNumberCalc() {
+  unsigned int paused = BTSession->getUnfinishedPausedTorrentsNb();
+  unsigned int nb = BTSession->getUnfinishedTorrents().size();
+  tabs->setTabText(0, tr("Downloads") +QString::fromUtf8(" (")+misc::toQString(nb-paused)+"/"+misc::toQString(nb)+QString::fromUtf8(")"));
 }
 
 void GUI::updateFinishedTorrentNumber(unsigned int nb) {
-  tabs->setTabText(1, tr("Finished") +QString::fromUtf8(" (")+misc::toQString(nb)+QString::fromUtf8(")"));
+  unsigned int paused = BTSession->getFinishedPausedTorrentsNb();
+  tabs->setTabText(1, tr("Finished") +QString::fromUtf8(" (")+misc::toQString(nb-paused)+"/"+misc::toQString(nb)+QString::fromUtf8(")"));
+}
+
+void GUI::updateFinishedTorrentNumberCalc() {
+  unsigned int paused = BTSession->getFinishedPausedTorrentsNb();
+  unsigned int nb = BTSession->getFinishedTorrents().size();
+  tabs->setTabText(1, tr("Finished") +QString::fromUtf8(" (")+misc::toQString(nb-paused)+"/"+misc::toQString(nb)+QString::fromUtf8(")"));
+}
+
+// Allow to change action on double-click
+void GUI::torrentDoubleClicked(QString hash, bool finished) {
+  int action;
+  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+  QTorrentHandle h = BTSession->getTorrentHandle(hash);
+
+  if(finished) {
+    action =  settings.value(QString::fromUtf8("Preferences/Downloads/DblClOnTorFN"), 0).toInt();
+  } else {
+    action = settings.value(QString::fromUtf8("Preferences/Downloads/DblClOnTorDl"), 0).toInt();
+  }
+
+  switch(action) {
+    case TOGGLE_PAUSE:
+      this->togglePausedState(hash);
+    break;
+    case OPEN_DEST: {
+      QTorrentHandle h = BTSession->getTorrentHandle(hash);
+      QString savePath = h.save_path();
+      QDesktopServices::openUrl(QUrl(savePath));
+      break;
+    }
+    case SHOW_PROPERTIES :
+      if(finished) {
+        finishedTorrentTab->showPropertiesFromHash(hash);
+      } else {
+        downloadingTorrentTab->showPropertiesFromHash(hash);
+      }
+    break;
+  }
 }
 
 // Toggle paused state of selected torrent
@@ -982,20 +1229,24 @@ void GUI::togglePausedState(QString hash) {
   if(tabs->currentIndex() == 1)
     inDownloadList = false;
   QTorrentHandle h = BTSession->getTorrentHandle(hash);
-  if(BTSession->isPaused(hash)) {
+  if(BTSession->isPaused(hash) && !(BTSession->isQueueingEnabled() && (BTSession->isDownloadQueued(hash) || BTSession->isUploadQueued(hash)))) {
     BTSession->resumeTorrent(hash);
     downloadingTorrentTab->setInfoBar(tr("'%1' resumed.", "e.g: xxx.avi resumed.").arg(h.name()));
     if(inDownloadList) {
       downloadingTorrentTab->resumeTorrent(hash);
+      updateUnfinishedTorrentNumber(downloadingTorrentTab->getNbTorrentsInList());
     }else{
       finishedTorrentTab->resumeTorrent(hash);
+      updateFinishedTorrentNumber(finishedTorrentTab->getNbTorrentsInList());
     }
   }else{
     BTSession->pauseTorrent(hash);
     if(inDownloadList) {
       downloadingTorrentTab->pauseTorrent(hash);
+      updateUnfinishedTorrentNumber(downloadingTorrentTab->getNbTorrentsInList());
     }else{
       finishedTorrentTab->pauseTorrent(hash);
+      updateFinishedTorrentNumber(finishedTorrentTab->getNbTorrentsInList());
     }
     downloadingTorrentTab->setInfoBar(tr("'%1' paused.", "xxx.avi paused.").arg(h.name()));
   }
@@ -1019,8 +1270,56 @@ void GUI::on_actionPause_All_triggered() {
       finishedTorrentTab->pauseTorrent(hash);
     }
   }
-  if(change)
+  if(change) {
+    updateUnfinishedTorrentNumber(downloadingTorrentTab->getNbTorrentsInList());
+    updateFinishedTorrentNumber(finishedTorrentTab->getNbTorrentsInList());
     downloadingTorrentTab->setInfoBar(tr("All downloads were paused."));
+  }
+}
+
+void GUI::on_actionIncreasePriority_triggered() {
+  bool inDownloadList = true;
+  if(tabs->currentIndex() > 1) return;
+  if(tabs->currentIndex() == 1)
+    inDownloadList = false;
+  QStringList hashes;
+  if(inDownloadList) {
+    hashes = downloadingTorrentTab->getSelectedTorrents();
+  } else {
+    hashes = finishedTorrentTab->getSelectedTorrents();
+  }
+  foreach(QString hash, hashes) {
+    if(inDownloadList) {
+      BTSession->increaseDlTorrentPriority(hash);
+      downloadingTorrentTab->updateDlList();
+    } else {
+      BTSession->increaseUpTorrentPriority(hash);
+      finishedTorrentTab->updateFinishedList();
+    }
+  }
+}
+
+void GUI::on_actionDecreasePriority_triggered() {
+  bool inDownloadList = true;
+  if(tabs->currentIndex() > 1) return;
+  if(tabs->currentIndex() == 1)
+    inDownloadList = false;
+  QStringList hashes;
+  if(inDownloadList) {
+    hashes = downloadingTorrentTab->getSelectedTorrents();
+  } else {
+    hashes = finishedTorrentTab->getSelectedTorrents();
+  }
+  QString hash;
+  foreach(QString hash, hashes) {
+    if(inDownloadList) {
+      BTSession->decreaseDlTorrentPriority(hash);
+      downloadingTorrentTab->updateDlList();
+    } else {
+      BTSession->decreaseUpTorrentPriority(hash);
+      finishedTorrentTab->updateFinishedList();
+    }
+  }
 }
 
 // pause selected items in the list
@@ -1040,14 +1339,23 @@ void GUI::on_actionPause_triggered() {
     if(BTSession->pauseTorrent(hash)){
       if(inDownloadList) {
         downloadingTorrentTab->pauseTorrent(hash);
+        updateUnfinishedTorrentNumber(downloadingTorrentTab->getNbTorrentsInList());
       } else {
         finishedTorrentTab->pauseTorrent(hash);
+        updateFinishedTorrentNumber(finishedTorrentTab->getNbTorrentsInList());
       }
       downloadingTorrentTab->setInfoBar(tr("'%1' paused.", "xxx.avi paused.").arg(BTSession->getTorrentHandle(hash).name()));
     }
   }
 }
 
+void GUI::pauseTorrent(QString hash) {
+  downloadingTorrentTab->pauseTorrent(hash);
+  finishedTorrentTab->pauseTorrent(hash);
+  updateUnfinishedTorrentNumber(downloadingTorrentTab->getNbTorrentsInList());
+  updateFinishedTorrentNumber(finishedTorrentTab->getNbTorrentsInList());
+}
+
 // Resume All Downloads in DL list
 void GUI::on_actionStart_All_triggered() {
   bool change = false;
@@ -1066,8 +1374,11 @@ void GUI::on_actionStart_All_triggered() {
       finishedTorrentTab->resumeTorrent(hash);
     }
   }
-  if(change)
+  if(change) {
+    updateUnfinishedTorrentNumber(downloadingTorrentTab->getNbTorrentsInList());
+    updateFinishedTorrentNumber(finishedTorrentTab->getNbTorrentsInList());
     downloadingTorrentTab->setInfoBar(tr("All downloads were resumed."));
+  }
 }
 
 // start selected items in the list
@@ -1087,8 +1398,10 @@ void GUI::on_actionStart_triggered() {
     if(BTSession->resumeTorrent(hash)){
       if(inDownloadList) {
         downloadingTorrentTab->resumeTorrent(hash);
+        updateUnfinishedTorrentNumber(downloadingTorrentTab->getNbTorrentsInList());
       } else {
         finishedTorrentTab->resumeTorrent(hash);
+        updateFinishedTorrentNumber(finishedTorrentTab->getNbTorrentsInList());
       }
       downloadingTorrentTab->setInfoBar(tr("'%1' resumed.", "e.g: xxx.avi resumed.").arg(BTSession->getTorrentHandle(hash).name()));
     }
@@ -1115,6 +1428,9 @@ void GUI::on_actionTorrent_Properties_triggered() {
 }
 
 void GUI::updateLists() {
+  // update global informations
+  dlSpeedLbl->setText(tr("DL: %1 KiB/s").arg(QString(QByteArray::number(BTSession->getPayloadDownloadRate()/1024., 'f', 1))));
+  upSpeedLbl->setText(tr("UP: %1 KiB/s").arg(QString(QByteArray::number(BTSession->getPayloadUploadRate()/1024., 'f', 1))));
   switch(getCurrentTabIndex()){
     case 0:
       downloadingTorrentTab->updateDlList();
@@ -1144,8 +1460,7 @@ void GUI::trackerAuthenticationRequired(QTorrentHandle& h) {
 void GUI::checkConnectionStatus() {
 //   qDebug("Checking connection status");
   // Update Ratio
-  if(getCurrentTabIndex() == 0)
-    downloadingTorrentTab->updateRatio();
+  updateRatio();
   // update global informations
   if(systrayIntegration) {
     QString html = "<div style='background-color: #678db2; color: #fff;height: 18px; font-weight: bold; margin-bottom: 5px;'>";
@@ -1165,15 +1480,8 @@ void GUI::checkConnectionStatus() {
     connecStatusLblIcon->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/connected.png")));
     connecStatusLblIcon->setToolTip(QString::fromUtf8("<b>")+tr("Connection Status:")+QString::fromUtf8("</b><br>")+tr("Online"));
   }else{
-    if(sessionStatus.num_peers) {
-      // Firewalled ?
-      connecStatusLblIcon->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/firewalled.png")));
-      connecStatusLblIcon->setToolTip("<b>"+tr("Connection Status:")+QString::fromUtf8("</b><br>")+tr("Firewalled?", "i.e: Behind a firewall/router?")+QString::fromUtf8("<br><i>")+tr("No incoming connections...")+QString::fromUtf8("</i>"));
-    }else{
-      // Disconnected
-      connecStatusLblIcon->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/disconnected.png")));
-      connecStatusLblIcon->setToolTip(QString::fromUtf8("<b>")+tr("Connection status:")+QString::fromUtf8("</b><br>")+tr("Offline")+QString::fromUtf8("<br><i>")+tr("No peers found...")+QString::fromUtf8("</i>"));
-    }
+    connecStatusLblIcon->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/firewalled.png")));
+    connecStatusLblIcon->setToolTip(QString::fromUtf8("<b>")+tr("Connection status:")+QString::fromUtf8("</b><br>")+QString::fromUtf8("<i>")+tr("No direct connections. This may indicate network configuration problems.")+QString::fromUtf8("</i>"));
   }
 }
 
@@ -1265,10 +1573,40 @@ void GUI::OptionsSaved(QString info, bool deleteOptions) {
   systrayIntegration = newSystrayIntegration;
   // Update info bar
   downloadingTorrentTab->setInfoBar(info);
+  // Update Web UI
+  if (options->isWebUiEnabled())
+  {
+    quint16 port = options->webUiPort();
+    QString username = options->webUiUsername();
+    QString password = options->webUiPassword();
+    initWebUi(username, password, port);
+  }
+  else if(httpServer)
+  {
+    delete httpServer;
+    httpServer = 0;
+  }
   // Update session
   configureSession(deleteOptions);
 }
 
+bool GUI::initWebUi(QString username, QString password, int port)
+{
+  if(httpServer)
+  {
+    httpServer->close();
+  }
+  else
+    httpServer = new HttpServer(BTSession, 500, this);
+  httpServer->setAuthorization(username, password);
+  bool success = httpServer->listen(QHostAddress::Any, port);
+  if (success)
+    qDebug("Web UI listening on port %d", port);
+  else
+    QMessageBox::critical(this, "Web User Interface Error", "Unable to initialize HTTP Server on port " + misc::toQString(port));
+  return success;
+}
+
 /*****************************************************
  *                                                   *
  *                 HTTP Downloader                   *

src/GUI.h

@@ -35,8 +35,13 @@ class DownloadingTorrents;
 class FinishedTorrents;
 class downloadFromURL;
 class SearchEngine;
-class QTcpServer;
-class QTcpSocket;
+#ifdef QT_4_4
+  class QLocalServer;
+  class QLocalSocket;
+#else
+  class QTcpServer;
+  class QTcpSocket;
+#endif
 class QCloseEvent;
 class RSSImp;
 class QShortcut;
@@ -46,6 +51,8 @@ class options_imp;
 class QTabWidget;
 class QLabel;
 class QModelIndex;
+class HttpServer;
+class QFrame;
 
 class GUI : public QMainWindow, private Ui::MainWindow{
   Q_OBJECT
@@ -69,19 +76,36 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     bool force_exit;
     unsigned int refreshInterval;
     QTimer *refresher;
+    QLabel *dlSpeedLbl;
+    QLabel *upSpeedLbl;
+    QLabel *ratioLbl;
+    QLabel *DHTLbl;
+    QFrame *statusSep1;
+    QFrame *statusSep2;
+    QFrame *statusSep3;
+    QFrame *statusSep4;
     // Keyboard shortcuts
     QShortcut *switchSearchShortcut;
     QShortcut *switchSearchShortcut2;
     QShortcut *switchDownShortcut;
     QShortcut *switchUpShortcut;
     QShortcut *switchRSSShortcut;
+    QAction *prioSeparator;
+    QAction *prioSeparator2;
     // Search
     SearchEngine *searchEngine;
     // RSS
     RSSImp *rssWidget;
+    // Web UI
+    HttpServer *httpServer;
     // Misc
-    QTcpServer *tcpServer;
+#ifdef QT_4_4
+    QLocalServer *localServer;
+    QLocalSocket *clientConnection;
+#else
+    QTcpServer *localServer;
     QTcpSocket *clientConnection;
+#endif
 
   protected slots:
     // GUI related slots
@@ -95,6 +119,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     void readParamsOnSocket();
     void acceptConnection();
     void togglePausedState(QString hash);
+    void torrentDoubleClicked(QString hash, bool finished);
     void on_actionPreview_file_triggered();
     void previewFile(QString filePath);
     void balloonClicked();
@@ -102,6 +127,8 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     void readSettings();
     void on_actionExit_triggered();
     void createTrayIcon();
+    void updateUnfinishedTorrentNumberCalc();
+    void updateFinishedTorrentNumberCalc();
     void updateUnfinishedTorrentNumber(unsigned int nb);
     void updateFinishedTorrentNumber(unsigned int nb);
     void fullDiskError(QTorrentHandle& h) const;
@@ -133,10 +160,15 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     void processScannedFiles(const QStringList& params);
     void processDownloadedFiles(QString path, QString url);
     void downloadFromURLList(const QStringList& urls);
-    void deleteTorrent(QString hash, QString fileName, bool finished);
+    void deleteTorrent(QString hash);
+    void deleteRatioTorrent(QString fileName);
     void finishedTorrent(QTorrentHandle& h) const;
     void torrentChecked(QString hash) const;
     void updateLists();
+    bool initWebUi(QString username, QString password, int port);
+    void pauseTorrent(QString hash);
+    void on_actionIncreasePriority_triggered();
+    void on_actionDecreasePriority_triggered();
     // Options slots
     void on_actionOptions_triggered();
     void OptionsSaved(QString info, bool deleteOptions);
@@ -147,10 +179,14 @@ class GUI : public QMainWindow, private Ui::MainWindow{
   public slots:
     void trackerAuthenticationRequired(QTorrentHandle& h);
     void setTabText(int index, QString text) const;
+    void openDestinationFolder() const;
+    void goBuyPage() const;
+    void updateRatio();
 
   protected:
     void closeEvent(QCloseEvent *);
-    void hideEvent(QHideEvent *);
+    bool event(QEvent * event);
+    void displayRSSTab(bool enable);
 
   public:
     // Construct / Destruct

src/Icons/qBittorrent.desktop

@@ -1,14 +1,14 @@
 [Desktop Entry]
-Categories=Qt;Application;Network;P2P
-Comment=V1.0.0
-Encoding=UTF-8
-Exec=qbittorrent
+Categories=Qt;Network;P2P
+Comment=V1.2.0
+Exec=qbittorrent %f
 GenericName=Bittorrent client
 GenericName[bg]=Торент клиент
 GenericName[de]=Bittorren Client
 GenericName[el]=Τορεντ πελάτης
 GenericName[es]=Cliente Bittorrent
 GenericName[fr]=Client Bittorrent
+GenericName[it]=Client Bittorrent
 GenericName[ja]=Bittorrent クライアント
 GenericName[ko]=비토렌트 클라이언트
 GenericName[nl]=Bittorrent client
@@ -19,7 +19,7 @@ GenericName[tr]=Bittorrent istemcisi
 GenericName[uk]=Bittorrent-клієнт
 GenericName[zh]=Bittorrent之用户
 Icon=qbittorrent
-MimeType=application/x-bittorrent
+MimeType=application/x-bittorrent;
 Name=qBittorrent
 Name[ko]=큐비토런트
 Terminal=false

src/MainWindow.ui

@@ -5,7 +5,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>849</width>
+    <width>914</width>
     <height>563</height>
    </rect>
   </property>
@@ -16,22 +16,15 @@
    <string/>
   </property>
   <widget class="QWidget" name="centralwidget" >
-   <layout class="QVBoxLayout" >
-    <property name="spacing" >
-     <number>6</number>
-    </property>
-    <property name="margin" >
-     <number>9</number>
-    </property>
-   </layout>
+   <layout class="QVBoxLayout" />
   </widget>
   <widget class="QMenuBar" name="menubar" >
    <property name="geometry" >
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>849</width>
-     <height>29</height>
+     <width>914</width>
+     <height>26</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu_Edit" >
@@ -48,6 +41,8 @@
     <addaction name="separator" />
     <addaction name="actionDelete" />
     <addaction name="actionDelete_Permanently" />
+    <addaction name="actionDecreasePriority" />
+    <addaction name="actionIncreasePriority" />
    </widget>
    <widget class="QMenu" name="menu_Help" >
     <property name="title" >
@@ -97,8 +92,11 @@
      <height>32</height>
     </size>
    </property>
+   <property name="floatable" >
+    <bool>false</bool>
+   </property>
    <attribute name="toolBarArea" >
-    <number>4</number>
+    <enum>TopToolBarArea</enum>
    </attribute>
    <attribute name="toolBarBreak" >
     <bool>false</bool>
@@ -118,9 +116,13 @@
    <addaction name="actionPause_All" />
    <addaction name="separator" />
    <addaction name="actionOptions" />
+   <addaction name="actionDecreasePriority" />
+   <addaction name="actionIncreasePriority" />
+   <addaction name="separator" />
    <addaction name="actionExit" />
    <addaction name="separator" />
   </widget>
+  <widget class="QStatusBar" name="statusBar" />
   <action name="actionOpen" >
    <property name="text" >
     <string>Open</string>
@@ -231,7 +233,31 @@
     <string>Set global upload limit</string>
    </property>
   </action>
+  <action name="actionDecreasePriority" >
+   <property name="icon" >
+    <iconset resource="icons.qrc" >:/Icons/skin/decrease.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Decrease priority</string>
+   </property>
+   <property name="visible" >
+    <bool>false</bool>
+   </property>
+  </action>
+  <action name="actionIncreasePriority" >
+   <property name="icon" >
+    <iconset resource="icons.qrc" >:/Icons/skin/increase.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Increase priority</string>
+   </property>
+   <property name="visible" >
+    <bool>false</bool>
+   </property>
+  </action>
  </widget>
- <resources/>
+ <resources>
+  <include location="icons.qrc" />
+ </resources>
  <connections/>
 </ui>

src/SearchTab.cpp

@@ -0,0 +1,189 @@
+/*
+ * Bittorrent Client using Qt4 and libtorrent.
+ * Copyright (C) 2006  Christophe Dumez
+ *
+ * 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 2
+ * of the License, 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.
+ *
+ * Contact : chris@qbittorrent.org
+ */
+
+#include <QDir>
+#include <QTreeView>
+#include <QStandardItemModel>
+#include <QHeaderView>
+#include <QSettings>
+
+#include "SearchTab.h"
+#include "SearchListDelegate.h"
+#include "misc.h"
+#include "searchEngine.h"
+
+#define SEARCH_NAME 0
+#define SEARCH_SIZE 1
+#define SEARCH_SEEDERS 2
+#define SEARCH_LEECHERS 3
+#define SEARCH_ENGINE 4
+
+SearchTab::SearchTab(SearchEngine *parent) : QWidget()
+{
+    box=new QVBoxLayout();
+    results_lbl=new QLabel();
+    resultsBrowser = new QTreeView();
+    resultsBrowser->setSelectionMode(QAbstractItemView::ExtendedSelection);
+    box->addWidget(results_lbl);
+    box->addWidget(resultsBrowser);
+    
+    setLayout(box);
+    // Set Search results list model
+    SearchListModel = new QStandardItemModel(0,5);
+    SearchListModel->setHeaderData(SEARCH_NAME, Qt::Horizontal, tr("Name", "i.e: file name"));
+    SearchListModel->setHeaderData(SEARCH_SIZE, Qt::Horizontal, tr("Size", "i.e: file size"));
+    SearchListModel->setHeaderData(SEARCH_SEEDERS, Qt::Horizontal, tr("Seeders", "i.e: Number of full sources"));
+    SearchListModel->setHeaderData(SEARCH_LEECHERS, Qt::Horizontal, tr("Leechers", "i.e: Number of partial sources"));
+    SearchListModel->setHeaderData(SEARCH_ENGINE, Qt::Horizontal, tr("Search engine"));
+    resultsBrowser->setModel(SearchListModel);
+    SearchDelegate = new SearchListDelegate();
+    resultsBrowser->setItemDelegate(SearchDelegate);
+    // Make search list header clickable for sorting
+    resultsBrowser->header()->setClickable(true);
+    resultsBrowser->header()->setSortIndicatorShown(true);
+    
+    // Connect signals to slots (search part)
+    connect(resultsBrowser, SIGNAL(doubleClicked(const QModelIndex&)), parent, SLOT(downloadSelectedItem(const QModelIndex&)));
+    connect(resultsBrowser->header(), SIGNAL(sectionPressed(int)), this, SLOT(sortSearchList(int)));
+    
+    // Load last columns width for search results list
+    if(!loadColWidthSearchList()){
+      resultsBrowser->header()->resizeSection(0, 275);
+    }
+}
+
+SearchTab::~SearchTab()
+{
+    saveColWidthSearchList();
+    delete resultsBrowser;
+    delete SearchListModel;
+    delete SearchDelegate;
+}
+
+QLabel* SearchTab::getCurrentLabel()
+{
+    return results_lbl;
+}
+
+QTreeView* SearchTab::getCurrentTreeView()
+{
+    return resultsBrowser;
+}
+
+QStandardItemModel* SearchTab::getCurrentSearchListModel()
+{
+    return SearchListModel;
+}
+
+// Set the color of a row in data model
+void SearchTab::setRowColor(int row, QString color){
+  for(int i=0; i<SearchListModel->columnCount(); ++i){
+    SearchListModel->setData(SearchListModel->index(row, i), QVariant(QColor(color)), Qt::ForegroundRole);
+  }
+}
+
+void SearchTab::sortSearchList(int index){
+  static Qt::SortOrder sortOrder = Qt::AscendingOrder;
+  if(resultsBrowser->header()->sortIndicatorSection() == index){
+      sortOrder = (sortOrder == Qt::DescendingOrder) ? Qt::AscendingOrder : Qt::DescendingOrder; ;
+  }
+  resultsBrowser->header()->setSortIndicator(index, sortOrder);
+  switch(index){
+    case SEEDERS:
+    case LEECHERS:
+    case SIZE:
+      sortSearchListInt(index, sortOrder);
+      break;
+    default:
+      sortSearchListString(index, sortOrder);
+  }
+}
+
+void SearchTab::sortSearchListInt(int index, Qt::SortOrder sortOrder){
+  QList<QPair<int, qlonglong> > lines;
+  // Insertion sorting
+  for(int i=0; i<SearchListModel->rowCount(); ++i){
+    misc::insertSort(lines, QPair<int,qlonglong>(i, SearchListModel->data(SearchListModel->index(i, index)).toLongLong()), sortOrder);
+  }
+  // Insert items in new model, in correct order
+  int nbRows_old = lines.size();
+  for(int row=0; row<lines.size(); ++row){
+    SearchListModel->insertRow(SearchListModel->rowCount());
+    int sourceRow = lines[row].first;
+    for(int col=0; col<5; ++col){
+      SearchListModel->setData(SearchListModel->index(nbRows_old+row, col), SearchListModel->data(SearchListModel->index(sourceRow, col)));
+      SearchListModel->setData(SearchListModel->index(nbRows_old+row, col), SearchListModel->data(SearchListModel->index(sourceRow, col), Qt::ForegroundRole), Qt::ForegroundRole);
+    }
+  }
+  // Remove old rows
+  SearchListModel->removeRows(0, nbRows_old);
+}
+
+void SearchTab::sortSearchListString(int index, Qt::SortOrder sortOrder){
+  QList<QPair<int, QString> > lines;
+  // Insetion sorting
+  for(int i=0; i<SearchListModel->rowCount(); ++i){
+    misc::insertSortString(lines, QPair<int, QString>(i, SearchListModel->data(SearchListModel->index(i, index)).toString()), sortOrder);
+  }
+  // Insert items in new model, in correct order
+  int nbRows_old = lines.size();
+  for(int row=0; row<nbRows_old; ++row){
+    SearchListModel->insertRow(SearchListModel->rowCount());
+    int sourceRow = lines[row].first;
+    for(int col=0; col<5; ++col){
+      SearchListModel->setData(SearchListModel->index(nbRows_old+row, col), SearchListModel->data(SearchListModel->index(sourceRow, col)));
+      SearchListModel->setData(SearchListModel->index(nbRows_old+row, col), SearchListModel->data(SearchListModel->index(sourceRow, col), Qt::ForegroundRole), Qt::ForegroundRole);
+    }
+  }
+  // Remove old rows
+  SearchListModel->removeRows(0, nbRows_old);
+}
+
+// Save columns width in a file to remember them
+// (download list)
+void SearchTab::saveColWidthSearchList() const{
+  qDebug("Saving columns width in search list");
+  QSettings settings("qBittorrent", "qBittorrent");
+  QStringList width_list;
+  for(int i=0; i<SearchListModel->columnCount(); ++i){
+    width_list << misc::toQString(resultsBrowser->columnWidth(i));
+  }
+  settings.setValue("SearchListColsWidth", width_list.join(" "));
+  qDebug("Search list columns width saved");
+}
+
+// Load columns width in a file that were saved previously
+// (search list)
+bool SearchTab::loadColWidthSearchList(){
+  qDebug("Loading columns width for search list");
+  QSettings settings("qBittorrent", "qBittorrent");
+  QString line = settings.value("SearchListColsWidth", QString()).toString();
+  if(line.isEmpty())
+    return false;
+  QStringList width_list = line.split(' ');
+  if(width_list.size() != SearchListModel->columnCount())
+    return false;
+  for(int i=0; i<width_list.size(); ++i){
+        resultsBrowser->header()->resizeSection(i, width_list.at(i).toInt());
+  }
+  qDebug("Search list columns width loaded");
+  return true;
+}

src/SearchTab.h

@@ -0,0 +1,59 @@
+/*
+ * Bittorrent Client using Qt4 and libtorrent.
+ * Copyright (C) 2006  Christophe Dumez
+ *
+ * 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 2
+ * of the License, 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.
+ *
+ * Contact : chris@qbittorrent.org
+ */
+
+#ifndef SEARCH_TAB_H
+#define SEARCH_TAB_H
+
+#include "ui_search.h"
+
+class SearchListDelegate;
+class SearchEngine;
+class QTreeView;
+class QStandardItemModel;
+
+class SearchTab : public QWidget, public Ui::search_engine
+{
+    Q_OBJECT
+            
+    private:
+        QVBoxLayout *box;
+        QLabel *results_lbl;
+        QTreeView *resultsBrowser;
+        QStandardItemModel *SearchListModel;
+        SearchListDelegate *SearchDelegate;
+    public:
+        SearchTab(SearchEngine *parent);
+        ~SearchTab();
+        bool loadColWidthSearchList();
+        QLabel * getCurrentLabel();
+        QStandardItemModel * getCurrentSearchListModel();
+        QTreeView * getCurrentTreeView();
+        void setRowColor(int row, QString color);
+    protected slots:
+        void sortSearchList(int index);
+        void sortSearchListInt(int index, Qt::SortOrder sortOrder);
+        void sortSearchListString(int index, Qt::SortOrder sortOrder);
+        void saveColWidthSearchList() const;
+        
+};
+
+#endif
+

src/TrackersAdditionDlg.h

@@ -0,0 +1,53 @@
+/*
+ * Bittorrent Client using Qt4 and libtorrent.
+ * Copyright (C) 2006  Christophe Dumez
+ *
+ * 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 2
+ * of the License, 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.
+ *
+ * Contact : chris@qbittorrent.org
+ */
+
+#ifndef TRACKERSADDITION_H
+#define TRACKERSADDITION_H
+
+#include <QDialog>
+#include <QStringList>
+#include "ui_trackersAdd.h"
+
+class TrackersAddDlg : public QDialog, private Ui::TrackersAdditionDlg{
+  Q_OBJECT
+
+  public:
+    TrackersAddDlg(QWidget *parent): QDialog(parent){
+      setupUi(this);
+      setAttribute(Qt::WA_DeleteOnClose);
+      show();
+    }
+    
+    ~TrackersAddDlg(){}
+    
+  signals:
+    void TrackersToAdd(QStringList trackers);
+    
+  public slots:
+    void on_buttonBox_accepted() {
+      QStringList trackers = trackers_list->toPlainText().trimmed().split("\n");
+      if(trackers.size()) {
+        emit TrackersToAdd(trackers);
+      }
+    }
+};
+
+#endif

src/about_imp.h

@@ -44,7 +44,7 @@ class about : public QDialog, private Ui::AboutDlg{
       // Thanks
       te_thanks->append(QString::fromUtf8("<a name='top'></a>"));
       te_thanks->append(QString::fromUtf8("<ul><li>I would like to thank sourceforge.net for hosting qBittorrent project.</li>"));
-      te_thanks->append(QString::fromUtf8("<li>I am happy that Arnaud Demaizière is contributing to the project as a developer. His help is greatly appreciated</li>"));
+      te_thanks->append(QString::fromUtf8("<li>I am happy that Ishan Arora and Arnaud Demaizière are contributing to the project as developers. Their help is greatly appreciated</li>"));
       te_thanks->append(QString::fromUtf8("<li>I also want to thank Jeffery Fernandez (jeffery@qbittorrent.org), project consultant, RPM packager, for his help and support.</li>"));
       te_thanks->append(QString::fromUtf8("<li>I am grateful to Peter Koeleman (peter@qbittorrent.org) who is helping port qBittorrent to Windows.</li>"));
       te_thanks->append(QString::fromUtf8("<li>Thanks a lot to our graphist Mateusz Toboła (tobejodok@qbittorrent.org) for his great work.</li></ul><br><br>"));
@@ -56,13 +56,13 @@ class about : public QDialog, private Ui::AboutDlg{
           "<i>- <u>Brazilian:</u> Nick Marinho (nickmarinho@gmail.com)<br>\
           - <u>Bulgarian:</u> Tsvetan & Boiko Bankov (emerge_life@users.sourceforge.net)<br>\
           - <u>Catalan:</u> Gekko Dam Beer (gekko04@users.sourceforge.net)<br>\
-          - <u>Chinese (Simplified):</u> Guo Yue (guoyue0418@hotmail.com)<br>\
+          - <u>Chinese (Simplified):</u> Guo Yue (yue.guo0418@gmail.com)<br>\
           - <u>Danish:</u> Mathias Nielsen (comoneo@gmail.com)<br>\
-          - <u>Dutch:</u> Joost Schipper (heavyjoost@users.sourceforge.net)<br>\
+          - <u>Dutch:</u> Joost Schipper (heavyjoost@users.sourceforge.net) and Peter Koeleman (peter@peerweb.nl)<br>\
           - <u>Finnish:</u> Niklas Laxström (nikerabbit@users.sourceforge.net)<br>\
           - <u>German:</u> Niels Hoffmann (zentralmaschine@users.sourceforge.net)<br>\
           - <u>Greek:</u> Tsvetan Bankov (emerge_life@users.sourceforge.net)<br>\
-          - <u>Hungarian:</u> Majoros Péter (majoros.j.p@t-online.hu)<br>\
+          - <u>Hungarian:</u> Majoros Péter (majoros.peterj@gmail.com)<br>\
           - <u>Italian:</u> Mirko Ferrari (mirkoferrari@gmail.com) and Ferraro Luciano (luciano.ferraro@gmail.com)<br>\
           - <u>Japanese:</u> Nardog (nardog@e2umail.com)<br>\
           - <u>Korean:</u> Jin Woo Sin (jin828sin@users.sourceforge.net)<br>\
@@ -70,9 +70,9 @@ class about : public QDialog, private Ui::AboutDlg{
           - <u>Polish:</u> Jarek Smieja (ajep9691@wp.pl)<br>\
           - <u>Portuguese:</u> Nick Marinho (nickmarinho@gmail.com)<br>\
           - <u>Romanian:</u> Obada Denis (obadadenis@users.sourceforge.net)<br>\
-          - <u>Russian:</u> Nick Khazov (m2k3d0n at users.sourceforge.net)<br>\
+          - <u>Russian:</u> Nick Khazov (m2k3d0n@users.sourceforge.net) and Alexey Morsov (samurai@ricom.ru)<br>\
           - <u>Slovak:</u>  helix84<br>\
-          - <u>Spanish:</u> Vicente Raul Plata Fonseca (silverxnt@users.sourceforge.net)<br>\
+          - <u>Spanish:</u> Vicente Raul Plata Fonseca (silverxnt@users.sourceforge.net) and Gabriel de Oliveira (deadloop@hotmail.com)<br>\
           - <u>Swedish:</u> Daniel Nylander (po@danielnylander.se)<br>\
           - <u>Turkish:</u> Erdem Bingöl (erdem84@gmail.com)<br>\
           - <u>Ukrainian:</u> Andrey Shpachenko (masterfix@users.sourceforge.net)<br><br>"));

src/arborescence.h

@@ -234,7 +234,7 @@ class arborescence {
     void addFile(QString path, size_type file_size, int index, float progress=0., int priority=1) {
       Q_ASSERT(root->isDir());
       path = QDir::cleanPath(path);
-      Q_ASSERT(path.startsWith(root->path()));
+      //Q_ASSERT(path.startsWith(root->path()));
       QString relative_path = path.remove(0, root->path().size());
       if(relative_path.at(0) ==QDir::separator())
         relative_path.remove(0, 1);

src/bittorrent.cpp

@@ -23,11 +23,13 @@
 #include <QTime>
 #include <QString>
 #include <QTimer>
+#include <QSettings>
 
 #include "bittorrent.h"
 #include "misc.h"
 #include "downloadThread.h"
 #include "deleteThread.h"
+#include "filterParserThread.h"
 
 #include <libtorrent/extensions/metadata_transfer.hpp>
 #include <libtorrent/extensions/ut_pex.hpp>
@@ -41,11 +43,17 @@
 #define MAX_TRACKER_ERRORS 2
 
 // Main constructor
-bittorrent::bittorrent() : timerScan(0), DHTEnabled(false), preAllocateAll(false), addInPause(false), maxConnecsPerTorrent(500), maxUploadsPerTorrent(4), max_ratio(-1), UPnPEnabled(false), NATPMPEnabled(false), LSDEnabled(false) {
+bittorrent::bittorrent() : timerScan(0), DHTEnabled(false), preAllocateAll(false), addInPause(false), maxConnecsPerTorrent(500), maxUploadsPerTorrent(4), max_ratio(-1), UPnPEnabled(false), NATPMPEnabled(false), LSDEnabled(false), folderScanInterval(5), queueingEnabled(false), calculateETA(true) {
   // To avoid some exceptions
   fs::path::default_name_check(fs::no_check);
   // Creating bittorrent session
-  s = new session(fingerprint("qB", VERSION_MAJOR, VERSION_MINOR, VERSION_BUGFIX, 0));
+  // Check if we should spoof azureus
+  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+  if(settings.value(QString::fromUtf8("AzureusSpoof"), false).toBool()) {
+    s = new session(fingerprint("AZ", 3, 0, 5, 2));
+  } else {
+    s = new session(fingerprint("qB", VERSION_MAJOR, VERSION_MINOR, VERSION_BUGFIX, 0));
+  }
   // Set severity level of libtorrent session
   s->set_severity_level(alert::info);
   // Enabling metadata plugin
@@ -62,12 +70,27 @@ bittorrent::bittorrent() : timerScan(0), DHTEnabled(false), preAllocateAll(false
   connect(downloader, SIGNAL(downloadFailure(QString, QString)), this, SLOT(handleDownloadFailure(QString, QString)));
   // File deleter (thread)
   deleter = new deleteThread(this);
-  BigRatioTimer = 0;  
+  BigRatioTimer = 0;
+  filterParser = 0;
+  downloadQueue = 0;
+  queuedDownloads = 0;
+  uploadQueue = 0;
+  queuedUploads = 0;
   qDebug("* BTSession constructed");
 }
 
 // Main destructor
 bittorrent::~bittorrent() {
+  qDebug("BTSession deletion");
+  // Set Session settings
+  session_settings ss;
+  ss.tracker_receive_timeout = 1;
+  ss.stop_tracker_timeout = 1;
+  ss.tracker_completion_timeout = 1;
+  ss.piece_timeout = 1;
+  ss.peer_timeout = 1;
+  ss.urlseed_timeout = 1;
+  s->set_settings(ss);
   // Disable directory scanning
   disableDirectoryScanning();
   // Delete our objects
@@ -76,9 +99,23 @@ bittorrent::~bittorrent() {
   delete timerAlerts;
   if(BigRatioTimer != 0)
     delete BigRatioTimer;
+  if(filterParser != 0)
+    delete filterParser;
   delete downloader;
+  if(queueingEnabled) {
+    Q_ASSERT(downloadQueue);
+    delete downloadQueue;
+    Q_ASSERT(queuedDownloads);
+    delete queuedDownloads;
+    Q_ASSERT(uploadQueue);
+    delete uploadQueue;
+    Q_ASSERT(queuedUploads);
+    delete queuedUploads;
+  }
   // Delete BT session
+  qDebug("Deleting session");
   delete s;
+  qDebug("Session deleted");
 }
 
 void bittorrent::preAllocateAllFiles(bool b) {
@@ -112,7 +149,25 @@ void bittorrent::deleteBigRatios() {
     if(getRealRatio(hash) > max_ratio) {
       QString fileName = h.name();
       deleteTorrent(hash);
-      emit torrent_deleted(hash, fileName, true);
+      emit torrent_ratio_deleted(fileName);
+    }
+  }
+}
+
+void bittorrent::setETACalculation(bool enable) {
+  if(calculateETA != enable) {
+    calculateETA = enable;
+    if(calculateETA) {
+      foreach(QString hash, unfinishedTorrents) {
+        QTorrentHandle h = getTorrentHandle(hash);
+        if(!h.is_paused()) {
+          TorrentsStartData[hash] = h.total_payload_download();
+          TorrentsStartTime[hash] = QDateTime::currentDateTime();
+        }
+      }
+    } else {
+      TorrentsStartData.clear();
+      TorrentsStartTime.clear();
     }
   }
 }
@@ -124,6 +179,115 @@ void bittorrent::setDownloadLimit(QString hash, long val) {
   saveTorrentSpeedLimits(hash);
 }
 
+bool bittorrent::isQueueingEnabled() const {
+  return queueingEnabled;
+}
+
+void bittorrent::setMaxActiveDownloads(int val) {
+  if(val != maxActiveDownloads) {
+    maxActiveDownloads = val;
+    if(queueingEnabled) {
+      updateDownloadQueue();
+      updateUploadQueue();
+    }
+  }
+}
+
+void bittorrent::setMaxActiveTorrents(int val) {
+  if(val != maxActiveTorrents) {
+    maxActiveTorrents = val;
+    if(queueingEnabled) {
+      updateDownloadQueue();
+      updateUploadQueue();
+    }
+  }
+}
+
+void bittorrent::increaseDlTorrentPriority(QString hash) {
+  Q_ASSERT(queueingEnabled);
+  int index = downloadQueue->indexOf(hash);
+  Q_ASSERT(index != -1);
+  if(index > 0) {
+    downloadQueue->swap(index-1, index);
+    saveTorrentPriority(hash, index-1);
+    saveTorrentPriority(downloadQueue->at(index), index);
+    updateDownloadQueue();
+  }
+}
+
+void bittorrent::increaseUpTorrentPriority(QString hash) {
+  Q_ASSERT(queueingEnabled);
+  int index = uploadQueue->indexOf(hash);
+  Q_ASSERT(index != -1);
+  if(index > 0) {
+    uploadQueue->swap(index-1, index);
+    saveTorrentPriority(hash, index-1);
+    saveTorrentPriority(uploadQueue->at(index), index);
+    updateUploadQueue();
+  }
+}
+
+void bittorrent::decreaseDlTorrentPriority(QString hash) {
+  Q_ASSERT(queueingEnabled);
+  int index = downloadQueue->indexOf(hash);
+  Q_ASSERT(index != -1);
+  if(index >= 0 && index < (downloadQueue->size()-1)) {
+    downloadQueue->swap(index+1, index);
+    saveTorrentPriority(hash, index+1);
+    saveTorrentPriority(downloadQueue->at(index), index);
+    updateDownloadQueue();
+  }
+}
+
+void bittorrent::decreaseUpTorrentPriority(QString hash) {
+  Q_ASSERT(queueingEnabled);
+  int index = uploadQueue->indexOf(hash);
+  Q_ASSERT(index != -1);
+  if(index >= 0 && index < (uploadQueue->size()-1)) {
+    uploadQueue->swap(index+1, index);
+    saveTorrentPriority(hash, index+1);
+    saveTorrentPriority(uploadQueue->at(index), index);
+    updateUploadQueue();
+  }
+}
+
+void bittorrent::saveTorrentPriority(QString hash, int prio) {
+  // Write .queued file
+  QFile prio_file(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".prio");
+  prio_file.open(QIODevice::WriteOnly | QIODevice::Text);
+  prio_file.write(QByteArray::number(prio));
+  prio_file.close();
+}
+
+int bittorrent::loadTorrentPriority(QString hash) {
+  if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".prio")) {
+    // Read .queued file
+    QFile prio_file(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".prio");
+    if(!prio_file.exists()) {
+      return -1;
+    }
+    prio_file.open(QIODevice::ReadOnly | QIODevice::Text);
+    bool ok = false;
+    int prio = prio_file.readAll().toInt(&ok);
+    prio_file.close();
+    if(!ok) {
+      return -1;
+    }
+    return prio;
+  }
+  return -1;
+}
+
+bool bittorrent::isDownloadQueued(QString hash) const {
+  Q_ASSERT(queueingEnabled);
+  return queuedDownloads->contains(hash);
+}
+
+bool bittorrent::isUploadQueued(QString hash) const {
+  Q_ASSERT(queueingEnabled);
+  return queuedUploads->contains(hash);
+}
+
 void bittorrent::setUploadLimit(QString hash, long val) {
   qDebug("Set upload limit rate to %ld", val);
   QTorrentHandle h = getTorrentHandle(hash);
@@ -132,6 +296,14 @@ void bittorrent::setUploadLimit(QString hash, long val) {
   saveTorrentSpeedLimits(hash);
 }
 
+int bittorrent::getMaximumActiveDownloads() const {
+  return maxActiveDownloads;
+}
+
+int bittorrent::getMaximumActiveTorrents() const {
+  return maxActiveTorrents;
+}
+
 void bittorrent::handleDownloadFailure(QString url, QString reason) {
   emit downloadFromUrlFailure(url, reason);
 }
@@ -140,9 +312,226 @@ void bittorrent::startTorrentsInPause(bool b) {
   addInPause = b;
 }
 
+void bittorrent::setQueueingEnabled(bool enable) {
+  if(queueingEnabled != enable) {
+    queueingEnabled = enable;
+    if(enable) {
+      // Load priorities
+      QList<QPair<int, QString> > tmp_list;
+      QStringList noprio;
+      QStringList unfinished = getUnfinishedTorrents();
+      foreach(QString hash, unfinished) {
+        int prio = loadTorrentPriority(hash);
+        if(prio != -1) {
+          misc::insertSort2<QString>(tmp_list, QPair<int,QString>(prio,hash), Qt::AscendingOrder);
+        } else {
+          noprio << hash;
+        }
+      }
+      downloadQueue = new QStringList();
+      QPair<int,QString> couple;
+      foreach(couple, tmp_list) {
+        downloadQueue->append(couple.second);
+      }
+      (*downloadQueue)<<noprio;
+      // save priorities
+      int i=0;
+      foreach(QString hash, *downloadQueue) {
+        saveTorrentPriority(hash, i);
+        ++i;
+      }
+      queuedDownloads = new QStringList();
+      updateDownloadQueue();
+      QList<QPair<int, QString> > tmp_list2;
+      QStringList noprio2;
+      QStringList finished = getFinishedTorrents();
+      foreach(QString hash, finished) {
+        int prio = loadTorrentPriority(hash);
+        if(prio != -1) {
+          misc::insertSort2<QString>(tmp_list2, QPair<int,QString>(prio,hash), Qt::AscendingOrder);
+        } else {
+          noprio2 << hash;
+        }
+      }
+      uploadQueue = new QStringList();
+      QPair<int,QString> couple2;
+      foreach(couple2, tmp_list2) {
+        uploadQueue->append(couple2.second);
+      }
+      (*uploadQueue)<<noprio;
+      // save priorities
+      int j=0;
+      foreach(QString hash, *uploadQueue) {
+        saveTorrentPriority(hash, j);
+        ++j;
+      }
+      queuedUploads = new QStringList();
+      updateUploadQueue();
+    } else {
+      // Unqueue torrents
+      foreach(QString hash, *queuedDownloads) {
+        QTorrentHandle h = getTorrentHandle(hash);
+        h.resume();
+        if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued")) {
+          QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued");
+        }
+        if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".prio")) {
+          QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".prio");
+        }
+      }
+      foreach(QString hash, *queuedUploads) {
+        QTorrentHandle h = getTorrentHandle(hash);
+        h.resume();
+        if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued")) {
+          QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued");
+        }
+        if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".prio")) {
+          QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".prio");
+        }
+      }
+      delete downloadQueue;
+      downloadQueue = 0;
+      delete queuedDownloads;
+      queuedDownloads = 0;
+      delete uploadQueue;
+      uploadQueue = 0;
+      delete queuedUploads;
+      queuedUploads = 0;
+    }
+  }
+}
+
+int bittorrent::getDlTorrentPriority(QString hash) const {
+  Q_ASSERT(downloadQueue != 0);
+  return downloadQueue->indexOf(hash);
+}
+
+int bittorrent::getUpTorrentPriority(QString hash) const {
+  Q_ASSERT(uploadQueue != 0);
+  return uploadQueue->indexOf(hash);
+}
+
+void bittorrent::updateUploadQueue() {
+  Q_ASSERT(queueingEnabled);
+  bool change = false;
+  int maxActiveUploads = maxActiveTorrents - currentActiveDownloads;
+  int currentActiveUploads = 0;
+  // Check if it is necessary to queue uploads
+  foreach(QString hash, *uploadQueue) {
+    QTorrentHandle h = getTorrentHandle(hash);
+    if(!h.is_paused()) {
+      if(currentActiveUploads < maxActiveUploads) {
+        ++currentActiveUploads;
+      } else {
+        // Queue it
+        h.pause();
+        change = true;
+        if(!queuedUploads->contains(hash)) {
+          queuedUploads->append(hash);
+          // Create .queued file
+          if(!QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued")) {
+            QFile queued_file(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued");
+            queued_file.open(QIODevice::WriteOnly | QIODevice::Text);
+            queued_file.close();
+          }
+        }
+      }
+    } else {
+      if(currentActiveUploads < maxActiveUploads && isUploadQueued(hash)) {
+        QTorrentHandle h = getTorrentHandle(hash);
+        h.resume();
+        change = true;
+        queuedUploads->removeAll(hash);
+        QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued");
+        ++currentActiveUploads;
+      }
+    }
+  }
+  if(currentActiveUploads < maxActiveUploads) {
+    // Could not fill download slots, unqueue torrents
+    foreach(QString hash, *uploadQueue) {
+      if(uploadQueue->size() != 0 && currentActiveUploads < maxActiveUploads) {
+        if(queuedUploads->contains(hash)) {
+          QTorrentHandle h = getTorrentHandle(hash);
+          h.resume();
+          change = true;
+          queuedUploads->removeAll(hash);
+          QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued");
+          ++currentActiveUploads;
+        }
+      } else {
+        break;
+      }
+    }
+  }
+  if(change) {
+    emit updateFinishedTorrentNumber();
+    emit forceFinishedListUpdate();
+  }
+}
+
+void bittorrent::updateDownloadQueue() {
+  Q_ASSERT(queueingEnabled);
+  bool change = false;
+  currentActiveDownloads = 0;
+  // Check if it is necessary to queue torrents
+  foreach(QString hash, *downloadQueue) {
+    QTorrentHandle h = getTorrentHandle(hash);
+    if(!h.is_paused()) {
+      if(currentActiveDownloads < maxActiveDownloads) {
+        ++currentActiveDownloads;
+      } else {
+        // Queue it
+        h.pause();
+        change = true;
+        if(!queuedDownloads->contains(hash)) {
+          queuedDownloads->append(hash);
+          // Create .queued file
+          if(!QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued")) {
+            QFile queued_file(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued");
+            queued_file.open(QIODevice::WriteOnly | QIODevice::Text);
+            queued_file.close();
+          }
+        }
+      }
+    } else {
+      if(currentActiveDownloads < maxActiveDownloads && isDownloadQueued(hash)) {
+        QTorrentHandle h = getTorrentHandle(hash);
+        h.resume();
+        change = true;
+        queuedDownloads->removeAll(hash);
+        QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued");
+        ++currentActiveDownloads;
+      }
+    }
+  }
+  if(currentActiveDownloads < maxActiveDownloads) {
+    // Could not fill download slots, unqueue torrents
+    foreach(QString hash, *downloadQueue) {
+      if(downloadQueue->size() != 0 && currentActiveDownloads < maxActiveDownloads) {
+        if(queuedDownloads->contains(hash)) {
+          QTorrentHandle h = getTorrentHandle(hash);
+          h.resume();
+          change = true;
+          queuedDownloads->removeAll(hash);
+          QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued");
+          ++currentActiveDownloads;
+        }
+      } else {
+        break;
+      }
+    }
+  }
+  if(change) {
+    emit updateUnfinishedTorrentNumber();
+    emit forceUnfinishedListUpdate();
+  }
+}
+
 // Calculate the ETA using GASA
 // GASA: global Average Speed Algorithm
 qlonglong bittorrent::getETA(QString hash) const {
+  Q_ASSERT(calculateETA);
   QTorrentHandle h = getTorrentHandle(hash);
   if(!h.is_valid()) return -1;
   switch(h.state()) {
@@ -188,6 +577,26 @@ bool bittorrent::isPaused(QString hash) const{
   return h.is_paused();
 }
 
+unsigned int bittorrent::getFinishedPausedTorrentsNb() const {
+  unsigned int nbPaused = 0;
+  foreach(QString hash, finishedTorrents) {
+    if(isPaused(hash)) {
+      ++nbPaused;
+    }
+  }
+  return nbPaused;
+}
+
+unsigned int bittorrent::getUnfinishedPausedTorrentsNb() const {
+  unsigned int nbPaused = 0;
+  foreach(QString hash, unfinishedTorrents) {
+    if(isPaused(hash)) {
+      ++nbPaused;
+    }
+  }
+  return nbPaused;
+}
+
 // Delete a torrent from the session, given its hash
 // permanent = true means that the torrent will be removed from the hard-drive too
 void bittorrent::deleteTorrent(QString hash, bool permanent) {
@@ -215,8 +624,10 @@ void bittorrent::deleteTorrent(QString hash, bool permanent) {
     torrentBackup.remove(file);
   }
   // Remove it from TorrentsStartTime hash table
-  TorrentsStartTime.remove(hash);
-  TorrentsStartData.remove(hash);
+  if(calculateETA) {
+    TorrentsStartTime.remove(hash);
+    TorrentsStartData.remove(hash);
+  }
   // Remove tracker errors
   trackersErrors.remove(hash);
   // Remove it from ratio table
@@ -232,12 +643,30 @@ void bittorrent::deleteTorrent(QString hash, bool permanent) {
       std::cerr << "Error: Torrent " << hash.toStdString() << " is neither in finished or unfinished list\n";
     }
   }
+  // Remove it from downloadQueue or UploadQueue
+  if(queueingEnabled) {
+    if(downloadQueue->contains(hash)) {
+      downloadQueue->removeAll(hash);
+      queuedDownloads->removeAll(hash);
+      updateDownloadQueue();
+    }
+    if(uploadQueue->contains(hash)) {
+      uploadQueue->removeAll(hash);
+      queuedUploads->removeAll(hash);
+      updateUploadQueue();
+    }
+  }
+  if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".prio"))
+    QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".prio");
+  if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued"))
+    QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued");
   if(permanent && files_arb != 0) {
     // Remove from Hard drive
     qDebug("Removing this on hard drive: %s", qPrintable(savePath+QDir::separator()+fileName));
     // Deleting in a thread to avoid GUI freeze
     deleter->deleteTorrent(savePath, files_arb);
   }
+  emit deletedTorrent(hash);
 }
 
 // Return a list of hashes for the finished torrents
@@ -265,8 +694,28 @@ void bittorrent::setUnfinishedTorrent(QString hash) {
   if(!unfinishedTorrents.contains(hash)) {
     unfinishedTorrents << hash;
     QTorrentHandle h = getTorrentHandle(hash);
-    TorrentsStartData[hash] = h.total_payload_download();
-    TorrentsStartTime[hash] = QDateTime::currentDateTime();
+    if(calculateETA) {
+      TorrentsStartData[hash] = h.total_payload_download();
+      TorrentsStartTime[hash] = QDateTime::currentDateTime();
+    }
+  }
+  if(queueingEnabled) {
+    // Remove it from uploadQueue
+    if(uploadQueue->contains(hash)) {
+      uploadQueue->removeAll(hash);
+      queuedDownloads->removeAll(hash);
+      if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".prio"))
+        QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".prio");
+      if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued"))
+        QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued");
+      updateUploadQueue();
+    }
+    // Add it to downloadQueue
+    if(!downloadQueue->contains(hash)) {
+      downloadQueue->append(hash);
+      saveTorrentPriority(hash, downloadQueue->size()-1);
+      updateDownloadQueue();
+    }
   }
 }
 
@@ -285,8 +734,24 @@ void bittorrent::setFinishedTorrent(QString hash) {
     unfinishedTorrents.removeAt(index);
   }
   // Remove it from TorrentsStartTime hash table
-  TorrentsStartTime.remove(hash);
-  TorrentsStartData.remove(hash);
+  if(calculateETA) {
+    TorrentsStartTime.remove(hash);
+    TorrentsStartData.remove(hash);
+  }
+  // Remove it from  
+  if(queueingEnabled) {
+    downloadQueue->removeAll(hash);
+    queuedDownloads->removeAll(hash);
+    if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".prio"))
+      QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".prio");
+    if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued"))
+      QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued");
+    updateDownloadQueue();
+    if(!uploadQueue->contains(hash)) {
+      uploadQueue->append(hash);
+      updateUploadQueue();
+    }
+  }
   // Save fast resume data
   saveFastResumeAndRatioData(hash);
 }
@@ -300,12 +765,30 @@ bool bittorrent::pauseTorrent(QString hash) {
     change = true;
     // Save fast resume data
     saveFastResumeAndRatioData(hash);
+    if(queueingEnabled) {
+      updateDownloadQueue();
+      updateUploadQueue();
+    }
     qDebug("Torrent paused successfully");
+    emit pausedTorrent(hash);
   }else{
     if(!h.is_valid()) {
       qDebug("Could not pause torrent %s, reason: invalid", hash.toUtf8().data());
     }else{
-      qDebug("Could not pause torrent %s, reason: already paused", hash.toUtf8().data());
+      if(queueingEnabled && (isDownloadQueued(hash)||isUploadQueued(hash))) {
+        // Remove it from queued list if present
+        if(queuedDownloads->contains(hash))
+          queuedDownloads->removeAll(hash);
+        if(queuedUploads->contains(hash))
+          queuedUploads->removeAll(hash);
+        if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued"))
+          QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued");
+        updateDownloadQueue();
+        updateUploadQueue();
+        change = true;
+      } else {
+        qDebug("Could not pause torrent %s, reason: already paused", hash.toUtf8().data());
+      }
     }
   }
   // Create .paused file if necessary
@@ -315,8 +798,10 @@ bool bittorrent::pauseTorrent(QString hash) {
     paused_file.close();
   }
   // Remove it from TorrentsStartTime hash table
-  TorrentsStartTime.remove(hash);
-  TorrentsStartData.remove(hash);
+  if(calculateETA) {
+    TorrentsStartTime.remove(hash);
+    TorrentsStartData.remove(hash);
+  }
   return change;
 }
 
@@ -325,11 +810,16 @@ bool bittorrent::resumeTorrent(QString hash) {
   bool success = false;
   QTorrentHandle h = getTorrentHandle(hash);
   if(h.is_valid() && h.is_paused()) {
-    // Save Addition DateTime
-    TorrentsStartData[hash] = h.total_payload_download();
-    TorrentsStartTime[hash] = QDateTime::currentDateTime();
-    h.resume();
-    success = true;
+    if(!(queueingEnabled && (isDownloadQueued(hash)||isUploadQueued(hash)))) {
+      // Save Addition DateTime
+      if(calculateETA) {
+        TorrentsStartData[hash] = h.total_payload_download();
+        TorrentsStartTime[hash] = QDateTime::currentDateTime();
+      }
+      h.resume();
+      success = true;
+      emit resumedTorrent(hash);
+    }
   }
   // Delete .paused file
   if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".paused"))
@@ -339,9 +829,25 @@ bool bittorrent::resumeTorrent(QString hash) {
     torrentsToPauseAfterChecking.removeAt(index);
     success = true;
   }
+  if(queueingEnabled) {
+    updateDownloadQueue();
+    updateUploadQueue();
+  }
   return success;
 }
 
+void bittorrent::pauseAllTorrents() {
+  QStringList list = getUnfinishedTorrents() + getFinishedTorrents();
+  foreach(QString hash, list)
+    pauseTorrent(hash);
+}
+
+void bittorrent::resumeAllTorrents() {
+  QStringList list = getUnfinishedTorrents() + getFinishedTorrents();
+  foreach(QString hash, list)
+    resumeTorrent(hash);
+}
+
 void bittorrent::loadWebSeeds(QString hash) {
   QFile urlseeds_file(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".urlseeds");
   if(!urlseeds_file.open(QIODevice::ReadOnly | QIODevice::Text)) return;
@@ -499,8 +1005,19 @@ void bittorrent::addTorrent(QString path, bool fromScanDir, QString from_url, bo
     h.resume();
     if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".finished")) {
       finishedTorrents << hash;
+      if(queueingEnabled) {
+        uploadQueue->append(hash);
+        saveTorrentPriority(hash, uploadQueue->size()-1);
+        updateUploadQueue();
+      }
     }else{
       unfinishedTorrents << hash;
+      // Add it to downloadQueue
+      if(queueingEnabled) {
+        downloadQueue->append(hash);
+        saveTorrentPriority(hash, downloadQueue->size()-1);
+        updateDownloadQueue();
+      }
     }
     // If download from url, remove temp file
     if(!from_url.isNull()) QFile::remove(file);
@@ -687,12 +1204,12 @@ bool bittorrent::enableDHT(bool b) {
         dht_state = bdecode(std::istream_iterator<char>(dht_state_file), std::istream_iterator<char>());
       }catch (std::exception&) {}
       try {
-	s->start_dht(dht_state);
-	s->add_dht_router(std::make_pair(std::string("router.bittorrent.com"), 6881));
-	s->add_dht_router(std::make_pair(std::string("router.utorrent.com"), 6881));
-	s->add_dht_router(std::make_pair(std::string("router.bitcomet.com"), 6881));
-	DHTEnabled = true;
-	qDebug("DHT enabled");
+  s->start_dht(dht_state);
+  s->add_dht_router(std::make_pair(std::string("router.bittorrent.com"), 6881));
+  s->add_dht_router(std::make_pair(std::string("router.utorrent.com"), 6881));
+  s->add_dht_router(std::make_pair(std::string("router.bitcomet.com"), 6881));
+  DHTEnabled = true;
+  qDebug("DHT enabled");
        }catch(std::exception e) {
          qDebug("Could not enable DHT, reason: %s", e.what());
           return false;
@@ -947,13 +1464,22 @@ void bittorrent::setDefaultSavePath(QString savepath) {
   defaultSavePath = savepath;
 }
 
+void bittorrent::setTimerScanInterval(int secs) {
+  if(folderScanInterval != secs) {
+    folderScanInterval = secs;
+    if(!scan_dir.isNull()) {
+      timerScan->start(folderScanInterval*1000);
+    }
+  }
+}
+
 // Enable directory scanning
 void bittorrent::enableDirectoryScanning(QString _scan_dir) {
   if(!_scan_dir.isEmpty()) {
     scan_dir = _scan_dir;
     timerScan = new QTimer(this);
     connect(timerScan, SIGNAL(timeout()), this, SLOT(scanDirectory()));
-    timerScan->start(5000);
+    timerScan->start(folderScanInterval*1000);
   }
 }
 
@@ -1053,6 +1579,7 @@ bool bittorrent::loadTrackerFile(QString hash) {
   if(trackers.size() != 0) {
     QTorrentHandle h = getTorrentHandle(hash);
     h.replace_trackers(trackers);
+    h.force_reannounce();
     return true;
   }else{
     return false;
@@ -1092,15 +1619,25 @@ void bittorrent::setDHTPort(int dht_port) {
 }
 
 // Enable IP Filtering
-void bittorrent::enableIPFilter(ip_filter filter) {
+void bittorrent::enableIPFilter(QString filter) {
   qDebug("Enabling IPFiler");
-  s->set_ip_filter(filter);
+  if(!filterParser) {
+    filterParser = new FilterParserThread(this, s);
+  }
+  if(filterPath.isEmpty() || filterPath != filter) {
+    filterPath = filter;
+    filterParser->processFilterFile(filter);
+  }
 }
 
 // Disable IP Filtering
 void bittorrent::disableIPFilter() {
   qDebug("Disabling IPFilter");
   s->set_ip_filter(ip_filter());
+  if(filterParser) {
+    delete filterParser;
+  }
+  filterPath = "";
 }
 
 // Set BT session settings (user_agent)
@@ -1151,18 +1688,37 @@ void bittorrent::readAlerts() {
       // Level: fatal
       QTorrentHandle h(p->handle);
       if(h.is_valid()){
-        QString hash = h.hash();
-        QList<QPair<QString, QString> > errors = trackersErrors.value(hash, QList<QPair<QString, QString> >());
-        if(errors.size() > MAX_TRACKER_ERRORS)
-          errors.removeAt(0);
-        errors << QPair<QString,QString>(QTime::currentTime().toString("hh:mm:ss"), QString::fromUtf8(a->msg().c_str()));
-        trackersErrors[hash] = errors;
         // Authentication
-        if(p->status_code == 401) {
+        if(p->status_code != 401) {
+          QString hash = h.hash();
+          qDebug("Received a tracker error for %s", p->url.c_str());
+          QHash<QString, QString> errors = trackersErrors.value(hash, QHash<QString, QString>());
+          // p->url requires at least libtorrent v0.13.1
+          errors[misc::toQString(p->url)] = QString::fromUtf8(a->msg().c_str());
+          trackersErrors[hash] = errors;
+        } else {
           emit trackerAuthenticationRequired(h);
         }
       }
     }
+    else if (tracker_reply_alert* p = dynamic_cast<tracker_reply_alert*>(a.get())) {
+      QTorrentHandle h(p->handle);
+      if(h.is_valid()){
+        qDebug("Received a tracker reply from %s", (const char*)h.current_tracker().toUtf8());
+        QString hash = h.hash();
+        QHash<QString, QString> errors = trackersErrors.value(hash, QHash<QString, QString>());
+        // p->url requires at least libtorrent v0.13.1
+        errors.remove(h.current_tracker());
+        trackersErrors[hash] = errors;
+      }
+    }
+    else if (portmap_error_alert* p = dynamic_cast<portmap_error_alert*>(a.get())) {
+      emit UPnPError(QString(p->msg().c_str()));
+    }
+    else if (portmap_alert* p = dynamic_cast<portmap_alert*>(a.get())) {
+      qDebug("UPnP Success, msg: %s", p->msg().c_str());
+      emit UPnPSuccess(QString(p->msg().c_str()));
+    }
     else if (peer_blocked_alert* p = dynamic_cast<peer_blocked_alert*>(a.get())) {
       emit peerBlocked(QString::fromUtf8(p->ip.to_string().c_str()));
     }
@@ -1189,8 +1745,10 @@ void bittorrent::readAlerts() {
           qDebug("%s was paused after checking", hash.toUtf8().data());
         } else {
           // Save Addition DateTime
-          TorrentsStartTime[hash] = QDateTime::currentDateTime();
-          TorrentsStartData[hash] = h.total_payload_download();
+          if(calculateETA) {
+            TorrentsStartTime[hash] = QDateTime::currentDateTime();
+            TorrentsStartData[hash] = h.total_payload_download();
+          }
         }
         emit torrentFinishedChecking(hash);
       }
@@ -1199,8 +1757,8 @@ void bittorrent::readAlerts() {
   }
 }
 
-QList<QPair<QString, QString> > bittorrent::getTrackersErrors(QString hash) const{
-  return trackersErrors.value(hash, QList<QPair<QString, QString> >());
+QHash<QString, QString> bittorrent::getTrackersErrors(QString hash) const{
+  return trackersErrors.value(hash, QHash<QString, QString>());
 }
 
 QStringList bittorrent::getTorrentsToPauseAfterChecking() const{
@@ -1292,6 +1850,7 @@ QString bittorrent::getSavePath(QString hash) {
     savePath = QString::fromUtf8(line.data());
   }else{
     // use default save path
+    qDebug("Using default save path because none was set");
     savePath = defaultSavePath;
   }
   // Checking if savePath Dir exists

src/bittorrent.h

@@ -36,6 +36,7 @@ using namespace libtorrent;
 class downloadThread;
 class deleteThread;
 class QTimer;
+class FilterParserThread;
 
 class bittorrent : public QObject{
   Q_OBJECT
@@ -54,7 +55,7 @@ class bittorrent : public QObject{
     QHash<QString, QDateTime> TorrentsStartTime;
     QHash<QString, size_type> TorrentsStartData;
     QHash<QString, QPair<size_type,size_type> > ratioData;
-    QHash<QString, QList<QPair<QString, QString> > > trackersErrors;
+    QHash<QString, QHash<QString, QString> > trackersErrors;
     deleteThread *deleter;
     QStringList finishedTorrents;
     QStringList unfinishedTorrents;
@@ -66,6 +67,18 @@ class bittorrent : public QObject{
     bool UPnPEnabled;
     bool NATPMPEnabled;
     bool LSDEnabled;
+    FilterParserThread *filterParser;
+    QString filterPath;
+    int folderScanInterval; // in seconds
+    bool queueingEnabled;
+    int maxActiveDownloads;
+    int maxActiveTorrents;
+    int currentActiveDownloads;
+    QStringList *downloadQueue;
+    QStringList *queuedDownloads;
+    QStringList *uploadQueue;
+    QStringList *queuedUploads;
+    bool calculateETA;
 
   protected:
     QString getSavePath(QString hash);
@@ -86,11 +99,21 @@ class bittorrent : public QObject{
     qlonglong getETA(QString hash) const;
     float getRealRatio(QString hash) const;
     session* getSession() const;
-    QList<QPair<QString, QString> > getTrackersErrors(QString hash) const;
+    QHash<QString, QString> getTrackersErrors(QString hash) const;
     QStringList getFinishedTorrents() const;
     QStringList getUnfinishedTorrents() const;
     bool isFinished(QString hash) const;
     bool has_filtered_files(QString hash) const;
+    unsigned int getFinishedPausedTorrentsNb() const;
+    unsigned int getUnfinishedPausedTorrentsNb() const;
+    bool isQueueingEnabled() const;
+    int getDlTorrentPriority(QString hash) const;
+    int getUpTorrentPriority(QString hash) const;
+    int getMaximumActiveDownloads() const;
+    int getMaximumActiveTorrents() const;
+    bool isDownloadQueued(QString hash) const;
+    bool isUploadQueued(QString hash) const;
+    int loadTorrentPriority(QString hash);
 
   public slots:
     void addTorrent(QString path, bool fromScanDir = false, QString from_url = QString(), bool resumed = false);
@@ -99,6 +122,8 @@ class bittorrent : public QObject{
     void deleteTorrent(QString hash, bool permanent = false);
     bool pauseTorrent(QString hash);
     bool resumeTorrent(QString hash);
+    void pauseAllTorrents();
+    void resumeAllTorrents();
     void saveDHTEntry();
     void preAllocateAllFiles(bool b);
     void saveFastResumeAndRatioData();
@@ -106,8 +131,9 @@ class bittorrent : public QObject{
     void enableDirectoryScanning(QString scan_dir);
     void disableDirectoryScanning();
     void enablePeerExchange();
-    void enableIPFilter(ip_filter filter);
+    void enableIPFilter(QString filter);
     void disableIPFilter();
+    void setQueueingEnabled(bool enable);
     void resumeUnfinishedTorrents();
     void saveTorrentSpeedLimits(QString hash);
     void loadTorrentSpeedLimits(QString hash);
@@ -115,6 +141,13 @@ class bittorrent : public QObject{
     void loadDownloadUploadForTorrent(QString hash);
     void handleDownloadFailure(QString url, QString reason);
     void loadWebSeeds(QString fileHash);
+    void updateDownloadQueue();
+    void updateUploadQueue();
+    void increaseDlTorrentPriority(QString hash);
+    void decreaseDlTorrentPriority(QString hash);
+    void increaseUpTorrentPriority(QString hash);
+    void decreaseUpTorrentPriority(QString hash);
+    void saveTorrentPriority(QString hash, int prio);
     // Session configuration - Setters
     void setListeningPortsRange(std::pair<unsigned short, unsigned short> ports);
     void setMaxConnections(int maxConnec);
@@ -140,6 +173,10 @@ class bittorrent : public QObject{
     void enableLSD(bool b);
     bool enableDHT(bool b);
     void reloadTorrent(const QTorrentHandle &h, bool full_alloc);
+    void setTimerScanInterval(int secs);
+    void setMaxActiveDownloads(int val);
+    void setMaxActiveTorrents(int val);
+    void setETACalculation(bool enable);
 
   protected slots:
     void scanDirectory();
@@ -153,6 +190,9 @@ class bittorrent : public QObject{
     void invalidTorrent(QString path);
     void duplicateTorrent(QString path);
     void addedTorrent(QString path, QTorrentHandle& h, bool fastResume);
+    void deletedTorrent(QString hash);
+    void pausedTorrent(QString hash);
+    void resumedTorrent(QString hash);
     void finishedTorrent(QTorrentHandle& h);
     void fullDiskError(QTorrentHandle& h);
     void trackerError(QString hash, QString time, QString msg);
@@ -167,7 +207,13 @@ class bittorrent : public QObject{
     void fastResumeDataRejected(QString name);
     void urlSeedProblem(QString url, QString msg);
     void torrentFinishedChecking(QString hash);
-    void torrent_deleted(QString hash, QString fileName, bool finished);
+    void torrent_ratio_deleted(QString fileName);
+    void UPnPError(QString msg);
+    void UPnPSuccess(QString msg);
+    void updateFinishedTorrentNumber();
+    void updateUnfinishedTorrentNumber();
+    void forceUnfinishedListUpdate();
+    void forceFinishedListUpdate();
 };
 
 #endif

src/convertPOtoTS.py

@@ -1,19 +0,0 @@
-#!/usr/bin/python
-
-import os
-
-LANG_FOLDER = "lang/"
-PO_FOLDER = 'po_files'
-
-if __name__ == '__main__':
-  po_files = os.listdir(os.path.join(LANG_FOLDER, PO_FOLDER))
-  po_files = [x for x in po_files if os.path.splitext(x)[-1] == ".po"]
-  for file in po_files:
-    # First clean up the ts file
-    ts_file = os.path.join(LANG_FOLDER, os.path.splitext(file)[0]+'.ts')
-    po_file = os.path.join(LANG_FOLDER, PO_FOLDER, file)
-    if os.path.exists(ts_file):
-      os.remove(ts_file)
-    # Convert to PO
-    print "Converting %s..." % (po_file,)
-    os.system("po2ts %s -o %s" % (po_file, ts_file))

src/convertTStoPO.py

@@ -1,24 +0,0 @@
-#!/usr/bin/python
-
-import os
-
-LANG_FOLDER = 'lang/'
-PO_FOLDER = 'po_files'
-
-if __name__ == '__main__':
-  ts_files = os.listdir(LANG_FOLDER)
-  ts_files = [x for x in ts_files if os.path.splitext(x)[-1] == ".ts"]
-  for file in ts_files:
-    # First clean up the po file
-    po_file = os.path.join(LANG_FOLDER, PO_FOLDER, os.path.splitext(file)[0]+'.po')
-    ts_file = os.path.join(LANG_FOLDER, file)
-    if os.path.exists(po_file):
-      os.remove(po_file)
-    # create po folder if it doesn't exist
-    if not os.path.exists(os.path.join(LANG_FOLDER, PO_FOLDER)):
-      os.mkdir(os.path.join(LANG_FOLDER, PO_FOLDER))
-    # Convert to PO
-    print "Converting %s..." % (ts_file,)
-    os.system("ts2po %s -o %s" % (ts_file, po_file))
-    # Making an archive
-    os.system("tar czf %s %s" % (os.path.join(LANG_FOLDER, PO_FOLDER)+'.tar.gz', os.path.join(LANG_FOLDER, PO_FOLDER)))

src/createtorrent.ui

@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>592</width>
-    <height>590</height>
+    <height>655</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -477,6 +477,20 @@
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="QLabel" name="progressLbl" >
+     <property name="text" >
+      <string>Progress:</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QProgressBar" name="progressBar" >
+     <property name="value" >
+      <number>0</number>
+     </property>
+    </widget>
+   </item>
    <item>
     <layout class="QHBoxLayout" >
      <property name="spacing" >

src/createtorrent_imp.cpp

@@ -44,9 +44,17 @@ using namespace boost::filesystem;
 createtorrent::createtorrent(QWidget *parent): QDialog(parent){
   setupUi(this);
   setAttribute(Qt::WA_DeleteOnClose);
+  creatorThread = new torrentCreatorThread();
+  connect(creatorThread, SIGNAL(creationSuccess(QString)), this, SLOT(handleCreationSucess(QString)));
+  connect(creatorThread, SIGNAL(creationFailure(QString)), this, SLOT(handleCreationFailure(QString)));
+  connect(creatorThread, SIGNAL(updateProgress(int)), this, SLOT(updateProgressBar(int)));
   show();
 }
 
+createtorrent::~createtorrent() {
+  delete creatorThread;
+}
+
 void createtorrent::on_addFolder_button_clicked(){
   QString dir = QFileDialog::getExistingDirectory(this, tr("Select a folder to add to the torrent"), QDir::homePath(), QFileDialog::ShowDirsOnly);
   if(!dir.isEmpty())
@@ -162,26 +170,70 @@ void createtorrent::on_createButton_clicked(){
   } else {
     return;
   }
+  QStringList url_seeds = allItems(URLSeeds_list);
+  QString comment = txt_comment->toPlainText();
+  creatorThread->create(input, destination, trackers, url_seeds, comment, check_private->isChecked(), getPieceSize());
+}
+
+void createtorrent::handleCreationFailure(QString msg) {
+  QMessageBox::information(0, tr("Torrent creation"), tr("Torrent creation was unsuccessful, reason: %1").arg(msg));
+  hide();
+}
+
+void createtorrent::handleCreationSuccess(QString path, const char* branch_path, QString hash) {
+  if(checkStartSeeding->isChecked()) {
+    // Create save path file
+    QFile savepath_file(misc::qBittorrentPath()+QString::fromUtf8("BT_backup")+QDir::separator()+hash+QString::fromUtf8(".savepath"));
+    savepath_file.open(QIODevice::WriteOnly | QIODevice::Text);
+    savepath_file.write(branch_path);
+    savepath_file.close();
+    emit torrent_to_seed(path);
+  }
+  QMessageBox::information(0, tr("Torrent creation"), tr("Torrent was created successfully:")+" "+path);
+  hide();
+}
+
+void createtorrent::updateProgressBar(int progress) {
+  progressBar->setValue(progress);
+}
+
+//
+// Torrent Creator Thread
+//
+
+void torrentCreatorThread::create(QString _input_path, QString _save_path, QStringList _trackers, QStringList _url_seeds, QString _comment, bool _is_private, int _piece_size) {
+  input_path = _input_path;
+  save_path = _save_path;
+  trackers = _trackers;
+  url_seeds = _url_seeds;
+  comment = _comment;
+  is_private = _is_private;
+  piece_size = _piece_size;
+  abort = false;
+  start();
+}
+
+void torrentCreatorThread::run() {
+  emit updateProgress(0);
   char const* creator_str = "qBittorrent "VERSION;
   try {
     boost::intrusive_ptr<torrent_info> t(new torrent_info);
-    ofstream out(complete(path((const char*)destination.toUtf8())), std::ios_base::binary);
+    ofstream out(complete(path((const char*)save_path.toUtf8())), std::ios_base::binary);
     // Adding files to the torrent
-    path full_path = complete(path(input.toUtf8().data()));
+    path full_path = complete(path(input_path.toUtf8().data()));
     add_files(*t, full_path.branch_path(), full_path.leaf());
+    if(abort) return;
     // Set piece size
-    int piece_size = getPieceSize();
     t->set_piece_size(piece_size);
     // Add url seeds
-    QStringList urlSeeds = allItems(URLSeeds_list);
     QString seed;
-    foreach(seed, urlSeeds){
+    foreach(seed, url_seeds){
       t->add_url_seed(seed.toUtf8().data());
     }
     for(int i=0; i<trackers.size(); ++i){
       t->add_tracker(trackers.at(i).toUtf8().data());
     }
-
+    if(abort) return;
     // calculate the hash for all pieces
     file_pool fp;
     boost::scoped_ptr<storage_interface> st(default_storage_constructor(t, full_path.branch_path(), fp));
@@ -191,34 +243,26 @@ void createtorrent::on_createButton_clicked(){
       st->read(&buf[0], i, 0, t->piece_size(i));
       hasher h(&buf[0], t->piece_size(i));
       t->set_hash(i, h.final());
+      emit updateProgress((int)(i*100./(float)num));
+      if(abort) return;
     }
     // Set qBittorrent as creator and add user comment to
     // torrent_info structure
     t->set_creator(creator_str);
-    t->set_comment((const char*)txt_comment->toPlainText().toUtf8());
+    t->set_comment((const char*)comment.toUtf8());
     // Is private ?
-    if(check_private->isChecked()){
+    if(is_private){
       t->set_priv(true);
     }
+    if(abort) return;
     // create the torrent and print it to out
     entry e = t->create_torrent();
     libtorrent::bencode(std::ostream_iterator<char>(out), e);
     out.flush();
-    if(checkStartSeeding->isChecked()) {
-      // Create save path file
-      QFile savepath_file(misc::qBittorrentPath()+QString::fromUtf8("BT_backup")+QDir::separator()+misc::toQString(t->info_hash())+QString::fromUtf8(".savepath"));
-      savepath_file.open(QIODevice::WriteOnly | QIODevice::Text);
-      savepath_file.write(full_path.branch_path().string().c_str());
-      savepath_file.close();
-      emit torrent_to_seed(destination);
-    }
+    emit updateProgress(100);
+    emit creationSuccess(save_path, full_path.branch_path().string().c_str(), misc::toQString(t->info_hash()));
   }
   catch (std::exception& e){
-    std::cerr << e.what() << "\n";
-    QMessageBox::information(0, tr("Torrent creation"), tr("Torrent creation was unsuccessful, reason: %1").arg(QString::fromUtf8(e.what())));
-    hide();
-    return;
+    emit creationFailure(QString::fromUtf8(e.what()));
   }
-  hide();
-  QMessageBox::information(0, tr("Torrent creation"), tr("Torrent was created successfully:")+" "+destination);
 }

src/createtorrent_imp.h

@@ -22,13 +22,48 @@
 #ifndef CREATE_TORRENT_IMP_H
 #define CREATE_TORRENT_IMP_H
 
+#include <QThread>
+
 #include "ui_createtorrent.h"
 
+class torrentCreatorThread : public QThread {
+  Q_OBJECT
+  
+  QString input_path;
+  QString save_path;
+  QStringList trackers;
+  QStringList url_seeds;
+  QString comment;
+  bool is_private;
+  int piece_size;
+  bool abort;
+  
+  public:
+    torrentCreatorThread() {}
+    ~torrentCreatorThread() {
+      abort = true;
+      wait();
+    }
+    void create(QString _input_path, QString _save_path, QStringList _trackers, QStringList _url_seeds, QString _comment, bool _is_private, int _piece_size);
+  
+  protected:
+    void run();
+    
+  signals:
+    void creationFailure(QString msg);
+    void creationSuccess(QString path, const char* branch_path, QString hash);
+    void updateProgress(int progress);
+};
+
 class createtorrent : public QDialog, private Ui::createTorrentDialog{
   Q_OBJECT
 
+  private:
+    torrentCreatorThread *creatorThread;
+    
   public:
     createtorrent(QWidget *parent = 0);
+    ~createtorrent();
     QStringList allItems(QListWidget *list);
     int getPieceSize() const;
 
@@ -43,6 +78,9 @@ class createtorrent : public QDialog, private Ui::createTorrentDialog{
     void on_removeTracker_button_clicked();
     void on_addURLSeed_button_clicked();
     void on_removeURLSeed_button_clicked();
+    void handleCreationFailure(QString msg);
+    void handleCreationSuccess(QString path, const char* branch_path, QString hash);
+    void updateProgressBar(int progress);
 };
 
 #endif

src/download.ui

@@ -18,188 +18,18 @@
      <property name="spacing" >
       <number>6</number>
      </property>
-     <property name="margin" >
+     <property name="leftMargin" >
+      <number>0</number>
+     </property>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
       <number>0</number>
      </property>
-     <item>
-      <layout class="QHBoxLayout" >
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <property name="margin" >
-        <number>0</number>
-       </property>
-       <item>
-        <spacer>
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" >
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QLabel" name="lbl_DLSpeed" >
-         <property name="text" >
-          <string>Total DL Speed:</string>
-         </property>
-         <property name="alignment" >
-          <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLCDNumber" name="LCD_DownSpeed" >
-         <property name="autoFillBackground" >
-          <bool>true</bool>
-         </property>
-         <property name="frameShadow" >
-          <enum>QFrame::Raised</enum>
-         </property>
-         <property name="smallDecimalPoint" >
-          <bool>false</bool>
-         </property>
-         <property name="numDigits" >
-          <number>6</number>
-         </property>
-         <property name="segmentStyle" >
-          <enum>QLCDNumber::Flat</enum>
-         </property>
-         <property name="value" stdset="0" >
-          <double>0.000000000000000</double>
-         </property>
-         <property name="intValue" stdset="0" >
-          <number>0</number>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="unitDL" >
-         <property name="text" >
-          <string>KiB/s</string>
-         </property>
-         <property name="alignment" >
-          <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer>
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" >
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QLabel" name="label" >
-         <property name="text" >
-          <string>Session ratio: </string>
-         </property>
-         <property name="alignment" >
-          <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLCDNumber" name="LCD_Ratio" >
-         <property name="autoFillBackground" >
-          <bool>true</bool>
-         </property>
-         <property name="numDigits" >
-          <number>4</number>
-         </property>
-         <property name="segmentStyle" >
-          <enum>QLCDNumber::Flat</enum>
-         </property>
-         <property name="value" stdset="0" >
-          <double>1.000000000000000</double>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="lbl_ratio_icon" >
-         <property name="text" >
-          <string/>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer>
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" >
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QLabel" name="lbl_UPSpeed" >
-         <property name="text" >
-          <string>Total UP Speed:</string>
-         </property>
-         <property name="alignment" >
-          <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLCDNumber" name="LCD_UpSpeed" >
-         <property name="autoFillBackground" >
-          <bool>true</bool>
-         </property>
-         <property name="smallDecimalPoint" >
-          <bool>false</bool>
-         </property>
-         <property name="numDigits" >
-          <number>6</number>
-         </property>
-         <property name="segmentStyle" >
-          <enum>QLCDNumber::Flat</enum>
-         </property>
-         <property name="value" stdset="0" >
-          <double>0.000000000000000</double>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="unitUP" >
-         <property name="text" >
-          <string>KiB/s</string>
-         </property>
-         <property name="alignment" >
-          <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer>
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" >
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </item>
      <item>
       <widget class="QTreeView" name="downloadList" >
        <property name="minimumSize" >
@@ -249,15 +79,22 @@
        <property name="spacing" >
         <number>6</number>
        </property>
-       <property name="margin" >
+       <property name="leftMargin" >
+        <number>9</number>
+       </property>
+       <property name="topMargin" >
+        <number>9</number>
+       </property>
+       <property name="rightMargin" >
+        <number>9</number>
+       </property>
+       <property name="bottomMargin" >
         <number>9</number>
        </property>
        <item>
         <widget class="QTextBrowser" name="infoBar" >
          <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>7</hsizetype>
-           <vsizetype>7</vsizetype>
+          <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -283,7 +120,16 @@
        <property name="spacing" >
         <number>6</number>
        </property>
-       <property name="margin" >
+       <property name="leftMargin" >
+        <number>9</number>
+       </property>
+       <property name="topMargin" >
+        <number>9</number>
+       </property>
+       <property name="rightMargin" >
+        <number>9</number>
+       </property>
+       <property name="bottomMargin" >
         <number>9</number>
        </property>
        <item>
@@ -346,7 +192,86 @@
     <string>Torrent Properties</string>
    </property>
   </action>
+  <action name="actionOpen_destination_folder" >
+   <property name="icon" >
+    <iconset resource="icons.qrc" >:/Icons/folder.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Open destination folder</string>
+   </property>
+  </action>
+  <action name="actionHOSColName" >
+   <property name="text" >
+    <string>Name</string>
+   </property>
+  </action>
+  <action name="actionHOSColSize" >
+   <property name="text" >
+    <string>Size</string>
+   </property>
+  </action>
+  <action name="actionHOSColProgress" >
+   <property name="text" >
+    <string>Progress</string>
+   </property>
+  </action>
+  <action name="actionHOSColDownSpeed" >
+   <property name="text" >
+    <string>DLSpeed</string>
+   </property>
+  </action>
+  <action name="actionHOSColUpSpeed" >
+   <property name="text" >
+    <string>UpSpeed</string>
+   </property>
+  </action>
+  <action name="actionHOSColSeedersLeechers" >
+   <property name="text" >
+    <string>Seeds/Leechs</string>
+   </property>
+  </action>
+  <action name="actionHOSColRatio" >
+   <property name="text" >
+    <string>Ratio</string>
+   </property>
+  </action>
+  <action name="actionHOSColEta" >
+   <property name="text" >
+    <string>ETA</string>
+   </property>
+  </action>
+  <action name="actionBuy_it" >
+   <property name="icon" >
+    <iconset resource="icons.qrc" >:/Icons/money.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Buy it</string>
+   </property>
+  </action>
+  <action name="actionHOSColPriority" >
+   <property name="text" >
+    <string>Priority</string>
+   </property>
+  </action>
+  <action name="actionIncreasePriority" >
+   <property name="icon" >
+    <iconset resource="icons.qrc" >:/Icons/skin/increase.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Increase priority</string>
+   </property>
+  </action>
+  <action name="actionDecreasePriority" >
+   <property name="icon" >
+    <iconset resource="icons.qrc" >:/Icons/skin/decrease.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Decrease priority</string>
+   </property>
+  </action>
  </widget>
- <resources/>
+ <resources>
+  <include location="icons.qrc" />
+ </resources>
  <connections/>
 </ui>

src/downloadThread.cpp

@@ -24,6 +24,8 @@
 #include <QSettings>
 #include <stdio.h>
 
+#define MAX_THREADS 3
+
 // http://curl.rtin.bz/libcurl/c/libcurl-errors.html
 QString subDownloadThread::errorCodeToString(CURLcode status) {
   switch(status){
@@ -113,7 +115,7 @@ void subDownloadThread::run(){
     curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fwrite);
     curl_easy_setopt(curl, CURLOPT_WRITEDATA, f);
     // Verbose
-    // curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
+    //curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
     // No progress info (we don't use it)
     curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1);
     // Redirections
@@ -150,9 +152,7 @@ downloadThread::~downloadThread(){
 
 void downloadThread::downloadUrl(QString url){
   QMutexLocker locker(&mutex);
-  if(downloading_list.contains(url)) return;
-  url_list << url;
-  downloading_list << url;
+  urls_queue.enqueue(url);
   if(!isRunning()){
     start();
   }else{
@@ -165,8 +165,8 @@ void downloadThread::run(){
     if(abort)
       return;
     mutex.lock();
-    if(url_list.size() != 0){
-      QString url = url_list.takeFirst();
+    if(!urls_queue.empty() && subThreads.size() < MAX_THREADS){
+      QString url = urls_queue.dequeue();
       mutex.unlock();
       subDownloadThread *st = new subDownloadThread(0, url);
       subThreads << st;
@@ -187,9 +187,9 @@ void downloadThread::propagateDownloadedFile(subDownloadThread* st, QString url,
   delete st;
   emit downloadFinished(url, path);
   mutex.lock();
-  index = downloading_list.indexOf(url);
-  Q_ASSERT(index != -1);
-  downloading_list.removeAt(index);
+  if(!urls_queue.empty()) {
+    condition.wakeOne();
+  }
   mutex.unlock();
 }
 
@@ -200,8 +200,8 @@ void downloadThread::propagateDownloadFailure(subDownloadThread* st, QString url
   delete st;
   emit downloadFailure(url, reason);
   mutex.lock();
-  index = downloading_list.indexOf(url);
-  Q_ASSERT(index != -1);
-  downloading_list.removeAt(index);
+  if(!urls_queue.empty()) {
+    condition.wakeOne();
+  }
   mutex.unlock();
 }

src/downloadThread.h

@@ -30,6 +30,7 @@
 #include <QWaitCondition>
 #include <QStringList>
 #include <curl/curl.h>
+#include <QQueue>
 
 class subDownloadThread : public QThread {
   Q_OBJECT
@@ -55,8 +56,7 @@ class downloadThread : public QThread {
   Q_OBJECT
 
   private:
-    QStringList url_list;
-    QStringList downloading_list;
+    QQueue<QString> urls_queue;
     QMutex mutex;
     QWaitCondition condition;
     bool abort;

src/downloadingTorrents.cpp

@@ -47,11 +47,9 @@ DownloadingTorrents::DownloadingTorrents(QObject *parent, bittorrent *BTSession)
   actionTorrent_Properties->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/properties.png")));
 //   tabBottom->setTabIcon(0, QIcon(QString::fromUtf8(":/Icons/log.png")));
 //   tabBottom->setTabIcon(1, QIcon(QString::fromUtf8(":/Icons/filter.png")));
-  // Set default ratio
-  lbl_ratio_icon->setPixmap(QPixmap(QString::fromUtf8(":/Icons/stare.png")));
 
   // Set Download list model
-  DLListModel = new QStandardItemModel(0,9);
+  DLListModel = new QStandardItemModel(0,10);
   DLListModel->setHeaderData(NAME, Qt::Horizontal, tr("Name", "i.e: file name"));
   DLListModel->setHeaderData(SIZE, Qt::Horizontal, tr("Size", "i.e: file size"));
   DLListModel->setHeaderData(PROGRESS, Qt::Horizontal, tr("Progress", "i.e: % downloaded"));
@@ -60,11 +58,15 @@ DownloadingTorrents::DownloadingTorrents(QObject *parent, bittorrent *BTSession)
   DLListModel->setHeaderData(SEEDSLEECH, Qt::Horizontal, tr("Seeds/Leechs", "i.e: full/partial sources"));
   DLListModel->setHeaderData(RATIO, Qt::Horizontal, tr("Ratio"));
   DLListModel->setHeaderData(ETA, Qt::Horizontal, tr("ETA", "i.e: Estimated Time of Arrival / Time left"));
+  DLListModel->setHeaderData(PRIORITY, Qt::Horizontal, tr("Priority"));
   downloadList->setModel(DLListModel);
   DLDelegate = new DLListDelegate(downloadList);
   downloadList->setItemDelegate(DLDelegate);
+  // Hide priority column
+  downloadList->hideColumn(PRIORITY);
   // Hide hash column
   downloadList->hideColumn(HASH);
+  loadHiddenColumns();
 
   connect(BTSession, SIGNAL(addedTorrent(QString, QTorrentHandle&, bool)), this, SLOT(torrentAdded(QString, QTorrentHandle&, bool)));
   connect(BTSession, SIGNAL(duplicateTorrent(QString)), this, SLOT(torrentDuplicate(QString)));
@@ -74,6 +76,9 @@ DownloadingTorrents::DownloadingTorrents(QObject *parent, bittorrent *BTSession)
   connect(BTSession, SIGNAL(fastResumeDataRejected(QString)), this, SLOT(addFastResumeRejectedAlert(QString)));
   connect(BTSession, SIGNAL(aboutToDownloadFromUrl(QString)), this, SLOT(displayDownloadingUrlInfos(QString)));
   connect(BTSession, SIGNAL(urlSeedProblem(QString, QString)), this, SLOT(addUrlSeedError(QString, QString)));
+  connect(BTSession, SIGNAL(UPnPError(QString)), this, SLOT(displayUPnPError(QString)));
+  connect(BTSession, SIGNAL(UPnPSuccess(QString)), this, SLOT(displayUPnPSuccess(QString)));
+  connect(BTSession, SIGNAL(forceUnfinishedListUpdate()), this, SLOT(updateDlList()));
 
   // Load last columns width for download list
   if(!loadColWidthDLList()) {
@@ -86,31 +91,55 @@ DownloadingTorrents::DownloadingTorrents(QObject *parent, bittorrent *BTSession)
   connect(downloadList, SIGNAL(doubleClicked(const QModelIndex&)), this, SLOT(notifyTorrentDoubleClicked(const QModelIndex&)));
   connect(downloadList->header(), SIGNAL(sectionPressed(int)), this, SLOT(sortDownloadList(int)));
   connect(downloadList, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayDLListMenu(const QPoint&)));
+  downloadList->header()->setContextMenuPolicy(Qt::CustomContextMenu);
+  connect(downloadList->header(), SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayDLHoSMenu(const QPoint&)));
   connect(infoBar, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayInfoBarMenu(const QPoint&)));
   // Actions
   connect(actionPause, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionPause_triggered()));
   connect(actionStart, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionStart_triggered()));
   connect(actionDelete, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionDelete_triggered()));
+  connect(actionIncreasePriority, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionIncreasePriority_triggered()));
+  connect(actionDecreasePriority, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionDecreasePriority_triggered()));
   connect(actionPreview_file, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionPreview_file_triggered()));
   connect(actionDelete_Permanently, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionDelete_Permanently_triggered()));
+  connect(actionOpen_destination_folder, SIGNAL(triggered()), (GUI*)parent, SLOT(openDestinationFolder()));
   connect(actionTorrent_Properties, SIGNAL(triggered()), this, SLOT(propertiesSelection()));
+  connect(actionBuy_it, SIGNAL(triggered()), (GUI*)parent, SLOT(goBuyPage()));
+
+  connect(actionHOSColName, SIGNAL(triggered()), this, SLOT(hideOrShowColumnName()));
+  connect(actionHOSColSize, SIGNAL(triggered()), this, SLOT(hideOrShowColumnSize()));
+  connect(actionHOSColProgress, SIGNAL(triggered()), this, SLOT(hideOrShowColumnProgress()));
+  connect(actionHOSColDownSpeed, SIGNAL(triggered()), this, SLOT(hideOrShowColumnDownSpeed()));
+  connect(actionHOSColUpSpeed, SIGNAL(triggered()), this, SLOT(hideOrShowColumnUpSpeed()));
+  connect(actionHOSColSeedersLeechers, SIGNAL(triggered()), this, SLOT(hideOrShowColumnSeedersLeechers()));
+  connect(actionHOSColRatio, SIGNAL(triggered()), this, SLOT(hideOrShowColumnRatio()));
+  connect(actionHOSColEta, SIGNAL(triggered()), this, SLOT(hideOrShowColumnEta()));
+  connect(actionHOSColPriority, SIGNAL(triggered()), this, SLOT(hideOrShowColumnPriority()));
+
   // Set info Bar infos
   setInfoBar(tr("qBittorrent %1 started.", "e.g: qBittorrent v0.x started.").arg(QString::fromUtf8(""VERSION)));
-  setInfoBar(tr("Be careful, sharing copyrighted material without permission is against the law."), QString::fromUtf8("red"));
   qDebug("Download tab built");
 }
 
 DownloadingTorrents::~DownloadingTorrents() {
   saveColWidthDLList();
+  saveHiddenColumns();
   delete DLDelegate;
   delete DLListModel;
 }
 
+void DownloadingTorrents::enablePriorityColumn(bool enable) {
+  if(enable) {
+    downloadList->showColumn(PRIORITY);
+  } else {
+    downloadList->hideColumn(PRIORITY);
+  }
+}
 
 void DownloadingTorrents::notifyTorrentDoubleClicked(const QModelIndex& index) {
   unsigned int row = index.row();
   QString hash = getHashFromRow(row);
-  emit torrentDoubleClicked(hash);
+  emit torrentDoubleClicked(hash, false);
 }
 
 void DownloadingTorrents::addLogPeerBlocked(QString ip) {
@@ -130,7 +159,8 @@ unsigned int DownloadingTorrents::getNbTorrentsInList() const {
 // Note: do not actually pause the torrent in BT session
 void DownloadingTorrents::pauseTorrent(QString hash) {
   int row = getRowFromHash(hash);
-  Q_ASSERT(row != -1);
+  if(row == -1)
+    return;
   DLListModel->setData(DLListModel->index(row, DLSPEED), QVariant((double)0.0));
   DLListModel->setData(DLListModel->index(row, UPSPEED), QVariant((double)0.0));
   DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)-1));
@@ -154,11 +184,14 @@ void DownloadingTorrents::setBottomTabEnabled(unsigned int index, bool b){
 
 // Show torrent properties dialog
 void DownloadingTorrents::showProperties(const QModelIndex &index) {
-  int row = index.row();
-  QString hash = DLListModel->data(DLListModel->index(row, HASH)).toString();
+  showPropertiesFromHash(DLListModel->data(DLListModel->index(index.row(), HASH)).toString());
+}
+
+void DownloadingTorrents::showPropertiesFromHash(QString hash) {
   QTorrentHandle h = BTSession->getTorrentHandle(hash);
   properties *prop = new properties(this, BTSession, h);
   connect(prop, SIGNAL(filteredFilesChanged(QString)), this, SLOT(updateFileSizeAndProgress(QString)));
+  connect(prop, SIGNAL(trackersChanged(QString)), BTSession, SLOT(saveTrackerFile(QString)));
   prop->show();
 }
 
@@ -181,6 +214,14 @@ void DownloadingTorrents::deleteTorrent(QString hash) {
   emit unfinishedTorrentsNumberChanged(nbTorrents);
 }
 
+void DownloadingTorrents::displayUPnPError(QString msg) {
+  setInfoBar(tr("UPnP/NAT-PMP: Port mapping failure, message: %1").arg(msg), QColor("red"));
+}
+
+void DownloadingTorrents::displayUPnPSuccess(QString msg) {
+  DownloadingTorrents::setInfoBar(tr("UPnP/NAT-PMP: Port mapping successful, message: %1").arg(msg), QColor("blue"));
+}
+
 // Update Info Bar information
 void DownloadingTorrents::setInfoBar(QString info, QColor color) {
   static unsigned int nbLines = 0;
@@ -278,16 +319,203 @@ void DownloadingTorrents::displayDLListMenu(const QPoint& pos) {
   myDLLlistMenu.addAction(actionSet_download_limit);
   myDLLlistMenu.addAction(actionSet_upload_limit);
   myDLLlistMenu.addSeparator();
+  myDLLlistMenu.addAction(actionOpen_destination_folder);
   myDLLlistMenu.addAction(actionTorrent_Properties);
+  if(BTSession->isQueueingEnabled()) {
+    myDLLlistMenu.addSeparator();
+    myDLLlistMenu.addAction(actionIncreasePriority);
+    myDLLlistMenu.addAction(actionDecreasePriority);
+  }
+  myDLLlistMenu.addSeparator();
+  myDLLlistMenu.addAction(actionBuy_it);
   // Call menu
   // XXX: why mapToGlobal() is not enough?
-  myDLLlistMenu.exec(mapToGlobal(pos)+QPoint(10,60));
+  myDLLlistMenu.exec(mapToGlobal(pos)+QPoint(10,35));
+}
+
+
+/*
+ * Hiding Columns functions
+ */
+
+// hide/show columns menu
+void DownloadingTorrents::displayDLHoSMenu(const QPoint& pos){
+  QMenu hideshowColumn(this);
+  hideshowColumn.setTitle(tr("Hide or Show Column"));
+  int lastCol;
+  if(BTSession->isQueueingEnabled()) {
+    lastCol = PRIORITY;
+  } else {
+    lastCol = ETA;
+  }
+  for(int i=0; i <= lastCol; ++i) {
+    hideshowColumn.addAction(getActionHoSCol(i));
+  }
+  // Call menu
+  hideshowColumn.exec(mapToGlobal(pos)+QPoint(10,10));
+}
+
+// toggle hide/show a column
+void DownloadingTorrents::hideOrShowColumn(int index) {
+  unsigned int nbVisibleColumns = 0;
+  unsigned int nbCols = DLListModel->columnCount();
+  // Count visible columns
+  for(unsigned int i=0; i<nbCols; ++i) {
+    if(!downloadList->isColumnHidden(i))
+      ++nbVisibleColumns;
+  }
+  if(!downloadList->isColumnHidden(index)) {
+    // User wants to hide the column
+    // Is there at least one other visible column?
+    if(nbVisibleColumns <= 1) return;
+    // User can hide the column, do it.
+    downloadList->setColumnHidden(index, true);
+    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_cancel.png")));
+    --nbVisibleColumns;
+    if(index == ETA) {
+      BTSession->setETACalculation(false);
+      qDebug("Disable ETA calculation");
+    }
+  } else {
+    // User want to display the column
+    downloadList->setColumnHidden(index, false);
+    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_ok.png")));
+    ++nbVisibleColumns;
+    if(index == ETA) {
+      BTSession->setETACalculation(true);
+      qDebug("Enable ETA calculation");
+    }
+  }
+  //resize all others non-hidden columns
+  for(unsigned int i=0; i<nbCols; ++i) {
+    if(!downloadList->isColumnHidden(i)) {
+      downloadList->setColumnWidth(i, (int)ceil(downloadList->columnWidth(i)+(downloadList->columnWidth(index)/nbVisibleColumns)));
+    }
+  }
+}
+
+void DownloadingTorrents::hidePriorityColumn(bool hide) {
+  downloadList->setColumnHidden(PRIORITY, hide);
+}
+
+// save the hidden columns in settings
+void DownloadingTorrents::saveHiddenColumns() {
+  QSettings settings("qBittorrent", "qBittorrent");
+  QStringList ishidden_list;
+  short nbColumns = DLListModel->columnCount()-1;
+
+  for(short i=0; i<nbColumns; ++i){
+    if(downloadList->isColumnHidden(i)) {
+      ishidden_list << QString::fromUtf8(misc::toString(0).c_str());
+    } else {
+      ishidden_list << QString::fromUtf8(misc::toString(1).c_str());
+    }
+  }
+  settings.setValue("DownloadListColsHoS", ishidden_list.join(" "));
+}
+
+// load the previous settings, and hide the columns
+bool DownloadingTorrents::loadHiddenColumns() {
+  bool loaded = false;
+  QSettings settings("qBittorrent", "qBittorrent");
+  QString line = settings.value("DownloadListColsHoS", QString()).toString();
+  QStringList ishidden_list;
+  if(!line.isEmpty()) {
+    ishidden_list = line.split(' ');
+    if(ishidden_list.size() == DLListModel->columnCount()-1) {
+      unsigned int listSize = ishidden_list.size();
+      for(unsigned int i=0; i<listSize; ++i){
+            downloadList->header()->resizeSection(i, ishidden_list.at(i).toInt());
+      }
+      loaded = true;
+    }
+  }
+  for(int i=0; i<DLListModel->columnCount()-1; i++) {
+    if(loaded && ishidden_list.at(i) == "0") {
+      downloadList->setColumnHidden(i, true);
+      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_cancel.png")));
+    } else {
+      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_ok.png")));
+    }
+  }
+  return loaded;
+}
+
+void DownloadingTorrents::hideOrShowColumnName() {
+  hideOrShowColumn(NAME);
+}
+
+void DownloadingTorrents::hideOrShowColumnSize() {
+  hideOrShowColumn(SIZE);
+}
+
+void DownloadingTorrents::hideOrShowColumnProgress() {
+  hideOrShowColumn(PROGRESS);
+}
+
+void DownloadingTorrents::hideOrShowColumnDownSpeed() {
+  hideOrShowColumn(DLSPEED);
+}
+
+void DownloadingTorrents::hideOrShowColumnUpSpeed() {
+  hideOrShowColumn(UPSPEED);
+}
+
+void DownloadingTorrents::hideOrShowColumnSeedersLeechers() {
+  hideOrShowColumn(SEEDSLEECH);
+}
+
+void DownloadingTorrents::hideOrShowColumnRatio() {
+  hideOrShowColumn(RATIO);
+}
+
+void DownloadingTorrents::hideOrShowColumnEta() {
+  hideOrShowColumn(ETA);
+}
+
+void DownloadingTorrents::hideOrShowColumnPriority() {
+  hideOrShowColumn(PRIORITY);
 }
 
 void DownloadingTorrents::on_actionClearLog_triggered() {
   infoBar->clear();
 }
 
+// getter, return the action hide or show whose id is index
+QAction* DownloadingTorrents::getActionHoSCol(int index) {
+  switch(index) {
+    case NAME :
+      return actionHOSColName;
+    break;
+    case SIZE :
+      return actionHOSColSize;
+    break;
+    case PROGRESS :
+      return actionHOSColProgress;
+    break;
+    case DLSPEED :
+      return actionHOSColDownSpeed;
+    break;
+    case UPSPEED :
+      return actionHOSColUpSpeed;
+    break;
+    case SEEDSLEECH :
+      return actionHOSColSeedersLeechers;
+    break;
+    case RATIO :
+      return actionHOSColRatio;
+    break;
+    case ETA :
+      return actionHOSColEta;
+    break;
+    case PRIORITY :
+      return actionHOSColPriority;
+      break;
+    default :
+      return NULL;
+  }
+}
+
 QStringList DownloadingTorrents::getSelectedTorrents(bool only_one) const{
   QStringList res;
   QModelIndex index;
@@ -303,32 +531,6 @@ QStringList DownloadingTorrents::getSelectedTorrents(bool only_one) const{
   return res;
 }
 
-void DownloadingTorrents::updateRatio() {
-  // Update ratio info
-  float ratio = 1.;
-  session_status sessionStatus = BTSession->getSessionStatus();
-  if(sessionStatus.total_payload_download == 0) {
-    if(sessionStatus.total_payload_upload == 0)
-      ratio = 1.;
-    else
-      ratio = 10.;
-  }else{
-    ratio = (double)sessionStatus.total_payload_upload / (double)sessionStatus.total_payload_download;
-    if(ratio > 10.)
-      ratio = 10.;
-  }
-  LCD_Ratio->display(QString(QByteArray::number(ratio, 'f', 1)));
-  if(ratio < 0.5) {
-    lbl_ratio_icon->setPixmap(QPixmap(QString::fromUtf8(":/Icons/unhappy.png")));
-  }else{
-    if(ratio > 1.0) {
-      lbl_ratio_icon->setPixmap(QPixmap(QString::fromUtf8(":/Icons/smile.png")));
-    }else{
-      lbl_ratio_icon->setPixmap(QPixmap(QString::fromUtf8(":/Icons/stare.png")));
-    }
-  }
-}
-
 void DownloadingTorrents::displayInfoBarMenu(const QPoint& pos) {
   // Log Menu
   QMenu myLogMenu(this);
@@ -347,9 +549,6 @@ void DownloadingTorrents::sortProgressColumnDelayed() {
 // get information from torrent handles and
 // update download list accordingly
 void DownloadingTorrents::updateDlList() {
-  // update global informations
-  LCD_UpSpeed->display(QString(QByteArray::number(BTSession->getPayloadUploadRate()/1024., 'f', 1))); // UP LCD
-  LCD_DownSpeed->display(QString(QByteArray::number(BTSession->getPayloadDownloadRate()/1024., 'f', 1))); // DL LCD
   // browse handles
   QStringList unfinishedTorrents = BTSession->getUnfinishedTorrents();
   QString hash;
@@ -368,10 +567,23 @@ void DownloadingTorrents::updateDlList() {
         row = getRowFromHash(hash);
       }
       Q_ASSERT(row != -1);
+      // Update Priority
+      if(BTSession->isQueueingEnabled()) {
+        DLListModel->setData(DLListModel->index(row, PRIORITY), QVariant((int)BTSession->getDlTorrentPriority(hash)));
+        if(h.is_paused() && BTSession->isDownloadQueued(hash)) {
+          DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/queued.png"))), Qt::DecorationRole);
+          if(!downloadList->isColumnHidden(ETA)) {
+            DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)-1));
+          }
+          setRowColor(row, QString::fromUtf8("grey"));
+        }
+      }
       // No need to update a paused torrent
       if(h.is_paused()) continue;
       if(BTSession->getTorrentsToPauseAfterChecking().indexOf(hash) != -1) {
-         DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)h.progress()));
+        if(!downloadList->isColumnHidden(PROGRESS)) {
+          DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)h.progress()));
+        }
          continue;
       }
       // Parse download state
@@ -388,43 +600,71 @@ void DownloadingTorrents::updateDlList() {
         case torrent_status::queued_for_checking:
           DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/time.png"))), Qt::DecorationRole);
           setRowColor(row, QString::fromUtf8("grey"));
-          DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)h.progress()));
+          if(!downloadList->isColumnHidden(PROGRESS)) {
+            DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)h.progress()));
+          }
           break;
         case torrent_status::connecting_to_tracker:
           if(h.download_payload_rate() > 0) {
             // Display "Downloading" status when connecting if download speed > 0
-            DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)BTSession->getETA(hash)));
+            if(!downloadList->isColumnHidden(ETA)) {
+              DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)BTSession->getETA(hash)));
+            }
             DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/downloading.png"))), Qt::DecorationRole);
             setRowColor(row, QString::fromUtf8("green"));
           }else{
-            DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)-1));
+            if(!downloadList->isColumnHidden(ETA)) {
+              DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)-1));
+            }
             DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/connecting.png"))), Qt::DecorationRole);
             setRowColor(row, QString::fromUtf8("grey"));
           }
-          DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)h.progress()));
-          DLListModel->setData(DLListModel->index(row, DLSPEED), QVariant((double)h.download_payload_rate()));
-          DLListModel->setData(DLListModel->index(row, UPSPEED), QVariant((double)h.upload_payload_rate()));
+          if(!downloadList->isColumnHidden(PROGRESS)) {
+            DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)h.progress()));
+          }
+          if(!downloadList->isColumnHidden(DLSPEED)) {
+            DLListModel->setData(DLListModel->index(row, DLSPEED), QVariant((double)h.download_payload_rate()));
+          }
+          if(!downloadList->isColumnHidden(UPSPEED)) {
+            DLListModel->setData(DLListModel->index(row, UPSPEED), QVariant((double)h.upload_payload_rate()));
+          }
           break;
         case torrent_status::downloading:
         case torrent_status::downloading_metadata:
           if(h.download_payload_rate() > 0) {
             DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/downloading.png"))), Qt::DecorationRole);
-            DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)BTSession->getETA(hash)));
+            if(!downloadList->isColumnHidden(ETA)) {
+              DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)BTSession->getETA(hash)));
+            }
             setRowColor(row, QString::fromUtf8("green"));
           }else{
             DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/stalled.png"))), Qt::DecorationRole);
-            DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)-1));
+            if(!downloadList->isColumnHidden(ETA)) {
+              DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)-1));
+            }
             setRowColor(row, QApplication::palette().color(QPalette::WindowText));
           }
-          DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)h.progress()));
-          DLListModel->setData(DLListModel->index(row, DLSPEED), QVariant((double)h.download_payload_rate()));
-          DLListModel->setData(DLListModel->index(row, UPSPEED), QVariant((double)h.upload_payload_rate()));
+          if(!downloadList->isColumnHidden(PROGRESS)) {
+            DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)h.progress()));
+          }
+          if(!downloadList->isColumnHidden(DLSPEED)) {
+            DLListModel->setData(DLListModel->index(row, DLSPEED), QVariant((double)h.download_payload_rate()));
+          }
+          if(!downloadList->isColumnHidden(UPSPEED)) {
+            DLListModel->setData(DLListModel->index(row, UPSPEED), QVariant((double)h.upload_payload_rate()));
+          }
           break;
         default:
-          DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)-1));
+          if(!downloadList->isColumnHidden(ETA)) {
+            DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)-1));
+          }
+      }
+      if(!downloadList->isColumnHidden(SEEDSLEECH)) {
+        DLListModel->setData(DLListModel->index(row, SEEDSLEECH), QVariant(misc::toQString(h.num_seeds(), true)+QString::fromUtf8("/")+misc::toQString(h.num_peers() - h.num_seeds(), true)));
+      }
+      if(!downloadList->isColumnHidden(RATIO)) {
+        DLListModel->setData(DLListModel->index(row, RATIO), QVariant(misc::toQString(BTSession->getRealRatio(hash))));
       }
-      DLListModel->setData(DLListModel->index(row, SEEDSLEECH), QVariant(misc::toQString(h.num_seeds(), true)+QString::fromUtf8("/")+misc::toQString(h.num_peers() - h.num_seeds(), true)));
-      DLListModel->setData(DLListModel->index(row, RATIO), QVariant(misc::toQString(BTSession->getRealRatio(hash))));
     }catch(invalid_handle e) {
       continue;
     }
@@ -437,6 +677,7 @@ void DownloadingTorrents::addTorrent(QString hash) {
   }
   QTorrentHandle h = BTSession->getTorrentHandle(hash);
   int row = getRowFromHash(hash);
+  qDebug("DL: addTorrent(): %s, row: %d", (const char*)hash.toUtf8(), row);
   if(row != -1) return;
   row = DLListModel->rowCount();
   // Adding torrent to download list
@@ -447,6 +688,8 @@ void DownloadingTorrents::addTorrent(QString hash) {
   DLListModel->setData(DLListModel->index(row, UPSPEED), QVariant((double)0.));
   DLListModel->setData(DLListModel->index(row, SEEDSLEECH), QVariant(QString::fromUtf8("0/0")));
   DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)-1));
+  if(BTSession->isQueueingEnabled())
+    DLListModel->setData(DLListModel->index(row, PRIORITY), QVariant((int)BTSession->getDlTorrentPriority(hash)));
   DLListModel->setData(DLListModel->index(row, HASH), QVariant(hash));
   // Pause torrent if it was paused last time
   if(BTSession->isPaused(hash)) {
@@ -560,11 +803,26 @@ void DownloadingTorrents::saveColWidthDLList() const{
   qDebug("Saving columns width in download list");
   QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
   QStringList width_list;
-  unsigned int nbColumns = DLListModel->columnCount()-1;
-  for(unsigned int i=0; i<nbColumns; ++i) {
-    width_list << misc::toQString(downloadList->columnWidth(i));
+  QStringList new_width_list;
+  short nbColumns = DLListModel->columnCount()-1;
+  QString line = settings.value("DownloadListColsWidth", QString()).toString();
+  if(!line.isEmpty()) {
+    width_list = line.split(' ');
   }
-  settings.setValue(QString::fromUtf8("DownloadListColsWidth"), width_list.join(QString::fromUtf8(" ")));
+  for(short i=0; i<nbColumns; ++i){
+    if(downloadList->columnWidth(i)<1 && width_list.size() == DLListModel->columnCount()-1 && width_list.at(i).toInt()>=1) {
+      // load the former width
+      new_width_list << width_list.at(i);
+    } else if(downloadList->columnWidth(i)>=1) { 
+      // usual case, save the current width
+      new_width_list << QString::fromUtf8(misc::toString(downloadList->columnWidth(i)).c_str());
+    } else { 
+      // default width
+      downloadList->resizeColumnToContents(i);
+      new_width_list << QString::fromUtf8(misc::toString(downloadList->columnWidth(i)).c_str());
+    }
+  }
+  settings.setValue(QString::fromUtf8("DownloadListColsWidth"), new_width_list.join(QString::fromUtf8(" ")));
   qDebug("Download list columns width saved");
 }
 
@@ -607,6 +865,7 @@ void DownloadingTorrents::torrentAdded(QString path, QTorrentHandle& h, bool fas
   if(BTSession->isFinished(hash)) {
     return;
   }
+  if(getRowFromHash(hash) != -1) return;
   int row = DLListModel->rowCount();
   // Adding torrent to download list
   DLListModel->insertRow(row);

src/downloadingTorrents.h

@@ -41,6 +41,10 @@ class DownloadingTorrents : public QWidget, public Ui::downloading{
     bool delayedSorting;
     unsigned int nbTorrents;
     Qt::SortOrder delayedSortingOrder;
+    void hideOrShowColumn(int index);
+    bool loadHiddenColumns();
+    void saveHiddenColumns();
+    QAction* getActionHoSCol(int index);
 
   public:
     DownloadingTorrents(QObject *parent, bittorrent *BTSession);
@@ -51,10 +55,11 @@ class DownloadingTorrents : public QWidget, public Ui::downloading{
     QString getHashFromRow(unsigned int row) const;
     QStringList getSelectedTorrents(bool only_one=false) const;
     unsigned int getNbTorrentsInList() const;
+    void enablePriorityColumn(bool enable);
 
   signals:
     void unfinishedTorrentsNumberChanged(unsigned int);
-    void torrentDoubleClicked(QString hash);
+    void torrentDoubleClicked(QString hash, bool finished);
     void torrentFinished(QString hash);
 
   protected slots:
@@ -65,6 +70,7 @@ class DownloadingTorrents : public QWidget, public Ui::downloading{
     void notifyTorrentDoubleClicked(const QModelIndex& index);
     void on_actionSet_upload_limit_triggered();
     void displayDLListMenu(const QPoint& pos);
+    void displayDLHoSMenu(const QPoint&);
     void on_actionClearLog_triggered();
     void displayInfoBarMenu(const QPoint& pos);
     void addTorrent(QString hash);
@@ -79,18 +85,30 @@ class DownloadingTorrents : public QWidget, public Ui::downloading{
     void setRowColor(int row, QColor color);
     void displayDownloadingUrlInfos(QString url);
     void showProperties(const QModelIndex &index);
+    void hideOrShowColumnName();
+    void hideOrShowColumnSize();
+    void hideOrShowColumnProgress();
+    void hideOrShowColumnDownSpeed();
+    void hideOrShowColumnUpSpeed();
+    void hideOrShowColumnSeedersLeechers();
+    void hideOrShowColumnRatio();
+    void hideOrShowColumnEta();
+    void hideOrShowColumnPriority();
+    void displayUPnPError(QString msg);
+    void displayUPnPSuccess(QString msg);
 
   public slots:
     void updateDlList();
     void setInfoBar(QString info, QColor color=QApplication::palette().color(QPalette::WindowText));
     void pauseTorrent(QString hash);
     void resumeTorrent(QString hash);
-    void updateRatio();
     void deleteTorrent(QString hash);
     void setBottomTabEnabled(unsigned int index, bool b);
     void propertiesSelection();
     void sortProgressColumnDelayed();
     void updateFileSizeAndProgress(QString hash);
+    void showPropertiesFromHash(QString hash);
+    void hidePriorityColumn(bool hide);
 
 };
 

src/eventmanager.cpp

@@ -0,0 +1,189 @@
+/*
+ *   Copyright (C) 2007 by Ishan Arora
+ *   ishanarora@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 2 of the License, 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.,
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+#include "eventmanager.h"
+#include "bittorrent.h"
+#include "json.h"
+#include <QDebug>
+
+EventManager::EventManager(QObject *parent, bittorrent *BTSession)
+	: QObject(parent), BTSession(BTSession)
+{
+	revision = 0;
+}
+
+void EventManager::update(QVariantMap event)
+{
+	revision++;
+	events << QPair<ulong, QVariantMap>(revision, event);
+	emit updated();
+	qDebug("Added the following event");
+	qDebug() << event;
+/*	QLinkedList<QPair<ulong, QVariantMap> >::iterator i;
+	for (i = events.begin(); i != events.end(); i++)
+		qDebug() << *i;*/
+}
+
+QVariant EventManager::querySince(ulong r) const
+{
+	QVariantList list;
+	QLinkedListIterator<QPair<ulong, QVariantMap> > i(events);
+	i.toBack();
+	while (i.hasPrevious())
+	{
+		QPair<ulong, QVariantMap> pair = i.previous();
+		if (pair.first <= r)
+			break;
+		list.prepend(QVariant(pair.second));
+	}
+	QVariantMap map;
+	map["events"] = QVariant(list);
+	map["revision"] = QVariant((qulonglong) revision);
+	return QVariant(map);
+}
+
+bool EventManager::isUpdated(ulong r) const
+{
+	return (r < revision);
+}
+
+void EventManager::addedTorrent(QString, QTorrentHandle& h)
+{
+	QVariantMap event;
+	event["type"] = QVariant("add");
+	event["hash"] = QVariant(h.hash());
+	event["name"] = QVariant(h.name());
+	update(event);
+}
+
+void EventManager::deletedTorrent(QString hash)
+{
+	QVariantMap event;
+	event["type"] = QVariant("delete");
+	event["hash"] = QVariant(hash);
+	QLinkedList<QPair<ulong, QVariantMap> >::iterator i = events.end();
+	bool loop = true;
+	while (loop && i != events.begin()) {
+		--i;
+		QVariantMap oldevent = i->second;
+		if(oldevent["hash"] == QVariant(hash))
+		{
+			if(oldevent["type"] == QVariant("add"))
+				loop = false;
+			i = events.erase(i);
+		}
+	}
+	update(event);
+}
+
+void EventManager::modifiedTorrent(QTorrentHandle h)
+{
+	QString hash = h.hash();
+	QVariantMap event;
+	QVariant v;
+	
+	if(h.is_paused()) {
+		if(BTSession->isDownloadQueued(hash) || BTSession->isUploadQueued(hash))
+			v = QVariant("queued");
+		else
+			v = QVariant("paused");
+	} else {
+		switch(h.state())
+		{
+			case torrent_status::finished:
+			case torrent_status::seeding:
+				v = QVariant("seeding");
+				break;
+			case torrent_status::checking_files:
+			case torrent_status::queued_for_checking:
+				v = QVariant("checking");
+				break;
+			case torrent_status::connecting_to_tracker:
+				if(h.download_payload_rate() > 0)
+					v = QVariant("downloading");
+				else
+					v = QVariant("connecting");
+				break;
+			case torrent_status::downloading:
+			case torrent_status::downloading_metadata:
+				if(h.download_payload_rate() > 0)
+					v = QVariant("downloading");
+				else
+					v = QVariant("stalled");
+				break;
+			default:
+				v = QVariant();
+		}
+	}
+	if(modify(hash, "state", v))
+		event["state"] = v;
+	
+	v = QVariant((qlonglong)h.actual_size());
+	if(modify(hash, "size", v))
+		event["size"] = v;
+	
+	v = QVariant(h.progress());
+	if(modify(hash, "progress", v))
+		event["progress"] = v;
+	
+	v = QVariant(h.download_payload_rate());
+	if(modify(hash, "dlspeed", v))
+		event["dlspeed"] = v;
+	
+	v = QVariant(h.upload_payload_rate());
+	if(modify(hash, "upspeed", v))
+		event["upspeed"] = v;
+	
+	if(event.size() > 0)
+	{
+		event["type"] = QVariant("modify");
+		event["hash"] = QVariant(hash);
+		update(event);
+	}
+}
+
+bool EventManager::modify(QString hash, QString key, QVariant value)
+{
+	QLinkedList<QPair<ulong, QVariantMap> >::iterator i = events.end();
+	while (i != events.begin()) {
+		--i;
+		QVariantMap event = i->second;
+		if(event["hash"] == QVariant(hash))
+		{
+			if(event["type"] == QVariant("add"))
+				return true;
+			if(event.contains(key))
+			{
+				if(event[key] == value)
+					return false;
+				else
+				{
+					if(event.size() <= 3)
+						i = events.erase(i);
+					else
+						i->second.remove(key);
+					return true;
+				}
+			}
+		}
+	}
+	return true;
+}

src/eventmanager.h

@@ -0,0 +1,58 @@
+/*
+ *   Copyright (C) 2007 by Ishan Arora
+ *   ishanarora@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 2 of the License, 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.,
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+#ifndef EVENTMANAGER_H
+#define EVENTMANAGER_H
+
+#include "qtorrenthandle.h"
+#include <QLinkedList>
+#include <QPair>
+#include <QVariant>
+
+struct bittorrent;
+
+class EventManager : public QObject
+{
+	Q_OBJECT
+	private:
+		ulong revision;
+		QLinkedList<QPair <ulong, QVariantMap> > events;
+		bool modify(QString hash, QString key, QVariant value);
+		bittorrent* BTSession;
+
+	protected:
+		void update(QVariantMap event);
+
+	public:
+		EventManager(QObject *parent, bittorrent* BTSession);
+		QVariant querySince(ulong r) const;
+		bool isUpdated(ulong r) const;
+
+	signals:
+		void updated();
+
+	public slots:
+		void addedTorrent(QString path, QTorrentHandle& h);
+		void deletedTorrent(QString hash);
+		void modifiedTorrent(QTorrentHandle h);
+};
+
+#endif

src/filterParserThread.h

@@ -0,0 +1,383 @@
+/*
+ * Bittorrent Client using Qt4 and libtorrent.
+ * Copyright (C) 2006  Christophe Dumez
+ *
+ * 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 2
+ * of the License, 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.
+ *
+ * Contact : chris@qbittorrent.org
+ */
+
+#ifndef FILTERPARSERTHREAD_H
+#define FILTERPARSERTHREAD_H
+
+#include <QThread>
+#include <QFile>
+#include <QDataStream>
+#include <QMessageBox>
+
+#include <libtorrent/session.hpp>
+#include <libtorrent/ip_filter.hpp>
+
+using namespace libtorrent;
+using namespace std;
+
+// P2B Stuff
+#include <string.h>
+#include <arpa/inet.h>
+// End of P2B stuff
+
+class FilterParserThread : public QThread  {
+  Q_OBJECT
+
+  private:
+    session *s;
+    ip_filter filter;
+    bool abort;
+    QString filePath;
+    
+  protected:
+    void run(){
+      qDebug("Processing filter file");
+      if(filePath.endsWith(".dat", Qt::CaseInsensitive)) {
+        // eMule DAT file
+        parseDATFilterFile(filePath);
+      } else {
+        if(filePath.endsWith(".p2p", Qt::CaseInsensitive)) {
+          // PeerGuardian p2p file
+          parseP2PFilterFile(filePath);
+        } else {
+            if(filePath.endsWith(".p2p", Qt::CaseInsensitive)) {
+              // PeerGuardian p2p file
+              parseP2BFilterFile(filePath);
+            } else {
+              // Default: eMule DAT format
+              parseDATFilterFile(filePath);
+            }
+        }
+      }
+      s->set_ip_filter(filter);
+      qDebug("IP Filter thread: finished parsing, filter applied");
+    }
+        
+  public:
+    FilterParserThread(QObject* parent, session *s) : QThread(parent), s(s), abort(false) {
+        
+    }
+    
+    ~FilterParserThread(){
+      abort = true;
+      wait();
+    }
+    
+    // Parser for eMule ip filter in DAT format
+    void parseDATFilterFile(QString filePath) {
+      const QRegExp is_ipv6(QString::fromUtf8("^[0-9a-f]{4}(:[0-9a-f]{4}){7}$"), Qt::CaseInsensitive, QRegExp::RegExp);
+      const QRegExp is_ipv4(QString::fromUtf8("^(([0-1]?[0-9]?[0-9])|(2[0-4][0-9])|(25[0-5]))(\\.(([0-1]?[0-9]?[0-9])|(2[0-4][0-9])|(25[0-5]))){3}$"), Qt::CaseInsensitive, QRegExp::RegExp);
+      QString strStartIP, strEndIP;
+      bool IPv4 = true;
+      QFile file(filePath);
+      if (file.exists()){
+        if(!file.open(QIODevice::ReadOnly | QIODevice::Text)){
+          QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("Couldn't open %1 in read mode.").arg(filePath));
+          return;
+        }
+        unsigned int nbLine = 0;
+        while (!file.atEnd() && !abort) {
+          ++nbLine;
+          QByteArray line = file.readLine();
+          // Ignoring empty lines
+          line = line.trimmed();
+          if(line.isEmpty()) continue;
+          // Ignoring commented lines
+          if(line.startsWith('#') || line.startsWith("//")) continue;
+          // Line is not commented
+          QList<QByteArray> partsList = line.split(',');
+          unsigned int nbElem = partsList.size();
+          // IP Range can be splitted by a dash or a comma...
+          // Check if there is a dash in first part
+          QByteArray firstPart = partsList.at(0);
+          int nbAccess = 0;
+          if(firstPart.contains('-')) {
+            // Range is splitted by a dash
+            QList<QByteArray> IPs = firstPart.split('-');
+            if(IPs.size() != 2) {
+              qDebug("Ipfilter.dat: line %d is malformed.", nbLine);
+              continue;
+            }
+            strStartIP = IPs.at(0).trimmed();
+            strEndIP = IPs.at(1).trimmed();
+            // Check if IPs are correct
+            if(strStartIP.contains(is_ipv4) && strEndIP.contains(is_ipv4)) {
+              IPv4 = true;
+            } else {
+              if(strStartIP.contains(is_ipv6) && strEndIP.contains(is_ipv6)) {
+                IPv4 = false;
+              } else {
+                // Could not determine IP format
+                qDebug("Ipfilter.dat: line %d is malformed.", nbLine);
+                continue;
+              }
+            }
+            // Check if there is an access value (apparently not mandatory)
+            if(nbElem > 1) {
+              // There is possibly one
+              bool ok;
+              nbAccess = partsList.at(1).trimmed().toInt(&ok);
+              if(!ok){
+                nbAccess = 0;
+              }
+            }
+          } else {
+            // Range is probably splitted by a comma
+            unsigned int nbElem = partsList.size();
+            if(nbElem > 1) {
+              strStartIP = firstPart.trimmed();
+              strEndIP = partsList.at(1).trimmed();
+              // Check if IPs are correct
+              if(strStartIP.contains(is_ipv4) && strEndIP.contains(is_ipv4)) {
+                IPv4 = true;
+              } else {
+                if(strStartIP.contains(is_ipv6) && strEndIP.contains(is_ipv6)) {
+                  IPv4 = false;
+                } else {
+                  // Could not determine IP format
+                  qDebug("Ipfilter.dat: line %d is malformed.", nbLine);
+                  continue;
+                }
+              }
+              // Check if there is an access value (apparently not mandatory)
+              if(nbElem > 2) {
+                // There is possibly one
+                bool ok;
+                nbAccess = partsList.at(2).trimmed().toInt(&ok);
+                if(!ok){
+                  nbAccess = 0;
+                }
+              }
+            }
+          }
+          if(nbAccess > 127) {
+            // Ignoring this rule because access value is too high
+            continue;
+          }
+          // Now Add to the filter
+          QStringList IP;
+          if(IPv4) {
+            //IPv4 addresses
+            IP = strStartIP.split('.');
+            address_v4 start((IP.at(0).toInt() << 24) + (IP.at(1).toInt() << 16) + (IP.at(2).toInt() << 8) + IP.at(3).toInt());
+            IP = strEndIP.split('.');
+            address_v4 last((IP.at(0).toInt() << 24) + (IP.at(1).toInt() << 16) + (IP.at(2).toInt() << 8) + IP.at(3).toInt());
+            // Apply to bittorrent session
+            filter.add_rule(start, last, ip_filter::blocked);
+          } else {
+            // IPv6, ex :   1fff:0000:0a88:85a3:0000:0000:ac1f:8001
+            IP = strStartIP.split(':');
+            address_v6 start = address_v6::from_string(strStartIP.remove(':', 0).toUtf8().data());
+            IP = strEndIP.split(':');
+            address_v6 last = address_v6::from_string(strEndIP.remove(':', 0).toUtf8().data());
+            // Apply to bittorrent session
+            filter.add_rule(start, last, ip_filter::blocked);
+          }
+        }
+        file.close();
+      }
+    }
+    
+    // Parser for PeerGuardian ip filter in p2p format
+    void parseP2PFilterFile(QString filePath) {
+      const QRegExp is_ipv4(QString::fromUtf8("^(([0-1]?[0-9]?[0-9])|(2[0-4][0-9])|(25[0-5]))(\\.(([0-1]?[0-9]?[0-9])|(2[0-4][0-9])|(25[0-5]))){3}$"), Qt::CaseInsensitive, QRegExp::RegExp);
+      QFile file(filePath);
+      QStringList IP;
+      if (file.exists()){
+        if(!file.open(QIODevice::ReadOnly | QIODevice::Text)){
+          QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("Couldn't open %1 in read mode.").arg(filePath));
+          return;
+        }
+        unsigned int nbLine = 0;
+        while (!file.atEnd() && !abort) {
+          ++nbLine;
+          QByteArray line = file.readLine();
+          // Ignoring empty lines
+          line = line.trimmed();
+          if(line.isEmpty()) continue;
+          // Ignoring commented lines
+          if(line.startsWith('#') || line.startsWith("//")) continue;
+          // Line is not commented
+          QList<QByteArray> partsList = line.split(':');
+          if(partsList.size() < 2){
+            qDebug("p2p file: line %d is malformed.", nbLine);
+            continue;
+          }
+          // Get IP range
+          QList<QByteArray> IPs = partsList.last().split('-');
+          if(IPs.size() != 2) {
+            qDebug("p2p file: line %d is malformed.", nbLine);
+            continue;
+          }
+          QString strStartIP = IPs.at(0).trimmed();
+          QString strEndIP = IPs.at(1).trimmed();
+          // Check IPs format (IPv4 only)
+          if(strStartIP.contains(is_ipv4) && strEndIP.contains(is_ipv4)) {
+            // IPv4
+            IP = strStartIP.split('.');
+            address_v4 start((IP.at(0).toInt() << 24) + (IP.at(1).toInt() << 16) + (IP.at(2).toInt() << 8) + IP.at(3).toInt());
+            IP = strEndIP.split('.');
+            address_v4 last((IP.at(0).toInt() << 24) + (IP.at(1).toInt() << 16) + (IP.at(2).toInt() << 8) + IP.at(3).toInt());
+            // Apply to bittorrent session
+            filter.add_rule(start, last, ip_filter::blocked);
+          } else {
+              qDebug("p2p file: line %d is malformed.", nbLine);
+              continue;
+          }
+        }
+        file.close();
+      }
+    }
+    
+    int getlineInStream(QDataStream& stream, string& name, char delim) {
+      char c;
+      int total_read = 0;
+      do {
+        int read = stream.readRawData(&c, 1);
+        total_read += read;
+        if(read > 0) {
+          if(c != delim) {
+            name += c;
+          } else {
+            // Delim found
+            return total_read;
+          }
+        }
+      } while(read > 0);
+      return total_read;
+    }
+    
+    // Parser for PeerGuardian ip filter in p2p format
+    void parseP2BFilterFile(QString filePath) {
+      QFile file(filePath);
+      if (file.exists()){
+        if(!file.open(QIODevice::ReadOnly)){
+          QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("Couldn't open %1 in read mode.").arg(filePath));
+          return;
+        }
+        QDataStream stream(&file);
+        // Read header
+        char buf[7];
+        unsigned char version;
+        if(
+                !stream.readRawData(buf, sizeof(buf)) ||
+                memcmp(buf, "\xFF\xFF\xFF\xFFP2B", 7) ||
+                !stream.readRawData((char*)&version, sizeof(version))
+        ) {
+          QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("%1 is not a valid PeerGuardian P2B file.").arg(filePath));
+          return;
+        }
+    
+        if(version==1 || version==2) {
+          qDebug ("p2b version 1 or 2");
+          unsigned int start, end;
+          
+          string name;
+          while(getlineInStream(stream, name, '\0') && !abort) {
+            if(
+              !stream.readRawData((char*)&start, sizeof(start)) ||
+              !stream.readRawData((char*)&end, sizeof(end))
+            ) {
+              QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("%1 is not a valid PeerGuardian P2B file.").arg(filePath));
+              return;
+            }
+            // Network byte order to Host byte order
+            // asio address_v4 contructor expects it
+            // that way
+            address_v4 first(ntohl(start));
+            address_v4 last(ntohl(end));
+            // Apply to bittorrent session
+            filter.add_rule(first, last, ip_filter::blocked);
+          }
+        }
+        else if(version==3) {
+          qDebug ("p2b version 3");
+          unsigned int namecount;
+          if(!stream.readRawData((char*)&namecount, sizeof(namecount))) {
+            QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("%1 is not a valid PeerGuardian P2B file.").arg(filePath));
+            return;
+          }
+          namecount=ntohl(namecount);
+          // Reading names although, we don't really care about them
+          for(unsigned int i=0; i<namecount; i++) {
+            string name;
+            if(!getlineInStream(stream, name, '\0')) {
+              QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("%1 is not a valid PeerGuardian P2B file.").arg(filePath));
+              return;
+            }
+            if(abort) return;
+          }
+          // Reading the ranges
+          unsigned int rangecount;
+          if(!stream.readRawData((char*)&rangecount, sizeof(rangecount))) {
+            QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("%1 is not a valid PeerGuardian P2B file.").arg(filePath));
+            return;
+          }
+          rangecount=ntohl(rangecount);
+    
+          unsigned int name, start, end;
+    
+          for(unsigned int i=0; i<rangecount; i++) {
+            if(
+              !stream.readRawData((char*)&name, sizeof(name)) ||
+              !stream.readRawData((char*)&start, sizeof(start)) ||
+              !stream.readRawData((char*)&end, sizeof(end))
+            ) {
+              QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("%1 is not a valid PeerGuardian P2B file.").arg(filePath));
+              return;
+            }
+            // Network byte order to Host byte order
+            // asio address_v4 contructor expects it
+            // that way
+            address_v4 first(ntohl(start));
+            address_v4 last(ntohl(end));
+            // Apply to bittorrent session
+            filter.add_rule(first, last, ip_filter::blocked);
+            if(abort) return;
+          }
+        } else {
+          QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("%1 is not a valid PeerGuardian P2B file.").arg(filePath));
+          return;
+        }
+        file.close();
+      }
+    }
+    
+    // Process ip filter file
+    // Supported formats:
+    //  * eMule IP list (DAT): http://wiki.phoenixlabs.org/wiki/DAT_Format
+    //  * PeerGuardian Text (P2P): http://wiki.phoenixlabs.org/wiki/P2P_Format
+    //  * PeerGuardian Binary (P2B): http://wiki.phoenixlabs.org/wiki/P2B_Format
+    void processFilterFile(QString _filePath){
+      if(isRunning()) {
+        // Already parsing a filter, abort first
+        abort = true;
+        wait();
+      }
+      abort = false;
+      filePath = _filePath;
+      // Run it
+      start();
+    }
+
+};
+
+#endif

src/httpconnection.cpp

@@ -0,0 +1,231 @@
+/*
+ *   Copyright (C) 2007 by Ishan Arora
+ *   ishanarora@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 2 of the License, 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.,
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+#include "httpconnection.h"
+#include "httpserver.h"
+#include "eventmanager.h"
+#include "json.h"
+#include <QTcpSocket>
+#include <QDateTime>
+#include <QStringList>
+#include <QHttpRequestHeader>
+#include <QHttpResponseHeader>
+#include <QFile>
+#include <QDebug>
+#include <QTemporaryFile>
+
+HttpConnection::HttpConnection(QTcpSocket *socket, HttpServer *parent)
+	: QObject(parent), socket(socket), parent(parent)
+{
+	socket->setParent(this);
+	connect(socket, SIGNAL(readyRead()), this, SLOT(read()));
+	connect(socket, SIGNAL(disconnected()), this, SLOT(deleteLater()));
+}
+
+HttpConnection::~HttpConnection()
+{
+}
+
+void HttpConnection::read()
+{
+	QByteArray input = socket->readAll();
+	qDebug(" -------");
+	qDebug("|REQUEST|");
+	qDebug(" -------");
+	//qDebug("%s", input.toAscii().constData());
+	if(input.size() > 100000) {
+		qDebug("Request too big");
+		generator.setStatusLine(400, "Bad Request");
+		write();
+		return;
+	}
+	parser.write(input);
+	if(parser.isError())
+	{
+		generator.setStatusLine(400, "Bad Request");
+		write();
+	}
+	else
+		if (parser.isParsable())
+			respond();
+}
+
+void HttpConnection::write()
+{
+	QByteArray output = generator.toByteArray();
+	/*qDebug(" --------");
+	qDebug("|RESPONSE|");
+	qDebug(" --------");
+	qDebug()<<output;*/
+	socket->write(output);
+	socket->disconnectFromHost();
+}
+
+void HttpConnection::respond()
+{
+	qDebug("Respond called");
+	QStringList auth = parser.value("Authorization").split(" ", QString::SkipEmptyParts);
+	if (auth.size() != 2 || QString::compare(auth[0], "Basic", Qt::CaseInsensitive) != 0 || !parent->isAuthorized(auth[1].toUtf8()))
+	{
+		generator.setStatusLine(401, "Unauthorized");
+		generator.setValue("WWW-Authenticate",  "Basic realm=\"you know what\"");
+		write();
+		return;
+	}
+	QString url  = parser.url();
+	QStringList list = url.split('/', QString::SkipEmptyParts);
+	if (list.contains(".") || list.contains(".."))
+	{
+		respondNotFound();
+		return;
+	}
+	if (list.size() == 0)
+		list.append("index.html");
+	if (list.size() == 2)
+	{
+		if (list[0] == "json")
+		{
+			if (list[1] == "events")
+			{
+				EventManager* manager =  parent->eventManager();
+				uint r = parser.get("r").toUInt();
+				if(manager->isUpdated(r))
+					respondJson();
+				else
+					connect(manager, SIGNAL(updated()), this, SLOT(respondJson()));
+				return;
+			}
+		}
+		if (list[0] == "command")
+		{
+			QString command = list[1];
+			respondCommand(command);
+			generator.setStatusLine(200, "OK");
+			write();
+			return;
+		}
+	}
+	if (list[0] == "images")
+		list[0] = "Icons";
+	else
+		list.prepend("webui");
+	url = ":/" + list.join("/");
+	QFile file(url);
+	if(!file.open(QIODevice::ReadOnly))
+	{
+		respondNotFound();
+		return;
+	}
+	QString ext = list.last();
+	int index = ext.lastIndexOf('.') + 1;
+	if (index > 0)
+		ext.remove(0, index);
+	else
+		ext.clear();
+	QByteArray data = file.readAll();
+	generator.setStatusLine(200, "OK");
+	generator.setContentTypeByExt(ext);
+	generator.setMessage(data);
+	write();
+}
+
+void HttpConnection::respondNotFound()
+{
+	generator.setStatusLine(404, "File not found");
+	write();
+}
+
+void HttpConnection::respondJson()
+{
+	EventManager* manager =  parent->eventManager();
+	QString temp = parser.get("r");
+	uint r = parser.get("r").toUInt();
+	QVariant data = manager->querySince(r);
+	QString string = toJson(data);
+	generator.setStatusLine(200, "OK");
+	generator.setContentTypeByExt("js");
+	generator.setMessage(string);
+	write();
+}
+
+void HttpConnection::respondCommand(QString command)
+{
+	if(command == "download")
+	{
+		QString urls = parser.post("urls");
+		QStringList list = urls.split('\n');
+		QStringList url_list_cleaned;
+		foreach(QString url, list){
+			url = url.trimmed();
+			if(!url.isEmpty()){
+				if(url_list_cleaned.indexOf(QRegExp(url, Qt::CaseInsensitive, QRegExp::FixedString)) < 0){
+					url_list_cleaned << url;
+				}
+			}
+		}
+		emit urlsReadyToBeDownloaded(url_list_cleaned);
+		return;
+	}
+	if(command == "upload")
+	{
+		QByteArray torrentfile = parser.torrent();
+		// XXX: Trick to get a unique filename
+		QString filePath;
+		QTemporaryFile *tmpfile = new QTemporaryFile();
+		if (tmpfile->open()) {
+			filePath = tmpfile->fileName();
+		}
+		delete tmpfile;
+		// write it to HD
+		QFile torrent(filePath);
+		if(torrent.open(QIODevice::WriteOnly)) {
+			torrent.write(torrentfile);
+			torrent.close();
+		}
+		emit torrentReadyToBeDownloaded(filePath, false, QString(), false);
+		return;
+	}
+	if(command == "resumeall")
+	{
+		emit resumeAllTorrents();
+		return;
+	}
+	if(command == "pauseall")
+	{
+		emit pauseAllTorrents();
+		return;
+	}
+	if(command == "resume")
+	{
+		emit resumeTorrent(parser.post("hash"));
+		return;
+	}
+	if(command == "pause")
+	{
+		emit pauseTorrent(parser.post("hash"));
+		return;
+	}
+	if(command == "delete")
+	{
+		emit deleteTorrent(parser.post("hash"));
+		return;
+	}
+}

src/httpconnection.h

@@ -0,0 +1,68 @@
+/*
+ *   Copyright (C) 2007 by Ishan Arora
+ *   ishanarora@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 2 of the License, 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.,
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+#ifndef HTTPCONNECTION_H
+#define HTTPCONNECTION_H
+
+#include "httprequestparser.h"
+#include "httpresponsegenerator.h"
+#include <QObject>
+
+class QTcpSocket;
+
+class HttpServer;
+
+class HttpConnection : public QObject
+{
+	Q_OBJECT
+	private:
+		QTcpSocket *socket;
+		HttpServer *parent;
+
+	protected:
+		HttpRequestParser parser;
+		HttpResponseGenerator generator;
+
+	protected slots:
+		void write();
+		virtual void respond();
+		void respondJson();
+		void respondCommand(QString command);
+		void respondNotFound();
+
+	public:
+		HttpConnection(QTcpSocket *socket, HttpServer *parent);
+		~HttpConnection();
+
+	private slots:
+		void read();
+
+	signals:
+		void urlsReadyToBeDownloaded(const QStringList&);
+		void torrentReadyToBeDownloaded(QString, bool, QString, bool);
+		void deleteTorrent(QString hash);
+		void resumeTorrent(QString hash);
+		void pauseTorrent(QString hash);
+		void resumeAllTorrents();
+		void pauseAllTorrents();
+};
+
+#endif

src/httprequestparser.cpp

@@ -0,0 +1,139 @@
+/*
+ *   Copyright (C) 2007 by Ishan Arora
+ *   ishanarora@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 2 of the License, 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.,
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+#include "httprequestparser.h"
+#include <QUrl>
+#include <QDebug>
+
+HttpRequestParser::HttpRequestParser()
+{
+	headerDone = false;
+	messageDone = false;
+	error = false;
+}
+
+HttpRequestParser::~HttpRequestParser()
+{
+}
+
+bool HttpRequestParser::isParsable() const
+{
+	return !error && headerDone && isValid() && (messageDone || !hasContentLength() || contentLength() == 0);
+}
+
+bool HttpRequestParser::isError() const
+{
+	return error;
+}
+
+QString HttpRequestParser::url() const
+{
+	return path;
+}
+
+QByteArray HttpRequestParser::message() const
+{
+	if(isParsable())
+		return data;
+	return QByteArray();
+}
+
+QString HttpRequestParser::get(const QString key) const
+{
+	return getMap[key];
+}
+
+QString HttpRequestParser::post(const QString key) const
+{
+	return postMap[key];
+}
+
+QByteArray HttpRequestParser::torrent() const
+{
+	return torrent_content;
+}
+
+void HttpRequestParser::write(QByteArray str)
+{
+	while (!headerDone && str.size()>0)
+	{
+		int index = str.indexOf('\n') + 1;
+		if(index == 0)
+		{
+			data += str;
+			str.clear();
+		}
+		else
+		{
+			data += str.left(index);
+			str.remove(0, index);
+			if(data.right(4) == "\r\n\r\n")
+			{
+				QHttpRequestHeader::operator=(QHttpRequestHeader(data));
+				headerDone = true;
+				data.clear();
+				QUrl url = QUrl::fromEncoded(QHttpRequestHeader::path().toAscii());
+				path = url.path();
+				qDebug() << path;
+				QListIterator<QPair<QString, QString> > i(url.queryItems());
+				while (i.hasNext())
+				{
+					QPair<QString, QString> pair = i.next();
+					getMap[pair.first] = pair.second;
+					qDebug() << pair.first << "=" << get(pair.first);
+				}
+			}
+		}
+	}
+	if(!messageDone && str.size()>0)
+	{
+		if(hasContentLength())
+		{
+			data += str;
+			if(data.size() >= (int) contentLength())
+			{
+				data.resize(contentLength());
+				messageDone = true;
+				//parse POST data
+				if(contentType() == "application/x-www-form-urlencoded")
+				{
+					QUrl url;
+					url.setEncodedQuery(data);
+					QListIterator<QPair<QString, QString> > i(url.queryItems());
+					while (i.hasNext())
+					{
+						QPair<QString, QString> pair = i.next();
+						postMap[pair.first] = pair.second;
+						qDebug() << pair.first << "=" << post(pair.first);
+					}
+				}
+				if(contentType() == "multipart/form-data")
+				{
+					//qDebug() << data.right(data.size()-data.indexOf("\r\n\r\n")-QByteArray("\r\n\r\n").size());
+					torrent_content = data.right(data.size()-data.indexOf("\r\n\r\n")-QByteArray("\r\n\r\n").size());
+				}
+			}
+		}
+		else
+			error = true;
+	}
+	qDebug() << "isError: " << isError();
+}

src/httprequestparser.h

@@ -0,0 +1,52 @@
+/*
+ *   Copyright (C) 2007 by Ishan Arora
+ *   ishanarora@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 2 of the License, 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.,
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+#ifndef HTTPREQUESTPARSER_H
+#define HTTPREQUESTPARSER_H
+
+#include<QHttpRequestHeader>
+
+class HttpRequestParser : public QHttpRequestHeader
+{
+	private:
+		bool headerDone;
+		bool messageDone;
+		bool error;
+		QByteArray data;
+		QString path;
+		QMap<QString, QString> postMap;
+		QMap<QString, QString> getMap;
+		QByteArray torrent_content;
+
+	public:
+		HttpRequestParser();
+		~HttpRequestParser();
+		bool isParsable() const;
+		bool isError() const;
+		QString url() const;
+		QByteArray message() const;
+		QString get(const QString key) const;
+		QString post(const QString key) const;
+		QByteArray torrent() const;
+		void write(QByteArray str);
+};
+
+#endif

src/httpresponsegenerator.cpp

@@ -0,0 +1,73 @@
+/*
+ *   Copyright (C) 2007 by Ishan Arora
+ *   ishanarora@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 2 of the License, 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.,
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+#include "httpresponsegenerator.h"
+#include <QDebug>
+
+void HttpResponseGenerator::setMessage(const QByteArray message)
+{
+	HttpResponseGenerator::message = message;
+	setContentLength(message.size());
+}
+
+void HttpResponseGenerator::setMessage(const QString message)
+{
+	setMessage(message.QString::toUtf8());
+}
+
+void HttpResponseGenerator::stripMessage()
+{
+	message.clear();
+}
+
+QByteArray HttpResponseGenerator::toByteArray() const
+{
+	return QHttpResponseHeader::toString().toUtf8() + message;
+}
+
+void HttpResponseGenerator::setContentTypeByExt(const QString ext)
+{
+	if(ext == "css")
+	{
+		setContentType("text/css");
+		return;
+	}
+	if(ext == "gif")
+	{
+		setContentType("image/gif");
+		return;
+	}
+	if(ext == "htm" || ext == "html")
+	{
+		setContentType("text/html");
+		return;
+	}
+	if(ext == "js")
+	{
+		setContentType("text/javascript");
+		return;
+	}
+	if(ext == "png")
+	{
+		setContentType("image/x-png");
+		return;
+	}
+}

src/httpresponsegenerator.h

@@ -0,0 +1,40 @@
+/*
+ *   Copyright (C) 2007 by Ishan Arora
+ *   ishanarora@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 2 of the License, 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.,
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+#ifndef HTTPRESPONSEGENERATOR_H
+#define HTTPRESPONSEGENERATOR_H
+
+#include<QHttpResponseHeader>
+
+class HttpResponseGenerator : public QHttpResponseHeader
+{
+	private:
+		QByteArray message;
+
+	public:
+		void setMessage(const QByteArray message);
+		void setMessage(const QString message);
+		void stripMessage();
+		void setContentTypeByExt(const QString ext);
+		virtual QByteArray toByteArray() const;
+};
+
+#endif

src/httpserver.cpp

@@ -0,0 +1,99 @@
+/*
+ *   Copyright (C) 2007 by Ishan Arora
+ *   ishanarora@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 2 of the License, 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.,
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+#include "httpserver.h"
+#include "httpconnection.h"
+#include "eventmanager.h"
+#include "bittorrent.h"
+#include <QTimer>
+
+HttpServer::HttpServer(bittorrent *BTSession, int msec, QObject* parent) : QTcpServer(parent)
+{
+	base64 = QByteArray(":").toBase64();
+	connect(this, SIGNAL(newConnection()), this, SLOT(newHttpConnection()));
+	HttpServer::BTSession = BTSession;
+	manager = new EventManager(this, BTSession);
+	//add torrents
+	QStringList list = BTSession->getUnfinishedTorrents() + BTSession->getFinishedTorrents();
+	QString hash;
+	foreach(hash, list)
+	{
+		QTorrentHandle h = BTSession->getTorrentHandle(hash);
+		if(h.is_valid())
+			manager->addedTorrent(QString(), h);
+	}
+	//connect BTSession to manager
+	connect(BTSession, SIGNAL(addedTorrent(QString, QTorrentHandle&, bool)), manager, SLOT(addedTorrent(QString, QTorrentHandle&)));
+	connect(BTSession, SIGNAL(deletedTorrent(QString)), manager, SLOT(deletedTorrent(QString)));
+	//set timer
+	QTimer *timer = new QTimer(this);
+	connect(timer, SIGNAL(timeout()), this, SLOT(onTimer()));
+	timer->start(msec);
+}
+
+HttpServer::~HttpServer()
+{
+	delete manager;
+}
+
+void HttpServer::newHttpConnection()
+{
+	QTcpSocket *socket;
+	while((socket = nextPendingConnection()))
+	{
+		HttpConnection *connection = new HttpConnection(socket, this);
+		//connect connection to BTSession
+		connect(connection, SIGNAL(urlsReadyToBeDownloaded(const QStringList&)), BTSession, SLOT(downloadFromURLList(const QStringList&)));
+		connect(connection, SIGNAL(torrentReadyToBeDownloaded(QString, bool, QString, bool)), BTSession, SLOT(addTorrent(QString, bool, QString, bool)));
+		connect(connection, SIGNAL(deleteTorrent(QString)), BTSession, SLOT(deleteTorrent(QString)));
+		connect(connection, SIGNAL(pauseTorrent(QString)), BTSession, SLOT(pauseTorrent(QString)));
+		connect(connection, SIGNAL(resumeTorrent(QString)), BTSession, SLOT(resumeTorrent(QString)));
+		connect(connection, SIGNAL(pauseAllTorrents()), BTSession, SLOT(pauseAllTorrents()));
+		connect(connection, SIGNAL(resumeAllTorrents()), BTSession, SLOT(resumeAllTorrents()));
+	}
+}
+
+void HttpServer::onTimer()
+{
+	QStringList list = BTSession->getUnfinishedTorrents() + BTSession->getFinishedTorrents();
+	foreach(QString hash, list)
+	{
+		QTorrentHandle h = BTSession->getTorrentHandle(hash);
+		if(h.is_valid())
+			manager->modifiedTorrent(h);
+	}
+}
+
+void HttpServer::setAuthorization(QString username, QString password)
+{
+	QString cat = username + ":" + password;
+	base64 = QByteArray(cat.toUtf8()).toBase64();
+}
+
+bool HttpServer::isAuthorized(QByteArray auth) const
+{
+	return (auth == base64);
+}
+
+EventManager *HttpServer::eventManager() const
+{
+	return manager;
+}

src/httpserver.h

@@ -0,0 +1,53 @@
+/*
+ *   Copyright (C) 2007 by Ishan Arora
+ *   ishanarora@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 2 of the License, 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.,
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+#ifndef HTTPSERVER_H
+#define HTTPSERVER_H
+
+#include <QTcpServer>
+#include <QByteArray>
+
+class bittorrent;
+
+class EventManager;
+
+class HttpServer : public QTcpServer
+{
+	Q_OBJECT
+
+	private:
+		QByteArray base64;
+		bittorrent *BTSession;
+		EventManager *manager;
+
+	public:
+		HttpServer(bittorrent *BTSession, int msec, QObject* parent = 0);
+		~HttpServer();
+		void setAuthorization(QString username, QString password);
+		bool isAuthorized(QByteArray auth) const;
+		EventManager *eventManager() const;
+
+	private slots:
+		void newHttpConnection();
+		void onTimer();
+};
+
+#endif

src/icons.qrc

@@ -1,104 +1,105 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-  <file>Icons/time.png</file>
-  <file>Icons/connection.png</file>
-  <file>Icons/locale.png</file>
-  <file>Icons/newmsg.png</file>
-  <file>Icons/url.png</file>
-  <file>Icons/button_ok.png</file>
-  <file>Icons/stare.png</file>
-  <file>Icons/log.png</file>
-  <file>Icons/qbittorrent32.png</file>
-  <file>Icons/downarrow.png</file>
-  <file>Icons/description.png</file>
-  <file>Icons/qbittorrent16.png</file>
-  <file>Icons/file.png</file>
-  <file>Icons/systemtray.png</file>
-  <file>Icons/unhappy.png</file>
-  <file>Icons/filter.png</file>
-  <file>Icons/sphere.png</file>
-  <file>Icons/mascot.png</file>
-  <file>Icons/encrypted.png</file>
-  <file>Icons/refresh.png</file>
-  <file>Icons/uparrow.png</file>
-  <file>Icons/style.png</file>
-  <file>Icons/wizard.png</file>
-  <file>Icons/password.png</file>
-  <file>Icons/gear.png</file>
-  <file>Icons/sphere2.png</file>
-  <file>Icons/smile.png</file>
-  <file>Icons/loading.png</file>
-  <file>Icons/button_cancel.png</file>
-  <file>Icons/qbittorrent22.png</file>
-  <file>Icons/proxy.png</file>
-  <file>Icons/add_folder.png</file>
-  <file>Icons/unavailable.png</file>
   <file>Icons/add_file.png</file>
-  <file>Icons/home.png</file>
-  <file>Icons/splash.png</file>
-  <file>Icons/rss32.png</file>
-  <file>Icons/rss16.png</file>
-  <file>Icons/unsubscribe.png</file>
-  <file>Icons/subscribe.png</file>
-  <file>Icons/unsubscribe16.png</file>
-  <file>Icons/subscribe16.png</file>
+  <file>Icons/add_folder.png</file>
   <file>Icons/bt_settings.png</file>
-  <file>Icons/star.png</file>
+  <file>Icons/button_cancel.png</file>
+  <file>Icons/button_ok.png</file>
   <file>Icons/configure.png</file>
+  <file>Icons/connection.png</file>
+  <file>Icons/description.png</file>
+  <file>Icons/downarrow.png</file>
   <file>Icons/download.png</file>
-  <file>Icons/folder.png</file>
   <file>Icons/edit_clear.png</file>
-  <file>Icons/flags/portugal.png</file>
+  <file>Icons/encrypted.png</file>
+  <file>Icons/file.png</file>
+  <file>Icons/filter.png</file>
+  <file>Icons/folder.png</file>
+  <file>Icons/gear.png</file>
+  <file>Icons/gnome-shutdown.png</file>
+  <file>Icons/home.png</file>
+  <file>Icons/loading.png</file>
+  <file>Icons/locale.png</file>
+  <file>Icons/log.png</file>
+  <file>Icons/mascot.png</file>
+  <file>Icons/money.png</file>
+  <file>Icons/newmsg.png</file>
+  <file>Icons/password.png</file>
+  <file>Icons/proxy.png</file>
+  <file>Icons/qbittorrent16.png</file>
+  <file>Icons/qbittorrent22.png</file>
+  <file>Icons/qbittorrent32.png</file>
+  <file>Icons/refresh.png</file>
+  <file>Icons/rss16.png</file>
+  <file>Icons/rss32.png</file>
+  <file>Icons/sphere.png</file>
+  <file>Icons/sphere2.png</file>
+  <file>Icons/splash.png</file>
+  <file>Icons/star.png</file>
+  <file>Icons/style.png</file>
+  <file>Icons/subscribe.png</file>
+  <file>Icons/subscribe16.png</file>
+  <file>Icons/systemtray.png</file>
+  <file>Icons/time.png</file>
+  <file>Icons/unavailable.png</file>
+  <file>Icons/unsubscribe.png</file>
+  <file>Icons/unsubscribe16.png</file>
+  <file>Icons/uparrow.png</file>
+  <file>Icons/url.png</file>
+  <file>Icons/wizard.png</file>
+  <file>Icons/flags/brazil.png</file>
+  <file>Icons/flags/bulgaria.png</file>
+  <file>Icons/flags/china.png</file>
+  <file>Icons/flags/denmark.png</file>
+  <file>Icons/flags/finland.png</file>
   <file>Icons/flags/france.png</file>
+  <file>Icons/flags/germany.png</file>
+  <file>Icons/flags/greece.png</file>
+  <file>Icons/flags/hungary.png</file>
+  <file>Icons/flags/italy.png</file>
+  <file>Icons/flags/japan.png</file>
+  <file>Icons/flags/netherlands.png</file>
+  <file>Icons/flags/norway.png</file>
+  <file>Icons/flags/poland.png</file>
+  <file>Icons/flags/portugal.png</file>
+  <file>Icons/flags/romania.png</file>
+  <file>Icons/flags/russia.png</file>
+  <file>Icons/flags/slovakia.png</file>
+  <file>Icons/flags/south_korea.png</file>
+  <file>Icons/flags/spain.png</file>
+  <file>Icons/flags/spain_catalunya.png</file>
+  <file>Icons/flags/sweden.png</file>
+  <file>Icons/flags/turkey.png</file>
   <file>Icons/flags/ukraine.png</file>
   <file>Icons/flags/united_kingdom.png</file>
-  <file>Icons/flags/germany.png</file>
-  <file>Icons/flags/russia.png</file>
-  <file>Icons/flags/netherlands.png</file>
-  <file>Icons/flags/slovakia.png</file>
-  <file>Icons/flags/spain.png</file>
-  <file>Icons/flags/finland.png</file>
-  <file>Icons/flags/spain_catalunya.png</file>
-  <file>Icons/flags/poland.png</file>
-  <file>Icons/flags/hungary.png</file>
-  <file>Icons/flags/norway.png</file>
-  <file>Icons/flags/denmark.png</file>
-  <file>Icons/flags/italy.png</file>
-  <file>Icons/flags/china.png</file>
-  <file>Icons/flags/brazil.png</file>
-  <file>Icons/flags/south_korea.png</file>
-  <file>Icons/flags/turkey.png</file>
-  <file>Icons/flags/sweden.png</file>
-  <file>Icons/flags/bulgaria.png</file>
-  <file>Icons/flags/romania.png</file>
-  <file>Icons/flags/japan.png</file>
-  <file>Icons/flags/greece.png</file>
-  <file>Icons/skin/properties.png</file>
-  <file>Icons/skin/play_all.png</file>
-  <file>Icons/skin/remove.png</file>
-  <file>Icons/skin/settings.png</file>
-  <file>Icons/skin/open.png</file>
-  <file>Icons/skin/disconnected.png</file>
-  <file>Icons/skin/delete.png</file>
-  <file>Icons/skin/connected.png</file>
-  <file>Icons/skin/url.png</file>
-  <file>Icons/skin/pause_all.png</file>
-  <file>Icons/skin/downloading.png</file>
-  <file>Icons/skin/play.png</file>
-  <file>Icons/skin/search.png</file>
-  <file>Icons/skin/exit.png</file>
-  <file>Icons/skin/pause.png</file>
-  <file>Icons/skin/firewalled.png</file>
-  <file>Icons/skin/seeding.png</file>
-  <file>Icons/skin/paused.png</file>
-  <file>Icons/skin/preview.png</file>
-  <file>Icons/skin/delete_perm.png</file>
-  <file>Icons/skin/connecting.png</file>
   <file>Icons/skin/add.png</file>
-  <file>Icons/skin/stalled.png</file>
-  <file>Icons/skin/new.png</file>
-  <file>Icons/skin/qb_question.png</file>
+  <file>Icons/skin/connected.png</file>
+  <file>Icons/skin/connecting.png</file>
+  <file>Icons/skin/decrease.png</file>
+  <file>Icons/skin/delete.png</file>
   <file>Icons/skin/delete_all.png</file>
+  <file>Icons/skin/delete_perm.png</file>
+  <file>Icons/skin/downloading.png</file>
+  <file>Icons/skin/exit.png</file>
+  <file>Icons/skin/firewalled.png</file>
+  <file>Icons/skin/increase.png</file>
   <file>Icons/skin/info.png</file>
+  <file>Icons/skin/new.png</file>
+  <file>Icons/skin/open.png</file>
+  <file>Icons/skin/pause.png</file>
+  <file>Icons/skin/pause_all.png</file>
+  <file>Icons/skin/paused.png</file>
+  <file>Icons/skin/play.png</file>
+  <file>Icons/skin/play_all.png</file>
+  <file>Icons/skin/preview.png</file>
+  <file>Icons/skin/properties.png</file>
+  <file>Icons/skin/qb_question.png</file>
+  <file>Icons/skin/queued.png</file>
+  <file>Icons/skin/remove.png</file>
+  <file>Icons/skin/search.png</file>
+  <file>Icons/skin/seeding.png</file>
+  <file>Icons/skin/settings.png</file>
+  <file>Icons/skin/stalled.png</file>
+  <file>Icons/skin/url.png</file>
 </qresource>
 </RCC>

src/json.cpp

@@ -0,0 +1,103 @@
+/*
+ *   Copyright (C) 2007 by Ishan Arora
+ *   ishanarora@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 2 of the License, 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.,
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+#include "json.h"
+
+QString toJson(QVariant v)
+{
+	if (v.isNull())
+		return "null";
+	QString result;
+	switch(v.type())
+	{
+		case QVariant::Bool:
+		case QVariant::Double:
+		case QVariant::Int:
+		case QVariant::LongLong:
+		case QVariant::UInt:
+		case QVariant::ULongLong:
+			return v.value<QString>();
+		case QVariant::String:
+		{
+			QString s = v.value<QString>();
+			result = "\"";
+			for(int i=0; i<s.size(); i++)
+			{
+				QChar ch = s[i];
+				switch(ch.toAscii())
+				{
+					case '\b':
+						result += "\\b";
+						break;
+					case '\f':
+						result += "\\f";
+						break;
+					case '\n':
+						result += "\\n";
+						break;
+					case '\r':
+						result += "\\r";
+						break;
+					case '\t':
+						result += "\\t";
+						break;
+					case '\"':
+					case '\'':
+					case '\\':
+					case '&':
+						result += '\\';
+					case '\0':
+					default:
+						result += ch;
+				}
+			}
+			result += "\"";
+			return result;
+		}
+		case QVariant::List:
+		{
+			result = "[";
+			QListIterator<QVariant> it(v.value<QVariantList>());
+			while (it.hasNext())
+				result += toJson(it.next()) + ",";
+			if(result.size() > 1)
+				result.chop(1);
+			result += "]";
+			return result;
+		}
+		case QVariant::Map:
+		{
+			result = "{";
+			QMapIterator<QString, QVariant> it(v.value<QVariantMap>());
+			while (it.hasNext()) {
+				it.next();
+				if(it.value().isValid())
+					result += toJson(QVariant(it.key())) + ":" + toJson(it.value()) + ",";
+			}
+			if(result.size() > 1)
+				result.chop(1);
+			result += "}";
+			return result;
+		}
+		default:
+			return "undefined";
+	}
+}

src/json.h

@@ -0,0 +1,29 @@
+/*
+ *   Copyright (C) 2007 by Ishan Arora
+ *   ishanarora@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 2 of the License, 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.,
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+#ifndef JSON_H
+#define JSON_H
+
+#include <QVariant>
+
+QString toJson(QVariant v);
+
+#endif

src/lang.qrc

@@ -1,29 +1,29 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-  <file>lang/qbittorrent_es.qm</file>
-  <file>lang/qbittorrent_ko.qm</file>
-  <file>lang/qbittorrent_hu.qm</file>
-  <file>lang/qbittorrent_sk.qm</file>
-  <file>lang/qbittorrent_uk.qm</file>
-  <file>lang/qbittorrent_ro.qm</file>
-  <file>lang/qbittorrent_ru.qm</file>
-  <file>lang/qbittorrent_nb.qm</file>
+  <file>lang/qbittorrent_bg.qm</file>
+  <file>lang/qbittorrent_ca.qm</file>
+  <file>lang/qbittorrent_da.qm</file>
+  <file>lang/qbittorrent_de.qm</file>
   <file>lang/qbittorrent_el.qm</file>
   <file>lang/qbittorrent_en.qm</file>
-  <file>lang/qbittorrent_pt_BR.qm</file>
+  <file>lang/qbittorrent_es.qm</file>
+  <file>lang/qbittorrent_fi.qm</file>
   <file>lang/qbittorrent_fr.qm</file>
+  <file>lang/qbittorrent_hu.qm</file>
+  <file>lang/qbittorrent_it.qm</file>
+  <file>lang/qbittorrent_ja.qm</file>
+  <file>lang/qbittorrent_ko.qm</file>
+  <file>lang/qbittorrent_nb.qm</file>
   <file>lang/qbittorrent_nl.qm</file>
   <file>lang/qbittorrent_pl.qm</file>
-  <file>lang/qbittorrent_it.qm</file>
-  <file>lang/qbittorrent_zh.qm</file>
-  <file>lang/qbittorrent_ca.qm</file>
   <file>lang/qbittorrent_pt.qm</file>
-  <file>lang/qbittorrent_da.qm</file>
-  <file>lang/qbittorrent_tr.qm</file>
-  <file>lang/qbittorrent_bg.qm</file>
-  <file>lang/qbittorrent_de.qm</file>
+  <file>lang/qbittorrent_pt_BR.qm</file>
+  <file>lang/qbittorrent_ro.qm</file>
+  <file>lang/qbittorrent_ru.qm</file>
+  <file>lang/qbittorrent_sk.qm</file>
   <file>lang/qbittorrent_sv.qm</file>
-  <file>lang/qbittorrent_ja.qm</file>
-  <file>lang/qbittorrent_fi.qm</file>
+  <file>lang/qbittorrent_tr.qm</file>
+  <file>lang/qbittorrent_uk.qm</file>
+  <file>lang/qbittorrent_zh.qm</file>
 </qresource>
 </RCC>