- Tagged v1.1.3 release

- Fixed a comment
- Added chinese traditional translation to stable branch - bump to v1.1.3 in stable branch (updated splash screen) - Updated changelogs
2025-12-18 14:38:04 -06:00 · 2008-08-26 07:21:15 +00:00 · 2008-08-26 07:14:38 +00:00 · 2008-08-26 06:45:24 +00:00 · 2008-08-18 23:58:30 +00:00 · 2008-08-17 03:53:49 +00:00
260 changed files with 37622 additions and 53454 deletions
--- a/23
+++ b/23
@@ -6,35 +6,24 @@ Contributors:
 * 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/oxygen/*.png
-  copyright: Oxygen Icon Theme (KDE)
-  license: LGPL
-  url: http://www.oxygen-icons.org
-
 * 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
+* files: src/Icons/skins/*.png
  copyright: Mateusz Tobola <tobejodok@qbittorrent.org>
  license: GPLv2

-* file: src/Icons/skin/tabs.gif
-  copyright: Greg Houston <gregory.houston@gmail.com>
-  license: MIT
+* files: src/menuicons/YYxYY/*.png
+  copyright: Mateusz Tobola <tobejodok@qbittorrent.org>
+  license: GPLv2

 * file: src/search_engine/engines/btjunkie.png
  copyright: Downloaded from btjunkie.org
@@ -57,9 +46,7 @@ Translations authors:
  - 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)
+  - Chinese (Simplified): Guo Yue (guoyue0418@hotmail.com)
  - Danish: Mathias Nielsen (comoneo@gmail.com)
  - Dutch: Joost Schipper (heavyjoost@users.sourceforge.net)
  - English: Christophe Dumez (chris@qbittorrent.org)
--- a/14
+++ b/14
@@ -1,17 +1,3 @@
-qBittorrent is licensed under the GNU General Public License version 2 with the
-addition of the following special exception:
-
-In addition, as a special exception, the copyright holders give permission to
-link this program with the OpenSSL project's "OpenSSL" library (or with
-modified versions of it that use the same license as the "OpenSSL" library),
-and distribute the linked executables. You must obey the GNU General Public
-License in all respects for all of the code used other than "OpenSSL".  If you
-modify file(s), you may extend this exception to your version of the file(s),
-but you are not obligated to do so. If you do not wish to do so, delete this
-exception statement from your version.
-
----------
-
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991

--- a/143
+++ b/143
@@ -1,146 +1,3 @@
-* Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.5.0
-    - FEATURE: Added Magnet URI support
-    - FEATURE: Make use of torrent enclosure in RSS feeds for direct download
-    - FEATURE: Implemented a RSS feed downloader with filter support
-    - FEATURE: Save old RSS item to hard disk to remember them on start up
-    - FEATURE: Display free disk space in torrent addition dialog
-    - FEATURE: In torrent addition from URL, paste clipboard content if it contains an URL
-    - FEATURE: RSS feeds URLs can now be copied to clipboard
-    - FEATURE: RSS feeds can now be grouped into folders
-    - FEATURE: If a torrent contains a torrent file, process downloaded torrent file too
-    - BUGFIX: torrent resume code rewrited
-    - COSMETIC: Redesigned RSS tab to improve usability
-
-* Sun Aug 21 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.4.1
-    - BUGFIX: Fix problems when changing save path (if using temporary download folder)
-    - BUGFIX: Display real save path instead of the temporary one in torrent properties
-    - BUGFIX: Catching invalid_handle exception to avoid rare crashes
-    - BUGFIX: Fixed popup menu position in RSS feeds list
-    - BUGFIX: Don't save RSS feed state if it could not be updated
-
-* Thu Aug 13 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.4.0
-    - FEATURE: Display swarm information in lists
-    - FEATURE: Allow to define temporary download folder
-    - FEATURE: Display total amount of uploaded data in finished list
-    - FEATURE: Resizing a column in a search results tab affects all tabs
-    - FEATURE: Search results tab columns are now remembered upon startup
-    - FEATURE: Added right click menu in search engine to clear completion history
-    - FEATURE: Allow to set a different port for DHT (UDP) than the one used for Bittorrent
-    - FEATURE: Updated spoofing code to avoid trackers ban
-    - BUGFIX: Provide more helpful explanation when an I/O error occured
-    - BUGFIX: Stop enforcing UTF-8 and use system locale instead
-    - COSMETIC: Redesigned program preferences
-    - COSMETIC: Updated icons set
-
-* Fri Jul 24 2009 - Christophe DUMEZ <chris@qbittorrent.org> - 1.3.5
-    - BUGFIX: Made IP filter parser more robust
-    - BUGFIX: Fixed torrent creation tool
-    - BUGFIX: Fixed possible overflow in progress calculation in arborescence.h
-    - BUGFIX: Save properties window size, position, columns width and restore them
-    - BUGFIX: Set a minimum default width for NAME column in properties
-    - BUGFIX: Remember visual indexes of columns in transfer lists
-
-* Sun Jul 12 2009 - Christophe DUMEZ <chris@qbittorrent.org> - v1.3.4
-    - BUGFIX: Fixed IP filter file parsing on 64bits
-    - BUGFIX: Suppressed QLayout: Attempting to add QLayout "" to properties "properties" warning message when opening a properties dialog
-    - BUGFIX: Fixed a little bug in search engine plugins helper file
-    - BUGFIX: Fixed compilation problems with Qt 4.3
-    - BUGFIX: Percentages no longer disapear with default cleanlooks style
-    - BUGFIX: Cleanly fixed popup menus position in lists (no more workarounds)
-    - BUGFIX: Fixed memory leak in search engine
-    - BUGFIX: Torrents with an infinite ratio are no longer affected by ratio_limit set in program preferences
-    - BUGFIX: Display a ratio of 0.0 if total_upload and total_download are both 0
-    - BUGFIX: Remove last separator in top tool bar
-    - BUGFIX: Tuned lists properties to make sure display is correct
-    - COSMETIC: Display date as well as time in log window
-
-* Sun Apr 5 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.3.3
-    - BUGFIX: Fixed Web UI torrent upload form
-    - BUGFIX: Fixed unicode support in search engine
-    - BUGFIX: Fixed search engine bug that prevented a torrent from appearing more than once among all tabs
-    - LICENSE: Added an exception to the license regarding OpenSSL.
-    - I18N: Updated Finnish translation
-
-* Sat Mar 7 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.3.2
-    - BUGFIX: Fix top toolbar disabling
-    - BUGFIX: Fix building with Qt 4.5
-    - BUGFIX: RSS items read status is now remembered upon restart
-
-* Mon Jan 26 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.3.1
-    - BUGFIX: Torrents paused due to an I/O error were displayed as queued
-    - BUGFIX: qBittorrent now prints backtrace in terminal when segfaulting
-    - BUGFIX: Fixed files progress display in torrent properties
-    - BUGFIX: Improved torrent ratio calculation
-    - BUGFIX: Fixed possible crash when parsing filter file
-    - BUGFIX: Made some code optimization
-    - BUGFIX: Fixed download/upload speed decrease problems
-    - I18N: Updated Finnish, Bulgarian and Greek translations
-
-* 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
--- a/3
+++ b/3
@@ -17,8 +17,7 @@ Dependencies:
 - Qt >= 4.3.0 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml)
  Qt >= 4.4.0 is advised

- libtorrent-rasterbar by Arvid Norberg (>= v0.14.0 REQUIRED)
-    -> http://www.qbittorrent.org/download.php (advised)
+- libtorrent-rasterbar by Arvid Norberg (>= v0.13.1 REQUIRED)
    -> http://www.libtorrent.net
    Be careful: another library (the one used by rTorrent) uses a similar name.

--- a/20
+++ b/20
@@ -1,2 +1,22 @@
 See https://blueprints.launchpad.net/qbittorrent/

+Translations updated in v1.1.0:
+- French
+- Chinese
+- Polish
+- Portuguese
+- Brazilian
+- Slovak
+- Swedish
+- Romanian
+- Finnish
+- Italian
+- Turkish
+- Korean
+- Hungarian
+- German
+- Spanish
+- Russian
+- Dutch
+- Bulgarian
+- Greek
--- a/202
+++ b/202
@@ -18,9 +18,17 @@ Main options:
  --help              This help text.

 Dependency options:
+  --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
@@ -140,6 +148,21 @@ while [ $# -gt 0 ]; do
 			shift
 			;;

+		--with-libtorrent-inc=*)
+			QC_WITH_LIBTORRENT_INC=$optarg
+			shift
+			;;
+
+		--with-libtorrent-lib=*)
+			QC_WITH_LIBTORRENT_LIB=$optarg
+			shift
+			;;
+
+		--with-libtorrent-static-lib=*)
+			QC_WITH_LIBTORRENT_STATIC_LIB=$optarg
+			shift
+			;;
+
 		--with-libboost-inc=*)
 			QC_WITH_LIBBOOST_INC=$optarg
 			shift
@@ -155,6 +178,21 @@ 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
@@ -191,9 +229,15 @@ echo PREFIX=$PREFIX
 echo BINDIR=$BINDIR
 echo DATADIR=$DATADIR
 echo EX_QTDIR=$EX_QTDIR
+echo QC_WITH_LIBTORRENT_INC=$QC_WITH_LIBTORRENT_INC
+echo QC_WITH_LIBTORRENT_LIB=$QC_WITH_LIBTORRENT_LIB
+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
@@ -323,29 +367,70 @@ public:
 /*
 -----BEGIN QCMOD-----
 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-----
 */
-// see  Conf::findPkgConfig
 class qc_libtorrent_rasterbar : public ConfObj
 {
 public:
 	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent-rasterbar >= 0.14.0 (>= 0.14.4 advised)"; }
+	QString name() const { return "libtorrent-rasterbar >= 0.13"; }
 	QString shortname() const { return "libtorrent-rasterbar"; }
 	bool exec(){
-		QStringList incs;
-		QString req_ver = "0.14.0";
-		QString adv_ver = "0.14.4";
-		QString version, libs, other;
-		VersionMode mode = VersionMin;
-		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other))
+        	QString s;
+		s = conf->getenv("QC_WITH_LIBTORRENT_INC");
+		if(!s.isEmpty()) {
+			if(!conf->checkHeader(s, "libtorrent/lsd.hpp")) {
 				return false;
-		for(int n = 0; n < incs.count(); ++n)
-			conf->addIncludePath(incs[n]);
-		if(!libs.isEmpty())
-			conf->addLib(libs);
-		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other))
-			printf("\nWarning: libtorrent-rasterbar v%s was detected. Although it will compile and run, you will probably experience some bugs. Please consider updating to v%s!\n", version.toUtf8().data(), adv_ver.toUtf8().data());
+      			}
+		}else{
+			QStringList sl;
+			sl << "/usr/include";
+			sl << "/usr/local/include";
+			bool found = false;
+			foreach(s, sl){
+				if(conf->checkHeader(s, "libtorrent/lsd.hpp")){
+					found = true;
+					break;
+				}
+			}
+			if(!found) {
+				return false;
+          		}
+		}
+		conf->addIncludePath(s);
+		conf->addIncludePath(s+QDir::separator()+"libtorrent");
+
+		s = conf->getenv("QC_WITH_LIBTORRENT_STATIC_LIB");
+		if(!s.isEmpty() && QFile::exists(s) && s.endsWith(".a")){
+			conf->addLib(s);
+			return true;
+		}
+
+		s = conf->getenv("QC_WITH_LIBTORRENT_LIB");
+		if(!s.isEmpty()) {
+      			if(!conf->checkLibrary(s, "torrent-rasterbar")) {
+			        return false;
+			}
+      			conf->addLib(QString("-L") + s);
+		}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, "torrent-rasterbar")){
+					found = true;
+					break;
+				}
+			}
+			if(!found) return false;
+			conf->addLib(QString("-L") + s);
+		}
 		return true;
 	}
 };
@@ -468,6 +553,86 @@ 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-----
@@ -555,6 +720,9 @@ 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;
@@ -1503,9 +1671,15 @@ export PREFIX
 export BINDIR
 export DATADIR
 export EX_QTDIR
+export QC_WITH_LIBTORRENT_INC
+export QC_WITH_LIBTORRENT_LIB
+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
--- a/qbittorrent.qc
+++ b/qbittorrent.qc
@@ -15,5 +15,6 @@
  <dep type='libcurl'>
    <required/>
  </dep>
+  <dep type='libmagick'/>
  <dep type='libzzip'/>
 </qconf>
--- a/qcm/libcommoncpp2.qcm
+++ b/qcm/libcommoncpp2.qcm
@@ -0,0 +1,65 @@
+/*
+-----BEGIN QCMOD-----
+name: libcommoncpp2
+arg: with-libcommoncpp2-inc=[path], Path to libcommoncpp2 include files
+arg: with-libcommoncpp2-lib=[path], Path to libcommoncpp2 library files
+-----END QCMOD-----
+*/
+class qc_libcommoncpp2 : public ConfObj
+{
+public:
+	qc_libcommoncpp2(Conf *c) : ConfObj(c) {}
+	QString name() const { return "GNU Common C++ library (libcommoncpp2)"; }
+	QString shortname() const { return "libcommoncpp2"; }
+	bool exec(){
+    QString s;
+		s = conf->getenv("QC_WITH_LIBCOMMONCPP2_INC");
+		if(!s.isEmpty()) {
+			if(!conf->checkHeader(s, "cc++/url.h")) {
+				return false;
+    	}
+		}else{
+			QStringList sl;
+			sl << "/usr/include";
+			sl << "/usr/local/include";
+			bool found = false;
+			foreach(s, sl){
+				if(conf->checkHeader(s, "cc++/url.h")){
+					found = true;
+					break;
+				}
+			}
+			if(!found) {
+				return false;
+      }
+		}
+		conf->addIncludePath(s);
+
+		s = conf->getenv("QC_WITH_LIBCOMMONCPP2_LIB");
+		if(!s.isEmpty()) {
+			if(!QFile::exists(s+QString("/libccext2.so")))
+		    return false;
+			if(!QFile::exists(s+QString("/libccgnu2.so")))
+				return false;
+    	conf->addLib(QString("-L") + s);
+		}else{
+			QStringList sl;
+			sl << "/usr/lib/";
+			sl << "/usr/lib64/";
+			sl << "/usr/local/lib/";
+			sl << "/usr/local/lib64/";
+			bool found = false;
+			foreach(s, sl){
+				if(QFile::exists(s+QString("libccext2.so"))){
+				  if(QFile::exists(s+QString("libccgnu2.so"))){
+						found = true;
+						break;
+					}
+				}
+			}
+			if(!found) return false;
+			conf->addLib(QString("-L") + s);
+		}
+		return true;
+	}
+};
--- a/qcm/libmagick.qcm
+++ b/qcm/libmagick.qcm
@@ -64,11 +64,14 @@ public:
                         	return false;
 		}
 		conf->addLib(QString("-L") + s);
-		QString out = "";
+		QProcess magickConfig;
 		QStringList params;
 		params << "--libs";
-		qconf->doCommand("Magick++-config", params, &out);
-		out = out.replace("\n", "");
+		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;
--- a/qcm/libtorrent-rasterbar.qcm
+++ b/qcm/libtorrent-rasterbar.qcm
@@ -1,29 +1,70 @@
 /*
 -----BEGIN QCMOD-----
 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-----
 */
-// see  Conf::findPkgConfig
 class qc_libtorrent_rasterbar : public ConfObj
 {
 public:
 	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent-rasterbar >= 0.14.0 (>= 0.14.4 advised)"; }
+	QString name() const { return "libtorrent-rasterbar >= 0.13"; }
 	QString shortname() const { return "libtorrent-rasterbar"; }
 	bool exec(){
-		QStringList incs;
-		QString req_ver = "0.14.0";
-		QString adv_ver = "0.14.4";
-		QString version, libs, other;
-		VersionMode mode = VersionMin;
-		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other))
+        	QString s;
+		s = conf->getenv("QC_WITH_LIBTORRENT_INC");
+		if(!s.isEmpty()) {
+			if(!conf->checkHeader(s, "libtorrent/lsd.hpp")) {
 				return false;
-		for(int n = 0; n < incs.count(); ++n)
-			conf->addIncludePath(incs[n]);
-		if(!libs.isEmpty())
-			conf->addLib(libs);
-		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other))
-			printf("\nWarning: libtorrent-rasterbar v%s was detected. Although it will compile and run, you will probably experience some bugs. Please consider updating to v%s!\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
+      			}
+		}else{
+			QStringList sl;
+			sl << "/usr/include";
+			sl << "/usr/local/include";
+			bool found = false;
+			foreach(s, sl){
+				if(conf->checkHeader(s, "libtorrent/lsd.hpp")){
+					found = true;
+					break;
+				}
+			}
+			if(!found) {
+				return false;
+          		}
+		}
+		conf->addIncludePath(s);
+		conf->addIncludePath(s+QDir::separator()+"libtorrent");
+
+		s = conf->getenv("QC_WITH_LIBTORRENT_STATIC_LIB");
+		if(!s.isEmpty() && QFile::exists(s) && s.endsWith(".a")){
+			conf->addLib(s);
+			return true;
+		}
+
+		s = conf->getenv("QC_WITH_LIBTORRENT_LIB");
+		if(!s.isEmpty()) {
+      			if(!conf->checkLibrary(s, "torrent-rasterbar")) {
+			        return false;
+			}
+      			conf->addLib(QString("-L") + s);
+		}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, "torrent-rasterbar")){
+					found = true;
+					break;
+				}
+			}
+			if(!found) return false;
+			conf->addLib(QString("-L") + s);
+		}
 		return true;
 	}
 };
--- a/src/DLListDelegate.h
+++ b/src/DLListDelegate.h
@@ -16,15 +16,6 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 *
- * In addition, as a special exception, the copyright holders give permission to
- * link this program with the OpenSSL project's "OpenSSL" library (or with
- * modified versions of it that use the same license as the "OpenSSL" library),
- * and distribute the linked executables. You must obey the GNU General Public
- * License in all respects for all of the code used other than "OpenSSL".  If you
- * modify file(s), you may extend this exception to your version of the file(s),
- * but you are not obligated to do so. If you do not wish to do so, delete this
- * exception statement from your version.
- *
 * Contact : chris@qbittorrent.org
 */

@@ -49,8 +40,7 @@
 #define SEEDSLEECH 5
 #define RATIO 6
 #define ETA 7
-#define PRIORITY 8
-#define HASH 9
+#define HASH 8

 class DLListDelegate: public QItemDelegate {
  Q_OBJECT
@@ -81,9 +71,6 @@ class DLListDelegate: public QItemDelegate {
        case RATIO:{
          QItemDelegate::drawBackground(painter, opt, index);
          double ratio = index.data().toDouble();
-          if(ratio > 100.)
-              QItemDelegate::drawDisplay(painter, opt, opt.rect, QString::fromUtf8("∞"));
-          else
          QItemDelegate::drawDisplay(painter, opt, opt.rect, QString(QByteArray::number(ratio, 'f', 1)));
          break;
        }
--- a/src/FeedDownloader.h
+++ b/src/FeedDownloader.h
@@ -1,480 +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.
- *
- * In addition, as a special exception, the copyright holders give permission to
- * link this program with the OpenSSL project's "OpenSSL" library (or with
- * modified versions of it that use the same license as the "OpenSSL" library),
- * and distribute the linked executables. You must obey the GNU General Public
- * License in all respects for all of the code used other than "OpenSSL".  If you
- * modify file(s), you may extend this exception to your version of the file(s),
- * but you are not obligated to do so. If you do not wish to do so, delete this
- * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
- */
-
-#ifndef FEEDDOWNLOADER_H
-#define FEEDDOWNLOADER_H
-
-#include <QString>
-#include <QHash>
-#include <QSettings>
-#include <QListWidget>
-#include <QListWidgetItem>
-#include <QInputDialog>
-#include <QMessageBox>
-#include <QRegExp>
-#include <QMenu>
-#include <QFile>
-#include <QDataStream>
-#include <QFileDialog>
-
-#include "bittorrent.h"
-#include "ui_FeedDownloader.h"
-
-class FeedFilter: public QHash<QString, QVariant> {
-private:
-  bool valid;
-public:
-  FeedFilter():valid(true) {}
-  FeedFilter(bool valid): valid(valid) {}
-  FeedFilter(QHash<QString, QVariant> filter): QHash<QString, QVariant>(filter), valid(true) {}
-
-  bool matches(QString s) {
-    QStringList match_tokens = getMatchingTokens();
-    foreach(const QString& token, match_tokens) {
-      if(token.isEmpty() || token == "")
-        continue;
-      QRegExp reg(token, Qt::CaseInsensitive);
-      if(reg.indexIn(s) < 0) return false;
-    }
-    // Checking not matching
-    QStringList notmatch_tokens = getNotMatchingTokens();
-    foreach(const QString& token, notmatch_tokens) {
-      if(token.isEmpty()) continue;
-      QRegExp reg(token, Qt::CaseInsensitive);
-      if(reg.indexIn(s) > -1) return false;
-    }
-    return true;
-  }
-
-  bool isValid() const {
-    return valid;
-  }
-
-  QStringList getMatchingTokens() const {
-    QString matches = this->value("matches", "").toString();
-    return matches.split(" ");
-  }
-
-  QString getMatchingTokens_str() const {
-    return this->value("matches", "").toString();
-  }
-
-  void setMatchingTokens(QString tokens) {
-    tokens = tokens.trimmed();
-    if(tokens.isEmpty())
-      (*this)["matches"] = "";
-    else
-      (*this)["matches"] = tokens;
-  }
-
-  QStringList getNotMatchingTokens() const {
-    QString notmatching = this->value("not", "").toString();
-    return notmatching.split(" ");
-  }
-
-  QString getNotMatchingTokens_str() const {
-    return this->value("not", "").toString();
-  }
-
-  void setNotMatchingTokens(QString tokens) {
-    (*this)["not"] = tokens.trimmed();
-  }
-
-  QString getSavePath() const {
-    return this->value("save_path", "").toString();
-  }
-
-  void setSavePath(QString save_path) {
-    (*this)["save_path"] = save_path;
-  }
-
-};
-
-class FeedFilters : public QHash<QString, QVariant> {
-
-private:
-  QString feed_url;
-
-public:
-  FeedFilters() {}
-  FeedFilters(QString feed_url, QHash<QString, QVariant> filters): QHash<QString, QVariant>(filters), feed_url(feed_url) {}
-
-  bool hasFilter(QString name) const {
-    return this->contains(name);
-  }
-
-  FeedFilter* matches(QString s) {
-    if(!isDownloadingEnabled()) return 0;
-    if(this->size() == 0) return new FeedFilter(false);
-    foreach(QVariant var_hash_filter, this->values()) {
-      QHash<QString, QVariant> hash_filter = var_hash_filter.toHash();
-      FeedFilter *filter = new FeedFilter(hash_filter);
-      if(filter->matches(s))
-        return filter;
-      else
-        delete filter;
-    }
-    return 0;
-  }
-
-  QStringList names() const {
-    return this->keys();
-  }
-
-  FeedFilter getFilter(QString name) const {
-    if(this->contains(name))
-      return FeedFilter(this->value(name).toHash());
-    return FeedFilter();
-  }
-
-  void setFilter(QString name, FeedFilter f) {
-    (*this)[name] = f;
-  }
-
-  bool isDownloadingEnabled() const {
-    QSettings qBTRSS("qBittorrent", "qBittorrent-rss");
-    QHash<QString, QVariant> feeds_w_downloader = qBTRSS.value("downloader_on", QHash<QString, QVariant>()).toHash();
-    return feeds_w_downloader.value(feed_url, false).toBool();
-  }
-
-  void setDownloadingEnabled(bool enabled) {
-    QSettings qBTRSS("qBittorrent", "qBittorrent-rss");
-    QHash<QString, QVariant> feeds_w_downloader = qBTRSS.value("downloader_on", QHash<QString, QVariant>()).toHash();
-    feeds_w_downloader[feed_url] = enabled;
-    qBTRSS.setValue("downloader_on", feeds_w_downloader);
-  }
-
-  static FeedFilters getFeedFilters(QString url) {
-    QSettings qBTRSS("qBittorrent", "qBittorrent-rss");
-    QHash<QString, QVariant> all_feeds_filters = qBTRSS.value("feed_filters", QHash<QString, QVariant>()).toHash();
-    return FeedFilters(url, all_feeds_filters.value(url, QHash<QString, QVariant>()).toHash());
-  }
-
-  void rename(QString old_name, QString new_name) {
-    Q_ASSERT(this->contains(old_name));
-    (*this)[new_name] = this->take(old_name);
-  }
-
-  bool serialize(QString path) {
-    QFile f(path);
-    if(f.open(QIODevice::WriteOnly)) {
-      QDataStream out(&f);
-      out.setVersion(QDataStream::Qt_4_3);
-      out << (QHash<QString, QVariant>)(*this);
-      f.close();
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  bool unserialize(QString path) {
-    QFile f(path);
-    if(f.open(QIODevice::ReadOnly)) {
-      QDataStream in(&f);
-      in.setVersion(QDataStream::Qt_4_3);
-      QHash<QString, QVariant> tmp;
-      in >> tmp;
-      qDebug("Unserialized %d filters", tmp.size());
-      foreach(const QString& key, tmp.keys()) {
-        (*this)[key] = tmp[key];
-      }
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  void save() {
-    QSettings qBTRSS("qBittorrent", "qBittorrent-rss");
-    QHash<QString, QVariant> all_feeds_filters = qBTRSS.value("feed_filters", QHash<QString, QVariant>()).toHash();
-    qDebug("Saving filters for feed: %s (%d filters)", feed_url.toLocal8Bit().data(), (*this).size());
-    all_feeds_filters[feed_url] = *this;
-    qBTRSS.setValue("feed_filters", all_feeds_filters);
-  }
-};
-
-class FeedDownloaderDlg : public QDialog, private Ui_FeedDownloader{
-  Q_OBJECT
-
-private:
-  QString feed_url;
-  QString feed_name;
-  FeedFilters filters;
-  bittorrent *BTSession;
-  QString selected_filter; // name
-
-public:
-  FeedDownloaderDlg(QWidget *parent, QString feed_url, QString feed_name, bittorrent* BTSession): QDialog(parent), feed_url(feed_url), feed_name(feed_name), BTSession(BTSession), selected_filter(QString::null){
-    setupUi(this);
-    setAttribute(Qt::WA_DeleteOnClose);
-    Q_ASSERT(!feed_name.isEmpty());
-    rssfeed_lbl->setText(feed_name);
-    filters = FeedFilters::getFeedFilters(feed_url);
-    // Connect Signals/Slots
-    connect(filtersList, SIGNAL(currentItemChanged(QListWidgetItem* , QListWidgetItem *)), this, SLOT(showFilterSettings(QListWidgetItem *)));
-    connect(filtersList, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayFiltersListMenu(const QPoint&)));
-    connect(actionAdd_filter, SIGNAL(triggered()), this, SLOT(addFilter()));
-    connect(actionRemove_filter, SIGNAL(triggered()), this, SLOT(deleteFilter()));
-    connect(actionRename_filter, SIGNAL(triggered()), this, SLOT(renameFilter()));
-    connect(del_button, SIGNAL(clicked(bool)), this, SLOT(deleteFilter()));
-    connect(add_button, SIGNAL(clicked(bool)), this, SLOT(addFilter()));
-    connect(enableDl_cb, SIGNAL(stateChanged(int)), this, SLOT(enableFilterBox(int)));
-    // Restore saved info
-    enableDl_cb->setChecked(filters.isDownloadingEnabled());
-    fillFiltersList();
-    if(filters.size() > 0) {
-      // Select first filter
-      filtersList->setCurrentItem(filtersList->item(0));
-      //showFilterSettings(filtersList->item(0));
-    }
-    // Show
-    show();
-  }
-
-  ~FeedDownloaderDlg() {
-    // Make sure we save everything
-    saveCurrentFilterSettings();
-    filters.save();
-  }
-
-protected slots:
-  void saveCurrentFilterSettings() {
-    if(!selected_filter.isEmpty()) {
-      FeedFilter filter = filters.getFilter(selected_filter);
-      filter.setMatchingTokens(match_line->text());
-      filter.setNotMatchingTokens(notmatch_line->text());
-      QString save_path = savepath_line->text().trimmed();
-      if(save_path.isEmpty())
-        save_path = BTSession->getDefaultSavePath();
-      filter.setSavePath(save_path);
-      // Save updated filter
-      filters.setFilter(selected_filter, filter);
-    }
-  }
-
-  void fillFiltersList() {
-    // Fill filter list
-    foreach(QString filter_name, filters.names()) {
-      new QListWidgetItem(filter_name, filtersList);
-    }
-  }
-
-  void displayFiltersListMenu(const QPoint&) {
-    QMenu myFiltersListMenu(this);
-    if(filtersList->selectedItems().size() > 0) {
-      myFiltersListMenu.addAction(actionRename_filter);
-      myFiltersListMenu.addAction(actionRemove_filter);
-    } else {
-      myFiltersListMenu.addAction(actionAdd_filter);
-    }
-    // Call menu
-    myFiltersListMenu.exec(QCursor::pos());
-  }
-
-  void showFilterSettings(QListWidgetItem *item) {
-    // First, save current filter settings
-    saveCurrentFilterSettings();
-    // Clear all fields
-    clearFields();
-    if(!item) {
-      qDebug("No new selected item");
-      return;
-    }
-    // Actually show filter settings
-    QString filter_name = item->text();
-    FeedFilter filter = filters.getFilter(filter_name);
-    filterSettingsBox->setEnabled(true);
-    match_line->setText(filter.getMatchingTokens_str());
-    if(match_line->text().trimmed().isEmpty()) {
-      match_line->setText(filter_name);
-    }
-    notmatch_line->setText(filter.getNotMatchingTokens_str());
-    QString save_path = filter.getSavePath();
-    if(save_path.isEmpty())
-      save_path = BTSession->getDefaultSavePath();
-    savepath_line->setText(save_path);
-    // Update selected filter
-    selected_filter = filter_name;
-  }
-
-  void deleteFilter() {
-    QList<QListWidgetItem *> items = filtersList->selectedItems();
-    if(items.size() == 1) {
-      QListWidgetItem * item = items.first();
-      filters.remove(item->text());
-      selected_filter = QString::null;
-      delete item;
-      // Reset Filter settings view
-      if(filters.size() == 0) {
-        clearFields();
-        filterSettingsBox->setEnabled(false);
-      }
-    }
-  }
-
-  void renameFilter() {
-    QList<QListWidgetItem *> items = filtersList->selectedItems();
-    if(items.size() == 1) {
-      QListWidgetItem *item = items.first();
-      QString current_name = item->text();
-      QString new_name;
-      bool validated = false;
-      do {
-        new_name = askFilterName(current_name);
-        if(new_name.isNull() || new_name == current_name) return;
-        if(!filters.hasFilter(new_name)) {
-          validated = true;
-        } else {
-          QMessageBox::warning(0, tr("Invalid filter name"), tr("This filter name is already in use."));
-        }
-      }while(!validated);
-      // Rename the filter
-      filters.rename(current_name, new_name);
-      if(selected_filter == current_name)
-        selected_filter = new_name;
-      item->setText(new_name);
-    }
-  }
-
-  void enableFilterBox(int state) {
-    if(state == Qt::Checked) {
-      filtersBox->setEnabled(true);
-      filters.setDownloadingEnabled(true);
-    } else {
-      filtersBox->setEnabled(false);
-      filters.setDownloadingEnabled(false);
-    }
-  }
-
-  QString askFilterName(QString name=QString::null) {
-    QString name_prop;
-    if(name.isEmpty())
-      name_prop = tr("New filter");
-    else
-      name_prop = name;
-    QString new_name;
-    bool validated = false;
-    do {
-      bool ok;
-      new_name = QInputDialog::getText(this, tr("Please choose a name for this filter"), tr("Filter name:"), QLineEdit::Normal, name_prop, &ok);
-      if(!ok) {
-        return QString::null;
-      }
-      // Validate filter name
-      new_name = new_name.trimmed();
-      if(new_name.isEmpty()) {
-        // Cannot be left empty
-        QMessageBox::warning(0, tr("Invalid filter name"), tr("The filter name cannot be left empty."));
-      } else {
-        validated = true;
-      }
-    } while(!validated);
-    return new_name;
-  }
-
-  void addFilter() {
-    QString filter_name = QString::null;
-    bool validated = false;
-    do {
-      filter_name = askFilterName();
-      if(filter_name.isNull()) return;
-      if(filters.hasFilter(filter_name)) {
-        // Filter alread exists
-        QMessageBox::warning(0, tr("Invalid filter name"), tr("This filter name is already in use."));
-      } else {
-        validated = true;
-      }
-    }while(!validated);
-    QListWidgetItem *it = new QListWidgetItem(filter_name, filtersList);
-    filtersList->setCurrentItem(it);
-    //showFilterSettings(it);
-  }
-
-  void clearFields() {
-    match_line->clear();
-    notmatch_line->clear();
-    savepath_line->clear();
-    test_res_lbl->setText("");
-    test_line->clear();
-  }
-
-  void on_testButton_clicked(bool) {
-    if(selected_filter.isEmpty()) return;
-    QString s = test_line->text().trimmed();
-    if(s.isEmpty()) {
-      QMessageBox::warning(0, tr("Filter testing error"), tr("Please specify a test torrent name."));
-      return;
-    }
-    // Get current filter
-    saveCurrentFilterSettings();
-    FeedFilter f = filters.getFilter(selected_filter);
-    if(f.matches(s))
-      test_res_lbl->setText("<b><font color=\"green\">"+tr("matches")+"</font></b>");
-    else
-      test_res_lbl->setText("<b><font color=\"red\">"+tr("does not match")+"</font></b>");
-  }
-
-  void on_importButton_clicked(bool) {
-    QString source = QFileDialog::getOpenFileName(0, tr("Select file to import"), QDir::homePath(),  tr("Filters Files")+QString::fromUtf8(" (*.filters)"));
-    if(source.isEmpty()) return;
-    if(filters.unserialize(source)) {
-      // Clean up first
-      clearFields();
-      filtersList->clear();
-      selected_filter = QString::null;
-      fillFiltersList();
-      if(filters.size() > 0)
-        filtersList->setCurrentItem(filtersList->item(0));
-      QMessageBox::information(0, tr("Import successful"), tr("Filters import was successful."));
-    } else {
-      QMessageBox::warning(0, tr("Import failure"), tr("Filters could not be imported due to an I/O error."));
-    }
-  }
-
-  void on_exportButton_clicked(bool) {
-    QString destination = QFileDialog::getSaveFileName(this, tr("Select destination file"), QDir::homePath(), tr("Filters Files")+QString::fromUtf8(" (*.filters)"));
-    if(destination.isEmpty()) return;
-    // Append file extension
-    if(!destination.endsWith(".filters"))
-      destination += ".filters";
-    if(QFile::exists(destination)) {
-      int ret = QMessageBox::question(0, tr("Overwriting confirmation"), tr("Are you sure you want to overwrite existing file?"), QMessageBox::Yes|QMessageBox::No);
-      if(ret != QMessageBox::Yes) return;
-    }
-    if(filters.serialize(destination))
-      QMessageBox::information(0, tr("Export successful"), tr("Filters export was successful."));
-    else
-      QMessageBox::warning(0, tr("Export failure"), tr("Filters could not be exported due to an I/O error."));
-  }
-
-};
-
-#endif // FEEDDOWNLOADER_H
--- a/src/FeedDownloader.ui
+++ b/src/FeedDownloader.ui
@@ -1,546 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>FeedDownloader</class>
- <widget class="QDialog" name="FeedDownloader">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>737</width>
-    <height>415</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>RSS Feed downloader</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_7">
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_4">
-     <item>
-      <widget class="QLabel" name="label_2">
-       <property name="font">
-        <font>
-         <pointsize>16</pointsize>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="text">
-        <string>RSS feed:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="rssfeed_lbl">
-       <property name="font">
-        <font>
-         <pointsize>16</pointsize>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="text">
-        <string>Feed name</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_5">
-       <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>
-   <item>
-    <widget class="QCheckBox" name="enableDl_cb">
-     <property name="text">
-      <string>Automatically download torrents from this feed</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="filtersBox">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="font">
-      <font>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="title">
-      <string>Download filters</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_3">
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_6">
-        <item>
-         <layout class="QVBoxLayout" name="verticalLayout">
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout">
-            <item>
-             <widget class="QLabel" name="label">
-              <property name="font">
-               <font>
-                <weight>75</weight>
-                <bold>true</bold>
-               </font>
-              </property>
-              <property name="text">
-               <string>Filters:</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer">
-              <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>
-          <item>
-           <widget class="QListWidget" name="filtersList">
-            <property name="contextMenuPolicy">
-             <enum>Qt::CustomContextMenu</enum>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_5">
-            <item>
-             <spacer name="horizontalSpacer_2">
-              <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="QPushButton" name="del_button">
-              <property name="text">
-               <string/>
-              </property>
-              <property name="icon">
-               <iconset resource="icons.qrc">
-                <normaloff>:/Icons/oxygen/list-remove.png</normaloff>:/Icons/oxygen/list-remove.png</iconset>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_4">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Fixed</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>10</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-            <item>
-             <widget class="QPushButton" name="add_button">
-              <property name="text">
-               <string/>
-              </property>
-              <property name="icon">
-               <iconset resource="icons.qrc">
-                <normaloff>:/Icons/oxygen/list-add.png</normaloff>:/Icons/oxygen/list-add.png</iconset>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_3">
-              <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>
-        </item>
-        <item>
-         <widget class="QGroupBox" name="filterSettingsBox">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="font">
-           <font>
-            <weight>75</weight>
-            <bold>true</bold>
-           </font>
-          </property>
-          <property name="autoFillBackground">
-           <bool>false</bool>
-          </property>
-          <property name="styleSheet">
-           <string/>
-          </property>
-          <property name="title">
-           <string>Filter settings</string>
-          </property>
-          <property name="flat">
-           <bool>false</bool>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout_9">
-           <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_3">
-             <item>
-              <layout class="QVBoxLayout" name="verticalLayout_2">
-               <item>
-                <widget class="QLabel" name="label_3">
-                 <property name="font">
-                  <font>
-                   <weight>50</weight>
-                   <bold>false</bold>
-                  </font>
-                 </property>
-                 <property name="text">
-                  <string>Matches:</string>
-                 </property>
-                 <property name="alignment">
-                  <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QLabel" name="label_4">
-                 <property name="font">
-                  <font>
-                   <weight>50</weight>
-                   <bold>false</bold>
-                  </font>
-                 </property>
-                 <property name="text">
-                  <string>Does not match:</string>
-                 </property>
-                 <property name="alignment">
-                  <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QLabel" name="label_5">
-                 <property name="font">
-                  <font>
-                   <weight>50</weight>
-                   <bold>false</bold>
-                  </font>
-                 </property>
-                 <property name="text">
-                  <string>Destination folder:</string>
-                 </property>
-                 <property name="alignment">
-                  <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item>
-              <layout class="QVBoxLayout" name="verticalLayout_4">
-               <item>
-                <widget class="QLineEdit" name="match_line">
-                 <property name="text">
-                  <string/>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QLineEdit" name="notmatch_line"/>
-               </item>
-               <item>
-                <layout class="QHBoxLayout" name="horizontalLayout_2">
-                 <item>
-                  <widget class="QLineEdit" name="savepath_line">
-                   <property name="minimumSize">
-                    <size>
-                     <width>300</width>
-                     <height>0</height>
-                    </size>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QToolButton" name="browse_button">
-                   <property name="font">
-                    <font>
-                     <weight>50</weight>
-                     <bold>false</bold>
-                    </font>
-                   </property>
-                   <property name="text">
-                    <string>...</string>
-                   </property>
-                  </widget>
-                 </item>
-                </layout>
-               </item>
-              </layout>
-             </item>
-            </layout>
-           </item>
-           <item>
-            <widget class="QGroupBox" name="testerBox">
-             <property name="title">
-              <string>Filter testing</string>
-             </property>
-             <layout class="QVBoxLayout" name="verticalLayout_8">
-              <item>
-               <layout class="QHBoxLayout" name="horizontalLayout_9">
-                <item>
-                 <layout class="QVBoxLayout" name="verticalLayout_5">
-                  <item>
-                   <widget class="QLabel" name="label_6">
-                    <property name="minimumSize">
-                     <size>
-                      <width>0</width>
-                      <height>28</height>
-                     </size>
-                    </property>
-                    <property name="font">
-                     <font>
-                      <weight>50</weight>
-                      <bold>false</bold>
-                     </font>
-                    </property>
-                    <property name="text">
-                     <string>Torrent title:</string>
-                    </property>
-                    <property name="alignment">
-                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QLabel" name="label_7">
-                    <property name="font">
-                     <font>
-                      <weight>50</weight>
-                      <bold>false</bold>
-                     </font>
-                    </property>
-                    <property name="text">
-                     <string>Result:</string>
-                    </property>
-                    <property name="alignment">
-                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </item>
-                <item>
-                 <layout class="QVBoxLayout" name="verticalLayout_6">
-                  <item>
-                   <layout class="QHBoxLayout" name="horizontalLayout_8">
-                    <item>
-                     <widget class="QLineEdit" name="test_line"/>
-                    </item>
-                    <item>
-                     <widget class="QPushButton" name="testButton">
-                      <property name="font">
-                       <font>
-                        <weight>50</weight>
-                        <bold>false</bold>
-                       </font>
-                      </property>
-                      <property name="text">
-                       <string>Test</string>
-                      </property>
-                     </widget>
-                    </item>
-                   </layout>
-                  </item>
-                  <item>
-                   <layout class="QHBoxLayout" name="horizontalLayout_7">
-                    <item>
-                     <widget class="QLabel" name="test_res_lbl">
-                      <property name="font">
-                       <font>
-                        <weight>50</weight>
-                        <bold>false</bold>
-                       </font>
-                      </property>
-                      <property name="text">
-                       <string>      </string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <spacer name="horizontalSpacer_6">
-                      <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>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <spacer name="verticalSpacer">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>9</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_10">
-     <item>
-      <widget class="QPushButton" name="importButton">
-       <property name="text">
-        <string>Import...</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="exportButton">
-       <property name="text">
-        <string>Export...</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QDialogButtonBox" name="buttonBox">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="standardButtons">
-        <set>QDialogButtonBox::Close</set>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
-  <action name="actionRename_filter">
-   <property name="icon">
-    <iconset resource="icons.qrc">
-     <normaloff>:/Icons/oxygen/edit_clear.png</normaloff>:/Icons/oxygen/edit_clear.png</iconset>
-   </property>
-   <property name="text">
-    <string>Rename filter</string>
-   </property>
-   <property name="toolTip">
-    <string>Rename filter</string>
-   </property>
-  </action>
-  <action name="actionRemove_filter">
-   <property name="icon">
-    <iconset resource="icons.qrc">
-     <normaloff>:/Icons/oxygen/list-remove.png</normaloff>:/Icons/oxygen/list-remove.png</iconset>
-   </property>
-   <property name="text">
-    <string>Remove filter</string>
-   </property>
-   <property name="toolTip">
-    <string>Remove filter</string>
-   </property>
-  </action>
-  <action name="actionAdd_filter">
-   <property name="icon">
-    <iconset resource="icons.qrc">
-     <normaloff>:/Icons/oxygen/list-add.png</normaloff>:/Icons/oxygen/list-add.png</iconset>
-   </property>
-   <property name="text">
-    <string>Add filter</string>
-   </property>
-  </action>
- </widget>
- <resources>
-  <include location="icons.qrc"/>
- </resources>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>FeedDownloader</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>FeedDownloader</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
--- a/src/FinishedListDelegate.h
+++ b/src/FinishedListDelegate.h
@@ -16,15 +16,6 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 *
- * In addition, as a special exception, the copyright holders give permission to
- * link this program with the OpenSSL project's "OpenSSL" library (or with
- * modified versions of it that use the same license as the "OpenSSL" library),
- * and distribute the linked executables. You must obey the GNU General Public
- * License in all respects for all of the code used other than "OpenSSL".  If you
- * modify file(s), you may extend this exception to your version of the file(s),
- * but you are not obligated to do so. If you do not wish to do so, delete this
- * exception statement from your version.
- *
 * Contact : chris@qbittorrent.org
 */

@@ -44,13 +35,9 @@
 #define F_NAME 0
 #define F_SIZE 1
 #define F_UPSPEED 2
-#define F_SWARM 3
-#define F_PEERS 4
-#define F_UPLOAD 5
-#define F_RATIO 6
-#define F_HASH 7
-
-#define MAX_RATIO 100.
+#define F_LEECH 3
+#define F_RATIO 4
+#define F_HASH 5

 class FinishedListDelegate: public QItemDelegate {
  Q_OBJECT
@@ -64,7 +51,6 @@ class FinishedListDelegate: public QItemDelegate {
      QStyleOptionViewItemV2 opt = QItemDelegate::setOptions(index, option);
      switch(index.column()){
        case F_SIZE:
-        case F_UPLOAD:
          QItemDelegate::drawBackground(painter, opt, index);
          QItemDelegate::drawDisplay(painter, opt, option.rect, misc::friendlyUnit(index.data().toLongLong()));
          break;
@@ -77,9 +63,6 @@ class FinishedListDelegate: public QItemDelegate {
        case F_RATIO:{
          QItemDelegate::drawBackground(painter, opt, index);
          double ratio = index.data().toDouble();
-          if(ratio > MAX_RATIO)
-            QItemDelegate::drawDisplay(painter, opt, opt.rect, QString::fromUtf8("∞"));
-          else
          QItemDelegate::drawDisplay(painter, opt, opt.rect, QString(QByteArray::number(ratio, 'f', 1)));
          break;
        }
--- a/src/FinishedTorrents.cpp
+++ b/src/FinishedTorrents.cpp
@@ -16,15 +16,6 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 *
- * In addition, as a special exception, the copyright holders give permission to
- * link this program with the OpenSSL project's "OpenSSL" library (or with
- * modified versions of it that use the same license as the "OpenSSL" library),
- * and distribute the linked executables. You must obey the GNU General Public
- * License in all respects for all of the code used other than "OpenSSL".  If you
- * modify file(s), you may extend this exception to your version of the file(s),
- * but you are not obligated to do so. If you do not wish to do so, delete this
- * exception statement from your version.
- *
 * Contact : chris@qbittorrent.org
 */
 #include "FinishedTorrents.h"
@@ -46,17 +37,14 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
  setupUi(this);
  actionStart->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/play.png")));
  actionPause->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/pause.png")));
-  finishedListModel = new QStandardItemModel(0,8);
+  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"));
  finishedListModel->setHeaderData(F_UPSPEED, Qt::Horizontal, tr("UP Speed", "i.e: Upload speed"));
-  finishedListModel->setHeaderData(F_SWARM, Qt::Horizontal, tr("Seeds / Leechers"));
-  finishedListModel->setHeaderData(F_PEERS, Qt::Horizontal, tr("Connected peers"));
-  finishedListModel->setHeaderData(F_UPLOAD, Qt::Horizontal, tr("Total uploaded", "i.e: Total amount of uploaded data"));
+  finishedListModel->setHeaderData(F_LEECH, Qt::Horizontal, tr("Leechers", "i.e: full/partial sources"));
  finishedListModel->setHeaderData(F_RATIO, Qt::Horizontal, tr("Ratio"));
  finishedList->setModel(finishedListModel);
-  finishedList->setRootIsDecorated(false);
-  finishedList->setAllColumnsShowFocus(true);
  loadHiddenColumns();
  // Hide hash column
  finishedList->hideColumn(F_HASH);
@@ -64,25 +52,22 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
  if(!loadColWidthFinishedList()){
    finishedList->header()->resizeSection(0, 200);
  }
-  // Connect BTSession signals
-  connect(BTSession, SIGNAL(metadataReceived(QTorrentHandle&)), this, SLOT(updateMetadata(QTorrentHandle&)));
  // Make download list header clickable for sorting
  finishedList->header()->setClickable(true);
  finishedList->header()->setSortIndicatorShown(true);
-  connect(finishedList->header(), SIGNAL(sectionPressed(int)), this, SLOT(toggleFinishedListSortOrder(int)));
+  connect(finishedList->header(), SIGNAL(sectionPressed(int)), this, SLOT(sortFinishedList(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")));
  actionDelete_Permanently->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/delete_perm.png")));
  actionTorrent_Properties->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/properties.png")));
  actionSet_upload_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png")));
-  actionCopy_magnet_link->setIcon(QIcon(QString::fromUtf8(":/Icons/magnet.png")));
-
  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()));
@@ -91,15 +76,11 @@ 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(actionCopy_magnet_link, SIGNAL(triggered()), (GUI*)parent, SLOT(copyMagnetURI()));

  connect(actionHOSColName, SIGNAL(triggered()), this, SLOT(hideOrShowColumnName()));
  connect(actionHOSColSize, SIGNAL(triggered()), this, SLOT(hideOrShowColumnSize()));
  connect(actionHOSColUpSpeed, SIGNAL(triggered()), this, SLOT(hideOrShowColumnUpSpeed()));
-  connect(actionHOSColSwarm, SIGNAL(triggered()), this, SLOT(hideOrShowColumnSwarm()));
-  connect(actionHOSColPeers, SIGNAL(triggered()), this, SLOT(hideOrShowColumnPeers()));
-  connect(actionHOSColUpload, SIGNAL(triggered()), this, SLOT(hideOrShowColumnUpload()));
+  connect(actionHOSColLeechers, SIGNAL(triggered()), this, SLOT(hideOrShowColumnLeechers()));
  connect(actionHOSColRatio, SIGNAL(triggered()), this, SLOT(hideOrShowColumnRatio()));
 }

@@ -117,6 +98,9 @@ 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();
@@ -126,9 +110,7 @@ void FinishedTorrents::addTorrent(QString hash){
  finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(h.name()));
  finishedListModel->setData(finishedListModel->index(row, F_SIZE), QVariant((qlonglong)h.actual_size()));
  finishedListModel->setData(finishedListModel->index(row, F_UPSPEED), QVariant((double)0.));
-  finishedListModel->setData(finishedListModel->index(row, F_SWARM), QVariant("-1/-1"));
-  finishedListModel->setData(finishedListModel->index(row, F_PEERS), QVariant("0"));
-  finishedListModel->setData(finishedListModel->index(row, F_UPLOAD), QVariant((qlonglong)h.all_time_upload()));
+  finishedListModel->setData(finishedListModel->index(row, F_LEECH), QVariant("0"));
  finishedListModel->setData(finishedListModel->index(row, F_RATIO), QVariant(QString::fromUtf8(misc::toString(BTSession->getRealRatio(hash)).c_str())));
  finishedListModel->setData(finishedListModel->index(row, F_HASH), QVariant(hash));
  if(h.is_paused()) {
@@ -141,8 +123,13 @@ void FinishedTorrents::addTorrent(QString hash){
  // Update the number of finished torrents
  ++nbFinished;
  emit finishedTorrentsNumberChanged(nbFinished);
-  // Sort List
-  sortFinishedList();
+}
+
+void FinishedTorrents::torrentAdded(QString, QTorrentHandle& h, bool) {
+  QString hash = h.hash();
+  if(BTSession->isFinished(hash)) {
+    addTorrent(hash);
+  }
 }

 // Set the color of a row in data model
@@ -155,8 +142,9 @@ void FinishedTorrents::setRowColor(int row, QString color){

 QStringList FinishedTorrents::getSelectedTorrents(bool only_one) const{
  QStringList res;
+  QModelIndex index;
  QModelIndexList selectedIndexes = finishedList->selectionModel()->selectedIndexes();
-  foreach(const QModelIndex &index, selectedIndexes) {
+  foreach(index, selectedIndexes) {
    if(index.column() == F_NAME) {
      // Get the file hash
      QString hash = finishedListModel->data(finishedListModel->index(index.row(), F_HASH)).toString();
@@ -186,44 +174,10 @@ bool FinishedTorrents::loadColWidthFinishedList(){
  for(unsigned int i=0; i<listSize; ++i){
        finishedList->header()->resizeSection(i, width_list.at(i).toInt());
  }
-  loadLastSortedColumn();
-  QVariantList visualIndexes = settings.value(QString::fromUtf8("FinishedListVisualIndexes"), QVariantList()).toList();
-  if(visualIndexes.size() != finishedListModel->columnCount()-1) {
-    qDebug("Corrupted values for download list columns sizes");
-    return false;
-  }
-  bool change = false;
-  do {
-    change = false;
-    for(int i=0;i<visualIndexes.size(); ++i) {
-      int new_visual_index = visualIndexes.at(finishedList->header()->logicalIndex(i)).toInt();
-      if(i != new_visual_index) {
-        qDebug("Moving column from %d to %d", finishedList->header()->logicalIndex(i), new_visual_index);
-        finishedList->header()->moveSection(i, new_visual_index);
-        change = true;
-      }
-    }
-  }while(change);
  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{
@@ -238,7 +192,7 @@ void FinishedTorrents::saveColWidthFinishedList() const{
    width_list = line.split(' ');
  }
  for(short i=0; i<nbColumns; ++i){
-    if(finishedList->columnWidth(i)<1 && width_list.size() == nbColumns && width_list.at(i).toInt()>=1) {
+    if(finishedList->columnWidth(i)<1 && width_list.size() == finishedListModel->columnCount()-1 && width_list.at(i).toInt()>=1) {
      // load the former width
      new_width_list << width_list.at(i);
    } else if(finishedList->columnWidth(i)>=1) { 
@@ -251,18 +205,14 @@ void FinishedTorrents::saveColWidthFinishedList() const{
    }
  }
  settings.setValue("FinishedListColsWidth", new_width_list.join(" "));
-  QVariantList visualIndexes;
-  for(int i=0; i<nbColumns; ++i) {
-    visualIndexes.append(finishedList->header()->visualIndex(i));
-  }
-  settings.setValue(QString::fromUtf8("FinishedListVisualIndexes"), visualIndexes);
  qDebug("Finished list columns width saved");
 }

 void FinishedTorrents::on_actionSet_upload_limit_triggered(){
  QModelIndexList selectedIndexes = finishedList->selectionModel()->selectedIndexes();
+  QModelIndex index;
  QStringList hashes;
-  foreach(const QModelIndex &index, selectedIndexes){
+  foreach(index, selectedIndexes){
    if(index.column() == F_NAME){
      // Get the file hash
      hashes << finishedListModel->data(finishedListModel->index(index.row(), F_HASH)).toString();
@@ -271,19 +221,15 @@ void FinishedTorrents::on_actionSet_upload_limit_triggered(){
  new BandwidthAllocationDialog(this, true, BTSession, hashes);
 }

-void FinishedTorrents::updateMetadata(QTorrentHandle &h) {
-  QString hash = h.hash();
-  int row = getRowFromHash(hash);
-  if(row != -1) {
-    qDebug("Updating torrent metadata in download list");
-    finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(h.name()));
-    finishedListModel->setData(finishedListModel->index(row, F_SIZE), QVariant((qlonglong)h.actual_size()));
+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) {
-    if(!h.is_valid()) return;
-    QString hash = h.hash();
    int row = getRowFromHash(hash);
    if(row == -1){
      qDebug("Cannot find torrent in finished list, adding it");
@@ -291,43 +237,43 @@ void FinishedTorrents::updateTorrent(QTorrentHandle h) {
      row = getRowFromHash(hash);
    }
    Q_ASSERT(row != -1);
-    if(!finishedList->isColumnHidden(F_SWARM)) {
-      finishedListModel->setData(finishedListModel->index(row, F_SWARM), misc::toQString(h.num_complete())+QString("/")+misc::toQString(h.num_incomplete()));
+    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/oxygen/time.png"))), Qt::DecorationRole);
-        } else {
-            finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/queued.png"))), Qt::DecorationRole);
+    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!
+      int reponse = QMessageBox::question(this, tr("Incomplete torrent in seeding list"), tr("It appears that the state of '%1' torrent changed from 'seeding' to 'downloading'. Would you like to move it back to download list? (otherwise the torrent will simply be deleted)").arg(h.name()), QMessageBox::Yes | QMessageBox::No);
+      if (reponse == QMessageBox::Yes) {
+        qDebug("Info: a torrent was moved from finished to download tab");
+        deleteTorrent(hash);
+        BTSession->setUnfinishedTorrent(hash);
+        emit torrentMovedFromFinishedList(hash);
      }
-        // Reset upload speed and seeds/leech
-        finishedListModel->setData(finishedListModel->index(row, F_UPSPEED), 0.);
-        finishedListModel->setData(finishedListModel->index(row, F_PEERS), "0");
+      else if (reponse == QMessageBox::No) {
+		    qDebug("Deleted from the finished");
+		    BTSession->deleteTorrent(hash, true);
+      }
+      continue;
+    }
+    if(h.state() == torrent_status::checking_files){
+      finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/time.png"))), Qt::DecorationRole);
      setRowColor(row, QString::fromUtf8("grey"));
-        return;
-    }
-    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/oxygen/time.png"))), Qt::DecorationRole);
-      setRowColor(row, QString::fromUtf8("grey"));
-      return;
+      continue;
    }
    setRowColor(row, QString::fromUtf8("orange"));
    finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png"))), Qt::DecorationRole);
    if(!finishedList->isColumnHidden(F_UPSPEED)) {
      finishedListModel->setData(finishedListModel->index(row, F_UPSPEED), QVariant((double)h.upload_payload_rate()));
    }
-    if(!finishedList->isColumnHidden(F_PEERS)) {
-      finishedListModel->setData(finishedListModel->index(row, F_PEERS), misc::toQString(h.num_peers() - h.num_seeds(), true));
-    }
-    if(!finishedList->isColumnHidden(F_UPLOAD)) {
-      finishedListModel->setData(finishedListModel->index(row, F_UPLOAD), QVariant((double)h.all_time_upload()));
+    if(!finishedList->isColumnHidden(F_LEECH)) {
+      finishedListModel->setData(finishedListModel->index(row, F_LEECH), misc::toQString(h.num_peers() - h.num_seeds(), true));
    }
    if(!finishedList->isColumnHidden(F_RATIO)) {
      finishedListModel->setData(finishedListModel->index(row, F_RATIO), QVariant(misc::toQString(BTSession->getRealRatio(hash))));
    }
  }
+}

 int FinishedTorrents::getRowFromHash(QString hash) const{
  unsigned int nbRows = finishedListModel->rowCount();
@@ -346,10 +292,17 @@ void FinishedTorrents::pauseTorrent(QString hash) {
    return;
  finishedListModel->setData(finishedListModel->index(row, F_UPSPEED), QVariant((double)0.0));
  finishedListModel->setData(finishedListModel->index(row, F_NAME), QIcon(QString::fromUtf8(":/Icons/skin/paused.png")), Qt::DecorationRole);
-  finishedListModel->setData(finishedListModel->index(row, F_PEERS), QVariant(QString::fromUtf8("0")));
+  finishedListModel->setData(finishedListModel->index(row, F_LEECH), QVariant(QString::fromUtf8("0")));
  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();
@@ -389,31 +342,21 @@ void FinishedTorrents::updateFileSize(QString hash){
 // display properties of selected items
 void FinishedTorrents::propertiesSelection(){
  QModelIndexList selectedIndexes = finishedList->selectionModel()->selectedIndexes();
-  foreach(const QModelIndex &index, selectedIndexes){
+  QModelIndex index;
+  foreach(index, selectedIndexes){
    if(index.column() == F_NAME){
      showProperties(index);
    }
  }
 }

-void FinishedTorrents::forceRecheck(){
-  QModelIndexList selectedIndexes = finishedList->selectionModel()->selectedIndexes();
-  foreach(const QModelIndex &index, selectedIndexes){
-      if(index.column() == F_NAME){
-          QString hash = finishedListModel->data(finishedListModel->index(index.row(), F_HASH)).toString();
-          QTorrentHandle h = BTSession->getTorrentHandle(hash);
-          qDebug("Forcing recheck for torrent %s", hash.toLocal8Bit().data());
-          h.force_recheck();
-      }
-  }
-}
-
-void FinishedTorrents::displayFinishedListMenu(const QPoint&){
+void FinishedTorrents::displayFinishedListMenu(const QPoint& pos){
  QMenu myFinishedListMenu(this);
+  QModelIndex index;
  // Enable/disable pause/start action given the DL state
  QModelIndexList selectedIndexes = finishedList->selectionModel()->selectedIndexes();
  bool has_pause = false, has_start = false, has_preview = false;
-  foreach(const QModelIndex &index, selectedIndexes) {
+  foreach(index, selectedIndexes) {
    if(index.column() == F_NAME) {
      // Get the file name
      QString hash = finishedListModel->data(finishedListModel->index(index.row(), F_HASH)).toString();
@@ -444,16 +387,14 @@ void FinishedTorrents::displayFinishedListMenu(const QPoint&){
  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();
-  myFinishedListMenu.addAction(actionCopy_magnet_link);
  myFinishedListMenu.addAction(actionBuy_it);

  // Call menu
-  myFinishedListMenu.exec(QCursor::pos());
+  // XXX: why mapToGlobal() is not enough?
+  myFinishedListMenu.exec(mapToGlobal(pos)+QPoint(10,59));
 }


@@ -465,12 +406,11 @@ void FinishedTorrents::displayFinishedListMenu(const QPoint&){
 void FinishedTorrents::displayFinishedHoSMenu(const QPoint& pos){
  QMenu hideshowColumn(this);
  hideshowColumn.setTitle(tr("Hide or Show Column"));
-  int lastCol = F_RATIO;
-  for(int i=0; i<=lastCol; i++) {
+  for(int i=0; i<=F_RATIO; i++) {
    hideshowColumn.addAction(getActionHoSCol(i));
  }
  // Call menu
-  hideshowColumn.exec(mapToGlobal(pos)+QPoint(10,34));
+  hideshowColumn.exec(mapToGlobal(pos)+QPoint(10,32));
 }

 // toggle hide/show a column
@@ -488,12 +428,12 @@ void FinishedTorrents::hideOrShowColumn(int index) {
    if(nbVisibleColumns <= 1) return;
    // User can hide the column, do it.
    finishedList->setColumnHidden(index, true);
-    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_cancel.png")));
+    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_cancel.png")));
    --nbVisibleColumns;
  } else {
    // User want to display the column
    finishedList->setColumnHidden(index, false);
-    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_ok.png")));
+    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_ok.png")));
    ++nbVisibleColumns;
  }
  //resize all others non-hidden columns
@@ -516,16 +456,8 @@ void FinishedTorrents::hideOrShowColumnUpSpeed() {
  hideOrShowColumn(F_UPSPEED);
 }

-void FinishedTorrents::hideOrShowColumnSwarm() {
-  hideOrShowColumn(F_SWARM);
-}
-
-void FinishedTorrents::hideOrShowColumnPeers() {
-  hideOrShowColumn(F_PEERS);
-}
-
-void FinishedTorrents::hideOrShowColumnUpload() {
-  hideOrShowColumn(F_UPLOAD);
+void FinishedTorrents::hideOrShowColumnLeechers() {
+  hideOrShowColumn(F_LEECH);
 }

 void FinishedTorrents::hideOrShowColumnRatio() {
@@ -551,9 +483,9 @@ bool FinishedTorrents::loadHiddenColumns() {
  for(int i=0; i<finishedListModel->columnCount()-1; i++) {
    if(loaded && ishidden_list.at(i) == "0") {
      finishedList->setColumnHidden(i, true);
-      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_cancel.png")));
+      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_cancel.png")));
    } else {
-      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_ok.png")));
+      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_ok.png")));
    }
  }
  return loaded;
@@ -587,14 +519,8 @@ QAction* FinishedTorrents::getActionHoSCol(int index) {
    case F_UPSPEED :
      return actionHOSColUpSpeed;
      break;
-    case F_SWARM :
-      return actionHOSColSwarm;
-      break;
-    case F_PEERS :
-      return actionHOSColPeers;
-      break;
-    case F_UPLOAD :
-      return actionHOSColUpload;
+    case F_LEECH :
+      return actionHOSColLeechers;
      break;
    case F_RATIO :
      return actionHOSColRatio;
@@ -609,42 +535,19 @@ QAction* FinishedTorrents::getActionHoSCol(int index) {
 * Sorting functions
 */

-void FinishedTorrents::toggleFinishedListSortOrder(int index) {
-  Qt::SortOrder sortOrder = Qt::AscendingOrder;
+void FinishedTorrents::sortFinishedList(int index){
+  static Qt::SortOrder sortOrder = Qt::AscendingOrder;
  if(finishedList->header()->sortIndicatorSection() == index){
-    sortOrder = (Qt::SortOrder)!(bool)finishedList->header()->sortIndicatorOrder();
-  }
-  switch(index) {
-    case F_SIZE:
-    case F_UPSPEED:
-    case F_RATIO:
-    case F_UPLOAD:
-      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();
+    if(sortOrder == Qt::AscendingOrder){
+      sortOrder = Qt::DescendingOrder;
    }else{
-    finishedList->header()->setSortIndicator(index, sortOrder);
+      sortOrder = Qt::AscendingOrder;
    }
+  }
+  finishedList->header()->setSortIndicator(index, sortOrder);
  switch(index){
    case F_SIZE:
    case F_UPSPEED:
-    case F_UPLOAD:
-    case F_RATIO:
      sortFinishedListFloat(index, sortOrder);
      break;
    default:
--- a/src/FinishedTorrents.h
+++ b/src/FinishedTorrents.h
@@ -16,15 +16,6 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 *
- * In addition, as a special exception, the copyright holders give permission to
- * link this program with the OpenSSL project's "OpenSSL" library (or with
- * modified versions of it that use the same license as the "OpenSSL" library),
- * and distribute the linked executables. You must obey the GNU General Public
- * License in all respects for all of the code used other than "OpenSSL".  If you
- * modify file(s), you may extend this exception to your version of the file(s),
- * but you are not obligated to do so. If you do not wish to do so, delete this
- * exception statement from your version.
- *
 * Contact : chris@qbittorrent.org
 */

@@ -69,31 +60,27 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
    void displayFinishedHoSMenu(const QPoint&);
    void setRowColor(int row, QString color);
    void saveColWidthFinishedList() const;
-    void toggleFinishedListSortOrder(int index);
-    void sortFinishedList(int index=-1, Qt::SortOrder sortOrder=Qt::AscendingOrder);
+    void sortFinishedList(int index);
    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();
    void hideOrShowColumnSize();
    void hideOrShowColumnUpSpeed();
-    void hideOrShowColumnSwarm();
-    void hideOrShowColumnPeers();
-    void hideOrShowColumnUpload();
+    void hideOrShowColumnLeechers();
    void hideOrShowColumnRatio();
-    void forceRecheck();

  public slots:
    void addTorrent(QString hash);
-    void updateTorrent(QTorrentHandle h);
+    void updateFinishedList();
    void pauseTorrent(QString hash);
+    void resumeTorrent(QString hash);
    void propertiesSelection();
    void deleteTorrent(QString hash);
    void showPropertiesFromHash(QString hash);
-    void loadLastSortedColumn();
-    void updateMetadata(QTorrentHandle &h);

  signals:
    void torrentMovedFromFinishedList(QString);
--- a/src/GUI.cpp
+++ b/src/GUI.cpp
--- a/src/GUI.h
+++ b/src/GUI.h
@@ -16,15 +16,6 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 *
- * In addition, as a special exception, the copyright holders give permission to
- * link this program with the OpenSSL project's "OpenSSL" library (or with
- * modified versions of it that use the same license as the "OpenSSL" library),
- * and distribute the linked executables. You must obey the GNU General Public
- * License in all respects for all of the code used other than "OpenSSL".  If you
- * modify file(s), you may extend this exception to your version of the file(s),
- * but you are not obligated to do so. If you do not wish to do so, delete this
- * exception statement from your version.
- *
 * Contact : chris@qbittorrent.org
 */

@@ -33,7 +24,7 @@

 #include <QProcess>
 #include <QSystemTrayIcon>
-#include <QPointer>
+
 #include "ui_MainWindow.h"
 #include "qtorrenthandle.h"

@@ -61,7 +52,6 @@ class QTabWidget;
 class QLabel;
 class QModelIndex;
 class HttpServer;
-class QFrame;

 class GUI : public QMainWindow, private Ui::MainWindow{
  Q_OBJECT
@@ -70,13 +60,12 @@ class GUI : public QMainWindow, private Ui::MainWindow{
    // Bittorrent
    bittorrent *BTSession;
    QTimer *checkConnect;
-    QTimer *scrapeTimer;
    QList<QPair<QTorrentHandle,QString> > unauthenticated_trackers;
    // GUI related
    QTabWidget *tabs;
-    QPointer<options_imp> options;
+    options_imp *options;
    QSystemTrayIcon *myTrayIcon;
-    QPointer<QTimer> systrayCreator;
+    QTimer *systrayCreator;
    QMenu *myTrayIconMenu;
    DownloadingTorrents *downloadingTorrentTab;
    FinishedTorrents *finishedTorrentTab;
@@ -86,28 +75,18 @@ 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
-    QPointer<HttpServer> httpServer;
+    HttpServer *httpServer;
    // Misc
 #ifdef QT_4_4
    QLocalServer *localServer;
@@ -126,7 +105,6 @@ 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);
@@ -140,10 +118,9 @@ class GUI : public QMainWindow, private Ui::MainWindow{
    void createTrayIcon();
    void updateUnfinishedTorrentNumber(unsigned int nb);
    void updateFinishedTorrentNumber(unsigned int nb);
-    void fullDiskError(QTorrentHandle& h, QString msg) const;
+    void fullDiskError(QTorrentHandle& h) const;
    void handleDownloadFromUrlFailure(QString, QString) const;
    void createSystrayDelayed();
-    void setPaused(QTorrentHandle &h) const;
    // Keyboard shortcuts
    void createKeyboardShortcuts();
    void displayDownTab() const;
@@ -167,22 +144,19 @@ 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 addedTorrent(QTorrentHandle& h) const;
-    void checkedTorrent(QTorrentHandle& h) const;
-    void pausedTorrent(QTorrentHandle& h) const;
-    void resumedTorrent(QTorrentHandle& h) const;
-    void updateLists(bool force=false);
+    void torrentChecked(QString hash) const;
+    void updateLists();
    bool initWebUi(QString username, QString password, int port);
-    void on_actionIncreasePriority_triggered();
-    void on_actionDecreasePriority_triggered();
-    void scrapeTrackers();
+    void pauseTorrent(QString hash);
    // Options slots
    void on_actionOptions_triggered();
-    void OptionsSaved(bool deleteOptions);
+    void OptionsSaved(QString info, bool deleteOptions);
    // HTTP slots
    void on_actionDownload_from_URL_triggered();

@@ -192,14 +166,11 @@ class GUI : public QMainWindow, private Ui::MainWindow{
    void setTabText(int index, QString text) const;
    void openDestinationFolder() const;
    void goBuyPage() const;
-    void copyMagnetURI() const;
    void updateRatio();

  protected:
    void closeEvent(QCloseEvent *);
-    void showEvent(QShowEvent *);
-    bool event(QEvent * event);
-    void displayRSSTab(bool enable);
+    void hideEvent(QHideEvent *);

  public:
    // Construct / Destruct
--- a/src/Icons/add_file.png
+++ b/src/Icons/add_file.png
--- a/src/Icons/add_folder.png
+++ b/src/Icons/add_folder.png
--- a/src/Icons/bt_settings.png
+++ b/src/Icons/bt_settings.png
--- a/src/Icons/button_cancel.png
+++ b/src/Icons/button_cancel.png
--- a/src/Icons/button_ok.png
+++ b/src/Icons/button_ok.png
--- a/src/Icons/configure.png
+++ b/src/Icons/configure.png
--- a/src/Icons/connection.png
+++ b/src/Icons/connection.png
--- a/src/Icons/description.png
+++ b/src/Icons/description.png
--- a/src/Icons/download.png
+++ b/src/Icons/download.png
--- a/src/Icons/oxygen/edit_clear.png
+++ b/src/Icons/oxygen/edit_clear.png
--- a/src/Icons/oxygen/encrypted.png
+++ b/src/Icons/oxygen/encrypted.png
--- a/src/Icons/oxygen/file.png
+++ b/src/Icons/oxygen/file.png
--- a/src/Icons/filter.png
+++ b/src/Icons/filter.png
--- a/src/Icons/oxygen/folder.png
+++ b/src/Icons/oxygen/folder.png
--- a/src/Icons/gear.png
+++ b/src/Icons/gear.png
--- a/src/Icons/home.png
+++ b/src/Icons/home.png
--- a/src/Icons/log.png
+++ b/src/Icons/log.png
--- a/src/Icons/magnet.png
+++ b/src/Icons/magnet.png
--- a/src/Icons/skin/mascot.png
+++ b/src/Icons/skin/mascot.png
--- a/src/Icons/newmsg.png
+++ b/src/Icons/newmsg.png
--- a/src/Icons/oxygen/browse.png
+++ b/src/Icons/oxygen/browse.png
--- a/src/Icons/oxygen/bt_settings.png
+++ b/src/Icons/oxygen/bt_settings.png
--- a/src/Icons/oxygen/bug.png
+++ b/src/Icons/oxygen/bug.png
--- a/src/Icons/oxygen/button_cancel.png
+++ b/src/Icons/oxygen/button_cancel.png
--- a/src/Icons/oxygen/button_ok.png
+++ b/src/Icons/oxygen/button_ok.png
--- a/src/Icons/oxygen/configure.png
+++ b/src/Icons/oxygen/configure.png
--- a/src/Icons/oxygen/connection.png
+++ b/src/Icons/oxygen/connection.png
--- a/src/Icons/oxygen/document-new.png
+++ b/src/Icons/oxygen/document-new.png
--- a/src/Icons/oxygen/download.png
+++ b/src/Icons/oxygen/download.png
--- a/src/Icons/oxygen/edit-clear.png
+++ b/src/Icons/oxygen/edit-clear.png
--- a/src/Icons/oxygen/edit-copy.png
+++ b/src/Icons/oxygen/edit-copy.png
--- a/src/Icons/oxygen/edit-cut.png
+++ b/src/Icons/oxygen/edit-cut.png
--- a/src/Icons/oxygen/edit-paste.png
+++ b/src/Icons/oxygen/edit-paste.png
--- a/src/Icons/oxygen/filter.png
+++ b/src/Icons/oxygen/filter.png
--- a/src/Icons/oxygen/folder-new.png
+++ b/src/Icons/oxygen/folder-new.png
--- a/src/Icons/oxygen/gear.png
+++ b/src/Icons/oxygen/gear.png
--- a/src/Icons/oxygen/list-add.png
+++ b/src/Icons/oxygen/list-add.png
--- a/src/Icons/oxygen/list-remove.png
+++ b/src/Icons/oxygen/list-remove.png
--- a/src/Icons/oxygen/log.png
+++ b/src/Icons/oxygen/log.png
--- a/src/Icons/oxygen/proxy.png
+++ b/src/Icons/oxygen/proxy.png
--- a/src/Icons/oxygen/subscribe.png
+++ b/src/Icons/oxygen/subscribe.png
--- a/src/Icons/oxygen/subscribe16.png
+++ b/src/Icons/oxygen/subscribe16.png
--- a/src/Icons/oxygen/unavailable.png
+++ b/src/Icons/oxygen/unavailable.png
--- a/src/Icons/oxygen/view-refresh.png
+++ b/src/Icons/oxygen/view-refresh.png
--- a/src/Icons/oxygen/webui.png
+++ b/src/Icons/oxygen/webui.png
--- a/src/Icons/password.png
+++ b/src/Icons/password.png
--- a/src/Icons/proxy.png
+++ b/src/Icons/proxy.png
--- a/src/Icons/qBittorrent.desktop
+++ b/src/Icons/qBittorrent.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Categories=Qt;Network;P2P
-Comment=V1.5.0
+Comment=V1.1.1
 Exec=qbittorrent %f
 GenericName=Bittorrent client
 GenericName[bg]=Торент клиент
--- a/src/Icons/skin/qbittorrent16.png
+++ b/src/Icons/skin/qbittorrent16.png
--- a/src/Icons/skin/qbittorrent22.png
+++ b/src/Icons/skin/qbittorrent22.png
--- a/src/Icons/skin/qbittorrent32.png
+++ b/src/Icons/skin/qbittorrent32.png
--- a/src/Icons/refresh.png
+++ b/src/Icons/refresh.png
--- a/src/Icons/skin/add.png
+++ b/src/Icons/skin/add.png
--- a/src/Icons/skin/connected.png
+++ b/src/Icons/skin/connected.png
--- a/src/Icons/skin/connecting.png
+++ b/src/Icons/skin/connecting.png
--- a/src/Icons/skin/decrease.png
+++ b/src/Icons/skin/decrease.png
--- a/src/Icons/skin/disconnected.png
+++ b/src/Icons/skin/disconnected.png
--- a/src/Icons/skin/firewalled.png
+++ b/src/Icons/skin/firewalled.png
--- a/src/Icons/skin/increase.png
+++ b/src/Icons/skin/increase.png
--- a/src/Icons/skin/queued.png
+++ b/src/Icons/skin/queued.png
--- a/src/Icons/oxygen/remove.png
+++ b/src/Icons/oxygen/remove.png
--- a/src/Icons/skin/tabs.gif
+++ b/src/Icons/skin/tabs.gif
--- a/src/Icons/smile.png
+++ b/src/Icons/smile.png
--- a/src/Icons/skin/splash.png
+++ b/src/Icons/skin/splash.png
--- a/src/Icons/star.png
+++ b/src/Icons/star.png
--- a/src/Icons/stare.png
+++ b/src/Icons/stare.png
--- a/src/Icons/style.png
+++ b/src/Icons/style.png
--- a/src/Icons/subscribe.png
+++ b/src/Icons/subscribe.png
--- a/src/Icons/subscribe16.png
+++ b/src/Icons/subscribe16.png
--- a/src/Icons/systemtray.png
+++ b/src/Icons/systemtray.png
--- a/src/Icons/oxygen/time.png
+++ b/src/Icons/oxygen/time.png
--- a/src/Icons/unavailable.png
+++ b/src/Icons/unavailable.png
--- a/src/Icons/unhappy.png
+++ b/src/Icons/unhappy.png
--- a/src/Icons/oxygen/unsubscribe.png
+++ b/src/Icons/oxygen/unsubscribe.png
--- a/src/Icons/oxygen/unsubscribe16.png
+++ b/src/Icons/oxygen/unsubscribe16.png
--- a/src/Icons/url.png
+++ b/src/Icons/url.png
--- a/src/Icons/wizard.png
+++ b/src/Icons/wizard.png
--- a/src/MainWindow.ui
+++ b/src/MainWindow.ui
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0" >
 <class>MainWindow</class>
 <widget class="QMainWindow" name="MainWindow" >
@@ -6,7 +5,7 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>914</width>
+    <width>849</width>
    <height>563</height>
   </rect>
  </property>
@@ -17,15 +16,203 @@
   <string/>
  </property>
  <widget class="QWidget" name="centralwidget" >
-   <layout class="QVBoxLayout"/>
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>58</y>
+     <width>849</width>
+     <height>505</height>
+    </rect>
+   </property>
+   <layout class="QVBoxLayout" name="vboxLayout" >
+    <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>
  </widget>
  <widget class="QMenuBar" name="menubar" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-     <width>914</width>
-     <height>23</height>
+     <width>849</width>
+     <height>26</height>
    </rect>
   </property>
   <widget class="QMenu" name="menu_Edit" >
@@ -42,8 +229,6 @@
    <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" >
@@ -59,7 +244,6 @@
     <string>Options</string>
    </property>
    <addaction name="actionOptions" />
-    <addaction name="actionShow_console"/>
   </widget>
   <widget class="QMenu" name="menu_File" >
    <property name="title" >
@@ -79,6 +263,14 @@
   <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>
@@ -94,9 +286,6 @@
     <height>32</height>
    </size>
   </property>
-   <property name="floatable">
-    <bool>false</bool>
-   </property>
   <attribute name="toolBarArea" >
    <enum>TopToolBarArea</enum>
   </attribute>
@@ -118,12 +307,9 @@
   <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>
@@ -234,42 +420,7 @@
    <string>Set global upload limit</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>
-   <property name="visible">
-    <bool>false</bool>
-   </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>
-   <property name="visible">
-    <bool>false</bool>
-   </property>
-  </action>
-  <action name="actionShow_console">
-   <property name="icon">
-    <iconset resource="icons.qrc">
-     <normaloff>:/Icons/oxygen/log.png</normaloff>:/Icons/oxygen/log.png</iconset>
-   </property>
-   <property name="text">
-    <string>Console</string>
-   </property>
-  </action>
 </widget>
- <resources>
-  <include location="icons.qrc"/>
- </resources>
+ <resources/>
 <connections/>
 </ui>
--- a/src/PreviewListDelegate.h
+++ b/src/PreviewListDelegate.h
@@ -16,15 +16,6 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 *
- * In addition, as a special exception, the copyright holders give permission to
- * link this program with the OpenSSL project's "OpenSSL" library (or with
- * modified versions of it that use the same license as the "OpenSSL" library),
- * and distribute the linked executables. You must obey the GNU General Public
- * License in all respects for all of the code used other than "OpenSSL".  If you
- * modify file(s), you may extend this exception to your version of the file(s),
- * but you are not obligated to do so. If you do not wish to do so, delete this
- * exception statement from your version.
- *
 * Contact : chris@qbittorrent.org
 */

--- a/src/PropListDelegate.h
+++ b/src/PropListDelegate.h
@@ -16,15 +16,6 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 *
- * In addition, as a special exception, the copyright holders give permission to
- * link this program with the OpenSSL project's "OpenSSL" library (or with
- * modified versions of it that use the same license as the "OpenSSL" library),
- * and distribute the linked executables. You must obey the GNU General Public
- * License in all respects for all of the code used other than "OpenSSL".  If you
- * modify file(s), you may extend this exception to your version of the file(s),
- * but you are not obligated to do so. If you do not wish to do so, delete this
- * exception statement from your version.
- *
 * Contact : chris@qbittorrent.org
 */

--- a/src/SearchListDelegate.h
+++ b/src/SearchListDelegate.h
@@ -16,15 +16,6 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 *
- * In addition, as a special exception, the copyright holders give permission to
- * link this program with the OpenSSL project's "OpenSSL" library (or with
- * modified versions of it that use the same license as the "OpenSSL" library),
- * and distribute the linked executables. You must obey the GNU General Public
- * License in all respects for all of the code used other than "OpenSSL".  If you
- * modify file(s), you may extend this exception to your version of the file(s),
- * but you are not obligated to do so. If you do not wish to do so, delete this
- * exception statement from your version.
- *
 * Contact : chris@qbittorrent.org
 */

--- a/src/SearchTab.cpp
+++ b/src/SearchTab.cpp
@@ -16,15 +16,6 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 *
- * In addition, as a special exception, the copyright holders give permission to
- * link this program with the OpenSSL project's "OpenSSL" library (or with
- * modified versions of it that use the same license as the "OpenSSL" library),
- * and distribute the linked executables. You must obey the GNU General Public
- * License in all respects for all of the code used other than "OpenSSL".  If you
- * modify file(s), you may extend this exception to your version of the file(s),
- * but you are not obligated to do so. If you do not wish to do so, delete this
- * exception statement from your version.
- *
 * Contact : chris@qbittorrent.org
 */

@@ -56,14 +47,13 @@ SearchTab::SearchTab(SearchEngine *parent) : QWidget()
    
    setLayout(box);
    // Set Search results list model
-    SearchListModel = new QStandardItemModel(0,6);
+    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);
-    resultsBrowser->hideColumn(URL_COLUMN); // Hide url column
    SearchDelegate = new SearchListDelegate();
    resultsBrowser->setItemDelegate(SearchDelegate);
    // Make search list header clickable for sorting
@@ -75,36 +65,19 @@ SearchTab::SearchTab(SearchEngine *parent) : QWidget()
    connect(resultsBrowser->header(), SIGNAL(sectionPressed(int)), this, SLOT(sortSearchList(int)));
    
    // Load last columns width for search results list
-    if(!loadColWidthResultsList()){
+    if(!loadColWidthSearchList()){
      resultsBrowser->header()->resizeSection(0, 275);
    }
 }

-SearchTab::~SearchTab() {
+SearchTab::~SearchTab()
+{
+    saveColWidthSearchList();
    delete resultsBrowser;
    delete SearchListModel;
    delete SearchDelegate;
 }

-QHeaderView* SearchTab::header() const {
-  return resultsBrowser->header();
-}
-
-bool SearchTab::loadColWidthResultsList() {
-  QSettings settings("qBittorrent", "qBittorrent");
-  QString line = settings.value("SearchResultsColsWidth", QString()).toString();
-  if(line.isEmpty())
-    return false;
-  QStringList width_list = line.split(' ');
-  if(width_list.size() < SearchListModel->columnCount())
-    return false;
-  unsigned int listSize = width_list.size();
-  for(unsigned int i=0; i<listSize; ++i){
-        resultsBrowser->header()->resizeSection(i, width_list.at(i).toInt());
-  }
-  return true;
-}
-
 QLabel* SearchTab::getCurrentLabel()
 {
    return results_lbl;
@@ -155,7 +128,7 @@ void SearchTab::sortSearchListInt(int index, Qt::SortOrder sortOrder){
  for(int row=0; row<lines.size(); ++row){
    SearchListModel->insertRow(SearchListModel->rowCount());
    int sourceRow = lines[row].first;
-    for(int col=0; col<6; ++col){
+    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);
    }
@@ -175,7 +148,7 @@ void SearchTab::sortSearchListString(int index, Qt::SortOrder sortOrder){
  for(int row=0; row<nbRows_old; ++row){
    SearchListModel->insertRow(SearchListModel->rowCount());
    int sourceRow = lines[row].first;
-    for(int col=0; col<6; ++col){
+    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);
    }
@@ -184,3 +157,34 @@ void SearchTab::sortSearchListString(int index, Qt::SortOrder sortOrder){
  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;
+}
+
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Christophe Dumez	f043cd3cc5	- Tagged v1.1.3 release	2008-08-26 07:21:15 +00:00
Christophe Dumez	28626f51ad	- Fixed a comment - Added chinese traditional translation to stable branch - bump to v1.1.3 in stable branch (updated splash screen) - Updated changelogs	2008-08-26 07:14:38 +00:00
Christophe Dumez	25233295ba	- Fixed ratio saving for seeding torrents	2008-08-26 06:45:24 +00:00
Christophe Dumez	bd6684405b	- Added czech translation	2008-08-18 23:58:30 +00:00
Christophe Dumez	a8235dc413	- Progress calculation fix	2008-08-17 03:53:49 +00:00
Christophe Dumez	c2838d9b0c	- Forgot to update this	2008-08-01 16:21:14 +00:00
Christophe Dumez	d6d7797064	- v1.1.1	2008-08-01 16:20:27 +00:00
Christophe Dumez	685216505c	- Fixed resource file	2008-08-01 16:17:31 +00:00
Christophe Dumez	c28c55280d	- Added release date	2008-08-01 14:37:03 +00:00
Christophe Dumez	f1032c4619	- Updated INSTALL file	2008-08-01 14:30:18 +00:00
Christophe Dumez	d34bfd13b3	- Updated resources files	2008-08-01 14:28:28 +00:00
Christophe Dumez	cfd6a9d734	- Removed rc	2008-08-01 14:23:39 +00:00
Christophe Dumez	c2f22d292a	- Updated bulgarian and greek translations	2008-07-31 12:45:35 +00:00
Christophe Dumez	9778112b3b	- Allow to download torrents from local files in WEB UI	2008-07-31 12:11:01 +00:00
Christophe Dumez	1708361bd5	- Added peerkoel to dutch translators	2008-07-29 09:58:50 +00:00
Christophe Dumez	cc04f7eec2	- Updated dutch translation	2008-07-29 09:56:32 +00:00
Christophe Dumez	395805f9e8	- Added new Russian translator's name	2008-07-29 07:48:26 +00:00
Christophe Dumez	ba5daee92f	- Patch from Alexey Morsov for desktop file to satisfy freedesktop standard	2008-07-29 07:42:45 +00:00
Christophe Dumez	bfef2b5cc0	- updated russian translation	2008-07-29 07:40:03 +00:00
Christophe Dumez	af2431afbd	- Added new spanish translator's name	2008-07-28 13:24:14 +00:00
Christophe Dumez	7a1b92e467	- Updated spanish translation	2008-07-28 13:17:55 +00:00
Christophe Dumez	dc399e9ed9	- optimized downloadthreads - fixed resizing in torrent addition dialog	2008-07-27 18:11:45 +00:00
Christophe Dumez	dad79d2cc8	- Bump to rc2	2008-07-27 16:02:58 +00:00
Christophe Dumez	b5d30d5154	- Fixed vertical alignements of menus	2008-07-27 15:58:33 +00:00
Christophe Dumez	72df85749b	- Updated TODO file	2008-07-27 15:42:57 +00:00
Christophe Dumez	6c84288b09	- Updated German translation	2008-07-23 07:00:16 +00:00
Christophe Dumez	78239d6956	- Fixed building on ARM (patch from Cristian Greco)	2008-07-22 19:49:22 +00:00
Christophe Dumez	41be514dcf	- Commented ASSERT due to a little string encoding bug in libtorrent	2008-07-22 14:40:01 +00:00
Christophe Dumez	855b539843	- Add missing line at the end	2008-07-19 20:04:01 +00:00
Christophe Dumez	2e72ab4973	- Fixed extented selection in search results list (Bug introduced by Tab support in search engine)	2008-07-19 19:28:57 +00:00
Christophe Dumez	ae2ad8e747	- Fixed a bug in torrent progress display	2008-07-16 21:53:34 +00:00
Christophe Dumez	42fa5ef8f3	- Updated hungarian translation	2008-07-13 21:12:16 +00:00
Christophe Dumez	9395f7316d	- Updated hungarian translator's mail	2008-07-13 21:10:18 +00:00
Christophe Dumez	fa1c4050ed	- Updated Korean translation	2008-07-12 21:23:27 +00:00
Christophe Dumez	565b98a94a	- Updated turkish translation	2008-07-11 21:35:39 +00:00
Christophe Dumez	f58efdfefc	- Bump to rc1 - Disable debug	2008-07-11 17:37:13 +00:00
Christophe Dumez	a806c27f70	- Updated Italian translation	2008-07-11 16:30:52 +00:00
Christophe Dumez	a8f82d9e12	- Updated Finnish translation	2008-07-10 18:50:34 +00:00
Christophe Dumez	fe6054307e	- Moved v1.1.x to its own branch. Trunk will now be dedicated to v1.2.x	2008-07-10 18:11:26 +00:00