Bump to 3.1.9.2

This is an excuse to produce new builds with an OpenSSL version that isn't affected by the heartbleed bug for Windows and Mac. This bug should only affect the WebUI and only if HTTPS/SSL authentication was enabled.

.travis.yml

@@ -43,7 +43,7 @@ before_install:
 
 install:
   - if [[ "$lt_source" == "from_dist" ]]; then sudo apt-get -qq install libtorrent-rasterbar-dev; fi
-  - if [[ "$lt_source" == "from_svn" ]]; then cd .. && svn co svn://svn.code.sf.net/p/libtorrent/code/branches/RC_0_16 ./libtorrent && (cd libtorrent && ./autotool.sh && ./configure $ltconf && sudo make install) && sudo ldconfig /usr/local/lib && cd $TRAVIS_BUILD_DIR ; fi
+  - if [[ "$lt_source" == "from_svn" ]]; then cd .. && svn co http://libtorrent.googlecode.com/svn/branches/RC_0_16 ./libtorrent && (cd libtorrent && ./autotool.sh && ./configure $ltconf && sudo make install) && sudo ldconfig /usr/local/lib && cd $TRAVIS_BUILD_DIR ; fi
 
 script:
   - qt-qconf

Changelog

@@ -1,3 +1,99 @@
+* Tue Apr 29 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.9.2
+    - OTHER: The v3.1.9.1 Windows build was broken
+
+* Mon Apr 28 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.9.1
+    - OTHER: This is an excuse to produce new builds with an OpenSSL version that isn't affected by the heartbleed bug for Windows and Mac. This bug should only affect the WebUI and only if HTTPS/SSL authentication was enabled.
+
+* Sat Mar 01 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.9
+    - BUGFIX: Fix nox build. Closes #1368 (bob23450)
+    - BUGFIX: Fix build with libtorrent 0.15.x (sledgehammer999)
+    - BUGFIX: Fix missing percentage signs. Closes #1392. (sledgehammer999)
+    - BUGFIX: Fix queue sorting order. (alfrix)
+    - BUGFIX: Fix build using qt < 4.7 Closes #1385. (Evgeny Lensky)
+    - BUGFIX: Fix autoupdater. Send our user-agent to sourceforge.net (sledgehammer999)
+    - FEATURE: Add button for links in toolbar (alfrix)
+
+* Sun Feb 02 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.8
+    - BUGFIX: Really fix build of v3.1.6
+
+* Sun Feb 02 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.7
+    - BUGFIX: Fix build of v3.1.6
+
+* Sun Feb 02 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.6
+    - BUGFIX: Fix 'preview file' regression. Closes #1285. (sledgehammer999)
+    - BUGFIX: Fix peers and seeds sorting in transfer list. (Angel Alonso)
+    - BUGFIX: Fix btdigg search engine. (BTDigg research team)
+    - BUGFIX: Save statistics every 15min and only if there was new traffic. Fixes #1288 and partially #1272. (sledgehammer999)
+    - BUGFIX: Fix share ratio text in the 'general' tab. (sledgehammer999)
+    - BUGFIX: Output a more generic message when blocking IPs and don't use italics in the log. (sledgehammer999)
+    - BUGFIX: Allow 2 decimals when setting the share ratio. Closes #1303. (sledgehammer999)
+    - BUGFIX: Fix extratorrents search plugin. (sledgehammer999)
+    - BUGFIX: Use shorter names for amount columns in main UI (Gelmir)
+    - BUGFIX: Fix overstretched options dialog. Closes #1293. (sledgehammer999)
+    - BUGFIX: Don't show a popup menu when no torrent is selected. (sledgehammer999)
+    - BUGFIX: Launch external programs async and don't block. Closes #1252. (sledgehammer999)
+    - BUGFIX: Don't re-announce to trackers when torrent is paused. Closes #1310. (sledgehammer999)
+    - BUGFIX: Bring dialog boxes in the front when qbt doesn't have focus. (sledgehammer999)
+    - BUGFIX: Correctly resize 'name' column of the content tab. Closes #1360. (sledgehammer999)
+    - BUGFIX: Correctly restore 'name' column width when loading magnet links in the 'Add new torrent dialog'. Closes #1334. (sledgehammer999)
+    - WEBUI: Fix sorting by size in WebUI when non-default locale used. (Vladimir Golovnev)
+    - UI: Reposition statistics menu item. (sledgehammer999)
+    - UI: Convert more accurately decimal numbers to text. (sledgehammer999)
+    - WINDOWS/OSX: Improvements on the behavior of the program updater(closes #1282) (sledgehammer999)
+    - LINUX: Explicitle tell that we don't support freedesktop's startup notify standard. Fixes GNOME issues. Closes #1217. (sledgehammer999)
+    - LINUX: Add our WM_CLASS in the .desktop file so window managers know how to group our windows. (sledgehammer999)
+    - OTHER: Sync translations from Transifex.
+
+* Thu 16 Jan 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.5
+    - BUGFIX: Fix compilation with Qt 4.7. Closes #1215. (sledgehammer999)
+    - BUGFIX: Third attempt at fixing saving settings on OS shutdown. (sledgehammer999)
+    - BUGFIX: Preview now correctly uses the selected file. Closes #1222 #1182. (sledgehammer999)
+    - BUGFIX: Allow to resize the columns in Add New Torrent dialog. Closes #1207 #676 (sledgehammer999)
+    - BUGFIX: Ensure that at least one column in the tranferlist is always visible. Closes #1165. (sledgehammer999)
+    - BUGFIX: Ensure that the options window will always be placed onscreen. Closes #1226. (sledgehammer999)
+    - BUGFIX: Delete temporary files after they aren't needed. Closes #1188. (sledgehammer999)
+    - BUGFIX: Correctly detect libtorrent version. (sledgehammer999)
+    - BUGFIX: Various code cppcheck fixes (Konstantin Goncharik)
+    - BUGFIX: Remove isohunt search engine and update thepiratebay url (sledgehammer999)
+    - BUGFIX: Fix rss settings corruption when checking regexp and going to other rule. (Gelmir)
+    - BUGFIX: Don't count paused torrents for the autoshutdown. Closes #1280. (sledgehammer999)
+    - LINUX: Fix notifications with xfce4-notifyd.
+    - OSX: Added basic retina support. Closes #1251. (Sébastien Lavoie)
+    - OTHER: Sync translations from Transifex.
+
+* Sun 29 Dec 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.4
+    - FEATURE: Statistics dialog (Gelmir)
+    - FEATURE: Tooltips explaining each peer's connection flags (sledgehammer999)
+    - FEATURE: Win/Mac Check for program updates every 15min and allow the user to manually check for updates through the help menu. (sledgehammer999)
+    - BUGFIX: Better dialog message for torrent delete confirmation (sledgehammer999)
+    - BUGFIX: Fix resizing grip location. Closes #1146. (sledgehammer999)
+    - BUGFIX: Lock toolbar in place. Closes #1144. (sledgehammer999)
+    - BUGFIX: Second attempt at fixing saving settings on shutdown. (sledgehammer999)
+    - BUGFIX: Sort labels in 'Add new torrent' dialog. Closes #1150 #411. (sledgehammer999)
+    - LINUX: Fix build under Ubuntu 13.10 (sledgehammer999)
+    - LINUX: Make sleep and shutdown functions work on systemd's logind (Faheem Pervez)
+
+* Mon Nov 20 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.3
+    - FEATURE: Add a key shortcut to "Add link to torrent..." (Angel Alonso)
+    - BUGFIX: Make all columns and headers use the same text alignment in the transferlist. (sledgehammer999)
+    - BUGFIX: Fix build system for Unix/Linux. (sledgehammer999)
+    - BUGFIX: Case insensitive sort in Peers list. Closes #1066. (sledgehammer999)
+    - BUGFIX: Small optimization of WebUI responses when there isn't a data payload. (sledgehammer999)
+    - BUGFIX: Hide empty folders after filtering. Closes #74. (sledgehammer999)
+    - BUGFIX: Expand folders when filtering files. Closes #1076. (sledgehammer999)
+    - BUGFIX: Updated search plugin's URL (Zach Thibeau)
+    - BUGFIX: Strip some png to fix incorrect sRGB profiles. (Angel Alonso)
+    - BUGFIX: Fixed font issues on OSX Mavericks (Zach Thibeau)
+    - BUGFIX: Improve text in the About dialog (Artem S. Tashkinov)
+    - BUGFIX: Always show a peer IP address as a tool tip (Artem S. Tashkinov)
+    - BUGFIX: Fix inhibit system functionality. Closes #766. (sledgehammer999)
+    - BUGFIX: WebUI: Don't gzip too small payloads. (sledgehammer999)
+    - BUGFIX: Correctly detect if the browser supports gzip compression. (sledgehammer999)
+    - BUGFIX: Fix WebUI link to 'Anonymous mode' explanation. Closes #1093. (sledgehammer999)
+    - BUGFIX: Correctly update tracker tier number in the trackers tab. Closes #1075. (sledgehammer999)
+    - BUGFIX: Speed improvements.(sledgehammer999)
+    - OTHER: Updated translations.
+    
 * Tue Nov 05 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.2
     - BUGFIX: Fix WebUI gzip compression. Closes #1037. (sledgehammer999)
     - BUGFIX: Fix compilation with qt < 4.8.0. Closes #1043. (sledgehammer999)

configure

@@ -511,7 +511,7 @@ public:
     QStringList libDirs;
     if (!s.isEmpty())
       libDirs << s;
-    libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
+    libDirs << "/usr/lib/" << "/usr/lib/i386-linux-gnu/" << "/usr/lib64/" << "/usr/lib/x86_64-linux-gnu/" << "/usr/local/lib/" << "/usr/lib/local/i386-linux-gnu/" << "/usr/local/lib64/" << "/usr/local/lib/x86_64-linux-gnu/";
 
     foreach(const QString& lib, required_libs) {
       bool found = false;

qcm/libboost.qcm

@@ -75,7 +75,7 @@ public:
     QStringList libDirs;
     if (!s.isEmpty())
       libDirs << s;
-    libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
+    libDirs << "/usr/lib/" << "/usr/lib/i386-linux-gnu/" << "/usr/lib64/" << "/usr/lib/x86_64-linux-gnu/" << "/usr/local/lib/" << "/usr/lib/local/i386-linux-gnu/" << "/usr/local/lib64/" << "/usr/local/lib/x86_64-linux-gnu/";
 
     foreach(const QString& lib, required_libs) {
       bool found = false;

src/Icons/qBittorrent.desktop

@@ -8,6 +8,8 @@ MimeType=application/x-bittorrent;x-scheme-handler/magnet;
 Name=qBittorrent
 Terminal=false
 Type=Application
+StartupNotify=false
+StartupWMClass=qbittorrent
 
 
 

src/about_imp.h

@@ -50,7 +50,7 @@ class about : public QDialog, private Ui::AboutDlg{
       setAttribute(Qt::WA_DeleteOnClose);
       // About
       QString aboutText =
-          QString::fromUtf8("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\"><html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">p, li { white-space: pre-wrap; }</style></head><body style=\" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;\"><p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">") +
+          QString::fromUtf8("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\"><html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">p, li { white-space: pre-wrap; }</style></head><body style=\" font-size:11pt; font-weight:400; font-style:normal;\"><p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">") +
           tr("An advanced BitTorrent client programmed in C++, based on Qt4 toolkit and libtorrent-rasterbar.") +
           QString::fromUtf8(" <br /><br />") +
           trUtf8("Copyright ©2006-2013 The qBittorrent project") +

src/addnewtorrentdialog.h

@@ -84,6 +84,7 @@ private:
   void loadState();
   void saveState();
   void setMetadataProgressIndicator(bool visibleIndicator, const QString &labelText = QString());
+  void setupTreeview();
 
 private:
   Ui::AddNewTorrentDialog *ui;
@@ -98,6 +99,7 @@ private:
   QStringList m_filesPath;
   bool m_hasRenamedFile;
   QShortcut *editHotkey;
+  QByteArray m_headerState;
 };
 
 #endif // ADDNEWTORRENTDIALOG_H

src/addnewtorrentdialog.ui

@@ -176,9 +176,6 @@
         <property name="sortingEnabled">
          <bool>true</bool>
         </property>
-        <attribute name="headerStretchLastSection">
-         <bool>false</bool>
-        </attribute>
        </widget>
       </item>
      </layout>

src/confirmdeletiondlg.ui

@@ -44,7 +44,7 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string>Are you sure you want to delete the selected torrents from the transfer list?</string>
+        <string notr="true">deletion message goes here</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>

src/deletionconfirmationdlg.h

@@ -40,8 +40,12 @@ class DeletionConfirmationDlg : public QDialog, private Ui::confirmDeletionDlg {
   Q_OBJECT
 
   public:
-  DeletionConfirmationDlg(QWidget *parent=0): QDialog(parent) {
+  DeletionConfirmationDlg(QWidget *parent, const int &size, const QString &name): QDialog(parent) {
     setupUi(this);
+    if (size == 1)
+      label->setText(tr("Are you sure you want to delete \"%1\" from the transfer list?", "Are you sure you want to delete \"ubuntu-linux-iso\" from the transfer list?").arg(name));
+    else
+      label->setText(tr("Are you sure you want to delete these %1 torrents from the transfer list?", "Are you sure you want to delete these 5 torrents from the transfer list?").arg(QString::number(size)));
     // Icons
     lbl_warn->setPixmap(IconProvider::instance()->getIcon("dialog-warning").pixmap(lbl_warn->height()));
     lbl_warn->setFixedWidth(lbl_warn->height());
@@ -57,10 +61,10 @@ class DeletionConfirmationDlg : public QDialog, private Ui::confirmDeletionDlg {
     return checkPermDelete->isChecked();
   }
 
-  static bool askForDeletionConfirmation(bool *delete_local_files) {
-    DeletionConfirmationDlg dlg;
+  static bool askForDeletionConfirmation(bool& delete_local_files, const int& size, const QString& name) {
+    DeletionConfirmationDlg dlg(NULL, size, name);
     if (dlg.exec() == QDialog::Accepted) {
-      *delete_local_files = dlg.shouldDeleteLocalFiles();
+      delete_local_files = dlg.shouldDeleteLocalFiles();
       return true;
     }
     return false;

src/downloadthread.cpp

@@ -134,8 +134,8 @@ void DownloadThread::processDlFinished(QNetworkReply* reply) {
   }
   // Success
   QTemporaryFile *tmpfile = new QTemporaryFile;
-  tmpfile->setAutoRemove(false);
   if (tmpfile->open()) {
+    tmpfile->setAutoRemove(false);
     QString filePath = tmpfile->fileName();
     qDebug("Temporary filename is: %s", qPrintable(filePath));
     if (reply->isOpen() || reply->open(QIODevice::ReadOnly)) {
@@ -153,6 +153,7 @@ void DownloadThread::processDlFinished(QNetworkReply* reply) {
       emit downloadFinished(url, filePath);
     } else {
       delete tmpfile;
+      fsutils::forceRemove(filePath);
       // Error when reading the request
       emit downloadFailure(url, tr("I/O Error"));
     }

src/headlessloader.h

@@ -41,6 +41,7 @@ class HeadlessLoader: public QObject {
 
 public:
   HeadlessLoader(const QStringList &torrentCmdLine) {
+    connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(shutdownCleanUp()), Qt::DirectConnection);
     Preferences pref;
     // Enable Web UI
     pref.setWebUiEnabled(true);
@@ -61,11 +62,12 @@ public:
     }
   }
 
-  ~HeadlessLoader() {
+public slots:
+  void shutdownCleanUp() {
+    Preferences().sync();
     QBtSession::drop();
   }
 
-public slots:
   // Call this function to exit qBittorrent headless loader
   // and return to prompt (object will be deleted by main)
   void exit() {

src/icons.qrc

@@ -314,6 +314,7 @@
   <file>Icons/oxygen/view-filter.png</file>
   <file>Icons/oxygen/view-preview.png</file>
   <file>Icons/oxygen/view-refresh.png</file>
+  <file>Icons/oxygen/view-statistics.png</file>
   <file>Icons/oxygen/wallet-open.png</file>
   <file>Icons/oxygen/webui.png</file>
   <file>Icons/skin/arrow-right.gif</file>