tagged v1.3.0 release

- Remove outdated comment

AUTHORS

@@ -3,4 +3,77 @@ Author:
 
 Contributors:
 * Arnaud Demaizière <arnaud@qbittorrent.org>
-* Ishan Arora <ishanarora@gmail.com>
+* Ishan Arora <ishan@qbittorrent.org>
+* Grigis Gaëtan <cipher16@gmail.com>
+
+Code from other projects:
+* files src/ico.cpp src/ico.h
+  copyright: Malte Starostik <malte@kde.org>
+  license: LGPL
+
+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/skin/*.png
+  files: src/menuicons/YYxYY/*.png
+  copyright: Mateusz Tobola <tobejodok@qbittorrent.org>
+  license: GPLv2
+
+* file: src/Icons/skin/tabs.gif
+  copyright: Greg Houston <gregory.houston@gmail.com>
+  license: MIT
+
+* 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 (yue.guo0418@gmail.com)
+  - Chinese (Traditional): Yi-Shun Wang (dnextstep@gmail.com)
+  - Czech: Jirka Vilim (web@tets.cz)
+  - 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,8 +1,85 @@
-* Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.1.0
+* Fri Jan 9 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.3.0
+    - FEATURE: Based on libtorrent-rasterbar v0.14.2
+    - FEATURE: Improved ratio calculation system
+    - FEATURE: Torrent creation code cleanup
+    - FEATURE: Allow to set maximum number of active seeds (queueing)
+    - FEATURE: Now seeds priorities are handled automatically by libtorrent-rasterbar (queueing)
+    - FEATURE: Code cleanup and optimization (save memory and cpu)
+    - FEATURE: ETA calculation now relies on average speed over all sessions
+    - FEATURE: Allow to force rechecking torrents
+    - FEATURE: Added support for 2 new extensions (uTorrent metadata and smart ban plugin)
+    - FEATURE: Allow to change the save path of torrents after addition
+    - FEATURE: Got rid of libmagick++ dependency
+    - FEATURE: Updated Web interface to MochaUI v0.9.5
+    - FEATURE: Added notification in WebUI when qBittorrent is not reachable
+    - FEATURE: Rewrote folder scanning code (Now uses a filesystem watcher)
+    - FEATURE: Added torrent deletion from hard drive function in Web UI
+    - FEATURE: Added queueing priority actions in Web UI
+    - FEATURE: Display progress using progress bars in Web UI
+    - BUGFIX: Made usage of fastresume data more reliable
+    - BUGFIX: qBittorrent shutdown is now faster
+    - BUGFIX: Fixed several memory leaks
+    - BUGFIX: WebUI is now working with IE7
+    - BUGFIX: Fixed spacing problem in toolbar when toggling its visibility
+    - BUGFIX: Fixed some compilation and Qt4 warnings
+    - BUGFIX: Do not use an addition dialog for torrents from folder scanning
+    - BUGFIX: Catch SIGTERM to exit cleanly (e.g. computer shutdown)
+    - BUGFIX: Improved proxy support code
+    - BUGFIX: Fixed systray icon tooltip on Windows
+    - BUGFIX: Proxy settings are now saved even if disabled
+
+* Sun Nov 9 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.2.1
+    - BUGFIX: Fixed possible crash when deleting a torrent permanently
+    - BUGFIX: Queued_for_checking torrents were not displayed as checking in seeding list
+    - BUGFIX: Speed up startup time when having a lot of torrents
+
+* Wed Oct 29th 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.2.0
+    - FEATURE: Torrent queueing system (with priorities)
+    - FEATURE: The number of DHT nodes is displayed
+    - FEATURE: RSS can now be disabled from program preferences
+    - FEATURE: Added collapse/expand all buttons in addition and properties dialogs
+    - FEATURE: Can have different proxies for Bittorrent and search engine
+    - FEATURE: Allow multiple item selection in Web UI transfer list
+    - FEATURE: Moved uploads to a separate list in Web UI
+    - BUGFIX: Totally rewritten Web UI list refresh system (fixed memory leak)
+    - BUGFIX: Disable ETA calculation when ETA column is hidden
+    - BUGFIX: Removed "disconnected" connection state, detection was far from perfect
+    - BUGFIX: Torrents are no longer starting from scratch when changing default save path (when torrent addition dialog is disabled)
+    - BUGFIX: Single instance code is now more reliable on Qt >= 4.4
+    - 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: Log is now in a separate dialog
+
+* Sun Sept 14 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.1.4
+    - FEATURE: DHT is no longer used as fallback only
+    - FEATURE: Ported WebUI to Mootools v1.2
+    - BUGFIX: Fixed 'start seeding after torrent creation' feature
+    - BUGFIX: Fixed compilation with boost v1.36
+    - BUGFIX: Some code optimization
+    - BUGFIX: Fixed memory leak in Web UI
+    - BUGFIX: Fixed problems with column sorting
+    - BUGFIX: Improved code for pausing torrents on startup
+    - BUGFIX: Torrent addition dialog is now disabled for downloads from WebUI
+    - BUGFIX: Give focus to input field in WebUI download dialog
+
+* Tue Aug 26 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.1.3
+    - BUGFIX: Fixed ratio saving for seeding torrents
+    - I18N: Added czech and traditional chinese translations
+
+* Sun Aug 17 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.1.2
+    - BUGFIX: Fixed progress calculation
+    - BUGFIX: Fixed finished torrent detection
+
+* Fri Aug 01 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.1.1
+    - BUGFIX: Fixed bad resource file for icons
+
+* 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
@@ -14,14 +91,19 @@
     - 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

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.14.0 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,37 +1,18 @@
-// 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 careful, the link can be relative
-- Improve search plugin install (choose in a list taken from plugins.qbittorrent.org)
-- support zipped torrents? (useful?)
-- Allow to limit the number of downloading torrents simultaneously (other are paused until a download finishes)
-
-// in v1.2.0
-- Allow user to organize the downloads into categories/folders?
-
-// in v1.1.0
-- Stop calculating ETAs when ETA column is hidden
--> See https://blueprints.launchpad.net/qbittorrent
+See https://blueprints.launchpad.net/qbittorrent/
 
+// translations done in v1.3.0
+- Romanian
+- Russian
+- Hungarian
+- German
+- Chinese (traditional)
+- Chinese (simplified)
+- Italian
+- Swedish
+- Turkish
+- French
+- Slovak
+- Czech
+- Korean
+- Portuguese
+- Brazilian

configure

@@ -18,15 +18,14 @@ 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
-  --disable-libmagick                    Disable use of libmagick
-  --with-libmagick-inc=[path]             Path to libmagick++ include files
-  --with-libmagick-lib=[path]             Path to libmagick++ library files
   --disable-libzzip                      Disable use of libzzip
   --with-libzzip-inc=[path]               Path to libzzip++ include files
   --with-libzzip-lib=[path]               Path to libzzip++ library files
@@ -176,21 +175,6 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
-		--disable-libmagick)
-			QC_DISABLE_libmagick="Y"
-			shift
-			;;
-
-		--with-libmagick-inc=*)
-			QC_WITH_LIBMAGICK_INC=$optarg
-			shift
-			;;
-
-		--with-libmagick-lib=*)
-			QC_WITH_LIBMAGICK_LIB=$optarg
-			shift
-			;;
-
 		--disable-libzzip)
 			QC_DISABLE_libzzip="Y"
 			shift
@@ -233,9 +217,6 @@ echo QC_WITH_LIBTORRENT_STATIC_LIB=$QC_WITH_LIBTORRENT_STATIC_LIB
 echo QC_WITH_LIBBOOST_INC=$QC_WITH_LIBBOOST_INC
 echo QC_WITH_LIBCURL_INC=$QC_WITH_LIBCURL_INC
 echo QC_WITH_LIBCURL_LIB=$QC_WITH_LIBCURL_LIB
-echo QC_DISABLE_libmagick=$QC_DISABLE_libmagick
-echo QC_WITH_LIBMAGICK_INC=$QC_WITH_LIBMAGICK_INC
-echo QC_WITH_LIBMAGICK_LIB=$QC_WITH_LIBMAGICK_LIB
 echo QC_DISABLE_libzzip=$QC_DISABLE_libzzip
 echo QC_WITH_LIBZZIP_INC=$QC_WITH_LIBZZIP_INC
 echo QC_WITH_LIBZZIP_LIB=$QC_WITH_LIBZZIP_LIB
@@ -354,29 +335,33 @@ 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.14"; }
+	QString shortname() const { return "libtorrent-rasterbar"; }
 	bool exec(){
         	QString s;
 		s = conf->getenv("QC_WITH_LIBTORRENT_INC");
 		if(!s.isEmpty()) {
-			if(!conf->checkHeader(s, "libtorrent/lsd.hpp")) {
+			if(!conf->checkHeader(s, "libtorrent/magnet_uri.hpp")) {
 				return false;
       			}
 		}else{
@@ -385,7 +370,7 @@ public:
 			sl << "/usr/local/include";
 			bool found = false;
 			foreach(s, sl){
-				if(conf->checkHeader(s, "libtorrent/lsd.hpp")){
+				if(conf->checkHeader(s, "libtorrent/magnet_uri.hpp")){
 					found = true;
 					break;
 				}
@@ -405,7 +390,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 +402,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;
 				}
@@ -547,86 +532,6 @@ public:
 		return true;
 	}
 };
-#line 1 "libmagick.qcm"
-/*
------BEGIN QCMOD-----
-name: libmagick
-arg: with-libmagick-inc=[path], Path to libmagick++ include files
-arg: with-libmagick-lib=[path], Path to libmagick++ library files
------END QCMOD-----
-*/
-#include <QProcess>
-class qc_libmagick : public ConfObj
-{
-public:
-	qc_libmagick(Conf *c) : ConfObj(c) {}
-	QString name() const { return "ImageMagick library (libmagick++)"; }
-	QString shortname() const { return "libmagick++"; }
-	QString checkString() const {
-		if(!conf->getenv("QC_DISABLE_libmagick").isEmpty())
-			return "";
-		return ConfObj::checkString();
-	}
-	bool exec(){
-		if(!conf->getenv("QC_DISABLE_libmagick").isEmpty())
-			return false;
-		QString s;
-		s = conf->getenv("QC_WITH_LIBMAGICK_INC");
-		if(!s.isEmpty()) {
-			if(!conf->checkHeader(s, "Magick++.h")) {
-				return false;
-    			}
-		}else{
-			QStringList sl;
-			sl << "/usr/include";
-			sl << "/usr/local/include";
-			bool found = false;
-			foreach(s, sl){
-				if(conf->checkHeader(s, "Magick++.h")){
-					found = true;
-					break;
-				}
-			}
-			if(!found)
-				return false;
-		}
-		conf->addIncludePath(s);
-
-		s = conf->getenv("QC_WITH_LIBMAGICK_LIB");
-		if(!s.isEmpty()) {
-                        if(!conf->checkLibrary(s, "Magick++")) {
-				return false;
-			}
-		}else{
-			QStringList sl;
-			sl << "/usr/lib/";
-			sl << "/usr/lib64/";
-			sl << "/usr/local/lib/";
-			sl << "/usr/local/lib64/";
-			bool found = false;
-			foreach(s, sl){
-				if(conf->checkLibrary(s, "Magick++")) {
-					found = true;
-                                        break;
-				}
-			}
-			if(!found)
-                         	return false;
-		}
-		conf->addLib(QString("-L") + s);
-		QProcess magickConfig;
-		QStringList params;
-		params << "--libs";
-		magickConfig.start("Magick++-config", params, QIODevice::ReadOnly);
-		magickConfig.waitForStarted();
-		magickConfig.waitForFinished();
-		QByteArray result = magickConfig.readAll();
-		result = result.replace("\n", "");
-		conf->addLib(result.data());
-		conf->addDefine("HAVE_MAGICK");
-		return true;
-	}
-};
 #line 1 "libzzip.qcm"
 /*
 -----BEGIN QCMOD-----
@@ -705,7 +610,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);
@@ -714,9 +619,6 @@ cat >$1/modules_new.cpp <<EOT
     o = new qc_libcurl(conf);
     o->required = true;
     o->disabled = false;
-    o = new qc_libmagick(conf);
-    o->required = false;
-    o->disabled = false;
     o = new qc_libzzip(conf);
     o->required = false;
     o->disabled = false;
@@ -1671,9 +1573,6 @@ export QC_WITH_LIBTORRENT_STATIC_LIB
 export QC_WITH_LIBBOOST_INC
 export QC_WITH_LIBCURL_INC
 export QC_WITH_LIBCURL_LIB
-export QC_DISABLE_libmagick
-export QC_WITH_LIBMAGICK_INC
-export QC_WITH_LIBMAGICK_LIB
 export QC_DISABLE_libzzip
 export QC_WITH_LIBZZIP_INC
 export QC_WITH_LIBZZIP_LIB

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.qc

@@ -6,7 +6,7 @@
   <dep type='qt4'>
     <required/>
   </dep>
-  <dep type='libtorrent'>
+  <dep type='libtorrent-rasterbar'>
     <required/>
   </dep>
   <dep type='libboost'>
@@ -15,6 +15,5 @@
   <dep type='libcurl'>
     <required/>
   </dep>
-  <dep type='libmagick'/>
   <dep type='libzzip'/>
 </qconf>

qcm/libtorrent-rasterbar.qcm

@@ -1,22 +1,22 @@
 /*
 -----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.14"; }
+	QString shortname() const { return "libtorrent-rasterbar"; }
 	bool exec(){
         	QString s;
 		s = conf->getenv("QC_WITH_LIBTORRENT_INC");
 		if(!s.isEmpty()) {
-			if(!conf->checkHeader(s, "libtorrent/lsd.hpp")) {
+			if(!conf->checkHeader(s, "libtorrent/magnet_uri.hpp")) {
 				return false;
       			}
 		}else{
@@ -25,7 +25,7 @@ public:
 			sl << "/usr/local/include";
 			bool found = false;
 			foreach(s, sl){
-				if(conf->checkHeader(s, "libtorrent/lsd.hpp")){
+				if(conf->checkHeader(s, "libtorrent/magnet_uri.hpp")){
 					found = true;
 					break;
 				}
@@ -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/FinishedTorrents.cpp

@@ -31,12 +31,12 @@
 #include <QStandardItemModel>
 #include <QHeaderView>
 #include <QMenu>
+#include <QMessageBox>
 
 FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : parent(parent), BTSession(BTSession), nbFinished(0){
   setupUi(this);
   actionStart->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/play.png")));
   actionPause->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/pause.png")));
-  connect(BTSession, SIGNAL(addedTorrent(QString, QTorrentHandle&, bool)), this, SLOT(torrentAdded(QString, QTorrentHandle&, bool)));
   finishedListModel = new QStandardItemModel(0,6);
   finishedListModel->setHeaderData(F_NAME, Qt::Horizontal, tr("Name", "i.e: file name"));
   finishedListModel->setHeaderData(F_SIZE, Qt::Horizontal, tr("Size", "i.e: file size"));
@@ -54,13 +54,12 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
   // Make download list header clickable for sorting
   finishedList->header()->setClickable(true);
   finishedList->header()->setSortIndicatorShown(true);
-  connect(finishedList->header(), SIGNAL(sectionPressed(int)), this, SLOT(sortFinishedList(int)));
+  connect(finishedList->header(), SIGNAL(sectionPressed(int)), this, SLOT(toggleFinishedListSortOrder(int)));
   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&)));
   actionDelete->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/delete.png")));
   actionPreview_file->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/preview.png")));
@@ -75,6 +74,7 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
   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(actionForce_recheck, SIGNAL(triggered()), this, SLOT(forceRecheck()));
 
   connect(actionHOSColName, SIGNAL(triggered()), this, SLOT(hideOrShowColumnName()));
   connect(actionHOSColSize, SIGNAL(triggered()), this, SLOT(hideOrShowColumnSize()));
@@ -97,9 +97,6 @@ void FinishedTorrents::notifyTorrentDoubleClicked(const QModelIndex& index) {
 }
 
 void FinishedTorrents::addTorrent(QString hash){
-  if(!BTSession->isFinished(hash)){
-    BTSession->setFinishedTorrent(hash);
-  }
   int row = getRowFromHash(hash);
   if(row != -1) return;
   row = finishedListModel->rowCount();
@@ -122,13 +119,8 @@ void FinishedTorrents::addTorrent(QString hash){
   // Update the number of finished torrents
   ++nbFinished;
   emit finishedTorrentsNumberChanged(nbFinished);
-}
-
-void FinishedTorrents::torrentAdded(QString, QTorrentHandle& h, bool) {
-  QString hash = h.hash();
-  if(BTSession->isFinished(hash)) {
-    addTorrent(hash);
-  }
+  // Sort List
+  sortFinishedList();
 }
 
 // Set the color of a row in data model
@@ -173,10 +165,27 @@ bool FinishedTorrents::loadColWidthFinishedList(){
   for(unsigned int i=0; i<listSize; ++i){
         finishedList->header()->resizeSection(i, width_list.at(i).toInt());
   }
+  loadLastSortedColumn();
   qDebug("Finished list columns width loaded");
   return true;
 }
 
+void FinishedTorrents::loadLastSortedColumn() {
+  // Loading last sorted column
+  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+  QString sortedCol = settings.value(QString::fromUtf8("FinishedListSortedCol"), QString()).toString();
+  if(!sortedCol.isEmpty()) {
+    Qt::SortOrder sortOrder;
+    if(sortedCol.endsWith(QString::fromUtf8("d")))
+      sortOrder = Qt::DescendingOrder;
+    else
+      sortOrder = Qt::AscendingOrder;
+    sortedCol = sortedCol.left(sortedCol.size()-1);
+    int index = sortedCol.toInt();
+    sortFinishedList(index, sortOrder);
+  }
+}
+
 // Save columns width in a file to remember them
 // (finished list)
 void FinishedTorrents::saveColWidthFinishedList() const{
@@ -220,15 +229,8 @@ void FinishedTorrents::on_actionSet_upload_limit_triggered(){
   new BandwidthAllocationDialog(this, true, BTSession, hashes);
 }
 
-void FinishedTorrents::updateFinishedList(){
-  QString hash;
-  QStringList finishedSHAs = BTSession->getFinishedTorrents();
-  foreach(hash, finishedSHAs){
-    QTorrentHandle h = BTSession->getTorrentHandle(hash);
-    if(!h.is_valid()){
-      qDebug("Problem: This torrent is not valid in finished list");
-      continue;
-    }
+void FinishedTorrents::updateTorrent(QTorrentHandle h) {
+    QString hash = h.hash();
     int row = getRowFromHash(hash);
     if(row == -1){
       qDebug("Cannot find torrent in finished list, adding it");
@@ -236,22 +238,24 @@ void FinishedTorrents::updateFinishedList(){
       row = getRowFromHash(hash);
     }
     Q_ASSERT(row != -1);
-    if(h.is_paused()) continue;
-    if(BTSession->getTorrentsToPauseAfterChecking().indexOf(hash) != -1) {
-      continue;
+    if(h.is_paused()) return;
+    // Update queued torrent
+    if(BTSession->isQueueingEnabled() && h.is_queued()) {
+        if(h.state() == torrent_status::checking_files || h.state() == torrent_status::queued_for_checking){
+            finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/time.png"))), Qt::DecorationRole);
+        } else {
+            finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/queued.png"))), Qt::DecorationRole);
+        }
+        // Reset upload speed and seeds/leech
+        finishedListModel->setData(finishedListModel->index(row, F_UPSPEED), 0.);
+        finishedListModel->setData(finishedListModel->index(row, F_LEECH), "0");
+        setRowColor(row, QString::fromUtf8("grey"));
+        return;
     }
-    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);
-      continue;
-    }
-    if(h.state() == torrent_status::checking_files){
+    if(h.state() == torrent_status::checking_files || h.state() == torrent_status::queued_for_checking){
       finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/time.png"))), Qt::DecorationRole);
       setRowColor(row, QString::fromUtf8("grey"));
-      continue;
+      return;
     }
     setRowColor(row, QString::fromUtf8("orange"));
     finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png"))), Qt::DecorationRole);
@@ -264,7 +268,6 @@ void FinishedTorrents::updateFinishedList(){
     if(!finishedList->isColumnHidden(F_RATIO)) {
       finishedListModel->setData(finishedListModel->index(row, F_RATIO), QVariant(misc::toQString(BTSession->getRealRatio(hash))));
     }
-  }
 }
 
 int FinishedTorrents::getRowFromHash(QString hash) const{
@@ -288,13 +291,6 @@ void FinishedTorrents::pauseTorrent(QString hash) {
   setRowColor(row, QString::fromUtf8("red"));
 }
 
-void FinishedTorrents::resumeTorrent(QString hash) {
-    int row = getRowFromHash(hash);
-    Q_ASSERT(row != -1);
-    finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png"))), Qt::DecorationRole);
-    setRowColor(row, QString::fromUtf8("orange"));
-}
-
 QString FinishedTorrents::getHashFromRow(unsigned int row) const {
   Q_ASSERT(row < (unsigned int)finishedListModel->rowCount());
   return finishedListModel->data(finishedListModel->index(row, F_HASH)).toString();
@@ -342,6 +338,18 @@ void FinishedTorrents::propertiesSelection(){
   }
 }
 
+void FinishedTorrents::forceRecheck(){
+  QModelIndexList selectedIndexes = finishedList->selectionModel()->selectedIndexes();
+  QModelIndex index;
+  foreach(index, selectedIndexes){
+      if(index.column() == F_NAME){
+          QString hash = finishedListModel->data(finishedListModel->index(index.row(), F_HASH)).toString();
+          QTorrentHandle h = BTSession->getTorrentHandle(hash);
+          h.force_recheck();
+      }
+  }
+}
+
 void FinishedTorrents::displayFinishedListMenu(const QPoint& pos){
   QMenu myFinishedListMenu(this);
   QModelIndex index;
@@ -379,6 +387,8 @@ void FinishedTorrents::displayFinishedListMenu(const QPoint& pos){
   myFinishedListMenu.addSeparator();
   myFinishedListMenu.addAction(actionSet_upload_limit);
   myFinishedListMenu.addSeparator();
+  myFinishedListMenu.addAction(actionForce_recheck);
+  myFinishedListMenu.addSeparator();
   myFinishedListMenu.addAction(actionOpen_destination_folder);
   myFinishedListMenu.addAction(actionTorrent_Properties);
   myFinishedListMenu.addSeparator();
@@ -386,7 +396,7 @@ void FinishedTorrents::displayFinishedListMenu(const QPoint& pos){
 
   // Call menu
   // XXX: why mapToGlobal() is not enough?
-  myFinishedListMenu.exec(mapToGlobal(pos)+QPoint(10,55));
+  myFinishedListMenu.exec(mapToGlobal(pos)+QPoint(10,58));
 }
 
 
@@ -398,11 +408,12 @@ void FinishedTorrents::displayFinishedListMenu(const QPoint& pos){
 void FinishedTorrents::displayFinishedHoSMenu(const QPoint& pos){
   QMenu hideshowColumn(this);
   hideshowColumn.setTitle(tr("Hide or Show Column"));
-  for(int i=0; i<=F_RATIO; i++) {
+  int lastCol = F_RATIO;
+  for(int i=0; i<=lastCol; i++) {
     hideshowColumn.addAction(getActionHoSCol(i));
   }
   // Call menu
-  hideshowColumn.exec(mapToGlobal(pos)+QPoint(10,55));
+  hideshowColumn.exec(mapToGlobal(pos)+QPoint(10,34));
 }
 
 // toggle hide/show a column
@@ -527,17 +538,37 @@ QAction* FinishedTorrents::getActionHoSCol(int index) {
  * Sorting functions
  */
 
-void FinishedTorrents::sortFinishedList(int index){
-  static Qt::SortOrder sortOrder = Qt::AscendingOrder;
+void FinishedTorrents::toggleFinishedListSortOrder(int index) {
+  Qt::SortOrder sortOrder = Qt::AscendingOrder;
   if(finishedList->header()->sortIndicatorSection() == index){
-    if(sortOrder == Qt::AscendingOrder){
-      sortOrder = Qt::DescendingOrder;
-    }else{
-      sortOrder = Qt::AscendingOrder;
-    }
+    sortOrder = (Qt::SortOrder)!(bool)finishedList->header()->sortIndicatorOrder();
   }
-  finishedList->header()->setSortIndicator(index, sortOrder);
-  switch(index){
+  switch(index) {
+    case F_SIZE:
+    case F_UPSPEED:
+    case F_RATIO:
+      sortFinishedListFloat(index, sortOrder);
+      break;
+    default:
+      sortFinishedListString(index, sortOrder);
+  }
+  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+  QString sortOrderLetter;
+  if(sortOrder == Qt::AscendingOrder)
+    sortOrderLetter = QString::fromUtf8("a");
+  else
+    sortOrderLetter = QString::fromUtf8("d");
+  settings.setValue(QString::fromUtf8("FinishedListSortedCol"), misc::toQString(index)+sortOrderLetter);
+}
+
+void FinishedTorrents::sortFinishedList(int index, Qt::SortOrder sortOrder){
+  if(index == -1) {
+    index = finishedList->header()->sortIndicatorSection();
+    sortOrder = finishedList->header()->sortIndicatorOrder();
+  } else {
+    finishedList->header()->setSortIndicator(index, sortOrder);
+  }
+  switch(index) {
     case F_SIZE:
     case F_UPSPEED:
       sortFinishedListFloat(index, sortOrder);

src/FinishedTorrents.h

@@ -60,11 +60,11 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     void displayFinishedHoSMenu(const QPoint&);
     void setRowColor(int row, QString color);
     void saveColWidthFinishedList() const;
-    void sortFinishedList(int index);
+    void toggleFinishedListSortOrder(int index);
+    void sortFinishedList(int index=-1, Qt::SortOrder sortOrder=Qt::AscendingOrder);
     void sortFinishedListFloat(int index, Qt::SortOrder sortOrder);
     void sortFinishedListString(int index, Qt::SortOrder sortOrder);
     void updateFileSize(QString hash);
-    void torrentAdded(QString path, QTorrentHandle& h, bool fastResume);
     void on_actionSet_upload_limit_triggered();
     void notifyTorrentDoubleClicked(const QModelIndex& index);
     void hideOrShowColumnName();
@@ -72,15 +72,16 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     void hideOrShowColumnUpSpeed();
     void hideOrShowColumnLeechers();
     void hideOrShowColumnRatio();
+    void forceRecheck();
 
   public slots:
     void addTorrent(QString hash);
-    void updateFinishedList();
+    void updateTorrent(QTorrentHandle h);
     void pauseTorrent(QString hash);
-    void resumeTorrent(QString hash);
     void propertiesSelection();
     void deleteTorrent(QString hash);
     void showPropertiesFromHash(QString hash);
+    void loadLastSortedColumn();
 
   signals:
     void torrentMovedFromFinishedList(QString);

src/GUI.h

@@ -24,7 +24,7 @@
 
 #include <QProcess>
 #include <QSystemTrayIcon>
-
+#include <QPointer>
 #include "ui_MainWindow.h"
 #include "qtorrenthandle.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;
@@ -47,6 +52,7 @@ class QTabWidget;
 class QLabel;
 class QModelIndex;
 class HttpServer;
+class QFrame;
 
 class GUI : public QMainWindow, private Ui::MainWindow{
   Q_OBJECT
@@ -58,9 +64,9 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     QList<QPair<QTorrentHandle,QString> > unauthenticated_trackers;
     // GUI related
     QTabWidget *tabs;
-    options_imp *options;
+    QPointer<options_imp> options;
     QSystemTrayIcon *myTrayIcon;
-    QTimer *systrayCreator;
+    QPointer<QTimer> systrayCreator;
     QMenu *myTrayIconMenu;
     DownloadingTorrents *downloadingTorrentTab;
     FinishedTorrents *finishedTorrentTab;
@@ -70,21 +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;
+    QPointer<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 +116,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     void on_actionCreate_torrent_triggered();
     void on_actionWebsite_triggered() const;
     void on_actionBugReport_triggered() const;
+    void on_actionShow_console_triggered();
     void readParamsOnSocket();
     void acceptConnection();
     void togglePausedState(QString hash);
@@ -134,19 +156,21 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     void processParams(const QStringList& params);
     void addTorrent(QString path);
     void addUnauthenticatedTracker(QPair<QTorrentHandle,QString> tracker);
-    void processScannedFiles(const QStringList& params);
     void processDownloadedFiles(QString path, QString url);
     void downloadFromURLList(const QStringList& urls);
     void deleteTorrent(QString hash);
-    void deleteRatioTorrent(QString fileName);
     void finishedTorrent(QTorrentHandle& h) const;
-    void torrentChecked(QString hash) const;
-    void updateLists();
+    void addedTorrent(QTorrentHandle& h) const;
+    void checkedTorrent(QTorrentHandle& h) const;
+    void pausedTorrent(QTorrentHandle& h) const;
+    void resumedTorrent(QTorrentHandle& h) const;
+    void updateLists(bool force=false);
     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);
+    void OptionsSaved(bool deleteOptions);
     // HTTP slots
     void on_actionDownload_from_URL_triggered();
 
@@ -160,7 +184,9 @@ class GUI : public QMainWindow, private Ui::MainWindow{
 
   protected:
     void closeEvent(QCloseEvent *);
-    void hideEvent(QHideEvent *);
+    void showEvent(QShowEvent *);
+    bool event(QEvent * event);
+    void displayRSSTab(bool enable);
 
   public:
     // Construct / Destruct

src/Icons/qBittorrent.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
-Categories=Qt;Application;Network;P2P
-Comment=V1.1.0
-Exec=qbittorrent
+Categories=Qt;Network;P2P
+Comment=V1.3.0
+Exec=qbittorrent %f
 GenericName=Bittorrent client
 GenericName[bg]=Торент клиент
 GenericName[de]=Bittorren 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,202 +16,14 @@
    <string/>
   </property>
   <widget class="QWidget" name="centralwidget" >
-   <property name="geometry" >
-    <rect>
-     <x>0</x>
-     <y>58</y>
-     <width>849</width>
-     <height>505</height>
-    </rect>
-   </property>
-   <layout class="QVBoxLayout" name="verticalLayout" >
-    <item>
-     <layout class="QHBoxLayout" name="_3" >
-      <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" stdset="0" >
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QLabel" name="lbl_DLSpeed_2" >
-        <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_2" >
-        <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" stdset="0" >
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QLabel" name="label_2" >
-        <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" stdset="0" >
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QLabel" name="lbl_UPSpeed_2" >
-        <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_2" >
-        <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" stdset="0" >
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </item>
-   </layout>
+   <layout class="QVBoxLayout" />
   </widget>
   <widget class="QMenuBar" name="menubar" >
    <property name="geometry" >
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>849</width>
+     <width>914</width>
      <height>26</height>
     </rect>
    </property>
@@ -229,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" >
@@ -244,6 +58,7 @@
      <string>Options</string>
     </property>
     <addaction name="actionOptions" />
+    <addaction name="actionShow_console" />
    </widget>
    <widget class="QMenu" name="menu_File" >
     <property name="title" >
@@ -263,14 +78,6 @@
    <property name="enabled" >
     <bool>true</bool>
    </property>
-   <property name="geometry" >
-    <rect>
-     <x>0</x>
-     <y>26</y>
-     <width>849</width>
-     <height>32</height>
-    </rect>
-   </property>
    <property name="contextMenuPolicy" >
     <enum>Qt::NoContextMenu</enum>
    </property>
@@ -286,6 +93,9 @@
      <height>32</height>
     </size>
    </property>
+   <property name="floatable" >
+    <bool>false</bool>
+   </property>
    <attribute name="toolBarArea" >
     <enum>TopToolBarArea</enum>
    </attribute>
@@ -307,9 +117,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>
@@ -420,7 +234,39 @@
     <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>
+  <action name="actionShow_console" >
+   <property name="icon" >
+    <iconset resource="icons.qrc" >:/Icons/log.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Console</string>
+   </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/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,15 @@ 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>Chinese (Traditional):</u> Yi-Shun Wang (dnextstep@gmail.com)<br>\
+          - <u>Czech:</u> Jirka Vilim (web@tets.cz)<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,11 +72,11 @@ 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>Turkish:</u> Hasan YILMAZ (iletisim@hedefturkce.com) and Erdem Bingöl (erdem84@gmail.com)<br>\
           - <u>Ukrainian:</u> Andrey Shpachenko (masterfix@users.sourceforge.net)<br><br>"));
       te_translation->append(tr("Please contact me if you would like to translate qBittorrent into your own language."));
       te_translation->scrollToAnchor(QString::fromUtf8("top"));

src/addTorrentDialog.ui

@@ -13,21 +13,6 @@
    <string>Torrent addition dialog</string>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <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="QLabel" name="fileNameLbl" >
      <property name="text" >
@@ -110,6 +95,50 @@
      </property>
     </widget>
    </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <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="QPushButton" name="collapseAllButton" >
+       <property name="text" >
+        <string>Collapse all</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="expandAllButton" >
+       <property name="text" >
+        <string>Expand all</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>
+    </layout>
+   </item>
    <item>
     <widget class="QCheckBox" name="checkIncrementalDL" >
      <property name="text" >

src/arborescence.h

@@ -172,27 +172,27 @@ class arborescence {
     torrent_file *root;
 
   public:
-    arborescence(torrent_info t) {
-      torrent_info::file_iterator fi = t.begin_files();
-      if(t.num_files() > 1) {
-        root = new torrent_file(0, misc::toQString(t.name()), true);
+    arborescence(boost::intrusive_ptr<torrent_info> t) {
+      torrent_info::file_iterator fi = t->begin_files();
+      if(t->num_files() > 1) {
+        root = new torrent_file(0, misc::toQString(t->name()), true);
       } else {
         // XXX: Will crash if there is no file in torrent
-        root = new torrent_file(0, misc::toQString(t.name()), false, fi->size, 0);
+        root = new torrent_file(0, misc::toQString(t->name()), false, fi->size, 0);
         return;
       }
       int i = 0;
-      while(fi != t.end_files()) {
+      while(fi != t->end_files()) {
         QString path = QDir::cleanPath(misc::toQString(fi->path.string()));
         addFile(path, fi->size, i);
         fi++;
         ++i;
       }
-      qDebug("real size: %ld, tree size: %ld", (long)t.total_size(), (long)root->getSize());
-      Q_ASSERT(root->getSize() == t.total_size());
+      qDebug("real size: %ld, tree size: %ld", (long)t->total_size(), (long)root->getSize());
+      Q_ASSERT(root->getSize() == t->total_size());
     }
 
-    arborescence(torrent_info t, std::vector<float> fp, int *prioritiesTab) {
+    arborescence(torrent_info const& t, std::vector<size_type> fp, int *prioritiesTab) {
       torrent_info::file_iterator fi = t.begin_files();
       if(t.num_files() > 1) {
         qDebug("More than one file in the torrent, setting a folder as root");
@@ -200,13 +200,13 @@ class arborescence {
       } else {
         // XXX: Will crash if there is no file in torrent
         qDebug("one file in the torrent, setting it as root with index 0");
-        root = new torrent_file(0, misc::toQString(t.name()), false, fi->size, 0, fp[0], prioritiesTab[0]);
+        root = new torrent_file(0, misc::toQString(t.name()), false, fi->size, 0, fp[0]/t.file_at(0).size, prioritiesTab[0]);
         return;
       }
       int i = 0;
       while(fi != t.end_files()) {
         QString path = QDir::cleanPath(misc::toQString(fi->path.string()));
-        addFile(path, fi->size, i, fp[i], prioritiesTab[i]);
+        addFile(path, fi->size, i, fp[i]/t.file_at(i).size, prioritiesTab[i]);
         fi++;
         ++i;
       }
@@ -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.h

@@ -22,10 +22,10 @@
 #define __BITTORRENT_H__
 
 #include <QHash>
-#include <QList>
-#include <QPair>
 #include <QStringList>
-#include <QDateTime>
+#include <QApplication>
+#include <QPalette>
+#include <QPointer>
 
 #include <libtorrent/session.hpp>
 #include <libtorrent/ip_filter.hpp>
@@ -34,31 +34,26 @@
 using namespace libtorrent;
 
 class downloadThread;
-class deleteThread;
 class QTimer;
+class QFileSystemWatcher;
+class QMutex;
 class FilterParserThread;
 
-class bittorrent : public QObject{
+class bittorrent : public QObject {
   Q_OBJECT
 
   private:
     session *s;
-    QString scan_dir;
-    QTimer *timerScan;
-    QTimer *timerAlerts;
-    QTimer *fastResumeSaver;
-    QTimer *BigRatioTimer;
+    QPointer<QFileSystemWatcher> FSWatcher;
+    QMutex* FSMutex;
+    QPointer<QTimer> timerAlerts;
+    QPointer<QTimer> BigRatioTimer;
     bool DHTEnabled;
-    downloadThread *downloader;
+    QPointer<downloadThread> downloader;
     QString defaultSavePath;
-    QStringList torrentsToPauseAfterChecking;
-    QHash<QString, QDateTime> TorrentsStartTime;
-    QHash<QString, size_type> TorrentsStartData;
-    QHash<QString, QPair<size_type,size_type> > ratioData;
     QHash<QString, QHash<QString, QString> > trackersErrors;
-    deleteThread *deleter;
-    QStringList finishedTorrents;
-    QStringList unfinishedTorrents;
+    QStringList consoleMessages;
+    QStringList peerBanMessages;
     bool preAllocateAll;
     bool addInPause;
     int maxConnecsPerTorrent;
@@ -67,9 +62,10 @@ class bittorrent : public QObject{
     bool UPnPEnabled;
     bool NATPMPEnabled;
     bool LSDEnabled;
-    FilterParserThread *filterParser;
+    QPointer<FilterParserThread> filterParser;
     QString filterPath;
-    int folderScanInterval; // in seconds
+    bool queueingEnabled;
+    QStringList url_skippingDlg;
 
   protected:
     QString getSavePath(QString hash);
@@ -79,50 +75,59 @@ class bittorrent : public QObject{
     bittorrent();
     ~bittorrent();
     QTorrentHandle getTorrentHandle(QString hash) const;
-    bool isPaused(QString hash) const;
+    std::vector<torrent_handle> getTorrents() const;
     bool isFilePreviewPossible(QString fileHash) const;
     bool isDHTEnabled() const;
     float getPayloadDownloadRate() const;
     float getPayloadUploadRate() const;
     session_status getSessionStatus() const;
     int getListenPort() const;
-    QStringList getTorrentsToPauseAfterChecking() const;
-    qlonglong getETA(QString hash) const;
     float getRealRatio(QString hash) const;
     session* getSession() 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;
+    int loadTorrentPriority(QString hash);
+    QStringList getConsoleMessages() const;
+    QStringList getPeerBanMessages() const;
+    qlonglong getETA(QString hash) const;
 
   public slots:
-    void addTorrent(QString path, bool fromScanDir = false, QString from_url = QString(), bool resumed = false);
+    QTorrentHandle addTorrent(QString path, bool fromScanDir = false, QString from_url = QString(), bool resumed = false);
+    void loadSessionState();
+    void saveSessionState();
     void downloadFromUrl(QString url);
     void downloadFromURLList(const QStringList& url_list);
     void deleteTorrent(QString hash, bool permanent = false);
-    bool pauseTorrent(QString hash);
-    bool resumeTorrent(QString hash);
+    /* Needed by Web UI */
     void pauseAllTorrents();
     void resumeAllTorrents();
+    void pauseTorrent(QString hash);
+    void resumeTorrent(QString hash);
+    /* End Web UI */
     void saveDHTEntry();
     void preAllocateAllFiles(bool b);
-    void saveFastResumeAndRatioData();
-    void saveFastResumeAndRatioData(QString hash);
+    void saveFastResumeData();
     void enableDirectoryScanning(QString scan_dir);
     void disableDirectoryScanning();
-    void enablePeerExchange();
     void enableIPFilter(QString filter);
     void disableIPFilter();
+    void setQueueingEnabled(bool enable);
     void resumeUnfinishedTorrents();
+    void saveTorrentPriority(QString hash, int prio);
     void saveTorrentSpeedLimits(QString hash);
     void loadTorrentSpeedLimits(QString hash);
-    void saveDownloadUploadForTorrent(QString hash);
-    void loadDownloadUploadForTorrent(QString hash);
     void handleDownloadFailure(QString url, QString reason);
     void loadWebSeeds(QString fileHash);
+    void increaseDlTorrentPriority(QString hash);
+    void decreaseDlTorrentPriority(QString hash);
+    void downloadUrlAndSkipDialog(QString);
     // Session configuration - Setters
     void setListeningPortsRange(std::pair<unsigned short, unsigned short> ports);
     void setMaxConnections(int maxConnec);
@@ -141,17 +146,15 @@ class bittorrent : public QObject{
     void loadFilesPriorities(QTorrentHandle& h);
     void setDownloadLimit(QString hash, long val);
     void setUploadLimit(QString hash, long val);
-    void setUnfinishedTorrent(QString hash);
-    void setFinishedTorrent(QString hash);
     void enableUPnP(bool b);
     void enableNATPMP(bool b);
     void enableLSD(bool b);
     bool enableDHT(bool b);
-    void reloadTorrent(const QTorrentHandle &h, bool full_alloc);
-    void setTimerScanInterval(int secs);
+    void addConsoleMessage(QString msg, QColor color=QApplication::palette().color(QPalette::WindowText));
+    void addPeerBanMessage(QString msg, bool from_ipfilter);
 
   protected slots:
-    void scanDirectory();
+    void scanDirectory(QString);
     void readAlerts();
     void processDownloadedFile(QString, QString);
     bool loadTrackerFile(QString hash);
@@ -159,29 +162,18 @@ class bittorrent : public QObject{
     void deleteBigRatios();
 
   signals:
-    void invalidTorrent(QString path);
-    void duplicateTorrent(QString path);
-    void addedTorrent(QString path, QTorrentHandle& h, bool fastResume);
+    void addedTorrent(QTorrentHandle& h);
     void deletedTorrent(QString hash);
-    void pausedTorrent(QString hash);
-    void resumedTorrent(QString hash);
+    void pausedTorrent(QTorrentHandle& h);
+    void resumedTorrent(QTorrentHandle& h);
     void finishedTorrent(QTorrentHandle& h);
     void fullDiskError(QTorrentHandle& h);
     void trackerError(QString hash, QString time, QString msg);
-    void portListeningFailure();
     void trackerAuthenticationRequired(QTorrentHandle& h);
-    void scanDirFoundTorrents(const QStringList& pathList);
     void newDownloadedTorrent(QString path, QString url);
-    void aboutToDownloadFromUrl(QString url);
     void updateFileSize(QString hash);
-    void peerBlocked(QString);
     void downloadFromUrlFailure(QString url, QString reason);
-    void fastResumeDataRejected(QString name);
-    void urlSeedProblem(QString url, QString msg);
-    void torrentFinishedChecking(QString hash);
-    void torrent_ratio_deleted(QString fileName);
-    void UPnPError(QString msg);
-    void UPnPSuccess(QString msg);
+    void torrentFinishedChecking(QTorrentHandle& h);
 };
 
 #endif

src/console.ui

@@ -0,0 +1,58 @@
+<ui version="4.0" >
+ <class>ConsoleDlg</class>
+ <widget class="QDialog" name="ConsoleDlg" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>512</width>
+    <height>497</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>qBittorrent console</string>
+  </property>
+  <property name="windowIcon" >
+   <iconset resource="icons.qrc" >:/Icons/log.png</iconset>
+  </property>
+  <layout class="QVBoxLayout" >
+   <item>
+    <widget class="QTabWidget" name="tabConsole" >
+     <property name="currentIndex" >
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="tab" >
+      <attribute name="title" >
+       <string>General</string>
+      </attribute>
+      <attribute name="icon" >
+       <iconset resource="icons.qrc" >:/Icons/log.png</iconset>
+      </attribute>
+      <layout class="QVBoxLayout" >
+       <item>
+        <widget class="QTextBrowser" name="textConsole" />
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_2" >
+      <attribute name="title" >
+       <string>Blocked IPs</string>
+      </attribute>
+      <attribute name="icon" >
+       <iconset resource="icons.qrc" >:/Icons/filter.png</iconset>
+      </attribute>
+      <layout class="QVBoxLayout" >
+       <item>
+        <widget class="QTextBrowser" name="textBannedPeers" />
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="icons.qrc" />
+ </resources>
+ <connections/>
+</ui>

src/console_imp.h

@@ -0,0 +1,50 @@
+/*
+ * 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 CONSOLE_H
+#define CONSOLE_H
+
+#include "bittorrent.h"
+#include "ui_console.h"
+
+using namespace libtorrent;
+
+class consoleDlg : public QDialog, private Ui_ConsoleDlg{
+  Q_OBJECT
+  
+  private:
+    bittorrent *BTSession;
+  
+  public:
+    consoleDlg(QWidget *parent, bittorrent* _BTSession) : QDialog(parent) {
+      setupUi(this);
+      setAttribute(Qt::WA_DeleteOnClose);
+      BTSession = _BTSession;
+      textConsole->setHtml(BTSession->getConsoleMessages().join("<br>"));
+      textBannedPeers->setHtml(BTSession->getPeerBanMessages().join("<br>"));
+      show();
+    }
+    
+    ~consoleDlg() {}
+  
+};
+
+#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_imp.cpp

@@ -26,6 +26,7 @@
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/fstream.hpp>
+#include <boost/bind.hpp>
 
 #include <libtorrent/entry.hpp>
 #include <libtorrent/bencode.hpp>
@@ -34,6 +35,7 @@
 #include <libtorrent/storage.hpp>
 #include <libtorrent/hasher.hpp>
 #include <libtorrent/file_pool.hpp>
+#include <libtorrent/create_torrent.hpp>
 
 #include "createtorrent_imp.h"
 #include "misc.h"
@@ -41,13 +43,23 @@
 using namespace libtorrent;
 using namespace boost::filesystem;
 
+// do not include files and folders whose
+// name starts with a .
+bool file_filter(boost::filesystem::path const& filename)
+{
+        if (filename.leaf()[0] == '.') return false;
+        std::cerr << filename << std::endl;
+        return true;
+}
+
 createtorrent::createtorrent(QWidget *parent): QDialog(parent){
   setupUi(this);
   setAttribute(Qt::WA_DeleteOnClose);
-  creatorThread = new torrentCreatorThread();
-  connect(creatorThread, SIGNAL(creationSuccess(QString)), this, SLOT(handleCreationSucess(QString)));
+  creatorThread = new torrentCreatorThread(this);
+  connect(creatorThread, SIGNAL(creationSuccess(QString, const char*)), this, SLOT(handleCreationSuccess(QString, const char*)));
   connect(creatorThread, SIGNAL(creationFailure(QString)), this, SLOT(handleCreationFailure(QString)));
   connect(creatorThread, SIGNAL(updateProgress(int)), this, SLOT(updateProgressBar(int)));
+  path::default_name_check(no_check);
   show();
 }
 
@@ -126,20 +138,6 @@ void createtorrent::on_addURLSeed_button_clicked(){
   }
 }
 
-// Subfunction to add files to a torrent_info structure
-// Written by Arvid Norberg (libtorrent Author)
-void add_files(torrent_info& t, path const& p, path const& l){
-  qDebug("p: %s, l: %s, l.leaf(): %s", p.string().c_str(), l.string().c_str(), l.leaf().c_str());
-  path f(p / l);
-  if (is_directory(f)){
-    for (directory_iterator i(f), end; i != end; ++i)
-      add_files(t, p, l / i->leaf());
-  }else{
-    qDebug("Adding %s", l.string().c_str());
-    t.add_file(l, file_size(f));
-  }
-}
-
 QStringList createtorrent::allItems(QListWidget *list){
   QStringList res;
   unsigned int nbItems = list->count();
@@ -180,17 +178,25 @@ void createtorrent::handleCreationFailure(QString 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::handleCreationSuccess(QString path, const char* branch_path) {
+    if(checkStartSeeding->isChecked()) {
+        // Create save path file
+        boost::intrusive_ptr<torrent_info> t;
+        try {
+            t = new torrent_info(path.toUtf8().data());
+        } catch(std::exception&) {
+            QMessageBox::critical(0, tr("Torrent creation"), tr("Created torrent file is invalid. It won't be added to download list."));
+            return;
+        }
+        QString hash = misc::toQString(t->info_hash());
+        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) {
@@ -213,54 +219,47 @@ void torrentCreatorThread::create(QString _input_path, QString _save_path, QStri
   start();
 }
 
+void sendProgressUpdateSignal(int i, int num, QDialog *parent){
+    ((createtorrent*)parent)->updateProgressBar((int)(i*100./(float)num));
+}
+
 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*)save_path.toUtf8())), std::ios_base::binary);
-    // Adding files to the torrent
+    file_storage fs;
+    file_pool fp;
     path full_path = complete(path(input_path.toUtf8().data()));
-    add_files(*t, full_path.branch_path(), full_path.leaf());
+    // Adding files to the torrent
+    add_files(fs, full_path, file_filter);
     if(abort) return;
-    // Set piece size
-    t->set_piece_size(piece_size);
+    create_torrent t(fs, piece_size);
+
     // Add url seeds
     QString seed;
     foreach(seed, url_seeds){
-      t->add_url_seed(seed.toUtf8().data());
+      t.add_url_seed(seed.toUtf8().data());
     }
     for(int i=0; i<trackers.size(); ++i){
-      t->add_tracker(trackers.at(i).toUtf8().data());
+      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));
-    int num = t->num_pieces();
-    std::vector<char> buf(piece_size);
-    for (int i = 0; i < num; ++i) {
-      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_piece_hashes(t, full_path.branch_path(), boost::bind<void>(&sendProgressUpdateSignal, _1, t.num_pieces(), parent));
     // Set qBittorrent as creator and add user comment to
     // torrent_info structure
-    t->set_creator(creator_str);
-    t->set_comment((const char*)comment.toUtf8());
+    t.set_creator(creator_str);
+    t.set_comment((const char*)comment.toUtf8());
     // Is private ?
     if(is_private){
-      t->set_priv(true);
+      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();
+    ofstream out(complete(path((const char*)save_path.toUtf8())), std::ios_base::binary);
+    bencode(std::ostream_iterator<char>(out), t.generate());
     emit updateProgress(100);
-    emit creationSuccess(save_path, full_path.branch_path().string().c_str(), misc::toQString(t->info_hash()));
+    emit creationSuccess(save_path, full_path.branch_path().string().c_str());
   }
   catch (std::exception& e){
     emit creationFailure(QString::fromUtf8(e.what()));

src/createtorrent_imp.h

@@ -37,9 +37,12 @@ class torrentCreatorThread : public QThread {
   bool is_private;
   int piece_size;
   bool abort;
+  QDialog *parent;
   
   public:
-    torrentCreatorThread() {}
+    torrentCreatorThread(QDialog *_parent) {
+        parent = _parent;
+    }
     ~torrentCreatorThread() {
       abort = true;
       wait();
@@ -51,7 +54,7 @@ class torrentCreatorThread : public QThread {
     
   signals:
     void creationFailure(QString msg);
-    void creationSuccess(QString path, const char* branch_path, QString hash);
+    void creationSuccess(QString path, const char* branch_path);
     void updateProgress(int progress);
 };
 
@@ -70,6 +73,9 @@ class createtorrent : public QDialog, private Ui::createTorrentDialog{
   signals:
     void torrent_to_seed(QString path);
 
+  public slots:
+    void updateProgressBar(int progress);
+
   protected slots:
     void on_createButton_clicked();
     void on_addFile_button_clicked();
@@ -79,8 +85,7 @@ class createtorrent : public QDialog, private Ui::createTorrentDialog{
     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);
+    void handleCreationSuccess(QString path, const char* branch_path);
 };
 
 #endif

src/deleteThread.h

@@ -1,125 +0,0 @@
-/*
- * 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 DELETETHREAD_H
-#define DELETETHREAD_H
-
-#include <QThread>
-#include <QMutex>
-#include <QWaitCondition>
-#include <QMutexLocker>
-#include <QPair>
-
-#include "arborescence.h"
-
-class subDeleteThread : public QThread {
-  Q_OBJECT
-  private:
-    QString save_path;
-    arborescence *arb;
-    bool abort;
-
-  public:
-    subDeleteThread(QObject *parent, QString saveDir, arborescence *arb) : QThread(parent), save_path(saveDir), arb(arb), abort(false){}
-
-    ~subDeleteThread(){
-      abort = true;
-      wait();
-    }
-
-  signals:
-    // For subthreads
-    void deletionSuccessST(subDeleteThread* st);
-    void deletionFailureST(subDeleteThread* st);
-
-  protected:
-    void run(){
-      if(arb->removeFromFS(save_path))
-        emit deletionSuccessST(this);
-      else
-        emit deletionFailureST(this);
-      delete arb;
-    }
-};
-
-class deleteThread : public QThread {
-  Q_OBJECT
-
-  private:
-    QList<QPair<QString, arborescence*> > torrents_list;
-    QMutex mutex;
-    QWaitCondition condition;
-    bool abort;
-    QList<subDeleteThread*> subThreads;
-
-  public:
-    deleteThread(QObject* parent) : QThread(parent), abort(false){}
-
-    ~deleteThread(){
-      mutex.lock();
-      abort = true;
-      condition.wakeOne();
-      mutex.unlock();
-      qDeleteAll(subThreads);
-      wait();
-    }
-
-    void deleteTorrent(QString saveDir, arborescence *arb){
-      qDebug("deleteThread called");
-      QMutexLocker locker(&mutex);
-      torrents_list << QPair<QString, arborescence*>(saveDir, arb);
-      if(!isRunning()){
-        start();
-      }else{
-        condition.wakeOne();
-      }
-    }
-
-  protected:
-    void run(){
-      forever{
-        if(abort)
-          return;
-        mutex.lock();
-        if(torrents_list.size() != 0){
-          QPair<QString, arborescence *> torrent = torrents_list.takeFirst();
-          mutex.unlock();
-          subDeleteThread *st = new subDeleteThread(0, torrent.first, torrent.second);
-          subThreads << st;
-          connect(st, SIGNAL(deletionSuccessST(subDeleteThread*)), this, SLOT(deleteSubThread(subDeleteThread*)));
-          connect(st, SIGNAL(deletionFailureST(subDeleteThread*)), this, SLOT(deleteSubThread(subDeleteThread*)));
-          st->start();
-        }else{
-          condition.wait(&mutex);
-          mutex.unlock();
-        }
-      }
-    }
-  protected slots:
-    void deleteSubThread(subDeleteThread* st){
-      int index = subThreads.indexOf(st);
-      Q_ASSERT(index != -1);
-      subThreads.removeAt(index);
-      delete st;
-    }
-};
-
-#endif

src/download.ui

@@ -48,93 +48,6 @@
      </item>
     </layout>
    </item>
-   <item>
-    <widget class="QTabWidget" name="tabBottom" >
-     <property name="maximumSize" >
-      <size>
-       <width>16777215</width>
-       <height>142</height>
-      </size>
-     </property>
-     <property name="tabPosition" >
-      <enum>QTabWidget::West</enum>
-     </property>
-     <property name="currentIndex" >
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="log_tab" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>765</width>
-        <height>138</height>
-       </rect>
-      </property>
-      <attribute name="title" >
-       <string>Log</string>
-      </attribute>
-      <layout class="QVBoxLayout" >
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <property name="margin" >
-        <number>9</number>
-       </property>
-       <item>
-        <widget class="QTextBrowser" name="infoBar" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="maximumSize" >
-          <size>
-           <width>16777215</width>
-           <height>120</height>
-          </size>
-         </property>
-         <property name="contextMenuPolicy" >
-          <enum>Qt::CustomContextMenu</enum>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="filter_tab" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>765</width>
-        <height>138</height>
-       </rect>
-      </property>
-      <attribute name="title" >
-       <string>IP filter</string>
-      </attribute>
-      <layout class="QVBoxLayout" >
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <property name="margin" >
-        <number>9</number>
-       </property>
-       <item>
-        <widget class="QTextBrowser" name="textBlockedUsers" >
-         <property name="maximumSize" >
-          <size>
-           <width>16777215</width>
-           <height>123</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
   </layout>
   <action name="actionStart" >
    <property name="text" >
@@ -151,11 +64,6 @@
     <string>Delete</string>
    </property>
   </action>
-  <action name="actionClearLog" >
-   <property name="text" >
-    <string>Clear</string>
-   </property>
-  </action>
   <action name="actionPreview_file" >
    <property name="text" >
     <string>Preview file</string>
@@ -239,8 +147,38 @@
     <string>Buy it</string>
    </property>
   </action>
-  <zorder>tabBottom</zorder>
-  <zorder></zorder>
+  <action name="actionHOSColPriority" >
+   <property name="text" >
+    <string>Priority</string>
+   </property>
+  </action>
+  <action name="actionIncreasePriority" >
+   <property name="icon" >
+    <iconset resource="icons.qrc" >
+     <normaloff>:/Icons/skin/increase.png</normaloff>:/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" >
+     <normaloff>:/Icons/skin/decrease.png</normaloff>:/Icons/skin/decrease.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Decrease priority</string>
+   </property>
+  </action>
+  <action name="actionForce_recheck" >
+   <property name="icon" >
+    <iconset resource="icons.qrc" >
+     <normaloff>:/Icons/gear.png</normaloff>:/Icons/gear.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Force recheck</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="icons.qrc" />

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){
@@ -79,7 +81,7 @@ void subDownloadThread::run(){
     return;
   }
   CURL *curl;
-  CURLcode res;
+  CURLcode res = (CURLcode)-1;
   curl = curl_easy_init();
   if(curl) {
     std::string c_url = url.toUtf8().data();
@@ -89,11 +91,11 @@ void subDownloadThread::run(){
     curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0);
     // PROXY SUPPORT
     QSettings settings("qBittorrent", "qBittorrent");
-    int intValue = settings.value(QString::fromUtf8("Preferences/Connection/ProxyType"), 0).toInt();
+    int intValue = settings.value(QString::fromUtf8("Preferences/Connection/HTTPProxyType"), 0).toInt();
     if(intValue > 0) {
       // Proxy enabled
-      QString IP = settings.value(QString::fromUtf8("Preferences/Connection/Proxy/IP"), "0.0.0.0").toString();
-      QString port = settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Port"), 8080).toString();
+      QString IP = settings.value(QString::fromUtf8("Preferences/Connection/HTTPProxy/IP"), "0.0.0.0").toString();
+      QString port = settings.value(QString::fromUtf8("Preferences/Connection/HTTPProxy/Port"), 8080).toString();
       qDebug("Using proxy: %s", (IP+QString(":")+port).toUtf8().data());
       curl_easy_setopt(curl, CURLOPT_PROXYPORT, (IP+QString(":")+port).toUtf8().data());
       // Default proxy type is HTTP, we must change if it is SOCKS5
@@ -104,8 +106,8 @@ void subDownloadThread::run(){
       // Authentication?
       if(intValue > 2) {
         qDebug("Proxy requires authentication, authenticating");
-        QString username = settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Username"), QString()).toString();
-        QString password = settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Password"), QString()).toString();
+        QString username = settings.value(QString::fromUtf8("Preferences/Connection/HTTPProxy/Username"), QString()).toString();
+        QString password = settings.value(QString::fromUtf8("Preferences/Connection/HTTPProxy/Password"), QString()).toString();
         curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, (username+QString(":")+password).toUtf8().data());
       }
     }
@@ -121,10 +123,13 @@ void subDownloadThread::run(){
     curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
     curl_easy_setopt(curl, CURLOPT_MAXREDIRS, -1);
     qDebug("Downloading %s", url.toUtf8().data());
-    res = curl_easy_perform(curl);
+    if(!abort)
+        res = curl_easy_perform(curl);
     /* always cleanup */
     curl_easy_cleanup(curl);
     fclose(f);
+    if(abort)
+        return;
     if(res) {
       emit downloadFailureST(this, url, errorCodeToString(res));
     } else {
@@ -150,9 +155,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 +168,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 +190,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 +203,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

@@ -33,13 +33,12 @@
 #include <QTime>
 #include <QMenu>
 
-DownloadingTorrents::DownloadingTorrents(QObject *parent, bittorrent *BTSession) : parent(parent), BTSession(BTSession), delayedSorting(false), nbTorrents(0) {
+DownloadingTorrents::DownloadingTorrents(QObject *parent, bittorrent *BTSession) : parent(parent), BTSession(BTSession), nbTorrents(0) {
   setupUi(this);
   // Setting icons
   actionStart->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/play.png")));
   actionPause->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/pause.png")));
   actionDelete->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/delete.png")));
-  actionClearLog->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/delete.png")));
   actionPreview_file->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/preview.png")));
   actionSet_upload_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png")));
   actionSet_download_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/downloading.png")));
@@ -49,7 +48,7 @@ DownloadingTorrents::DownloadingTorrents(QObject *parent, bittorrent *BTSession)
 //   tabBottom->setTabIcon(1, QIcon(QString::fromUtf8(":/Icons/filter.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"));
@@ -58,23 +57,17 @@ 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)));
-  connect(BTSession, SIGNAL(invalidTorrent(QString)), this, SLOT(torrentCorrupted(QString)));
-  connect(BTSession, SIGNAL(portListeningFailure()), this, SLOT(portListeningFailure()));
-  connect(BTSession, SIGNAL(peerBlocked(QString)), this, SLOT(addLogPeerBlocked(const QString)));
-  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(torrentFinishedChecking(QTorrentHandle&)), this, SLOT(sortProgressColumn(QTorrentHandle&)));
 
   // Load last columns width for download list
   if(!loadColWidthDLList()) {
@@ -85,19 +78,21 @@ DownloadingTorrents::DownloadingTorrents(QObject *parent, bittorrent *BTSession)
   downloadList->header()->setSortIndicatorShown(true);
   // Connecting Actions to slots
   connect(downloadList, SIGNAL(doubleClicked(const QModelIndex&)), this, SLOT(notifyTorrentDoubleClicked(const QModelIndex&)));
-  connect(downloadList->header(), SIGNAL(sectionPressed(int)), this, SLOT(sortDownloadList(int)));
+  connect(downloadList->header(), SIGNAL(sectionPressed(int)), this, SLOT(toggleDownloadListSortOrder(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(actionForce_recheck, SIGNAL(triggered()), this, SLOT(forceRecheck()));
   connect(actionBuy_it, SIGNAL(triggered()), (GUI*)parent, SLOT(goBuyPage()));
 
   connect(actionHOSColName, SIGNAL(triggered()), this, SLOT(hideOrShowColumnName()));
@@ -108,9 +103,10 @@ DownloadingTorrents::DownloadingTorrents(QObject *parent, bittorrent *BTSession)
   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)));
+  BTSession->addConsoleMessage(tr("qBittorrent %1 started.", "e.g: qBittorrent v0.x started.").arg(QString::fromUtf8(""VERSION)));
   qDebug("Download tab built");
 }
 
@@ -121,6 +117,13 @@ DownloadingTorrents::~DownloadingTorrents() {
   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();
@@ -128,16 +131,6 @@ void DownloadingTorrents::notifyTorrentDoubleClicked(const QModelIndex& index) {
   emit torrentDoubleClicked(hash, false);
 }
 
-void DownloadingTorrents::addLogPeerBlocked(QString ip) {
-  static unsigned int nbLines = 0;
-  ++nbLines;
-  if(nbLines > 200) {
-    textBlockedUsers->clear();
-    nbLines = 1;
-  }
-  textBlockedUsers->append(QString::fromUtf8("<font color='grey'>")+ QTime::currentTime().toString(QString::fromUtf8("hh:mm:ss")) + QString::fromUtf8("</font> - ")+tr("<font color='red'>%1</font> <i>was blocked</i>", "x.y.z.w was blocked").arg(ip));
-}
-
 unsigned int DownloadingTorrents::getNbTorrentsInList() const {
   return nbTorrents;
 }
@@ -153,7 +146,7 @@ void DownloadingTorrents::pauseTorrent(QString hash) {
   DLListModel->setData(DLListModel->index(row, NAME), QIcon(QString::fromUtf8(":/Icons/skin/paused.png")), Qt::DecorationRole);
   DLListModel->setData(DLListModel->index(row, SEEDSLEECH), QVariant(QString::fromUtf8("0/0")));
   QTorrentHandle h = BTSession->getTorrentHandle(hash);
-  DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)h.progress()));
+  //DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)h.progress()));
   setRowColor(row, QString::fromUtf8("red"));
 }
 
@@ -162,12 +155,6 @@ QString DownloadingTorrents::getHashFromRow(unsigned int row) const {
   return DLListModel->data(DLListModel->index(row, HASH)).toString();
 }
 
-void DownloadingTorrents::setBottomTabEnabled(unsigned int index, bool b){
-  if(index and !b)
-    tabBottom->setCurrentIndex(0);
-  tabBottom->setTabEnabled(index, b);
-}
-
 // Show torrent properties dialog
 void DownloadingTorrents::showProperties(const QModelIndex &index) {
   showPropertiesFromHash(DLListModel->data(DLListModel->index(index.row(), HASH)).toString());
@@ -181,13 +168,6 @@ void DownloadingTorrents::showPropertiesFromHash(QString hash) {
   prop->show();
 }
 
-void DownloadingTorrents::resumeTorrent(QString hash){
-    int row = getRowFromHash(hash);
-    Q_ASSERT(row != -1);
-    DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/connecting.png"))), Qt::DecorationRole);
-    setRowColor(row, QString::fromUtf8("grey"));
-}
-
 // Remove a torrent from the download list but NOT from the BT Session
 void DownloadingTorrents::deleteTorrent(QString hash) {
   int row = getRowFromHash(hash);
@@ -200,34 +180,6 @@ 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;
-  ++nbLines;
-  // Check log size, clear it if too big
-  if(nbLines > 200) {
-    infoBar->clear();
-    nbLines = 1;
-  }
-  infoBar->append(QString::fromUtf8("<font color='grey'>")+ QTime::currentTime().toString(QString::fromUtf8("hh:mm:ss")) + QString::fromUtf8("</font> - <font color='") + color.name() +QString::fromUtf8("'><i>") + info + QString::fromUtf8("</i></font>"));
-}
-
-void DownloadingTorrents::addFastResumeRejectedAlert(QString name) {
-  setInfoBar(tr("Fast resume data was rejected for torrent %1, checking again...").arg(name), QString::fromUtf8("red"));
-}
-
-void DownloadingTorrents::addUrlSeedError(QString url, QString msg) {
-  setInfoBar(tr("Url seed lookup failed for url: %1, message: %2").arg(url).arg(msg), QString::fromUtf8("red"));
-}
-
 void DownloadingTorrents::on_actionSet_download_limit_triggered() {
   QModelIndexList selectedIndexes = downloadList->selectionModel()->selectedIndexes();
   QModelIndex index;
@@ -267,6 +219,18 @@ void DownloadingTorrents::propertiesSelection(){
   }
 }
 
+void DownloadingTorrents::forceRecheck() {
+    QModelIndexList selectedIndexes = downloadList->selectionModel()->selectedIndexes();
+    QModelIndex index;
+    foreach(index, selectedIndexes){
+        if(index.column() == NAME){
+            QString hash = DLListModel->data(DLListModel->index(index.row(), HASH)).toString();
+            QTorrentHandle h = BTSession->getTorrentHandle(hash);
+            h.force_recheck();
+        }
+    }
+}
+
 void DownloadingTorrents::displayDLListMenu(const QPoint& pos) {
   QMenu myDLLlistMenu(this);
   QModelIndex index;
@@ -305,13 +269,20 @@ void DownloadingTorrents::displayDLListMenu(const QPoint& pos) {
   myDLLlistMenu.addAction(actionSet_download_limit);
   myDLLlistMenu.addAction(actionSet_upload_limit);
   myDLLlistMenu.addSeparator();
+  myDLLlistMenu.addAction(actionForce_recheck);
+  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));
 }
 
 
@@ -323,11 +294,17 @@ void DownloadingTorrents::displayDLListMenu(const QPoint& pos) {
 void DownloadingTorrents::displayDLHoSMenu(const QPoint& pos){
   QMenu hideshowColumn(this);
   hideshowColumn.setTitle(tr("Hide or Show Column"));
-  for(int i=0; i<=ETA; i++) {
+  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,55));
+  hideshowColumn.exec(mapToGlobal(pos)+QPoint(10,10));
 }
 
 // toggle hide/show a column
@@ -361,6 +338,14 @@ void DownloadingTorrents::hideOrShowColumn(int index) {
   }
 }
 
+void DownloadingTorrents::hidePriorityColumn(bool hide) {
+  downloadList->setColumnHidden(PRIORITY, hide);
+  if(hide)
+    getActionHoSCol(PRIORITY)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_cancel.png")));
+  else
+    getActionHoSCol(PRIORITY)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_ok.png")));
+}
+
 // save the hidden columns in settings
 void DownloadingTorrents::saveHiddenColumns() {
   QSettings settings("qBittorrent", "qBittorrent");
@@ -436,9 +421,8 @@ void DownloadingTorrents::hideOrShowColumnEta() {
   hideOrShowColumn(ETA);
 }
 
-
-void DownloadingTorrents::on_actionClearLog_triggered() {
-  infoBar->clear();
+void DownloadingTorrents::hideOrShowColumnPriority() {
+  hideOrShowColumn(PRIORITY);
 }
 
 // getter, return the action hide or show whose id is index
@@ -468,6 +452,9 @@ QAction* DownloadingTorrents::getActionHoSCol(int index) {
     case ETA :
       return actionHOSColEta;
     break;
+    case PRIORITY :
+      return actionHOSColPriority;
+      break;
     default :
       return NULL;
   }
@@ -488,33 +475,10 @@ QStringList DownloadingTorrents::getSelectedTorrents(bool only_one) const{
   return res;
 }
 
-void DownloadingTorrents::displayInfoBarMenu(const QPoint& pos) {
-  // Log Menu
-  QMenu myLogMenu(this);
-  myLogMenu.addAction(actionClearLog);
-  // XXX: Why mapToGlobal() is not enough?
-  myLogMenu.exec(mapToGlobal(pos)+QPoint(44,305));
-}
-
-void DownloadingTorrents::sortProgressColumnDelayed() {
-    if(delayedSorting) {
-      sortDownloadListFloat(PROGRESS, delayedSortingOrder);
-      qDebug("Delayed sorting of progress column");
-    }
-}
-
 // get information from torrent handles and
 // update download list accordingly
-void DownloadingTorrents::updateDlList() {
-  // browse handles
-  QStringList unfinishedTorrents = BTSession->getUnfinishedTorrents();
-  QString hash;
-  foreach(hash, unfinishedTorrents) {
-    QTorrentHandle h = BTSession->getTorrentHandle(hash);
-    if(!h.is_valid()){
-      qDebug("We have an invalid handle for: %s", qPrintable(hash));
-      continue;
-    }
+bool DownloadingTorrents::updateTorrent(QTorrentHandle h) {
+    bool added = false;
     try{
       QString hash = h.hash();
       int row = getRowFromHash(hash);
@@ -522,58 +486,43 @@ void DownloadingTorrents::updateDlList() {
         qDebug("Info: Could not find filename in download list, adding it...");
         addTorrent(hash);
         row = getRowFromHash(hash);
+        added = true;
       }
       Q_ASSERT(row != -1);
-      // No need to update a paused torrent
-      if(h.is_paused()) continue;
-      if(BTSession->getTorrentsToPauseAfterChecking().indexOf(hash) != -1) {
-        if(!downloadList->isColumnHidden(PROGRESS)) {
-          DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)h.progress()));
-        }
-         continue;
+      // Update Priority
+      if(BTSession->isQueueingEnabled()) {
+          DLListModel->setData(DLListModel->index(row, PRIORITY), QVariant((int)BTSession->getDlTorrentPriority(hash)));
+          if(h.is_queued()) {
+              if(h.state() == torrent_status::checking_files || h.state() == torrent_status::queued_for_checking) {
+                  DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/time.png"))), Qt::DecorationRole);
+                  if(!downloadList->isColumnHidden(PROGRESS)) {
+                      DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)h.progress()));
+                  }
+              }else {
+                  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));
+                  }
+              }
+              // Reset speeds and seeds/leech
+              DLListModel->setData(DLListModel->index(row, DLSPEED), QVariant((double)0.));
+              DLListModel->setData(DLListModel->index(row, UPSPEED), QVariant((double)0.));
+              DLListModel->setData(DLListModel->index(row, SEEDSLEECH), QVariant("0/0"));
+              setRowColor(row, QString::fromUtf8("grey"));
+              return added;
+          }
       }
+      if(!downloadList->isColumnHidden(PROGRESS))
+        DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)h.progress()));
+      // No need to update a paused torrent
+      if(h.is_paused()) return added;
       // Parse download state
       // Setting download state
       switch(h.state()) {
-        case torrent_status::finished:
-        case torrent_status::seeding:
-          qDebug("A torrent that was in download tab just finished, moving it to finished tab");
-          BTSession->setUnfinishedTorrent(hash);
-          emit torrentFinished(hash);
-          deleteTorrent(hash);
-          continue;
         case torrent_status::checking_files:
         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"));
-          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
-            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{
-            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"));
-          }
-          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:
@@ -590,9 +539,6 @@ void DownloadingTorrents::updateDlList() {
             }
             setRowColor(row, QApplication::palette().color(QPalette::WindowText));
           }
-          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()));
           }
@@ -611,18 +557,14 @@ void DownloadingTorrents::updateDlList() {
       if(!downloadList->isColumnHidden(RATIO)) {
         DLListModel->setData(DLListModel->index(row, RATIO), QVariant(misc::toQString(BTSession->getRealRatio(hash))));
       }
-    }catch(invalid_handle e) {
-      continue;
-    }
-  }
+    }catch(invalid_handle e) {}
+    return added;
 }
 
 void DownloadingTorrents::addTorrent(QString hash) {
-  if(BTSession->isFinished(hash)){
-    BTSession->setUnfinishedTorrent(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
@@ -632,18 +574,23 @@ void DownloadingTorrents::addTorrent(QString hash) {
   DLListModel->setData(DLListModel->index(row, DLSPEED), QVariant((double)0.));
   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, PROGRESS), QVariant((double)h.progress()));
   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)) {
+  // Pause torrent if it is
+  if(h.is_paused()) {
     DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/paused.png"))), Qt::DecorationRole);
     setRowColor(row, QString::fromUtf8("red"));
   }else{
-    DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/connecting.png"))), Qt::DecorationRole);
+    DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/stalled.png"))), Qt::DecorationRole);
     setRowColor(row, QString::fromUtf8("grey"));
   }
   ++nbTorrents;
   emit unfinishedTorrentsNumberChanged(nbTorrents);
+  // sort List
+  sortDownloadList();
 }
 
 void DownloadingTorrents::sortDownloadListFloat(int index, Qt::SortOrder sortOrder) {
@@ -692,27 +639,51 @@ void DownloadingTorrents::sortDownloadListString(int index, Qt::SortOrder sortOr
   DLListModel->removeRows(0, nbRows_old);
 }
 
-void DownloadingTorrents::sortDownloadList(int index, Qt::SortOrder startSortOrder, bool fromLoadColWidth) {
-  qDebug("Called sort download list");
-  static Qt::SortOrder sortOrder = startSortOrder;
-  if(!fromLoadColWidth && downloadList->header()->sortIndicatorSection() == index) {
-    if(sortOrder == Qt::AscendingOrder) {
-      sortOrder = Qt::DescendingOrder;
-    }else{
-      sortOrder = Qt::AscendingOrder;
-    }
+void DownloadingTorrents::toggleDownloadListSortOrder(int index) {
+  Qt::SortOrder sortOrder = Qt::AscendingOrder;
+  qDebug("Toggling column sort order");
+  if(downloadList->header()->sortIndicatorSection() == index) {
+    sortOrder = (Qt::SortOrder)!(bool)downloadList->header()->sortIndicatorOrder();
   }
+  switch(index) {
+    case SIZE:
+    case ETA:
+    case UPSPEED:
+    case DLSPEED:
+    case PROGRESS:
+    case PRIORITY:
+    case RATIO:
+      sortDownloadListFloat(index, sortOrder);
+      break;
+    default:
+      sortDownloadListString(index, sortOrder);
+  }
+  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
   QString sortOrderLetter;
   if(sortOrder == Qt::AscendingOrder)
     sortOrderLetter = QString::fromUtf8("a");
   else
     sortOrderLetter = QString::fromUtf8("d");
-  if(fromLoadColWidth) {
-    // XXX: Why is this needed?
-    if(sortOrder == Qt::DescendingOrder)
-      downloadList->header()->setSortIndicator(index, Qt::AscendingOrder);
-    else
-      downloadList->header()->setSortIndicator(index, Qt::DescendingOrder);
+  settings.setValue(QString::fromUtf8("DownloadListSortedCol"), misc::toQString(index)+sortOrderLetter);
+}
+
+void DownloadingTorrents::sortProgressColumn(QTorrentHandle& h) {
+  QString hash = h.hash();
+  int index = downloadList->header()->sortIndicatorSection();
+  if(index == PROGRESS) {
+    int row = getRowFromHash(hash);
+    if(row >= 0) {
+      DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)h.progress()));
+      Qt::SortOrder sortOrder = downloadList->header()->sortIndicatorOrder();
+      sortDownloadListFloat(index, sortOrder);
+    }
+  }
+}
+
+void DownloadingTorrents::sortDownloadList(int index, Qt::SortOrder sortOrder) {
+  if(index == -1) {
+    index = downloadList->header()->sortIndicatorSection();
+    sortOrder = downloadList->header()->sortIndicatorOrder();
   } else {
     downloadList->header()->setSortIndicator(index, sortOrder);
   }
@@ -721,23 +692,13 @@ void DownloadingTorrents::sortDownloadList(int index, Qt::SortOrder startSortOrd
     case ETA:
     case UPSPEED:
     case DLSPEED:
-      sortDownloadListFloat(index, sortOrder);
-      break;
+    case PRIORITY:
     case PROGRESS:
-      if(fromLoadColWidth) {
-        // Progress sorting must be delayed until files are checked (on startup)
-        delayedSorting = true;
-        qDebug("Delayed sorting of the progress column");
-        delayedSortingOrder = sortOrder;
-      }else{
-        sortDownloadListFloat(index, sortOrder);
-      }
+      sortDownloadListFloat(index, sortOrder);
       break;
     default:
       sortDownloadListString(index, sortOrder);
   }
-  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
-  settings.setValue(QString::fromUtf8("DownloadListSortedCol"), misc::toQString(index)+sortOrderLetter);
 }
 
 // Save columns width in a file to remember them
@@ -786,7 +747,13 @@ bool DownloadingTorrents::loadColWidthDLList() {
   for(unsigned int i=0; i<listSize; ++i) {
         downloadList->header()->resizeSection(i, width_list.at(i).toInt());
   }
+  qDebug("Download list columns width loaded");
+  return true;
+}
+
+void DownloadingTorrents::loadLastSortedColumn() {
   // Loading last sorted column
+  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
   QString sortedCol = settings.value(QString::fromUtf8("DownloadListSortedCol"), QString()).toString();
   if(!sortedCol.isEmpty()) {
     Qt::SortOrder sortOrder;
@@ -796,55 +763,8 @@ bool DownloadingTorrents::loadColWidthDLList() {
       sortOrder = Qt::AscendingOrder;
     sortedCol = sortedCol.left(sortedCol.size()-1);
     int index = sortedCol.toInt();
-    sortDownloadList(index, sortOrder, true);
+    sortDownloadList(index, sortOrder);
   }
-  qDebug("Download list columns width loaded");
-  return true;
-}
-
-// Called when a torrent is added
-void DownloadingTorrents::torrentAdded(QString path, QTorrentHandle& h, bool fastResume) {
-  QString hash = h.hash();
-  if(BTSession->isFinished(hash)) {
-    return;
-  }
-  int row = DLListModel->rowCount();
-  // Adding torrent to download list
-  DLListModel->insertRow(row);
-  DLListModel->setData(DLListModel->index(row, NAME), QVariant(h.name()));
-  DLListModel->setData(DLListModel->index(row, SIZE), QVariant((qlonglong)h.actual_size()));
-  DLListModel->setData(DLListModel->index(row, DLSPEED), QVariant((double)0.));
-  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, RATIO), QVariant(misc::toQString(BTSession->getRealRatio(hash))));
-  DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)-1));
-  DLListModel->setData(DLListModel->index(row, HASH), QVariant(hash));
-  // Pause torrent if it was paused last time
-  // Not using isPaused function because torrents are paused after checking now
-  if(QFile::exists(misc::qBittorrentPath()+QString::fromUtf8("BT_backup")+QDir::separator()+hash+QString::fromUtf8(".paused"))) {
-    DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/paused.png"))), Qt::DecorationRole);
-    setRowColor(row, QString::fromUtf8("red"));
-  }else{
-    DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/connecting.png"))), Qt::DecorationRole);
-    setRowColor(row, QString::fromUtf8("grey"));
-  }
-  if(!fastResume) {
-    setInfoBar(tr("'%1' added to download list.", "'/home/y/xxx.torrent' was added to download list.").arg(path));
-  }else{
-    setInfoBar(tr("'%1' resumed. (fast resume)", "'/home/y/xxx.torrent' was resumed. (fast resume)").arg(path));
-  }
-  ++nbTorrents;
-  emit unfinishedTorrentsNumberChanged(nbTorrents);
-}
-
-// Called when trying to add a duplicate torrent
-void DownloadingTorrents::torrentDuplicate(QString path) {
-  setInfoBar(tr("'%1' is already in download list.", "e.g: 'xxx.avi' is already in download list.").arg(path));
-}
-
-void DownloadingTorrents::torrentCorrupted(QString path) {
-  setInfoBar(tr("Unable to decode torrent file: '%1'", "e.g: Unable to decode torrent file: '/home/y/xxx.torrent'").arg(path), QString::fromUtf8("red"));
-  setInfoBar(tr("This file is either corrupted or this isn't a torrent."),QString::fromUtf8("red"));
 }
 
 void DownloadingTorrents::updateFileSizeAndProgress(QString hash) {
@@ -852,13 +772,7 @@ void DownloadingTorrents::updateFileSizeAndProgress(QString hash) {
   Q_ASSERT(row != -1);
   QTorrentHandle h = BTSession->getTorrentHandle(hash);
   DLListModel->setData(DLListModel->index(row, SIZE), QVariant((qlonglong)h.actual_size()));
-  DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)h.progress()));
-}
-
-// Called when we couldn't listen on any port
-// in the given range.
-void DownloadingTorrents::portListeningFailure() {
-  setInfoBar(tr("Couldn't listen on any of the given ports."), QString::fromUtf8("red"));
+  //DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)h.progress()));
 }
 
 // Set the color of a row in data model
@@ -880,7 +794,3 @@ int DownloadingTorrents::getRowFromHash(QString hash) const{
   }
   return -1;
 }
-
-void DownloadingTorrents::displayDownloadingUrlInfos(QString url) {
-  setInfoBar(tr("Downloading '%1', please wait...", "e.g: Downloading 'xxx.torrent', please wait...").arg(url), QPalette::WindowText);
-}

src/downloadingTorrents.h

@@ -38,9 +38,7 @@ class DownloadingTorrents : public QWidget, public Ui::downloading{
     bittorrent *BTSession;
     DLListDelegate *DLDelegate;
     QStandardItemModel *DLListModel;
-    bool delayedSorting;
     unsigned int nbTorrents;
-    Qt::SortOrder delayedSortingOrder;
     void hideOrShowColumn(int index);
     bool loadHiddenColumns();
     void saveHiddenColumns();
@@ -55,34 +53,24 @@ 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, bool finished);
-    void torrentFinished(QString hash);
 
   protected slots:
-    void addLogPeerBlocked(QString);
-    void addFastResumeRejectedAlert(QString);
-    void addUrlSeedError(QString url, QString msg);
     void on_actionSet_download_limit_triggered();
     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);
-    void sortDownloadList(int index, Qt::SortOrder startSortOrder=Qt::AscendingOrder, bool fromLoadColWidth=false);
+    void sortDownloadList(int index=-1, Qt::SortOrder startSortOrder=Qt::AscendingOrder);
+    void toggleDownloadListSortOrder(int index);
     void sortDownloadListFloat(int index, Qt::SortOrder sortOrder);
     void sortDownloadListString(int index, Qt::SortOrder sortOrder);
     void saveColWidthDLList() const;
-    void torrentAdded(QString path, QTorrentHandle& h, bool fastResume);
-    void torrentDuplicate(QString path);
-    void torrentCorrupted(QString path);
-    void portListeningFailure();
     void setRowColor(int row, QColor color);
-    void displayDownloadingUrlInfos(QString url);
     void showProperties(const QModelIndex &index);
     void hideOrShowColumnName();
     void hideOrShowColumnSize();
@@ -92,20 +80,20 @@ class DownloadingTorrents : public QWidget, public Ui::downloading{
     void hideOrShowColumnSeedersLeechers();
     void hideOrShowColumnRatio();
     void hideOrShowColumnEta();
-    void displayUPnPError(QString msg);
-    void displayUPnPSuccess(QString msg);
+    void hideOrShowColumnPriority();
+    void forceRecheck();
 
   public slots:
-    void updateDlList();
-    void setInfoBar(QString info, QColor color=QApplication::palette().color(QPalette::WindowText));
+    bool updateTorrent(QTorrentHandle h);
     void pauseTorrent(QString hash);
-    void resumeTorrent(QString hash);
     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);
+    void sortProgressColumn(QTorrentHandle& h);
+    void loadLastSortedColumn();
+    void addTorrent(QString hash);
 
 };
 

src/engineSelectDlg.cpp

@@ -32,11 +32,6 @@
 #include <QDropEvent>
 #include <QInputDialog>
 
-#ifdef HAVE_MAGICK
-  #include <Magick++.h>
-  using namespace Magick;
-#endif
-
 #ifdef HAVE_ZZIP
   #include <zzip/zzip.h>
 #endif
@@ -611,20 +606,6 @@ void engineSelectDlg::processDownloadedFile(QString url, QString filePath) {
   if(url.endsWith("favicon.ico", Qt::CaseInsensitive)){
     // Icon downloaded
     QImage fileIcon;
-#ifdef HAVE_MAGICK
-    try{
-      QFile::copy(filePath, filePath+".ico");
-      Image image(QDir::cleanPath(filePath+".ico").toUtf8().data());
-        // Convert to PNG since we can't read ICO format
-      image.magick("PNG");
-        // Resize to 16x16px
-      image.sample(Geometry(16, 16));
-      image.write(filePath.toUtf8().data());
-      QFile::remove(filePath+".ico");
-    }catch(Magick::Exception &error_){
-      qDebug("favicon conversion to PNG failure: %s", error_.what());
-    }
-#endif
     if(fileIcon.load(filePath)) {
       QList<QTreeWidgetItem*> items = findItemsWithUrl(url);
       QTreeWidgetItem *item;

src/eventmanager.cpp

@@ -1,6 +1,6 @@
 /*
- *   Copyright (C) 2007 by Ishan Arora
- *   ishanarora@gmail.com
+ *   Copyright (C) 2007 by Ishan Arora & Christophe Dumez
+ *   <ishan@qbittorrent.org>, <chris@qbittorrent.org>
  *
  *   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
@@ -20,167 +20,76 @@
 
 
 #include "eventmanager.h"
-#include "json.h"
+#include "bittorrent.h"
 #include <QDebug>
 
-EventManager::EventManager(QObject *parent)
-	: QObject(parent)
+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;*/
+QList<QVariantMap> EventManager::getEventList() const {
+        return event_list.values();
 }
 
-QVariant EventManager::querySince(ulong r) const
+void EventManager::addedTorrent(QTorrentHandle& h)
 {
-	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);
+    modifiedTorrent(h);
 }
 
 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);
+    event_list.remove(hash);
 }
 
 void EventManager::modifiedTorrent(QTorrentHandle h)
 {
-	QString hash = h.hash();
-	QVariantMap event;
-	QVariant v;
-	
-	if(h.is_paused())
-		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);
-	}
-}
+    QString hash = h.hash();
+    QVariantMap 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;
-				}
-			}
-		}
+    if(h.is_paused()) {
+        event["state"] = QVariant("paused");
+    } else {
+        if(BTSession->isQueueingEnabled() && h.is_queued()) {
+            event["state"] = QVariant("queued");
+        } else {
+            switch(h.state())
+            {
+                        case torrent_status::finished:
+                        case torrent_status::seeding:
+                event["state"] = QVariant("seeding");
+                break;
+                        case torrent_status::checking_files:
+                        case torrent_status::queued_for_checking:
+                event["state"] = QVariant("checking");
+                break;
+                        case torrent_status::allocating:
+                        case torrent_status::downloading:
+                        case torrent_status::downloading_metadata:
+                if(h.download_payload_rate() > 0)
+                    event["state"] = QVariant("downloading");
+                else
+                    event["state"] = QVariant("stalled");
+                break;
+                        default:
+                qDebug("No status, should not happen!!! status is %d", h.state());
+                event["state"] = QVariant();
+            }
+        }
+    }
+	event["name"] = QVariant(h.name());
+	event["size"] = QVariant((qlonglong)h.actual_size());
+        if(!h.is_seed()) {
+		event["progress"] = QVariant(h.progress());
+		event["dlspeed"] = QVariant(h.download_payload_rate());
+                if(BTSession->isQueueingEnabled()) {
+                    event["priority"] = QVariant(h.queue_position());
+                } else {
+                    event["priority"] = -1;
+                }
 	}
-	return true;
+	event["upspeed"] = QVariant(h.upload_payload_rate());
+        event["seed"] = QVariant(h.is_seed());
+	event["hash"] = QVariant(hash);
+	event_list[hash] = event;
 }

src/eventmanager.h

@@ -1,6 +1,6 @@
 /*
- *   Copyright (C) 2007 by Ishan Arora
- *   ishanarora@gmail.com
+ *   Copyright (C) 2007 by Ishan Arora & Christophe Dumez
+ *   <ishan@qbittorrent.org>, <chris@qbittorrent.org>
  *
  *   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
@@ -23,31 +23,27 @@
 #define EVENTMANAGER_H
 
 #include "qtorrenthandle.h"
-#include <QLinkedList>
-#include <QPair>
+#include <QHash>
 #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);
+		QHash<QString, QVariantMap> event_list;
+		bittorrent* BTSession;
 
 	protected:
 		void update(QVariantMap event);
 
 	public:
-		EventManager(QObject *parent = 0);
-		QVariant querySince(ulong r) const;
-		bool isUpdated(ulong r) const;
-
-	signals:
-		void updated();
+		EventManager(QObject *parent, bittorrent* BTSession);
+                QList<QVariantMap> getEventList() const;
 
 	public slots:
-		void addedTorrent(QString path, QTorrentHandle& h);
+		void addedTorrent(QTorrentHandle& h);
 		void deletedTorrent(QString hash);
 		void modifiedTorrent(QTorrentHandle h);
 };

src/filterParserThread.h

@@ -35,7 +35,11 @@ using namespace std;
 
 // P2B Stuff
 #include <string.h>
-#include <arpa/inet.h>
+#ifdef Q_WS_WIN
+    #include <Winsock2.h>
+#else
+    #include <arpa/inet.h>
+#endif
 // End of P2B stuff
 
 class FilterParserThread : public QThread  {
@@ -250,8 +254,9 @@ class FilterParserThread : public QThread  {
     int getlineInStream(QDataStream& stream, string& name, char delim) {
       char c;
       int total_read = 0;
+      int read;
       do {
-        int read = stream.readRawData(&c, 1);
+        read = stream.readRawData(&c, 1);
         total_read += read;
         if(read > 0) {
           if(c != delim) {

src/httpconnection.cpp

@@ -30,6 +30,7 @@
 #include <QHttpResponseHeader>
 #include <QFile>
 #include <QDebug>
+#include <QTemporaryFile>
 
 HttpConnection::HttpConnection(QTcpSocket *socket, HttpServer *parent)
 	: QObject(parent), socket(socket), parent(parent)
@@ -41,15 +42,31 @@ HttpConnection::HttpConnection(QTcpSocket *socket, HttpServer *parent)
 
 HttpConnection::~HttpConnection()
 {
+  delete socket;
+}
+
+void HttpConnection::processDownloadedFile(QString url, QString file_path) {
+	qDebug("URL %s successfully downloaded !", (const char*)url.toUtf8());
+	emit torrentReadyToBeDownloaded(file_path, false, url, false);	
+}
+
+void HttpConnection::handleDownloadFailure(QString url, QString reason) {
+	std::cerr << "Could not download " << (const char*)url.toUtf8() << ", reason: " << (const char*)reason.toUtf8() << "\n";
 }
 
 void HttpConnection::read()
 {
-	QString input = socket->readAll();
-	qDebug(" -------");
+	QByteArray input = socket->readAll();
+	/*qDebug(" -------");
 	qDebug("|REQUEST|");
-	qDebug(" -------");
-	qDebug(input.toAscii().constData());
+	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())
 	{
@@ -64,16 +81,17 @@ void HttpConnection::read()
 void HttpConnection::write()
 {
 	QByteArray output = generator.toByteArray();
-	qDebug(" --------");
+	/*qDebug(" --------");
 	qDebug("|RESPONSE|");
 	qDebug(" --------");
-	qDebug()<<output;
+	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()))
 	{
@@ -97,12 +115,7 @@ void HttpConnection::respond()
 		{
 			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()));
+				respondJson();
 				return;
 			}
 		}
@@ -147,11 +160,8 @@ void HttpConnection::respondNotFound()
 
 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);
+        EventManager* manager =  parent->eventManager();
+        QString string = json::toJson(manager->getEventList());
 	generator.setStatusLine(200, "OK");
 	generator.setContentTypeByExt("js");
 	generator.setMessage(string);
@@ -164,41 +174,64 @@ void HttpConnection::respondCommand(QString command)
 	{
 		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;
-				}
+				qDebug("Downloading url: %s", (const char*)url.toUtf8());
+				emit UrlReadyToBeDownloaded(url);
 			}
 		}
-		emit urlsReadyToBeDownloaded(url_list_cleaned);
 		return;
 	}
-	if(command == "resumeall")
+	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")
-	{
+        if(command == "pauseall") {
 		emit pauseAllTorrents();
 		return;
 	}
-	if(command == "resume")
-	{
+	if(command == "resume")	{
 		emit resumeTorrent(parser.post("hash"));
 		return;
 	}
-	if(command == "pause")
-	{
+        if(command == "pause") {
 		emit pauseTorrent(parser.post("hash"));
 		return;
 	}
-	if(command == "delete")
-	{
-		emit deleteTorrent(parser.post("hash"));
+        if(command == "delete") {
+                emit deleteTorrent(parser.post("hash"), false);
 		return;
 	}
+        if(command == "deletePerm") {
+                emit deleteTorrent(parser.post("hash"), true);
+                return;
+        }
+        if(command == "increasePrio") {
+                emit increasePrioTorrent(parser.post("hash"));
+                return;
+        }
+        if(command == "decreasePrio") {
+                emit decreasePrioTorrent(parser.post("hash"));
+                return;
+        }
 }

src/httpconnection.h

@@ -27,7 +27,6 @@
 #include <QObject>
 
 class QTcpSocket;
-
 class HttpServer;
 
 class HttpConnection : public QObject
@@ -47,6 +46,8 @@ class HttpConnection : public QObject
 		void respondJson();
 		void respondCommand(QString command);
 		void respondNotFound();
+		void processDownloadedFile(QString, QString);
+		void handleDownloadFailure(QString, QString);
 
 	public:
 		HttpConnection(QTcpSocket *socket, HttpServer *parent);
@@ -56,10 +57,13 @@ class HttpConnection : public QObject
 		void read();
 
 	signals:
-		void urlsReadyToBeDownloaded(const QStringList&);
-		void deleteTorrent(QString hash);
+                void UrlReadyToBeDownloaded(QString url);
+		void torrentReadyToBeDownloaded(QString, bool, QString, bool);
+                void deleteTorrent(QString hash, bool permanently);
 		void resumeTorrent(QString hash);
 		void pauseTorrent(QString hash);
+                void increasePrioTorrent(QString hash);
+                void decreasePrioTorrent(QString hash);
 		void resumeAllTorrents();
 		void pauseAllTorrents();
 };

src/httprequestparser.cpp

@@ -49,11 +49,11 @@ QString HttpRequestParser::url() const
 	return path;
 }
 
-QString HttpRequestParser::message() const
+QByteArray HttpRequestParser::message() const
 {
 	if(isParsable())
 		return data;
-	return QString();
+	return QByteArray();
 }
 
 QString HttpRequestParser::get(const QString key) const
@@ -66,7 +66,12 @@ QString HttpRequestParser::post(const QString key) const
 	return postMap[key];
 }
 
-void HttpRequestParser::write(QString str)
+QByteArray HttpRequestParser::torrent() const
+{
+	return torrent_content;
+}
+
+void HttpRequestParser::write(QByteArray str)
 {
 	while (!headerDone && str.size()>0)
 	{
@@ -87,13 +92,13 @@ void HttpRequestParser::write(QString str)
 				data.clear();
 				QUrl url = QUrl::fromEncoded(QHttpRequestHeader::path().toAscii());
 				path = url.path();
-				qDebug() << path;
+                                //() << 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);
+                                        //qDebug() << pair.first << "=" << get(pair.first);
 				}
 			}
 		}
@@ -111,18 +116,23 @@ void HttpRequestParser::write(QString str)
 				if(contentType() == "application/x-www-form-urlencoded")
 				{
 					QUrl url;
-					url.setEncodedQuery(data.toAscii());
+					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);
+                                                //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;
-	}
+        }
 }

src/httprequestparser.h

@@ -30,10 +30,11 @@ class HttpRequestParser : public QHttpRequestHeader
 		bool headerDone;
 		bool messageDone;
 		bool error;
-		QString data;
+		QByteArray data;
 		QString path;
 		QMap<QString, QString> postMap;
 		QMap<QString, QString> getMap;
+		QByteArray torrent_content;
 
 	public:
 		HttpRequestParser();
@@ -41,10 +42,11 @@ class HttpRequestParser : public QHttpRequestHeader
 		bool isParsable() const;
 		bool isError() const;
 		QString url() const;
-		QString message() const;
+		QByteArray message() const;
 		QString get(const QString key) const;
 		QString post(const QString key) const;
-		void write(QString str);
+		QByteArray torrent() const;
+		void write(QByteArray str);
 };
 
 #endif

src/httpresponsegenerator.cpp

@@ -20,7 +20,6 @@
 
 
 #include "httpresponsegenerator.h"
-#include <QDebug>
 
 void HttpResponseGenerator::setMessage(const QByteArray message)
 {

src/httpserver.cpp

@@ -25,32 +25,32 @@
 #include "bittorrent.h"
 #include <QTimer>
 
-HttpServer::HttpServer(bittorrent *BTSession, int msec, QObject* parent) : QTcpServer(parent)
+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 = _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);
-	}
+        std::vector<torrent_handle> torrents = BTSession->getTorrents();
+        std::vector<torrent_handle>::iterator torrentIT;
+        for(torrentIT = torrents.begin(); torrentIT != torrents.end(); torrentIT++) {
+            QTorrentHandle h = QTorrentHandle(*torrentIT);
+            if(h.is_valid())
+                manager->addedTorrent(h);
+        }
 	//connect BTSession to manager
-	connect(BTSession, SIGNAL(addedTorrent(QString, QTorrentHandle&, bool)), manager, SLOT(addedTorrent(QString, QTorrentHandle&)));
+	connect(BTSession, SIGNAL(addedTorrent(QTorrentHandle&)), manager, SLOT(addedTorrent(QTorrentHandle&)));
 	connect(BTSession, SIGNAL(deletedTorrent(QString)), manager, SLOT(deletedTorrent(QString)));
 	//set timer
-	QTimer *timer = new QTimer(this);
+	timer = new QTimer(this);
 	connect(timer, SIGNAL(timeout()), this, SLOT(onTimer()));
 	timer->start(msec);
 }
 
 HttpServer::~HttpServer()
 {
+	delete timer;
 	delete manager;
 }
 
@@ -61,24 +61,26 @@ void HttpServer::newHttpConnection()
 	{
 		HttpConnection *connection = new HttpConnection(socket, this);
 		//connect connection to BTSession
-		connect(connection, SIGNAL(urlsReadyToBeDownloaded(const QStringList&)), BTSession, SLOT(downloadFromURLList(const QStringList&)));
-		connect(connection, SIGNAL(deleteTorrent(QString)), BTSession, SLOT(deleteTorrent(QString)));
+		connect(connection, SIGNAL(UrlReadyToBeDownloaded(QString)), BTSession, SLOT(downloadUrlAndSkipDialog(QString)));
+		connect(connection, SIGNAL(torrentReadyToBeDownloaded(QString, bool, QString, bool)), BTSession, SLOT(addTorrent(QString, bool, QString, bool)));
+                connect(connection, SIGNAL(deleteTorrent(QString, bool)), BTSession, SLOT(deleteTorrent(QString, bool)));
 		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()));
+                connect(connection, SIGNAL(increasePrioTorrent(QString)), BTSession, SLOT(increaseDlTorrentPriority(QString)));
+                connect(connection, SIGNAL(decreasePrioTorrent(QString)), BTSession, SLOT(decreaseDlTorrentPriority(QString)));
 	}
 }
 
-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::onTimer() {
+        std::vector<torrent_handle> torrents = BTSession->getTorrents();
+        std::vector<torrent_handle>::iterator torrentIT;
+        for(torrentIT = torrents.begin(); torrentIT != torrents.end(); torrentIT++) {
+            QTorrentHandle h = QTorrentHandle(*torrentIT);
+            if(h.is_valid())
+                manager->modifiedTorrent(h);
+        }
 }
 
 void HttpServer::setAuthorization(QString username, QString password)
@@ -92,7 +94,7 @@ bool HttpServer::isAuthorized(QByteArray auth) const
 	return (auth == base64);
 }
 
-EventManager *HttpServer::eventManager() const
+EventManager* HttpServer::eventManager() const
 {
 	return manager;
 }

src/httpserver.h

@@ -26,7 +26,7 @@
 #include <QByteArray>
 
 class bittorrent;
-
+class QTimer;
 class EventManager;
 
 class HttpServer : public QTcpServer
@@ -37,6 +37,7 @@ class HttpServer : public QTcpServer
 		QByteArray base64;
 		bittorrent *BTSession;
 		EventManager *manager;
+		QTimer *timer;
 
 	public:
 		HttpServer(bittorrent *BTSession, int msec, QObject* parent = 0);

src/ico.cpp

@@ -0,0 +1,462 @@
+/*
+ * kimgio import filter for MS Windows .ico files
+ *
+ * Distributed under the terms of the LGPL
+ * Copyright (c) 2000 Malte Starostik <malte@kde.org>
+ *
+ */
+
+#include "ico.h"
+
+#include <cstring>
+#include <cstdlib>
+#include <algorithm>
+#include <vector>
+
+#include <QImage>
+#include <QBitmap>
+#include <QApplication>
+#include <QVector>
+#include <QDesktopWidget>
+
+namespace
+{
+    // Global header (see http://www.daubnet.com/formats/ICO.html)
+    struct IcoHeader
+    {
+        enum Type { Icon = 1, Cursor };
+        quint16 reserved;
+        quint16 type;
+        quint16 count;
+    };
+
+    inline QDataStream& operator >>( QDataStream& s, IcoHeader& h )
+    {
+        return s >> h.reserved >> h.type >> h.count;
+    }
+
+    // Based on qt_read_dib et al. from qimage.cpp
+    // (c) 1992-2002 Trolltech AS.
+    struct BMP_INFOHDR
+    {
+        static const quint32 Size = 40;
+        quint32  biSize;                // size of this struct
+        quint32  biWidth;               // pixmap width
+        quint32  biHeight;              // pixmap height
+        quint16  biPlanes;              // should be 1
+        quint16  biBitCount;            // number of bits per pixel
+        enum Compression { RGB = 0 };
+        quint32  biCompression;         // compression method
+        quint32  biSizeImage;           // size of image
+        quint32  biXPelsPerMeter;       // horizontal resolution
+        quint32  biYPelsPerMeter;       // vertical resolution
+        quint32  biClrUsed;             // number of colors used
+        quint32  biClrImportant;        // number of important colors
+    };
+    const quint32 BMP_INFOHDR::Size;
+
+    QDataStream& operator >>( QDataStream &s, BMP_INFOHDR &bi )
+    {
+        s >> bi.biSize;
+        if ( bi.biSize == BMP_INFOHDR::Size )
+        {
+            s >> bi.biWidth >> bi.biHeight >> bi.biPlanes >> bi.biBitCount;
+            s >> bi.biCompression >> bi.biSizeImage;
+            s >> bi.biXPelsPerMeter >> bi.biYPelsPerMeter;
+            s >> bi.biClrUsed >> bi.biClrImportant;
+        }
+        return s;
+    }
+
+#if 0
+    QDataStream &operator<<( QDataStream &s, const BMP_INFOHDR &bi )
+    {
+        s << bi.biSize;
+        s << bi.biWidth << bi.biHeight;
+        s << bi.biPlanes;
+        s << bi.biBitCount;
+        s << bi.biCompression;
+        s << bi.biSizeImage;
+        s << bi.biXPelsPerMeter << bi.biYPelsPerMeter;
+        s << bi.biClrUsed << bi.biClrImportant;
+        return s;
+    }
+#endif
+
+    // Header for every icon in the file
+    struct IconRec
+    {
+        unsigned char width;
+        unsigned char height;
+        quint16 colors;
+        quint16 hotspotX;
+        quint16 hotspotY;
+        quint32 size;
+        quint32 offset;
+    };
+
+    inline QDataStream& operator >>( QDataStream& s, IconRec& r )
+    {
+        return s >> r.width >> r.height >> r.colors
+                 >> r.hotspotX >> r.hotspotY >> r.size >> r.offset;
+    }
+
+    struct LessDifference
+    {
+        LessDifference( unsigned s, unsigned c )
+            : size( s ), colors( c ) {}
+
+        bool operator ()( const IconRec& lhs, const IconRec& rhs ) const
+        {
+            // closest size match precedes everything else
+            if ( std::abs( int( lhs.width - size ) ) <
+                 std::abs( int( rhs.width - size ) ) ) return true;
+            else if ( std::abs( int( lhs.width - size ) ) >
+                 std::abs( int( rhs.width - size ) ) ) return false;
+            else if ( colors == 0 )
+            {
+                // high/true color requested
+                if ( lhs.colors == 0 ) return true;
+                else if ( rhs.colors == 0 ) return false;
+                else return lhs.colors > rhs.colors;
+            }
+            else
+            {
+                // indexed icon requested
+                if ( lhs.colors == 0 && rhs.colors == 0 ) return false;
+                else if ( lhs.colors == 0 ) return false;
+                else return std::abs( int( lhs.colors - colors ) ) <
+                            std::abs( int( rhs.colors - colors ) );
+            }
+        }
+        unsigned size;
+        unsigned colors;
+    };
+
+    bool loadFromDIB( QDataStream& stream, const IconRec& rec, QImage& icon )
+    {
+        BMP_INFOHDR header;
+        stream >> header;
+        if ( stream.atEnd() || header.biSize != BMP_INFOHDR::Size ||
+             header.biSize > rec.size ||
+             header.biCompression != BMP_INFOHDR::RGB ||
+             ( header.biBitCount != 1 && header.biBitCount != 4 &&
+               header.biBitCount != 8 && header.biBitCount != 24 &&
+               header.biBitCount != 32 ) ) return false;
+
+        unsigned paletteSize, paletteEntries;
+
+        if (header.biBitCount > 8)
+        {
+            paletteEntries = 0;
+            paletteSize    = 0;
+        }
+        else
+        {
+            paletteSize    = (1 << header.biBitCount);
+            paletteEntries = paletteSize;
+            if (header.biClrUsed && header.biClrUsed < paletteSize)
+                paletteEntries = header.biClrUsed;
+        }
+
+        // Always create a 32-bit image to get the mask right
+        // Note: this is safe as rec.width, rec.height are bytes
+        icon = QImage( rec.width, rec.height, QImage::Format_ARGB32 );
+        if ( icon.isNull() ) return false;
+
+        QVector< QRgb > colorTable( paletteSize );
+
+        colorTable.fill( QRgb( 0 ) );
+        for ( unsigned i = 0; i < paletteEntries; ++i )
+        {
+            unsigned char rgb[ 4 ];
+            stream.readRawData( reinterpret_cast< char* >( &rgb ),
+                                 sizeof( rgb ) );
+            colorTable[ i ] = qRgb( rgb[ 2 ], rgb[ 1 ], rgb[ 0 ] );
+        }
+
+        unsigned bpl = ( rec.width * header.biBitCount + 31 ) / 32 * 4;
+
+        unsigned char* buf = new unsigned char[ bpl ];
+        for ( unsigned y = rec.height; !stream.atEnd() && y--; )
+        {
+            stream.readRawData( reinterpret_cast< char* >( buf ), bpl );
+            unsigned char* pixel = buf;
+            QRgb* p = reinterpret_cast< QRgb* >( icon.scanLine(y));
+            switch ( header.biBitCount )
+            {
+                case 1:
+                    for ( unsigned x = 0; x < rec.width; ++x )
+                        *p++ = colorTable[
+                            ( pixel[ x / 8 ] >> ( 7 - ( x & 0x07 ) ) ) & 1 ];
+                    break;
+                case 4:
+                    for ( unsigned x = 0; x < rec.width; ++x )
+                        if ( x & 1 ) *p++ = colorTable[ pixel[ x / 2 ] & 0x0f ];
+                        else *p++ = colorTable[ pixel[ x / 2 ] >> 4 ];
+                    break;
+                case 8:
+                    for ( unsigned x = 0; x < rec.width; ++x )
+                        *p++ = colorTable[ pixel[ x ] ];
+                    break;
+                case 24:
+                    for ( unsigned x = 0; x < rec.width; ++x )
+                        *p++ = qRgb( pixel[ 3 * x + 2 ],
+                                     pixel[ 3 * x + 1 ],
+                                     pixel[ 3 * x ] );
+                    break;
+                case 32:
+                    for ( unsigned x = 0; x < rec.width; ++x )
+                        *p++ = qRgba( pixel[ 4 * x + 2 ],
+                                      pixel[ 4 * x + 1 ],
+                                      pixel[ 4 * x ],
+                                      pixel[ 4 * x  + 3] );
+                    break;
+            }
+        }
+        delete[] buf;
+
+        if ( header.biBitCount < 32 )
+        {
+            // Traditional 1-bit mask
+            bpl = ( rec.width + 31 ) / 32 * 4;
+            buf = new unsigned char[ bpl ];
+            for ( unsigned y = rec.height; y--; )
+            {
+                stream.readRawData( reinterpret_cast< char* >( buf ), bpl );
+                QRgb* p = reinterpret_cast< QRgb* >(icon.scanLine(y));
+                for ( unsigned x = 0; x < rec.width; ++x, ++p )
+                    if ( ( ( buf[ x / 8 ] >> ( 7 - ( x & 0x07 ) ) ) & 1 ) )
+                        *p &= RGB_MASK;
+            }
+            delete[] buf;
+        }
+        return true;
+    }
+}
+
+ICOHandler::ICOHandler()
+{
+}
+
+bool ICOHandler::canRead() const
+{
+    if (canRead(device())) {
+        setFormat("ico");
+        return true;
+    }
+    return false;
+}
+
+bool ICOHandler::read(QImage *outImage)
+{
+
+    qint64 offset = device()->pos();
+
+    QDataStream stream( device() );
+    stream.setByteOrder( QDataStream::LittleEndian );
+    IcoHeader header;
+    stream >> header;
+    if ( stream.atEnd() || !header.count ||
+         ( header.type != IcoHeader::Icon && header.type != IcoHeader::Cursor) )
+        return false;
+
+    unsigned requestedSize = 32;
+    unsigned requestedColors =  QApplication::desktop()->depth() > 8 ? 0 : QApplication::desktop()->depth();
+    int requestedIndex = -1;
+#if 0
+    if ( io->parameters() )
+    {
+        QStringList params = QString(io->parameters()).split( ';', QString::SkipEmptyParts );
+        QMap< QString, QString > options;
+        for ( QStringList::ConstIterator it = params.begin();
+              it != params.end(); ++it )
+        {
+            QStringList tmp = (*it).split( '=', QString::SkipEmptyParts );
+            if ( tmp.count() == 2 ) options[ tmp[ 0 ] ] = tmp[ 1 ];
+        }
+        if ( options[ "index" ].toUInt() )
+            requestedIndex = options[ "index" ].toUInt();
+        if ( options[ "size" ].toUInt() )
+            requestedSize = options[ "size" ].toUInt();
+        if ( options[ "colors" ].toUInt() )
+            requestedColors = options[ "colors" ].toUInt();
+    }
+#endif
+
+    typedef std::vector< IconRec > IconList;
+    IconList icons;
+    for ( unsigned i = 0; i < header.count; ++i )
+    {
+        if ( stream.atEnd() )
+            return false;
+        IconRec rec;
+        stream >> rec;
+        icons.push_back( rec );
+    }
+    IconList::const_iterator selected;
+    if (requestedIndex >= 0) {
+        selected = std::min( icons.begin() + requestedIndex, icons.end() );
+    } else {
+        selected = std::min_element( icons.begin(), icons.end(),
+                                     LessDifference( requestedSize, requestedColors ) );
+    }
+    if ( stream.atEnd() || selected == icons.end() ||
+         offset + selected->offset > device()->size() )
+        return false;
+
+    device()->seek( offset + selected->offset );
+    QImage icon;
+    if ( loadFromDIB( stream, *selected, icon ) )
+    {
+        icon.setText( "X-Index", 0, QString::number( selected - icons.begin() ) );
+        if ( header.type == IcoHeader::Cursor )
+        {
+            icon.setText( "X-HotspotX", 0, QString::number( selected->hotspotX ) );
+            icon.setText( "X-HotspotY", 0, QString::number( selected->hotspotY ) );
+        }
+
+        *outImage = icon;
+        return true;
+    }
+    return false;
+}
+
+bool ICOHandler::write(const QImage &/*image*/)
+{
+#if 0
+    if (image.isNull())
+        return;
+
+    QByteArray dibData;
+    QDataStream dib(dibData, QIODevice::ReadWrite);
+    dib.setByteOrder(QDataStream::LittleEndian);
+
+    QImage pixels = image;
+    QImage mask;
+    if (io->image().hasAlphaBuffer())
+        mask = image.createAlphaMask();
+    else
+        mask = image.createHeuristicMask();
+    mask.invertPixels();
+    for ( int y = 0; y < pixels.height(); ++y )
+        for ( int x = 0; x < pixels.width(); ++x )
+            if ( mask.pixel( x, y ) == 0 ) pixels.setPixel( x, y, 0 );
+
+    if (!qt_write_dib(dib, pixels))
+        return;
+
+   uint hdrPos = dib.device()->at();
+    if (!qt_write_dib(dib, mask))
+        return;
+    memmove(dibData.data() + hdrPos, dibData.data() + hdrPos + BMP_WIN + 8, dibData.size() - hdrPos - BMP_WIN - 8);
+    dibData.resize(dibData.size() - BMP_WIN - 8);
+
+    QDataStream ico(device());
+    ico.setByteOrder(QDataStream::LittleEndian);
+    IcoHeader hdr;
+    hdr.reserved = 0;
+    hdr.type = Icon;
+    hdr.count = 1;
+    ico << hdr.reserved << hdr.type << hdr.count;
+    IconRec rec;
+    rec.width = image.width();
+    rec.height = image.height();
+    if (image.numColors() <= 16)
+        rec.colors = 16;
+    else if (image.depth() <= 8)
+        rec.colors = 256;
+    else
+        rec.colors = 0;
+    rec.hotspotX = 0;
+    rec.hotspotY = 0;
+    rec.dibSize = dibData.size();
+    ico << rec.width << rec.height << rec.colors
+        << rec.hotspotX << rec.hotspotY << rec.dibSize;
+    rec.dibOffset = ico.device()->at() + sizeof(rec.dibOffset);
+    ico << rec.dibOffset;
+
+    BMP_INFOHDR dibHeader;
+    dib.device()->at(0);
+    dib >> dibHeader;
+    dibHeader.biHeight = image.height() << 1;
+    dib.device()->at(0);
+    dib << dibHeader;
+
+    ico.writeRawBytes(dibData.data(), dibData.size());
+    return true;
+#endif
+    return false;
+}
+
+QByteArray ICOHandler::name() const
+{
+    return "ico";
+}
+
+bool ICOHandler::canRead(QIODevice *device)
+{
+    if (!device) {
+        qWarning("ICOHandler::canRead() called with no device");
+        return false;
+    }
+
+    const qint64 oldPos = device->pos();
+
+    char head[8];
+    qint64 readBytes = device->read(head, sizeof(head));
+    const bool readOk = readBytes == sizeof(head);
+
+    if (device->isSequential()) {
+        while (readBytes > 0)
+            device->ungetChar(head[readBytes-- - 1]);
+    } else {
+        device->seek(oldPos);
+    }
+
+    if ( !readOk )
+        return false;
+
+    return head[2] == '\001' && head[3] == '\000' && // type should be 1
+        ( head[6] == 16 || head[6] == 32 || head[6] == 64 ) && // width can only be one of those
+        ( head[7] == 16 || head[7] == 32 || head[7] == 64 );   // same for height
+}
+
+class ICOPlugin : public QImageIOPlugin
+{
+public:
+    QStringList keys() const;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const;
+};
+
+QStringList ICOPlugin::keys() const
+{
+    return QStringList() << "ico" << "ICO";
+}
+
+QImageIOPlugin::Capabilities ICOPlugin::capabilities(QIODevice *device, const QByteArray &format) const
+{
+    if (format == "ico" || format == "ICO")
+        return Capabilities(CanRead);
+    if (!format.isEmpty())
+        return 0;
+    if (!device->isOpen())
+        return 0;
+
+    Capabilities cap;
+    if (device->isReadable() && ICOHandler::canRead(device))
+        cap |= CanRead;
+    return cap;
+}
+
+QImageIOHandler *ICOPlugin::create(QIODevice *device, const QByteArray &format) const
+{
+    QImageIOHandler *handler = new ICOHandler;
+    handler->setDevice(device);
+    handler->setFormat(format);
+    return handler;
+}
+
+Q_EXPORT_STATIC_PLUGIN(ICOPlugin)
+Q_EXPORT_PLUGIN2(ico, ICOPlugin)

src/ico.h

@@ -0,0 +1,52 @@
+/*
+ * ico.h - kimgio import filter for MS Windows .ico files
+ *
+ * Distributed under the terms of the LGPL
+ * Copyright (c) 2000 Malte Starostik <malte@kde.org>
+ *
+ */
+
+// You can use QImageIO::setParameters() to request a specific
+// Icon out of an .ico file:
+//
+// Options consist of a name=value pair and are separated by a semicolon.
+// Available options are:
+//     size=<size>   select the icon that most closely matches <size> (pixels)
+//                   default: 32
+//     colors=<num>  select the icon that has <num> colors (or comes closest)
+//                   default: 1 << display depth or 0 (RGB) if display depth > 8
+//     index=<index> select the indexth icon from the file. If this option
+//                   is present, the size and colors options will be ignored.
+//                   default: none
+// If both size and colors are given, size takes precedence.
+//
+// The old format is still supported:
+//     the parameters consist of a single string in the form
+//     "<size>[:<colors>]" which correspond to the options above
+//
+// If an icon was returned (i.e. the file is valid and the index option
+// if present was not out of range), the icon's index within the .ico
+// file is returned in the text tag "X-Index" of the image.
+// If the icon is in fact a cursor, its hotspot coordinates are returned
+// in the text tags "X-HotspotX" and "X-HotspotY".
+
+#ifndef	_ICO_H_
+#define _ICO_H_
+
+#include <QtGui/QImageIOPlugin>
+
+class ICOHandler : public QImageIOHandler
+{
+public:
+    ICOHandler();
+
+    bool canRead() const;
+    bool read(QImage *image);
+    bool write(const QImage &image);
+
+    QByteArray name() const;
+
+    static bool canRead(QIODevice *device);
+};
+
+#endif

src/icons.qrc

@@ -16,6 +16,7 @@
   <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>
@@ -31,19 +32,16 @@
   <file>Icons/refresh.png</file>
   <file>Icons/rss16.png</file>
   <file>Icons/rss32.png</file>
-  <file>Icons/smile.png</file>
   <file>Icons/sphere.png</file>
   <file>Icons/sphere2.png</file>
   <file>Icons/splash.png</file>
   <file>Icons/star.png</file>
-  <file>Icons/stare.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/unhappy.png</file>
   <file>Icons/unsubscribe.png</file>
   <file>Icons/unsubscribe16.png</file>
   <file>Icons/uparrow.png</file>
@@ -52,6 +50,7 @@
   <file>Icons/flags/brazil.png</file>
   <file>Icons/flags/bulgaria.png</file>
   <file>Icons/flags/china.png</file>
+  <file>Icons/flags/czech.png</file>
   <file>Icons/flags/denmark.png</file>
   <file>Icons/flags/finland.png</file>
   <file>Icons/flags/france.png</file>
@@ -71,19 +70,20 @@
   <file>Icons/flags/spain.png</file>
   <file>Icons/flags/spain_catalunya.png</file>
   <file>Icons/flags/sweden.png</file>
+  <file>Icons/flags/taiwan.png</file>
   <file>Icons/flags/turkey.png</file>
   <file>Icons/flags/ukraine.png</file>
   <file>Icons/flags/united_kingdom.png</file>
   <file>Icons/skin/add.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/disconnected.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>
@@ -95,11 +95,13 @@
   <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/tabs.gif</file>
   <file>Icons/skin/url.png</file>
 </qresource>
 </RCC>

src/json.cpp

@@ -1,103 +0,0 @@
-/*
- *   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

@@ -24,6 +24,73 @@
 
 #include <QVariant>
 
-QString toJson(QVariant v);
+namespace json {
+
+    QString toJson(QVariant v) {
+        if (v.isNull())
+            return "null";
+        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>();
+                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;
+            }
+            default:
+                return "undefined";
+        }
+    }
+
+   QString toJson(QList<QVariantMap> v) {
+        QStringList res;
+        foreach(QVariantMap m, v) {
+            QStringList vlist;
+            foreach(QString key, m.keys()) {
+                vlist << toJson(key)+":"+toJson(m[key]);
+            }
+            res << "{"+vlist.join(",")+"}";
+        }
+        return "["+res.join(",")+"]";
+    }
+}
 
 #endif

src/lang.qrc

@@ -2,6 +2,7 @@
 <qresource>
   <file>lang/qbittorrent_bg.qm</file>
   <file>lang/qbittorrent_ca.qm</file>
+  <file>lang/qbittorrent_cs.qm</file>
   <file>lang/qbittorrent_da.qm</file>
   <file>lang/qbittorrent_de.qm</file>
   <file>lang/qbittorrent_el.qm</file>
@@ -25,5 +26,6 @@
   <file>lang/qbittorrent_tr.qm</file>
   <file>lang/qbittorrent_uk.qm</file>
   <file>lang/qbittorrent_zh.qm</file>
+  <file>lang/qbittorrent_zh_TW.qm</file>
 </qresource>
 </RCC>