Tagged v2.0.3 release

- Bump to v2.0.3
- Minor french translation update
2025-10-14 11:52:15 +02:00 · 2009-12-23 08:57:08 +00:00 · 2009-12-23 08:53:21 +00:00 · 2009-12-22 21:35:28 +00:00 · 2009-12-22 21:32:42 +00:00 · 2009-12-22 19:22:33 +00:00
145 changed files with 16953 additions and 44690 deletions
--- a/6
+++ b/6
@@ -12,10 +12,6 @@ Code from other projects:
  copyright: Malte Starostik <malte@kde.org>
  license: LGPL

-* files src/search_engine/socks.py
-  copyright: Dan Haim <negativeiq@users.sourceforge.net>
-  license: BSD
-
 Images Authors:
 * files: src/Icons/*.png
  copyright: Gnome Icon Theme
@@ -61,7 +57,7 @@ Translations authors:
  copyright:
  - Brazilian: Nick Marinho (nickmarinho@gmail.com)
  - Bulgarian: Tsvetan & Boiko Bankov (emerge_life@users.sourceforge.net)
-  - Catalan: Francisco Luque Contreras (frannoe@ya.com)
+  - Catalan: Gekko Dam Beer (gekko04@users.sourceforge.net)
  - Chinese (Simplified): Guo Yue (yue.guo0418@gmail.com)
  - Chinese (Traditional): Yi-Shun Wang (dnextstep@gmail.com)
  - Czech: Jirka Vilim (web@tets.cz)
--- a/62
+++ b/62
@@ -1,65 +1,3 @@
-* Mon Jan 18 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.1.0
-    - FEATURE: Graphical User Interface can be disabled at compilation time (headless running)
-    - FEATURE: Torrents can be labeled/categorized
-    - FEATURE: Labeled torrent can be downloaded corresponding subfolders
-    - FEATURE: Disk cache size can be set from preferences
-    - FEATURE: Peer Exchange (PeX) can be disabled from preferences
-    - FEATURE: Append !.qB extension to incomplete files option (libtorrent >= v0.15 only)
-    - FEATURE: Torrent files/folders can be renamed (torrent addition dialog or files properties)
-    - FEATURE: uTorrent compatible tracker list support (use torrentz.com url as a default)
-    - FEATURE: Better proxy support and preferences remodeling
-    - FEATURE: qBittorrent can identify itself as uTorrent, Vuze or KTorrent (Any stable version)
-    - FEATURE: Torrents can be renamed in transfer list
-    - FEATURE: Display torrent addition dialog for magnet links too
-    - FEATURE: Files contained in a torrent are opened on double click (files panel)
-    - FEATURE: Added support for magnet links in search engine
-    - FEATURE: Added vertor.com and torrentdownloads.net search plugins
-    - FEATURE: Search engine can now use a SOCKS5 proxy
-    - FEATURE: HTTP proxy support for peer communication
-    - BUGFIX: Search engine loads new proxy settings without program restart
-    - BUGFIX: Use XDG folders (.cache, .local) instead of .qbittorrent
-    - BUGFIX: Added legal notice on startup that the user must accept
-    - BUGFIX: Protect Web UI authentication against brute forcing
-    - BUGFIX: Use HTTP digest mode for Web UI authentication (instead of Basic)
-    - BUGFIX: Properly display torrents with one file in subfolder(s)
-    - BUGFIX: Display Web UI favicon
-    - BUGFIX: File priority can be set for finished torrents that have filtered files
-    - COSMETIC: Use checkboxes to filter torrent content instead of comboboxes
-    - COSMETIC: Use alternating row colors in transfer list (set in program preferences)
-    - COSMETIC: Added a spin box to speed limiting dialog for manual input
-
-* Mon Jan 11 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.0.7
-    - BUGFIX: Fix 'Add in pause' setting in torrent addition dialog
-    - BUGFIX: Update RSS feed as soon as feed downloader is enabled
-    - BUGFIX: RSS Feed downloader ignores articles above maximum number of articles
-    - BUGFIX: Fix possible bug when deleting a RSS folder
-    - BUGFIX: Remove persistant data when a RSS feed is deleted
-    - BUGFIX: RSS filters are now alphabetically sorted
-    - BUGFIX: Fix crash when renaming currently displayed RSS filter
-    - BUGFIX: Remove overwriting confirmation when exporting RSS filters since Qt takes care of it
-
-* Tue Jan 5 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.0.6
-    - BUGFIX: Fix detection of invalid torrent files
-    - BUGFIX: Stop catching signals once one has been caught to avoid possible infinite loop
-    - BUGFIX: Force data recheck whenever a torrent is moved
-    - BUGFIX: Detect existing torrent data even if incomplete torrents are saved to a different folder
-    - COSMETIC: Improve torrent deletion confirmation dialog so that the text that not get truncated
-
-* Thu Dec 31 2009 - Christophe Dumez <chris@qbittorrent.org> - v2.0.5
-    - BUGFIX: Fix crash with downloaded/availability bars when the torrent has too many pieces
-
-* Wed Dec 30 2009 - Christophe Dumez <chris@qbittorrent.org> - v2.0.4
-    - BUGFIX: Fix PeerGuardian .p2b binary filter support
-    - BUGFIX: Fix possible crash when closing a search engine tab
-    - BUGFIX: Make sure service port does not change
-    - BUGFIX: Fix possible DHT port saving issue
-    - BUGFIX: Fix communication between qBittorrent and Web UI (Qt 4.6)
-    - BUGFIX: Use Wildcard matching instead of full regex in RSS feed downloader
-    - BUGFIX: Fix code for listening on a random port whenever it failed to listen on the one defined
-    - BUGFIX: Use global maximum transfer rates as maximum values in per-torrent speed limiting dialogs
-    - BUGFIX: Fix global download rate limiting from Web UI
-    - COSMETIC: Display a disconnected icon in status bar whenever qBittorrent failed to listen on the port defined
-
 * Wed Dec 23 2009 - Christophe Dumez <chris@qbittorrent.org> - v2.0.3
    - BUGFIX: Minor cosmetic fix to program preferences
    - BUGFIX: Fix "Temp path" button in program preferences
--- a/57
+++ b/57
@@ -1,51 +1,32 @@
 qBittorrent - A BitTorrent client in C++ / Qt4
 ------------------------------------------

-1) Compile and install qBittorrent with Qt4 Graphical Interface
+./configure
+make && make install
+qbittorrent

-  $ ./configure
-  $ make && make install
-  $ qbittorrent
+will install and execute qBittorrent hopefully without any problems.

-  will install and execute qBittorrent hopefully without any problems.
+Dependencies:
+- Qt >= 4.4.0 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml)

-  Dependencies:
-    - Qt >= 4.4.0 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml)
+- libtorrent-rasterbar by Arvid Norberg (>= 0.14.0 REQUIRED, >= v0.15.0 ADVISED)
+    -> http://www.qbittorrent.org/download.php (advised)
+    -> http://www.libtorrent.net
+    Be careful: another library (the one used by rTorrent) uses a similar name.

-    - libtorrent-rasterbar by Arvid Norberg (>= 0.14.4 REQUIRED, >= v0.15.0 ADVISED)
-        -> http://www.libtorrent.net
-        Be careful: another library (the one used by rTorrent) uses a similar name.
+- libboost: libboost-filesystem, libboost-date-time, libboost-thread, libboost-serialization

-    - libboost: libboost-filesystem, libboost-date-time, libboost-thread, libboost-serialization
+- python >= 2.3 (needed by search engine)
+  * Run time only dependency

-    - python >= 2.3 (needed by search engine)
-        * Run time only dependency
-
-    - libnotify >= 0.4.2, glib-2.0 (optional)
-        * Can be used for system notifications to replace standard Qt notifications
-          so that it integrates better into the Desktop
-
-    - geoip-database (optional)
-        * If qBittorrent cannot find this database, it will try to resolve countries using the Internet but it will be a lot slower.
-        * Run time only dependency
-
-2) Compile and install qBittorrent without Qt4 Graphical interface
-
-  $ ./configure --disable-gui
-  $ make && make install
-  $ qbittorrent
-
-  will install and execute qBittorrent hopefully without any problems.
-
-  Dependencies:
-    - Qt >= 4.4.0 (libqt-devel, libqtcore, libqtnetwork, libqtxml)
-
-    - libtorrent-rasterbar by Arvid Norberg (>= 0.14.0 REQUIRED, >= v0.15.0 ADVISED)
-        -> http://www.libtorrent.net
-        Be careful: another library (the one used by rTorrent) uses a similar name.
-
-    - libboost: libboost-filesystem, libboost-date-time, libboost-thread, libboost-serialization
+- libnotify >= 0.4.2, glib-2.0 (optional)
+  * Can be used for system notifications to replace standard Qt notifications
+    so that it integrates better into the Desktop

+- geoip-database (optional)
+  * If qBittorrent cannot find this database, it will try to resolve countries using the Internet but it will be a lot slower.
+  * Run time only dependency

 DOCUMENTATION:
 Please note that there is a documentation with a "compiling howto" at http://wiki.qbittorrent.org.
--- a/27
+++ b/27
@@ -18,8 +18,6 @@ Main options:
  --help              This help text.

 Dependency options:
-  --disable-gui                      Disable qBittorrent Graphical user
-                                    interface for headless running
  --with-libboost-inc=[path]         Path to libboost include files
  --disable-libnotify               Disable use of libnotify
  --disable-geoip-database          Disable use of geoip-database
@@ -142,11 +140,6 @@ while [ $# -gt 0 ]; do
 			shift
 			;;

-		--disable-gui)
-			QC_DISABLE_GUI="Y"
-			shift
-			;;
-
 		--with-libboost-inc=*)
 			QC_WITH_LIBBOOST_INC=$optarg
 			shift
@@ -188,7 +181,6 @@ echo PREFIX=$PREFIX
 echo BINDIR=$BINDIR
 echo DATADIR=$DATADIR
 echo EX_QTDIR=$EX_QTDIR
-echo QC_DISABLE_GUI=$QC_DISABLE_GUI
 echo QC_WITH_LIBBOOST_INC=$QC_WITH_LIBBOOST_INC
 echo QC_DISABLE_libnotify=$QC_DISABLE_libnotify
 echo QC_DISABLE_geoip_database=$QC_DISABLE_geoip_database
@@ -298,7 +290,6 @@ cat >$1/modules.cpp <<EOT
 /*
 -----BEGIN QCMOD-----
 name: Qt >= 4.4
-arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
 -----END QCMOD-----
 */
 class qc_qt4 : public ConfObj
@@ -309,9 +300,6 @@ public:
 	QString shortname() const { return "Qt 4.4"; }
 	bool exec()
 	{
-		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-			conf->addDefine("DISABLE_GUI");
-		}	
 		if(QT_VERSION >= 0x040500) {
                        conf->addDefine("QT_4_5");
                }
@@ -330,11 +318,11 @@ class qc_libtorrent_rasterbar : public ConfObj
 {
 public:
 	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent-rasterbar >= 0.14.4"; }
+	QString name() const { return "libtorrent-rasterbar >= 0.14.0 (>= 0.15.0 advised)"; }
 	QString shortname() const { return "libtorrent-rasterbar"; }
 	bool exec(){
 		QStringList incs;
-		QString req_ver = "0.14.4";
+		QString req_ver = "0.14.0";
 		QString adv_ver = "0.15.0";
 		QString version, libs, other;
 		VersionMode mode = VersionMin;
@@ -345,7 +333,7 @@ public:
 		if(!libs.isEmpty())
 			conf->addLib(libs);
 		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other))
-                        printf("\nWarning: libtorrent-rasterbar v%s was detected.\nSome feature will be disabled because they require v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
+                        printf("\nWarning: libtorrent-rasterbar v%s was detected.\nAlthough it will compile and run, you will be missing some features. Please consider updating to v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
 		else
 			conf->addDefine("LIBTORRENT_0_15");
 		return true;
@@ -422,10 +410,6 @@ public:
 	QString name() const { return "libnotify >= 0.4.2 (optional)"; }
 	QString shortname() const { return "libnotify"; }
 	bool exec(){
-		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-			printf("\nNot Required");
-			return true;
-		}
 		QStringList incs;
 		QString req_ver = "0.4.2";
 		QString version, libs, other;
@@ -469,10 +453,6 @@ public:
 	QString name() const { return "GeoIP Database (optional)"; }
 	QString shortname() const { return "GeoIP Database"; }
 	bool exec() {
-	if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-		printf("\nNot Required");
-		return true;
-	}
 #ifdef Q_WS_X11
 		if(!conf->getenv("QC_WITH_GEOIP_DATABASE_EMBEDDED").isEmpty()) {
 #endif
@@ -1451,7 +1431,6 @@ export PREFIX
 export BINDIR
 export DATADIR
 export EX_QTDIR
-export QC_DISABLE_GUI
 export QC_WITH_LIBBOOST_INC
 export QC_DISABLE_libnotify
 export QC_DISABLE_geoip_database
--- a/doc/qbittorrent-nox.1
+++ b/doc/qbittorrent-nox.1
@@ -1,44 +0,0 @@
-.\" This manpage has been automatically generated by docbook2man
-.\" from a DocBook document.  This tool can be found at:
-.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>.
-.TH "QBITTORRENT\-NOX" "1" "January 16th 2010" "Command line Bittorrent client written in C++ / Qt4" ""
-
-.SH "NAME"
-qBittorrent\-nox \- a command line Bittorrent client written in C++ / Qt4
-
-.SH "SYNOPSIS"
-
-\fBqbittorrent\-nox\fR [\-\-webui-port=x] [TORRENT_FILE | URL]...
-
-\fBqbittorrent\-nox\fR \-\-help
-
-\fBqbittorrent\-nox\fR \-\-version
-
-.PP
-.SH "DESCRIPTION"
-
-\fBqBittorrent-nox\fR is an advanced command-line Bittorrent client written in C++ / Qt4,
-using the \fBlibtorrent-rasterbar\fR library by Arvid Norberg. qBittorrent\-nox aims
-to be a good alternative to other command line bittorrent clients and provides features similar to popular graphical clients.
-
-qBittorrent\-nox is fast, stable, light and it supports unicode. 
-It also comes with UPnP port forwarding / NAT-PMP, encryption (Vuze compatible), 
-FAST extension (mainline) and PeX support (utorrent compatible).
-
-qBittorrent\-nox is meant to be controlled via its feature-rich Web UI which is accessible as a default on http://localhost:8080. The Web UI access is secured and the default account user name is "admin" with "adminadmin" as a password.
-
-.SH "OPTIONS"
-
-\fB--help\fR Prints the command line options.
-
-\fB--version\fR Prints qbittorrent program version number.
-
-\fB--webui-port=x\fR Changes Web UI port to x (default: 8080).
-
-.SH "BUGS"
-
-If you find a bug, please report it at http://bugs.qbittorrent.org
-
-.SH "AUTHOR"
-
-Christophe Dumez <chris@qbittorrent.org>
--- a/doc/qbittorrent.1
+++ b/doc/qbittorrent.1
@@ -1,14 +1,14 @@
 .\" This manpage has been automatically generated by docbook2man
 .\" from a DocBook document.  This tool can be found at:
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>.
-.TH "QBITTORRENT" "1" "January 16th 2010" "Bittorrent client written in C++ / Qt4" ""
+.TH "QBITTORRENT" "1" "September 30th 2009" "Bittorrent client written in C++ / Qt4" ""

 .SH "NAME"
 qBittorrent \- a Bittorrent client written in C++ / Qt4

 .SH "SYNOPSIS"

-\fBqbittorrent\fR [\-\-no-splash] [\-\-webui-port=x] [TORRENT_FILE | URL]...
+\fBqbittorrent\fR [\-\-no-splash] [TORRENT_FILE | URL]...

 \fBqbittorrent\fR \-\-help

@@ -18,9 +18,10 @@ qBittorrent \- a Bittorrent client written in C++ / Qt4
 .SH "DESCRIPTION"

 \fBqBittorrent\fR is an advanced Bittorrent client written in C++ / Qt4,
-using the \fBlibtorrent-rasterbar\fR library by Arvid Norberg. qBittorrent is similar to uTorrent. qBittorrent
+using the \fBrblibtorrent\fR library by Arvid Norberg. qBittorrent aims
+to be a good alternative to all other bittorrent clients out there. qBittorrent
 is fast, stable, light, it supports unicode and it provides a good integrated search engine.
-It also comes with UPnP port forwarding / NAT-PMP, encryption (Vuze compatible), 
+It also comes with UPnP port forwarding / NAT-PMP, encryption (Azureus compatible), 
 FAST extension (mainline) and PeX support (utorrent compatible).

 .SH "OPTIONS"
@@ -31,8 +32,6 @@ FAST extension (mainline) and PeX support (utorrent compatible).

 \fB--no-splash\fR Disables splash screen on startup.

-\fB--webui-port=x\fR Changes Web UI port to x (default: 8080).
-
 .SH "BUGS"

 If you find a bug, please report it at http://bugs.qbittorrent.org
--- a/qcm/geoip-database.qcm
+++ b/qcm/geoip-database.qcm
@@ -12,10 +12,6 @@ public:
 	QString name() const { return "GeoIP Database (optional)"; }
 	QString shortname() const { return "GeoIP Database"; }
 	bool exec() {
-	if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-		printf("\nNot Required");
-		return true;
-	}
 #ifdef Q_WS_X11
 		if(!conf->getenv("QC_WITH_GEOIP_DATABASE_EMBEDDED").isEmpty()) {
 #endif
--- a/qcm/libnotify.qcm
+++ b/qcm/libnotify.qcm
@@ -11,10 +11,6 @@ public:
 	QString name() const { return "libnotify >= 0.4.2 (optional)"; }
 	QString shortname() const { return "libnotify"; }
 	bool exec(){
-		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-			printf("\nNot Required");
-			return true;
-		}
 		QStringList incs;
 		QString req_ver = "0.4.2";
 		QString version, libs, other;
--- a/qcm/libtorrent-rasterbar.qcm
+++ b/qcm/libtorrent-rasterbar.qcm
@@ -8,11 +8,11 @@ class qc_libtorrent_rasterbar : public ConfObj
 {
 public:
 	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent-rasterbar >= 0.14.4"; }
+	QString name() const { return "libtorrent-rasterbar >= 0.14.0 (>= 0.15.0 advised)"; }
 	QString shortname() const { return "libtorrent-rasterbar"; }
 	bool exec(){
 		QStringList incs;
-		QString req_ver = "0.14.4";
+		QString req_ver = "0.14.0";
 		QString adv_ver = "0.15.0";
 		QString version, libs, other;
 		VersionMode mode = VersionMin;
@@ -23,7 +23,7 @@ public:
 		if(!libs.isEmpty())
 			conf->addLib(libs);
 		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other))
-                        printf("\nWarning: libtorrent-rasterbar v%s was detected.\nSome feature will be disabled because they require v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
+                        printf("\nWarning: libtorrent-rasterbar v%s was detected.\nAlthough it will compile and run, you will be missing some features. Please consider updating to v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
 		else
 			conf->addDefine("LIBTORRENT_0_15");
 		return true;
--- a/qcm/qt4.qcm
+++ b/qcm/qt4.qcm
@@ -1,7 +1,6 @@
 /*
 -----BEGIN QCMOD-----
 name: Qt >= 4.4
-arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
 -----END QCMOD-----
 */
 class qc_qt4 : public ConfObj
@@ -12,9 +11,6 @@ public:
 	QString shortname() const { return "Qt 4.4"; }
 	bool exec()
 	{
-		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-			conf->addDefine("DISABLE_GUI");
-		}	
 		if(QT_VERSION >= 0x040500) {
                        conf->addDefine("QT_4_5");
                }
--- a/src/GUI.cpp
+++ b/src/GUI.cpp
@@ -60,8 +60,6 @@
 #include "speedlimitdlg.h"
 #include "preferences.h"
 #include "console_imp.h"
-#include "trackerlist.h"
-#include "peerlistwidget.h"
 #include "torrentpersistentdata.h"
 #include "transferlistfilterswidget.h"
 #include "propertieswidget.h"
@@ -80,7 +78,6 @@ using namespace libtorrent;
 // Constructor
 GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), displaySpeedInTitle(false), force_exit(false) {
  setupUi(this);
-
  setWindowTitle(tr("qBittorrent %1", "e.g: qBittorrent v0.x").arg(QString::fromUtf8(VERSION)));
  // Setting icons
  this->setWindowIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png")));
@@ -188,15 +185,6 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
  readSettings();
  properties->readSettings();

-  // Limit status filters list height
-  int cur_height = 80;
-  do {
-    transferListFilters->getStatusFilters()->setFixedHeight(cur_height);
-    cur_height += 10;
-    transferListFilters->getStatusFilters()->scrollToBottom();
-  }while(transferListFilters->getStatusFilters()->verticalScrollBar()->sliderPosition() > 0);
-  transferListFilters->getStatusFilters()->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-
  if(Preferences::startMinimized()) {
    setWindowState(Qt::WindowMinimized);
  }
@@ -662,12 +650,8 @@ void GUI::processParams(const QStringList& params) {
      BTSession->downloadFromUrl(param);
    }else{
      if(param.startsWith("magnet:", Qt::CaseInsensitive)) {
-        if(useTorrentAdditionDialog) {
-          torrentAdditionDialog *dialog = new torrentAdditionDialog(this, BTSession);
-          dialog->showLoadMagnetURI(param);
-        } else {
-          BTSession->addMagnetUri(param);
-        }
+        // FIXME: Possibily skipped torrent addition dialog
+        BTSession->addMagnetUri(param);
      } else {
        if(useTorrentAdditionDialog) {
          torrentAdditionDialog *dialog = new torrentAdditionDialog(this, BTSession);
@@ -740,10 +724,7 @@ void GUI::loadPreferences(bool configure_session) {
  }
  unsigned int new_refreshInterval = Preferences::getRefreshInterval();
  transferList->setRefreshInterval(new_refreshInterval);
-  transferList->setAlternatingRowColors(Preferences::useAlternatingRowColors());
-  properties->getFilesList()->setAlternatingRowColors(Preferences::useAlternatingRowColors());
-  properties->getTrackerList()->setAlternatingRowColors(Preferences::useAlternatingRowColors());
-  properties->getPeerList()->setAlternatingRowColors(Preferences::useAlternatingRowColors());
+
  // Queueing System
  if(Preferences::isQueueingSystemEnabled()) {
    if(!configure_session || !BTSession->isQueueingEnabled()) {
@@ -851,16 +832,9 @@ void GUI::showNotificationBaloon(QString title, QString msg) const {
 *****************************************************/

 void GUI::downloadFromURLList(const QStringList& url_list) {
-  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
-  bool useTorrentAdditionDialog = settings.value(QString::fromUtf8("Preferences/Downloads/AdditionDialog"), true).toBool();
  foreach(const QString url, url_list) {
    if(url.startsWith("magnet:", Qt::CaseInsensitive)) {
-      if(useTorrentAdditionDialog) {
-        torrentAdditionDialog *dialog = new torrentAdditionDialog(this, BTSession);
-        dialog->showLoadMagnetURI(url);
-      } else {
-        BTSession->addMagnetUri(url);
-      }
+      BTSession->addMagnetUri(url);
    } else {
      BTSession->downloadFromUrl(url);
    }
--- a/src/GUI.h
+++ b/src/GUI.h
@@ -59,105 +59,104 @@ class StatusBar;
 class GUI : public QMainWindow, private Ui::MainWindow{
  Q_OBJECT

-private:
-  // Bittorrent
-  Bittorrent *BTSession;
-  QList<QPair<QTorrentHandle,QString> > unauthenticated_trackers; // Still needed?
-  // GUI related
-  QTimer *guiUpdater;
-  QTabWidget *tabs;
-  StatusBar *status_bar;
-  QPointer<options_imp> options;
-  QPointer<QSystemTrayIcon> systrayIcon;
-  QPointer<QTimer> systrayCreator;
-  QMenu *myTrayIconMenu;
-  TransferListWidget *transferList;
-  TransferListFiltersWidget *transferListFilters;
-  PropertiesWidget *properties;
-  bool displaySpeedInTitle;
-  bool force_exit;
-  // Keyboard shortcuts
-  QShortcut *switchSearchShortcut;
-  QShortcut *switchSearchShortcut2;
-  QShortcut *switchTransferShortcut;
-  QShortcut *switchRSSShortcut;
-  // Widgets
-  QAction *prioSeparator;
-  QAction *prioSeparator2;
-  QSplitter *hSplitter;
-  QSplitter *vSplitter;
-  // Search
-  SearchEngine *searchEngine;
-  // RSS
-  QPointer<RSSImp> rssWidget;
-  // Misc
-  QLocalServer *localServer;
+  private:
+    // Bittorrent
+    Bittorrent *BTSession;
+    QList<QPair<QTorrentHandle,QString> > unauthenticated_trackers; // Still needed?
+    // GUI related
+    QTimer *guiUpdater;
+    QTabWidget *tabs;
+    StatusBar *status_bar;
+    QPointer<options_imp> options;
+    QPointer<QSystemTrayIcon> systrayIcon;
+    QPointer<QTimer> systrayCreator;
+    QMenu *myTrayIconMenu;
+    TransferListWidget *transferList;
+    TransferListFiltersWidget *transferListFilters;
+    PropertiesWidget *properties;
+    bool displaySpeedInTitle;
+    bool force_exit;
+    // Keyboard shortcuts
+    QShortcut *switchSearchShortcut;
+    QShortcut *switchSearchShortcut2;
+    QShortcut *switchTransferShortcut;
+    QShortcut *switchRSSShortcut;
+    // Widgets
+    QAction *prioSeparator;
+    QAction *prioSeparator2;
+    QSplitter *hSplitter;
+    QSplitter *vSplitter;
+    // Search
+    SearchEngine *searchEngine;
+    // RSS
+    QPointer<RSSImp> rssWidget;
+    // Misc
+    QLocalServer *localServer;

-protected slots:
-  // GUI related slots
-  void dropEvent(QDropEvent *event);
-  void dragEnterEvent(QDragEnterEvent *event);
-  void toggleVisibility(QSystemTrayIcon::ActivationReason e);
-  void on_actionAbout_triggered();
-  void on_actionCreate_torrent_triggered();
-  void on_actionWebsite_triggered() const;
-  void on_actionBugReport_triggered() const;
-  void on_actionShow_console_triggered();
-  void readParamsOnSocket();
-  void acceptConnection();
-  void balloonClicked();
-  void writeSettings();
-  void readSettings();
-  void on_actionExit_triggered();
-  void createTrayIcon();
-  void fullDiskError(QTorrentHandle& h, QString msg) const;
-  void handleDownloadFromUrlFailure(QString, QString) const;
-  void createSystrayDelayed();
-  void tab_changed(int);
-  // Keyboard shortcuts
-  void createKeyboardShortcuts();
-  void displayTransferTab() const;
-  void displaySearchTab() const;
-  void displayRSSTab() const;
-  // Torrent actions
-  void on_actionSet_global_upload_limit_triggered();
-  void on_actionSet_global_download_limit_triggered();
-  void on_actionDocumentation_triggered() const;
-  void on_actionOpen_triggered();
-  void updateGUI();
-  void loadPreferences(bool configure_session=true);
-  void processParams(const QStringList& params);
-  void addTorrent(QString path);
-  void addUnauthenticatedTracker(QPair<QTorrentHandle,QString> tracker);
-  void processDownloadedFiles(QString path, QString url);
-  void finishedTorrent(QTorrentHandle& h) const;
-  // Options slots
-  void on_actionOptions_triggered();
-  void optionsSaved();
-  // HTTP slots
-  void on_actionDownload_from_URL_triggered();
+  protected slots:
+    // GUI related slots
+    void dropEvent(QDropEvent *event);
+    void dragEnterEvent(QDragEnterEvent *event);
+    void toggleVisibility(QSystemTrayIcon::ActivationReason e);
+    void on_actionAbout_triggered();
+    void on_actionCreate_torrent_triggered();
+    void on_actionWebsite_triggered() const;
+    void on_actionBugReport_triggered() const;
+    void on_actionShow_console_triggered();
+    void readParamsOnSocket();
+    void acceptConnection();
+    void balloonClicked();
+    void writeSettings();
+    void readSettings();
+    void on_actionExit_triggered();
+    void createTrayIcon();
+    void fullDiskError(QTorrentHandle& h, QString msg) const;
+    void handleDownloadFromUrlFailure(QString, QString) const;
+    void createSystrayDelayed();
+    void tab_changed(int);
+    // Keyboard shortcuts
+    void createKeyboardShortcuts();
+    void displayTransferTab() const;
+    void displaySearchTab() const;
+    void displayRSSTab() const;
+    // Torrent actions
+    void on_actionSet_global_upload_limit_triggered();
+    void on_actionSet_global_download_limit_triggered();
+    void on_actionDocumentation_triggered() const;
+    void on_actionOpen_triggered();
+    void updateGUI();
+    void loadPreferences(bool configure_session=true);
+    void processParams(const QStringList& params);
+    void addTorrent(QString path);
+    void addUnauthenticatedTracker(QPair<QTorrentHandle,QString> tracker);
+    void processDownloadedFiles(QString path, QString url);
+    void downloadFromURLList(const QStringList& urls);
+    void finishedTorrent(QTorrentHandle& h) const;
+    // Options slots
+    void on_actionOptions_triggered();
+    void optionsSaved();
+    // HTTP slots
+    void on_actionDownload_from_URL_triggered();


-public slots:
-  void trackerAuthenticationRequired(QTorrentHandle& h);
-  void setTabText(int index, QString text) const;
-  void showNotificationBaloon(QString title, QString msg) const;
-  void downloadFromURLList(const QStringList& urls);
+  public slots:
+    void trackerAuthenticationRequired(QTorrentHandle& h);
+    void setTabText(int index, QString text) const;
+    void showNotificationBaloon(QString title, QString msg) const;

-protected:
-  void closeEvent(QCloseEvent *);
-  void showEvent(QShowEvent *);
-  bool event(QEvent * event);
-  void displayRSSTab(bool enable);
+  protected:
+    void closeEvent(QCloseEvent *);
+    void showEvent(QShowEvent *);
+    bool event(QEvent * event);
+    void displayRSSTab(bool enable);

-public:
-  // Construct / Destruct
-  GUI(QWidget *parent=0, QStringList torrentCmdLine=QStringList());
-  ~GUI();
-  // Methods
-  int getCurrentTabIndex() const;
-  QPoint screenCenter() const;
-  TransferListWidget* getTransferList() const { return transferList; }
+  public:
+    // Construct / Destruct
+    GUI(QWidget *parent=0, QStringList torrentCmdLine=QStringList());
+    ~GUI();
+    // Methods
+    int getCurrentTabIndex() const;
+    QPoint screenCenter() const;
 };

 #endif
--- a/src/Icons/oxygen/feed-subscribe.png
+++ b/src/Icons/oxygen/feed-subscribe.png
--- a/src/Icons/oxygen/folder-documents.png
+++ b/src/Icons/oxygen/folder-documents.png
--- a/src/Icons/oxygen/services.png
+++ b/src/Icons/oxygen/services.png
--- a/src/Icons/qBittorrent.desktop
+++ b/src/Icons/qBittorrent.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Categories=Qt;Network;P2P;
-Comment=V2.1.0
+Comment=V2.0.3
 Exec=qbittorrent %f
 GenericName=Bittorrent client
 GenericName[bg]=Торент клиент
--- a/src/Icons/skin/disconnected.png
+++ b/src/Icons/skin/disconnected.png
--- a/src/Icons/skin/splash.png
+++ b/src/Icons/skin/splash.png
--- a/src/about_imp.h
+++ b/src/about_imp.h
@@ -64,7 +64,7 @@ class about : public QDialog, private Ui::AboutDlg{
      te_translation->append(QString::fromUtf8(
          "<i>- <u>Brazilian:</u> Nick Marinho (nickmarinho@gmail.com)<br>\
          - <u>Bulgarian:</u> Tsvetan & Boiko Bankov (emerge_life@users.sourceforge.net)<br>\
-          - <u>Catalan:</u> Francisco Luque Contreras (frannoe@ya.com)<br>\
+          - <u>Catalan:</u> Gekko Dam Beer (gekko04@users.sourceforge.net)<br>\
          - <u>Chinese (Simplified):</u> Guo Yue (yue.guo0418@gmail.com)<br>\
          - <u>Chinese (Traditional):</u> Yi-Shun Wang (dnextstep@gmail.com)<br>\
          - <u>Czech:</u> Jirka Vilim (web@tets.cz)<br>\
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
--- a/src/bittorrent.h
+++ b/src/bittorrent.h
@@ -34,12 +34,8 @@
 #include <QMap>
 #include <QUrl>
 #include <QStringList>
-#ifdef DISABLE_GUI
-#include <QCoreApplication>
-#else
 #include <QApplication>
 #include <QPalette>
-#endif
 #include <QPointer>

 #include <libtorrent/session.hpp>
@@ -111,20 +107,12 @@ private:
  bool NATPMPEnabled;
  bool LSDEnabled;
  bool DHTEnabled;
-  int current_dht_port;
-  bool PeXEnabled;
  bool queueingEnabled;
-  bool appendLabelToSavePath;
-#ifdef LIBTORRENT_0_15
-  bool appendqBExtension;
-#endif
  QString defaultSavePath;
  QString defaultTempPath;
  // GeoIP
-#ifndef DISABLE_GUI
  bool resolve_countries;
  bool geoipDBLoaded;
-#endif
  // ETA Computation
  QPointer<QTimer> timerETA;
  QHash<QString, QList<int> > ETA_samples;
@@ -206,18 +194,10 @@ public slots:
  void setGlobalRatio(float ratio);
  void setDeleteRatio(float ratio);
  void setDHTPort(int dht_port);
-  void setPeerProxySettings(proxy_settings proxySettings);
-  void setHTTPProxySettings(proxy_settings proxySettings);
+  void setProxySettings(proxy_settings proxySettings, bool trackers=true, bool peers=true, bool web_seeds=true, bool dht=true);
  void setSessionSettings(session_settings sessionSettings);
  void startTorrentsInPause(bool b);
  void setDefaultTempPath(QString temppath);
-  void setAppendLabelToSavePath(bool append);
-  void appendLabelToTorrentSavePath(QTorrentHandle h);
-  void changeLabelInTorrentSavePath(QTorrentHandle h, QString old_label, QString new_label);
-#ifdef LIBTORRENT_0_15
-  void appendqBextensionToTorrent(QTorrentHandle h, bool append);
-  void setAppendqBExtension(bool append);
-#endif
  void applyEncryptionSettings(pe_settings se);
  void setDownloadLimit(QString hash, long val);
  void setUploadLimit(QString hash, long val);
@@ -225,11 +205,7 @@ public slots:
  void enableNATPMP(bool b);
  void enableLSD(bool b);
  bool enableDHT(bool b);
-#ifdef DISABLE_GUI
-  void addConsoleMessage(QString msg, QString color=QString::null);
-#else
  void addConsoleMessage(QString msg, QColor color=QApplication::palette().color(QPalette::WindowText));
-#endif
  void addPeerBanMessage(QString msg, bool from_ipfilter);
  void processDownloadedFile(QString, QString);
  void addMagnetSkipAddDlg(QString uri);
@@ -257,8 +233,6 @@ signals:
  void downloadFromUrlFailure(QString url, QString reason);
  void torrentFinishedChecking(QTorrentHandle& h);
  void metadataReceived(QTorrentHandle &h);
-  void savePathChanged(QTorrentHandle &h);
-  void newConsoleMessage(QString msg);
 };

 #endif
--- a/src/downloadedpiecesbar.h
+++ b/src/downloadedpiecesbar.h
@@ -36,7 +36,6 @@
 #include <QList>
 #include <QPixmap>
 #include <libtorrent/bitfield.hpp>
-#include <math.h>

 using namespace libtorrent;
 #define BAR_HEIGHT 18
@@ -56,46 +55,19 @@ public:
  void setProgress(bitfield pieces) {
    if(pieces.empty()) {
      // Empty bar
-      QPixmap pix = QPixmap(1, 1);
-      pix.fill();
-      pixmap = pix;
+      pixmap = QPixmap(1, 1);
+      QPainter painter(&pixmap);
+      painter.setPen(Qt::white);
+      painter.drawPoint(0,0);
    } else {
-      int nb_pieces = pieces.size();
-      // Reduce the number of pieces before creating the pixmap
-      // otherwise it can crash when there are too many pieces
-      if(nb_pieces > width()) {
-        int ratio = floor(nb_pieces/(double)width());
-        QVector<bool> scaled_pieces;
-        for(int i=0; i<nb_pieces; i+= ratio) {
-          bool have = true;
-          for(int j=i; j<qMin(i+ratio, nb_pieces); ++j) {
-            if(!pieces[i]) { have = false; break; }
-          }
-          scaled_pieces << have;
-        }
-        QPixmap pix = QPixmap(scaled_pieces.size(), 1);
-        pix.fill();
-        QPainter painter(&pix);
-        for(int i=0; i<scaled_pieces.size(); ++i) {
-          if(scaled_pieces[i])
-            painter.setPen(Qt::blue);
-          else
-            painter.setPen(Qt::white);
-          painter.drawPoint(i,0);
-        }
-        pixmap = pix;
-      } else {
-        QPixmap pix = QPixmap(pieces.size(), 1);
-        pix.fill();
-        QPainter painter(&pix);
-        for(uint i=0; i<pieces.size(); ++i) {
-          if(pieces[i])
-            painter.setPen(Qt::blue);
-          else
-            painter.setPen(Qt::white);
-          painter.drawPoint(i,0);
-        }
-        pixmap = pix;
+      pixmap = QPixmap(pieces.size(), 1);
+      QPainter painter(&pixmap);
+      for(uint i=0; i<pieces.size(); ++i) {
+        if(pieces[i])
+          painter.setPen(Qt::blue);
+        else
+          painter.setPen(Qt::white);
+        painter.drawPoint(i,0);
      }
    }
    update();
--- a/src/downloadthread.cpp
+++ b/src/downloadthread.cpp
@@ -35,8 +35,6 @@
 #include <QNetworkRequest>
 #include <QNetworkProxy>

-enum ProxyType {HTTP=1, SOCKS5=2, HTTP_PW=3, SOCKS5_PW=4, SOCKS4=5};
-
 /** Download Thread **/

 downloadThread::downloadThread(QObject* parent) : QObject(parent) {
@@ -107,7 +105,7 @@ void downloadThread::applyProxySettings() {
    qDebug("Using proxy: %s", (IP+QString(":")+port).toLocal8Bit().data());
    proxy.setPort(port.toUShort());
    // Default proxy type is HTTP, we must change if it is SOCKS5
-    if(intValue == SOCKS5 || intValue == SOCKS5_PW) {
+    if(intValue%2==0) {
      qDebug("Proxy is SOCKS5, not HTTP");
      proxy.setType(QNetworkProxy::Socks5Proxy);
    } else {
--- a/src/engineselectdlg.cpp
+++ b/src/engineselectdlg.cpp
@@ -170,7 +170,7 @@ void engineSelectDlg::on_actionUninstall_triggered() {
    }else {
      // Proceed with uninstall
      // remove it from hard drive
-      QDir enginesFolder(misc::searchEngineLocation()+QDir::separator()+"engines");
+      QDir enginesFolder(misc::qBittorrentPath()+"search_engine"+QDir::separator()+"engines");
      QStringList filters;
      filters << id+".*";
      QStringList files = enginesFolder.entryList(filters, QDir::Files, QDir::Unsorted);
@@ -245,7 +245,7 @@ QTreeWidgetItem* engineSelectDlg::findItemWithID(QString id){
 }

 bool engineSelectDlg::isUpdateNeeded(QString plugin_name, float new_version) const {
-  float old_version = SearchEngine::getPluginVersion(misc::searchEngineLocation()+QDir::separator()+"engines"+QDir::separator()+plugin_name+".py");
+  float old_version = SearchEngine::getPluginVersion(misc::qBittorrentPath()+"search_engine"+QDir::separator()+"engines"+QDir::separator()+plugin_name+".py");
  qDebug("IsUpdate needed? tobeinstalled: %.2f, alreadyinstalled: %.2f", new_version, old_version);
  return (new_version > old_version);
 }
@@ -260,7 +260,7 @@ void engineSelectDlg::installPlugin(QString path, QString plugin_name) {
    return;
  }
  // Process with install
-  QString dest_path = misc::searchEngineLocation()+QDir::separator()+"engines"+QDir::separator()+plugin_name+".py";
+  QString dest_path = misc::qBittorrentPath()+"search_engine"+QDir::separator()+"engines"+QDir::separator()+plugin_name+".py";
  bool update = false;
  if(QFile::exists(dest_path)) {
    // Backup in case install fails
@@ -324,12 +324,12 @@ void engineSelectDlg::addNewEngine(QString engine_name) {
    setRowColor(pluginsTree->indexOfTopLevelItem(item), "red");
  }
  // Handle icon
-  QString iconPath = misc::searchEngineLocation()+QDir::separator()+"engines"+QDir::separator()+engine->getName()+".png";
+  QString iconPath = misc::qBittorrentPath()+"search_engine"+QDir::separator()+"engines"+QDir::separator()+engine->getName()+".png";
  if(QFile::exists(iconPath)) {
    // Good, we already have the icon
    item->setData(ENGINE_NAME, Qt::DecorationRole, QVariant(QIcon(iconPath)));
  } else {
-    iconPath = misc::searchEngineLocation()+QDir::separator()+"engines"+QDir::separator()+engine->getName()+".ico";
+    iconPath = misc::qBittorrentPath()+"search_engine"+QDir::separator()+"engines"+QDir::separator()+engine->getName()+".ico";
    if(QFile::exists(iconPath)) { // ICO support
      item->setData(ENGINE_NAME, Qt::DecorationRole, QVariant(QIcon(iconPath)));
    } else {
@@ -427,9 +427,9 @@ void engineSelectDlg::processDownloadedFile(QString url, QString filePath) {
        QFile icon(filePath);
        icon.open(QIODevice::ReadOnly);
        if(ICOHandler::canRead(&icon))
-          iconPath = misc::searchEngineLocation()+QDir::separator()+"engines"+QDir::separator()+id+".ico";
+          iconPath = misc::qBittorrentPath()+"search_engine"+QDir::separator()+"engines"+QDir::separator()+id+".ico";
        else
-          iconPath = misc::searchEngineLocation()+QDir::separator()+"engines"+QDir::separator()+id+".png";
+          iconPath = misc::qBittorrentPath()+"search_engine"+QDir::separator()+"engines"+QDir::separator()+id+".png";
        QFile::copy(filePath, iconPath);
        item->setData(ENGINE_NAME, Qt::DecorationRole, QVariant(QIcon(iconPath)));
      }
--- a/src/eventmanager.cpp
+++ b/src/eventmanager.cpp
@@ -33,12 +33,12 @@
 #include "bittorrent.h"
 #include "misc.h"
 #include "preferences.h"
-//#include "proplistdelegate.h"
+#include "proplistdelegate.h"
 #include "torrentpersistentdata.h"
 #include <QDebug>

 EventManager::EventManager(QObject *parent, Bittorrent *BTSession)
-  : QObject(parent), BTSession(BTSession)
+    : QObject(parent), BTSession(BTSession)
 {
 }

@@ -103,9 +103,13 @@ QList<QVariantMap> EventManager::getPropFilesInfo(QString hash) const {
  int i=0;
  for(fi=t.begin_files(); fi != t.end_files(); fi++) {
    QVariantMap file;
-    QString path = QDir::cleanPath(misc::toQString(fi->path.string()));
-    QString name = path.split('/').last();
-    file["name"] = name;
+    if(h.num_files() == 1) {
+      file["name"] = h.name();
+    } else {
+      QString path = QDir::cleanPath(misc::toQString(fi->path.string()));
+      QString name = path.split('/').last();
+      file["name"] = name;
+    }
    file["size"] = misc::friendlyUnit((double)fi->size);
    if(fi->size > 0)
      file["progress"] = fp[i]/(double)fi->size;
@@ -118,162 +122,14 @@ QList<QVariantMap> EventManager::getPropFilesInfo(QString hash) const {
  return files;
 }

-void EventManager::setGlobalPreferences(QVariantMap m) const {
-  // UI
-  if(m.contains("locale"))
-    Preferences::setLocale(m["locale"].toString());
-  // Downloads
-  if(m.contains("save_path"))
-    Preferences::setSavePath(m["save_path"].toString());
-  if(m.contains("temp_path_enabled"))
-    Preferences::setTempPathEnabled(m["temp_path_enabled"].toBool());
-  if(m.contains("temp_path"))
-    Preferences::setTempPath(m["temp_path"].toString());
-  if(m.contains("scan_dir"))
-    Preferences::setScanDir(m["scan_dir"].toString());
-  if(m.contains("preallocate_all"))
-    Preferences::preAllocateAllFiles(m["preallocate_all"].toBool());
-  if(m.contains("queueing_enabled"))
-    Preferences::setQueueingSystemEnabled(m["queueing_enabled"].toBool());
-  if(m.contains("max_active_downloads"))
-    Preferences::setMaxActiveDownloads(m["max_active_downloads"].toInt());
-  if(m.contains("max_active_torrents"))
-    Preferences::setMaxActiveTorrents(m["max_active_torrents"].toInt());
-  if(m.contains("max_active_uploads"))
-    Preferences::setMaxActiveUploads(m["max_active_uploads"].toInt());
-#ifdef LIBTORRENT_0_15
-  if(m.contains("incomplete_files_ext"))
-    Preferences::useIncompleteFilesExtension(m["incomplete_files_ext"].toBool());
-#endif
-  // Connection
-  if(m.contains("listen_port"))
-    Preferences::setSessionPort(m["listen_port"].toInt());
-  if(m.contains("upnp"))
-    Preferences::setUPnPEnabled(m["upnp"].toBool());
-  if(m.contains("natpmp"))
-    Preferences::setNATPMPEnabled(m["natpmp"].toBool());
-  if(m.contains("dl_limit"))
-    Preferences::setGlobalDownloadLimit(m["dl_limit"].toInt());
-  if(m.contains("up_limit"))
-    Preferences::setGlobalUploadLimit(m["up_limit"].toInt());
-  if(m.contains("max_connec"))
-    Preferences::setMaxConnecs(m["max_connec"].toInt());
-  if(m.contains("max_connec_per_torrent"))
-    Preferences::setMaxConnecsPerTorrent(m["max_connec_per_torrent"].toInt());
-  if(m.contains("max_uploads_per_torrent"))
-    Preferences::setMaxUploadsPerTorrent(m["max_uploads_per_torrent"].toInt());
-  // Bittorrent
-  if(m.contains("dht"))
-    Preferences::setDHTEnabled(m["dht"].toBool());
-  if(m.contains("pex"))
-    Preferences::setPeXEnabled(m["pex"].toBool());
-  qDebug("Pex support: %d", (int)m["pex"].toBool());
-  if(m.contains("lsd"))
-    Preferences::setLSDEnabled(m["lsd"].toBool());
-  if(m.contains("encryption"))
-    Preferences::setEncryptionSetting(m["encryption"].toInt());
-  if(m.contains("peer_id"))
-    Preferences::setPeerID(m["peer_id"].toString());
-  if(m.contains("peer_version"))
-    Preferences::setClientVersion(m["peer_version"].toString());
-  if(m.contains("peer_build"))
-    Preferences::setClientBuild(m["peer_build"].toString());
-  // Proxy
-  if(m.contains("proxy_type"))
-    Preferences::setPeerProxyType(m["proxy_type"].toInt());
-  if(m.contains("proxy_ip"))
-    Preferences::setPeerProxyIp(m["proxy_ip"].toString());
-  if(m.contains("proxy_port"))
-    Preferences::setPeerProxyPort(m["proxy_port"].toUInt());
-  if(m.contains("proxy_auth_enabled"))
-    Preferences::setPeerProxyAuthEnabled(m["proxy_auth_enabled"].toBool());
-  if(m.contains("proxy_username"))
-    Preferences::setPeerProxyUsername(m["proxy_username"].toString());
-  if(m.contains("proxy_password"))
-    Preferences::setPeerProxyPassword(m["proxy_password"].toString());
-  if(m.contains("http_proxy_type"))
-    Preferences::setHTTPProxyType(m["http_proxy_type"].toInt());
-  if(m.contains("http_proxy_ip"))
-    Preferences::setHTTPProxyIp(m["http_proxy_ip"].toString());
-  if(m.contains("http_proxy_port"))
-    Preferences::setHTTPProxyPort(m["http_proxy_port"].toUInt());
-  if(m.contains("http_proxy_auth_enabled"))
-    Preferences::setHTTPProxyAuthEnabled(m["http_proxy_auth_enabled"].toBool());
-  if(m.contains("http_proxy_username"))
-    Preferences::setHTTPProxyUsername(m["http_proxy_username"].toString());
-  if(m.contains("http_proxy_password"))
-    Preferences::setHTTPProxyPassword(m["http_proxy_password"].toString());
-  // IP Filter
-  if(m.contains("ip_filter_enabled"))
-    Preferences::setFilteringEnabled(m["ip_filter_enabled"].toBool());
-  if(m.contains("ip_filter_path"))
-    Preferences::setFilter(m["ip_filter_path"].toString());
-  // Web UI
-  if(m.contains("web_ui_port"))
-    Preferences::setWebUiPort(m["web_ui_port"].toUInt());
-  if(m.contains("web_ui_username"))
-    Preferences::setWebUiUsername(m["web_ui_username"].toString());
-  if(m.contains("web_ui_password"))
-    Preferences::setWebUiPassword(m["web_ui_password"].toString());
-  // Reload preferences
-  BTSession->configureSession();
-}
-
 QVariantMap EventManager::getGlobalPreferences() const {
  QVariantMap data;
-  // UI
-  data["locale"] = Preferences::getLocale();
-  // Downloads
-  data["save_path"] = Preferences::getSavePath();
-  data["temp_path_enabled"] = Preferences::isTempPathEnabled();
-  data["temp_path"] = Preferences::getTempPath();
-  data["scan_dir_enabled"] = Preferences::isDirScanEnabled();
-  data["scan_dir"] = Preferences::getScanDir();
-  data["preallocate_all"] = Preferences::preAllocateAllFiles();
-  data["queueing_enabled"] = Preferences::isQueueingSystemEnabled();
-  data["max_active_downloads"] = Preferences::getMaxActiveDownloads();
-  data["max_active_torrents"] = Preferences::getMaxActiveTorrents();
-  data["max_active_uploads"] = Preferences::getMaxActiveUploads();
-#ifdef LIBTORRENT_0_15
-  data["incomplete_files_ext"] = Preferences::useIncompleteFilesExtension();
-#endif
-  // Connection
-  data["listen_port"] = Preferences::getSessionPort();
-  data["upnp"] = Preferences::isUPnPEnabled();
-  data["natpmp"] = Preferences::isNATPMPEnabled();
  data["dl_limit"] = Preferences::getGlobalDownloadLimit();
  data["up_limit"] = Preferences::getGlobalUploadLimit();
+  data["dht"] = Preferences::isDHTEnabled();
  data["max_connec"] = Preferences::getMaxConnecs();
  data["max_connec_per_torrent"] = Preferences::getMaxConnecsPerTorrent();
  data["max_uploads_per_torrent"] = Preferences::getMaxUploadsPerTorrent();
-  // Bittorrent
-  data["dht"] = Preferences::isDHTEnabled();
-  data["pex"] = Preferences::isPeXEnabled();
-  data["lsd"] = Preferences::isLSDEnabled();
-  data["encryption"] = Preferences::getEncryptionSetting();
-  data["peer_id"] = Preferences::getPeerID();
-  data["peer_version"] = Preferences::getClientVersion();
-  data["peer_build"] = Preferences::getClientBuild();
-  // Proxy
-  data["proxy_type"] = Preferences::getPeerProxyType();
-  data["proxy_ip"] = Preferences::getPeerProxyIp();
-  data["proxy_port"] = Preferences::getPeerProxyPort();
-  data["proxy_auth_enabled"] = Preferences::isPeerProxyAuthEnabled();
-  data["proxy_username"] = Preferences::getPeerProxyUsername();
-  data["proxy_password"] = Preferences::getPeerProxyPassword();
-  data["http_proxy_type"] = Preferences::getHTTPProxyType();
-  data["http_proxy_ip"] = Preferences::getHTTPProxyIp();
-  data["http_proxy_port"] = Preferences::getHTTPProxyPort();
-  data["http_proxy_auth_enabled"] = Preferences::isHTTPProxyAuthEnabled();
-  data["http_proxy_username"] = Preferences::getHTTPProxyUsername();
-  data["http_proxy_password"] = Preferences::getHTTPProxyPassword();
-  // IP Filter
-  data["ip_filter_enabled"] = Preferences::isFilteringEnabled();
-  data["ip_filter_path"] = Preferences::getFilter();
-  // Web UI
-  data["web_ui_port"] = Preferences::getWebUiPort();
-  data["web_ui_username"] = Preferences::getWebUiUsername();
-  data["web_ui_password"] = Preferences::getWebUiPassword();
  return data;
 }

@@ -306,10 +162,10 @@ QVariantMap EventManager::getPropGeneralInfo(QString hash) const {
    data["nb_connections"] = QString::number(h.num_connections())+" ("+tr("%1 max", "e.g. 10 max").arg(QString::number(h.connections_limit()))+")";
    // Update ratio info
    double ratio = BTSession->getRealRatio(h.hash());
-    if(ratio > 100.)
-      data["share_ratio"] = QString::fromUtf8("∞");
-    else
-      data["share_ratio"] = QString(QByteArray::number(ratio, 'f', 1));
+      if(ratio > 100.)
+        data["share_ratio"] = QString::fromUtf8("∞");
+      else
+        data["share_ratio"] = QString(QByteArray::number(ratio, 'f', 1));
  }
  return data;
 }
@@ -377,7 +233,7 @@ void EventManager::modifiedTorrent(QTorrentHandle h)
  }
  event["name"] = QVariant(h.name());
  event["size"] = QVariant(misc::friendlyUnit(h.actual_size()));
-  event["progress"] = QVariant((double)h.progress());
+  event["progress"] = QVariant(h.progress());
  event["dlspeed"] = QVariant(tr("%1/s", "e.g. 120 KiB/s").arg(misc::friendlyUnit(h.download_payload_rate())));
  if(BTSession->isQueueingEnabled()) {
    if(h.queue_position() >= 0)
--- a/src/eventmanager.h
+++ b/src/eventmanager.h
@@ -55,7 +55,6 @@ class EventManager : public QObject
                QList<QVariantMap> getPropTrackersInfo(QString hash) const;
                QList<QVariantMap> getPropFilesInfo(QString hash) const;
                QVariantMap getGlobalPreferences() const;
-                void setGlobalPreferences(QVariantMap m) const;

 	public slots:
 		void addedTorrent(QTorrentHandle& h);
--- a/src/feedList.h
+++ b/src/feedList.h
@@ -47,16 +47,10 @@ public:
    }
  }

-  void itemAboutToBeRemoved(QTreeWidgetItem *item) {
+  void itemRemoved(QTreeWidgetItem *item) {
    RssFile* file = mapping.take(item);
-    if(file->getType() == RssFile::STREAM) {
+    if(file->getType() == RssFile::STREAM)
      feeds_items.remove(file->getID());
-    } else {
-      QList<RssStream*> feeds = ((RssFolder*)file)->getAllFeeds();
-      foreach(RssStream* feed, feeds) {
-        feeds_items.remove(feed->getID());
-      }
-    }
  }

  bool hasFeed(QString url) const {
--- a/src/feeddownloader.h
+++ b/src/feeddownloader.h
@@ -64,21 +64,17 @@ public:

  bool matches(QString s) {
    QStringList match_tokens = getMatchingTokens();
-    //qDebug("Checking matching tokens: \"%s\"", getMatchingTokens_str().toLocal8Bit().data());
    foreach(const QString& token, match_tokens) {
      if(token.isEmpty() || token == "")
        continue;
-      //qDebug("Token: %s", token.toLocal8Bit().data());
-      QRegExp reg(token, Qt::CaseInsensitive, QRegExp::Wildcard);
-      //reg.setMinimal(false);
+      QRegExp reg(token, Qt::CaseInsensitive);
      if(reg.indexIn(s) < 0) return false;
    }
-    qDebug("Checking not matching tokens");
    // Checking not matching
    QStringList notmatch_tokens = getNotMatchingTokens();
    foreach(const QString& token, notmatch_tokens) {
      if(token.isEmpty()) continue;
-      QRegExp reg(token, Qt::CaseInsensitive, QRegExp::Wildcard);
+      QRegExp reg(token, Qt::CaseInsensitive);
      if(reg.indexIn(s) > -1) return false;
    }
    return true;
@@ -261,7 +257,6 @@ public:
    // Restore saved info
    enableDl_cb->setChecked(filters.isDownloadingEnabled());
    fillFiltersList();
-    filtersList->sortItems(Qt::AscendingOrder);
    if(filters.size() > 0) {
      // Select first filter
      filtersList->setCurrentItem(filtersList->item(0));
@@ -272,8 +267,6 @@ public:
  }

  ~FeedDownloaderDlg() {
-    if(enableDl_cb->isChecked())
-      emit filteringEnabled();
    // Make sure we save everything
    saveCurrentFilterSettings();
    filters.save();
@@ -381,14 +374,11 @@ protected slots:
          QMessageBox::warning(0, tr("Invalid filter name"), tr("This filter name is already in use."));
        }
      }while(!validated);
-      // Save the current filter
-      saveCurrentFilterSettings();
      // Rename the filter
      filters.rename(current_name, new_name);
      if(selected_filter == current_name)
        selected_filter = new_name;
      item->setText(new_name);
-      filtersList->sortItems(Qt::AscendingOrder);
    }
  }

@@ -442,7 +432,6 @@ protected slots:
      }
    }while(!validated);
    QListWidgetItem *it = new QListWidgetItem(filter_name, filtersList);
-    filtersList->sortItems(Qt::AscendingOrder);
    filtersList->setCurrentItem(it);
    //showFilterSettings(it);
  }
@@ -498,19 +487,16 @@ protected slots:
    // Append file extension
    if(!destination.endsWith(".filters"))
      destination += ".filters";
-    /*if(QFile::exists(destination)) {
+    if(QFile::exists(destination)) {
      int ret = QMessageBox::question(0, tr("Overwriting confirmation"), tr("Are you sure you want to overwrite existing file?"), QMessageBox::Yes|QMessageBox::No);
      if(ret != QMessageBox::Yes) return;
-    }*/
+    }
    if(filters.serialize(destination))
      QMessageBox::information(0, tr("Export successful"), tr("Filters export was successful."));
    else
      QMessageBox::warning(0, tr("Export failure"), tr("Filters could not be exported due to an I/O error."));
  }

-signals:
-  void filteringEnabled();
-
 };

 #undef QHash
--- a/src/filterparserthread.h
+++ b/src/filterparserthread.h
@@ -34,8 +34,7 @@
 #include <QThread>
 #include <QFile>
 #include <QDataStream>
-#include <QRegExp>
-#include <QStringList>
+#include <QMessageBox>

 #include <libtorrent/session.hpp>
 #include <libtorrent/ip_filter.hpp>
@@ -72,7 +71,7 @@ class FilterParserThread : public QThread  {
          // PeerGuardian p2p file
          parseP2PFilterFile(filePath);
        } else {
-            if(filePath.endsWith(".p2b", Qt::CaseInsensitive)) {
+            if(filePath.endsWith(".p2p", Qt::CaseInsensitive)) {
              // PeerGuardian p2b file
              parseP2BFilterFile(filePath);
            } else {
@@ -104,7 +103,7 @@ class FilterParserThread : public QThread  {
      QFile file(filePath);
      if (file.exists()){
        if(!file.open(QIODevice::ReadOnly | QIODevice::Text)){
-          std::cerr << "I/O Error: Could not open ip filer file in read mode." << std::endl;
+          QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("Couldn't open %1 in read mode.").arg(filePath));
          return;
        }
        unsigned int nbLine = 0;
@@ -225,7 +224,7 @@ class FilterParserThread : public QThread  {
      QStringList IP;
      if (file.exists()){
        if(!file.open(QIODevice::ReadOnly | QIODevice::Text)){
-          std::cerr << "I/O Error: Could not open ip filer file in read mode." << std::endl;
+          QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("Couldn't open %1 in read mode.").arg(filePath));
          return;
        }
        unsigned int nbLine = 0;
@@ -293,7 +292,7 @@ class FilterParserThread : public QThread  {
      QFile file(filePath);
      if (file.exists()){
        if(!file.open(QIODevice::ReadOnly)){
-          std::cerr << "I/O Error: Could not open ip filer file in read mode." << std::endl;
+          QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("Couldn't open %1 in read mode.").arg(filePath));
          return;
        }
        QDataStream stream(&file);
@@ -305,7 +304,7 @@ class FilterParserThread : public QThread  {
                memcmp(buf, "\xFF\xFF\xFF\xFFP2B", 7) ||
                !stream.readRawData((char*)&version, sizeof(version))
        ) {
-          std::cerr << "Parsing Error: The filter file is not a valid PeerGuardian P2B file." << std::endl;
+          QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("%1 is not a valid PeerGuardian P2B file.").arg(filePath));
          return;
        }
    
@@ -319,7 +318,7 @@ class FilterParserThread : public QThread  {
              !stream.readRawData((char*)&start, sizeof(start)) ||
              !stream.readRawData((char*)&end, sizeof(end))
            ) {
-              std::cerr << "Parsing Error: The filter file is not a valid PeerGuardian P2B file." << std::endl;
+              QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("%1 is not a valid PeerGuardian P2B file.").arg(filePath));
              return;
            }
            // Network byte order to Host byte order
@@ -335,7 +334,7 @@ class FilterParserThread : public QThread  {
          qDebug ("p2b version 3");
          unsigned int namecount;
          if(!stream.readRawData((char*)&namecount, sizeof(namecount))) {
-            std::cerr << "Parsing Error: The filter file is not a valid PeerGuardian P2B file." << std::endl;
+            QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("%1 is not a valid PeerGuardian P2B file.").arg(filePath));
            return;
          }
          namecount=ntohl(namecount);
@@ -343,7 +342,7 @@ class FilterParserThread : public QThread  {
          for(unsigned int i=0; i<namecount; i++) {
            string name;
            if(!getlineInStream(stream, name, '\0')) {
-              std::cerr << "Parsing Error: The filter file is not a valid PeerGuardian P2B file." << std::endl;
+              QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("%1 is not a valid PeerGuardian P2B file.").arg(filePath));
              return;
            }
            if(abort) return;
@@ -351,7 +350,7 @@ class FilterParserThread : public QThread  {
          // Reading the ranges
          unsigned int rangecount;
          if(!stream.readRawData((char*)&rangecount, sizeof(rangecount))) {
-            std::cerr << "Parsing Error: The filter file is not a valid PeerGuardian P2B file." << std::endl;
+            QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("%1 is not a valid PeerGuardian P2B file.").arg(filePath));
            return;
          }
          rangecount=ntohl(rangecount);
@@ -364,7 +363,7 @@ class FilterParserThread : public QThread  {
              !stream.readRawData((char*)&start, sizeof(start)) ||
              !stream.readRawData((char*)&end, sizeof(end))
            ) {
-              std::cerr << "Parsing Error: The filter file is not a valid PeerGuardian P2B file." << std::endl;
+              QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("%1 is not a valid PeerGuardian P2B file.").arg(filePath));
              return;
            }
            // Network byte order to Host byte order
@@ -377,7 +376,7 @@ class FilterParserThread : public QThread  {
            if(abort) return;
          }
        } else {
-          std::cerr << "Parsing Error: The filter file is not a valid PeerGuardian P2B file." << std::endl;
+          QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("%1 is not a valid PeerGuardian P2B file.").arg(filePath));
          return;
        }
        file.close();
--- a/src/headlessloader.h
+++ b/src/headlessloader.h
@@ -1,138 +0,0 @@
-/*
- * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2006  Christophe Dumez, Frédéric Lassabe
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * In addition, as a special exception, the copyright holders give permission to
- * link this program with the OpenSSL project's "OpenSSL" library (or with
- * modified versions of it that use the same license as the "OpenSSL" library),
- * and distribute the linked executables. You must obey the GNU General Public
- * License in all respects for all of the code used other than "OpenSSL".  If you
- * modify file(s), you may extend this exception to your version of the file(s),
- * but you are not obligated to do so. If you do not wish to do so, delete this
- * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
- */
-
-#ifndef HEADLESSLOADER_H
-#define HEADLESSLOADER_H
-
-#include <QObject>
-#include <QCoreApplication>
-#include <QLocalServer>
-#include <QLocalSocket>
-#include "preferences.h"
-#include "bittorrent.h"
-
-class HeadlessLoader: QObject {
-  Q_OBJECT
-
-  private:
-    QLocalServer *localServer;
-    Bittorrent *BTSession;
-
-  public:
-    HeadlessLoader(QStringList torrentCmdLine) {
-      // Enable Web UI
-      Preferences::setWebUiEnabled(true);
-      // Instanciate Bittorrent Object
-      BTSession = new Bittorrent();
-      connect(BTSession, SIGNAL(newConsoleMessage(QString)), this, SLOT(displayConsoleMessage(QString)));
-      // Resume unfinished torrents
-      BTSession->startUpTorrents();
-      // Process command line parameters
-      processParams(torrentCmdLine);
-      // Use a tcp server to allow only one instance of qBittorrent
-      localServer = new QLocalServer();
-      QString uid = QString::number(getuid());
-#ifdef Q_WS_X11
-      if(QFile::exists(QDir::tempPath()+QDir::separator()+QString("qBittorrent-")+uid)) {
-        // Socket was not closed cleanly
-        std::cerr << "Warning: Local domain socket was not closed cleanly, deleting file...\n";
-        QFile::remove(QDir::tempPath()+QDir::separator()+QString("qBittorrent-")+uid);
-      }
-#endif
-      if (!localServer->listen("qBittorrent-"+uid)) {
-        std::cerr  << "Couldn't create socket, single instance mode won't work...\n";
-      }
-      connect(localServer, SIGNAL(newConnection()), this, SLOT(acceptConnection()));
-      // Display some information to the user
-      std::cout << std::endl << "******** " << tr("Information").toLocal8Bit().data() << " ********" << std::endl;
-      std::cout << tr("To control qBittorrent, access the Web UI at http://localhost:%1").arg(QString::number(Preferences::getWebUiPort())).toLocal8Bit().data() << std::endl;
-      std::cout << tr("The Web UI administrator user name is: %1").arg(Preferences::getWebUiUsername()).toLocal8Bit().data() << std::endl;
-      if(Preferences::getWebUiPassword() == "f6fdffe48c908deb0f4c3bd36c032e72") {
-        std::cout << tr("The Web UI administrator password is still the default one: %1").arg("adminadmin").toLocal8Bit().data() << std::endl;
-        std::cout << tr("This is a security risk, please consider changing your password from program preferences.").toLocal8Bit().data() << std::endl;
-      }
-    }
-
-    ~HeadlessLoader() {
-      delete BTSession;
-    }
-
-  public slots:
-    // Call this function to exit qBittorrent headless loader
-    // and return to prompt (object will be deleted by main)
-    void exit() {
-     qApp->quit();
-    }
-
-    void displayConsoleMessage(QString msg) {
-      std::cout << msg.toLocal8Bit().data() << std::endl;
-    }
-
-    // As program parameters, we can get paths or urls.
-    // This function parse the parameters and call
-    // the right addTorrent function, considering
-    // the parameter type.
-    void processParams(const QStringList& params) {
-      foreach(QString param, params) {
-        param = param.trimmed();
-        if(param.startsWith("--")) continue;
-        if(param.startsWith(QString::fromUtf8("http://"), Qt::CaseInsensitive) || param.startsWith(QString::fromUtf8("ftp://"), Qt::CaseInsensitive) || param.startsWith(QString::fromUtf8("https://"), Qt::CaseInsensitive)) {
-          BTSession->downloadFromUrl(param);
-        }else{
-          if(param.startsWith("magnet:", Qt::CaseInsensitive)) {
-            BTSession->addMagnetUri(param);
-          } else {
-            BTSession->addTorrent(param);
-          }
-        }
-      }
-    }
-
-    void acceptConnection() {
-      QLocalSocket *clientConnection = localServer->nextPendingConnection();
-      connect(clientConnection, SIGNAL(disconnected()), this, SLOT(readParamsOnSocket()));
-      qDebug("accepted connection from another instance");
-    }
-
-    void readParamsOnSocket() {
-      QLocalSocket *clientConnection = static_cast<QLocalSocket*>(sender());
-      if(clientConnection) {
-        QByteArray params = clientConnection->readAll();
-        if(!params.isEmpty()) {
-          processParams(QString::fromUtf8(params.data()).split(QString::fromUtf8("\n")));
-          qDebug("Received parameters from another instance");
-        }
-        clientConnection->deleteLater();
-      }
-    }
-
-};
-
-#endif
--- a/src/httpconnection.cpp
+++ b/src/httpconnection.cpp
@@ -46,7 +46,7 @@
 #include <QTemporaryFile>

 HttpConnection::HttpConnection(QTcpSocket *socket, Bittorrent *BTSession, HttpServer *parent)
-  : QObject(parent), socket(socket), parent(parent), BTSession(BTSession)
+    : QObject(parent), socket(socket), parent(parent), BTSession(BTSession)
 {
  socket->setParent(this);
  connect(socket, SIGNAL(readyRead()), this, SLOT(read()));
@@ -103,12 +103,12 @@ void HttpConnection::write()
 }

 QString HttpConnection::translateDocument(QString data) {
-  std::string contexts[] = {"TransferListFiltersWidget", "TransferListWidget", "PropertiesWidget", "GUI", "MainWindow", "HttpServer", "confirmDeletionDlg", "TrackerList", "TorrentFilesModel", "options_imp", "Preferences"};
+  std::string contexts[] = {"TransferListFiltersWidget", "TransferListWidget", "PropertiesWidget", "GUI", "MainWindow", "HttpServer", "confirmDeletionDlg", "TrackerList", "TorrentFilesModel", "options_imp"};
  int i=0;
  bool found = false;
  do {
    found = false;
-    QRegExp regex(QString::fromUtf8("_\\(([\\w\\s?!:\\/\\(\\),µ\\-\\.]+)\\)"));
+    QRegExp regex("_\\(([\\w\\s?!:\\/\\(\\)\\.]+)\\)");
    i = regex.indexIn(data, i);
    if(i >= 0) {
      //qDebug("Found translatable string: %s", regex.cap(1).toUtf8().data());
@@ -118,7 +118,7 @@ QString HttpConnection::translateDocument(QString data) {
      do {
        translation = qApp->translate(contexts[context_index].c_str(), word.toLocal8Bit().data(), 0, QCoreApplication::UnicodeUTF8, 1);
        ++context_index;
-      }while(translation == word && context_index < 11);
+      }while(translation == word && context_index < 10);
      //qDebug("Translation is %s", translation.toUtf8().data());
      data = data.replace(i, regex.matchedLength(), translation);
      i += translation.length();
@@ -128,44 +128,18 @@ QString HttpConnection::translateDocument(QString data) {
  return data;
 }

-void HttpConnection::respond() {
+void HttpConnection::respond()
+{
  //qDebug("Respond called");
-  int nb_fail = parent->client_failed_attempts.value(socket->peerAddress().toString(), 0);
-  if(nb_fail > 4) {
-    generator.setStatusLine(403, "Forbidden");
-    generator.setMessage(tr("Your IP address has been banned after too many failed authentication attempts."));
-    write();
-    return;
-  }
-  QString auth = parser.value("Authorization");
-  if (QString::compare(auth.split(" ").first(), "Digest", Qt::CaseInsensitive) != 0 || !parent->isAuthorized(auth.toLocal8Bit(), parser.method())) {
-    // Update failed attempt counter
-    parent->client_failed_attempts.insert(socket->peerAddress().toString(), nb_fail+1);
-    qDebug("client IP: %s (%d failed attempts)", socket->peerAddress().toString().toLocal8Bit().data(), nb_fail);
-    // Return unauthorized header
+  QStringList auth = parser.value("Authorization").split(" ", QString::SkipEmptyParts);
+  if (auth.size() != 2 || QString::compare(auth[0], "Basic", Qt::CaseInsensitive) != 0 || !parent->isAuthorized(auth[1].toLocal8Bit()))
+  {
    generator.setStatusLine(401, "Unauthorized");
-    generator.setValue("WWW-Authenticate",  "Digest realm=\""+QString(QBT_REALM)+"\", nonce=\""+parent->generateNonce()+"\", algorithm=\"MD5\", qop=\"auth\"");
+    generator.setValue("WWW-Authenticate",  "Basic realm=\"you know what\"");
    write();
    return;
  }
-  // Client sucessfuly authenticated, reset number of failed attempts
-  parent->client_failed_attempts.remove(socket->peerAddress().toString());
  QString url  = parser.url();
-  // Favicon
-  if(url.endsWith("favicon.ico")) {
-    qDebug("Returning favicon");
-    QFile favicon(":/Icons/skin/qbittorrent16.png");
-    if(favicon.open(QIODevice::ReadOnly)) {
-      QByteArray data = favicon.readAll();
-      generator.setStatusLine(200, "OK");
-      generator.setContentTypeByExt("png");
-      generator.setMessage(data);
-      write();
-    } else {
-      respondNotFound();
-    }
-    return;
-  }
  QStringList list = url.split('/', QString::SkipEmptyParts);
  if (list.contains(".") || list.contains(".."))
  {
@@ -219,7 +193,6 @@ void HttpConnection::respond() {
  else
    list.prepend("webui");
  url = ":/" + list.join("/");
-  //qDebug("Resource URL: %s", url.toLocal8Bit().data());
  QFile file(url);
  if(!file.open(QIODevice::ReadOnly))
  {
@@ -255,7 +228,6 @@ void HttpConnection::respondJson()
  QString string = json::toJson(manager->getEventList());
  generator.setStatusLine(200, "OK");
  generator.setContentTypeByExt("js");
-  //qDebug("JSON: %s", string.toLocal8Bit().data());
  generator.setMessage(string);
  write();
 }
@@ -284,7 +256,6 @@ void HttpConnection::respondFilesPropertiesJson(QString hash) {
  generator.setStatusLine(200, "OK");
  generator.setContentTypeByExt("js");
  generator.setMessage(string);
-  //qDebug("JSON: %s", string.toLocal8Bit().data());
  write();
 }

@@ -358,32 +329,47 @@ void HttpConnection::respondCommand(QString command)
    return;
  }
  if(command == "setPreferences") {
-    QString json_str = parser.post("json");
-    //qDebug("setPreferences, json: %s", json_str.toLocal8Bit().data());
-    EventManager* manager =  parent->eventManager();
-    manager->setGlobalPreferences(json::fromJson(json_str));
+    bool ok = false;
+    int dl_limit = parser.post("dl_limit").toInt(&ok);
+    if(ok) {
+      BTSession->setDownloadRateLimit(dl_limit*1024);
+      Preferences::setGlobalDownloadLimit(dl_limit);
+    }
+    int up_limit = parser.post("up_limit").toInt(&ok);
+    if(ok) {
+      BTSession->setUploadRateLimit(up_limit*1024);
+      Preferences::setGlobalUploadLimit(up_limit);
+    }
+    int dht_state = parser.post("dht").toInt(&ok);
+    if(ok) {
+      BTSession->enableDHT(dht_state == 1);
+      Preferences::setDHTEnabled(dht_state == 1);
+    }
+    int max_connec = parser.post("max_connec").toInt(&ok);
+    if(ok) {
+      BTSession->setMaxConnections(max_connec);
+      Preferences::setMaxConnecs(max_connec);
+    }
+    int max_connec_per_torrent = parser.post("max_connec_per_torrent").toInt(&ok);
+    if(ok) {
+      BTSession->setMaxConnectionsPerTorrent(max_connec_per_torrent);
+      Preferences::setMaxConnecsPerTorrent(max_connec_per_torrent);
+    }
+    int max_uploads_per_torrent = parser.post("max_uploads_per_torrent").toInt(&ok);
+    if(ok) {
+      BTSession->setMaxUploadsPerTorrent(max_uploads_per_torrent);
+      Preferences::setMaxUploadsPerTorrent(max_uploads_per_torrent);
+    }
  }
  if(command == "setFilePrio") {
    QString hash = parser.post("hash");
    int file_id = parser.post("id").toInt();
    int priority = parser.post("priority").toInt();
    QTorrentHandle h = BTSession->getTorrentHandle(hash);
-    if(h.is_valid() && h.has_metadata()) {
+    if(h.is_valid() && h.has_metadata() && !h.get_torrent_handle().is_seed()) {
      h.file_priority(file_id, priority);
    }
  }
-  if(command == "getGlobalUpLimit") {
-    generator.setStatusLine(200, "OK");
-    generator.setContentTypeByExt("html");
-    generator.setMessage(QString::number(BTSession->getSession()->upload_rate_limit()));
-    write();
-  }
-  if(command == "getGlobalDlLimit") {
-    generator.setStatusLine(200, "OK");
-    generator.setContentTypeByExt("html");
-    generator.setMessage(QString::number(BTSession->getSession()->download_rate_limit()));
-    write();
-  }
  if(command == "getTorrentUpLimit") {
    QString hash = parser.post("hash");
    QTorrentHandle h = BTSession->getTorrentHandle(hash);
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -33,14 +33,13 @@
 #include "httpconnection.h"
 #include "eventmanager.h"
 #include "bittorrent.h"
+#include "preferences.h"
 #include <QTimer>
 #include <QCryptographicHash>
-#include <QTime>
-#include <QRegExp>

 HttpServer::HttpServer(Bittorrent *_BTSession, int msec, QObject* parent) : QTcpServer(parent) {
  username = Preferences::getWebUiUsername().toLocal8Bit();
-  password_ha1 = Preferences::getWebUiPassword().toLocal8Bit();
+  password_md5 = Preferences::getWebUiPassword().toLocal8Bit();
  connect(this, SIGNAL(newConnection()), this, SLOT(newHttpConnection()));
  BTSession = _BTSession;
  manager = new EventManager(this, BTSession);
@@ -77,12 +76,6 @@ HttpServer::HttpServer(Bittorrent *_BTSession, int msec, QObject* parent) : QTcp
  a = tr("Maximum number of connections per torrent limit must be greater than 0 or disabled.");
  a = tr("Maximum number of upload slots per torrent limit must be greater than 0 or disabled.");
  a = tr("Unable to save program preferences, qBittorrent is probably unreachable.");
-  a = tr("Language");
-  a = tr("Downloaded", "Is the file downloaded or not?");
-  a = tr("The port used for incoming connections must be greater than 1024 and less than 65535.");
-  a = tr("The port used for the Web UI must be greater than 1024 and less than 65535.");
-  a = tr("The Web UI username must be at least 3 characters long.");
-  a = tr("The Web UI password must be at least 3 characters long.");
 }

 HttpServer::~HttpServer()
@@ -119,110 +112,21 @@ void HttpServer::onTimer() {
  }
 }

-QString HttpServer::generateNonce() const {
-  QCryptographicHash md5(QCryptographicHash::Md5);
-  md5.addData(QTime::currentTime().toString("hhmmsszzz").toLocal8Bit());
-  md5.addData(":");
-  md5.addData(QBT_REALM);
-  return md5.result().toHex();
-}
-
-void HttpServer::setAuthorization(QString _username, QString _password_ha1) {
+void HttpServer::setAuthorization(QString _username, QString _password_md5) {
  username = _username.toLocal8Bit();
-  password_ha1 = _password_ha1.toLocal8Bit();
+  password_md5 = _password_md5.toLocal8Bit();
 }

-// AUTH string is: Digest username="chris",
-// realm="Web UI Access",
-// nonce="570d04de93444b7fd3eaeaecb00e635e",
-// uri="/", algorithm=MD5,
-// response="ba886766d19b45313c0e2195e4344264",
-// qop=auth, nc=00000001, cnonce="e8ac970779c17075"
-bool HttpServer::isAuthorized(QByteArray auth, QString method) const {
-  qDebug("AUTH string is %s", auth.data());
-  // Get user name
-  QRegExp regex_user(".*username=\"([^\"]+)\".*");
-  if(regex_user.indexIn(auth) < 0) return false;
-  QString prop_user = regex_user.cap(1);
-  qDebug("AUTH: Proposed username is %s, real username is %s", prop_user.toLocal8Bit().data(), username.data());
-  if(prop_user != username) {
-    // User name is invalid, we can reject already
-    qDebug("AUTH-PROB: Username is invalid");
-    return false;
-  }
-  // Get realm
-  QRegExp regex_realm(".*realm=\"([^\"]+)\".*");
-  if(regex_realm.indexIn(auth) < 0) {
-    qDebug("AUTH-PROB: Missing realm");
-    return false;
-  }
-  QByteArray prop_realm = regex_realm.cap(1).toLocal8Bit();
-  if(prop_realm != QBT_REALM) {
-    qDebug("AUTH-PROB: Wrong realm");
-    return false;
-  }
-  // get nonce
-  QRegExp regex_nonce(".*nonce=\"([^\"]+)\".*");
-  if(regex_nonce.indexIn(auth) < 0) {
-    qDebug("AUTH-PROB: missing nonce");
-    return false;
-  }
-  QByteArray prop_nonce = regex_nonce.cap(1).toLocal8Bit();
-  qDebug("prop nonce is: %s", prop_nonce.data());
-  // get uri
-  QRegExp regex_uri(".*uri=\"([^\"]+)\".*");
-  if(regex_uri.indexIn(auth) < 0) {
-    qDebug("AUTH-PROB: Missing uri");
-    return false;
-  }
-  QByteArray prop_uri = regex_uri.cap(1).toLocal8Bit();
-  qDebug("prop uri is: %s", prop_uri.data());
-  // get response
-  QRegExp regex_response(".*response=\"([^\"]+)\".*");
-  if(regex_response.indexIn(auth) < 0) {
-    qDebug("AUTH-PROB: Missing response");
-    return false;
-  }
-  QByteArray prop_response = regex_response.cap(1).toLocal8Bit();
-  qDebug("prop response is: %s", prop_response.data());
-  // Compute correct reponse
-  QCryptographicHash md5_ha2(QCryptographicHash::Md5);
-  md5_ha2.addData(method.toLocal8Bit() + ":" + prop_uri);
-  QByteArray ha2 = md5_ha2.result().toHex();
-  QByteArray response = "";
-  if(auth.contains("qop=")) {
-    QCryptographicHash md5_ha(QCryptographicHash::Md5);
-    // Get nc
-    QRegExp regex_nc(".*nc=(\\w+).*");
-    if(regex_nc.indexIn(auth) < 0) {
-      qDebug("AUTH-PROB: qop but missing nc");
-      return false;
-    }
-    QByteArray prop_nc = regex_nc.cap(1).toLocal8Bit();
-    qDebug("prop nc is: %s", prop_nc.data());
-    QRegExp regex_cnonce(".*cnonce=\"([^\"]+)\".*");
-    if(regex_cnonce.indexIn(auth) < 0) {
-      qDebug("AUTH-PROB: qop but missing cnonce");
-      return false;
-    }
-    QByteArray prop_cnonce = regex_cnonce.cap(1).toLocal8Bit();
-    qDebug("prop cnonce is: %s", prop_cnonce.data());
-    QRegExp regex_qop(".*qop=(\\w+).*");
-    if(regex_qop.indexIn(auth) < 0) {
-      qDebug("AUTH-PROB: missing qop");
-      return false;
-    }
-    QByteArray prop_qop = regex_qop.cap(1).toLocal8Bit();
-    qDebug("prop qop is: %s", prop_qop.data());
-    md5_ha.addData(password_ha1+":"+prop_nonce+":"+prop_nc+":"+prop_cnonce+":"+prop_qop+":"+ha2);
-    response = md5_ha.result().toHex();
-  } else {
-    QCryptographicHash md5_ha(QCryptographicHash::Md5);
-    md5_ha.addData(password_ha1+":"+prop_nonce+":"+ha2);
-    response = md5_ha.result().toHex();
-  }
-  qDebug("AUTH: comparing reponses");
-  return prop_response == response;
+bool HttpServer::isAuthorized(QByteArray auth) const {
+  // Decode Auth
+  QByteArray decoded = QByteArray::fromBase64(auth);
+  QList<QByteArray> creds = decoded.split(':');
+  if(creds.size() != 2) return false;
+  QByteArray prop_username = creds.first();
+  if(prop_username != username) return false;
+  QCryptographicHash md5(QCryptographicHash::Md5);
+  md5.addData(creds.last());
+  return (password_md5 == md5.result().toHex());
 }

 EventManager* HttpServer::eventManager() const
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Christophe Dumez	c21f32283e	Tagged v2.0.3 release	2009-12-23 08:57:08 +00:00
Christophe Dumez	a33b978564	- Bump to v2.0.3	2009-12-23 08:53:21 +00:00
Christophe Dumez	f9cf937e20	- Minor french translation update	2009-12-22 21:35:28 +00:00
Christophe Dumez	7109685913	- Updated language files	2009-12-22 21:32:42 +00:00
Christophe Dumez	bd222ac8bd	- BUGFIX: Use the save path set in program preferences as a default in torrent addition dialog	2009-12-22 19:22:33 +00:00
Christophe Dumez	b675f4ac58	- Fix issue with speed limiting (infinite value was not handled properly)	2009-12-22 17:37:45 +00:00
Christophe Dumez	9989ec79c9	- BUGFIX: Trackers are now displayed for torrents without metadata	2009-12-22 15:40:05 +00:00
Christophe Dumez	20167c2276	- Fix little typo	2009-12-22 14:21:03 +00:00
Christophe Dumez	e26a1d5342	- BUGFIX: Handle paths with [~, ., ..] properly	2009-12-22 10:39:38 +00:00
Christophe Dumez	3734e11879	- Update spanish translator name	2009-12-21 18:49:38 +00:00
Christophe Dumez	4632c6fda9	- Updated Spanish translation	2009-12-21 16:13:02 +00:00
Christophe Dumez	62ff08b6b5	- Fix "Temp path" button in program preferences	2009-12-19 20:46:51 +00:00
Christophe Dumez	f50b62624a	- Fix to Serbian translation	2009-12-19 19:35:51 +00:00
Christophe Dumez	d380eb9958	- Updated Russian translation	2009-12-19 13:40:15 +00:00
Christophe Dumez	a71bdde022	- Updated Serbian translation	2009-12-19 07:50:26 +00:00
Christophe Dumez	e8e6894b5c	- Minor cosmetic fix to program preferences	2009-12-18 20:02:55 +00:00
Christophe Dumez	d92f69fa0f	- Prepare for v2.0.2 release	2009-12-18 15:24:13 +00:00
Christophe Dumez	77d7a1ec49	- Fix .qbittorrent folder not being created. This bug was introduced in v2.0.1 and it is very important.	2009-12-18 15:15:32 +00:00
Christophe Dumez	d5c174a6f8	- BUGFIX: Read RSS articles are remembered on restart for feeds with no torr ents attached	2009-12-18 14:47:33 +00:00
Christophe Dumez	173999e504	- Fix Mininova search engine plugin	2009-12-18 14:16:19 +00:00
Christophe Dumez	1ed928bc39	- BUGFIX: Fix ThePirateBay.org search engine plugin	2009-12-18 14:00:39 +00:00
Christophe Dumez	b85d51ba79	- Do not use home folder as a fallback when the destination folder is not accessible	2009-12-17 20:01:18 +00:00
Christophe Dumez	779b53722b	- Added referer parameter to download_file() helper function (required by some websites such as sumotorrent)	2009-12-14 21:50:21 +00:00
Christophe Dumez	76780c4c46	- Fix RSS downloader for feeds where torrents are not attached (but the links points to them)	2009-12-14 18:56:00 +00:00
Christophe Dumez	da74f24a71	- Update changelog	2009-12-13 17:53:04 +00:00
Christophe Dumez	01c56865db	- Better checking of based32 encoded Magnet Links to increase robustness	2009-12-13 10:15:50 +00:00
Christophe Dumez	b541c9fa4c	- Added Hex Magnet Link support (new standard, used for example by ThePirateBay)	2009-12-13 09:52:28 +00:00
Christophe Dumez	aac0fbcbe4	- Fix possible crash in torrent properties (files)	2009-12-13 00:44:47 +00:00
Christophe Dumez	b315551edd	- Fix missing slot warning when using libtorrent v0.14 (Thanks Haypo)	2009-12-13 00:03:35 +00:00
Christophe Dumez	58a885cb87	- Updated version number to v2.0.1	2009-12-12 22:57:56 +00:00
Christophe Dumez	d19282285c	- BUGFIX: ~/qBT_dir is created only when it is actually used	2009-12-12 22:39:29 +00:00
Christophe Dumez	e0d8ca39a5	- BUGFIX: Fix link to plugins.qbittorrent.org in plugins dialog	2009-12-12 22:17:51 +00:00
Christophe Dumez	ec3169c9b0	- Fix column hiding behavior when queueing system is disabled	2009-12-12 22:07:41 +00:00
Christophe Dumez	7bfd7e9cda	- Disable debug mode	2009-12-11 13:05:46 +00:00
Christophe Dumez	459bb8c51d	- Removed useless debug	2009-12-11 12:26:51 +00:00
Christophe Dumez	9159a9f25d	- µTorrent is now also spoofed correctly	2009-12-11 12:22:41 +00:00
Christophe Dumez	8ea8f8a9f7	- Branched v2.0.x	2009-12-10 19:39:09 +00:00