Tagged v2.4.0beta1 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
 

Changelog

@@ -1,56 +1,7 @@
-* 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
-    - FEATURE: Added button to password-lock the UI
+    - FEATURE: Added Auto-Shutdown on downloads completion feature
     - 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 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

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

@@ -200,9 +200,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

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

src/icons.qrc

@@ -153,7 +153,6 @@
   <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>

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;