- Tagged rc8

Changelog

@@ -41,13 +41,12 @@
     - 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)
@@ -68,8 +67,6 @@
     - 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

@@ -25,7 +25,7 @@ Dependencies:
 
 - libboost: libboost-filesystem, libboost-date-time, libboost-thread, libboost-serialization
 
-- libcurl
+- libcommoncpp2
 
 - python >= 2.3 (needed by search engine)
 

TODO

@@ -8,9 +8,11 @@
 - 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
@@ -50,14 +52,12 @@
   -> in download list
   -> in seeding list
 
-TODO:
-- Check search engine cpu usage
+// in v1.0.0 - FEATURE FREEZE
+- Fix all (or almost all) opened bugs in bug tracker
+- Recheck doc
+- Translations update (IN PROGRESS)
 
-rc10->rc11? changelog:
-- BUGFIX: Bypass exit confirmation on system shutdown
-- BUGFIX: Download from urls are now able to follow redirections
-- BUGFIX: Clean up for failed torrents downloaded from urls
-- BUGFIX: Fixed downloads from URLs on Windows
-- BUGFIX: Fixed search engine on Windows
-- BUGFIX: Fixed torrent creation from a directory
-- BUGFIX: Fixed save path when seeding automatically after torrent creation
+rc7->rc8 changelog:
+- BUGFIX: Fixed torrent files filtering
+- BUGFIX: Stop search when clearing results
+- BUGFIX: Fixed compilation on Fedora 8

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-libcurl-inc=[path]               Path to libcurl include files
-  --with-libcurl-lib=[path]               Path to libcurl library files
+  --with-libcommoncpp2-inc=[path]         Path to libcommoncpp2 include files
+  --with-libcommoncpp2-lib=[path]         Path to libcommoncpp2 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-libcurl-inc=*)
-			QC_WITH_LIBCURL_INC=$optarg
+		--with-libcommoncpp2-inc=*)
+			QC_WITH_LIBCOMMONCPP2_INC=$optarg
 			shift
 			;;
 
-		--with-libcurl-lib=*)
-			QC_WITH_LIBCURL_LIB=$optarg
+		--with-libcommoncpp2-lib=*)
+			QC_WITH_LIBCOMMONCPP2_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_LIBCURL_INC=$QC_WITH_LIBCURL_INC
-echo QC_WITH_LIBCURL_LIB=$QC_WITH_LIBCURL_LIB
+echo QC_WITH_LIBCOMMONCPP2_INC=$QC_WITH_LIBCOMMONCPP2_INC
+echo QC_WITH_LIBCOMMONCPP2_LIB=$QC_WITH_LIBCOMMONCPP2_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
@@ -485,25 +485,25 @@ public:
 		return true;
 	}
 };
-#line 1 "libcurl.qcm"
+#line 1 "libcommoncpp2.qcm"
 /*
 -----BEGIN QCMOD-----
 name: libcommoncpp2
-arg: with-libcurl-inc=[path], Path to libcurl include files
-arg: with-libcurl-lib=[path], Path to libcurl library files
+arg: with-libcommoncpp2-inc=[path], Path to libcommoncpp2 include files
+arg: with-libcommoncpp2-lib=[path], Path to libcommoncpp2 library files
 -----END QCMOD-----
 */
-class qc_libcurl : public ConfObj
+class qc_libcommoncpp2 : public ConfObj
 {
 public:
-	qc_libcurl(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libcurl"; }
-	QString shortname() const { return "libcurl"; }
+	qc_libcommoncpp2(Conf *c) : ConfObj(c) {}
+	QString name() const { return "GNU Common C++ library (libcommoncpp2)"; }
+	QString shortname() const { return "libcommoncpp2"; }
 	bool exec(){
     QString s;
-		s = conf->getenv("QC_WITH_LIBCURL_INC");
+		s = conf->getenv("QC_WITH_LIBCOMMONCPP2_INC");
 		if(!s.isEmpty()) {
-			if(!conf->checkHeader(s, "curl/curl.h")) {
+			if(!conf->checkHeader(s, "cc++/url.h")) {
 				return false;
     	}
 		}else{
@@ -512,7 +512,7 @@ public:
 			sl << "/usr/local/include";
 			bool found = false;
 			foreach(s, sl){
-				if(conf->checkHeader(s, "curl/curl.h")){
+				if(conf->checkHeader(s, "cc++/url.h")){
 					found = true;
 					break;
 				}
@@ -523,10 +523,12 @@ public:
 		}
 		conf->addIncludePath(s);
 
-		s = conf->getenv("QC_WITH_LIBCURL_LIB");
+		s = conf->getenv("QC_WITH_LIBCOMMONCPP2_LIB");
 		if(!s.isEmpty()) {
-			if(!QFile::exists(s+QString("/libcurl.so")))
-		          return false;
+			if(!QFile::exists(s+QString("/libccext2.so")))
+		    return false;
+			if(!QFile::exists(s+QString("/libccgnu2.so")))
+				return false;
     	conf->addLib(QString("-L") + s);
 		}else{
 			QStringList sl;
@@ -536,9 +538,11 @@ public:
 			sl << "/usr/local/lib64/";
 			bool found = false;
 			foreach(s, sl){
-				if(QFile::exists(s+QString("libcurl.so"))){
-					found = true;
-					break;
+				if(QFile::exists(s+QString("libccext2.so"))){
+				  if(QFile::exists(s+QString("libccgnu2.so"))){
+						found = true;
+						break;
+					}
 				}
 			}
 			if(!found) return false;
@@ -711,7 +715,7 @@ cat >$1/modules_new.cpp <<EOT
     o = new qc_libboost(conf);
     o->required = true;
     o->disabled = false;
-    o = new qc_libcurl(conf);
+    o = new qc_libcommoncpp2(conf);
     o->required = true;
     o->disabled = false;
     o = new qc_libmagick(conf);
@@ -1669,8 +1673,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_LIBCURL_INC
-export QC_WITH_LIBCURL_LIB
+export QC_WITH_LIBCOMMONCPP2_INC
+export QC_WITH_LIBCOMMONCPP2_LIB
 export QC_DISABLE_libmagick
 export QC_WITH_LIBMAGICK_INC
 export QC_WITH_LIBMAGICK_LIB

qbittorrent.qc

@@ -12,7 +12,7 @@
   <dep type='libboost'>
     <required/>
   </dep>
-  <dep type='libcurl'>
+  <dep type='libcommoncpp2'>
     <required/>
   </dep>
   <dep type='libmagick'/>

qcm/libcurl.qcm

@@ -1,61 +0,0 @@
-/*
------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;
-	}
-};

src/FinishedTorrents.cpp

@@ -313,6 +313,8 @@ 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) {
@@ -332,7 +334,7 @@ void FinishedTorrents::displayFinishedListMenu(const QPoint& pos){
           has_pause = true;
         }
       }
-      if(BTSession->isFilePreviewPossible(hash) && !has_preview) {
+      if(!previewProgram.isEmpty() && BTSession->isFilePreviewPossible(hash) && !has_preview) {
          myFinishedListMenu.addAction(actionPreview_file);
          has_preview = true;
       }

src/GUI.cpp

@@ -45,7 +45,6 @@
 #include "options_imp.h"
 #include "previewSelect.h"
 #include "allocationDlg.h"
-#include "stdlib.h"
 
 using namespace libtorrent;
 
@@ -160,6 +159,8 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
   checkConnect = new QTimer(this);
   connect(checkConnect, SIGNAL(timeout()), this, SLOT(checkConnectionStatus()));
   checkConnect->start(5000);
+  previewProcess = new QProcess(this);
+  connect(previewProcess, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(cleanTempPreviewFile(int, QProcess::ExitStatus)));
   // Accept drag 'n drops
   setAcceptDrops(true);
   show();
@@ -181,6 +182,9 @@ GUI::~GUI() {
     delete myTrayIconMenu;
   }
   delete tcpServer;
+  previewProcess->kill();
+  previewProcess->waitForFinished();
+  delete previewProcess;
   delete connecStatusLblIcon;
   delete tabs;
   // Keyboard shortcuts
@@ -384,6 +388,12 @@ void GUI::on_actionPreview_file_triggered() {
   new previewSelect(this, h);
 }
 
+void GUI::cleanTempPreviewFile(int, QProcess::ExitStatus) const {
+  if(!QFile::remove(QDir::tempPath()+QDir::separator()+QString::fromUtf8("qBT_preview.tmp"))) {
+    std::cerr << "Couldn't remove temporary file: " << (QDir::tempPath()+QDir::separator()+QString::fromUtf8("qBT_preview.tmp")).toUtf8().data() << "\n";
+  }
+}
+
 // Necessary if we want to close the window
 // in one time if "close to systray" is enabled
 void GUI::on_actionExit_triggered() {
@@ -392,10 +402,24 @@ void GUI::on_actionExit_triggered() {
 }
 
 void GUI::previewFile(QString filePath) {
-  QDesktopServices::openUrl(QString("file://")+filePath);
+  // Check if there is already one preview running
+  if(previewProcess->state() == QProcess::NotRunning) {
+    // First copy temporarily (XXX: is it necessary?)
+    QString tmpPath = QDir::tempPath()+QDir::separator()+QString::fromUtf8("qBT_preview.tmp");
+    QFile::remove(tmpPath);
+    QFile::copy(filePath, tmpPath);
+    // Launch program preview
+    QStringList params;
+    params << tmpPath;
+    QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+    QString previewProgram = settings.value(QString::fromUtf8("Preferences/General/MediaPlayer"), QString()).toString();
+    previewProcess->start(previewProgram, params, QIODevice::ReadOnly);
+  }else{
+    QMessageBox::critical(0, tr("Preview process already running"), tr("There is already another preview process running.\nPlease close the other one first."));
+  }
 }
 
-int GUI::getCurrentTabIndex() const{
+unsigned int GUI::getCurrentTabIndex() const{
   if(isMinimized() || isHidden())
     return -1;
   return tabs->currentIndex();
@@ -449,7 +473,7 @@ void GUI::on_actionAbout_triggered() {
 
 // Called when we close the program
 void GUI::closeEvent(QCloseEvent *e) {
-
+  qDebug("Mainwindow received closeEvent");
   QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
   bool goToSystrayOnExit = settings.value(QString::fromUtf8("Preferences/General/CloseToTray"), false).toBool();
   if(!force_exit && systrayIntegration && goToSystrayOnExit && !this->isHidden()) {
@@ -461,16 +485,13 @@ void GUI::closeEvent(QCloseEvent *e) {
     show();
     if(!isMaximized())
       showNormal();
-    if(e->spontaneous() == true || force_exit == true) {
-      if(QMessageBox::question(this,
-        tr("Are you sure you want to quit?")+QString::fromUtf8(" -- ")+tr("qBittorrent"),
-        tr("The download list is not empty.\nAre you sure you want to quit qBittorrent?"),
-        tr("&Yes"), tr("&No"),
-        QString(), 0, 1)) {
-          e->ignore();
-          force_exit = false;
-          return;
-      }
+    if(QMessageBox::question(this,
+       tr("Are you sure you want to quit?")+QString::fromUtf8(" -- ")+tr("qBittorrent"),
+       tr("The download list is not empty.\nAre you sure you want to quit qBittorrent?"),
+       tr("&Yes"), tr("&No"),
+       QString(), 0, 1)) {
+         e->ignore();
+         return;
     }
   }
   hide();
@@ -488,7 +509,6 @@ void GUI::closeEvent(QCloseEvent *e) {
   qApp->exit();
 }
 
-
 // Display window to create a torrent
 void GUI::on_actionCreate_torrent_triggered() {
   createtorrent *ct = new createtorrent(this);
@@ -768,12 +788,7 @@ void GUI::processDownloadedFiles(QString path, QString url) {
 void GUI::configureSession(bool deleteOptions) {
   qDebug("Configuring session");
   // General
-  bool new_displaySpeedInTitle = options->speedInTitleBar();
-  if(!new_displaySpeedInTitle && new_displaySpeedInTitle != displaySpeedInTitle) {
-    // Reset title
-    setWindowTitle(tr("qBittorrent %1", "e.g: qBittorrent v0.x").arg(QString::fromUtf8(VERSION)));
-  }
-  displaySpeedInTitle = new_displaySpeedInTitle;
+  displaySpeedInTitle = options->speedInTitleBar();
   unsigned int new_refreshInterval = options->getRefreshInterval();
   if(refreshInterval != new_refreshInterval) {
     refreshInterval = new_refreshInterval;
@@ -834,21 +849,12 @@ void GUI::configureSession(bool deleteOptions) {
   // * Proxy settings
   proxy_settings proxySettings;
   if(options->isProxyEnabled()) {
-    proxySettings.hostname = options->getProxyIp().toStdString();
-    proxySettings.port = options->getProxyPort();
-    if(options->isProxyAuthEnabled()) {
-      proxySettings.username = options->getProxyUsername().toStdString();
-      proxySettings.password = options->getProxyPassword().toStdString();
-    }
-    QString proxy_str;
     switch(options->getProxyType()) {
       case HTTP:
         proxySettings.type = proxy_settings::http;
-        proxy_str = misc::toQString("http://")+options->getProxyIp()+":"+misc::toQString(proxySettings.port);
         break;
       case HTTP_PW:
         proxySettings.type = proxy_settings::http_pw;
-        proxy_str = misc::toQString("http://")+options->getProxyUsername()+":"+options->getProxyPassword()+"@"+options->getProxyIp()+":"+misc::toQString(proxySettings.port);
         break;
       case SOCKS5:
         proxySettings.type = proxy_settings::socks5;
@@ -857,22 +863,12 @@ void GUI::configureSession(bool deleteOptions) {
         proxySettings.type = proxy_settings::socks5_pw;
         break;
     }
-    if(!proxy_str.isEmpty()) {
-      // 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());
-      putenv(proxystr);
-#else
-      setenv("http_proxy", proxy_str.toUtf8().data(), 1);
-#endif
+    proxySettings.hostname = options->getProxyIp().toStdString();
+    proxySettings.port = options->getProxyPort();
+    if(options->isProxyAuthEnabled()) {
+      proxySettings.username = options->getProxyUsername().toStdString();
+      proxySettings.password = options->getProxyPassword().toStdString();
     }
-  } else {
-#ifdef Q_WS_WIN
-    putenv("http_proxy=");
-#else
-    unsetenv("http_proxy");
-#endif
   }
   BTSession->setProxySettings(proxySettings, options->useProxyForTrackers(), options->useProxyForPeers(), options->useProxyForWebseeds(), options->useProxyForDHT());
   // * Session settings

src/GUI.h

@@ -74,6 +74,8 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     QShortcut *switchDownShortcut;
     QShortcut *switchUpShortcut;
     QShortcut *switchRSSShortcut;
+    // Preview
+    QProcess *previewProcess;
     // Search
     SearchEngine *searchEngine;
     // RSS
@@ -96,6 +98,7 @@ 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();
@@ -155,7 +158,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     GUI(QWidget *parent=0, QStringList torrentCmdLine=QStringList());
     ~GUI();
     // Methods
-    int getCurrentTabIndex() const;
+    unsigned int getCurrentTabIndex() const;
     QPoint screenCenter() const;
 };
 

src/PropListDelegate.h

@@ -181,8 +181,7 @@ class PropListDelegate: public QItemDelegate {
 //           } else {
             model->setData(index, QVariant(HIGH));
             model->setData(index, QVariant(NORMAL));
-            if(filteredFilesChanged != 0)
-              *filteredFilesChanged = true;
+            *filteredFilesChanged = true;
 //           }
           break;
         case 2:

src/bittorrent.h

@@ -25,7 +25,6 @@
 #include <QList>
 #include <QPair>
 #include <QStringList>
-#include <QDateTime>
 
 #include <libtorrent/session.hpp>
 #include <libtorrent/ip_filter.hpp>
@@ -45,17 +44,18 @@ class bittorrent : public QObject{
     QString scan_dir;
     QTimer *timerScan;
     QTimer *timerAlerts;
-    QTimer *fastResumeSaver;
-    QTimer *BigRatioTimer;
     bool DHTEnabled;
     downloadThread *downloader;
     QString defaultSavePath;
     QStringList torrentsToPauseAfterChecking;
-    QHash<QString, QDateTime> TorrentsStartTime;
-    QHash<QString, size_type> TorrentsStartData;
+    QHash<QString, bool> reloadingTorrents;
+    QHash<QString, QList<qlonglong> > ETAstats;
+    QHash<QString, qlonglong> ETAs;
     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;
@@ -63,9 +63,6 @@ class bittorrent : public QObject{
     int maxConnecsPerTorrent;
     int maxUploadsPerTorrent;
     float max_ratio;
-    bool UPnPEnabled;
-    bool NATPMPEnabled;
-    bool LSDEnabled;
 
   protected:
     QString getSavePath(QString hash);
@@ -83,7 +80,7 @@ class bittorrent : public QObject{
     session_status getSessionStatus() const;
     int getListenPort() const;
     QStringList getTorrentsToPauseAfterChecking() const;
-    qlonglong getETA(QString hash) const;
+    long getETA(QString hash) const;
     float getRealRatio(QString hash) const;
     session* getSession() const;
     QList<QPair<QString, QString> > getTrackersErrors(QString hash) const;
@@ -102,13 +99,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 resumeUnfinishedTorrents();
+    void updateETAs();
     void saveTorrentSpeedLimits(QString hash);
     void loadTorrentSpeedLimits(QString hash);
     void saveDownloadUploadForTorrent(QString hash);
@@ -139,7 +136,6 @@ class bittorrent : public QObject{
     void enableNATPMP(bool b);
     void enableLSD(bool b);
     bool enableDHT(bool b);
-    void reloadTorrent(const QTorrentHandle &h, bool full_alloc);
 
   protected slots:
     void scanDirectory();
@@ -147,6 +143,8 @@ class bittorrent : public QObject{
     void processDownloadedFile(QString, QString);
     bool loadTrackerFile(QString hash);
     void saveTrackerFile(QString hash);
+    void pauseAndReloadTorrent(QTorrentHandle h, bool full_alloc);
+    void reloadTorrent(const QTorrentHandle &h, bool full_alloc); // This is protected now, call pauseAndReloadTorrent() instead
     void deleteBigRatios();
 
   signals:

src/createtorrent_imp.cpp

@@ -36,7 +36,6 @@
 #include <libtorrent/file_pool.hpp>
 
 #include "createtorrent_imp.h"
-#include "misc.h"
 
 using namespace libtorrent;
 using namespace boost::filesystem;
@@ -121,13 +120,11 @@ 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));
   }
 }
@@ -144,8 +141,6 @@ QStringList createtorrent::allItems(QListWidget *list){
 // Main function that create a .torrent file
 void createtorrent::on_createButton_clicked(){
   QString input = textInputPath->text().trimmed();
-  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;
@@ -166,8 +161,9 @@ 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
-    path full_path = complete(path(input.toUtf8().data()));
+    full_path = complete(path(input.toUtf8().data()));
     add_files(*t, full_path.branch_path(), full_path.leaf());
     // Set piece size
     int piece_size = getPieceSize();
@@ -204,14 +200,8 @@ void createtorrent::on_createButton_clicked(){
     entry e = t->create_torrent();
     libtorrent::bencode(std::ostream_iterator<char>(out), e);
     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();
+    if(checkStartSeeding->isChecked())
       emit torrent_to_seed(destination);
-    }
   }
   catch (std::exception& e){
     std::cerr << e.what() << "\n";

src/downloadThread.cpp

@@ -21,48 +21,43 @@
 
 #include "downloadThread.h"
 #include <iostream>
-#include <QSettings>
-#include <stdio.h>
+#include <cc++/common.h>
 
-// http://curl.rtin.bz/libcurl/c/libcurl-errors.html
-QString subDownloadThread::errorCodeToString(CURLcode status) {
+QString subDownloadThread::errorCodeToString(int status) {
   switch(status){
-    case CURLE_FTP_CANT_GET_HOST:
-    case CURLE_COULDNT_RESOLVE_HOST:
+    case 1://ost::URLStream::errUnreachable:
       return tr("Host is unreachable");
-    case CURLE_READ_ERROR:
-    case CURLE_FILE_COULDNT_READ_FILE:
+    case 2://ost::URLStream::errMissing:
       return tr("File was not found (404)");
-    case CURLE_FTP_ACCESS_DENIED:
-    case CURLE_LOGIN_DENIED:
-    case CURLE_FTP_USER_PASSWORD_INCORRECT:
+    case 3://ost::URLStream::errDenied:
       return tr("Connection was denied");
-    case CURLE_URL_MALFORMAT:
+    case 4://ost::URLStream::errInvalid:
       return tr("Url is invalid");
-    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:
+    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:
       return tr("Connection failure");
-    case CURLE_OPERATION_TIMEOUTED:
+    case 9://ost::URLStream::errTimeout:
       return tr("Connection was timed out");
-    case CURLE_INTERFACE_FAILED:
+    case 10://ost::URLStream::errInterface:
       return tr("Incorrect network interface");
     default:
       return tr("Unknown error");
   }
 }
 
-subDownloadThread::subDownloadThread(QObject *parent, QString url) : QThread(parent), url(url), abort(false){}
+subDownloadThread::subDownloadThread(QObject *parent, QString url) : QThread(parent), url(url), abort(false){
+  url_stream = new ost::URLStream();
+}
 
 subDownloadThread::~subDownloadThread(){
   abort = true;
   wait();
+  delete url_stream;
 }
 
 void subDownloadThread::run(){
@@ -73,66 +68,38 @@ void subDownloadThread::run(){
     filePath = tmpfile->fileName();
   }
   delete tmpfile;
-  FILE *f = fopen(filePath.toUtf8().data(), "wb");
-  if(!f) {
-    std::cerr << "couldn't open destination file" << "\n";
+  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';
     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";
+  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;
+    }
+  }
+  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,18 +29,22 @@
 #include <QMutexLocker>
 #include <QWaitCondition>
 #include <QStringList>
-#include <curl/curl.h>
+
+namespace ost {
+  class URLStream;
+}
 
 class subDownloadThread : public QThread {
   Q_OBJECT
   private:
     QString url;
+    ost::URLStream *url_stream;
     bool abort;
 
   public:
     subDownloadThread(QObject *parent, QString url);
     ~subDownloadThread();
-    QString errorCodeToString(CURLcode status);
+    QString errorCodeToString(int status);
 
   signals:
     // For subthreads
@@ -72,13 +76,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,6 +190,7 @@ 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>"));
 }
 
@@ -245,6 +246,8 @@ 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) {
@@ -264,7 +267,7 @@ void DownloadingTorrents::displayDLListMenu(const QPoint& pos) {
           has_pause = true;
         }
       }
-      if(BTSession->isFilePreviewPossible(hash) && !has_preview) {
+      if(!previewProgram.isEmpty() && BTSession->isFilePreviewPossible(hash) && !has_preview) {
          myDLLlistMenu.addAction(actionPreview_file);
          has_preview = true;
       }
@@ -414,7 +417,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, QApplication::palette().color(QPalette::WindowText));
+            setRowColor(row, 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=QApplication::palette().color(QPalette::WindowText));
+    void setInfoBar(QString info, QColor color=QPalette::WindowText);
     void pauseTorrent(QString hash);
     void resumeTorrent(QString hash);
     void updateRatio();

src/engineSelectDlg.cpp

@@ -250,13 +250,11 @@ 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("python", params, QIODevice::ReadOnly);
+  nova.start(misc::qBittorrentPath()+"search_engine"+QDir::separator()+"nova2.py", 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());
@@ -282,13 +280,11 @@ 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("python", params, QIODevice::ReadOnly);
+  nova.start(misc::qBittorrentPath()+"search_engine"+QDir::separator()+"nova2.py", 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;
@@ -299,13 +295,11 @@ 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("python", params, QIODevice::ReadOnly);
+  nova.start(misc::qBittorrentPath()+"search_engine"+QDir::separator()+"nova2.py", 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/misc.h

@@ -298,7 +298,7 @@ class misc : public QObject{
 
     // Take a number of seconds and return an user-friendly
     // time duration like "1d 2h 10m".
-    static QString userFriendlyDuration(qlonglong seconds) {
+    static QString userFriendlyDuration(const long int seconds) {
       if(seconds < 0) {
         return tr("Unknown");
       }

src/options.ui

@@ -306,6 +306,51 @@
          </layout>
         </widget>
        </item>
+       <item>
+        <widget class="QGroupBox" name="previewBox" >
+         <property name="title" >
+          <string>Preview program</string>
+         </property>
+         <layout class="QVBoxLayout" >
+          <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>
+            <item>
+             <widget class="QLabel" name="lbl_preview" >
+              <property name="text" >
+               <string>Media player:</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="textMediaPlayer" />
+            </item>
+            <item>
+             <widget class="QToolButton" name="browsePreviewButton" >
+              <property name="text" >
+               <string>...</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
        <item>
         <spacer>
          <property name="orientation" >
@@ -794,10 +839,10 @@
                  <bool>false</bool>
                 </property>
                 <property name="text" >
-                 <string/>
+                 <string>0.0.0.0</string>
                 </property>
                 <property name="maxLength" >
-                 <number>75</number>
+                 <number>15</number>
                 </property>
                 <property name="echoMode" >
                  <enum>QLineEdit::Normal</enum>
@@ -947,72 +992,70 @@
               <property name="title" >
                <string>Affected connections</string>
               </property>
-              <layout class="QVBoxLayout" >
-               <item>
-                <widget class="QCheckBox" name="checkProxyTrackers" >
-                 <property name="sizePolicy" >
-                  <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="text" >
-                  <string>Use proxy for connections to trackers</string>
-                 </property>
-                 <property name="checked" >
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="checkProxyPeers" >
-                 <property name="sizePolicy" >
-                  <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="text" >
-                  <string>Use proxy for connections to regular peers</string>
-                 </property>
-                 <property name="checked" >
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="checkProxyDHT" >
-                 <property name="sizePolicy" >
-                  <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="text" >
-                  <string>Use proxy for DHT messages</string>
-                 </property>
-                 <property name="checked" >
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="checkProxyWebseeds" >
-                 <property name="sizePolicy" >
-                  <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="text" >
-                  <string>Use proxy for connections to web seeds</string>
-                 </property>
-                 <property name="checked" >
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-              </layout>
+              <widget class="QCheckBox" name="checkProxyTrackers" >
+               <property name="geometry" >
+                <rect>
+                 <x>10</x>
+                 <y>20</y>
+                 <width>341</width>
+                 <height>22</height>
+                </rect>
+               </property>
+               <property name="text" >
+                <string>Use proxy for connections to trackers</string>
+               </property>
+               <property name="checked" >
+                <bool>true</bool>
+               </property>
+              </widget>
+              <widget class="QCheckBox" name="checkProxyPeers" >
+               <property name="geometry" >
+                <rect>
+                 <x>10</x>
+                 <y>40</y>
+                 <width>341</width>
+                 <height>22</height>
+                </rect>
+               </property>
+               <property name="text" >
+                <string>Use proxy for connections to regular peers</string>
+               </property>
+               <property name="checked" >
+                <bool>true</bool>
+               </property>
+              </widget>
+              <widget class="QCheckBox" name="checkProxyWebseeds" >
+               <property name="geometry" >
+                <rect>
+                 <x>10</x>
+                 <y>60</y>
+                 <width>341</width>
+                 <height>22</height>
+                </rect>
+               </property>
+               <property name="text" >
+                <string>Use proxy for connections to web seeds</string>
+               </property>
+               <property name="checked" >
+                <bool>true</bool>
+               </property>
+              </widget>
+              <widget class="QCheckBox" name="checkProxyDHT" >
+               <property name="geometry" >
+                <rect>
+                 <x>10</x>
+                 <y>80</y>
+                 <width>341</width>
+                 <height>22</height>
+                </rect>
+               </property>
+               <property name="text" >
+                <string>Use proxy for DHT messages</string>
+               </property>
+               <property name="checked" >
+                <bool>true</bool>
+               </property>
+              </widget>
              </widget>
             </item>
            </layout>

src/options_imp.cpp

@@ -152,6 +152,7 @@ options_imp::options_imp(QWidget *parent):QDialog(parent){
   connect(checkCloseToSystray, SIGNAL(stateChanged(int)), this, SLOT(enableApplyButton()));
   connect(checkMinimizeToSysTray, SIGNAL(stateChanged(int)), this, SLOT(enableApplyButton()));
   connect(checkSystrayBalloons, SIGNAL(stateChanged(int)), this, SLOT(enableApplyButton()));
+  connect(textMediaPlayer, SIGNAL(textChanged(QString)), this, SLOT(enableApplyButton()));
   // Downloads tab
   connect(textSavePath, SIGNAL(textChanged(QString)), this, SLOT(enableApplyButton()));
   connect(checkPreallocateAll, SIGNAL(stateChanged(int)), this, SLOT(enableApplyButton()));
@@ -261,6 +262,7 @@ void options_imp::saveOptions(){
   settings.setValue(QString::fromUtf8("CloseToTray"), closeToTray());
   settings.setValue(QString::fromUtf8("MinimizeToTray"), minimizeToTray());
   settings.setValue(QString::fromUtf8("NotificationBaloons"), OSDEnabled());
+  settings.setValue(QString::fromUtf8("MediaPlayer"), getPreviewProgram());
   // End General preferences
   settings.endGroup();
   // Downloads preferences
@@ -404,6 +406,7 @@ void options_imp::loadOptions(){
     checkMinimizeToSysTray->setChecked(settings.value(QString::fromUtf8("MinimizeToTray"), false).toBool());
     checkSystrayBalloons->setChecked(settings.value(QString::fromUtf8("NotificationBaloons"), true).toBool());
   }
+  textMediaPlayer->setText(settings.value(QString::fromUtf8("MediaPlayer"), QString()).toString());
   // End General preferences
   settings.endGroup();
   // Downloads preferences
@@ -460,15 +463,7 @@ void options_imp::loadOptions(){
     spinUploadLimit->setEnabled(false);
   }
   intValue = settings.value(QString::fromUtf8("ProxyType"), 0).toInt();
-  if(intValue <= 0) {
-    intValue = 0;
-  } else {
-    if(intValue%2 == 0) {
-      intValue = 2;
-    }else {
-      intValue = 1;
-    }
-  }
+  if(intValue < 0) intValue = 0;
   comboProxyType->setCurrentIndex(intValue);
   enableProxy(intValue);
   if(isProxyEnabled()) {
@@ -588,6 +583,12 @@ int options_imp::getEncryptionSetting() const{
   return comboEncryption->currentIndex();
 }
 
+QString options_imp::getPreviewProgram() const{
+  QString preview_txt = textMediaPlayer->text();
+  preview_txt = preview_txt.trimmed();
+  return preview_txt;
+}
+
 bool options_imp::minimizeToTray() const{
   if(checkNoSystray->isChecked()) return false;
   return checkMinimizeToSysTray->isChecked();
@@ -871,7 +872,6 @@ void options_imp::enableProxy(int index){
     textProxyIP->setEnabled(false);
     lblProxyPort->setEnabled(false);
     spinProxyPort->setEnabled(false);
-    checkProxyAuth->setChecked(false);
     checkProxyAuth->setEnabled(false);
     ProxyConnecsBox->setEnabled(false);
   }
@@ -996,6 +996,13 @@ void options_imp::on_browseFilterButton_clicked() {
   }
 }
 
+void options_imp::on_browsePreviewButton_clicked() {
+  QString program_txt = QFileDialog::getOpenFileName(this, tr("Choose your favourite preview program"), QDir::homePath());
+  if(!program_txt.isNull()){
+    textMediaPlayer->setText(program_txt);
+  }
+}
+
 // Display dialog to choose save dir
 void options_imp::on_browseSaveDirButton_clicked(){
   QString dir = QFileDialog::getExistingDirectory(this, tr("Choose a save directory"), QDir::homePath());

src/options_imp.h

@@ -61,6 +61,7 @@ class options_imp : public QDialog, private Ui::Dialog{
     bool minimizeToTray() const;
     bool closeToTray() const;
     bool OSDEnabled() const;
+    QString getPreviewProgram() const;
     // Downloads
     QString getSavePath() const;
     bool preAllocateAllFiles() const;
@@ -118,6 +119,7 @@ class options_imp : public QDialog, private Ui::Dialog{
     void on_addFilterRangeButton_clicked();
     void on_delFilterRangeButton_clicked();
     void on_browseScanDirButton_clicked();
+    void on_browsePreviewButton_clicked();
     void on_browseFilterButton_clicked();
     void on_browseSaveDirButton_clicked();
     void processFilterFile(QString filePath=QString());

src/properties.ui

@@ -5,7 +5,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>594</width>
+    <width>538</width>
     <height>567</height>
    </rect>
   </property>

src/properties_imp.cpp

@@ -30,8 +30,6 @@
 #include <QMenu>
 #include <QTimer>
 #include <QStandardItemModel>
-#include <QSettings>
-#include <QDesktopWidget>
 
 // Constructor
 properties::properties(QWidget *parent, bittorrent *BTSession, QTorrentHandle &h): QDialog(parent), h(h), BTSession(BTSession), changedFilteredfiles(false), hash(h.hash()) {
@@ -120,7 +118,6 @@ properties::properties(QWidget *parent, bittorrent *BTSession, QTorrentHandle &h
   updateInfosTimer = new QTimer(this);
   connect(updateInfosTimer, SIGNAL(timeout()), this, SLOT(updateInfos()));
   updateInfosTimer->start(3000);
-  loadSettings();
 }
 
 properties::~properties(){
@@ -158,36 +155,6 @@ void properties::addFilesToTree(file *root, QStandardItem *parent) {
   }
 }
 
-void properties::writeSettings() {
-  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
-  settings.beginGroup(QString::fromUtf8("PropWindow"));
-  settings.setValue(QString::fromUtf8("size"), size());
-  settings.setValue(QString::fromUtf8("pos"), pos());
-  settings.endGroup();
-}
-
-void properties::loadSettings() {
-  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
-  resize(settings.value(QString::fromUtf8("PropWindow/size"), size()).toSize());
-  move(settings.value(QString::fromUtf8("PropWindow/pos"), screenCenter()).toPoint());
-}
-
-// Center window
-QPoint properties::screenCenter() const{
-  int scrn = 0;
-  QWidget *w = this->topLevelWidget();
-
-  if(w)
-    scrn = QApplication::desktop()->screenNumber(w);
-  else if(QApplication::desktop()->isVirtualDesktop())
-    scrn = QApplication::desktop()->screenNumber(QCursor::pos());
-  else
-    scrn = QApplication::desktop()->screenNumber(this);
-
-  QRect desk(QApplication::desktop()->availableGeometry(scrn));
-  return QPoint((desk.width() - this->frameGeometry().width()) / 2, (desk.height() - this->frameGeometry().height()) / 2);
-}
-
 // priority is the new priority of given item
 void properties::updateParentsPriority(QStandardItem *item, int priority) {
   QStandardItem *parent = item->parent();
@@ -489,7 +456,6 @@ void properties::askForTracker(){
   h.force_reannounce();
   // Reload Trackers
   loadTrackers();
-  emit trackersChanged(h.hash());
 }
 
 void properties::deleteSelectedUrlSeeds(){
@@ -538,7 +504,6 @@ void properties::deleteSelectedTrackers(){
   h.force_reannounce();
   // Reload Trackers
   loadTrackers();
-  emit trackersChanged(h.hash());
 }
 
 void properties::riseSelectedTracker(){
@@ -572,7 +537,6 @@ void properties::riseSelectedTracker(){
     // Reload Trackers
     loadTrackers();
     trackersURLS->item(i-1)->setSelected(true);
-    emit trackersChanged(h.hash());
   }
 }
 
@@ -607,7 +571,6 @@ void properties::lowerSelectedTracker(){
     // Reload Trackers
     loadTrackers();
     trackersURLS->item(i+1)->setSelected(true);
-    emit trackersChanged(h.hash());
   }
 }
 

src/properties_imp.h

@@ -74,13 +74,10 @@ class properties : public QDialog, private Ui::properties{
     void updateParentsPriority(QStandardItem *item, int priority);
     void updatePriorities(QStandardItem *item);
     void getPriorities(QStandardItem *parent, int *priorities);
-    void writeSettings();
-    void loadSettings();
 
   signals:
     void filteredFilesChanged(QString hash);
     void fileSizeChanged(QString hash);
-    void trackersChanged(QString hash);
 
   public:
     // Constructor
@@ -89,9 +86,6 @@ class properties : public QDialog, private Ui::properties{
     bool allFiltered() const;
     bool savePiecesPriorities();
     int* loadPiecesPriorities();
-
-  protected:
-    QPoint screenCenter() const;
 };
 
 #endif

src/qgnomelook.h

@@ -42,7 +42,7 @@ class QGnomeLookStyle : public QCleanlooksStyle {
               vertical = (pb2->orientation == Qt::Vertical);
             }
             if (!vertical) {
-              QPalette::ColorRole textRole = QPalette::WindowText;/*
+              QPalette::ColorRole textRole = QPalette::Dark;/*
               if ((pb->textAlignment & Qt::AlignCenter) && pb->textVisible
                    && ((qint64(pb->progress) - qint64(pb->minimum)) * 2 >= (qint64(pb->maximum) - qint64(pb->minimum)))) {
                 textRole = QPalette::HighlightedText;

src/searchEngine.cpp

@@ -28,7 +28,6 @@
 #include <QTemporaryFile>
 #include <QSystemTrayIcon>
 #include <iostream>
-#include <QTimer>
 
 #include "SearchListDelegate.h"
 #include "searchEngine.h"
@@ -80,9 +79,6 @@ SearchEngine::SearchEngine(bittorrent *BTSession, QSystemTrayIcon *myTrayIcon, b
   connect(searchProcess, SIGNAL(started()), this, SLOT(searchStarted()));
   connect(searchProcess, SIGNAL(readyReadStandardOutput()), this, SLOT(readSearchOutput()));
   connect(searchProcess, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(searchFinished(int,QProcess::ExitStatus)));
-  searchTimeout = new QTimer(this);
-  searchTimeout->setSingleShot(true);
-  connect(searchTimeout, SIGNAL(timeout()), this, SLOT(on_stop_search_button_clicked()));
   // Check last enabled search engines
   loadEngineSettings();
   // Update nova.py search plugin if necessary
@@ -96,7 +92,6 @@ SearchEngine::~SearchEngine(){
   saveColWidthSearchList();
   searchProcess->kill();
   searchProcess->waitForFinished();
-  delete searchTimeout;
   delete searchProcess;
   delete searchCompleter;
   delete SearchListModel;
@@ -250,9 +245,6 @@ void SearchEngine::on_search_button_clicked(){
     searchProcess->kill();
     searchProcess->waitForFinished();
   }
-  if(searchTimeout->isActive()) {
-    searchTimeout->stop();
-  }
   QString pattern = search_pattern->text().trimmed();
   // No search pattern entered
   if(pattern.isEmpty()){
@@ -277,7 +269,7 @@ void SearchEngine::on_search_button_clicked(){
   QStringList params;
   QStringList engineNames;
   search_stopped = false;
-  params << misc::qBittorrentPath()+"search_engine"+QDir::separator()+"nova2.py";
+
   params << enabled_engines.join(",");
   params << pattern.split(" ");
   // Update SearchEngine widgets
@@ -286,8 +278,7 @@ void SearchEngine::on_search_button_clicked(){
   search_result_line_truncated.clear();
   results_lbl->setText(tr("Results")+" <i>(0)</i>:");
   // Launch search
-  searchProcess->start("python", params, QIODevice::ReadOnly);
-  searchTimeout->start(180000); // 3min
+  searchProcess->start(misc::qBittorrentPath()+"search_engine"+QDir::separator()+"nova2.py", params, QIODevice::ReadOnly);
 }
 
 void SearchEngine::searchStarted(){
@@ -318,7 +309,6 @@ void SearchEngine::downloadSelectedItem(const QModelIndex& index){
 // line to search results calling appendSearchResult().
 void SearchEngine::readSearchOutput(){
   QByteArray output = searchProcess->readAllStandardOutput();
-  output.replace("\r", "");
   QList<QByteArray> lines_list = output.split('\n');
   QByteArray line;
   if(!search_result_line_truncated.isEmpty()){
@@ -371,7 +361,7 @@ void SearchEngine::updateNova() {
   QStringList files = shipped_subDir.entryList();
   QString file;
   foreach(file, files){
-    QString shipped_file = shipped_subDir.path()+"/"+file;
+    QString shipped_file = shipped_subDir.path()+QDir::separator()+file;
     // Copy python classes
     if(file.endsWith(".py")) {
       if(misc::getPluginVersion(shipped_file) > misc::getPluginVersion(destDir+file) ) {
@@ -458,7 +448,6 @@ void SearchEngine::on_stop_search_button_clicked(){
   // Kill process
   searchProcess->terminate();
   search_stopped = true;
-  searchTimeout->stop();
 }
 
 // Clear search results list
@@ -466,13 +455,12 @@ void SearchEngine::on_clear_button_clicked(){
   // Kill process
   searchProcess->terminate();
   search_stopped = true;
-  searchTimeout->stop();
+
   searchResultsUrls.clear();
   SearchListModel->removeRows(0, SearchListModel->rowCount());
   // Disable clear & download buttons
   clear_button->setEnabled(false);
   download_button->setEnabled(false);
-  nb_search_results = 0;
   results_lbl->setText(tr("Results")+" <i>(0)</i>:");
   // focus on search pattern
   search_pattern->clear();

src/searchEngine.h

@@ -33,7 +33,6 @@ class SearchListDelegate;
 class bittorrent;
 class QSystemTrayIcon;
 class downloadThread;
-class QTimer;
 
 class SearchEngine : public QWidget, public Ui::search_engine{
   Q_OBJECT
@@ -55,7 +54,6 @@ class SearchEngine : public QWidget, public Ui::search_engine{
     bool systrayIntegration;
     downloadThread *downloader;
     QStringList enabled_engines;
-    QTimer *searchTimeout;
 
   public:
     SearchEngine(bittorrent *BTSession, QSystemTrayIcon *myTrayIcon, bool systrayIntegration);

src/search_engine/engines/btjunkie.py

@@ -1,4 +1,4 @@
-#VERSION: 1.12
+#VERSION: 1.10
 #AUTHORS: Fabien Devaux (fab@gnux.info)
 from novaprinter import prettyPrinter
 import urllib
@@ -10,11 +10,11 @@ class btjunkie(object):
 
 	def search(self, what):
 		i = 1
-		while True and i<11:
+		while True:
 			res = 0
 			dat = urllib.urlopen(self.url+'/search?q=%s&o=52&p=%d'%(what,i)).read().decode('utf8', 'replace')
 			# I know it's not very readable, but the SGML parser feels in pain
-			section_re = re.compile('(?s)href="http://dl.btjunkie.org/torrent/.*?<tr>')
+			section_re = re.compile('(?s)href="/torrent.*?<tr>')
 			torrent_re = re.compile('(?s)href="(?P<link>.*?[^"]+).*?'
 			'class="BlckUnd">(?P<name>.*?)</a>.*?'
 			'>(?P<size>\d+MB)</font>.*?'
@@ -27,9 +27,9 @@ class btjunkie(object):
 					torrent_infos = m.groupdict()
 					torrent_infos['name'] = re.sub('</?font.*?>', '', torrent_infos['name'])
 					torrent_infos['engine_url'] = self.url
-					#torrent_infos['link'] = self.url+torrent_infos['link']
+					torrent_infos['link'] = self.url+torrent_infos['link']
 					prettyPrinter(torrent_infos)
 					res = res + 1
 			if res == 0:
 				break
-			i = i + 1
+			i = i + 1

src/search_engine/engines/isohunt.py

@@ -1,4 +1,4 @@
-#VERSION: 1.01
+#VERSION: 1.00
 #AUTHORS: Gekko Dam Beer (gekko04@users.sourceforge.net)
 from novaprinter import prettyPrinter
 import sgmllib
@@ -67,7 +67,7 @@ class isohunt(object):
 
 	def search(self, what):
 		i = 1
-		while True and i<11:
+		while True:
 			results = []
 			parser = self.SimpleSGMLParser(results, self.url)
 			dat = urllib.urlopen(self.url+'/torrents.php?ihq=%s&ihp=%s'%(what,i)).read().decode('utf-8', 'replace')
@@ -75,4 +75,4 @@ class isohunt(object):
 			parser.close()
 			if len(results) <= 0:
 				break
-			i += 1
+			i += 1

src/search_engine/engines/mininova.py

@@ -1,4 +1,4 @@
-#VERSION: 1.12
+#VERSION: 1.11
 #AUTHORS: Fabien Devaux (fab@gnux.info)
 from novaprinter import prettyPrinter
 import urllib
@@ -29,7 +29,7 @@ class mininova(object):
 			else:
 				return ''.join([ get_text(n) for n in txt.childNodes])
 		page = 1
-		while True and page<11:
+		while True:
 			res = 0
 			dat = urllib.urlopen(self.url+'/search/%s/seeds/%d'%(what, page)).read().decode('utf-8', 'replace')
 			dat = re.sub("<a href=\"http://www.boardreader.com/index.php.*\"", "<a href=\"plop\"", dat)

src/search_engine/engines/piratebay.py

@@ -1,4 +1,4 @@
-#VERSION: 1.01
+#VERSION: 1.00
 #AUTHORS: Fabien Devaux (fab@gnux.info)
 from novaprinter import prettyPrinter
 import sgmllib
@@ -68,7 +68,7 @@ class piratebay(object):
 		ret = []
 		i = 0
 		order = 'se'
-		while True and i<11:
+		while True:
 			results = []
 			parser = self.SimpleSGMLParser(results, self.url)
 			dat = urllib.urlopen(self.url+'/search/%s/%u/0/0' % (what, i)).read()
@@ -76,4 +76,4 @@ class piratebay(object):
 			parser.close()
 			if len(results) <= 0:
 				break
-			i += 1
+			i += 1