tagged v1.5.0beta3 release

- Updated search icon

AUTHORS

@@ -17,6 +17,11 @@ Images Authors:
   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

COPYING

@@ -1,3 +1,17 @@
+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
 

Changelog

@@ -1,3 +1,72 @@
+* 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: Added "Unread" item to RSS feed list to display all unread news
+    - 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

TODO

@@ -1,21 +1,2 @@
 See https://blueprints.launchpad.net/qbittorrent/
 
-// translations done in v1.3.0
-- Romanian
-- Russian
-- Hungarian
-- German
-- Chinese (traditional)
-- Chinese (simplified)
-- Italian
-- Swedish
-- Turkish
-- French
-- Slovak
-- Czech
-- Korean
-- Portuguese
-- Brazilian
-- Greek
-- Bulgarian
-- Finnish

configure

@@ -18,17 +18,12 @@ 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-libzzip                      Disable use of libzzip
-  --with-libzzip-inc=[path]               Path to libzzip++ include files
-  --with-libzzip-lib=[path]               Path to libzzip++ library files
+  --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-libzzip             Disable use of libzzip
+  --with-libzzip-inc=[path]      Path to libzzip++ include files
+  --with-libzzip-lib=[path]      Path to libzzip++ library files
 
 EOT
 }
@@ -145,21 +140,6 @@ 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
@@ -211,9 +191,6 @@ 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
@@ -346,70 +323,29 @@ 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"; }
+	QString name() const { return "libtorrent-rasterbar >= 0.14.0 (>= 0.14.4 advised)"; }
 	QString shortname() const { return "libtorrent-rasterbar"; }
 	bool exec(){
-        	QString s;
-		s = conf->getenv("QC_WITH_LIBTORRENT_INC");
-		if(!s.isEmpty()) {
-			if(!conf->checkHeader(s, "libtorrent/magnet_uri.hpp")) {
-				return false;
-      			}
-		}else{
-			QStringList sl;
-			sl << "/usr/include";
-			sl << "/usr/local/include";
-			bool found = false;
-			foreach(s, sl){
-				if(conf->checkHeader(s, "libtorrent/magnet_uri.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);
-		}
+		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))
+			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());
 		return true;
 	}
 };
@@ -1567,9 +1503,6 @@ 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

qcm/libmagick.qcm

@@ -64,14 +64,11 @@ public:
                          	return false;
 		}
 		conf->addLib(QString("-L") + s);
-		QProcess magickConfig;
+		QString out = "";
 		QStringList params;
-		params << "--libs";
-		magickConfig.start("Magick++-config", params, QIODevice::ReadOnly);
-		magickConfig.waitForStarted();
-		magickConfig.waitForFinished();
-		QByteArray result = magickConfig.readAll();
-		result = result.replace("\n", "");
+                params << "--libs";
+		qconf->doCommand("Magick++-config", params, &out);
+		out = out.replace("\n", "");
 		conf->addLib(result.data());
 		conf->addDefine("HAVE_MAGICK");
 		return true;

qcm/libtorrent-rasterbar.qcm

@@ -1,9 +1,6 @@
 /*
 -----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
@@ -11,61 +8,22 @@ class qc_libtorrent_rasterbar : public ConfObj
 {
 public:
 	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent-rasterbar >= 0.14"; }
+	QString name() const { return "libtorrent-rasterbar >= 0.14.0 (>= 0.14.4 advised)"; }
 	QString shortname() const { return "libtorrent-rasterbar"; }
 	bool exec(){
-        	QString s;
-		s = conf->getenv("QC_WITH_LIBTORRENT_INC");
-		if(!s.isEmpty()) {
-			if(!conf->checkHeader(s, "libtorrent/magnet_uri.hpp")) {
-				return false;
-      			}
-		}else{
-			QStringList sl;
-			sl << "/usr/include";
-			sl << "/usr/local/include";
-			bool found = false;
-			foreach(s, sl){
-				if(conf->checkHeader(s, "libtorrent/magnet_uri.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);
-		}
+		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))
+			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());
 		return true;
 	}
 };

src/DLListDelegate.h

@@ -16,6 +16,15 @@
  * 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
  */
 

src/FeedDownloader.h

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

src/FeedDownloader.ui

@@ -0,0 +1,546 @@
+<?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>

src/FinishedListDelegate.h

@@ -16,6 +16,15 @@
  * 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
  */
 
@@ -35,9 +44,13 @@
 #define F_NAME 0
 #define F_SIZE 1
 #define F_UPSPEED 2
-#define F_LEECH 3
-#define F_RATIO 4
-#define F_HASH 5
+#define F_SWARM 3
+#define F_PEERS 4
+#define F_UPLOAD 5
+#define F_RATIO 6
+#define F_HASH 7
+
+#define MAX_RATIO 100.
 
 class FinishedListDelegate: public QItemDelegate {
   Q_OBJECT
@@ -51,6 +64,7 @@ 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;
@@ -63,7 +77,7 @@ class FinishedListDelegate: public QItemDelegate {
         case F_RATIO:{
           QItemDelegate::drawBackground(painter, opt, index);
           double ratio = index.data().toDouble();
-          if(ratio > 100.)
+          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)));

src/FinishedTorrents.cpp

@@ -16,6 +16,15 @@
  * 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"
@@ -37,13 +46,17 @@ 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,6);
+  finishedListModel = new QStandardItemModel(0,8);
   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_LEECH, Qt::Horizontal, tr("Leechers", "i.e: full/partial sources"));
+  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_RATIO, Qt::Horizontal, tr("Ratio"));
   finishedList->setModel(finishedListModel);
+  finishedList->setRootIsDecorated(false);
+  finishedList->setAllColumnsShowFocus(true);
   loadHiddenColumns();
   // Hide hash column
   finishedList->hideColumn(F_HASH);
@@ -51,6 +64,8 @@ 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);
@@ -66,6 +81,8 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
   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()));
@@ -75,11 +92,14 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
   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(actionHOSColLeechers, SIGNAL(triggered()), this, SLOT(hideOrShowColumnLeechers()));
+  connect(actionHOSColSwarm, SIGNAL(triggered()), this, SLOT(hideOrShowColumnSwarm()));
+  connect(actionHOSColPeers, SIGNAL(triggered()), this, SLOT(hideOrShowColumnPeers()));
+  connect(actionHOSColUpload, SIGNAL(triggered()), this, SLOT(hideOrShowColumnUpload()));
   connect(actionHOSColRatio, SIGNAL(triggered()), this, SLOT(hideOrShowColumnRatio()));
 }
 
@@ -106,7 +126,9 @@ 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_LEECH), QVariant("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_RATIO), QVariant(QString::fromUtf8(misc::toString(BTSession->getRealRatio(hash)).c_str())));
   finishedListModel->setData(finishedListModel->index(row, F_HASH), QVariant(hash));
   if(h.is_paused()) {
@@ -165,6 +187,23 @@ bool FinishedTorrents::loadColWidthFinishedList(){
         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;
 }
@@ -199,7 +238,7 @@ void FinishedTorrents::saveColWidthFinishedList() const{
     width_list = line.split(' ');
   }
   for(short i=0; i<nbColumns; ++i){
-    if(finishedList->columnWidth(i)<1 && width_list.size() == finishedListModel->columnCount()-1 && width_list.at(i).toInt()>=1) {
+    if(finishedList->columnWidth(i)<1 && width_list.size() == nbColumns && width_list.at(i).toInt()>=1) {
       // load the former width
       new_width_list << width_list.at(i);
     } else if(finishedList->columnWidth(i)>=1) { 
@@ -212,6 +251,11 @@ 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");
 }
 
@@ -227,7 +271,18 @@ 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::updateTorrent(QTorrentHandle h) {
+    if(!h.is_valid()) return;
     QString hash = h.hash();
     int row = getRowFromHash(hash);
     if(row == -1){
@@ -236,22 +291,25 @@ 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()) return;
     // Update queued torrent
     if(BTSession->isQueueingEnabled() && h.is_queued()) {
         if(h.state() == torrent_status::checking_files || h.state() == torrent_status::queued_for_checking){
-            finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/time.png"))), Qt::DecorationRole);
+            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);
         }
         // Reset upload speed and seeds/leech
         finishedListModel->setData(finishedListModel->index(row, F_UPSPEED), 0.);
-        finishedListModel->setData(finishedListModel->index(row, F_LEECH), "0");
+        finishedListModel->setData(finishedListModel->index(row, F_PEERS), "0");
         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/time.png"))), Qt::DecorationRole);
+      finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/oxygen/time.png"))), Qt::DecorationRole);
       setRowColor(row, QString::fromUtf8("grey"));
       return;
     }
@@ -260,8 +318,11 @@ void FinishedTorrents::updateTorrent(QTorrentHandle h) {
     if(!finishedList->isColumnHidden(F_UPSPEED)) {
       finishedListModel->setData(finishedListModel->index(row, F_UPSPEED), QVariant((double)h.upload_payload_rate()));
     }
-    if(!finishedList->isColumnHidden(F_LEECH)) {
-      finishedListModel->setData(finishedListModel->index(row, F_LEECH), misc::toQString(h.num_peers() - h.num_seeds(), true));
+    if(!finishedList->isColumnHidden(F_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_RATIO)) {
       finishedListModel->setData(finishedListModel->index(row, F_RATIO), QVariant(misc::toQString(BTSession->getRealRatio(hash))));
@@ -285,7 +346,7 @@ 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_LEECH), QVariant(QString::fromUtf8("0")));
+  finishedListModel->setData(finishedListModel->index(row, F_PEERS), QVariant(QString::fromUtf8("0")));
   setRowColor(row, QString::fromUtf8("red"));
 }
 
@@ -341,12 +402,13 @@ void FinishedTorrents::forceRecheck(){
       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& pos){
+void FinishedTorrents::displayFinishedListMenu(const QPoint&){
   QMenu myFinishedListMenu(this);
   // Enable/disable pause/start action given the DL state
   QModelIndexList selectedIndexes = finishedList->selectionModel()->selectedIndexes();
@@ -387,11 +449,11 @@ void FinishedTorrents::displayFinishedListMenu(const QPoint& pos){
   myFinishedListMenu.addAction(actionOpen_destination_folder);
   myFinishedListMenu.addAction(actionTorrent_Properties);
   myFinishedListMenu.addSeparator();
+  myFinishedListMenu.addAction(actionCopy_magnet_link);
   myFinishedListMenu.addAction(actionBuy_it);
 
   // Call menu
-  // XXX: why mapToGlobal() is not enough?
-  myFinishedListMenu.exec(mapToGlobal(pos)+QPoint(10,58));
+  myFinishedListMenu.exec(QCursor::pos());
 }
 
 
@@ -426,12 +488,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/button_cancel.png")));
+    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_cancel.png")));
     --nbVisibleColumns;
   } else {
     // User want to display the column
     finishedList->setColumnHidden(index, false);
-    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_ok.png")));
+    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_ok.png")));
     ++nbVisibleColumns;
   }
   //resize all others non-hidden columns
@@ -454,8 +516,16 @@ void FinishedTorrents::hideOrShowColumnUpSpeed() {
   hideOrShowColumn(F_UPSPEED);
 }
 
-void FinishedTorrents::hideOrShowColumnLeechers() {
-  hideOrShowColumn(F_LEECH);
+void FinishedTorrents::hideOrShowColumnSwarm() {
+  hideOrShowColumn(F_SWARM);
+}
+
+void FinishedTorrents::hideOrShowColumnPeers() {
+  hideOrShowColumn(F_PEERS);
+}
+
+void FinishedTorrents::hideOrShowColumnUpload() {
+  hideOrShowColumn(F_UPLOAD);
 }
 
 void FinishedTorrents::hideOrShowColumnRatio() {
@@ -481,9 +551,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/button_cancel.png")));
+      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_cancel.png")));
     } else {
-      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_ok.png")));
+      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_ok.png")));
     }
   }
   return loaded;
@@ -517,8 +587,14 @@ QAction* FinishedTorrents::getActionHoSCol(int index) {
     case F_UPSPEED :
       return actionHOSColUpSpeed;
       break;
-    case F_LEECH :
-      return actionHOSColLeechers;
+    case F_SWARM :
+      return actionHOSColSwarm;
+      break;
+    case F_PEERS :
+      return actionHOSColPeers;
+      break;
+    case F_UPLOAD :
+      return actionHOSColUpload;
       break;
     case F_RATIO :
       return actionHOSColRatio;
@@ -542,6 +618,7 @@ void FinishedTorrents::toggleFinishedListSortOrder(int index) {
     case F_SIZE:
     case F_UPSPEED:
     case F_RATIO:
+    case F_UPLOAD:
       sortFinishedListFloat(index, sortOrder);
       break;
     default:
@@ -566,6 +643,8 @@ void FinishedTorrents::sortFinishedList(int index, Qt::SortOrder sortOrder){
   switch(index) {
     case F_SIZE:
     case F_UPSPEED:
+    case F_UPLOAD:
+    case F_RATIO:
       sortFinishedListFloat(index, sortOrder);
       break;
     default:

src/FinishedTorrents.h

@@ -16,6 +16,15 @@
  * 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
  */
 
@@ -70,7 +79,9 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     void hideOrShowColumnName();
     void hideOrShowColumnSize();
     void hideOrShowColumnUpSpeed();
-    void hideOrShowColumnLeechers();
+    void hideOrShowColumnSwarm();
+    void hideOrShowColumnPeers();
+    void hideOrShowColumnUpload();
     void hideOrShowColumnRatio();
     void forceRecheck();
 
@@ -82,6 +93,7 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     void deleteTorrent(QString hash);
     void showPropertiesFromHash(QString hash);
     void loadLastSortedColumn();
+    void updateMetadata(QTorrentHandle &h);
 
   signals:
     void torrentMovedFromFinishedList(QString);

src/GUI.h

@@ -16,6 +16,15 @@
  * 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
  */
 
@@ -61,6 +70,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     // Bittorrent
     bittorrent *BTSession;
     QTimer *checkConnect;
+    QTimer *scrapeTimer;
     QList<QPair<QTorrentHandle,QString> > unauthenticated_trackers;
     // GUI related
     QTabWidget *tabs;
@@ -130,9 +140,10 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     void createTrayIcon();
     void updateUnfinishedTorrentNumber(unsigned int nb);
     void updateFinishedTorrentNumber(unsigned int nb);
-    void fullDiskError(QTorrentHandle& h) const;
+    void fullDiskError(QTorrentHandle& h, QString msg) const;
     void handleDownloadFromUrlFailure(QString, QString) const;
     void createSystrayDelayed();
+    void setPaused(QTorrentHandle &h) const;
     // Keyboard shortcuts
     void createKeyboardShortcuts();
     void displayDownTab() const;
@@ -168,6 +179,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     bool initWebUi(QString username, QString password, int port);
     void on_actionIncreasePriority_triggered();
     void on_actionDecreasePriority_triggered();
+    void scrapeTrackers();
     // Options slots
     void on_actionOptions_triggered();
     void OptionsSaved(bool deleteOptions);
@@ -180,6 +192,7 @@ 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:

src/Icons/qBittorrent.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Categories=Qt;Network;P2P
-Comment=V1.3.1
+Comment=V1.5.0
 Exec=qbittorrent %f
 GenericName=Bittorrent client
 GenericName[bg]=Торент клиент

src/MainWindow.ui

@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow" >
-  <property name="geometry" >
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,264 +10,266 @@
     <height>563</height>
    </rect>
   </property>
-  <property name="contextMenuPolicy" >
+  <property name="contextMenuPolicy">
    <enum>Qt::CustomContextMenu</enum>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <widget class="QWidget" name="centralwidget" >
-   <layout class="QVBoxLayout" />
+  <widget class="QWidget" name="centralwidget">
+   <layout class="QVBoxLayout"/>
   </widget>
-  <widget class="QMenuBar" name="menubar" >
-   <property name="geometry" >
+  <widget class="QMenuBar" name="menubar">
+   <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
      <width>914</width>
-     <height>26</height>
+     <height>23</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menu_Edit" >
-    <property name="title" >
+   <widget class="QMenu" name="menu_Edit">
+    <property name="title">
      <string>&amp;Edit</string>
     </property>
-    <addaction name="actionStart_All" />
-    <addaction name="actionPause_All" />
-    <addaction name="separator" />
-    <addaction name="actionStart" />
-    <addaction name="actionPause" />
-    <addaction name="separator" />
-    <addaction name="actionTorrent_Properties" />
-    <addaction name="separator" />
-    <addaction name="actionDelete" />
-    <addaction name="actionDelete_Permanently" />
-    <addaction name="actionDecreasePriority" />
-    <addaction name="actionIncreasePriority" />
+    <addaction name="actionStart_All"/>
+    <addaction name="actionPause_All"/>
+    <addaction name="separator"/>
+    <addaction name="actionStart"/>
+    <addaction name="actionPause"/>
+    <addaction name="separator"/>
+    <addaction name="actionTorrent_Properties"/>
+    <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" >
+   <widget class="QMenu" name="menu_Help">
+    <property name="title">
      <string>&amp;Help</string>
     </property>
-    <addaction name="actionBugReport" />
-    <addaction name="actionWebsite" />
-    <addaction name="actionDocumentation" />
-    <addaction name="actionAbout" />
+    <addaction name="actionBugReport"/>
+    <addaction name="actionWebsite"/>
+    <addaction name="actionDocumentation"/>
+    <addaction name="actionAbout"/>
    </widget>
-   <widget class="QMenu" name="menu_Options" >
-    <property name="title" >
+   <widget class="QMenu" name="menu_Options">
+    <property name="title">
      <string>Options</string>
     </property>
-    <addaction name="actionOptions" />
-    <addaction name="actionShow_console" />
+    <addaction name="actionOptions"/>
+    <addaction name="actionShow_console"/>
    </widget>
-   <widget class="QMenu" name="menu_File" >
-    <property name="title" >
+   <widget class="QMenu" name="menu_File">
+    <property name="title">
      <string>&amp;File</string>
     </property>
-    <addaction name="actionOpen" />
-    <addaction name="actionDownload_from_URL" />
-    <addaction name="actionCreate_torrent" />
-    <addaction name="actionExit" />
+    <addaction name="actionOpen"/>
+    <addaction name="actionDownload_from_URL"/>
+    <addaction name="actionCreate_torrent"/>
+    <addaction name="actionExit"/>
    </widget>
-   <addaction name="menu_File" />
-   <addaction name="menu_Edit" />
-   <addaction name="menu_Options" />
-   <addaction name="menu_Help" />
+   <addaction name="menu_File"/>
+   <addaction name="menu_Edit"/>
+   <addaction name="menu_Options"/>
+   <addaction name="menu_Help"/>
   </widget>
-  <widget class="QToolBar" name="toolBar" >
-   <property name="enabled" >
+  <widget class="QToolBar" name="toolBar">
+   <property name="enabled">
     <bool>true</bool>
    </property>
-   <property name="contextMenuPolicy" >
+   <property name="contextMenuPolicy">
     <enum>Qt::NoContextMenu</enum>
    </property>
-   <property name="movable" >
+   <property name="movable">
     <bool>false</bool>
    </property>
-   <property name="orientation" >
+   <property name="orientation">
     <enum>Qt::Horizontal</enum>
    </property>
-   <property name="iconSize" >
+   <property name="iconSize">
     <size>
      <width>32</width>
      <height>32</height>
     </size>
    </property>
-   <property name="floatable" >
+   <property name="floatable">
     <bool>false</bool>
    </property>
-   <attribute name="toolBarArea" >
+   <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
    </attribute>
-   <attribute name="toolBarBreak" >
+   <attribute name="toolBarBreak">
     <bool>false</bool>
    </attribute>
-   <addaction name="actionOpen" />
-   <addaction name="actionDownload_from_URL" />
-   <addaction name="separator" />
-   <addaction name="actionDelete" />
-   <addaction name="actionDelete_Permanently" />
-   <addaction name="separator" />
-   <addaction name="actionTorrent_Properties" />
-   <addaction name="separator" />
-   <addaction name="actionStart" />
-   <addaction name="actionPause" />
-   <addaction name="separator" />
-   <addaction name="actionStart_All" />
-   <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" />
+   <addaction name="actionOpen"/>
+   <addaction name="actionDownload_from_URL"/>
+   <addaction name="separator"/>
+   <addaction name="actionDelete"/>
+   <addaction name="actionDelete_Permanently"/>
+   <addaction name="separator"/>
+   <addaction name="actionTorrent_Properties"/>
+   <addaction name="separator"/>
+   <addaction name="actionStart"/>
+   <addaction name="actionPause"/>
+   <addaction name="separator"/>
+   <addaction name="actionStart_All"/>
+   <addaction name="actionPause_All"/>
+   <addaction name="separator"/>
+   <addaction name="actionOptions"/>
+   <addaction name="actionDecreasePriority"/>
+   <addaction name="actionIncreasePriority"/>
+   <addaction name="separator"/>
+   <addaction name="actionExit"/>
   </widget>
-  <widget class="QStatusBar" name="statusBar" />
-  <action name="actionOpen" >
-   <property name="text" >
+  <widget class="QStatusBar" name="statusBar"/>
+  <action name="actionOpen">
+   <property name="text">
     <string>Open</string>
    </property>
   </action>
-  <action name="actionExit" >
-   <property name="text" >
+  <action name="actionExit">
+   <property name="text">
     <string>Exit</string>
    </property>
   </action>
-  <action name="actionOptions" >
-   <property name="text" >
+  <action name="actionOptions">
+   <property name="text">
     <string>Preferences</string>
    </property>
   </action>
-  <action name="actionAbout" >
-   <property name="text" >
+  <action name="actionAbout">
+   <property name="text">
     <string>About</string>
    </property>
   </action>
-  <action name="actionStart" >
-   <property name="text" >
+  <action name="actionStart">
+   <property name="text">
     <string>Start</string>
    </property>
   </action>
-  <action name="actionPause" >
-   <property name="text" >
+  <action name="actionPause">
+   <property name="text">
     <string>Pause</string>
    </property>
   </action>
-  <action name="actionDelete" >
-   <property name="text" >
+  <action name="actionDelete">
+   <property name="text">
     <string>Delete</string>
    </property>
   </action>
-  <action name="actionPause_All" >
-   <property name="text" >
+  <action name="actionPause_All">
+   <property name="text">
     <string>Pause All</string>
    </property>
   </action>
-  <action name="actionStart_All" >
-   <property name="text" >
+  <action name="actionStart_All">
+   <property name="text">
     <string>Start All</string>
    </property>
   </action>
-  <action name="actionWebsite" >
-   <property name="text" >
+  <action name="actionWebsite">
+   <property name="text">
     <string>Visit website</string>
    </property>
   </action>
-  <action name="actionDelete_Permanently" >
-   <property name="text" >
+  <action name="actionDelete_Permanently">
+   <property name="text">
     <string>Delete Permanently</string>
    </property>
   </action>
-  <action name="actionTorrent_Properties" >
-   <property name="text" >
+  <action name="actionTorrent_Properties">
+   <property name="text">
     <string>Torrent Properties</string>
    </property>
   </action>
-  <action name="actionDownload_from_URL" >
-   <property name="text" >
+  <action name="actionDownload_from_URL">
+   <property name="text">
     <string>Download from URL</string>
    </property>
   </action>
-  <action name="actionCreate_torrent" >
-   <property name="text" >
+  <action name="actionCreate_torrent">
+   <property name="text">
     <string>Create torrent</string>
    </property>
   </action>
-  <action name="actionPreview_file" >
-   <property name="text" >
+  <action name="actionPreview_file">
+   <property name="text">
     <string>Preview file</string>
    </property>
   </action>
-  <action name="actionClearLog" >
-   <property name="text" >
+  <action name="actionClearLog">
+   <property name="text">
     <string>Clear log</string>
    </property>
   </action>
-  <action name="actionBugReport" >
-   <property name="text" >
+  <action name="actionBugReport">
+   <property name="text">
     <string>Report a bug</string>
    </property>
   </action>
-  <action name="actionSet_upload_limit" >
-   <property name="text" >
+  <action name="actionSet_upload_limit">
+   <property name="text">
     <string>Set upload limit</string>
    </property>
   </action>
-  <action name="actionSet_download_limit" >
-   <property name="text" >
+  <action name="actionSet_download_limit">
+   <property name="text">
     <string>Set download limit</string>
    </property>
   </action>
-  <action name="actionDocumentation" >
-   <property name="text" >
+  <action name="actionDocumentation">
+   <property name="text">
     <string>Documentation</string>
    </property>
   </action>
-  <action name="actionSet_global_download_limit" >
-   <property name="text" >
+  <action name="actionSet_global_download_limit">
+   <property name="text">
     <string>Set global download limit</string>
    </property>
   </action>
-  <action name="actionSet_global_upload_limit" >
-   <property name="text" >
+  <action name="actionSet_global_upload_limit">
+   <property name="text">
     <string>Set global upload limit</string>
    </property>
   </action>
-  <action name="actionDecreasePriority" >
-   <property name="icon" >
-    <iconset resource="icons.qrc" >:/Icons/skin/decrease.png</iconset>
+  <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" >
+   <property name="text">
     <string>Decrease priority</string>
    </property>
-   <property name="visible" >
+   <property name="visible">
     <bool>false</bool>
    </property>
   </action>
-  <action name="actionIncreasePriority" >
-   <property name="icon" >
-    <iconset resource="icons.qrc" >:/Icons/skin/increase.png</iconset>
+  <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" >
+   <property name="text">
     <string>Increase priority</string>
    </property>
-   <property name="visible" >
+   <property name="visible">
     <bool>false</bool>
    </property>
   </action>
-  <action name="actionShow_console" >
-   <property name="icon" >
-    <iconset resource="icons.qrc" >:/Icons/log.png</iconset>
+  <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" >
+   <property name="text">
     <string>Console</string>
    </property>
   </action>
  </widget>
  <resources>
-  <include location="icons.qrc" />
+  <include location="icons.qrc"/>
  </resources>
  <connections/>
 </ui>

src/PreviewListDelegate.h

@@ -16,6 +16,15 @@
  * 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
  */
 

src/PropListDelegate.h

@@ -16,6 +16,15 @@
  * 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
  */
 

src/SearchListDelegate.h

@@ -16,6 +16,15 @@
  * 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
  */
 

src/SearchTab.cpp

@@ -16,6 +16,15 @@
  * 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
  */
 
@@ -47,13 +56,14 @@ SearchTab::SearchTab(SearchEngine *parent) : QWidget()
     
     setLayout(box);
     // Set Search results list model
-    SearchListModel = new QStandardItemModel(0,5);
+    SearchListModel = new QStandardItemModel(0,6);
     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
@@ -65,19 +75,36 @@ SearchTab::SearchTab(SearchEngine *parent) : QWidget()
     connect(resultsBrowser->header(), SIGNAL(sectionPressed(int)), this, SLOT(sortSearchList(int)));
     
     // Load last columns width for search results list
-    if(!loadColWidthSearchList()){
+    if(!loadColWidthResultsList()){
       resultsBrowser->header()->resizeSection(0, 275);
     }
 }
 
-SearchTab::~SearchTab()
-{
-    saveColWidthSearchList();
+SearchTab::~SearchTab() {
     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;
@@ -128,7 +155,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<5; ++col){
+    for(int col=0; col<6; ++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);
     }
@@ -148,7 +175,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<5; ++col){
+    for(int col=0; col<6; ++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);
     }
@@ -157,33 +184,3 @@ 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;
-}

src/SearchTab.h

@@ -16,6 +16,15 @@
  * 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
  */
 
@@ -24,9 +33,13 @@
 
 #include "ui_search.h"
 
+#define ENGINE_URL_COLUMN 4
+#define URL_COLUMN 5
+
 class SearchListDelegate;
 class SearchEngine;
 class QTreeView;
+class QHeaderView;
 class QStandardItemModel;
 
 class SearchTab : public QWidget, public Ui::search_engine
@@ -42,16 +55,17 @@ class SearchTab : public QWidget, public Ui::search_engine
     public:
         SearchTab(SearchEngine *parent);
         ~SearchTab();
-        bool loadColWidthSearchList();
+        bool loadColWidthResultsList();
         QLabel * getCurrentLabel();
         QStandardItemModel * getCurrentSearchListModel();
         QTreeView * getCurrentTreeView();
         void setRowColor(int row, QString color);
+        QHeaderView* header() const;
+
     protected slots:
         void sortSearchList(int index);
         void sortSearchListInt(int index, Qt::SortOrder sortOrder);
         void sortSearchListString(int index, Qt::SortOrder sortOrder);
-        void saveColWidthSearchList() const;
         
 };
 

src/TrackersAdditionDlg.h

@@ -16,6 +16,15 @@
  * 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
  */
 

src/about.ui

@@ -1,8 +1,9 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <author>Christophe Dumez</author>
  <class>AboutDlg</class>
- <widget class="QDialog" name="AboutDlg" >
-  <property name="geometry" >
+ <widget class="QDialog" name="AboutDlg">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -10,65 +11,65 @@
     <height>320</height>
    </rect>
   </property>
-  <property name="minimumSize" >
+  <property name="minimumSize">
    <size>
     <width>504</width>
     <height>320</height>
    </size>
   </property>
-  <property name="maximumSize" >
+  <property name="maximumSize">
    <size>
     <width>504</width>
     <height>320</height>
    </size>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>About qBittorrent</string>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout">
    <item>
-    <layout class="QHBoxLayout" >
+    <layout class="QHBoxLayout">
      <item>
-      <widget class="QLabel" name="logo" >
-       <property name="minimumSize" >
+      <widget class="QLabel" name="logo">
+       <property name="minimumSize">
         <size>
          <width>22</width>
          <height>22</height>
         </size>
        </property>
-       <property name="maximumSize" >
+       <property name="maximumSize">
         <size>
          <width>22</width>
          <height>22</height>
         </size>
        </property>
-       <property name="text" >
+       <property name="text">
         <string/>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QLabel" name="lb_name" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+      <widget class="QLabel" name="lb_name">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="text" >
-        <string>&lt;h3>&lt;b>qBittorrent&lt;/b>&lt;/h3></string>
+       <property name="text">
+        <string>&lt;h3&gt;&lt;b&gt;qBittorrent&lt;/b&gt;&lt;/h3&gt;</string>
        </property>
-       <property name="textFormat" >
+       <property name="textFormat">
         <enum>Qt::RichText</enum>
        </property>
       </widget>
      </item>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
@@ -79,79 +80,90 @@
     </layout>
    </item>
    <item>
-    <widget class="QTabWidget" name="tw_tabs" >
-     <property name="currentIndex" >
+    <widget class="QTabWidget" name="tw_tabs">
+     <property name="currentIndex">
       <number>0</number>
      </property>
-     <widget class="QWidget" name="tab2" >
-      <attribute name="title" >
+     <widget class="QWidget" name="tab2">
+      <attribute name="title">
        <string>About</string>
       </attribute>
-      <widget class="QLabel" name="mascot_lbl" >
-       <property name="geometry" >
+      <widget class="QLabel" name="mascot_lbl">
+       <property name="geometry">
         <rect>
          <x>380</x>
-         <y>50</y>
+         <y>70</y>
          <width>94</width>
          <height>162</height>
         </rect>
        </property>
-       <property name="text" >
+       <property name="text">
         <string/>
        </property>
       </widget>
-      <widget class="QLabel" name="lb_about" >
-       <property name="geometry" >
+      <widget class="QLabel" name="lb_about">
+       <property name="geometry">
         <rect>
          <x>0</x>
-         <y>40</y>
+         <y>30</y>
          <width>481</width>
          <height>102</height>
         </rect>
        </property>
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="text" >
-        <string>A bittorrent client using Qt4 and libtorrent, programmed in C++.&lt;br>
-&lt;br>
-Copyright © 2006 by Christophe Dumez&lt;br>
-&lt;br> &lt;u>Home Page:&lt;/u> &lt;i>http://www.qbittorrent.org&lt;/i>&lt;br></string>
+       <property name="text">
+        <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;A Bittorrent client programmed in C++, based on Qt4 toolkit &lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;and libtorrent-rasterbar. &lt;br /&gt;&lt;br /&gt;Copyright ©2006-2009 Christophe Dumez&lt;br /&gt;&lt;br /&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;Home Page:&lt;/span&gt; &lt;a href=&quot;http://www.qbittorrent.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;http://www.qbittorrent.org&lt;/span&gt;&lt;/a&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
-       <property name="textFormat" >
+       <property name="textFormat">
         <enum>Qt::RichText</enum>
        </property>
-       <property name="alignment" >
+       <property name="scaledContents">
+        <bool>true</bool>
+       </property>
+       <property name="alignment">
         <set>Qt::AlignCenter</set>
        </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+       <property name="openExternalLinks">
+        <bool>true</bool>
+       </property>
       </widget>
      </widget>
-     <widget class="QWidget" name="tab3" >
-      <attribute name="title" >
+     <widget class="QWidget" name="tab3">
+      <attribute name="title">
        <string>Author</string>
       </attribute>
-      <layout class="QVBoxLayout" >
-       <property name="spacing" >
+      <layout class="QVBoxLayout">
+       <property name="spacing">
         <number>6</number>
        </property>
        <item>
-        <widget class="QFrame" name="te_authors" >
-         <layout class="QHBoxLayout" >
-          <property name="spacing" >
+        <widget class="QFrame" name="te_authors">
+         <layout class="QHBoxLayout">
+          <property name="spacing">
            <number>6</number>
           </property>
           <item>
            <spacer>
-            <property name="orientation" >
+            <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeType" >
+            <property name="sizeType">
              <enum>QSizePolicy::Preferred</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
               <height>20</height>
@@ -160,13 +172,13 @@ Copyright © 2006 by Christophe Dumez&lt;br>
            </spacer>
           </item>
           <item>
-           <layout class="QVBoxLayout" >
-            <property name="spacing" >
+           <layout class="QVBoxLayout">
+            <property name="spacing">
              <number>6</number>
             </property>
             <item>
-             <widget class="QLabel" name="label_3" >
-              <property name="font" >
+             <widget class="QLabel" name="label_3">
+              <property name="font">
                <font>
                 <family>Sans Serif</family>
                 <pointsize>9</pointsize>
@@ -177,14 +189,14 @@ Copyright © 2006 by Christophe Dumez&lt;br>
                 <strikeout>false</strikeout>
                </font>
               </property>
-              <property name="text" >
+              <property name="text">
                <string>Name:</string>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QLabel" name="label_4" >
-              <property name="font" >
+             <widget class="QLabel" name="label_4">
+              <property name="font">
                <font>
                 <family>Sans Serif</family>
                 <pointsize>9</pointsize>
@@ -195,14 +207,14 @@ Copyright © 2006 by Christophe Dumez&lt;br>
                 <strikeout>false</strikeout>
                </font>
               </property>
-              <property name="text" >
+              <property name="text">
                <string>Country:</string>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QLabel" name="lbl_birthday" >
-              <property name="font" >
+             <widget class="QLabel" name="lbl_birthday">
+              <property name="font">
                <font>
                 <family>Sans Serif</family>
                 <pointsize>9</pointsize>
@@ -213,14 +225,14 @@ Copyright © 2006 by Christophe Dumez&lt;br>
                 <strikeout>false</strikeout>
                </font>
               </property>
-              <property name="text" >
+              <property name="text">
                <string>Birthday:</string>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QLabel" name="lbl_occupation" >
-              <property name="font" >
+             <widget class="QLabel" name="lbl_occupation">
+              <property name="font">
                <font>
                 <family>Sans Serif</family>
                 <pointsize>9</pointsize>
@@ -231,14 +243,14 @@ Copyright © 2006 by Christophe Dumez&lt;br>
                 <strikeout>false</strikeout>
                </font>
               </property>
-              <property name="text" >
+              <property name="text">
                <string>Occupation:</string>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QLabel" name="label_5" >
-              <property name="font" >
+             <widget class="QLabel" name="label_5">
+              <property name="font">
                <font>
                 <family>Sans Serif</family>
                 <pointsize>9</pointsize>
@@ -249,14 +261,14 @@ Copyright © 2006 by Christophe Dumez&lt;br>
                 <strikeout>false</strikeout>
                </font>
               </property>
-              <property name="text" >
+              <property name="text">
                <string>E-mail:</string>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QLabel" name="label_8" >
-              <property name="font" >
+             <widget class="QLabel" name="label_8">
+              <property name="font">
                <font>
                 <family>Sans Serif</family>
                 <pointsize>9</pointsize>
@@ -267,7 +279,7 @@ Copyright © 2006 by Christophe Dumez&lt;br>
                 <strikeout>false</strikeout>
                </font>
               </property>
-              <property name="text" >
+              <property name="text">
                <string>Home page:</string>
               </property>
              </widget>
@@ -276,13 +288,13 @@ Copyright © 2006 by Christophe Dumez&lt;br>
           </item>
           <item>
            <spacer>
-            <property name="orientation" >
+            <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeType" >
+            <property name="sizeType">
              <enum>QSizePolicy::Preferred</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
               <height>20</height>
@@ -291,48 +303,48 @@ Copyright © 2006 by Christophe Dumez&lt;br>
            </spacer>
           </item>
           <item>
-           <layout class="QVBoxLayout" >
-            <property name="spacing" >
+           <layout class="QVBoxLayout">
+            <property name="spacing">
              <number>6</number>
             </property>
             <item>
-             <widget class="QLabel" name="label_2" >
-              <property name="text" >
+             <widget class="QLabel" name="label_2">
+              <property name="text">
                <string>Christophe Dumez</string>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QLabel" name="label_7" >
-              <property name="text" >
+             <widget class="QLabel" name="label_7">
+              <property name="text">
                <string>France</string>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QLabel" name="label_11" >
-              <property name="text" >
+             <widget class="QLabel" name="label_11">
+              <property name="text">
                <string>03/05/1985</string>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QLabel" name="label_10" >
-              <property name="text" >
+             <widget class="QLabel" name="label_10">
+              <property name="text">
                <string>Student in computer science</string>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QLabel" name="label_6" >
-              <property name="text" >
+             <widget class="QLabel" name="label_6">
+              <property name="text">
                <string>chris@qbittorrent.org</string>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QLabel" name="label_9" >
-              <property name="text" >
+             <widget class="QLabel" name="label_9">
+              <property name="text">
                <string>http://www.dchris.eu</string>
               </property>
              </widget>
@@ -341,10 +353,10 @@ Copyright © 2006 by Christophe Dumez&lt;br>
           </item>
           <item>
            <spacer>
-            <property name="orientation" >
+            <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>40</width>
               <height>20</height>
@@ -357,46 +369,46 @@ Copyright © 2006 by Christophe Dumez&lt;br>
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab4" >
-      <attribute name="title" >
+     <widget class="QWidget" name="tab4">
+      <attribute name="title">
        <string>Thanks to</string>
       </attribute>
-      <layout class="QVBoxLayout" >
-       <property name="spacing" >
+      <layout class="QVBoxLayout">
+       <property name="spacing">
         <number>6</number>
        </property>
        <item>
-        <widget class="QTextBrowser" name="te_thanks" />
+        <widget class="QTextBrowser" name="te_thanks"/>
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab5" >
-      <attribute name="title" >
+     <widget class="QWidget" name="tab5">
+      <attribute name="title">
        <string>Translation</string>
       </attribute>
-      <layout class="QVBoxLayout" >
-       <property name="spacing" >
+      <layout class="QVBoxLayout">
+       <property name="spacing">
         <number>6</number>
        </property>
        <item>
-        <widget class="QTextBrowser" name="te_translation" >
-         <property name="lineWrapMode" >
+        <widget class="QTextBrowser" name="te_translation">
+         <property name="lineWrapMode">
           <enum>QTextEdit::NoWrap</enum>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab1" >
-      <attribute name="title" >
+     <widget class="QWidget" name="tab1">
+      <attribute name="title">
        <string>License</string>
       </attribute>
-      <layout class="QVBoxLayout" >
-       <property name="spacing" >
+      <layout class="QVBoxLayout">
+       <property name="spacing">
         <number>6</number>
        </property>
        <item>
-        <widget class="QTextBrowser" name="te_license" />
+        <widget class="QTextBrowser" name="te_license"/>
        </item>
       </layout>
      </widget>
@@ -404,7 +416,7 @@ Copyright © 2006 by Christophe Dumez&lt;br>
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
  <resources/>
  <connections/>
 </ui>

src/about_imp.h

@@ -16,6 +16,15 @@
  * 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
  */
 
@@ -37,8 +46,8 @@ class about : public QDialog, private Ui::AboutDlg{
       setupUi(this);
       setAttribute(Qt::WA_DeleteOnClose);
       // Set icons
-      logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/qbittorrent22.png")));
-      mascot_lbl->setPixmap(QPixmap(QString::fromUtf8(":/Icons/mascot.png")));
+      logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/qbittorrent22.png")));
+      mascot_lbl->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/mascot.png")));
       //Title
       lb_name->setText(QString::fromUtf8("<b><h1>")+tr("qBittorrent")+QString::fromUtf8(" "VERSION"</h1></b>"));
       // Thanks
@@ -82,7 +91,19 @@ class about : public QDialog, private Ui::AboutDlg{
       te_translation->scrollToAnchor(QString::fromUtf8("top"));
       // License
       te_license->append(QString::fromUtf8("<a name='top'></a>"));
-      te_license->append(QString::fromUtf8("<center><b>GNU GENERAL PUBLIC LICENSE</b></center><br>\
+      te_license->append(QString::fromUtf8("qBittorrent is licensed under the GNU General Public License version 2 with the\
+addition of the following special exception:\
+<br><br>\
+<i>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.</i>\
+<br><br>\
+          <center><b>GNU GENERAL PUBLIC LICENSE</b></center><br>\
           <center>Version 2, June 1991</center><br>\
           Copyright (C) 1989, 1991 Free Software Foundation, Inc.<br>\
           51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA<br>\

src/addTorrentDialog.ui

@@ -1,68 +1,60 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>addTorrentDialog</class>
- <widget class="QDialog" name="addTorrentDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="addTorrentDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>511</width>
-    <height>441</height>
+    <height>461</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Torrent addition dialog</string>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QLabel" name="fileNameLbl" >
-     <property name="text" >
+    <widget class="QLabel" name="fileNameLbl">
+     <property name="text">
       <string/>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="Line" name="line" >
-     <property name="orientation" >
+    <widget class="Line" name="line">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QLabel" name="savePathLbl" >
-     <property name="font" >
+    <widget class="QLabel" name="savePathLbl">
+     <property name="font">
       <font>
        <weight>75</weight>
        <bold>true</bold>
       </font>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>Save path:</string>
      </property>
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
-     <property name="leftMargin" >
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
+     <property name="margin">
       <number>0</number>
      </property>
      <item>
-      <widget class="QLineEdit" name="savePathTxt" />
+      <widget class="QLineEdit" name="savePathTxt"/>
      </item>
      <item>
-      <widget class="QToolButton" name="browseButton" >
-       <property name="text" >
+      <widget class="QToolButton" name="browseButton">
+       <property name="text">
         <string>...</string>
        </property>
       </widget>
@@ -70,66 +62,27 @@
     </layout>
    </item>
    <item>
-    <widget class="QLabel" name="torrentContentLbl" >
-     <property name="font" >
-      <font>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="text" >
-      <string>Torrent content:</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QTreeView" name="torrentContentList" >
-     <property name="contextMenuPolicy" >
-      <enum>Qt::CustomContextMenu</enum>
-     </property>
-     <property name="editTriggers" >
-      <set>QAbstractItemView::AllEditTriggers</set>
-     </property>
-     <property name="selectionMode" >
-      <enum>QAbstractItemView::ExtendedSelection</enum>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" >
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="collapseAllButton" >
-       <property name="text" >
-        <string>Collapse all</string>
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Torrent size:</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="expandAllButton" >
-       <property name="text" >
-        <string>Expand all</string>
+      <widget class="QLabel" name="lbl_torrent_size">
+       <property name="text">
+        <string>Unknown</string>
        </property>
       </widget>
      </item>
      <item>
-      <spacer>
-       <property name="orientation" >
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
@@ -140,42 +93,77 @@
     </layout>
    </item>
    <item>
-    <widget class="QCheckBox" name="checkIncrementalDL" >
-     <property name="text" >
-      <string>Download in correct order (slower but good for previewing)</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="addInPause" >
-     <property name="text" >
-      <string>Add to download list in paused state</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <property name="leftMargin" >
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
-      <number>0</number>
-     </property>
+    <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <spacer>
-       <property name="orientation" >
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Free disk space:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="lbl_disk_space">
+       <property name="text">
+        <string>Unknown</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_space_msg">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="torrentContentLbl">
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Torrent content:</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QTreeView" name="torrentContentList">
+     <property name="contextMenuPolicy">
+      <enum>Qt::CustomContextMenu</enum>
+     </property>
+     <property name="editTriggers">
+      <set>QAbstractItemView::AllEditTriggers</set>
+     </property>
+     <property name="selectionMode">
+      <enum>QAbstractItemView::ExtendedSelection</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout">
+     <item>
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
@@ -184,25 +172,89 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="OkButton" >
-       <property name="text" >
+      <widget class="QPushButton" name="collapseAllButton">
+       <property name="text">
+        <string>Collapse all</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="expandAllButton">
+       <property name="text">
+        <string>Expand all</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="checkIncrementalDL">
+     <property name="text">
+      <string>Download in sequential order (slower but good for previewing)</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="addInPause">
+     <property name="text">
+      <string>Add to download list in paused state</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout">
+     <property name="spacing">
+      <number>6</number>
+     </property>
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="OkButton">
+       <property name="text">
         <string>Add</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="CancelButton" >
-       <property name="text" >
+      <widget class="QPushButton" name="CancelButton">
+       <property name="text">
         <string>Cancel</string>
        </property>
       </widget>
      </item>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
@@ -213,23 +265,23 @@
     </layout>
    </item>
   </layout>
-  <action name="actionIgnored" >
-   <property name="text" >
+  <action name="actionIgnored">
+   <property name="text">
     <string>Ignored</string>
    </property>
   </action>
-  <action name="actionNormal" >
-   <property name="text" >
+  <action name="actionNormal">
+   <property name="text">
     <string>Normal</string>
    </property>
   </action>
-  <action name="actionHigh" >
-   <property name="text" >
+  <action name="actionHigh">
+   <property name="text">
     <string>High</string>
    </property>
   </action>
-  <action name="actionMaximum" >
-   <property name="text" >
+  <action name="actionMaximum">
+   <property name="text">
     <string>Maximum</string>
    </property>
   </action>

src/allocationDlg.h

@@ -16,6 +16,15 @@
  * 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
  */
 

src/arborescence.h

@@ -16,6 +16,15 @@
  * 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
  */
 
@@ -28,232 +37,234 @@
 #include "misc.h"
 
 class torrent_file {
-  private:
-    torrent_file *parent;
-    bool is_dir;
-    QString rel_path;
-    QList<const torrent_file*> children;
-    size_type size;
-    float progress;
-    int priority;
-    int index; // Index in torrent_info
+private:
+  torrent_file *parent;
+  bool is_dir;
+  QString rel_path;
+  QList<const torrent_file*> children;
+  size_type size;
+  float progress;
+  int priority;
+  int index; // Index in torrent_info
 
-  public:
-    torrent_file(torrent_file *parent, QString path, bool dir, size_type size=0, int index=-1, float progress=0., int priority=1): parent(parent), is_dir(dir), size(size), progress(progress), priority(priority), index(index){
-      qDebug("created a file with index %d", index);
-      rel_path = QDir::cleanPath(path);
-      if(parent) {
-        parent->updateProgress();
-        parent->updatePriority(priority);
-      }
+public:
+  torrent_file(torrent_file *parent, QString path, bool dir, size_type size=0, int index=-1, float progress=0., int priority=1): parent(parent), is_dir(dir), size(size), progress(progress), priority(priority), index(index){
+    qDebug("created a file with index %d", index);
+    rel_path = QDir::cleanPath(path);
+    Q_ASSERT(progress >= 0.);
+    Q_ASSERT(progress <= 1.);
+    if(parent) {
+      parent->updateProgress();
+      parent->updatePriority(priority);
     }
+  }
 
-    ~torrent_file() {
-      qDeleteAll(children);
-    }
+  ~torrent_file() {
+    qDeleteAll(children);
+  }
 
-    QString path() const {
-      return rel_path;
-    }
+  QString path() const {
+    return rel_path;
+  }
 
-    QString name() const {
-      return rel_path.split(QDir::separator()).last();
-    }
+  QString name() const {
+    return rel_path.split(QDir::separator()).last();
+  }
 
-    void updateProgress() {
-      Q_ASSERT(is_dir);
-      if(children.isEmpty()) {
-        progress = 0.;
-        return;
-      }
-      float wanted = 0.;
-      float done = 0.;
-      foreach(const torrent_file *child, children) {
-        wanted += child->getSize();
-        done += child->getSize()*child->getProgress();
-      }
-      progress = done / wanted;
-      Q_ASSERT(progress >= 0.);
-      Q_ASSERT(progress <= 1.);
+  void updateProgress() {
+    Q_ASSERT(is_dir);
+    if(children.isEmpty()) {
+      progress = 0.;
+      return;
     }
+    double wanted = 0.;
+    double done = 0.;
+    foreach(const torrent_file *child, children) {
+      wanted += child->getSize();
+      done += child->getSize()*child->getProgress();
+    }
+    progress = done / wanted;
+    Q_ASSERT(progress >= 0.);
+    Q_ASSERT(progress <= 1.);
+  }
 
-    void updatePriority(int prio) {
-      Q_ASSERT(is_dir);
-      foreach(const torrent_file *child, children) {
-        if(child->getPriority() != prio) return;
-      }
-      priority = prio;
+  void updatePriority(int prio) {
+    Q_ASSERT(is_dir);
+    foreach(const torrent_file *child, children) {
+      if(child->getPriority() != prio) return;
     }
+    priority = prio;
+  }
 
-    int getPriority() const {
-      return priority;
-    }
+  int getPriority() const {
+    return priority;
+  }
 
-    size_type getSize() const {
-      return size;
-    }
+  size_type getSize() const {
+    return size;
+  }
 
-    float getProgress() const {
-      return progress;
-    }
+  float getProgress() const {
+    return progress;
+  }
 
-    int getIndex() const {
-      return index;
-    }
+  int getIndex() const {
+    return index;
+  }
 
-    bool isDir() const {
-      return is_dir;
-    }
+  bool isDir() const {
+    return is_dir;
+  }
 
-    bool hasChildren() const {
-      return (!children.isEmpty());
-    }
+  bool hasChildren() const {
+    return (!children.isEmpty());
+  }
 
-    QList<const torrent_file*> getChildren() const {
-      return children;
-    }
+  QList<const torrent_file*> getChildren() const {
+    return children;
+  }
 
-    const torrent_file* getChild(QString fileName) const {
-      Q_ASSERT(is_dir);
-      foreach(const torrent_file *f, children) {
-        if(f->name() == fileName) return f;
-      }
-      return 0;
+  const torrent_file* getChild(QString fileName) const {
+    Q_ASSERT(is_dir);
+    foreach(const torrent_file *f, children) {
+      if(f->name() == fileName) return f;
     }
+    return 0;
+  }
 
-    void addBytes(size_type b) {
-      size += b;
-      if(parent)
-        parent->addBytes(b);
-    }
+  void addBytes(size_type b) {
+    size += b;
+    if(parent)
+      parent->addBytes(b);
+  }
 
-    torrent_file* addChild(QString fileName, bool dir, size_type size=0, int index = -1, float progress=0., int priority=1) {
-      Q_ASSERT(is_dir);
-      qDebug("Adding a new child of size: %ld", (long)size);
-      torrent_file *f = new torrent_file(this, QDir::cleanPath(rel_path+QDir::separator()+fileName), dir, size, index, progress, priority);
-      children << f;
-      if(size) {
-        addBytes(size);
-      }
-      return f;
+  torrent_file* addChild(QString fileName, bool dir, size_type size=0, int index = -1, float progress=0., int priority=1) {
+    Q_ASSERT(is_dir);
+    qDebug("Adding a new child of size: %ld", (long)size);
+    torrent_file *f = new torrent_file(this, QDir::cleanPath(rel_path+QDir::separator()+fileName), dir, size, index, progress, priority);
+    children << f;
+    if(size) {
+      addBytes(size);
     }
+    return f;
+  }
 
-    bool removeFromFS(QString saveDir) const {
-      QString full_path = saveDir + QDir::separator() + rel_path;
-      if(!QFile::exists(full_path)) {
-        qDebug("%s does not exist, no need to remove it", full_path.toUtf8().data());
-        return true;
-      }
-      bool success = true;
-      qDebug("We have %d children", children.size());
-      foreach(const torrent_file *f, children) {
-        bool s = f->removeFromFS(saveDir);
-        success = s && success;
-      }
-      if(is_dir) {
-        qDebug("trying to remove directory: %s", full_path.toUtf8().data());
-        QDir dir(full_path);
-        dir.rmdir(full_path);
-      } else {
-        qDebug("trying to remove file: %s", full_path.toUtf8().data());
-        bool s = QFile::remove(full_path);
-        success = s && success;
-      }
-      return success;
+  bool removeFromFS(QString saveDir) const {
+    QString full_path = saveDir + QDir::separator() + rel_path;
+    if(!QFile::exists(full_path)) {
+      qDebug("%s does not exist, no need to remove it", full_path.toLocal8Bit().data());
+      return true;
     }
+    bool success = true;
+    qDebug("We have %d children", children.size());
+    foreach(const torrent_file *f, children) {
+      bool s = f->removeFromFS(saveDir);
+      success = s && success;
+    }
+    if(is_dir) {
+      qDebug("trying to remove directory: %s", full_path.toLocal8Bit().data());
+      QDir dir(full_path);
+      dir.rmdir(full_path);
+    } else {
+      qDebug("trying to remove file: %s", full_path.toLocal8Bit().data());
+      bool s = QFile::remove(full_path);
+      success = s && success;
+    }
+    return success;
+  }
 };
 
 class arborescence {
-  private:
-    torrent_file *root;
+private:
+  torrent_file *root;
 
-  public:
-    arborescence(boost::intrusive_ptr<torrent_info> t) {
-      torrent_info::file_iterator fi = t->begin_files();
-      if(t->num_files() > 1) {
-        root = new torrent_file(0, misc::toQString(t->name()), true);
-      } else {
-        // XXX: Will crash if there is no file in torrent
-        root = new torrent_file(0, misc::toQString(t->name()), false, fi->size, 0);
-        return;
-      }
-      int i = 0;
-      while(fi != t->end_files()) {
-        QString path = QDir::cleanPath(misc::toQString(fi->path.string()));
-        addFile(path, fi->size, i);
-        fi++;
-        ++i;
-      }
-      qDebug("real size: %ld, tree size: %ld", (long)t->total_size(), (long)root->getSize());
-      Q_ASSERT(root->getSize() == t->total_size());
+public:
+  arborescence(boost::intrusive_ptr<torrent_info> t) {
+    torrent_info::file_iterator fi = t->begin_files();
+    if(t->num_files() > 1) {
+      root = new torrent_file(0, misc::toQString(t->name()), true);
+    } else {
+      // XXX: Will crash if there is no file in torrent
+      root = new torrent_file(0, misc::toQString(t->name()), false, fi->size, 0);
+      return;
     }
-
-    arborescence(torrent_info const& t, std::vector<size_type> fp, int *prioritiesTab) {
-      torrent_info::file_iterator fi = t.begin_files();
-      if(t.num_files() > 1) {
-        qDebug("More than one file in the torrent, setting a folder as root");
-        root = new torrent_file(0, misc::toQString(t.name()), true);
-      } else {
-        // XXX: Will crash if there is no file in torrent
-        qDebug("one file in the torrent, setting it as root with index 0");
-        root = new torrent_file(0, misc::toQString(t.name()), false, fi->size, 0, ((float)fp[0])/t.file_at(0).size, prioritiesTab[0]);
-        return;
-      }
-      int i = 0;
-      while(fi != t.end_files()) {
-        QString path = QDir::cleanPath(misc::toQString(fi->path.string()));
-        addFile(path, fi->size, i, ((float)fp[i])/t.file_at(i).size, prioritiesTab[i]);
-        fi++;
-        ++i;
-      }
-      qDebug("real size: %ld, tree size: %ld", (long)t.total_size(), (long)root->getSize());
-      Q_ASSERT(root->getSize() == t.total_size());
+    int i = 0;
+    while(fi != t->end_files()) {
+      QString path = QDir::cleanPath(misc::toQString(fi->path.string()));
+      addFile(path, fi->size, i);
+      fi++;
+      ++i;
     }
+    qDebug("real size: %ld, tree size: %ld", (long)t->total_size(), (long)root->getSize());
+    Q_ASSERT(root->getSize() == t->total_size());
+  }
 
-    ~arborescence() {
-      delete root;
+  arborescence(torrent_info const& t, std::vector<size_type> fp, std::vector<int> files_priority) {
+    torrent_info::file_iterator fi = t.begin_files();
+    if(t.num_files() > 1) {
+      qDebug("More than one file in the torrent, setting a folder as root");
+      root = new torrent_file(0, misc::toQString(t.name()), true);
+    } else {
+      // XXX: Will crash if there is no file in torrent
+      qDebug("one file in the torrent, setting it as root with index 0");
+      root = new torrent_file(0, misc::toQString(t.name()), false, fi->size, 0, ((double)fp[0])/t.file_at(0).size, files_priority.at(0));
+      return;
     }
-
-    torrent_file* getRoot() const {
-      return root;
+    int i = 0;
+    while(fi != t.end_files()) {
+      QString path = QDir::cleanPath(misc::toQString(fi->path.string()));
+      addFile(path, fi->size, i, ((double)fp[i])/t.file_at(i).size, files_priority.at(i));
+      fi++;
+      ++i;
     }
+    qDebug("real size: %ld, tree size: %ld", (long)t.total_size(), (long)root->getSize());
+    Q_ASSERT(root->getSize() == t.total_size());
+  }
 
-    bool removeFromFS(QString saveDir) {
-      if(!QFile::exists(saveDir+QDir::separator()+root->path())) return true;
-      bool success = root->removeFromFS(saveDir);
-      QDir root_dir(root->path());
-      root_dir.rmdir(saveDir+QDir::separator()+root->path());
-      return success;
-    }
+  ~arborescence() {
+    delete root;
+  }
 
-  protected:
-    void addFile(QString path, size_type file_size, int index, float progress=0., int priority=1) {
-      Q_ASSERT(root->isDir());
-      path = QDir::cleanPath(path);
-      //Q_ASSERT(path.startsWith(root->path()));
-      QString relative_path = path.remove(0, root->path().size());
-      if(relative_path.at(0) ==QDir::separator())
-        relative_path.remove(0, 1);
-      QStringList fileNames = relative_path.split(QDir::separator());
-      torrent_file *dad = root;
-      unsigned int nb_i = 0;
-      unsigned int size = fileNames.size();
-      foreach(const QString &fileName, fileNames) {
-        ++nb_i;
-        if(fileName == ".") continue;
-        const torrent_file* child = dad->getChild(fileName);
-        if(!child) {
-          if(nb_i != size) {
-            // Folder
-            child = dad->addChild(fileName, true);
-          } else {
-            // File
-            child = dad->addChild(fileName, false, file_size, index, progress, priority);
-          }
+  torrent_file* getRoot() const {
+    return root;
+  }
+
+  bool removeFromFS(QString saveDir) {
+    if(!QFile::exists(saveDir+QDir::separator()+root->path())) return true;
+    bool success = root->removeFromFS(saveDir);
+    QDir root_dir(root->path());
+    root_dir.rmdir(saveDir+QDir::separator()+root->path());
+    return success;
+  }
+
+protected:
+  void addFile(QString path, size_type file_size, int index, float progress=0., int priority=1) {
+    Q_ASSERT(root->isDir());
+    path = QDir::cleanPath(path);
+    //Q_ASSERT(path.startsWith(root->path()));
+    QString relative_path = path.remove(0, root->path().size());
+    if(relative_path.at(0) ==QDir::separator())
+      relative_path.remove(0, 1);
+    QStringList fileNames = relative_path.split(QDir::separator());
+    torrent_file *dad = root;
+    unsigned int nb_i = 0;
+    unsigned int size = fileNames.size();
+    foreach(const QString &fileName, fileNames) {
+      ++nb_i;
+      if(fileName == ".") continue;
+      const torrent_file* child = dad->getChild(fileName);
+      if(!child) {
+        if(nb_i != size) {
+          // Folder
+          child = dad->addChild(fileName, true);
+        } else {
+          // File
+          child = dad->addChild(fileName, false, file_size, index, progress, priority);
         }
-        dad = (torrent_file*)child;
       }
+      dad = (torrent_file*)child;
     }
+  }
 };
 
 #endif

src/bittorrent.h

@@ -16,6 +16,15 @@
  * 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 __BITTORRENT_H__
@@ -51,6 +60,7 @@ class bittorrent : public QObject {
     bool DHTEnabled;
     QPointer<downloadThread> downloader;
     QString defaultSavePath;
+    QString defaultTempPath;
     QHash<QString, QHash<QString, QString> > trackersErrors;
     QStringList consoleMessages;
     QStringList peerBanMessages;
@@ -58,7 +68,7 @@ class bittorrent : public QObject {
     bool addInPause;
     int maxConnecsPerTorrent;
     int maxUploadsPerTorrent;
-    float max_ratio;
+    float ratio_limit;
     bool UPnPEnabled;
     bool NATPMPEnabled;
     bool LSDEnabled;
@@ -66,6 +76,7 @@ class bittorrent : public QObject {
     QString filterPath;
     bool queueingEnabled;
     QStringList url_skippingDlg;
+    QHash<QString, QString> savepath_fromurl;
 
   protected:
     QString getSavePath(QString hash);
@@ -97,19 +108,22 @@ class bittorrent : public QObject {
     QStringList getConsoleMessages() const;
     QStringList getPeerBanMessages() const;
     qlonglong getETA(QString hash) const;
+    bool useTemporaryFolder() const;
+    QString getDefaultSavePath() const;
 
   public slots:
     QTorrentHandle addTorrent(QString path, bool fromScanDir = false, QString from_url = QString(), bool resumed = false);
+    QTorrentHandle addMagnetUri(QString magnet_uri, bool resumed=false);
     void loadSessionState();
     void saveSessionState();
     void downloadFromUrl(QString url);
-    void downloadFromURLList(const QStringList& url_list);
     void deleteTorrent(QString hash, bool permanent = false);
+    void startUpTorrents();
     /* Needed by Web UI */
     void pauseAllTorrents();
-    void resumeAllTorrents();
     void pauseTorrent(QString hash);
     void resumeTorrent(QString hash);
+    void resumeAllTorrents();
     /* End Web UI */
     void saveDHTEntry();
     void preAllocateAllFiles(bool b);
@@ -119,15 +133,13 @@ class bittorrent : public QObject {
     void enableIPFilter(QString filter);
     void disableIPFilter();
     void setQueueingEnabled(bool enable);
-    void resumeUnfinishedTorrents();
-    void saveTorrentPriority(QString hash, int prio);
     void saveTorrentSpeedLimits(QString hash);
     void loadTorrentSpeedLimits(QString hash);
     void handleDownloadFailure(QString url, QString reason);
     void loadWebSeeds(QString fileHash);
     void increaseDlTorrentPriority(QString hash);
     void decreaseDlTorrentPriority(QString hash);
-    void downloadUrlAndSkipDialog(QString);
+    void downloadUrlAndSkipDialog(QString url, QString save_path=QString::null);
     // Session configuration - Setters
     void setListeningPortsRange(std::pair<unsigned short, unsigned short> ports);
     void setMaxConnections(int maxConnec);
@@ -142,6 +154,7 @@ class bittorrent : public QObject {
     void setSessionSettings(session_settings sessionSettings);
     void startTorrentsInPause(bool b);
     void setDefaultSavePath(QString savepath);
+    void setDefaultTempPath(QString temppath);
     void applyEncryptionSettings(pe_settings se);
     void loadFilesPriorities(QTorrentHandle& h);
     void setDownloadLimit(QString hash, long val);
@@ -152,13 +165,14 @@ class bittorrent : public QObject {
     bool enableDHT(bool b);
     void addConsoleMessage(QString msg, QColor color=QApplication::palette().color(QPalette::WindowText));
     void addPeerBanMessage(QString msg, bool from_ipfilter);
+    void processDownloadedFile(QString, QString);
+    void saveTrackerFile(QString hash);
+    void addMagnetSkipAddDlg(QString uri);
 
   protected slots:
     void scanDirectory(QString);
     void readAlerts();
-    void processDownloadedFile(QString, QString);
-    bool loadTrackerFile(QString hash);
-    void saveTrackerFile(QString hash);
+    void loadTrackerFile(QString hash);
     void deleteBigRatios();
 
   signals:
@@ -167,13 +181,15 @@ class bittorrent : public QObject {
     void pausedTorrent(QTorrentHandle& h);
     void resumedTorrent(QTorrentHandle& h);
     void finishedTorrent(QTorrentHandle& h);
-    void fullDiskError(QTorrentHandle& h);
+    void fullDiskError(QTorrentHandle& h, QString msg);
     void trackerError(QString hash, QString time, QString msg);
     void trackerAuthenticationRequired(QTorrentHandle& h);
     void newDownloadedTorrent(QString path, QString url);
     void updateFileSize(QString hash);
     void downloadFromUrlFailure(QString url, QString reason);
     void torrentFinishedChecking(QTorrentHandle& h);
+    void metadataReceived(QTorrentHandle &h);
+    void torrentPaused(QTorrentHandle &h);
 };
 
 #endif

src/console.ui

@@ -13,7 +13,7 @@
    <string>qBittorrent console</string>
   </property>
   <property name="windowIcon" >
-   <iconset resource="icons.qrc" >:/Icons/log.png</iconset>
+	  <iconset resource="icons.qrc" >:/Icons/oxygen/log.png</iconset>
   </property>
   <layout class="QVBoxLayout" >
    <item>
@@ -26,7 +26,7 @@
        <string>General</string>
       </attribute>
       <attribute name="icon" >
-       <iconset resource="icons.qrc" >:/Icons/log.png</iconset>
+	      <iconset resource="icons.qrc" >:/Icons/oxygen/log.png</iconset>
       </attribute>
       <layout class="QVBoxLayout" >
        <item>

src/console_imp.h

@@ -16,6 +16,15 @@
  * 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
  */