- Tagged v1.0.0final

- Updated TODO

Changelog

@@ -6,6 +6,7 @@
     - FEATURE: Added RSS support
     - FEATURE: Support files prioritizing in a torrent
     - FEATURE: Brand new search engine plugins system
+    - FEATURE: Filtered files don't appear on hard disk anymore
     - FEATURE: Finished torrents are now moved to another tab for seeding
     - FEATURE: Display more infos about the torrent in its properties
     - FEATURE: Allow the user to edit torrents' trackers
@@ -40,21 +41,25 @@
     - FEATURE: Added an option to automatically delete torrents when they reach a given ratio (>= 1.0)
     - FEATURE: Added an option to display current transfer speeds in title bar
     - FEATURE: Torrent content is now displayed as a tree
+    - FEATURE: Better media file preview (player detected automatically)
+    - FEATURE: Greatly improved ETA calculation algorithm (use GASA)
     - I18N: Added Hungarian translation
     - I18N: Added Brazilian translation
     - BUGFIX: Progress of paused torrents is now correct on restart
+    - BUGFIX: clear the results of a search stops searching
     - BUGFIX: Progress column gets sorted on restart it is was during last execution
-    - BUGFIX: Made ETA more reliable using stats instead of instant values
     - BUGFIX: Remove torrent from hard drive used to delete parent folder if empty
     - BUGFIX: Fixed a crash when filtering all the files in a torrent
     - BUGFIX: Reload torrent only when necessary (properties)
     - BUGFIX: qBittorrent is not exiting anymore when a dialog is closed and main window is hidden
+    - BUGFIX: Catch all possible exceptions when adding a torrent to avoid crashing
     - BUGFIX: Search plugin update is not making the GUI freeze anymore (moved to a thread)
     - BUGFIX: DHT settings were not saved correctly
     - BUGFIX: Workaround to build on Fedora system (pkg-config problem)
     - BUGFIX: search plugin update - do not display only last version changelog
     - BUGFIX: Search plugin update - fixed missing new lines in changelog
     - BUGFIX: The number of search results was not reset when clicking on 'Clear' button
+    - BUGFIX: Fixed systray integration when qbittorrent is launched on system startup
     - BUGFIX: Update torrent progress when its content changed (filtered files)
     - BUGFIX: Improved the way menu icons are installed to avoid problems on some systems
     - BUGFIX: Improved incremental download
@@ -63,6 +68,10 @@
     - BUGFIX: Prevent downloadFromUrl flooding
     - BUGFIX: ETA was wrong for torrents with filtered files
     - BUGFIX: Fixed drag'n drop on non-KDE systems
+    - BUGFIX: Removed build dependency on Python
+    - BUGFIX: Catching DHT exception in case there is a problem
+    - BUGFIX: Remember properties window size and position
+    - BUGFIX: Improved proxy support in search engine (HTTP only)
     - COSMETIC: Redesigned torrent properties a little
     - COSMETIC: Totally redesigned program preferences
     - COSMETIC: Display more logs messages concerning features

INSTALL

@@ -1,4 +1,4 @@
-qBittorrent - A BitTorrent client in C++ / Qt4.2
+qBittorrent - A BitTorrent client in C++ / Qt4
 ------------------------------------------
 
 *** Necessary if qt3 is default on your system ***
@@ -14,7 +14,7 @@ qbittorrent
 will install and execute qBittorrent hopefully without any problems.
 
 Dependencies:
-- Qt >= 4.2 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml)
+- Qt >= 4.3.0 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml)
 
 - rblibtorrent by Arvid Norberg (>= v0.13 REQUIRED)
     -> http://www.qbittorrent.org/download.php (advised)
@@ -25,7 +25,7 @@ Dependencies:
 
 - libboost: libboost-filesystem, libboost-date-time, libboost-thread, libboost-serialization
 
-- libcommoncpp2
+- libcurl
 
 - python >= 2.3 (needed by search engine)
 

TODO

@@ -8,11 +8,9 @@
 - Skins support? (contact Mateusz)
 
 // Harder
-- Display a progress bar that really represents the pieces we have (like in eMule)
 - Torrent scheduler ala µtorrent/Bitcomet
 
 // Waiting for libtorrent
-- File selection in a torrent in compact mode
 - Allow to prioritize torrents (may code this in qBittorrent?)
 
 // Unsure
@@ -32,7 +30,6 @@
 
 // in v1.1.0
 - Tabs support in search
-- Allow to hide columns?
 - Allow to scan multiple directories? (useful?)
 - Web interface (turbogears? php? python?)
   * Webserver? Try to write a webserver as a plugin for qBittorrent in Python
@@ -46,17 +43,7 @@
 - Display in torrent addition dialog:
    * free disk space on selected drive
    * free disk space after torrent download (and/or torrent size)
-- Allow to change action on double-click
-  -> in download list
-  -> in seeding list
 
-// in v1.0.0 - FEATURE FREEZE
-- Fix all (or almost all) opened bugs in bug tracker
-- debug new torrent content selection
-- Recheck doc
-- Translations update (IN PROGRESS)
-- Make use of total_wanted
-
-rc2->rc3 changelog:
-- BUGFIX: Fixed a proxy problem causing connections to be rejected by trackers
-- BUGFIX: Fixed compilation problem on FreeBSD
+rc11 -> final? changelog:
+BUGFIX: Fixed systray integration when qbittorrent is launched on system startup
+BUGFIX: Catch all possible exceptions when adding a torrent to avoid crashing

configure

@@ -22,8 +22,8 @@ Dependency options:
   --with-libtorrent-lib=[path]            Path to libtorrent library files
   --with-libtorrent-static-lib=[path]     Path to libtorrent .a file
   --with-libboost-inc=[path]              Path to libboost include files
-  --with-libcommoncpp2-inc=[path]         Path to libcommoncpp2 include files
-  --with-libcommoncpp2-lib=[path]         Path to libcommoncpp2 library files
+  --with-libcurl-inc=[path]               Path to libcurl include files
+  --with-libcurl-lib=[path]               Path to libcurl library files
   --disable-libmagick                    Disable use of libmagick
   --with-libmagick-inc=[path]             Path to libmagick++ include files
   --with-libmagick-lib=[path]             Path to libmagick++ library files
@@ -166,13 +166,13 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
-		--with-libcommoncpp2-inc=*)
-			QC_WITH_LIBCOMMONCPP2_INC=$optarg
+		--with-libcurl-inc=*)
+			QC_WITH_LIBCURL_INC=$optarg
 			shift
 			;;
 
-		--with-libcommoncpp2-lib=*)
-			QC_WITH_LIBCOMMONCPP2_LIB=$optarg
+		--with-libcurl-lib=*)
+			QC_WITH_LIBCURL_LIB=$optarg
 			shift
 			;;
 
@@ -231,8 +231,8 @@ 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_LIBCOMMONCPP2_INC=$QC_WITH_LIBCOMMONCPP2_INC
-echo QC_WITH_LIBCOMMONCPP2_LIB=$QC_WITH_LIBCOMMONCPP2_LIB
+echo QC_WITH_LIBCURL_INC=$QC_WITH_LIBCURL_INC
+echo QC_WITH_LIBCURL_LIB=$QC_WITH_LIBCURL_LIB
 echo QC_DISABLE_libmagick=$QC_DISABLE_libmagick
 echo QC_WITH_LIBMAGICK_INC=$QC_WITH_LIBMAGICK_INC
 echo QC_WITH_LIBMAGICK_LIB=$QC_WITH_LIBMAGICK_LIB
@@ -412,7 +412,9 @@ public:
 		}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")){
@@ -423,16 +425,6 @@ public:
 			if(!found) return false;
 			conf->addLib(QString("-L") + s);
 		}
-		// BUGFIX for Fedora (doesn't support pkg-config?)
-		QFile issue_file("/etc/issue");
-		if(issue_file.open(QIODevice::ReadOnly | QIODevice::Text)){
-			QString content = issue_file.readAll();
-			issue_file.close();
-			if(content.indexOf("Fedora") != -1){
-				qWarning("Fedora detected. WORKAROUND for Fedora pkg-config problem enabled");
-				conf->addLib("-lssl -lcrypto -lboost_date_time -lboost_filesystem -lboost_thread -lz -ltorrent");
-			}
-		}
 		return true;
 	}
 };
@@ -493,25 +485,25 @@ public:
 		return true;
 	}
 };
-#line 1 "libcommoncpp2.qcm"
+#line 1 "libcurl.qcm"
 /*
 -----BEGIN QCMOD-----
 name: libcommoncpp2
-arg: with-libcommoncpp2-inc=[path], Path to libcommoncpp2 include files
-arg: with-libcommoncpp2-lib=[path], Path to libcommoncpp2 library files
+arg: with-libcurl-inc=[path], Path to libcurl include files
+arg: with-libcurl-lib=[path], Path to libcurl library files
 -----END QCMOD-----
 */
-class qc_libcommoncpp2 : public ConfObj
+class qc_libcurl : public ConfObj
 {
 public:
-	qc_libcommoncpp2(Conf *c) : ConfObj(c) {}
-	QString name() const { return "GNU Common C++ library (libcommoncpp2)"; }
-	QString shortname() const { return "libcommoncpp2"; }
+	qc_libcurl(Conf *c) : ConfObj(c) {}
+	QString name() const { return "libcurl"; }
+	QString shortname() const { return "libcurl"; }
 	bool exec(){
     QString s;
-		s = conf->getenv("QC_WITH_LIBCOMMONCPP2_INC");
+		s = conf->getenv("QC_WITH_LIBCURL_INC");
 		if(!s.isEmpty()) {
-			if(!conf->checkHeader(s, "cc++/url.h")) {
+			if(!conf->checkHeader(s, "curl/curl.h")) {
 				return false;
     	}
 		}else{
@@ -520,7 +512,7 @@ public:
 			sl << "/usr/local/include";
 			bool found = false;
 			foreach(s, sl){
-				if(conf->checkHeader(s, "cc++/url.h")){
+				if(conf->checkHeader(s, "curl/curl.h")){
 					found = true;
 					break;
 				}
@@ -531,39 +523,27 @@ public:
 		}
 		conf->addIncludePath(s);
 
-		s = conf->getenv("QC_WITH_LIBCOMMONCPP2_LIB");
+		s = conf->getenv("QC_WITH_LIBCURL_LIB");
 		if(!s.isEmpty()) {
-			if(!QFile::exists(s+QString("libccext2.so")))
-		    return false;
-			if(!QFile::exists(s+QString("libccgnu2.so")))
-				return false;
+			if(!QFile::exists(s+QString("/libcurl.so")))
+		          return false;
     	conf->addLib(QString("-L") + s);
 		}else{
 			QStringList sl;
 			sl << "/usr/lib/";
+			sl << "/usr/lib64/";
 			sl << "/usr/local/lib/";
+			sl << "/usr/local/lib64/";
 			bool found = false;
 			foreach(s, sl){
-				if(QFile::exists(s+QString("libccext2.so"))){
-				  if(QFile::exists(s+QString("libccgnu2.so"))){
-						found = true;
-						break;
-					}
+				if(QFile::exists(s+QString("libcurl.so"))){
+					found = true;
+					break;
 				}
 			}
 			if(!found) return false;
 			conf->addLib(QString("-L") + s);
 		}
-		// BUGFIX for Fedora (doesn't support pkg-config?)
-    QFile issue_file("/etc/issue");
-    if(issue_file.open(QIODevice::ReadOnly | QIODevice::Text)){
-      QString content = issue_file.readAll();
-      issue_file.close();
-      if(content.indexOf("Fedora") != -1){
-        qWarning("Fedora detected. WORKAROUND for Fedora pkg-config problem enabled");
-        conf->addLib("-pthread -lccext2 -lz -lccgnu2 -ldl -lrt");
-      }
-    }
 		return true;
 	}
 };
@@ -614,18 +594,20 @@ public:
 
 		s = conf->getenv("QC_WITH_LIBMAGICK_LIB");
 		if(!s.isEmpty()) {
-			if(!QFile::exists(s+QString("libMagick++.so"))){
-                          return false;
-                        }
+                        if(!conf->checkLibrary(s, "Magick++")) {
+				return false;
+			}
 		}else{
 			QStringList sl;
 			sl << "/usr/lib/";
+			sl << "/usr/lib64/";
 			sl << "/usr/local/lib/";
+			sl << "/usr/local/lib64/";
 			bool found = false;
 			foreach(s, sl){
-				if(QFile::exists(s+QString("libMagick++.so"))){
+				if(conf->checkLibrary(s, "Magick++")) {
 					found = true;
-					break;
+                                        break;
 				}
 			}
 			if(!found)
@@ -692,13 +674,15 @@ public:
 
 		s = conf->getenv("QC_WITH_LIBZZIP_LIB");
 		if(!s.isEmpty()) {
-			if(!QFile::exists(s+QString("libzzip.so"))){
+			if(!QFile::exists(s+QString("/libzzip.so"))){
                           return false;
                         }
 		}else{
 			QStringList sl;
 			sl << "/usr/lib/";
+			sl << "/usr/lib64/";
 			sl << "/usr/local/lib/";
+			sl << "/usr/local/lib64/";
 			bool found = false;
 			foreach(s, sl){
 				if(QFile::exists(s+QString("libzzip.so"))){
@@ -715,26 +699,6 @@ public:
 		return true;
 	}
 };
-#line 1 "python.qcm"
-/*
------BEGIN QCMOD-----
-name: python
------END QCMOD-----
-*/
-class qc_python : public ConfObj
-{
-public:
-	qc_python(Conf *c) : ConfObj(c) {}
-	QString name() const { return "python >= 2.3"; }
-	QString shortname() const { return "python"; }
-	bool exec(){
-          int r = conf->doCommand("python testpython.py");
-	  if(r == 0)
-	    return true;
-	  else
-	    return false;
-	}
-};
 
 EOT
 cat >$1/modules_new.cpp <<EOT
@@ -747,7 +711,7 @@ cat >$1/modules_new.cpp <<EOT
     o = new qc_libboost(conf);
     o->required = true;
     o->disabled = false;
-    o = new qc_libcommoncpp2(conf);
+    o = new qc_libcurl(conf);
     o->required = true;
     o->disabled = false;
     o = new qc_libmagick(conf);
@@ -756,9 +720,6 @@ cat >$1/modules_new.cpp <<EOT
     o = new qc_libzzip(conf);
     o->required = false;
     o->disabled = false;
-    o = new qc_python(conf);
-    o->required = true;
-    o->disabled = false;
 
 EOT
 cat >$1/conf4.h <<EOT
@@ -1708,8 +1669,8 @@ export QC_WITH_LIBTORRENT_INC
 export QC_WITH_LIBTORRENT_LIB
 export QC_WITH_LIBTORRENT_STATIC_LIB
 export QC_WITH_LIBBOOST_INC
-export QC_WITH_LIBCOMMONCPP2_INC
-export QC_WITH_LIBCOMMONCPP2_LIB
+export QC_WITH_LIBCURL_INC
+export QC_WITH_LIBCURL_LIB
 export QC_DISABLE_libmagick
 export QC_WITH_LIBMAGICK_INC
 export QC_WITH_LIBMAGICK_LIB

qbittorrent.qc

@@ -12,12 +12,9 @@
   <dep type='libboost'>
     <required/>
   </dep>
-  <dep type='libcommoncpp2'>
+  <dep type='libcurl'>
     <required/>
   </dep>
   <dep type='libmagick'/>
   <dep type='libzzip'/>
-  <dep type='python'>
-    <required/>
-  </dep>
 </qconf>

qcm/libcommoncpp2.qcm

@@ -37,15 +37,17 @@ public:
 
 		s = conf->getenv("QC_WITH_LIBCOMMONCPP2_LIB");
 		if(!s.isEmpty()) {
-			if(!QFile::exists(s+QString("libccext2.so")))
+			if(!QFile::exists(s+QString("/libccext2.so")))
 		    return false;
-			if(!QFile::exists(s+QString("libccgnu2.so")))
+			if(!QFile::exists(s+QString("/libccgnu2.so")))
 				return false;
     	conf->addLib(QString("-L") + s);
 		}else{
 			QStringList sl;
 			sl << "/usr/lib/";
+			sl << "/usr/lib64/";
 			sl << "/usr/local/lib/";
+			sl << "/usr/local/lib64/";
 			bool found = false;
 			foreach(s, sl){
 				if(QFile::exists(s+QString("libccext2.so"))){
@@ -58,16 +60,6 @@ public:
 			if(!found) return false;
 			conf->addLib(QString("-L") + s);
 		}
-		// BUGFIX for Fedora (doesn't support pkg-config?)
-    QFile issue_file("/etc/issue");
-    if(issue_file.open(QIODevice::ReadOnly | QIODevice::Text)){
-      QString content = issue_file.readAll();
-      issue_file.close();
-      if(content.indexOf("Fedora") != -1){
-        qWarning("Fedora detected. WORKAROUND for Fedora pkg-config problem enabled");
-        conf->addLib("-pthread -lccext2 -lz -lccgnu2 -ldl -lrt");
-      }
-    }
 		return true;
 	}
 };

qcm/libcurl.qcm

@@ -0,0 +1,61 @@
+/*
+-----BEGIN QCMOD-----
+name: libcommoncpp2
+arg: with-libcurl-inc=[path], Path to libcurl include files
+arg: with-libcurl-lib=[path], Path to libcurl library files
+-----END QCMOD-----
+*/
+class qc_libcurl : public ConfObj
+{
+public:
+	qc_libcurl(Conf *c) : ConfObj(c) {}
+	QString name() const { return "libcurl"; }
+	QString shortname() const { return "libcurl"; }
+	bool exec(){
+    QString s;
+		s = conf->getenv("QC_WITH_LIBCURL_INC");
+		if(!s.isEmpty()) {
+			if(!conf->checkHeader(s, "curl/curl.h")) {
+				return false;
+    	}
+		}else{
+			QStringList sl;
+			sl << "/usr/include";
+			sl << "/usr/local/include";
+			bool found = false;
+			foreach(s, sl){
+				if(conf->checkHeader(s, "curl/curl.h")){
+					found = true;
+					break;
+				}
+			}
+			if(!found) {
+				return false;
+      }
+		}
+		conf->addIncludePath(s);
+
+		s = conf->getenv("QC_WITH_LIBCURL_LIB");
+		if(!s.isEmpty()) {
+			if(!QFile::exists(s+QString("/libcurl.so")))
+		          return false;
+    	conf->addLib(QString("-L") + s);
+		}else{
+			QStringList sl;
+			sl << "/usr/lib/";
+			sl << "/usr/lib64/";
+			sl << "/usr/local/lib/";
+			sl << "/usr/local/lib64/";
+			bool found = false;
+			foreach(s, sl){
+				if(QFile::exists(s+QString("libcurl.so"))){
+					found = true;
+					break;
+				}
+			}
+			if(!found) return false;
+			conf->addLib(QString("-L") + s);
+		}
+		return true;
+	}
+};

qcm/libmagick.qcm

@@ -44,18 +44,20 @@ public:
 
 		s = conf->getenv("QC_WITH_LIBMAGICK_LIB");
 		if(!s.isEmpty()) {
-			if(!QFile::exists(s+QString("libMagick++.so"))){
-                          return false;
-                        }
+                        if(!conf->checkLibrary(s, "Magick++")) {
+				return false;
+			}
 		}else{
 			QStringList sl;
 			sl << "/usr/lib/";
+			sl << "/usr/lib64/";
 			sl << "/usr/local/lib/";
+			sl << "/usr/local/lib64/";
 			bool found = false;
 			foreach(s, sl){
-				if(QFile::exists(s+QString("libMagick++.so"))){
+				if(conf->checkLibrary(s, "Magick++")) {
 					found = true;
-					break;
+                                        break;
 				}
 			}
 			if(!found)

qcm/libtorrent.qcm

@@ -52,7 +52,9 @@ public:
 		}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")){
@@ -63,16 +65,6 @@ public:
 			if(!found) return false;
 			conf->addLib(QString("-L") + s);
 		}
-		// BUGFIX for Fedora (doesn't support pkg-config?)
-		QFile issue_file("/etc/issue");
-		if(issue_file.open(QIODevice::ReadOnly | QIODevice::Text)){
-			QString content = issue_file.readAll();
-			issue_file.close();
-			if(content.indexOf("Fedora") != -1){
-				qWarning("Fedora detected. WORKAROUND for Fedora pkg-config problem enabled");
-				conf->addLib("-lssl -lcrypto -lboost_date_time -lboost_filesystem -lboost_thread -lz -ltorrent");
-			}
-		}
 		return true;
 	}
 };

qcm/libzzip.qcm

@@ -44,13 +44,15 @@ public:
 
 		s = conf->getenv("QC_WITH_LIBZZIP_LIB");
 		if(!s.isEmpty()) {
-			if(!QFile::exists(s+QString("libzzip.so"))){
+			if(!QFile::exists(s+QString("/libzzip.so"))){
                           return false;
                         }
 		}else{
 			QStringList sl;
 			sl << "/usr/lib/";
+			sl << "/usr/lib64/";
 			sl << "/usr/local/lib/";
+			sl << "/usr/local/lib64/";
 			bool found = false;
 			foreach(s, sl){
 				if(QFile::exists(s+QString("libzzip.so"))){

qcm/python.qcm

@@ -1,19 +0,0 @@
-/*
------BEGIN QCMOD-----
-name: python
------END QCMOD-----
-*/
-class qc_python : public ConfObj
-{
-public:
-	qc_python(Conf *c) : ConfObj(c) {}
-	QString name() const { return "python >= 2.3"; }
-	QString shortname() const { return "python"; }
-	bool exec(){
-          int r = conf->doCommand("python testpython.py");
-	  if(r == 0)
-	    return true;
-	  else
-	    return false;
-	}
-};

src/DLListDelegate.h

@@ -83,12 +83,9 @@ class DLListDelegate: public QItemDelegate {
           newopt.maximum = 100;
           newopt.minimum = 0;
           newopt.state |= QStyle::State_Enabled;
-          newopt.textVisible = false;
+          newopt.textVisible = true;
           QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt,
           painter);
-          QPalette::ColorGroup cg = opt.state & QStyle::State_Enabled ? QPalette::Normal : QPalette::Disabled;
-          painter->setPen(opt.palette.color(cg, QPalette::WindowText));
-          painter->drawText(opt.rect, Qt::AlignCenter, newopt.text);
           break;
         }
         default:

src/FinishedListDelegate.h

@@ -76,12 +76,9 @@ class FinishedListDelegate: public QItemDelegate {
           newopt.maximum = 100;
           newopt.minimum = 0;
           newopt.state |= QStyle::State_Enabled;
-          newopt.textVisible = false;
+          newopt.textVisible = true;
           QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt,
           painter);
-          QPalette::ColorGroup cg = opt.state & QStyle::State_Enabled ? QPalette::Normal : QPalette::Disabled;
-          painter->setPen(opt.palette.color(cg, QPalette::WindowText));
-          painter->drawText(opt.rect, Qt::AlignCenter, newopt.text);
           break;
         }
         default:

src/FinishedTorrents.cpp

@@ -313,8 +313,6 @@ void FinishedTorrents::displayFinishedListMenu(const QPoint& pos){
   QModelIndex index;
   // Enable/disable pause/start action given the DL state
   QModelIndexList selectedIndexes = finishedList->selectionModel()->selectedIndexes();
-  QSettings settings("qBittorrent", "qBittorrent");
-  QString previewProgram = settings.value("Preferences/general/MediaPlayer", QString()).toString();
   bool has_pause = false, has_start = false, has_preview = false;
   foreach(index, selectedIndexes) {
     if(index.column() == F_NAME) {
@@ -334,7 +332,7 @@ void FinishedTorrents::displayFinishedListMenu(const QPoint& pos){
           has_pause = true;
         }
       }
-      if(!previewProgram.isEmpty() && BTSession->isFilePreviewPossible(hash) && !has_preview) {
+      if(BTSession->isFilePreviewPossible(hash) && !has_preview) {
          myFinishedListMenu.addAction(actionPreview_file);
          has_preview = true;
       }

src/GUI.h

@@ -59,6 +59,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     QTabWidget *tabs;
     options_imp *options;
     QSystemTrayIcon *myTrayIcon;
+    QTimer *systrayCreator;
     QMenu *myTrayIconMenu;
     DownloadingTorrents *downloadingTorrentTab;
     FinishedTorrents *finishedTorrentTab;
@@ -74,8 +75,6 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     QShortcut *switchDownShortcut;
     QShortcut *switchUpShortcut;
     QShortcut *switchRSSShortcut;
-    // Preview
-    QProcess *previewProcess;
     // Search
     SearchEngine *searchEngine;
     // RSS
@@ -98,7 +97,6 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     void togglePausedState(QString hash);
     void on_actionPreview_file_triggered();
     void previewFile(QString filePath);
-    void cleanTempPreviewFile(int, QProcess::ExitStatus) const;
     void balloonClicked();
     void writeSettings();
     void readSettings();
@@ -108,6 +106,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     void updateFinishedTorrentNumber(unsigned int nb);
     void fullDiskError(QTorrentHandle& h) const;
     void handleDownloadFromUrlFailure(QString, QString) const;
+    void createSystrayDelayed();
     // Keyboard shortcuts
     void createKeyboardShortcuts();
     void displayDownTab() const;
@@ -158,7 +157,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     GUI(QWidget *parent=0, QStringList torrentCmdLine=QStringList());
     ~GUI();
     // Methods
-    unsigned int getCurrentTabIndex() const;
+    int getCurrentTabIndex() const;
     QPoint screenCenter() const;
 };
 

src/Icons/qBittorrent.desktop

@@ -4,19 +4,20 @@ Comment=V1.0.0
 Encoding=UTF-8
 Exec=qbittorrent
 GenericName=Bittorrent client
-GenericName[fr]=Client Bittorrent
-GenericName[nl]=Bittorrent client
+GenericName[bg]=Торент клиент
+GenericName[de]=Bittorren Client
+GenericName[el]=Τορεντ πελάτης
 GenericName[es]=Cliente Bittorrent
+GenericName[fr]=Client Bittorrent
+GenericName[ja]=Bittorrent クライアント
+GenericName[ko]=비토렌트 클라이언트
+GenericName[nl]=Bittorrent client
+GenericName[pl]=Klient Bittorrent
+GenericName[ru]=клиент Bittorrent
 GenericName[sv]=Bittorrent-klient
 GenericName[tr]=Bittorrent istemcisi
-GenericName[de]=Bittorren Client
-GenericName[pl]=Klient Bittorrent
-GenericName[zh]=Bittorrent之用户
-GenericName[ko]=비토렌트 클라이언트
-GenericName[el]=Τορεντ πελάτης
-GenericName[bg]=Торент клиент
 GenericName[uk]=Bittorrent-клієнт
-GenericName[ru]=клиент Bittorrent
+GenericName[zh]=Bittorrent之用户
 Icon=qbittorrent
 MimeType=application/x-bittorrent
 Name=qBittorrent

src/PreviewListDelegate.h

@@ -61,11 +61,8 @@ class PreviewListDelegate: public QItemDelegate {
           newopt.maximum = 100;
           newopt.minimum = 0;
           newopt.state |= QStyle::State_Enabled;
-          newopt.textVisible = false;
+          newopt.textVisible = true;
           QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt, painter);
-          QPalette::ColorGroup cg = opt.state & QStyle::State_Enabled ? QPalette::Normal : QPalette::Disabled;
-          painter->setPen(opt.palette.color(cg, QPalette::WindowText));
-          painter->drawText(opt.rect, Qt::AlignCenter, newopt.text);
           break;
         }
         default:

src/PropListDelegate.h

@@ -75,11 +75,8 @@ class PropListDelegate: public QItemDelegate {
           newopt.maximum = 100;
           newopt.minimum = 0;
           newopt.state |= QStyle::State_Enabled;
-          newopt.textVisible = false;
+          newopt.textVisible = true;
           QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt, painter);
-          QPalette::ColorGroup cg = opt.state & QStyle::State_Enabled ? QPalette::Normal : QPalette::Disabled;
-          painter->setPen(opt.palette.color(cg, QPalette::WindowText));
-          painter->drawText(opt.rect, Qt::AlignCenter, newopt.text);
           break;
         }
         case PRIORITY:{
@@ -177,14 +174,16 @@ class PropListDelegate: public QItemDelegate {
           }
           break;
         case 1:
-          if(old_val != NORMAL){
+//           if(old_val != NORMAL){
+//             model->setData(index, QVariant(NORMAL));
+//             if(filteredFilesChanged != 0)
+//               *filteredFilesChanged = true;
+//           } else {
+            model->setData(index, QVariant(HIGH));
             model->setData(index, QVariant(NORMAL));
             if(filteredFilesChanged != 0)
               *filteredFilesChanged = true;
-          } else {
-            model->setData(index, QVariant(HIGH));
-            model->setData(index, QVariant(NORMAL));
-          }
+//           }
           break;
         case 2:
           if(old_val != HIGH){

src/arborescence.h

@@ -27,19 +27,19 @@
 #include <QDir>
 #include "misc.h"
 
-class file {
+class torrent_file {
   private:
-    file *parent;
+    torrent_file *parent;
     bool is_dir;
     QString rel_path;
-    QList<file*> children;
+    QList<torrent_file*> children;
     size_type size;
     float progress;
     int priority;
     int index; // Index in torrent_info
 
   public:
-    file(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){
+    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) {
@@ -48,7 +48,7 @@ class file {
       }
     }
 
-    ~file() {
+    ~torrent_file() {
       qDeleteAll(children);
     }
 
@@ -62,17 +62,25 @@ class file {
 
     void updateProgress() {
       Q_ASSERT(is_dir);
-      float sum = 0;
-      file *child;
-      foreach(child, children) {
-        sum += child->getProgress();
+      if(children.isEmpty()) {
+        progress = 0.;
+        return;
       }
-      progress = sum / (float)children.size();
+      float wanted = 0.;
+      float done = 0.;
+      torrent_file *child;
+      foreach(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);
-      file *child;
+      torrent_file *child;
       foreach(child, children) {
         if(child->getPriority() != prio) return;
       }
@@ -103,13 +111,13 @@ class file {
       return (!children.isEmpty());
     }
 
-    QList<file*> getChildren() const {
+    QList<torrent_file*> getChildren() const {
       return children;
     }
 
-    file* getChild(QString fileName) const {
+    torrent_file* getChild(QString fileName) const {
       Q_ASSERT(is_dir);
-      file* f;
+      torrent_file* f;
       foreach(f, children) {
         if(f->name() == fileName) return f;
       }
@@ -122,10 +130,10 @@ class file {
         parent->addBytes(b);
     }
 
-    file* addChild(QString fileName, bool dir, size_type size=0, int index = -1, float progress=0., int priority=1) {
+    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);
-      file *f = new file(this, QDir::cleanPath(rel_path+QDir::separator()+fileName), dir, size, index, progress, priority);
+      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);
@@ -140,7 +148,7 @@ class file {
         return true;
       }
       bool success = true;
-      file *f;
+      torrent_file *f;
       qDebug("We have %d children", children.size());
       foreach(f, children) {
         bool s = f->removeFromFS(saveDir);
@@ -161,16 +169,16 @@ class file {
 
 class arborescence {
   private:
-    file *root;
+    torrent_file *root;
 
   public:
     arborescence(torrent_info t) {
       torrent_info::file_iterator fi = t.begin_files();
       if(t.num_files() > 1) {
-        root = new file(0, misc::toQString(t.name()), true);
+        root = new torrent_file(0, misc::toQString(t.name()), true);
       } else {
         // XXX: Will crash if there is no file in torrent
-        root = new file(0, misc::toQString(t.name()), false, fi->size, 0);
+        root = new torrent_file(0, misc::toQString(t.name()), false, fi->size, 0);
         return;
       }
       int i = 0;
@@ -188,11 +196,11 @@ class arborescence {
       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 file(0, misc::toQString(t.name()), true);
+        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 file(0, misc::toQString(t.name()), false, fi->size, 0, fp[0], prioritiesTab[0]);
+        root = new torrent_file(0, misc::toQString(t.name()), false, fi->size, 0, fp[0], prioritiesTab[0]);
         return;
       }
       int i = 0;
@@ -210,7 +218,7 @@ class arborescence {
       delete root;
     }
 
-    file* getRoot() const {
+    torrent_file* getRoot() const {
       return root;
     }
 
@@ -232,13 +240,13 @@ class arborescence {
         relative_path.remove(0, 1);
       QStringList fileNames = relative_path.split(QDir::separator());
       QString fileName;
-      file *dad = root;
+      torrent_file *dad = root;
       unsigned int nb_i = 0;
       unsigned int size = fileNames.size();
       foreach(fileName, fileNames) {
         ++nb_i;
         if(fileName == ".") continue;
-        file* child = dad->getChild(fileName);
+        torrent_file* child = dad->getChild(fileName);
         if(!child) {
           if(nb_i != size) {
             // Folder

src/bittorrent.h

@@ -25,8 +25,10 @@
 #include <QList>
 #include <QPair>
 #include <QStringList>
+#include <QDateTime>
 
 #include <libtorrent/session.hpp>
+#include <libtorrent/ip_filter.hpp>
 #include "qtorrenthandle.h"
 
 using namespace libtorrent;
@@ -43,18 +45,17 @@ class bittorrent : public QObject{
     QString scan_dir;
     QTimer *timerScan;
     QTimer *timerAlerts;
+    QTimer *fastResumeSaver;
+    QTimer *BigRatioTimer;
     bool DHTEnabled;
     downloadThread *downloader;
     QString defaultSavePath;
     QStringList torrentsToPauseAfterChecking;
-    QStringList reloadingTorrents;
-    QHash<QString, QList<qlonglong> > ETAstats;
-    QHash<QString, qlonglong> ETAs;
+    QHash<QString, QDateTime> TorrentsStartTime;
+    QHash<QString, size_type> TorrentsStartData;
     QHash<QString, QPair<size_type,size_type> > ratioData;
-    QTimer *ETARefresher;
     QHash<QString, QList<QPair<QString, QString> > > trackersErrors;
     deleteThread *deleter;
-    QStringList waitingForPause;
     QStringList finishedTorrents;
     QStringList unfinishedTorrents;
     bool preAllocateAll;
@@ -62,6 +63,9 @@ class bittorrent : public QObject{
     int maxConnecsPerTorrent;
     int maxUploadsPerTorrent;
     float max_ratio;
+    bool UPnPEnabled;
+    bool NATPMPEnabled;
+    bool LSDEnabled;
 
   protected:
     QString getSavePath(QString hash);
@@ -79,7 +83,7 @@ class bittorrent : public QObject{
     session_status getSessionStatus() const;
     int getListenPort() const;
     QStringList getTorrentsToPauseAfterChecking() const;
-    long getETA(QString hash) const;
+    qlonglong getETA(QString hash) const;
     float getRealRatio(QString hash) const;
     session* getSession() const;
     QList<QPair<QString, QString> > getTrackersErrors(QString hash) const;
@@ -89,7 +93,7 @@ class bittorrent : public QObject{
     bool has_filtered_files(QString hash) const;
 
   public slots:
-    void addTorrent(QString path, bool fromScanDir = false, QString from_url = QString());
+    void addTorrent(QString path, bool fromScanDir = false, QString from_url = QString(), bool resumed = false);
     void downloadFromUrl(QString url);
     void downloadFromURLList(const QStringList& url_list);
     void deleteTorrent(QString hash, bool permanent = false);
@@ -98,14 +102,13 @@ class bittorrent : public QObject{
     void saveDHTEntry();
     void preAllocateAllFiles(bool b);
     void saveFastResumeAndRatioData();
+    void saveFastResumeAndRatioData(QString hash);
     void enableDirectoryScanning(QString scan_dir);
     void disableDirectoryScanning();
     void enablePeerExchange();
     void enableIPFilter(ip_filter filter);
     void disableIPFilter();
-    void pauseAndReloadTorrent(QTorrentHandle h);
     void resumeUnfinishedTorrents();
-    void updateETAs();
     void saveTorrentSpeedLimits(QString hash);
     void loadTorrentSpeedLimits(QString hash);
     void saveDownloadUploadForTorrent(QString hash);
@@ -135,7 +138,8 @@ class bittorrent : public QObject{
     void enableUPnP(bool b);
     void enableNATPMP(bool b);
     void enableLSD(bool b);
-    void enableDHT(bool b);
+    bool enableDHT(bool b);
+    void reloadTorrent(const QTorrentHandle &h, bool full_alloc);
 
   protected slots:
     void scanDirectory();
@@ -143,7 +147,6 @@ class bittorrent : public QObject{
     void processDownloadedFile(QString, QString);
     bool loadTrackerFile(QString hash);
     void saveTrackerFile(QString hash);
-    void reloadTorrent(const QTorrentHandle &h); // This is protected now, call pauseAndReloadTorrent() instead
     void deleteBigRatios();
 
   signals:

src/createtorrent_imp.cpp

@@ -36,6 +36,7 @@
 #include <libtorrent/file_pool.hpp>
 
 #include "createtorrent_imp.h"
+#include "misc.h"
 
 using namespace libtorrent;
 using namespace boost::filesystem;
@@ -120,11 +121,13 @@ void createtorrent::on_addURLSeed_button_clicked(){
 // Subfunction to add files to a torrent_info structure
 // Written by Arvid Norberg (libtorrent Author)
 void add_files(torrent_info& t, path const& p, path const& l){
+  qDebug("p: %s, l: %s, l.leaf(): %s", p.string().c_str(), l.string().c_str(), l.leaf().c_str());
   path f(p / l);
   if (is_directory(f)){
     for (directory_iterator i(f), end; i != end; ++i)
       add_files(t, p, l / i->leaf());
   }else{
+    qDebug("Adding %s", l.string().c_str());
     t.add_file(l, file_size(f));
   }
 }
@@ -141,7 +144,9 @@ QStringList createtorrent::allItems(QListWidget *list){
 // Main function that create a .torrent file
 void createtorrent::on_createButton_clicked(){
   QString input = textInputPath->text().trimmed();
-  if(input.isEmpty() == 0){
+  if (input.endsWith(QDir::separator()))
+    input.chop(1);
+  if(input.isEmpty()){
     QMessageBox::critical(0, tr("No input path set"), tr("Please type an input path first"));
     return;
   }
@@ -161,9 +166,8 @@ void createtorrent::on_createButton_clicked(){
   try {
     boost::intrusive_ptr<torrent_info> t(new torrent_info);
     ofstream out(complete(path((const char*)destination.toUtf8())), std::ios_base::binary);
-    path full_path;
     // Adding files to the torrent
-    full_path = complete(path(input.toUtf8().data()));
+    path full_path = complete(path(input.toUtf8().data()));
     add_files(*t, full_path.branch_path(), full_path.leaf());
     // Set piece size
     int piece_size = getPieceSize();
@@ -199,8 +203,15 @@ void createtorrent::on_createButton_clicked(){
     // create the torrent and print it to out
     entry e = t->create_torrent();
     libtorrent::bencode(std::ostream_iterator<char>(out), e);
-    if(checkStartSeeding->isChecked())
+    out.flush();
+    if(checkStartSeeding->isChecked()) {
+      // Create save path file
+      QFile savepath_file(misc::qBittorrentPath()+QString::fromUtf8("BT_backup")+QDir::separator()+misc::toQString(t->info_hash())+QString::fromUtf8(".savepath"));
+      savepath_file.open(QIODevice::WriteOnly | QIODevice::Text);
+      savepath_file.write(full_path.branch_path().string().c_str());
+      savepath_file.close();
       emit torrent_to_seed(destination);
+    }
   }
   catch (std::exception& e){
     std::cerr << e.what() << "\n";

src/downloadThread.cpp

@@ -21,43 +21,48 @@
 
 #include "downloadThread.h"
 #include <iostream>
-#include <cc++/common.h>
+#include <QSettings>
+#include <stdio.h>
 
-QString subDownloadThread::errorCodeToString(int status) {
+// http://curl.rtin.bz/libcurl/c/libcurl-errors.html
+QString subDownloadThread::errorCodeToString(CURLcode status) {
   switch(status){
-    case 1://ost::URLStream::errUnreachable:
+    case CURLE_FTP_CANT_GET_HOST:
+    case CURLE_COULDNT_RESOLVE_HOST:
       return tr("Host is unreachable");
-    case 2://ost::URLStream::errMissing:
+    case CURLE_READ_ERROR:
+    case CURLE_FILE_COULDNT_READ_FILE:
       return tr("File was not found (404)");
-    case 3://ost::URLStream::errDenied:
+    case CURLE_FTP_ACCESS_DENIED:
+    case CURLE_LOGIN_DENIED:
+    case CURLE_FTP_USER_PASSWORD_INCORRECT:
       return tr("Connection was denied");
-    case 4://ost::URLStream::errInvalid:
+    case CURLE_URL_MALFORMAT:
       return tr("Url is invalid");
-    case 5://ost::URLStream::errForbidden:
-      return tr("Connection forbidden (403)");
-    case 6://ost::URLStream::errUnauthorized:
-      return tr("Connection was not authorized (401)");
-    case 7://ost::URLStream::errRelocated:
-      return tr("Content has moved (301)");
-    case 8://ost::URLStream::errFailure:
+    case CURLE_COULDNT_RESOLVE_PROXY:
+      return tr("Could not resolve proxy");
+    //case 5:
+    //  return tr("Connection forbidden (403)");
+    //case 6:
+    //  return tr("Connection was not authorized (401)");
+    //case 7:
+    //  return tr("Content has moved (301)");
+    case CURLE_COULDNT_CONNECT:
       return tr("Connection failure");
-    case 9://ost::URLStream::errTimeout:
+    case CURLE_OPERATION_TIMEOUTED:
       return tr("Connection was timed out");
-    case 10://ost::URLStream::errInterface:
+    case CURLE_INTERFACE_FAILED:
       return tr("Incorrect network interface");
     default:
       return tr("Unknown error");
   }
 }
 
-subDownloadThread::subDownloadThread(QObject *parent, QString url) : QThread(parent), url(url), abort(false){
-  url_stream = new ost::URLStream();
-}
+subDownloadThread::subDownloadThread(QObject *parent, QString url) : QThread(parent), url(url), abort(false){}
 
 subDownloadThread::~subDownloadThread(){
   abort = true;
   wait();
-  delete url_stream;
 }
 
 void subDownloadThread::run(){
@@ -68,38 +73,66 @@ void subDownloadThread::run(){
     filePath = tmpfile->fileName();
   }
   delete tmpfile;
-  QFile dest_file(filePath);
-  if(!dest_file.open(QIODevice::WriteOnly | QIODevice::Text)){
-    std::cerr << "Error: could't create temporary file: " << (const char*)filePath.toUtf8() << '\n';
+  FILE *f = fopen(filePath.toUtf8().data(), "wb");
+  if(!f) {
+    std::cerr << "couldn't open destination file" << "\n";
     return;
   }
-  ost::URLStream::Error status = url_stream->get((const char*)url.toUtf8());
-  if(status){
-      // Failure
-    QString error_msg = errorCodeToString((int)status);
-    qDebug("Download failed for %s, reason: %s", (const char*)url.toUtf8(), (const char*)error_msg.toUtf8());
-    url_stream->close();
-    emit downloadFailureST(this, url, error_msg);
-    return;
-  }
-  qDebug("Downloading %s...", (const char*)url.toUtf8());
-  char cbuf[1024];
-  int len;
-  while(!url_stream->eof()) {
-    url_stream->read(cbuf, sizeof(cbuf));
-    len = url_stream->gcount();
-    if(len > 0)
-      dest_file.write(cbuf, len);
-    if(abort){
-      dest_file.close();
-      url_stream->close();
-      return;
+  CURL *curl;
+  CURLcode res;
+  curl = curl_easy_init();
+  if(curl) {
+    std::string c_url = url.toUtf8().data();
+    curl_easy_setopt(curl, CURLOPT_URL, c_url.c_str());
+    // SSL support
+    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
+    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0);
+    // PROXY SUPPORT
+    QSettings settings("qBittorrent", "qBittorrent");
+    int intValue = settings.value(QString::fromUtf8("Preferences/Connection/ProxyType"), 0).toInt();
+    if(intValue > 0) {
+      // Proxy enabled
+      QString IP = settings.value(QString::fromUtf8("Preferences/Connection/Proxy/IP"), "0.0.0.0").toString();
+      QString port = settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Port"), 8080).toString();
+      qDebug("Using proxy: %s", (IP+QString(":")+port).toUtf8().data());
+      curl_easy_setopt(curl, CURLOPT_PROXYPORT, (IP+QString(":")+port).toUtf8().data());
+      // Default proxy type is HTTP, we must change if it is SOCKS5
+      if(intValue%2==0) {
+        qDebug("Proxy is SOCKS5, not HTTP");
+        curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);
+      }
+      // Authentication?
+      if(intValue > 2) {
+        qDebug("Proxy requires authentication, authenticating");
+        QString username = settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Username"), QString()).toString();
+        QString password = settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Password"), QString()).toString();
+        curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, (username+QString(":")+password).toUtf8().data());
+      }
     }
+    // We have to define CURLOPT_WRITEFUNCTION or it will crash on windows
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fwrite);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, f);
+    // Verbose
+    // curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
+    // No progress info (we don't use it)
+    curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1);
+    // Redirections
+    curl_easy_setopt(curl, CURLOPT_AUTOREFERER, 1);
+    curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+    curl_easy_setopt(curl, CURLOPT_MAXREDIRS, -1);
+    qDebug("Downloading %s", url.toUtf8().data());
+    res = curl_easy_perform(curl);
+    /* always cleanup */
+    curl_easy_cleanup(curl);
+    fclose(f);
+    if(res) {
+      emit downloadFailureST(this, url, errorCodeToString(res));
+    } else {
+      emit downloadFinishedST(this, url, filePath);      
+    }
+  } else {
+    std::cerr << "Could not initialize CURL" << "\n";
   }
-  dest_file.close();
-  url_stream->close();
-  emit downloadFinishedST(this, url, filePath);
-  qDebug("download completed here: %s", (const char*)filePath.toUtf8());
 }
 
 /** Download Thread **/

src/downloadThread.h

@@ -29,22 +29,18 @@
 #include <QMutexLocker>
 #include <QWaitCondition>
 #include <QStringList>
-
-namespace ost {
-  class URLStream;
-}
+#include <curl/curl.h>
 
 class subDownloadThread : public QThread {
   Q_OBJECT
   private:
     QString url;
-    ost::URLStream *url_stream;
     bool abort;
 
   public:
     subDownloadThread(QObject *parent, QString url);
     ~subDownloadThread();
-    QString errorCodeToString(int status);
+    QString errorCodeToString(CURLcode status);
 
   signals:
     // For subthreads
@@ -76,13 +72,13 @@ class downloadThread : public QThread {
     ~downloadThread();
 
     void downloadUrl(QString url);
+    void setProxy(QString IP, int port, QString username, QString password);
 
   protected:
     void run();
 
   protected slots:
     void propagateDownloadedFile(subDownloadThread* st, QString url, QString path);
-
     void propagateDownloadFailure(subDownloadThread* st, QString url, QString reason);
 };
 

src/downloadingTorrents.cpp

@@ -190,7 +190,6 @@ void DownloadingTorrents::setInfoBar(QString info, QColor color) {
     infoBar->clear();
     nbLines = 1;
   }
-  qDebug("Color is %s", color.name().toUtf8().data());
   infoBar->append(QString::fromUtf8("<font color='grey'>")+ QTime::currentTime().toString(QString::fromUtf8("hh:mm:ss")) + QString::fromUtf8("</font> - <font color='") + color.name() +QString::fromUtf8("'><i>") + info + QString::fromUtf8("</i></font>"));
 }
 
@@ -246,8 +245,6 @@ void DownloadingTorrents::displayDLListMenu(const QPoint& pos) {
   QModelIndex index;
   // Enable/disable pause/start action given the DL state
   QModelIndexList selectedIndexes = downloadList->selectionModel()->selectedIndexes();
-  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
-  QString previewProgram = settings.value(QString::fromUtf8("Preferences/general/MediaPlayer"), QString()).toString();
   bool has_pause = false, has_start = false, has_preview = false;
   foreach(index, selectedIndexes) {
     if(index.column() == NAME) {
@@ -267,7 +264,7 @@ void DownloadingTorrents::displayDLListMenu(const QPoint& pos) {
           has_pause = true;
         }
       }
-      if(!previewProgram.isEmpty() && BTSession->isFilePreviewPossible(hash) && !has_preview) {
+      if(BTSession->isFilePreviewPossible(hash) && !has_preview) {
          myDLLlistMenu.addAction(actionPreview_file);
          has_preview = true;
       }
@@ -417,7 +414,7 @@ void DownloadingTorrents::updateDlList() {
           }else{
             DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/stalled.png"))), Qt::DecorationRole);
             DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)-1));
-            setRowColor(row, QPalette::WindowText);
+            setRowColor(row, QApplication::palette().color(QPalette::WindowText));
           }
           DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)h.progress()));
           DLListModel->setData(DLListModel->index(row, DLSPEED), QVariant((double)h.download_payload_rate()));

src/downloadingTorrents.h

@@ -82,7 +82,7 @@ class DownloadingTorrents : public QWidget, public Ui::downloading{
 
   public slots:
     void updateDlList();
-    void setInfoBar(QString info, QColor color=QPalette::WindowText);
+    void setInfoBar(QString info, QColor color=QApplication::palette().color(QPalette::WindowText));
     void pauseTorrent(QString hash);
     void resumeTorrent(QString hash);
     void updateRatio();

src/engineSelectDlg.cpp

@@ -250,11 +250,13 @@ void engineSelectDlg::setRowColor(int row, QString color){
 bool engineSelectDlg::checkInstalled(QString plugin_name) const {
   QProcess nova;
   QStringList params;
+  params << misc::qBittorrentPath()+"search_engine"+QDir::separator()+"nova2.py";
   params << "--supported_engines";
-  nova.start(misc::qBittorrentPath()+"search_engine"+QDir::separator()+"nova2.py", params, QIODevice::ReadOnly);
+  nova.start("python", params, QIODevice::ReadOnly);
   nova.waitForStarted();
   nova.waitForFinished();
   QByteArray result = nova.readAll();
+  result = result.replace("\r", "");
   result = result.replace("\n", "");
   QList<QByteArray> plugins_list = result.split(',');
   return plugins_list.contains(plugin_name.toUtf8());
@@ -280,11 +282,13 @@ void engineSelectDlg::loadSupportedSearchEngines(bool first) {
   QStringList params;
   // Ask nova core for the supported search engines
   QProcess nova;
+  params << misc::qBittorrentPath()+"search_engine"+QDir::separator()+"nova2.py";
   params << "--supported_engines";
-  nova.start(misc::qBittorrentPath()+"search_engine"+QDir::separator()+"nova2.py", params, QIODevice::ReadOnly);
+  nova.start("python", params, QIODevice::ReadOnly);
   nova.waitForStarted();
   nova.waitForFinished();
   QByteArray result = nova.readAll();
+  result = result.replace("\r", "");
   result = result.replace("\n", "");
   qDebug("read: %s", result.data());
   QByteArray e;
@@ -295,11 +299,13 @@ void engineSelectDlg::loadSupportedSearchEngines(bool first) {
     installed_engines[en] = old_engines.value(en, true);
   }
   params.clear();
+  params << misc::qBittorrentPath()+"search_engine"+QDir::separator()+"nova2.py";
   params << "--supported_engines_infos";
-  nova.start(misc::qBittorrentPath()+"search_engine"+QDir::separator()+"nova2.py", params, QIODevice::ReadOnly);
+  nova.start("python", params, QIODevice::ReadOnly);
   nova.waitForStarted();
   nova.waitForFinished();
   result = nova.readAll();
+  result = result.replace("\r", "");
   result = result.replace("\n", "");
   qDebug("read: %s", result.data());
   unsigned int i = 0;

src/icons.qrc

@@ -47,6 +47,7 @@
   <file>Icons/configure.png</file>
   <file>Icons/download.png</file>
   <file>Icons/folder.png</file>
+  <file>Icons/edit_clear.png</file>
   <file>Icons/flags/portugal.png</file>
   <file>Icons/flags/france.png</file>
   <file>Icons/flags/ukraine.png</file>