Tagged v2.3.1 release

AUTHORS

@@ -12,7 +12,7 @@ Contributors:
 * Silvan Scherrer <silvan.scherrer@aroa.ch>
 
 Code from other projects:
-* files src/qtsingleapp/* src/lineedit/*
+* files src/qtsingleapp/*
   copyright: Nokia Corporation
   license: LGPL
 
@@ -83,7 +83,7 @@ Translations authors:
   - German: Niels Hoffmann (zentralmaschine@users.sourceforge.net)
   - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net) and Stephanos Antaris (santaris@csd.auth.gr)
   - Hungarian: Majoros Péter (majoros.j.p@t-online.hu)
-  - Italian: Matteo Sechi (bu17714@gmail.com)
+  - Italian: Mirko Ferrari (mirkoferrari@gmail.com) and Ferraro Luciano (luciano.ferraro@gmail.com)
   - Japanese: Nardog (alphisation@gmail.com)
   - Korean: Jin Woo Sin (jin828sin@users.sourceforge.net)
   - Norwegian: Lars-Erik Labori (hamil@users.sourceforge.net)

Changelog

@@ -1,100 +1,11 @@
-* Wed Nov 10 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.10
-    - BUGFIX: Fix possible crash when selecting a RSS item (really closes #575624)
-    - BUGFIX: Improved IPv6 support (IP filter and Peer list)
-    - BUGFIX: Make IP filter more tolerant towards strangely formatted IPs
-    - BUGFIX: More reliable folder scanning
-    - BUGFIX: Do not create the torrent root folder at final destination if
-    torrent is in the temp dir (closes #673271)
-    - BUGFIX: Fix compilation with libnotify v0.7.0 (closes #671769)
-    - BUGFIX: Use a pointing cursor over status bar buttons
-
-* Sun Oct 31 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.9
-    - BUGFIX: Fix crash when pressing enter in save path field in torrent addition dialog
-    - BUGFIX: Fix crash when deleting a torrent with no metadata (closes #667528)
-    - BUGFIX: Fix possible crash on clicking a RSS article (closes #575624)
-    - BUGFIX: Correctly update total number of torrents when a torrent is automatically removed (closes #668726)
-    - BUGFIX: Correctly display the hash of torrents with no metadata
-    - BUGFIX: Elide status bar text if it is too wide
-    - BUGFIX: Make sure the splash screen is displayed for 2 seconds
-    - BUGFIX: Make listening on a particular interface more reliable
-    - BUGFIX: Fix torrent size update in torrent addition dialog
-    - BUGFIX: Fix possible crash on qBittorrent shutdown
-    - BUGFIX: Fix and improve file priorities editing (closes #669084)
-    - I18N: Updated Arabic, Italian and Croatian translations
-
-* Sun Oct 24 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.8
-    - BUGFIX: Fix possible crash on manual peer ban
-    - BUGFIX: Improved hostname resolution code
-    - BUGFIX: Several search plugins fixed
-    - BUGFIX: Auto-disable the shutdown feature
-    - BUGFIX: Remember the current property tab on startup
-    - BUGFIX: Fix status list widget height issue on style change
-    - BUGFIX: Fix rounding issue in torrent progress display
-    - BUGFIX: Fix issue when altering files priorities of a seeding torrent
-    - BUGFIX: Better fix for save path editing issues in torrent addition dialog
-    - BUGFIX: Peers can now be sorted by country
-
-* Tue Oct 19 2010  - Christophe Dumez <chris@qbittorrent.org> - v2.4.7
-    - BUGFIX: Display the priority column when the queueing system gets enabled
-    - BUGFIX: Fix encoding problem in file renaming
-    - BUGFIX: Delete uneeded files on torrent "soft" deletion
-    - BUGFIX: Fix issues when marking a file as 'not downloaded' causes the torrent to complete
-    - BUGFIX: Improved "Set Location" and "Change save path" dialogs
-    - BUGFIX: Fix display of queued seeding torrents
-
-* Sun Oct 17 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.6
-    - BUGFIX: Fix "torrent seeding after creation" feature
-    - BUGFIX: The properties panel data would sometimes not match the selected torrent
-    - BUGFIX: Fix detection of files at final destination when temp dir is used
-    - BUGFIX: Fix moving of a torrent to an unexisting directory
-
-* Tue Oct 12 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.5
-    - BUGFIX: Remember torrent completion date correctly
-    - BUGFIX: Fix feature to keep incomplete torrents in a separate folder
-    - BUGFIX: Fix display of URL seeds in the UI
-    - BUGFIX: Improved peer hostname resolution with caching
-    - BUGFIX: Piece availability/downloaded widgets performance improvement
-
-* Fri Oct 1 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.4
-    - BUGFIX: Clean program exit on system shutdown/logout
-    - BUGFIX: Fix possible search engine plugin update
-
-* Tue Sep 28 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.3
-    - BUGFIX: Fix encoding issue in command line parameters processing
-    - BUGFIX: Fix possible crash when changing the save path in addition dialog
-    - BUGFIX: Fix wrong mapping to source model
-
-* Sun Sep 26 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.2
-    - BUGFIX: Fix display of torrent content in addition dialog
-    - BUGFIX: Really fix manual editing of save path in torrent addition dialog
-
-* Sun Sep 26 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.1
-    - I18N: Updated Arabic translation
-    - I18N: Fixes to German translation
-    - BUGFIX: Save path can now be edited in torrent addition dialog
-    - BUGFIX: Fix save path encoding on non-utf8 systems
-    - BUGFIX: Fix saving to drive root on Windows
-    - BUGFIX: OGV can now be previewed
-    - BUGFIX: Maximum download limit is now 10MB/s
-    - BUGFIX: Fix 'download in scan dir' persistence
-    - BUGFIX: Add .torrent extension only when missing (torrent creator)
-    - BUGFIX: Fix possible issue with temporary download path persistence
-    - BUGFIX: Added support for | (OR) operator in RSS feed downloader
-    - BUGFIX: Fix Web UI for spanish users
-    - BUGFIX: Fix locale switching from Web UI
-    - BUGFIX: Use AND operator for torrentdownloads.net searches
-    - BUGFIX: Limit torrent addition dialog width to fit the screen
-    - COSMETIC: Fix progress bars style on Windows
-
-* Tue Aug 24 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.0
-    - FEATURE: Added actions to "Move to top/bottom" of priority queue
-    - FEATURE: Auto-Shutdown on downloads completion
-    - FEATURE: Email notification on download completion
-    - FEATURE: Added button to password-lock the UI
-    - FEATURE: Added label-level Pause/Resume/Delete actions
-    - FEATURE: Torrents can now be filtered by name
-    - FEATURE: Run external program on torrent completion
-    - FEATURE: Detect executable updates in order to advise the user to restart
+* Tue Aug 17 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.3.1
+    - BUGFIX: Fix compilation with gcc 4.5
+    - BUGFIX: Fix about dialog layout
+    - BUGFIX: Remember previously selected paths in torrent creation dialog
+    - BUGFIX: Added missing right-click menu icon in Web UI
+    - BUGFIX: Fix speed limit sliders initialization in Web UI
+    - BUGFIX: Priority actions are only effective if the transfer list tab is displayed
+    - BUGFIX: Fix possible folder watching issues on Windows and OS/2
 
 * Tue Jul 27 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.3.0
     - FEATURE: Simplified torrent root folder renaming/truncating (< v2.3.0 is no longer forward compatible)

qcm/qtsingleapplication.qcm

@@ -1,26 +0,0 @@
-/*
------BEGIN QCMOD-----
-name: libboost
-arg: with-qtsingleapplication=[system|shipped], Use the shipped qtsingleapplication library or the system one
------END QCMOD-----
-*/
-class qc_qtsingleapplication : public ConfObj
-{
-public:
-        qc_qtsingleapplication(Conf *c) : ConfObj(c) {}
-        QString name() const { return "qtsingleapplication library"; }
-        QString shortname() const { return "qtsingleapplication"; }
-
-        bool exec(){
-                QString s;
-                s = conf->getenv("QC_WITH_QTSINGLEAPPLICATION");
-                if(s.compare("system", Qt::CaseInsensitive) == 0) {
-                  // System
-                  conf->addDefine("USE_SYSTEM_QTSINGLEAPPLICATION");
-                  printf(" [system] ");
-                } else {
-                  printf(" [shipped] ");
-                }
-                return true;
-        }
-};

src/GUI.h

@@ -57,8 +57,6 @@ class about;
 class createtorrent;
 class downloadFromURL;
 class HidableTabWidget;
-class LineEdit;
-class QFileSystemWatcher;
 
 class GUI : public QMainWindow, private Ui::MainWindow{
   Q_OBJECT
@@ -71,7 +69,6 @@ public:
   QWidget* getCurrentTabWidget() const;
   TransferListWidget* getTransferList() const { return transferList; }
   QMenu* getTrayIconMenu();
-  PropertiesWidget *getProperties() const { return properties; }
 
 public slots:
   void trackerAuthenticationRequired(QTorrentHandle& h);
@@ -80,7 +77,6 @@ public slots:
   void downloadFromURLList(const QStringList& urls);
   void updateAltSpeedsBtn(bool alternative);
   void updateNbTorrents(unsigned int nb_downloading, unsigned int nb_seeding, unsigned int nb_active, unsigned int nb_inactive, unsigned int nb_paused);
-  void deleteBTSession();
 
 protected slots:
   // GUI related slots
@@ -101,10 +97,6 @@ protected slots:
   void handleDownloadFromUrlFailure(QString, QString) const;
   void createSystrayDelayed();
   void tab_changed(int);
-  void on_actionLock_qBittorrent_triggered();
-  void defineUILockPassword();
-  bool unlockUI();
-  void notifyOfUpdate(QString);
   // Keyboard shortcuts
   void createKeyboardShortcuts();
   void displayTransferTab() const;
@@ -138,7 +130,6 @@ protected:
   void displaySearchTab(bool enable);
 
 private:
-  QFileSystemWatcher *executable_watcher;
   // Bittorrent
   Bittorrent *BTSession;
   QList<QPair<QTorrentHandle,QString> > unauthenticated_trackers; // Still needed?
@@ -159,8 +150,6 @@ private:
   PropertiesWidget *properties;
   bool displaySpeedInTitle;
   bool force_exit;
-  bool ui_locked;
-  LineEdit *search_filter;
   // Keyboard shortcuts
   QShortcut *switchSearchShortcut;
   QShortcut *switchSearchShortcut2;
@@ -171,7 +160,6 @@ private:
   QAction *prioSeparator2;
   QSplitter *hSplitter;
   QSplitter *vSplitter;
-  QMenu *lockMenu;
   // Search
   QPointer<SearchEngine> searchEngine;
   // RSS
@@ -182,8 +170,6 @@ private slots:
     void on_actionRSS_Reader_triggered();
     void on_actionSpeed_in_title_bar_triggered();
     void on_actionTop_tool_bar_triggered();
-    void on_actionShutdown_when_downloads_complete_triggered();
-    void on_actionDonate_money_triggered();
 };
 
 #endif

src/Icons/qBittorrent.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Categories=Qt;Network;P2P;
-Comment=V2.4.10
+Comment=V2.3.1
 Exec=qbittorrent %f
 GenericName=Bittorrent client
 GenericName[ar]=العميل Bittorrent

src/Info.plist

@@ -47,7 +47,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.4.10</string>
+	<string>2.3.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>

src/about.qrc

@@ -1,6 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-  <file>gpl.html</file>
-</qresource>
-</RCC>
-

src/bittorrent.h

@@ -108,7 +108,6 @@ public:
   session* getSession() const;
   QHash<QString, TrackerInfos> getTrackersInfo(QString hash) const;
   bool hasActiveTorrents() const;
-  bool hasDownloadingTorrents() const;
   bool isQueueingEnabled() const;
   int getMaximumActiveDownloads() const;
   int getMaximumActiveTorrents() const;
@@ -200,9 +199,6 @@ protected slots:
   void takeETASamples();
   void exportTorrentFiles(QString path);
   void saveTempFastResumeData();
-  void sendNotificationEmail(QTorrentHandle h);
-  void autoRunExternalProgram(QTorrentHandle h, bool async=true);
-  void cleanUpAutoRunProcess(int);
 
 signals:
   void addedTorrent(QTorrentHandle& h);

src/createtorrent_imp.cpp

@@ -191,8 +191,7 @@ void createtorrent::on_createButton_clicked(){
   QString destination = QFileDialog::getSaveFileName(this, tr("Select destination torrent file"), last_path, tr("Torrent Files")+QString::fromUtf8(" (*.torrent)"));
   if(!destination.isEmpty()) {
     settings.setValue("CreateTorrent/last_save_path", misc::removeLastPathPart(destination));
-    if(!destination.toUpper().endsWith(".TORRENT"))
-      destination += QString::fromUtf8(".torrent");
+    destination += QString::fromUtf8(".torrent");
   } else {
     return;
   }
@@ -220,22 +219,16 @@ void createtorrent::handleCreationSuccess(QString path, QString branch_path) {
   // Remove busy cursor
   setCursor(QCursor(Qt::ArrowCursor));
   if(checkStartSeeding->isChecked()) {
-    QString root_folder;
     // Create save path temp data
     boost::intrusive_ptr<torrent_info> t;
     try {
       t = new torrent_info(path.toUtf8().data());
-      root_folder = misc::truncateRootFolder(t);
     } catch(std::exception&) {
       QMessageBox::critical(0, tr("Torrent creation"), tr("Created torrent file is invalid. It won't be added to download list."));
       return;
     }
     QString hash = misc::toQString(t->info_hash());
-    QString save_path = branch_path;
-    if(!root_folder.isEmpty()) {
-      save_path = QDir(save_path).absoluteFilePath(root_folder);
-    }
-    TorrentTempData::setSavePath(hash, save_path);
+    TorrentTempData::setSavePath(hash, branch_path);
 #if LIBTORRENT_VERSION_MINOR > 14
     // Enable seeding mode (do not recheck the files)
     TorrentTempData::setSeedingMode(hash, true);
@@ -291,7 +284,8 @@ void torrentCreatorThread::run() {
   char const* creator_str = "qBittorrent "VERSION;
   try {
     file_storage fs;
-    path full_path = complete(path(input_path.toUtf8().constData()));
+    file_pool fp;
+    path full_path = complete(path(input_path.toLocal8Bit().data()));
     // Adding files to the torrent
     add_files(fs, full_path, file_filter);
     if(abort) return;
@@ -316,7 +310,7 @@ void torrentCreatorThread::run() {
     t.set_priv(is_private);
     if(abort) return;
     // create the torrent and print it to out
-    ofstream out(complete(path((const char*)save_path.toUtf8())), std::ios_base::binary);
+    ofstream out(complete(path((const char*)save_path.toLocal8Bit())), std::ios_base::binary);
     bencode(std::ostream_iterator<char>(out), t.generate());
     emit updateProgress(100);
     emit creationSuccess(save_path, QString::fromUtf8(full_path.branch_path().string().c_str()));

src/downloadedpiecesbar.h

@@ -60,34 +60,31 @@ public:
       pix.fill();
       pixmap = pix;
     } else {
-      const qulonglong nb_pieces = pieces.size();
+      const int nb_pieces = pieces.size();
       // Reduce the number of pieces before creating the pixmap
       // otherwise it can crash when there are too many pieces
-      const uint w = width();
-      if(nb_pieces > w) {
-        const uint ratio = floor(nb_pieces/(double)w);
-        bitfield scaled_pieces(ceil(nb_pieces/(double)ratio), false);
-        bitfield scaled_downloading(ceil(nb_pieces/(double)ratio), false);
-        uint scaled_index = 0;
-        for(qulonglong i=0; i<nb_pieces; i+= ratio) {
+      if(nb_pieces > width()) {
+        const int ratio = floor(nb_pieces/(double)width());
+        std::vector<bool> scaled_pieces;
+        std::vector<bool> scaled_downloading;
+        for(int i=0; i<nb_pieces; i+= ratio) {
           bool have = true;
-          for(qulonglong j=i; j<qMin(i+ratio, nb_pieces); ++j) {
+          for(int j=i; j<qMin(i+ratio, nb_pieces); ++j) {
             if(!pieces[i]) { have = false; break; }
           }
+          scaled_pieces.push_back(have);
           if(have) {
-            scaled_pieces.set_bit(scaled_index);
+            scaled_downloading.push_back(false);
           } else {
             bool downloading = false;
-            for(qulonglong j=i; j<qMin(i+ratio, nb_pieces); ++j) {
+            for(int j=i; j<qMin(i+ratio, nb_pieces); ++j) {
               if(downloading_pieces[i]) { downloading = true; break; }
             }
-            if(downloading)
-              scaled_downloading.set_bit(scaled_index);
+            scaled_downloading.push_back(downloading);
           }
-          ++scaled_index;
         }
         QPixmap pix = QPixmap(scaled_pieces.size(), 1);
-        //pix.fill();
+        pix.fill();
         QPainter painter(&pix);
         for(uint i=0; i<scaled_pieces.size(); ++i) {
           if(scaled_pieces[i]) {
@@ -104,7 +101,7 @@ public:
         pixmap = pix;
       } else {
         QPixmap pix = QPixmap(pieces.size(), 1);
-        //pix.fill();
+        pix.fill();
         QPainter painter(&pix);
         for(uint i=0; i<pieces.size(); ++i) {
           if(pieces[i]) {

src/engineselectdlg.cpp

@@ -44,7 +44,7 @@
 #include <QTemporaryFile>
 
 enum EngineColumns {ENGINE_NAME, ENGINE_URL, ENGINE_STATE, ENGINE_ID};
-#define UPDATE_URL "http://qbittorrent.svn.sourceforge.net/viewvc/qbittorrent/branches/v2_4_x/src/search_engine/engines/"
+#define UPDATE_URL "http://qbittorrent.svn.sourceforge.net/viewvc/qbittorrent/trunk/src/search_engine/engines/"
 
 engineSelectDlg::engineSelectDlg(QWidget *parent, SupportedEngines *supported_engines) : QDialog(parent), supported_engines(supported_engines) {
   setupUi(this);
@@ -270,7 +270,6 @@ void engineSelectDlg::installPlugin(QString path, QString plugin_name) {
     // Backup in case install fails
     QFile::copy(dest_path, dest_path+".bak");
     misc::safeRemove(dest_path);
-    misc::safeRemove(dest_path+"c");
     update = true;
   }
   // Copy the plugin

src/eventmanager.cpp

@@ -38,7 +38,6 @@
 //#include "proplistdelegate.h"
 #include "torrentpersistentdata.h"
 #include <QDebug>
-#include <QTranslator>
 
 EventManager::EventManager(QObject *parent, Bittorrent *BTSession)
   : QObject(parent), BTSession(BTSession)
@@ -125,20 +124,8 @@ QList<QVariantMap> EventManager::getPropFilesInfo(QString hash) const {
 
 void EventManager::setGlobalPreferences(QVariantMap m) const {
   // UI
-  if(m.contains("locale")) {
-    QString locale = m["locale"].toString();
-    if(Preferences::getLocale() != locale) {
-      QTranslator *translator = new QTranslator;
-      if(translator->load(QString::fromUtf8(":/lang/qbittorrent_") + locale)){
-        qDebug("%s locale recognized, using translation.", qPrintable(locale));
-      }else{
-        qDebug("%s locale unrecognized, using default (en_GB).", qPrintable(locale));
-      }
-      qApp->installTranslator(translator);
-    }
-
-    Preferences::setLocale(locale);
-  }
+  if(m.contains("locale"))
+    Preferences::setLocale(m["locale"].toString());
   // Downloads
   if(m.contains("save_path"))
     Preferences::setSavePath(m["save_path"].toString());
@@ -176,16 +163,6 @@ void EventManager::setGlobalPreferences(QVariantMap m) const {
   }
   if(m.contains("export_dir"))
     Preferences::setExportDir(m["export_dir"].toString());
-  if(m.contains("mail_notification_enabled"))
-    Preferences::setMailNotificationEnabled(m["mail_notification_enabled"].toBool());
-  if(m.contains("mail_notification_email"))
-    Preferences::setMailNotificationEmail(m["mail_notification_email"].toString());
-  if(m.contains("mail_notification_smtp"))
-    Preferences::setMailNotificationSMTP(m["mail_notification_smtp"].toString());
-  if(m.contains("autorun_enabled"))
-    Preferences::setAutoRunEnabled(m["autorun_enabled"].toBool());
-  if(m.contains("autorun_program"))
-    Preferences::setAutoRunProgram(m["autorun_program"].toString());
   if(m.contains("preallocate_all"))
     Preferences::preAllocateAllFiles(m["preallocate_all"].toBool());
   if(m.contains("queueing_enabled"))
@@ -288,11 +265,6 @@ QVariantMap EventManager::getGlobalPreferences() const {
   data["download_in_scan_dirs"] = var_list;
   data["export_dir_enabled"] = Preferences::isTorrentExportEnabled();
   data["export_dir"] = Preferences::getExportDir();
-  data["mail_notification_enabled"] = Preferences::isMailNotificationEnabled();
-  data["mail_notification_email"] = Preferences::getMailNotificationEmail();
-  data["mail_notification_smtp"] = Preferences::getMailNotificationSMTP();
-  data["autorun_enabled"] = Preferences::isAutoRunEnabled();
-  data["autorun_program"] = Preferences::getAutoRunProgram();
   data["preallocate_all"] = Preferences::preAllocateAllFiles();
   data["queueing_enabled"] = Preferences::isQueueingSystemEnabled();
   data["max_active_downloads"] = Preferences::getMaxActiveDownloads();

src/feeddownloader.h

@@ -105,7 +105,7 @@ public:
 
   QStringList getNotMatchingTokens() const {
     QString notmatching = this->value("not", "").toString();
-    return notmatching.split(QRegExp("[\\s|]"));
+    return notmatching.split(" ");
   }
 
   QString getNotMatchingTokens_str() const {

src/filesystemwatcher.h

@@ -19,8 +19,6 @@
 #endif
 #endif
 
-#include "misc.h"
-
 #ifndef CIFS_MAGIC_NUMBER
 #define CIFS_MAGIC_NUMBER 0xFF534D42
 #endif
@@ -29,9 +27,6 @@
 #define NFS_SUPER_MAGIC 0x6969
 #endif
 
-const int WATCH_INTERVAL = 10000; // 10 sec
-const int MAX_PARTIAL_RETRIES = 5;
-
 /*
  * Subclassing QFileSystemWatcher in order to support Network File
  * System watching (NFS, CIFS) on Linux and Mac OS.
@@ -44,14 +39,11 @@ private:
   QList<QDir> watched_folders;
   QPointer<QTimer> watch_timer;
 #endif
-  QStringList m_filters;
-  // Partial torrents
-  QHash<QString, int> m_partialTorrents;
-  QPointer<QTimer> m_partialTorrentTimer;
+  QStringList filters;
 
 #ifndef Q_WS_WIN
-private:
-  static bool isNetworkFileSystem(QString path) {
+protected:
+  bool isNetworkFileSystem(QString path) {
     QString file = path;
     if(!file.endsWith(QDir::separator()))
       file += QDir::separator();
@@ -107,7 +99,7 @@ private:
 
 public:
   FileSystemWatcher(QObject *parent): QFileSystemWatcher(parent) {
-    m_filters << "*.torrent";
+    filters << "*.torrent";
     connect(this, SIGNAL(directoryChanged(QString)), this, SLOT(scanLocalFolder(QString)));
   }
 
@@ -116,8 +108,6 @@ public:
     if(watch_timer)
       delete watch_timer;
 #endif
-    if(m_partialTorrentTimer)
-      delete m_partialTorrentTimer;
   }
 
   QStringList directories() const {
@@ -147,7 +137,7 @@ public:
       if (!watch_timer) {
         watch_timer = new QTimer(this);
         connect(watch_timer, SIGNAL(timeout()), this, SLOT(scanNetworkFolders()));
-        watch_timer->start(WATCH_INTERVAL); // 5 sec
+        watch_timer->start(5000); // 5 sec
       }
     } else {
 #endif
@@ -206,72 +196,18 @@ protected slots:
 #endif
   }
 
-  void processPartialTorrents() {
-    QStringList no_longer_partial;
-
-    // Check which torrents are still partial
-    foreach(const QString& torrent_path, m_partialTorrents.keys()) {
-      if(!QFile::exists(torrent_path)) {
-        m_partialTorrents.remove(torrent_path);
-        continue;
-      }
-      if(misc::isValidTorrentFile(torrent_path)) {
-        no_longer_partial << torrent_path;
-         m_partialTorrents.remove(torrent_path);
-      } else {
-        if(m_partialTorrents[torrent_path] >= MAX_PARTIAL_RETRIES) {
-          m_partialTorrents.remove(torrent_path);
-          QFile::rename(torrent_path, torrent_path+".invalid");
-        } else {
-          m_partialTorrents[torrent_path]++;
-        }
-      }
-    }
-
-    // Stop the partial timer if necessary
-    if(m_partialTorrents.empty()) {
-      m_partialTorrentTimer->stop();
-      m_partialTorrentTimer->deleteLater();
-      qDebug("No longer any partial torrent.");
-    } else {
-      qDebug("Still %d partial torrents after delayed processing.", m_partialTorrents.count());
-      m_partialTorrentTimer->start(WATCH_INTERVAL);
-    }
-    // Notify of new torrents
-    if(!no_longer_partial.isEmpty())
-      emit torrentsAdded(no_longer_partial);
-  }
-
 signals:
   void torrentsAdded(QStringList &pathList);
 
 private:
-  void startPartialTorrentTimer() {
-    Q_ASSERT(!m_partialTorrents.isEmpty());
-    if(!m_partialTorrentTimer) {
-      m_partialTorrentTimer = new QTimer();
-      connect(m_partialTorrentTimer, SIGNAL(timeout()), SLOT(processPartialTorrents()));
-      m_partialTorrentTimer->setSingleShot(true);
-      m_partialTorrentTimer->start(WATCH_INTERVAL);
-    }
-  }
-
   void addTorrentsFromDir(const QDir &dir, QStringList &torrents) {
-    const QStringList files = dir.entryList(m_filters, QDir::Files, QDir::Unsorted);
-    foreach(const QString &file, files) {
-      const QString file_abspath = dir.absoluteFilePath(file);
-      if(misc::isValidTorrentFile(file_abspath)) {
-        torrents << file_abspath;
-      } else {
-        if(!m_partialTorrents.contains(file_abspath)) {
-          qDebug("Partial torrent detected at: %s", qPrintable(file_abspath));
-          qDebug("Delay the file's processing...");
-          m_partialTorrents.insert(file_abspath, 0);
-        }
-      }
-    }
-    if(!m_partialTorrents.empty())
-      startPartialTorrentTimer();
+    const QStringList files = dir.entryList(filters, QDir::Files, QDir::Unsorted);
+    foreach(const QString &file, files)
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
+      torrents << dir.absoluteFilePath(file).replace("/", "\\");
+#else
+      torrents << dir.absoluteFilePath(file);
+#endif
   }
 
 };

src/httpconnection.cpp

@@ -109,7 +109,7 @@ QString HttpConnection::translateDocument(QString data) {
   bool found = false;
   do {
     found = false;
-    QRegExp regex(QString::fromUtf8("_\\(([\\w\\s?!:\\/\\(\\),%µ&\\-\\.]+)\\)"));
+    QRegExp regex(QString::fromUtf8("_\\(([\\w\\s?!:\\/\\(\\),µ&\\-\\.]+)\\)"));
     i = regex.indexIn(data, i);
     if(i >= 0) {
       //qDebug("Found translatable string: %s", regex.cap(1).toUtf8().data());
@@ -161,7 +161,7 @@ void HttpConnection::respond() {
     write();
     return;
   }
-  // Client successfully authenticated, reset number of failed attempts
+  // Client sucessfuly authenticated, reset number of failed attempts
   parent->resetNbFailedAttemptsForIp(peer_ip);
   QString url  = parser.url();
   // Favicon
@@ -500,16 +500,6 @@ void HttpConnection::respondCommand(QString command)
     if(h.is_valid()) h.queue_position_down();
     return;
   }
-  if(command == "topPrio") {
-    QTorrentHandle h = BTSession->getTorrentHandle(parser.post("hash"));
-    if(h.is_valid()) h.queue_position_top();
-    return;
-  }
-  if(command == "bottomPrio") {
-    QTorrentHandle h = BTSession->getTorrentHandle(parser.post("hash"));
-    if(h.is_valid()) h.queue_position_bottom();
-    return;
-  }
   if(command == "recheck"){
     recheckTorrent(parser.post("hash"));
     return;

src/httpconnection.h

@@ -54,7 +54,7 @@ class HttpConnection : public QObject
 
 	protected slots:
 		void write();
-		void respond();
+		virtual void respond();
 		void respondJson();
                 void respondGenPropertiesJson(QString hash);
                 void respondTrackersPropertiesJson(QString hash);

src/httpresponsegenerator.h

@@ -44,7 +44,7 @@ class HttpResponseGenerator : public QHttpResponseHeader
 		void setMessage(const QString message);
 		void stripMessage();
 		void setContentTypeByExt(const QString ext);
-		QByteArray toByteArray() const;
+		virtual QByteArray toByteArray() const;
 };
 
 #endif

src/icons.qrc

@@ -49,7 +49,6 @@
   <file>Icons/skin/queued.png</file>
   <file>Icons/skin/checking.png</file>
   <file>Icons/skin/handle-icon.gif</file>
-  <file>Icons/skin/arrow-right.gif</file>
   <file>Icons/skin/filterinactive.png</file>
   <file>Icons/skin/decrease.png</file>
   <file>Icons/skin/play22.png</file>
@@ -133,10 +132,8 @@
   <file>Icons/oxygen/edit-copy.png</file>
   <file>Icons/oxygen/folder-documents.png</file>
   <file>Icons/oxygen/urlseed.png</file>
-  <file>Icons/oxygen/go-up.png</file>
   <file>Icons/oxygen/edit-cut.png</file>
   <file>Icons/oxygen/gear32.png</file>
-  <file>Icons/oxygen/go-bottom.png</file>
   <file>Icons/oxygen/user-group-delete.png</file>
   <file>Icons/oxygen/unsubscribe.png</file>
   <file>Icons/oxygen/tab-close.png</file>
@@ -153,15 +150,12 @@
   <file>Icons/oxygen/cookies.png</file>
   <file>Icons/oxygen/network-server.png</file>
   <file>Icons/oxygen/unsubscribe16.png</file>
-  <file>Icons/oxygen/encrypted32.png</file>
   <file>Icons/oxygen/list-add.png</file>
   <file>Icons/oxygen/edit-paste.png</file>
   <file>Icons/oxygen/folder-remote.png</file>
   <file>Icons/oxygen/help-about.png</file>
   <file>Icons/oxygen/encrypted.png</file>
   <file>Icons/oxygen/folder-remote16.png</file>
-  <file>Icons/oxygen/go-top.png</file>
-  <file>Icons/oxygen/emblem-favorite.png</file>
   <file>Icons/oxygen/edit_clear.png</file>
   <file>Icons/oxygen/bug.png</file>
   <file>Icons/oxygen/gear.png</file>
@@ -172,7 +166,6 @@
   <file>Icons/oxygen/button_cancel.png</file>
   <file>Icons/oxygen/preferences-desktop.png</file>
   <file>Icons/oxygen/bt_settings.png</file>
-  <file>Icons/oxygen/go-down.png</file>
   <file>Icons/oxygen/subscribe16.png</file>
   <file>Icons/oxygen/download.png</file>
   <file>Icons/oxygen/log.png</file>

src/json.h

@@ -132,7 +132,6 @@ namespace json {
           tmp += c;
         }
       }
-      if(!tmp.isEmpty()) couples << tmp;
       foreach(QString couple, couples) {
         QStringList parts = couple.split(":");
         if(parts.size() != 2) continue;