Tagged v2.7.0 release

Fix possible encoding problem on Windows (torrent creation tool)
Fix compilation with boost >= v1.46

AUTHORS

@@ -50,6 +50,10 @@ Images Authors:
   copyright: Greg Houston <gregory.houston@gmail.com>
   license: MIT
 
+* file: src/Icons/skin/qbittorrent_mono.svg
+  copyright: Daniel Eguren <deguren@gmail.com>
+  license: LGPL
+
 * file: src/search_engine/engines/btjunkie.png
   copyright: Downloaded from btjunkie.org
 
@@ -89,7 +93,8 @@ Translations authors:
   - Italian: Matteo Sechi (bu17714@gmail.com)
   - Japanese: Nardog (alphisation@gmail.com)
   - Korean: Jin Woo Sin (jin828sin@users.sourceforge.net)
-  - Norwegian: Lars-Erik Labori (hamil@users.sourceforge.net)
+  - Lithuanian: Naglis Jonaitis (njonaitis@gmail.com)
+  - Norwegian: Tomaso
   - Polish: Mariusz Fik (fisiu@opensuse.org)
   - Portuguese: Nick Marinho (nickmarinho@gmail.com)
   - Romanian: Obada Denis (obadadenis@users.sourceforge.net)

Changelog

@@ -1,39 +1,18 @@
-* Sun Jan 23 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.4
+* Sun Mar 20 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.7.0
-   - BUGFIX: Added unicode support to email notification
+    - FEATURE: Added search field for torrent content
-   - BUGFIX: Improved compatibility with various SMTP servers
+    - FEATURE: Added auto-shutdown confirmation dialog
-   - BUGFIX: Fix Labeling in RSS downloader
+    - FEATURE: Added option to skip torrent deletion confirmation (Ville Kiiskinen)
-   - BUGFIX: Avoid main window flashing on startup (closes #703984)
+    - FEATURE: IP address reported to trackers is now customizable
-   - BUGFIX: Improved hostname resolution code
+    - FEATURE: Inhibit system sleep when torrents are active (Vladimir Golovnev)
-   - BUGFIX: Dropped dependency on libboost-thread
+    - FEATURE: Added option to bypass Web UI authentication for localhost
-   - BUGFIX: Display legal notice on screen center
+    - FEATURE: Added option to disable program exit confirmation
-   - BUGFIX: Fix renaming of single-file torrents (by Vladimir Golovnev)
+    - FEATURE: Added per-torrent ratio limiting (Christian Kandeler)
-   - I18N: More dialog buttons are now translated (by Vladimir Golovnev)
+    - FEATURE: Torrent content list is now sortable
-   - I18N: Fix translation of size units (by Vladimir Golovnev)
+    - BUGFIX: Fix compilation with namespaced Qt (Christian Kandeler)
-
+    - BUGFIX: Added length restriction on UI lock password
-* Sat Jan 15 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.3
+    - COSMETIC: Added monochrome tray icon
-   - BUGFIX: Fix possible crashes in full allocation mode
+    - COSMETIC: Improved status bar's style
-   - BUGFIX: Fix icon size issues (Linux, icon theme)
+    - OTHER: Make QtDBus dependency optional (X11)
-   - BUGFIX: Fixed file priority context menu
-   - BUGFIX: Remove dbus dependency in nox mode
-   - BUGFIX: Fix compilation on FreeBSD
-   - I18N: Improve Web UI translation
-   - I18N: Updated Polish translation
-
-* Wed Jan 12 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.2
-    - BUGFIX: Do not report PeX as being disabled when DHT is
-    - BUGFIX: Fix possible crash on adding magnet links
-    - BUGFIX: Fix torrent import (was not working)
-    - I18N: Updated Greek, Croatian, Russian, Unkrainian and Bulgarian translations
-    - I18N: Added Armenian translation (New)
-    - I18N: Remove country flags from program preferences (language selection)
-    - I18N: Translate locale names (language selection)
-
-* Mon Jan 10 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.1
-    - BUGFIX: Really disable torrent addition dialog by default
-    - BUGFIX: Fix some missing icons in the Web UI
-    - BUGFIX: Fix magnet torrent name update problem
-    - COSMETIC: Use 24px size for toolbar icons and reduce spacing
-    - COSMETIC: Move transfer list filter on the right side of the toolbar
 
 * Sun Jan 9 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.0
     - FEATURE: Use system icons (Linux, Qt >= 4.6)

configure

@@ -22,6 +22,8 @@ Dependency options:
   --disable-gui                                   Disable qBittorrent
                                                  Graphical user interface for
                                                  headless running
+  --disable-qt-dbus                              Disable use of qt-dbus
+  --disable-qt-svg                               Disable use of qt-svg
   --with-libboost-inc=[path]                      Path to libboost include
                                                  files
   --with-libboost-lib=[path]                      Path to libboost library
@@ -162,6 +164,16 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
+		--disable-qt-dbus)
+			QC_DISABLE_qt_dbus="Y"
+			shift
+			;;
+
+		--disable-qt-svg)
+			QC_DISABLE_qt_svg="Y"
+			shift
+			;;
+
 		--with-libboost-inc=*)
 			QC_WITH_LIBBOOST_INC=$optarg
 			shift
@@ -215,6 +227,8 @@ echo DATADIR=$DATADIR
 echo EX_QTDIR=$EX_QTDIR
 echo QC_ENABLE_DEBUG=$QC_ENABLE_DEBUG
 echo QC_DISABLE_GUI=$QC_DISABLE_GUI
+echo QC_DISABLE_qt_dbus=$QC_DISABLE_qt_dbus
+echo QC_DISABLE_qt_svg=$QC_DISABLE_qt_svg
 echo QC_WITH_LIBBOOST_INC=$QC_WITH_LIBBOOST_INC
 echo QC_WITH_LIBBOOST_LIB=$QC_WITH_LIBBOOST_LIB
 echo QC_DISABLE_libnotify=$QC_DISABLE_libnotify
@@ -355,6 +369,70 @@ public:
 		return(QT_VERSION >= 0x040500);
 	}
 };
+#line 1 "qt-dbus.qcm"
+/*
+-----BEGIN QCMOD-----
+name: qt-dbus
+-----END QCMOD-----
+*/
+// see  Conf::findPkgConfig
+class qc_qt_dbus : public ConfObj
+{
+public:
+	qc_qt_dbus(Conf *c) : ConfObj(c) {}
+	QString name() const { return "QtDBus >= 4.5"; }
+	QString shortname() const { return "qt-dbus"; }
+        QString checkString() const {
+                if(!conf->getenv("QC_DISABLE_qt_dbus").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
+                        return "";
+                return ConfObj::checkString();
+        }
+	bool exec(){
+                if(!conf->getenv("QC_DISABLE_qt_dbus").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
+                  return false;
+		QStringList incs;
+		QString req_ver = "4.5.0";
+		QString version, libs, other;
+		VersionMode mode = VersionMin;
+		if(conf->findPkgConfig("QtDBus", mode, req_ver, &version, &incs, &libs, &other)) {
+                        conf->addExtra("CONFIG += dbus");
+			return true;
+                }
+		return false;
+	}
+};
+#line 1 "qt-svg.qcm"
+/*
+-----BEGIN QCMOD-----
+name: qt-svg
+-----END QCMOD-----
+*/
+// see  Conf::findPkgConfig
+class qc_qt_svg : public ConfObj
+{
+public:
+	qc_qt_svg(Conf *c) : ConfObj(c) {}
+	QString name() const { return "QtSvg >= 4.5"; }
+	QString shortname() const { return "qt-svg"; }
+        QString checkString() const {
+                if(!conf->getenv("QC_DISABLE_qt_svg").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
+                        return "";
+                return ConfObj::checkString();
+        }
+	bool exec(){
+                if(!conf->getenv("QC_DISABLE_qt_svg").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
+                  return false;
+		QStringList incs;
+		QString req_ver = "4.5.0";
+		QString version, libs, other;
+		VersionMode mode = VersionMin;
+		if(conf->findPkgConfig("QtSvg", mode, req_ver, &version, &incs, &libs, &other)) {
+                        conf->addExtra("CONFIG += svg");
+			return true;
+                }
+		return false;
+	}
+};
 #line 1 "pkg-config.qcm"
 /*
 -----BEGIN QCMOD-----
@@ -645,6 +723,12 @@ cat >$1/modules_new.cpp <<EOT
     o = new qc_qt4(conf);
     o->required = true;
     o->disabled = false;
+    o = new qc_qt_dbus(conf);
+    o->required = false;
+    o->disabled = false;
+    o = new qc_qt_svg(conf);
+    o->required = false;
+    o->disabled = false;
     o = new qc_pkg_config(conf);
     o->required = true;
     o->disabled = false;
@@ -1610,6 +1694,8 @@ export DATADIR
 export EX_QTDIR
 export QC_ENABLE_DEBUG
 export QC_DISABLE_GUI
+export QC_DISABLE_qt_dbus
+export QC_DISABLE_qt_svg
 export QC_WITH_LIBBOOST_INC
 export QC_WITH_LIBBOOST_LIB
 export QC_DISABLE_libnotify

qbittorrent.qc

@@ -6,6 +6,10 @@
   <dep type='qt4'>
     <required/>
   </dep>
+  <dep type='qt-dbus'>
+  </dep>
+  <dep type='qt-svg'>
+  </dep>
   <dep type='pkg-config'>
     <required/>
   </dep>

qcm/qt-dbus.qcm

@@ -0,0 +1,31 @@
+/*
+-----BEGIN QCMOD-----
+name: qt-dbus
+-----END QCMOD-----
+*/
+// see  Conf::findPkgConfig
+class qc_qt_dbus : public ConfObj
+{
+public:
+	qc_qt_dbus(Conf *c) : ConfObj(c) {}
+	QString name() const { return "QtDBus >= 4.5"; }
+	QString shortname() const { return "qt-dbus"; }
+        QString checkString() const {
+                if(!conf->getenv("QC_DISABLE_qt_dbus").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
+                        return "";
+                return ConfObj::checkString();
+        }
+	bool exec(){
+                if(!conf->getenv("QC_DISABLE_qt_dbus").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
+                  return false;
+		QStringList incs;
+		QString req_ver = "4.5.0";
+		QString version, libs, other;
+		VersionMode mode = VersionMin;
+		if(conf->findPkgConfig("QtDBus", mode, req_ver, &version, &incs, &libs, &other)) {
+                        conf->addExtra("CONFIG += dbus");
+			return true;
+                }
+		return false;
+	}
+};

qcm/qt-svg.qcm

@@ -0,0 +1,31 @@
+/*
+-----BEGIN QCMOD-----
+name: qt-svg
+-----END QCMOD-----
+*/
+// see  Conf::findPkgConfig
+class qc_qt_svg : public ConfObj
+{
+public:
+	qc_qt_svg(Conf *c) : ConfObj(c) {}
+	QString name() const { return "QtSvg >= 4.5"; }
+	QString shortname() const { return "qt-svg"; }
+        QString checkString() const {
+                if(!conf->getenv("QC_DISABLE_qt_svg").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
+                        return "";
+                return ConfObj::checkString();
+        }
+	bool exec(){
+                if(!conf->getenv("QC_DISABLE_qt_svg").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
+                  return false;
+		QStringList incs;
+		QString req_ver = "4.5.0";
+		QString version, libs, other;
+		VersionMode mode = VersionMin;
+		if(conf->findPkgConfig("QtSvg", mode, req_ver, &version, &incs, &libs, &other)) {
+                        conf->addExtra("CONFIG += svg");
+			return true;
+                }
+		return false;
+	}
+};

src/Icons/qBittorrent.desktop

@@ -1,36 +1,39 @@
 [Desktop Entry]
-Categories=Qt;Network;P2P;
+Categories=Network;FileTransfer;P2P;Qt;
-Comment=V2.6.4
+Exec=qbittorrent %U
-Exec=qbittorrent %f
+GenericName=BitTorrent client
-GenericName=Bittorrent client
+GenericName[ar]=العميل BitTorrent
-GenericName[ar]=العميل Bittorrent
 GenericName[bg]=Торент клиент
-GenericName[cs]=Bittorrent klient
+GenericName[cs]=BitTorrent klient
-GenericName[de]=Bittorren Client
+GenericName[de]=BitTorren Client
-GenericName[el]=Bittorrent πελάτης
+GenericName[el]=BitTorrent πελάτης
-GenericName[es]=Cliente Bittorrent
+GenericName[es]=Cliente BitTorrent
-GenericName[fi]=Bittorrent-ohjelma
+GenericName[fi]=BitTorrent-ohjelma
-GenericName[fr]=Client Bittorrent
+GenericName[fr]=Client BitTorrent
-GenericName[hr]=Bittorrent klijent
+GenericName[hr]=BitTorrent klijent
-GenericName[hu]=Bittorrent kliens
+GenericName[hu]=BitTorrent kliens
-GenericName[it]=Client Bittorrent
+GenericName[it]=Client BitTorrent
-GenericName[ja]=Bittorrent クライアント
+GenericName[ja]=BitTorrent クライアント
 GenericName[ko]=비토렌트 클라이언트
-GenericName[nl]=Bittorrent-cliënt
+GenericName[lt]=BitTorrent klientas
-GenericName[pl]=Klient Bittorrent
+GenericName[nl]=BitTorrent-cliënt
-GenericName[pt]=Cliente Bittorrent
+GenericName[pl]=Klient BitTorrent
-GenericName[pt_BR]=Cliente Bittorrent
+GenericName[pt]=Cliente BitTorrent
-GenericName[ro]=Client Bittorrent
+GenericName[pt_BR]=Cliente BitTorrent
-GenericName[ru]=клиент Bittorrent
+GenericName[ro]=Client BitTorrent
-GenericName[sk]=Klient siete Bittorrent
+GenericName[ru]=клиент BitTorrent
-GenericName[sr]=Bittorrent-клијент
+GenericName[sk]=Klient siete BitTorrent
-GenericName[sv]=Bittorrent-klient
+GenericName[sr]=BitTorrent-клијент
-GenericName[tr]=Bittorrent istemcisi
+GenericName[sv]=BitTorrent-klient
-GenericName[uk]=Bittorrent-клієнт
+GenericName[tr]=BitTorrent istemcisi
-GenericName[zh]=Bittorrent之用户
+GenericName[uk]=BitTorrent-клієнт
-GenericName[zh_TW]=Bittorrent客戶端
+GenericName[zh]=BitTorrent之用户
+GenericName[zh_TW]=BitTorrent客戶端
+Comment=Download and share files over BitTorrent
+Comment[fr]=Télécharger et partager des fichiers avec BitTorrent
+Comment[pl]=Dzielenie się plikami przez BitTorrent
 Icon=qbittorrent
-MimeType=application/x-bittorrent;
+MimeType=application/x-bittorrent;x-scheme-handler/magnet;
 Name=qBittorrent
 Name[ko]=큐비토런트
 Terminal=false

src/Info.plist

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

src/about_imp.h

@@ -78,7 +78,8 @@ class about : public QDialog, private Ui::AboutDlg{
           <li><u>Italian:</u> Matteo Sechi (bu17714@gmail.com)</li>\
           <li><u>Japanese:</u> Nardog (alphisation@gmail.com)</li>\
           <li><u>Korean:</u> Jin Woo Sin (jin828sin@users.sourceforge.net)</li>\
-          <li><u>Norwegian:</u> Lars-Erik Labori (hamil@users.sourceforge.net)</li>\
+          <li><u>Lithuanian:</u> Naglis Jonaitis (njonaitis@gmail.com)</li>\
+          <li><u>Norwegian:</u> Tomaso</li>\
           <li><u>Polish:</u> Mariusz Fik (fisiu@opensuse.org)</li>\
           <li><u>Portuguese:</u> Nick Marinho (nickmarinho@gmail.com)</li>\
           <li><u>Romanian:</u> Obada Denis (obadadenis@users.sourceforge.net)</li>\

src/downloadthread.cpp

@@ -38,71 +38,75 @@
 #include "downloadthread.h"
 #include "preferences.h"
 #ifndef DISABLE_GUI
-  #include "rsssettings.h"
+#include "rsssettings.h"
 #endif
 #include "qinisettings.h"
 
 /** Download Thread **/
 
-downloadThread::downloadThread(QObject* parent) : QObject(parent) {
+DownloadThread::DownloadThread(QObject* parent) : QObject(parent) {
   connect(&m_networkManager, SIGNAL(finished (QNetworkReply*)), this, SLOT(processDlFinished(QNetworkReply*)));
 #ifndef QT_NO_OPENSSL
   connect(&m_networkManager, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)), this, SLOT(ignoreSslErrors(QNetworkReply*,QList<QSslError>)));
 #endif
 }
 
-void downloadThread::processDlFinished(QNetworkReply* reply) {
+void DownloadThread::processDlFinished(QNetworkReply* reply) {
   QString url = reply->url().toString();
   qDebug("Download finished: %s", qPrintable(url));
+  // Check if the request was successful
   if(reply->error() != QNetworkReply::NoError) {
     // Failure
     qDebug("Download failure (%s), reason: %s", qPrintable(url), qPrintable(errorCodeToString(reply->error())));
     emit downloadFailure(url, errorCodeToString(reply->error()));
-  } else {
+    reply->deleteLater();
-    QVariant redirection = reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
+    return;
+  }
+  // Check if the server ask us to redirect somewhere lese
+  const QVariant redirection = reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
   if(redirection.isValid()) {
     // We should redirect
     qDebug("Redirecting from %s to %s", qPrintable(url), qPrintable(redirection.toUrl().toString()));
     m_redirectMapping.insert(redirection.toUrl().toString(), url);
     downloadUrl(redirection.toUrl().toString());
+    reply->deleteLater();
     return;
   }
-    // Checking if it was redirecting, restoring initial URL
+  // Checking if it was redirected, restoring initial URL
   if(m_redirectMapping.contains(url)) {
     url = m_redirectMapping.take(url);
   }
   // Success
-    QString filePath;
   QTemporaryFile *tmpfile = new QTemporaryFile;
   tmpfile->setAutoRemove(false);
   if (tmpfile->open()) {
-      filePath = tmpfile->fileName();
+    QString filePath = tmpfile->fileName();
     qDebug("Temporary filename is: %s", qPrintable(filePath));
-      if(reply->open(QIODevice::ReadOnly)) {
+    if(reply->isOpen() || reply->open(QIODevice::ReadOnly)) {
       // TODO: Support GZIP compression
       tmpfile->write(reply->readAll());
-        reply->close();
       tmpfile->close();
+      // XXX: For some reason, tmpfile has to be destroyed before
+      // the signal is sent or the file stays locked on Windows
+      // for some reason.
       delete tmpfile;
       // Send finished signal
       emit downloadFinished(url, filePath);
     } else {
-        // Error when reading the request
-        tmpfile->close();
       delete tmpfile;
+      // Error when reading the request
       emit downloadFailure(url, tr("I/O Error"));
     }
   } else {
     delete tmpfile;
     emit downloadFailure(url, tr("I/O Error"));
   }
-  }
   // Clean up
   reply->deleteLater();
 }
 
 #ifndef DISABLE_GUI
-void downloadThread::loadCookies(const QString &host_name, QString url) {
+void DownloadThread::loadCookies(const QString &host_name, QString url) {
   const QList<QByteArray> raw_cookies = RssSettings().getHostNameCookies(host_name);
   QNetworkCookieJar *cookie_jar = m_networkManager.cookieJar();
   QList<QNetworkCookie> cookies;
@@ -119,30 +123,24 @@ void downloadThread::loadCookies(const QString &host_name, QString url) {
 }
 #endif
 
-void downloadThread::downloadTorrentUrl(QString url) {
+void DownloadThread::downloadTorrentUrl(const QString &url) {
-#ifndef DISABLE_GUI
-  // Load cookies
-  QString host_name = QUrl::fromEncoded(url.toLocal8Bit()).host();
-  if(!host_name.isEmpty())
-    loadCookies(host_name, url);
-#endif
   // Process request
   QNetworkReply *reply = downloadUrl(url);
   connect(reply, SIGNAL(downloadProgress(qint64,qint64)), this, SLOT(checkDownloadSize(qint64,qint64)));
 }
 
-QNetworkReply* downloadThread::downloadUrl(QString url){
+QNetworkReply* DownloadThread::downloadUrl(const QString &url){
   // Update proxy settings
   applyProxySettings();
 #ifndef DISABLE_GUI
   // Load cookies
-  QString host_name = QUrl::fromEncoded(url.toLocal8Bit()).host();
+  QString host_name = QUrl::fromEncoded(url.toUtf8()).host();
   if(!host_name.isEmpty())
     loadCookies(host_name, url);
 #endif
   // Process download request
   qDebug("url is %s", qPrintable(url));
-  const QUrl qurl = QUrl::fromEncoded(url.toLocal8Bit());
+  const QUrl qurl = QUrl::fromEncoded(url.toUtf8());
   QNetworkRequest request(qurl);
   // Spoof Firefox 3.5 user agent to avoid
   // Web server banning
@@ -156,26 +154,28 @@ QNetworkReply* downloadThread::downloadUrl(QString url){
   return m_networkManager.get(request);
 }
 
-void downloadThread::checkDownloadSize(qint64 bytesReceived, qint64 bytesTotal) {
+void DownloadThread::checkDownloadSize(qint64 bytesReceived, qint64 bytesTotal) {
+  QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
+  if(!reply) return;
   if(bytesTotal > 0) {
-    QNetworkReply *reply = static_cast<QNetworkReply*>(sender());
     // Total number of bytes is available
     if(bytesTotal > 1048576) {
       // More than 1MB, this is probably not a torrent file, aborting...
       reply->abort();
+      reply->deleteLater();
     } else {
       disconnect(reply, SIGNAL(downloadProgress(qint64,qint64)), this, SLOT(checkDownloadSize(qint64,qint64)));
     }
   } else {
     if(bytesReceived  > 1048576) {
       // More than 1MB, this is probably not a torrent file, aborting...
-      QNetworkReply *reply = static_cast<QNetworkReply*>(sender());
       reply->abort();
+      reply->deleteLater();
     }
   }
 }
 
-void downloadThread::applyProxySettings() {
+void DownloadThread::applyProxySettings() {
   QNetworkProxy proxy;
   const Preferences pref;
   if(pref.isProxyEnabled()) {
@@ -203,7 +203,7 @@ void downloadThread::applyProxySettings() {
   m_networkManager.setProxy(proxy);
 }
 
-QString downloadThread::errorCodeToString(QNetworkReply::NetworkError status) {
+QString DownloadThread::errorCodeToString(QNetworkReply::NetworkError status) {
   switch(status){
   case QNetworkReply::HostNotFoundError:
     return tr("The remote host name was not found (invalid hostname)");
@@ -253,7 +253,7 @@ QString downloadThread::errorCodeToString(QNetworkReply::NetworkError status) {
 }
 
 #ifndef QT_NO_OPENSSL
-void downloadThread::ignoreSslErrors(QNetworkReply* reply,QList<QSslError> errors) {
+void DownloadThread::ignoreSslErrors(QNetworkReply* reply, const QList<QSslError> &errors) {
   Q_UNUSED(errors)
   // Ignore all SSL errors
   reply->ignoreSslErrors();

src/downloadthread.h

@@ -36,26 +36,28 @@
 #include <QHash>
 #include <QSslError>
 
+QT_BEGIN_NAMESPACE
 class QNetworkAccessManager;
+QT_END_NAMESPACE
 
-class downloadThread : public QObject {
+class DownloadThread : public QObject {
   Q_OBJECT
 
 public:
-  downloadThread(QObject* parent = 0);
+  DownloadThread(QObject* parent = 0);
-  QNetworkReply* downloadUrl(QString url);
+  QNetworkReply* downloadUrl(const QString &url);
-  void downloadTorrentUrl(QString url);
+  void downloadTorrentUrl(const QString &url);
   //void setProxy(QString IP, int port, QString username, QString password);
 
 signals:
-  void downloadFinished(QString url, QString file_path);
+  void downloadFinished(const QString &url, const QString &file_path);
-  void downloadFailure(QString url, QString reason);
+  void downloadFailure(const QString &url, const QString &reason);
 
 private slots:
   void processDlFinished(QNetworkReply* reply);
   void checkDownloadSize(qint64 bytesReceived, qint64 bytesTotal);
 #ifndef QT_NO_OPENSSL
-  void ignoreSslErrors(QNetworkReply*,QList<QSslError>);
+  void ignoreSslErrors(QNetworkReply*,const QList<QSslError>&);
 #endif
 
 private:

src/executionlog.h

@@ -3,9 +3,11 @@
 
 #include <QWidget>
 
+QT_BEGIN_NAMESPACE
 namespace Ui {
     class ExecutionLog;
 }
+QT_END_NAMESPACE
 
 class ExecutionLog : public QWidget
 {

src/iconprovider.cpp

@@ -73,6 +73,10 @@ void IconProvider::useSystemIconTheme(bool enable)
   m_useSystemTheme = enable;
 }
 
+// Makes sure the icon is at least available in 16px and 24px size
+// It scales the icon from the theme if necessary
+// Otherwise, the UI looks broken if the icon is not available
+// in the correct size.
 QIcon IconProvider::generateDifferentSizes(const QIcon &icon)
 {
   QIcon new_icon;

src/icons.qrc

@@ -3,9 +3,7 @@
   <file>Icons/url.png</file>
   <file>Icons/loading.png</file>
   <file>Icons/3-state-checkbox.gif</file>
-  <file>Icons/uparrow.png</file>
   <file>Icons/sphere.png</file>
-  <file>Icons/downarrow.png</file>
   <file>Icons/slow_off.png</file>
   <file>Icons/sphere2.png</file>
   <file>Icons/magnet.png</file>
@@ -36,10 +34,12 @@
   <file>Icons/skin/firewalled.png</file>
   <file>Icons/skin/downloading.png</file>
   <file>Icons/skin/toolbox-divider.gif</file>
+  <file>Icons/skin/qbittorrent_mono.svg</file>
   <file>Icons/skin/stalledUP.png</file>
   <file>Icons/skin/filteractive.png</file>
   <file>Icons/skin/bg-handle-horizontal.gif</file>
   <file>Icons/skin/download.png</file>
+  <file>Icons/skin/ratio.png</file>
   <file>Icons/flags/sm.png</file>
   <file>Icons/flags/lt.png</file>
   <file>Icons/flags/th.png</file>

src/lang.qrc

@@ -15,6 +15,7 @@
   <file>lang/qbittorrent_fr.qm</file>
   <file>lang/qbittorrent_uk.qm</file>
   <file>lang/qbittorrent_zh.qm</file>
+  <file>lang/qbittorrent_lt.qm</file>
   <file>lang/qbittorrent_ko.qm</file>
   <file>lang/qbittorrent_nb.qm</file>
   <file>lang/qbittorrent_sv.qm</file>
@@ -24,6 +25,7 @@
   <file>lang/qbittorrent_pt_BR.qm</file>
   <file>lang/qbittorrent_da.qm</file>
   <file>lang/qbittorrent_cs.qm</file>
+  <file>lang/qbittorrent_hy.qm</file>
   <file>lang/qbittorrent_pl.qm</file>
   <file>lang/qbittorrent_bg.qm</file>
   <file>lang/qbittorrent_ar.qm</file>
@@ -31,6 +33,5 @@
   <file>lang/qbittorrent_en.qm</file>
   <file>lang/qbittorrent_hr.qm</file>
   <file>lang/qbittorrent_ro.qm</file>
-  <file>lang/qbittorrent_hy.qm</file>
 </qresource>
 </RCC>