- Removed rc2 from version

- Cleaned up libMagick compilation flags detection
- Minor fixes to About dialog
- Updated language files
- Fixed French translation

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

Changelog

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

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.toUtf8().data(), adv_ver.toUtf8().data());
 		return true;
 	}
 };

src/FinishedListDelegate.h

@@ -44,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
@@ -60,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;
@@ -72,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

@@ -46,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);
@@ -88,7 +92,9 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
   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()));
 }
 
@@ -115,7 +121,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()) {
@@ -174,6 +182,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;
 }
@@ -208,7 +233,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) { 
@@ -221,6 +246,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");
 }
 
@@ -245,22 +275,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;
     }
@@ -269,8 +302,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))));
@@ -294,7 +330,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"));
 }
 
@@ -350,12 +386,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();
@@ -399,8 +436,7 @@ void FinishedTorrents::displayFinishedListMenu(const QPoint& pos){
   myFinishedListMenu.addAction(actionBuy_it);
 
   // Call menu
-  // XXX: why mapToGlobal() is not enough?
-  myFinishedListMenu.exec(mapToGlobal(pos)+QPoint(10,58));
+  myFinishedListMenu.exec(QCursor::pos());
 }
 
 
@@ -435,12 +471,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
@@ -463,8 +499,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() {
@@ -490,9 +534,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;
@@ -526,8 +570,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;
@@ -551,6 +601,7 @@ void FinishedTorrents::toggleFinishedListSortOrder(int index) {
     case F_SIZE:
     case F_UPSPEED:
     case F_RATIO:
+    case F_UPLOAD:
       sortFinishedListFloat(index, sortOrder);
       break;
     default:
@@ -575,6 +626,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

@@ -79,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();
 

src/GUI.cpp

@@ -99,14 +99,14 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
     qDebug("Info: System tray unavailable");
   }
   // Setting icons
-  this->setWindowIcon(QIcon(QString::fromUtf8(":/Icons/qbittorrent32.png")));
+  this->setWindowIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png")));
   actionOpen->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/open.png")));
   actionExit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/exit.png")));
   actionDownload_from_URL->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/url.png")));
   actionOptions->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/settings.png")));
   actionAbout->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/info.png")));
-  actionWebsite->setIcon(QIcon(QString::fromUtf8(":/Icons/qbittorrent32.png")));
-  actionBugReport->setIcon(QIcon(QString::fromUtf8(":/Icons/newmsg.png")));
+  actionWebsite->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png")));
+  actionBugReport->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/bug.png")));
   actionStart->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/play.png")));
   actionPause->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/pause.png")));
   actionDelete->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/delete.png")));
@@ -132,7 +132,7 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
   options = new options_imp(this);
   connect(options, SIGNAL(status_changed(bool)), this, SLOT(OptionsSaved(bool)));
   BTSession = new bittorrent();
-  connect(BTSession, SIGNAL(fullDiskError(QTorrentHandle&)), this, SLOT(fullDiskError(QTorrentHandle&)));
+  connect(BTSession, SIGNAL(fullDiskError(QTorrentHandle&, QString)), this, SLOT(fullDiskError(QTorrentHandle&, QString)));
   connect(BTSession, SIGNAL(finishedTorrent(QTorrentHandle&)), this, SLOT(finishedTorrent(QTorrentHandle&)));
   connect(BTSession, SIGNAL(addedTorrent(QTorrentHandle&)), this, SLOT(addedTorrent(QTorrentHandle&)));
   connect(BTSession, SIGNAL(pausedTorrent(QTorrentHandle&)), this, SLOT(pausedTorrent(QTorrentHandle&)));
@@ -249,6 +249,9 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
   if(!settings.value(QString::fromUtf8("Preferences/General/StartMinimized"), false).toBool()) {
     show();
   }
+  scrapeTimer = new QTimer(this);
+  connect(scrapeTimer, SIGNAL(timeout()), this, SLOT(scrapeTrackers()));
+  scrapeTimer->start(20000);
   qDebug("GUI Built");
 }
 
@@ -260,6 +263,8 @@ GUI::~GUI() {
   BTSession->saveDHTEntry();
   BTSession->saveSessionState();
   BTSession->saveFastResumeData();
+  scrapeTimer->stop();
+  delete scrapeTimer;
   delete dlSpeedLbl;
   delete upSpeedLbl;
   delete ratioLbl;
@@ -319,6 +324,16 @@ void GUI::displayRSSTab(bool enable) {
   }
 }
 
+void GUI::scrapeTrackers() {
+  std::vector<torrent_handle> torrents = BTSession->getTorrents();
+  std::vector<torrent_handle>::iterator torrentIT;
+  for(torrentIT = torrents.begin(); torrentIT != torrents.end(); torrentIT++) {
+    QTorrentHandle h = QTorrentHandle(*torrentIT);
+    if(!h.is_valid()) continue;
+    h.scrape_tracker();
+  }
+}
+
 void GUI::updateRatio() {
   // Update ratio info
   float ratio = 1.;
@@ -418,15 +433,15 @@ void GUI::checkedTorrent(QTorrentHandle& h) const {
 }
 
 // Notification when disk is full
-void GUI::fullDiskError(QTorrentHandle& h) const {
+void GUI::fullDiskError(QTorrentHandle& h, QString msg) const {
   QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
   bool useNotificationBalloons = settings.value(QString::fromUtf8("Preferences/General/NotificationBaloons"), true).toBool();
   if(systrayIntegration && useNotificationBalloons) {
-    myTrayIcon->showMessage(tr("I/O Error", "i.e: Input/Output Error"), tr("An error occured when trying to read or write %1. The disk is probably full, download has been paused", "e.g: An error occured when trying to read or write xxx.avi. The disk is probably full, download has been paused").arg(h.name()), QSystemTrayIcon::Critical, TIME_TRAY_BALLOON);
+    myTrayIcon->showMessage(tr("I/O Error", "i.e: Input/Output Error"), tr("An I/O error occured for torrent %1.\n Reason: %2", "e.g: An error occured for torrent xxx.avi.\n Reason: disk is full.").arg(h.name()).arg(msg), QSystemTrayIcon::Critical, TIME_TRAY_BALLOON);
   }
   // Download will be paused by libtorrent. Updating GUI information accordingly
   QString hash = h.hash();
-  qDebug("Full disk error, pausing torrent %s", hash.toUtf8().data());
+  qDebug("Full disk error, pausing torrent %s", hash.toLocal8Bit().data());
   if(h.is_seed()) {
     // In finished list
     qDebug("Automatically paused torrent was in finished list");
@@ -670,7 +685,8 @@ void GUI::closeEvent(QCloseEvent *e) {
   bool goToSystrayOnExit = settings.value(QString::fromUtf8("Preferences/General/CloseToTray"), false).toBool();
   if(!force_exit && systrayIntegration && goToSystrayOnExit && !this->isHidden()) {
     hide();
-    e->ignore();
+    //e->ignore();
+    e->accept();
     return;
   }
   if(settings.value(QString::fromUtf8("Preferences/General/ExitConfirm"), true).toBool() && downloadingTorrentTab->getNbTorrentsInList()) {
@@ -729,8 +745,7 @@ void GUI::dropEvent(QDropEvent *event) {
   if(event->mimeData()->hasUrls()) {
     QList<QUrl> urls = event->mimeData()->urls();
     foreach(const QUrl &url, urls) {
-      QString tmp = url.toString();
-      tmp.trimmed();
+      QString tmp = url.toString().trimmed();
       if(!tmp.isEmpty())
         files << url.toString();
     }
@@ -742,7 +757,7 @@ void GUI::dropEvent(QDropEvent *event) {
   bool useTorrentAdditionDialog = settings.value(QString::fromUtf8("Preferences/Downloads/AdditionDialog"), true).toBool();
   foreach(QString file, files) {
     file = file.trimmed().replace(QString::fromUtf8("file://"), QString::fromUtf8(""), Qt::CaseInsensitive);
-    qDebug("Dropped file %s on download list", file.toUtf8().data());
+    qDebug("Dropped file %s on download list", file.toLocal8Bit().data());
     if(file.startsWith(QString::fromUtf8("http://"), Qt::CaseInsensitive) || file.startsWith(QString::fromUtf8("ftp://"), Qt::CaseInsensitive) || file.startsWith(QString::fromUtf8("https://"), Qt::CaseInsensitive)) {
       BTSession->downloadFromUrl(file);
       continue;
@@ -759,7 +774,7 @@ void GUI::dropEvent(QDropEvent *event) {
 // Decode if we accept drag 'n drop or not
 void GUI::dragEnterEvent(QDragEnterEvent *event) {
   foreach(const QString &mime, event->mimeData()->formats()){
-    qDebug("mimeData: %s", mime.toUtf8().data());
+    qDebug("mimeData: %s", mime.toLocal8Bit().data());
   }
   if (event->mimeData()->hasFormat(QString::fromUtf8("text/plain")) || event->mimeData()->hasFormat(QString::fromUtf8("text/uri-list"))) {
     event->acceptProposedAction();
@@ -954,6 +969,11 @@ void GUI::configureSession(bool deleteOptions) {
   // Downloads
   // * Save path
   BTSession->setDefaultSavePath(options->getSavePath());
+  if(options->isTempPathEnabled()) {
+    BTSession->setDefaultTempPath(options->getTempPath());
+  } else {
+    BTSession->setDefaultTempPath(QString::null);
+  }
   BTSession->preAllocateAllFiles(options->preAllocateAllFiles());
   BTSession->startTorrentsInPause(options->addTorrentsInPause());
   // * Scan dir
@@ -969,7 +989,7 @@ void GUI::configureSession(bool deleteOptions) {
   BTSession->setListeningPortsRange(options->getPorts());
   unsigned short new_listenPort = BTSession->getListenPort();
   if(new_listenPort != old_listenPort) {
-    BTSession->addConsoleMessage(tr("qBittorrent is bind to port: %1", "e.g: qBittorrent is bind to port: 1666").arg( misc::toQString(new_listenPort)));
+    BTSession->addConsoleMessage(tr("qBittorrent is bound to port: TCP/%1", "e.g: qBittorrent is bound to port: 6881").arg( misc::toQString(new_listenPort)));
   }
   // * Global download limit
   QPair<int, int> limits = options->getGlobalBandwidthLimits();
@@ -1058,9 +1078,12 @@ void GUI::configureSession(bool deleteOptions) {
   // * DHT
   if(options->isDHTEnabled()) {
     // Set DHT Port
-    BTSession->setDHTPort(new_listenPort);
+    BTSession->setDHTPort(options->getDHTPort());
     if(BTSession->enableDHT(true)) {
-      BTSession->addConsoleMessage(tr("DHT support [ON], port: %1").arg(new_listenPort), QString::fromUtf8("blue"));
+      int dht_port = new_listenPort;
+      if(options->getDHTPort())
+        dht_port = options->getDHTPort();
+      BTSession->addConsoleMessage(tr("DHT support [ON], port: UDP/%1").arg(dht_port), QString::fromUtf8("blue"));
     } else {
       BTSession->addConsoleMessage(tr("DHT support [OFF]"), QString::fromUtf8("red"));
     }
@@ -1170,11 +1193,11 @@ void GUI::configureSession(bool deleteOptions) {
     // We need this for urllib in search engine plugins
 #ifdef Q_WS_WIN
     char proxystr[512];
-    snprintf(proxystr, 512, "http_proxy=%s", proxy_str.toUtf8().data());
+    snprintf(proxystr, 512, "http_proxy=%s", proxy_str.toLocal8Bit().data());
     putenv(proxystr);
 #else
-    qDebug("HTTP: proxy string: %s", proxy_str.toUtf8().data());
-    setenv("http_proxy", proxy_str.toUtf8().data(), 1);
+    qDebug("HTTP: proxy string: %s", proxy_str.toLocal8Bit().data());
+    setenv("http_proxy", proxy_str.toLocal8Bit().data(), 1);
 #endif
   } else {
     qDebug("Disabling search proxy");
@@ -1501,10 +1524,10 @@ void GUI::createSystrayDelayed() {
 void GUI::createTrayIcon() {
   // Tray icon
  #ifdef Q_WS_WIN
-  myTrayIcon = new QSystemTrayIcon(QIcon(QString::fromUtf8(":/Icons/qbittorrent16.png")), this);
+  myTrayIcon = new QSystemTrayIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent16.png")), this);
  #endif
  #ifndef Q_WS_WIN
-  myTrayIcon = new QSystemTrayIcon(QIcon(QString::fromUtf8(":/Icons/qbittorrent22.png")), this);
+  myTrayIcon = new QSystemTrayIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent22.png")), this);
 #endif
   // Tray icon Menu
   myTrayIconMenu = new QMenu(this);

src/GUI.h

@@ -70,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;
@@ -139,7 +140,7 @@ 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();
     // Keyboard shortcuts
@@ -177,6 +178,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);