Tagged todays releases

Fix progress bar style on Windows

AUTHORS

@@ -3,15 +3,27 @@ Author:
 
 Contributors:
 * Stefanos Antaris <santaris@csd.auth.gr>
+* Mohammad Dib <mdib@qbittorrent.org>
+* Mirco Chinelli <infinity89@fastwebmail.it>
 * Ishan Arora <ishan@qbittorrent.org>
 * Arnaud Demaizière <arnaud@qbittorrent.org>
 * Grigis Gaëtan <cipher16@gmail.com>
+* Christian Kandeler <zambesi@users.sourceforge.net>
+* Silvan Scherrer <silvan.scherrer@aroa.ch>
 
 Code from other projects:
+* files src/qtsingleapp/* src/lineedit/*
+  copyright: Nokia Corporation
+  license: LGPL
+
 * files src/ico.cpp src/ico.h
   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
@@ -55,11 +67,13 @@ Images Authors:
 Translations authors:
 * files: src/lang/*.ts
   copyright:
+  - Arabic: SDERAWI (abz8868@msn.com) and sn51234 (nesseyan@gmail.com)
   - Brazilian: Nick Marinho (nickmarinho@gmail.com)
-  - Bulgarian: Tsvetan & Boiko Bankov (emerge_life@users.sourceforge.net)
-  - Catalan: Gekko Dam Beer (gekko04@users.sourceforge.net)
+  - Bulgarian: Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net)
+  - Catalan: Francisco Luque Contreras (frannoe@ya.com)
   - Chinese (Simplified): Guo Yue (yue.guo0418@gmail.com)
   - Chinese (Traditional): Yi-Shun Wang (dnextstep@gmail.com)
+  - Croatian: Oliver Mucafir (oliver.untwist@gmail.com)
   - Czech: Jirka Vilim (web@tets.cz)
   - Danish: Mathias Nielsen (comoneo@gmail.com)
   - Dutch: Joost Schipper (heavyjoost@users.sourceforge.net)
@@ -67,10 +81,10 @@ Translations authors:
   - Finnish: Niklas Laxström (nikerabbit@users.sourceforge.net)
   - French: Christophe Dumez (chris@qbittorrent.org)
   - German: Niels Hoffmann (zentralmaschine@users.sourceforge.net)
-  - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net)
+  - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net) and Stephanos Antaris (santaris@csd.auth.gr)
   - Hungarian: Majoros Péter (majoros.j.p@t-online.hu)
   - Italian: Mirko Ferrari (mirkoferrari@gmail.com) and Ferraro Luciano (luciano.ferraro@gmail.com)
-  - Japanese: Nardog (nardog@e2umail.com)
+  - Japanese: Nardog (alphisation@gmail.com)
   - Korean: Jin Woo Sin (jin828sin@users.sourceforge.net)
   - Norwegian: Lars-Erik Labori (hamil@users.sourceforge.net)
   - Polish: Mariusz Fik (fisiu@opensuse.org)
@@ -79,8 +93,8 @@ Translations authors:
   - Russian: Nick Khazov (m2k3d0n at users.sourceforge.net)
   - Serbian: Anaximandar Milet (anaximandar at operamail.com)
   - Slovak:  helix84
-  - Spanish: Vicente Raul Plata Fonseca (silverxnt@users.sourceforge.net)
+  - Spanish: Francisco Luque Contreras (frannoe@ya.com)
   - Swedish: Daniel Nylander (po@danielnylander.se)
-  - Turkish: Erdem Bingöl (erdem84@gmail.com)
-  - Ukrainian: Andrey Shpachenko (masterfix@users.sourceforge.net)
+  - Turkish: Hasan Yilmaz (iletisim@hedefturkce.com)
+  - Ukrainian: Andrey Shpachenko (masterfix@users.sourceforge.net) and Oleh Prypin (blaxpirit@gmail.com)
   license: GPLv2

INSTALL

@@ -1,30 +1,57 @@
 qBittorrent - A BitTorrent client in C++ / Qt4
 ------------------------------------------
 
-./configure
-make && make install
-qbittorrent
+1) Compile and install qBittorrent with Qt4 Graphical Interface
 
-will install and execute qBittorrent hopefully without any problems.
+  $ ./configure
+  $ make && make install
+  $ qbittorrent
 
-Dependencies:
-- Qt >= 4.4.0 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml)
+  will install and execute qBittorrent hopefully without any problems.
 
-- libtorrent-rasterbar by Arvid Norberg (>= 0.14.0 REQUIRED, >= v0.15.0 ADVISED)
-    -> http://www.qbittorrent.org/download.php (advised)
+  Dependencies:
+    - Qt >= 4.4.0 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml)
+
+    - pkg-config executable
+
+    - libtorrent-rasterbar by Arvid Norberg (>= 0.14.4 REQUIRED, compatible with v0.15.x)
         -> 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 1.34.x (libboost-filesystem, libboost-thread, libboost-date-time) + libasio
+      or
+    - libboost >= 1.35.x (libboost-system, libboost-filesystem, libboost-thread, libboost-date-time)
 
-- python >= 2.3 (needed by search engine)
+    - python >= 2.3 (needed by search engine)
+        * Run time only dependency
 
-- libnotify >= 0.4.2, glib-2.0 (optional)
+    - 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)
+    - 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)
+
+    - pkg-config executable
+
+    - 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
+
 
 DOCUMENTATION:
 Please note that there is a documentation with a "compiling howto" at http://wiki.qbittorrent.org.

README.os2

@@ -0,0 +1,62 @@
+qBittorrent - A BitTorrent client in Qt4
+------------------------------------------
+
+This is the eComStation (OS/2) qBittorrent part of the readme. See also README for more general information.
+
+
+Building qBittorrent
+********************
+
+
+Requirements
+============
+
+- gcc based build env (recommended gcc v4.4.2 or greater)
+  
+- Qt4 for eCS (OS/2) dev package (see http://svn.netlabs.org/qt4 for more information)
+
+- libtorrent-rasterbar for eCS (OS/2) port (see http://svn.netlabs.org/ports for more information)
+
+- boost for eCS (OS/2) port (see http://svn.netlabs.org/ports for more information)
+
+
+How to build
+============
+
+First you need to create the conf.pri file in the same dir as this readme.os2 is.
+the conf.pri file has the following content:
+
+##### conf.pri content beginn #####
+PREFIX = .
+BINDIR = ./bin
+INCDIR = ./include
+LIBDIR = ./lib
+DATADIR = ./share
+
+CONFIG += staticlib
+INCLUDEPATH += x:/trees/libtorrent/trunk/include
+LIBS += -Lx:/trees/libtorrent/trunk/src/.libs \
+        -Lx:/trees/boost/trunk/stage/lib \
+        -Lx:/trees/openssl \
+	-Lx:/extras/lib
+##### conf.pri content end #####
+
+Of course all the above path references have to be adjusted to your build env.
+
+It should now be easy to build qBittorrent:
+
+Simply type:
+$ qmake
+
+Followed by:
+$ make
+
+If all works fine you should get a working qbittorrent executable.
+
+If you have any question regarding the eCS (OS/2) port of qBittorrent you can meet me (_diver) on IRC:
+#netlabs on irc.freenode.net
+
+------------------------------------------
+Silvan Scherrer <silvan.scherrer@aroa.ch>
+
+

doc/qbittorrent-nox.1

@@ -0,0 +1,44 @@
+.\" 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>

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" "September 30th 2009" "Bittorrent client written in C++ / Qt4" ""
+.TH "QBITTORRENT" "1" "January 16th 2010" "Bittorrent client written in C++ / Qt4" ""
 
 .SH "NAME"
 qBittorrent \- a Bittorrent client written in C++ / Qt4
 
 .SH "SYNOPSIS"
 
-\fBqbittorrent\fR [\-\-no-splash] [TORRENT_FILE | URL]...
+\fBqbittorrent\fR [\-\-no-splash] [\-\-webui-port=x] [TORRENT_FILE | URL]...
 
 \fBqbittorrent\fR \-\-help
 
@@ -18,10 +18,9 @@ qBittorrent \- a Bittorrent client written in C++ / Qt4
 .SH "DESCRIPTION"
 
 \fBqBittorrent\fR is an advanced Bittorrent client written in C++ / Qt4,
-using the \fBrblibtorrent\fR library by Arvid Norberg. qBittorrent aims
-to be a good alternative to all other bittorrent clients out there. qBittorrent
+using the \fBlibtorrent-rasterbar\fR library by Arvid Norberg. qBittorrent is similar to uTorrent. 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 (Azureus compatible), 
+It also comes with UPnP port forwarding / NAT-PMP, encryption (Vuze compatible), 
 FAST extension (mainline) and PeX support (utorrent compatible).
 
 .SH "OPTIONS"
@@ -32,6 +31,8 @@ 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

qbittorrent.pro

@@ -1,6 +1,4 @@
 TEMPLATE = subdirs
 
-include(conf.pri)
-
 SUBDIRS += src
 

qbittorrent.qc

@@ -6,6 +6,9 @@
   <dep type='qt4'>
     <required/>
   </dep>
+  <dep type='pkg-config'>
+    <required/>
+  </dep>
   <dep type='libtorrent-rasterbar'>
     <required/>
   </dep>
@@ -16,4 +19,6 @@
   </dep>
   <dep type='geoip-database'>
   </dep>
+  <dep type='qtsingleapplication'>
+  </dep>
 </qconf>

qcm/geoip-database.qcm

@@ -11,7 +11,15 @@ public:
 	qc_geoip_database(Conf *c) : ConfObj(c) {}
 	QString name() const { return "GeoIP Database (optional)"; }
 	QString shortname() const { return "GeoIP Database"; }
+        QString checkString() const {
+                if(!conf->getenv("QC_DISABLE_geoip_database").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
+                        return "";
+                return ConfObj::checkString();
+        }
 	bool exec() {
+	if(!conf->getenv("QC_DISABLE_geoip_database").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+		return false;
+	}
 #ifdef Q_WS_X11
 		if(!conf->getenv("QC_WITH_GEOIP_DATABASE_EMBEDDED").isEmpty()) {
 #endif
@@ -20,9 +28,9 @@ public:
 			return true;
 #ifdef Q_WS_X11
 		}
-                if(QFile::exists("/usr/share/GeoIP/GeoIP.dat") || QFile::exists("/usr/local/share/GeoIP/GeoIP.dat"))
+                if(QFile::exists("/usr/share/GeoIP/GeoIP.dat") || QFile::exists("/usr/local/share/GeoIP/GeoIP.dat") || QFile::exists("/var/lib/GeoIP/GeoIP.dat"))
 			return true;
-                printf("\nWarning: GeoIP database was not found at /usr/share/GeoIP/GeoIP.dat\nCountry resolution will be slow.");
+                printf("\nWarning: GeoIP database was not found at /usr/share/GeoIP/GeoIP.dat or /var/lib/GeoIP/GeoIP.dat\nCountry resolution will be slow.");
 		return false;
 #endif
 	}

qcm/libboost.qcm

@@ -2,14 +2,39 @@
 -----BEGIN QCMOD-----
 name: libboost
 arg: with-libboost-inc=[path], Path to libboost include files
+arg: with-libboost-lib=[path], Path to libboost library files
 -----END QCMOD-----
 */
+#include <boost/version.hpp>
 class qc_libboost : public ConfObj
 {
 public:
 	qc_libboost(Conf *c) : ConfObj(c) {}
 	QString name() const { return "libboost"; }
 	QString shortname() const { return "libboost"; }
+  QString findBoostLib(QString path, QString lib) const {
+    QString name;
+    QDir libDir(path);
+    QStringList filters;
+    filters << "libboost_"+lib+"*-mt*.so";
+    QStringList result = libDir.entryList(filters, QDir::Files);
+    if(!result.empty()) {
+      name = result.first().mid(3);
+      // Remove .so
+      name.chop(3);
+    } else {
+      // Fall back to non -mt boost lib
+      filters.clear();
+      filters << "libboost_"+lib+"*.so";
+      result = libDir.entryList(filters, QDir::Files);
+      if(!result.empty()) {
+        name = result.first().mid(3);
+        // Remove .so
+        name.chop(3);
+      }
+    }
+    return name;
+  }
 	bool exec(){
         	QString s;
 		s = conf->getenv("QC_WITH_LIBBOOST_INC");
@@ -51,6 +76,43 @@ public:
       			}
 		}
 		conf->addIncludePath(s);
+		// Find library
+		s = conf->getenv("QC_WITH_LIBBOOST_LIB");
+    QStringList required_libs;
+#if BOOST_VERSION >= 103500
+      required_libs << "system"; 
+#endif
+    if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+      // Not required by nox
+      required_libs << "filesystem" << "thread";
+    }
+    QStringList libDirs;
+    libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
+    foreach(const QString& lib, required_libs) {
+      if(!s.isEmpty()) {
+        QString detected_name = findBoostLib(s, lib);
+        if(detected_name.isEmpty()) {
+          printf("Could not find boost %s library!\n", qPrintable(lib));
+          return false;
+        } else {
+          conf->addLib("-l"+detected_name);
+        }
+      } else {
+        bool found = false;
+        foreach(const QString& libDir, libDirs) {
+          QString detected_name = findBoostLib(libDir, lib);
+          if(!detected_name.isEmpty()) {
+            conf->addLib("-l"+detected_name);
+            found = true;
+            break;
+          }
+        }
+        if(!found) {
+          printf("Could not find boost %s library!\n", qPrintable(lib));
+          return false;
+        }
+      }
+    }
 		return true;
 	}
 };

qcm/libnotify.qcm

@@ -10,7 +10,15 @@ public:
 	qc_libnotify(Conf *c) : ConfObj(c) {}
 	QString name() const { return "libnotify >= 0.4.2 (optional)"; }
 	QString shortname() const { return "libnotify"; }
+        QString checkString() const {
+                if(!conf->getenv("QC_DISABLE_libnotify").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
+                        return "";
+                return ConfObj::checkString();
+        }
 	bool exec(){
+		if(!conf->getenv("QC_DISABLE_libnotify").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+			return false;
+		}
 		QStringList incs;
 		QString req_ver = "0.4.2";
 		QString version, libs, other;
@@ -32,6 +40,17 @@ public:
 			} else {
 				return false;
 			}
+			QStringList incs3;
+                        QString req_ver3 = "2.0";
+                        QString version3, libs3, other3;
+			if(conf->findPkgConfig("gtk+-2.0", mode, req_ver3, &version3, &incs3, &libs3, &other3)) {
+                                for(int n = 0; n < incs3.count(); ++n)
+                                conf->addIncludePath(incs3[n]);
+                                if(!libs3.isEmpty())
+                                        conf->addLib(libs3);
+                        } else {
+                                return false;
+                        }
 		} else {
 			return false;
 		}

qcm/libtorrent-rasterbar.qcm

@@ -8,24 +8,20 @@ class qc_libtorrent_rasterbar : public ConfObj
 {
 public:
 	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent-rasterbar >= 0.14.0 (>= 0.15.0 advised)"; }
+	QString name() const { return "libtorrent-rasterbar >= 0.14.4"; }
 	QString shortname() const { return "libtorrent-rasterbar"; }
 	bool exec(){
 		QStringList incs;
-		QString req_ver = "0.14.0";
-		QString adv_ver = "0.15.0";
+		QString req_ver = "0.14.4";
 		QString version, libs, other;
 		VersionMode mode = VersionMin;
 		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other))
 			return false;
 		for(int n = 0; n < incs.count(); ++n)
 			conf->addIncludePath(incs[n]);
-		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.\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");
+		if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+  		  conf->addLib("-lcrypto");
+                }
 		return true;
 	}
 };

qcm/pkg-config.qcm

@@ -0,0 +1,16 @@
+/*
+-----BEGIN QCMOD-----
+name: pkg-config
+-----END QCMOD-----
+*/
+#include <QProcess>
+class qc_pkg_config : public ConfObj
+{
+public:
+	qc_pkg_config(Conf *c) : ConfObj(c) {}
+	QString name() const { return "pkg-config executable"; }
+	QString shortname() const { return "pkg-config"; }
+	bool exec(){
+		return !conf->findProgram("pkg-config").isEmpty();
+	}
+};

qcm/qt4.qcm

@@ -1,6 +1,7 @@
 /*
 -----BEGIN QCMOD-----
 name: Qt >= 4.4
+arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
 -----END QCMOD-----
 */
 class qc_qt4 : public ConfObj
@@ -11,10 +12,9 @@ public:
 	QString shortname() const { return "Qt 4.4"; }
 	bool exec()
 	{
-		if(QT_VERSION >= 0x040500) {
-                        conf->addDefine("QT_4_5");
+		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+			conf->addDefine("DISABLE_GUI");
 		}	
 		return(QT_VERSION >= 0x040400);
-		
 	}
 };

qcm/qtsingleapplication.qcm

@@ -0,0 +1,26 @@
+/*
+-----BEGIN QCMOD-----
+name: libboost
+arg: with-qtsingleapplication=[system|shipped], Use the shipped qtsingleapplication library or the system one
+-----END QCMOD-----
+*/
+class qc_qtsingleapplication : public ConfObj
+{
+public:
+        qc_qtsingleapplication(Conf *c) : ConfObj(c) {}
+        QString name() const { return "qtsingleapplication library"; }
+        QString shortname() const { return "qtsingleapplication"; }
+
+        bool exec(){
+                QString s;
+                s = conf->getenv("QC_WITH_QTSINGLEAPPLICATION");
+                if(s.compare("system", Qt::CaseInsensitive) == 0) {
+                  // System
+                  conf->addDefine("USE_SYSTEM_QTSINGLEAPPLICATION");
+                  printf(" [system] ");
+                } else {
+                  printf(" [shipped] ");
+                }
+                return true;
+        }
+};

src/GUI.h

@@ -37,13 +37,10 @@
 #include "ui_mainwindow.h"
 #include "qtorrenthandle.h"
 
-enum TabIndex{TAB_TRANSFER, TAB_SEARCH, TAB_RSS};
-
 class Bittorrent;
 class QTimer;
 class downloadFromURL;
 class SearchEngine;
-class QLocalServer;
 class QCloseEvent;
 class RSSImp;
 class QShortcut;
@@ -55,45 +52,37 @@ class TransferListFiltersWidget;
 class QSplitter;
 class PropertiesWidget;
 class StatusBar;
+class consoleDlg;
+class about;
+class createtorrent;
+class downloadFromURL;
+class HidableTabWidget;
+class LineEdit;
+class QFileSystemWatcher;
 
 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;
+public:
+  // Construct / Destruct
+  GUI(QWidget *parent=0, QStringList torrentCmdLine=QStringList());
+  ~GUI();
+  // Methods
+  QWidget* getCurrentTabWidget() const;
+  TransferListWidget* getTransferList() const { return transferList; }
+  QMenu* getTrayIconMenu();
+  PropertiesWidget *getProperties() const { return properties; }
 
-  protected slots:
+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);
+  void updateAltSpeedsBtn(bool alternative);
+  void updateNbTorrents(unsigned int nb_downloading, unsigned int nb_seeding, unsigned int nb_active, unsigned int nb_inactive, unsigned int nb_paused);
+  void deleteBTSession();
+
+protected slots:
   // GUI related slots
   void dropEvent(QDropEvent *event);
   void dragEnterEvent(QDragEnterEvent *event);
@@ -103,8 +92,6 @@ class GUI : public QMainWindow, private Ui::MainWindow{
   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();
@@ -114,6 +101,10 @@ class GUI : public QMainWindow, private Ui::MainWindow{
   void handleDownloadFromUrlFailure(QString, QString) const;
   void createSystrayDelayed();
   void tab_changed(int);
+  void on_actionLock_qBittorrent_triggered();
+  void defineUILockPassword();
+  bool unlockUI();
+  void notifyOfUpdate(QString);
   // Keyboard shortcuts
   void createKeyboardShortcuts();
   void displayTransferTab() const;
@@ -126,37 +117,72 @@ class GUI : public QMainWindow, private Ui::MainWindow{
   void on_actionOpen_triggered();
   void updateGUI();
   void loadPreferences(bool configure_session=true);
+  void processParams(const QString& params);
   void processParams(const QStringList& params);
   void addTorrent(QString path);
-    void addUnauthenticatedTracker(QPair<QTorrentHandle,QString> tracker);
+  void addUnauthenticatedTracker(const QPair<QTorrentHandle,QString> &tracker);
   void processDownloadedFiles(QString path, QString url);
-    void downloadFromURLList(const QStringList& urls);
   void finishedTorrent(QTorrentHandle& h) const;
+  void askRecursiveTorrentDownloadConfirmation(QTorrentHandle &h);
   // 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;
-
-  protected:
+protected:
   void closeEvent(QCloseEvent *);
   void showEvent(QShowEvent *);
   bool event(QEvent * event);
   void displayRSSTab(bool enable);
+  void displaySearchTab(bool enable);
 
-  public:
-    // Construct / Destruct
-    GUI(QWidget *parent=0, QStringList torrentCmdLine=QStringList());
-    ~GUI();
-    // Methods
-    int getCurrentTabIndex() const;
-    QPoint screenCenter() const;
+private:
+  QFileSystemWatcher *executable_watcher;
+  // Bittorrent
+  Bittorrent *BTSession;
+  QList<QPair<QTorrentHandle,QString> > unauthenticated_trackers; // Still needed?
+  // GUI related
+  QTimer *guiUpdater;
+  HidableTabWidget *tabs;
+  StatusBar *status_bar;
+  QPointer<options_imp> options;
+  QPointer<consoleDlg> console;
+  QPointer<about> aboutDlg;
+  QPointer<createtorrent> createTorrentDlg;
+  QPointer<downloadFromURL> downloadFromURLDialog;
+  QPointer<QSystemTrayIcon> systrayIcon;
+  QPointer<QTimer> systrayCreator;
+  QPointer<QMenu> myTrayIconMenu;
+  TransferListWidget *transferList;
+  TransferListFiltersWidget *transferListFilters;
+  PropertiesWidget *properties;
+  bool displaySpeedInTitle;
+  bool force_exit;
+  bool ui_locked;
+  LineEdit *search_filter;
+  // Keyboard shortcuts
+  QShortcut *switchSearchShortcut;
+  QShortcut *switchSearchShortcut2;
+  QShortcut *switchTransferShortcut;
+  QShortcut *switchRSSShortcut;
+  // Widgets
+  QAction *prioSeparator;
+  QAction *prioSeparator2;
+  QSplitter *hSplitter;
+  QSplitter *vSplitter;
+  QMenu *lockMenu;
+  // Search
+  QPointer<SearchEngine> searchEngine;
+  // RSS
+  QPointer<RSSImp> rssWidget;
+
+private slots:
+    void on_actionSearch_engine_triggered();
+    void on_actionRSS_Reader_triggered();
+    void on_actionSpeed_in_title_bar_triggered();
+    void on_actionTop_tool_bar_triggered();
+    void on_actionShutdown_when_downloads_complete_triggered();
 };
 
 #endif