Tagged v2.4.0rc3 release

Changelog

@@ -1,48 +1,4 @@
-* 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
+* Unreleased - 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

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.cpp

@@ -42,7 +42,6 @@
 #include <QClipboard>
 #include <QCloseEvent>
 #include <QShortcut>
-#include <QScrollBar>
 
 #include "GUI.h"
 #include "transferlistwidget.h"
@@ -72,7 +71,6 @@
 void qt_mac_set_dock_menu(QMenu *menu);
 #endif
 #include "lineedit.h"
-#include "sessionapplication.h"
 
 using namespace libtorrent;
 
@@ -90,8 +88,6 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), for
   ui_locked = Preferences::isUILocked();
   setWindowTitle(tr("qBittorrent %1", "e.g: qBittorrent v0.x").arg(QString::fromUtf8(VERSION)));
   displaySpeedInTitle = Preferences::speedInTitleBar();
-  // Clean exit on log out
-  connect(static_cast<SessionApplication*>(qApp), SIGNAL(sessionIsShuttingDown()), this, SLOT(deleteBTSession()));
   // Setting icons
   this->setWindowIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png")));
   actionOpen->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/open.png")));
@@ -114,7 +110,7 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), for
   actionSet_global_download_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/download.png")));
   actionDocumentation->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/qb_question.png")));
   actionLock_qBittorrent->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/encrypted32.png")));
-  lockMenu = new QMenu();
+  QMenu *lockMenu = new QMenu();
   QAction *defineUiLockPasswdAct = lockMenu->addAction(tr("Set the password..."));
   connect(defineUiLockPasswdAct, SIGNAL(triggered()), this, SLOT(defineUILockPassword()));
   actionLock_qBittorrent->setMenu(lockMenu);
@@ -252,16 +248,6 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), for
 #endif
 }
 
-void GUI::deleteBTSession() {
-  guiUpdater->stop();
-  status_bar->stopTimer();
-  if(BTSession) {
-    delete BTSession;
-    BTSession = 0;
-  }
-  QTimer::singleShot(0, this, SLOT(close()));
-}
-
 // Destructor
 GUI::~GUI() {
   qDebug("GUI destruction");
@@ -272,9 +258,7 @@ GUI::~GUI() {
 #endif
   // Async deletion of Bittorrent session as early as possible
   // in order to speed up exit
-  session_proxy sp;
-  if(BTSession)
-    sp = BTSession->asyncDeletion();
+  session_proxy sp = BTSession->asyncDeletion();
   // Some saving
   properties->saveSettings();
   disconnect(tabs, SIGNAL(currentChanged(int)), this, SLOT(tab_changed(int)));
@@ -285,7 +269,6 @@ GUI::~GUI() {
   delete search_filter;
   delete transferList;
   delete guiUpdater;
-  delete lockMenu;
   if(createTorrentDlg)
     delete createTorrentDlg;
   if(console)
@@ -679,7 +662,7 @@ void GUI::closeEvent(QCloseEvent *e) {
     e->accept();
     return;
   }
-  if(settings.value(QString::fromUtf8("Preferences/General/ExitConfirm"), true).toBool() && BTSession && BTSession->hasActiveTorrents()) {
+  if(settings.value(QString::fromUtf8("Preferences/General/ExitConfirm"), true).toBool() && BTSession->hasActiveTorrents()) {
     if(e->spontaneous() || force_exit) {
       if(!isVisible())
         show();

src/GUI.h

@@ -80,7 +80,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
@@ -171,7 +170,6 @@ private:
   QAction *prioSeparator2;
   QSplitter *hSplitter;
   QSplitter *vSplitter;
-  QMenu *lockMenu;
   // Search
   QPointer<SearchEngine> searchEngine;
   // RSS

src/Icons/qBittorrent.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Categories=Qt;Network;P2P;
-Comment=V2.4.6
+Comment=V2.4.0
 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.6</string>
+	<string>2.4.0</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.cpp

@@ -165,7 +165,6 @@ Bittorrent::~Bittorrent() {
 #endif
     saveSessionState();
     saveFastResumeData();
-    qDebug("Deleting the session");
     // Delete session
     session_proxy sp = s->abort();
     delete s;
@@ -864,17 +863,17 @@ QTorrentHandle Bittorrent::addMagnetUri(QString magnet_uri, bool resumed) {
   }
   QString torrent_name = misc::magnetUriToName(magnet_uri);
   const QString savePath(getSavePath(hash, false, QString::null, torrent_name));
-  if(!defaultTempPath.isEmpty() && !TorrentPersistentData::isSeed(hash) && resumed) {
+  if(!defaultTempPath.isEmpty() && resumed && !TorrentPersistentData::isSeed(hash)) {
     qDebug("addMagnetURI: Temp folder is enabled.");
     qDebug("addTorrent::Temp folder is enabled.");
     QString torrent_tmp_path = defaultTempPath.replace("\\", "/");
-    p.save_path = torrent_tmp_path.toUtf8().constData();
+    p.save_path = torrent_tmp_path.toLocal8Bit().constData();
     // Check if save path exists, creating it otherwise
     if(!QDir(torrent_tmp_path).exists())
       QDir().mkpath(torrent_tmp_path);
     qDebug("addMagnetURI: using save_path: %s", qPrintable(torrent_tmp_path));
   } else {
-    p.save_path = savePath.toUtf8().constData();
+    p.save_path = savePath.toLocal8Bit().constData();
     // Check if save path exists, creating it otherwise
     if(!QDir(savePath).exists())
       QDir().mkpath(savePath);
@@ -913,10 +912,10 @@ QTorrentHandle Bittorrent::addMagnetUri(QString magnet_uri, bool resumed) {
   Q_ASSERT(h.hash() == hash);
 
   // If temp path is enabled, move torrent
-  if(!defaultTempPath.isEmpty() && !resumed) {
+  /*if(!defaultTempPath.isEmpty() && !resumed) {
     qDebug("Temp folder is enabled, moving new torrent to temp folder");
     h.move_storage(defaultTempPath);
-  }
+  }*/
 
   // Connections limit per torrent
   h.set_max_connections(Preferences::getMaxConnecsPerTorrent());
@@ -1096,7 +1095,6 @@ QTorrentHandle Bittorrent::addTorrent(QString path, bool fromScanDir, QString fr
   }
   // Actually add the torrent
   QString root_folder = misc::truncateRootFolder(t);
-  qDebug("Truncated root folder: %s", qPrintable(root_folder));
   add_torrent_params p;
   //Getting fast resume data if existing
   std::vector<char> buf;
@@ -1116,20 +1114,20 @@ QTorrentHandle Bittorrent::addTorrent(QString path, bool fromScanDir, QString fr
   } else {
     savePath = getSavePath(hash, fromScanDir, path, root_folder);
   }
-  if(!defaultTempPath.isEmpty() && !TorrentPersistentData::isSeed(hash) && resumed) {
+  if(!defaultTempPath.isEmpty() && resumed && !TorrentPersistentData::isSeed(hash)) {
     qDebug("addTorrent::Temp folder is enabled.");
     QString torrent_tmp_path = defaultTempPath.replace("\\", "/");
     if(!root_folder.isEmpty()) {
       if(!torrent_tmp_path.endsWith("/")) torrent_tmp_path += "/";
       torrent_tmp_path += root_folder;
     }
-    p.save_path = torrent_tmp_path.toUtf8().constData();
+    p.save_path = torrent_tmp_path.toLocal8Bit().constData();
     // Check if save path exists, creating it otherwise
     if(!QDir(torrent_tmp_path).exists())
       QDir().mkpath(torrent_tmp_path);
     qDebug("addTorrent: using save_path: %s", qPrintable(torrent_tmp_path));
   } else {
-    p.save_path = savePath.toUtf8().constData();
+    p.save_path = savePath.toLocal8Bit().constData();
     // Check if save path exists, creating it otherwise
     if(!QDir(savePath).exists())
       QDir().mkpath(savePath);
@@ -1172,7 +1170,7 @@ QTorrentHandle Bittorrent::addTorrent(QString path, bool fromScanDir, QString fr
   TorrentPersistentData::setRootFolder(hash, root_folder);
 
   // If temp path is enabled, move torrent
-  if(!defaultTempPath.isEmpty() && !resumed) {
+  /*if(!defaultTempPath.isEmpty() && !resumed) {
     qDebug("Temp folder is enabled, moving new torrent to temp folder");
     QString torrent_tmp_path = defaultTempPath.replace("\\", "/");
     if(!root_folder.isEmpty()) {
@@ -1180,7 +1178,7 @@ QTorrentHandle Bittorrent::addTorrent(QString path, bool fromScanDir, QString fr
       torrent_tmp_path += root_folder;
     }
     h.move_storage(torrent_tmp_path);
-  }
+  }*/
 
   // Connections limit per torrent
   h.set_max_connections(Preferences::getMaxConnecsPerTorrent());
@@ -1543,7 +1541,6 @@ void Bittorrent::saveTempFastResumeData() {
 // Only save fast resume data for unfinished and unpaused torrents (Optimization)
 // Called periodically and on exit
 void Bittorrent::saveFastResumeData() {
-  qDebug("Saving fast resume data...");
   // Stop listening for alerts
   resumeDataTimer.stop();
   timerAlerts->stop();
@@ -2017,6 +2014,7 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
       if (torrent_finished_alert* p = dynamic_cast<torrent_finished_alert*>(a.get())) {
         QTorrentHandle h(p->handle);
         if(h.is_valid()) {
+          emit finishedTorrent(h);
           const QString hash = h.hash();
 #if LIBTORRENT_VERSION_MINOR > 14
           // Remove .!qB extension if necessary
@@ -2048,23 +2046,27 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
                 }
               }
             }
-            // Move to download directory if necessary
-            if(!defaultTempPath.isEmpty()) {
-              // Check if directory is different
-              const QDir current_dir(h.save_path());
-              const QDir save_dir(getSavePath(hash));
-              if(current_dir != save_dir) {
-                h.move_storage(save_dir.absolutePath());
-              }
+          }
+          // Move to download directory if necessary
+          if(!defaultTempPath.isEmpty()) {
+            // Check if directory is different
+            const QDir current_dir(h.save_path());
+            const QDir save_dir(getSavePath(hash));
+            if(current_dir != save_dir) {
+              h.move_storage(save_dir.absolutePath());
             }
+          }
+          // Recheck if the user asked to
+          if(Preferences::recheckTorrentsOnCompletion() && !was_already_seeded) {
             // Remember finished state
             TorrentPersistentData::saveSeedStatus(h);
-            // Recheck if the user asked to
-            if(Preferences::recheckTorrentsOnCompletion()) {
-              h.force_recheck();
-            }
-            emit finishedTorrent(h);
-            qDebug("Received finished alert for %s", qPrintable(h.name()));
+            h.force_recheck();
+          } else {
+            // Remember finished state
+            TorrentPersistentData::saveSeedStatus(h);
+          }
+          qDebug("Received finished alert for %s", qPrintable(h.name()));
+          if(!was_already_seeded) {
             bool will_shutdown = Preferences::shutdownWhenDownloadsComplete() && !hasDownloadingTorrents();
             // AutoRun program
             if(Preferences::isAutoRunEnabled())
@@ -2488,10 +2490,7 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
         qDebug("getSavePath, got save_path from persistent data: %s", qPrintable(savePath));
       }
       // Clean path
-      savePath = savePath.replace("\\", "/");
       savePath = misc::expandPath(savePath);
-      if(!savePath.endsWith("/"))
-        savePath += "/";
       return savePath;
     }
 

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

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

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/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;

src/lang/qbittorrent_en.ts

@@ -2988,12 +2988,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ScanFoldersModel</name>
     <message>
-        <location filename="../scannedfoldersmodel.cpp" line="103"/>
+        <location filename="../scannedfoldersmodel.cpp" line="102"/>
         <source>Watched Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../scannedfoldersmodel.cpp" line="104"/>
+        <location filename="../scannedfoldersmodel.cpp" line="103"/>
         <source>Download here</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4243,14 +4243,14 @@ Please install it manually.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../createtorrent_imp.cpp" line="214"/>
-        <location filename="../createtorrent_imp.cpp" line="228"/>
-        <location filename="../createtorrent_imp.cpp" line="239"/>
+        <location filename="../createtorrent_imp.cpp" line="213"/>
+        <location filename="../createtorrent_imp.cpp" line="227"/>
+        <location filename="../createtorrent_imp.cpp" line="238"/>
         <source>Torrent creation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../createtorrent_imp.cpp" line="239"/>
+        <location filename="../createtorrent_imp.cpp" line="238"/>
         <source>Torrent was created successfully:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4265,7 +4265,7 @@ Please install it manually.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../createtorrent_imp.cpp" line="214"/>
+        <location filename="../createtorrent_imp.cpp" line="213"/>
         <source>Torrent creation was unsuccessful, reason: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4291,7 +4291,7 @@ Please install it manually.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../createtorrent_imp.cpp" line="228"/>
+        <location filename="../createtorrent_imp.cpp" line="227"/>
         <source>Created torrent file is invalid. It won&apos;t be added to download list.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4686,13 +4686,13 @@ However, those plugins were disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../misc.cpp" line="666"/>
+        <location filename="../misc.cpp" line="665"/>
         <source>%1h %2m</source>
         <comment>e.g: 3hours 5minutes</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../misc.cpp" line="671"/>
+        <location filename="../misc.cpp" line="670"/>
         <source>%1d %2h</source>
         <comment>e.g: 2days 10hours</comment>
         <translation type="unfinished"></translation>
@@ -4709,21 +4709,21 @@ However, those plugins were disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../misc.cpp" line="614"/>
-        <location filename="../misc.cpp" line="619"/>
-        <location filename="../misc.cpp" line="623"/>
-        <location filename="../misc.cpp" line="626"/>
+        <location filename="../misc.cpp" line="613"/>
+        <location filename="../misc.cpp" line="618"/>
+        <location filename="../misc.cpp" line="622"/>
+        <location filename="../misc.cpp" line="625"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../misc.cpp" line="657"/>
+        <location filename="../misc.cpp" line="656"/>
         <source>&lt; 1m</source>
         <comment>&lt; 1 minute</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../misc.cpp" line="661"/>
+        <location filename="../misc.cpp" line="660"/>
         <source>%1m</source>
         <comment>e.g: 10minutes</comment>
         <translation type="unfinished"></translation>
@@ -4732,58 +4732,58 @@ However, those plugins were disabled.</source>
 <context>
     <name>options_imp</name>
     <message>
-        <location filename="../options_imp.cpp" line="1217"/>
-        <location filename="../options_imp.cpp" line="1219"/>
+        <location filename="../options_imp.cpp" line="1216"/>
+        <location filename="../options_imp.cpp" line="1218"/>
         <source>Choose export directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../options_imp.cpp" line="1252"/>
-        <location filename="../options_imp.cpp" line="1254"/>
-        <location filename="../options_imp.cpp" line="1269"/>
-        <location filename="../options_imp.cpp" line="1271"/>
+        <location filename="../options_imp.cpp" line="1251"/>
+        <location filename="../options_imp.cpp" line="1253"/>
+        <location filename="../options_imp.cpp" line="1268"/>
+        <location filename="../options_imp.cpp" line="1270"/>
         <source>Choose a save directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../options_imp.cpp" line="1234"/>
-        <location filename="../options_imp.cpp" line="1236"/>
+        <location filename="../options_imp.cpp" line="1233"/>
+        <location filename="../options_imp.cpp" line="1235"/>
         <source>Choose an ip filter file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../options_imp.cpp" line="1174"/>
+        <location filename="../options_imp.cpp" line="1173"/>
         <source>Add directory to scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../options_imp.cpp" line="1180"/>
+        <location filename="../options_imp.cpp" line="1179"/>
         <source>Folder is already being watched.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../options_imp.cpp" line="1183"/>
+        <location filename="../options_imp.cpp" line="1182"/>
         <source>Folder does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../options_imp.cpp" line="1186"/>
+        <location filename="../options_imp.cpp" line="1185"/>
         <source>Folder is not readable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../options_imp.cpp" line="1194"/>
+        <location filename="../options_imp.cpp" line="1193"/>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../options_imp.cpp" line="1194"/>
+        <location filename="../options_imp.cpp" line="1193"/>
         <source>Failed to add Scan Folder &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../options_imp.cpp" line="1234"/>
-        <location filename="../options_imp.cpp" line="1236"/>
+        <location filename="../options_imp.cpp" line="1233"/>
+        <location filename="../options_imp.cpp" line="1235"/>
         <source>Filters</source>
         <translation type="unfinished"></translation>
     </message>