- Tagged beta2 release

2025-12-27 10:48:04 -06:00 · 2008-06-22 17:41:47 +00:00
153 changed files with 13547 additions and 16460 deletions
--- a/67
+++ b/67
@@ -3,69 +3,4 @@ Author:

 Contributors:
 * Arnaud Demaizière <arnaud@qbittorrent.org>
-* Ishan Arora <ishan@qbittorrent.org>
-* Grigis Gaëtan <cipher16@gmail.com>
-
-Images Authors:
-* files: src/Icons/*.png
-  copyright: Gnome Icon Theme
-  license: GPLv2
-  url: http://ftp.acc.umu.se/pub/GNOME/sources/gnome-icon-theme
-
-* files: src/Icons/flags/*.png
-  copyright: Open Clip Art Library
-  license: Creative Commons Public Domain Dedication
-  url: http://www.openclipart.org
-
-* files: src/Icons/skins/*.png
-  copyright: Mateusz Tobola <tobejodok@qbittorrent.org>
-  license: GPLv2
-
-* files: src/menuicons/YYxYY/*.png
-  copyright: Mateusz Tobola <tobejodok@qbittorrent.org>
-  license: GPLv2
-
-* file: src/search_engine/engines/btjunkie.png
-  copyright: Downloaded from btjunkie.org
-
-* file: src/search_engine/engines/isohunt.png
-  copyright: Downloaded from isohunt.com
-
-* file: src/search_engine/engines/mininova.png
-  copyright: Downloaded from mininova.org
-
-* file: src/search_engine/engines/piratebay.png
-  copyright: Downloaded from thepiratebay.org
-
-* file: src/search_engine/engines/torrentreactor.png
-  copyright: Downloaded from torrentreactor.net
-
-Translations authors:
-* files: src/lang/*.ts
-  copyright:
-  - Brazilian: Nick Marinho (nickmarinho@gmail.com)
-  - Bulgarian: Tsvetan & Boiko Bankov (emerge_life@users.sourceforge.net)
-  - Catalan: Gekko Dam Beer (gekko04@users.sourceforge.net)
-  - Chinese (Simplified): Guo Yue (guoyue0418@hotmail.com)
-  - Danish: Mathias Nielsen (comoneo@gmail.com)
-  - Dutch: Joost Schipper (heavyjoost@users.sourceforge.net)
-  - English: Christophe Dumez (chris@qbittorrent.org)
-  - 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)
-  - 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)
-  - Korean: Jin Woo Sin (jin828sin@users.sourceforge.net)
-  - Norwegian: Lars-Erik Labori (hamil@users.sourceforge.net)
-  - Polish: Jarek Smieja (ajep9691@wp.pl)
-  - Portuguese: Nick Marinho (nickmarinho@gmail.com)
-  - Romanian: Obada Denis (obadadenis@users.sourceforge.net)
-  - Russian: Nick Khazov (m2k3d0n at users.sourceforge.net)
-  - Slovak:  helix84
-  - Spanish: Vicente Raul Plata Fonseca (silverxnt@users.sourceforge.net)
-  - Swedish: Daniel Nylander (po@danielnylander.se)
-  - Turkish: Erdem Bingöl (erdem84@gmail.com)
-  - Ukrainian: Andrey Shpachenko (masterfix@users.sourceforge.net)
-  license: GPLv2
+* Ishan Arora <ishanarora@gmail.com>
--- a/20
+++ b/20
@@ -1,21 +1,8 @@
-* Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.2.0
-    - FEATURE: Torrent queueing system (with priorities)
-    - FEATURE: DHT is always ON (no longer used as fallback)
-    - FEATURE: The number of DHT nodes is displayed
-    - FEATURE: RSS can now be disabled from program preferences
-    - BUGFIX: Disable ETA calculation when ETA column is hidden
-    - BUGFIX: Removed "disconnected" connection state, detection was far from perfect
-    - COSMETIC: Transfer speed, ratio, connection status and DHT nodes are displayed in status bar    
-    - COSMETIC: RSS Tab is now hidden as a default
-    - COSMETIC: Allow to hide or display top toolbar
-    - COSMETIC: Top toolbar is now hidden as a default
-
-* Fri Aug 01 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.1.0
+* Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.1.0
    - FEATURE: Web interface to control qbittorrent (Ishan Arora)
    - FEATURE: Can spoof Azureus peer id to avoid ban
    - FEATURE: Allow to hide/show some columns in download and seeding lists
    - FEATURE: Option to start qBittorrent minimized in systray
-    - FEATURE: Multi-tab support in search engine (Grigis Gaëtan)
    - FEATURE: Allow to define double-click actions in torrents lists
    - FEATURE: Allow to open torrent destination folder
    - FEATURE: Real progress bar in torrent properties that displays downloaded pieces
@@ -27,19 +14,14 @@
    - FEATURE: Added support for PeerGuardian p2b filters (binary)
    - FEATURE: Allow to customize folder scan interval
    - FEATURE: Allow to add several trackers at once
-    - BUGFIX: Allow to run one instance of qBittorrent per user
    - BUGFIX: Do not display seeds number in seeding list (always 0)
    - BUGFIX: Threadified IP filter file parser to avoid GUI freeze
-    - BUGFIX: Ask if we want to redownload if content was deleted from hard drive
-    - BUGFIX: Added missing copyright/licensing information for some files
-    - BUGFIX: qBittorrent is no longer conflicting with rTorrent (libtorrent renamed to libtorrent-rasterbar)
    - COSMETIC: Do not display progress bar in seeding list (always 100%)
    - COSMETIC: Added a progress bar for torrent creation
    - COSMETIC: Display tracker errors in a cleaner way
    - COSMETIC: Display "unpaused/total_torrent" in download/upload tabs
    - COSMETIC: Allow to resize RSS column
    - COSMETIC: Global UP/DL speeds and ratio are displayed above tabs
-    - COSMETIC: Use infinity symbol for ETA when time is infinite

 * Fri Apr 11 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.0.0
    - FEATURE: Based on new libtorrent v0.13
--- a/7
+++ b/7
@@ -15,12 +15,13 @@ will install and execute qBittorrent hopefully without any problems.

 Dependencies:
 - Qt >= 4.3.0 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml)
-  Qt >= 4.4.0 is advised

- libtorrent-rasterbar by Arvid Norberg (>= v0.13.1 REQUIRED)
+- rblibtorrent by Arvid Norberg (>= v0.13 REQUIRED)
    -> http://www.qbittorrent.org/download.php (advised)
    -> http://www.libtorrent.net
-    Be careful: another library (the one used by rTorrent) uses a similar name.
+    Be careful: another library (the one used by rTorrent) use the same name.
+    These are TWO different libraries and qBittorrent will only work with the one provided
+    on sourceforge (created by Arvid Norberg). The two libraries conflicts with each other.

 - libboost: libboost-filesystem, libboost-date-time, libboost-thread, libboost-serialization

--- a/37
+++ b/37
@@ -1,4 +1,37 @@
-See https://blueprints.launchpad.net/qbittorrent/
+// Easy
+- Translations into as many languages as possible
+- Use Launchpad/Rosetta for translations once it supports TS files
+
+// Intermediate
+- Port on MacOS, Windows (and create an installer for Windows) - Slow progress
+- Add some transparency (menus,...), improve look / usabilty
+- Skins support? (contact Mateusz)
+
+// Harder
+- Torrent scheduler ala µtorrent/Bitcomet
+
+// Waiting for libtorrent
+- Allow to prioritize torrents (may code this in qBittorrent?)
+
+// Unsure
+- Display the peers we are connected to for each torrent with infos (like flag, dl/up speeds, ...)
+- Azureus spoofing to prevent ban from trackers?
+- Option to shutdown computer when downloads are finished
+- NAT checker/Tester
+- Display hard drive space left?
+- Make use of dbus on Linux for the single instance instead of socket communication?
+  (http://techbase.kde.org/Development/Tutorials/D-Bus/Accessing_Interfaces)
+- When favicon can't be downloaded, try to parse the webpage for:
+  <link rel="icon" href="http://example.com/favicon.ico" type="image/vnd.microsoft.icon">
+    * Be careful, the link can be relative
+- Improve search plugin install (choose in a list taken from plugins.qbittorrent.org)
+- support zipped torrents? (useful?)
+- Allow to limit the number of downloading torrents simultaneously (other are paused until a download finishes)

 // in v1.2.0
- Split download and uploads in Web UI (Ishan Ahora)
+- Allow user to organize the downloads into categories/folders?
+
+// in v1.1.0
+- Stop calculating ETAs when ETA column is hidden
+-> See https://blueprints.launchpad.net/qbittorrent
+
--- a/36
+++ b/36
@@ -18,11 +18,9 @@ Main options:
  --help              This help text.

 Dependency options:
-  --with-libtorrent-inc=[path]            Path to libtorrent-rasterbar include
-                                         files
-  --with-libtorrent-lib=[path]            Path to libtorrent-rasterbar library
-                                         files
-  --with-libtorrent-static-lib=[path]     Path to libtorrent-rasterbar .a file
+  --with-libtorrent-inc=[path]            Path to libtorrent include files
+  --with-libtorrent-lib=[path]            Path to libtorrent library files
+  --with-libtorrent-static-lib=[path]     Path to libtorrent .a file
  --with-libboost-inc=[path]              Path to libboost include files
  --with-libcurl-inc=[path]               Path to libcurl include files
  --with-libcurl-lib=[path]               Path to libcurl library files
@@ -356,28 +354,24 @@ public:
 	QString shortname() const { return "Qt 4.3"; }
 	bool exec()
 	{
-		if(QT_VERSION >= 0x040400) {
-			conf->addDefine("QT_4_4");
-		}
 		return(QT_VERSION >= 0x040300);
-		
 	}
 };
-#line 1 "libtorrent-rasterbar.qcm"
+#line 1 "libtorrent.qcm"
 /*
 -----BEGIN QCMOD-----
-name: libtorrent-rasterbar
-arg: with-libtorrent-inc=[path], Path to libtorrent-rasterbar include files
-arg: with-libtorrent-lib=[path], Path to libtorrent-rasterbar library files
-arg: with-libtorrent-static-lib=[path], Path to libtorrent-rasterbar .a file
+name: libtorrent
+arg: with-libtorrent-inc=[path], Path to libtorrent include files
+arg: with-libtorrent-lib=[path], Path to libtorrent library files
+arg: with-libtorrent-static-lib=[path], Path to libtorrent .a file
 -----END QCMOD-----
 */
-class qc_libtorrent_rasterbar : public ConfObj
+class qc_libtorrent : public ConfObj
 {
 public:
-	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent-rasterbar >= 0.13"; }
-	QString shortname() const { return "libtorrent-rasterbar"; }
+	qc_libtorrent(Conf *c) : ConfObj(c) {}
+	QString name() const { return "libtorrent >= 0.13"; }
+	QString shortname() const { return "libtorrent"; }
 	bool exec(){
        	QString s;
 		s = conf->getenv("QC_WITH_LIBTORRENT_INC");
@@ -411,7 +405,7 @@ public:

 		s = conf->getenv("QC_WITH_LIBTORRENT_LIB");
 		if(!s.isEmpty()) {
-      			if(!conf->checkLibrary(s, "torrent-rasterbar")) {
+      			if(!conf->checkLibrary(s, "torrent")) {
 			        return false;
 			}
      			conf->addLib(QString("-L") + s);
@@ -423,7 +417,7 @@ public:
 			sl << "/usr/local/lib64/";
 			bool found = false;
 			foreach(s, sl){
-				if(conf->checkLibrary(s, "torrent-rasterbar")){
+				if(conf->checkLibrary(s, "torrent")){
 					found = true;
 					break;
 				}
@@ -711,7 +705,7 @@ cat >$1/modules_new.cpp <<EOT
    o = new qc_qt4(conf);
    o->required = true;
    o->disabled = false;
-    o = new qc_libtorrent_rasterbar(conf);
+    o = new qc_libtorrent(conf);
    o->required = true;
    o->disabled = false;
    o = new qc_libboost(conf);
--- a/packaging/debian-unstable/debian/changelog
+++ b/packaging/debian-unstable/debian/changelog
@@ -0,0 +1,134 @@
+qbittorrent (0.6.1-1) unstable; urgency=low
+
+  * Disabled debug mode
+
+ -- Christophe Dumez <chris@qbittorrent.org>  Mon, 28 Aug 2006 21:22:48 +0200
+
+qbittorrent (0.6.1-0) unstable; urgency=low
+  * BUGFIX: Fixed possible segfaults when using context menus
+  * BUGFIX: Cleanup up context menus code
+  * BUGFIX: Used best gzip compressing for manpage
+
+ -- Christophe Dumez <chris@qbittorrent.org>  Thu,  24 Aug 2006 19:53:32 +0200
+
+qbittorrent (0.6.0) unstable; urgency=low
+  * FEATURE: Rewritten the download list from scratch (more flexible)
+  * FEATURE: Rewritten the search results list from scratch (more flexible)
+  * FEATURE: Rewritten the torrent properties list from scratch (more flexible)
+  * FEATURE: Improved and cleaned up search engine code
+  * FEATURE: Search results are now displayed in real time (not sequentially)
+  * FEATURE: Added two command lines parameters (--version, --help)
+  * FEATURE: Added a popup menu for download list
+  * FEATURE: Double-click on an item now toggles the paused state of a download
+  * FEATURE: Improved code to be more portable (Windows & MacOS versions should arrive soon)
+  * FEATURE: Allow to toggle selected state of a file within a torrent using double-click
+  * FEATURE: Remember columns width in download and search results lists
+  * BUGFIX: Don't use pkg-config for libcurl anymore (easier to compile)
+  * BUGFIX: Fixed ETA calculation when downloading while connecting
+  * BUGFIX: Download progress is now displayed correctly during first seconds of execution (was 0% before)
+  * BUGFIX: Code cleanup & optimization
+  * BUGFIX: Fixed sorting in download list
+  * BUGFIX: Fixed sorting in search results list
+  * BUGFIX: Fixed Parameters passing between instances
+  * BUGFIX: Fixed missing icon for clear action in infoBar popup menu
+  * BUGFIX: Fixed truncated lines in search results
+  * BUGFIX: Don't refresh download list when user is in search tab (save CPU)
+  * BUGFIX: Don't update Progress/DL Speed/ETA for finished downloads (save CPU)
+  * BUGFIX: Save selected search engines only when they have changed (faster program exit)
+  * COSMETIC: Increased icon size in toolbar from 24px to 32px
+  * COSMETIC: Display a progress bar to visualize each download progress
+  * COSMETIC: Size of each result in search are displayed in user friendly units
+  * COSMETIC: Display a progress bar to visualize each file progress within a torrent
+  * COSMETIC: Renamed 'ratio' to 'Session ratio' (makes more sense)
+  * COSMETIC: Improved layout of torrent properties window when maximized
+  * COSMETIC: Now number of search results is updated in real time
+  * COSMETIC: Remember last window size
+  * COSMETIC: Improved splash screen look
+  * COSMETIC: Improved default width of columns in download and search results lists
+
+ -- Christophe Dumez <chris@qbittorrent.org>  Wed,  22 Aug 2006 10:42:37 +0200
+
+qbittorrent (0.5.0) unstable; urgency=low
+  * Improved "Download from url" feature (now supports https, ftp & redirections)
+  * Added a torrent creation tool
+  * Display progress for each file within a torrent
+  * Based on new libtorrent v0.10 (lot of improvements)
+  * Now possible to clear log textbox (popup menu)
+  * Added two search engines (isohunt, torrentreactor)
+  * Now Display share ratio on main window
+  * Use OSD (On Screen Display) when a download or a search is finished
+  * Allow only one instance of qBittorrent (and add new parameters to download list)
+  * Remember last selected search engines in search tab
+  * Improved search engines status output (Aborted, timed out, finished, no results)
+  * qBittorrent can now update search plugin from qbittorrent.org
+  * Added Slovak, Italian, Portuguese, Romanian and Traditional Chinese languages
+  * Fixed ThePirateBay parser for search engine (website had changed)
+  * Fixed filenames for results from ThePirateBay search engine
+  * Fixed unicode support for ThePirateBay search engine
+  * Now search results are sorted by seeds
+  * Overwrite nova.py search plugin only if it is outdated
+  * Fixed possible division by 0 in ETA calculation
+  * Improved ETA calculation precision
+  * Fixed default tab in options
+  * When saving options, reconnect only when listening ports changed
+  * qBittorrent has now its own new logo
+  * Display status "downloading" if DL Speed > 0 (even when tracker is down)
+  * Added a splashscreen
+  * qBittorrent has new cute icons
+  * Display number of results in search tab
+  * Added icons for each item in download list according to its state
+  * Redesigned Locale settings
+  * Fixed search engines names width (were cut on the right)
+  * Moved search engines to the left of the window (better ui)
+
+ -- Christophe Dumez <chris@qbittorrent.org>  Wed,  2 Aug 2006 19:46:32 +0200
+
+qbittorrent (0.4.1) unstable; urgency=low
+  * Not counting "protocol chatter" in UP/DL speed anymore
+  * Download speed is now 0 when download is finished
+  * Paused torrents remain paused when qbittorrent is re-started
+  * Added option "go to systray when minimizing"
+  * Added option "Clear finished downloads on exit"
+  * Added option "Ask user for confirmation on exit"
+  * Added "Stalled" status for downloads (colored in orange, paused are in red and finished in green)
+  * Fixed Search window layout on maximizing
+  * Fixed a bug that caused upload limit not to be always applied
+  * Added Bulgarian translation
+  * Updated Translations
+  * Code optimization
+
+ -- Christophe Dumez <chris@qbittorrent.org>  Thu,  22 Jun 2006 20:14:27 +0200
+
+qbittorrent (0.4.0) unstable; urgency=low
+
+  * Added a search engine (supports Mininova & thepiratebay websites)
+  * Fixed critical bug: some options were not applied correctly to BT session
+  * Possibility to download a torrent file from an URL
+  * Added confirmation dialog on qbittorrent exit
+  * Enabled sorting in Download list
+  * Added Ukrainian translation
+  * Support urls as program parameters
+  * Added more actions to trayicon menu
+  * Fixed exception catching when retrieving fastresume data
+  * use Binary prefix standards from IEC 60027-2 for units (B, KiB, MiB, GiB, TiB)
+  * Iconification to systray when minimizing
+  * Code Cleanup & optimization
+
+ -- Christophe Dumez <chris@qbittorrent.org>  Wed,  14 Jun 2006 14:47:27 +0200
+
+qbittorrent (0.3.1) unstable; urgency=low
+
+  * Fixed toolbar layout (spacing).
+  * Added Russian translation.
+  * Resume also finished files on startup (for seeding).
+  * Added colors corresponding to download state.
+  * Fixed a segfault when deleting a download (if no scan dir is set).
+
+ -- Christophe Dumez <chris@qbittorrent.org>  Sat,  6 Jun 2006 21:36:27 +0200
+
+
+qbittorrent (0.3) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Christophe Dumez <chris@qbittorrent.org>  Sat,  3 Jun 2006 21:57:27 +0200
--- a/packaging/debian-unstable/debian/compat
+++ b/packaging/debian-unstable/debian/compat
@@ -0,0 +1 @@
+4
--- a/packaging/debian-unstable/debian/control
+++ b/packaging/debian-unstable/debian/control
@@ -0,0 +1,15 @@
+Source: qbittorrent
+Section: net
+Priority: optional
+Maintainer: Christophe Dumez <chris@qbittorrent.org>
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, libqt4-core (>= 4.1.0), libqt4-dev (>= 4.1.0), libqt4-gui (>= 4.1.0), rb-libtorrent (>= 0.10), libcurl3-dev
+Standards-Version: 3.6.2
+
+Package: qbittorrent
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, rb-libtorrent (>= 0.10), python (>= 2.3)
+Description: Bittorrent client in Qt4.1 / C++
+ qBittorrent is a bittorrent client programmed in C++ / Qt4.1
+ using rb_libtorrent by Arvid Norberg. It aims to be a good 
+ alternative to other bittorrent client out there. It is fast,
+ stable and provides unicode support.
--- a/packaging/debian-unstable/debian/copyright
+++ b/packaging/debian-unstable/debian/copyright
@@ -0,0 +1,26 @@
+This is qbittorrent, written and maintained by Christophe Dumez <chris@qbittorrent.org>
+on Sat,  3 Jun 2006 21:57:27 +0200.
+
+The original source can always be found at:
+	ftp://ftp.debian.org/dists/unstable/main/source/
+
+Copyright (C) 2006  Christophe Dumez
+
+License:
+
+  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 package; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
--- a/packaging/debian-unstable/debian/dirs
+++ b/packaging/debian-unstable/debian/dirs
@@ -0,0 +1,2 @@
+usr/bin
+usr/sbin
--- a/packaging/debian-unstable/debian/docs
+++ b/packaging/debian-unstable/debian/docs
@@ -0,0 +1,3 @@
+NEWS
+README
+TODO
--- a/packaging/debian-unstable/debian/rules
+++ b/packaging/debian-unstable/debian/rules
@@ -0,0 +1,107 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+CFLAGS = -Wall
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+config.status: configure
+	dh_testdir
+	# Add here commands to configure the package.
+	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --prefix=/usr
+
+
+build: build-stamp
+
+build-stamp:  config.status
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE)
+	#docbook-to-man debian/qbittorrent.sgml > qbittorrent.1
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
+
+	# Add here commands to clean up after the build process.
+	-$(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	# Add here commands to install the package into debian/qbittorrent.
+	$(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/qbittorrent
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs Changelog
+	dh_installdocs
+	dh_installexamples
+#	dh_install
+#	dh_installmenu
+#	dh_installdebconf	
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_python
+#	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 
--- a/packaging/mandriva/qbittorrent.spec
+++ b/packaging/mandriva/qbittorrent.spec
@@ -0,0 +1,249 @@
+
+%define name qbittorrent
+%define major 0
+%define minor 6
+%define patch 1
+%define version	%{major}.%{minor}.%{patch}
+%define release %mkrel 2
+%define _iconsdir %{_datadir}/icons
+%define _mandir %_datadir/man
+
+Name:           %{name}
+Summary:        A Bittorrent Client using C++ / Qt4
+Version:        %{version}
+Release:        %{release}
+Source0:        http://sourceforge.net/projects/qbittorrent/%{name}-%{version}.tar.gz
+URL:            http://sourceforge.net/projects/qbittorrent
+Vendor:			http://qbittorrent.sourceforge.net/
+Group:          Internet/File Transfer
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+License:        GPL
+BuildRequires:	libqt4-devel >= 4.1.2, libqtgui4 >= 4.1.2, libqtcore4 >= 4.1.2, libqtxml4 >= 4.1.2, libqtnetwork4 >= 4.1.2, rb_libtorrent-devel >= 0.10-3, libcurl3-devel
+Requires:		libqtgui4 >= 4.1.2, libqtcore4 >= 4.1.2, libqtxml4 >= 4.1.2, libqtnetwork4 >= 4.1.2, librb_libtorrent0 >= 0.10-3, python >= 2.3, libcurl3
+
+%description
+A Bittorrent client using C++ / libtorrent and a Qt4 Graphical User Interface.
+It aims to be as fast as possible and to provide multi-OS, unicode support.
+
+%prep
+%setup
+
+%build
+# Export the Environment variables
+export QTDIR=%_prefix/%_lib/qt4
+export KDEDIR=%_prefix
+export LD_LIBRARY_PATH=$QTDIR/%_lib:$KDEDIR/%_lib:$LD_LIBRARY_PATH
+export PATH=$QTDIR/bin:$KDEDIR/bin:$PATH
+
+
+# Change to the Source directory and configure
+#cd src
+CFLAGS="%optflags" CXXFLAGS="%optflags" \
+./configure --prefix=%{buildroot}%{_prefix}
+
+# Necessary to remove old compiled files.. if they exist
+make clean
+
+%make
+
+%install
+%makeinstall --directory=src
+
+
+# Create the menu directory
+install -d %{buildroot}%{_menudir}
+
+# Build the Menu
+#<package> <section> <file_in> <file_out> [requires] [title]
+kdedesktop2mdkmenu.pl %{name} "%{group}" %{buildroot}%{_datadir}/applications/qBittorrent.desktop %{buildroot}%{_menudir}/%{name}
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%post
+/sbin/ldconfig
+%{update_menus}
+
+%postun
+/sbin/ldconfig
+%{clean_menus}
+
+
+%files
+%defattr(-,root,root)
+%doc README INSTALL NEWS COPYING AUTHORS TODO Changelog
+%doc %{_mandir}/man1/*.bz2
+
+
+# The binaries
+%_bindir/*
+
+
+# Icon files
+# Hi and Lo colour icons various sizes
+%_iconsdir/hicolor/128x128/apps/qbittorrent.png
+%_iconsdir/hicolor/16x16/apps/qbittorrent.png
+%_iconsdir/hicolor/192x192/apps/qbittorrent.png
+%_iconsdir/hicolor/22x22/apps/qbittorrent.png
+%_iconsdir/hicolor/24x24/apps/qbittorrent.png
+%_iconsdir/hicolor/32x32/apps/qbittorrent.png
+%_iconsdir/hicolor/36x36/apps/qbittorrent.png
+%_iconsdir/hicolor/48x48/apps/qbittorrent.png
+%_iconsdir/hicolor/64x64/apps/qbittorrent.png
+%_iconsdir/hicolor/72x72/apps/qbittorrent.png
+%_iconsdir/hicolor/96x96/apps/qbittorrent.png
+## %_iconsdir/hicolor/scalable/apps/qbittorrent.svgz
+
+
+# Desktop Link
+%_datadir/applications/qBittorrent.desktop
+
+# The qbittorrent Menu directory
+%dir %{_menudir}
+%{_menudir}/%{name}
+
+
+%changelog
+
+* Wed Aug 23 2006 - Christophe Dumez <chris@qbittorrent.org> - 0.6.0-0.1.2006mdk
+- FEATURE: Rewritten the download list from scratch (more flexible)
+- FEATURE: Rewritten the search results list from scratch (more flexible)
+- FEATURE: Rewritten the torrent properties list from scratch (more flexible)
+- FEATURE: Improved and cleaned up search engine code
+- FEATURE: Search results are now displayed in real time (not sequentially)
+- FEATURE: Added two command lines parameters (--version, --help)
+- FEATURE: Added a popup menu for download list
+- FEATURE: Double-click on an item now toggles the paused state of a download
+- FEATURE: Improved code to be more portable (Windows & MacOS versions should arrive soon)
+- FEATURE: Allow to toggle selected state of a file within a torrent using double-click
+- FEATURE: Remember columns width in download and search results lists
+- BUGFIX: Don't use pkg-config for libcurl anymore (easier to compile)
+- BUGFIX: Fixed ETA calculation when downloading while connecting
+- BUGFIX: Download progress is now displayed correctly during first seconds of execution (was 0% before)
+- BUGFIX: Code cleanup & optimization
+- BUGFIX: Fixed sorting in download list
+- BUGFIX: Fixed sorting in search results list
+- BUGFIX: Fixed Parameters passing between instances
+- BUGFIX: Fixed missing icon for clear action in infoBar popup menu
+- BUGFIX: Fixed truncated lines in search results
+- BUGFIX: Don't refresh download list when user is in search tab (save CPU)
+- BUGFIX: Don't update Progress/DL Speed/ETA for finished downloads (save CPU)
+- BUGFIX: Save selected search engines only when they have changed (faster program exit)
+- COSMETIC: Increased icon size in toolbar from 24px to 32px
+- COSMETIC: Display a progress bar to visualize each download progress
+- COSMETIC: Size of each result in search are displayed in user friendly units
+- COSMETIC: Display a progress bar to visualize each file progress within a torrent
+- COSMETIC: Renamed 'ratio' to 'Session ratio' (makes more sense)
+- COSMETIC: Improved layout of torrent properties window when maximized
+- COSMETIC: Now number of search results is updated in real time
+- COSMETIC: Remember last window size
+- COSMETIC: Improved splash screen look
+- COSMETIC: Improved default width of columns in download and search results lists
+
+* Tue Aug 08 2006 - Christophe Dumez <chris@qbittorrent.org> - 0.5.0-0.1.20060mdk
+ - FEATURE: Improved "Download from url" feature (now supports https, ftp & redirections)
+ - FEATURE: Added a torrent creation tool
+ - FEATURE: Display progress for each file within a torrent
+ - FEATURE: Based on new libtorrent v0.10 (lot of improvements)
+ - FEATURE: Now possible to clear log textbox (popup menu)
+ - FEATURE: Added two search engines (isohunt, torrentreactor)
+ - FEATURE: Now Display share ratio on main window
+ - FEATURE: Use OSD (On Screen Display) when a download or a search is finished
+ - FEATURE: Allow only one instance of qBittorrent (and add new parameters to download list)
+ - FEATURE: Remember last selected search engines in search tab
+ - FEATURE: Improved search engines status output (Aborted, timed out, finished, no results)
+ - FEATURE: qBittorrent can now update search plugin from qbittorrent.org
+ - I18N: Added Slovak, Italian, Portuguese, Romanian and Traditional Chinese languages
+ - BUGFIX: Fixed ThePirateBay parser for search engine (website had changed)
+ - BUGFIX: Fixed filenames for results from ThePirateBay search engine
+ - BUGFIX: Fixed unicode support for ThePirateBay search engine
+ - BUGFIX: Now search results are sorted by seeds
+ - BUGFIX: Overwrite nova.py search plugin only if it is outdated
+ - BUGFIX: Fixed possible division by 0 in ETA calculation
+ - BUGFIX: Improved ETA calculation precision
+ - BUGFIX: Fixed default tab in options
+ - BUGFIX: When saving options, reconnect only when listening ports changed
+ - COSMETIC: qBittorrent has now its own new logo
+ - COSMETIC: Display status "downloading" if DL Speed > 0 (even when tracker is down)
+ - COSMETIC: Added a splashscreen
+ - COSMETIC: qBittorrent has new cute icons
+ - COSMETIC: Display number of results in search tab
+ - COSMETIC: Added icons for each item in download list according to its state
+ - COSMETIC: Redesigned Locale settings
+ - COSMETIC: Fixed search engines names width (were cut on the right)
+ - COSMETIC: Moved search engines to the left of the window (better ui)
+
+* Fri Jun 23 2006 - Christophe Dumez <chris@qbittorrent.org> - 0.4.1-0.1.20060mdk
+- Not counting "protocol chatter" in UP/DL speed anymore
+- Download speed is now 0 when download is finished
+- Paused torrents remain paused when qbittorrent is re-started
+- Added option "go to systray when minimizing"
+- Added option "Clear finished downloads on exit"
+- Added option "Ask user for confirmation on exit"
+- Added "Stalled" status for downloads (colored in orange, paused are in red and finished in green)
+- Fixed Search window layout on maximizing
+- Fixed a bug that caused upload limit not to be always applied
+- Added Bulgarian translation
+- Updated Translations
+- Code optimization
+
+* Tue Jun 13 2006 - Christophe Dumez <chris@qbittorrent.org> - 0.4.0-0.1.20060mdk
+- Added a search engine (supports Mininova & thepiratebay websites)
+- Fixed critical bug: some options were not applied correctly to BT session
+- Possibility to download a torrent file from an URL
+- Added confirmation dialog on qbittorrent exit
+- Enabled sorting in Download list
+- Added Ukrainian translation
+- Support urls as program parameters
+- Added more actions to trayicon menu
+- Fixed exception catching when retrieving fastresume data
+- use Binary prefix standards from IEC 60027-2 for units (B, KiB, MiB, GiB, TiB)
+- Iconification to systray when minimizing
+- Code Cleanup & optimization
+
+* Tue Jun 06 2006 - Christophe Dumez <chris@qbittorrent.org> - 0.3.1-0.1.20060mdk
+- Fixed toolbar layout (spacing)
+- Added Russian translation
+- Resume also finished files on startup (for seeding)
+- Added colors corresponding to download state
+- Fixed a segfault when deleting a download (if no scan dir is set)
+
+* Mon Jun 05 2006 - Christophe Dumez <chris@qbittorrent.org> - 0.3-0.1.20060mdk
+- Fixed auto-resume (worked only once)
+- Fixed BT_Backup dir creation on first startup (thanks Peter)
+- Now min port and max port are inverted if (min port > max port)
+- Fixed memory leaks
+- Added qbittorrent man page
+- Allow to disable max connections limit (default is disabled)
+- Disable upload limit by default
+- Added Menu Entry with icon (thanks Peter)
+- Restructured directory, now Makefile is in main directory (not src/)
+- Updated README / INSTALL
+
+* Fri Jun 02 2006 - Christophe Dumez <chris@qbittorrent.org> 0.2.3-0.1.20060mdk
+- Fixed ports checking function (user couldn't type the value he wanted)
+- Check tracker errors list size and clear it if it becomes too big.
+- qBittorrent does not remove .torrent file from scanned directory anymore
+- Small cosmetic change
+
+* Wed May 31 2006 Christophe Dumez <chris@qbittorrent.org> 0.2.2-0.1.20060mdk
+- Fixed missing icons
+
+* Sat May 27 2006 Jeffery Fernandez <developer@jefferyfernandez.id.au> 0.2.1-0.1.20060mdk
+- Initial Build for Mandriva Linux
+
+* Thu May 25 2006 Christophe Dumez <chris@qbittorrent.org>
+- Fixed "make install" rule
+- Disabled debug mode 
+
+* Thu May 25 2006 Christophe Dumez <chris@qbittorrent.org> - v0.2
+- Fixed a compatibility problem with some versions of qmake
+- Added translations : Greek, Swedish
+- Fixed Polish translation selection
+- Fixed come warning because of two unexisting slots
+- Improved "Apply" button behaviour in options
+- Windows are now resizable
+
+* Tue May 16 2006 Christophe Dumez <chris@qbittorrent.org> - v0.1
+- Initial release (lack features & still need a lot of improvements)
+
--- a/packaging/mandriva/rb_libtorrent.spec
+++ b/packaging/mandriva/rb_libtorrent.spec
@@ -0,0 +1,147 @@
+
+%define package_name	rb_libtorrent
+%define orig_name libtorrent
+%define major 0
+%define minor .10
+%define patch .1
+%define version	%{major}%{minor}
+%define candidate -rc1
+%define lib_name %mklibname %{package_name} %{major}
+%define release	%mkrel 4
+
+Summary     	: libtorrent is a C++ bittorrent library.
+Name			: %{package_name}
+Version			: %{version}
+Release			: %{release}
+License			: GPL
+Group       	: Development/C++
+Source0			: http://www.rasterbar.com/products/libtorrent/libtorrent-%{version}.tar.gz
+URL				: http://www.rasterbar.com
+BuildRequires	: boost >= 1.33.1
+BuildRoot		:  %{_tmppath}/%{orig_name}-%{version}-%{release}-root
+Patch0			: file_progress_arvid.patch.bz2
+
+%description
+ libtorrent is a C++ library that aims to be a good alternative 
+to all the other bittorrent implementations around.
+
+
+%package -n %{package_name}-devel
+Group			: Development/C++
+Summary			: Development files for %{package_name}
+Conflicts		: libtorrent7-devel
+
+%description -n %{package_name}-devel
+ Development files for %{package_name}
+
+%package -n %{lib_name}
+Group			: Development/C++
+Summary			: Library files for %{package_name}
+Conflicts		: libtorrent7
+
+%description -n %{lib_name}
+ Library files for %{package_name}
+
+%prep
+%setup -n %{orig_name}-%{version}
+
+%build
+%configure --prefix=%{_prefix}
+%make
+
+
+%install
+%makeinstall
+
+# Create directories for the package 
+install -d %{buildroot}%{_includedir}/%{orig_name}
+install -d %{buildroot}%{_libdir}/pkgconfig
+
+%clean
+rm -rf %{buildroot}
+
+# The binaries
+%files  %(orig_name)
+%defattr(0644, root, root, 0755)
+%{_bindir}/*
+
+# Documentation
+%defattr(-, root, root)
+%doc README AUTHORS INSTALL COPYING ChangeLog NEWS
+%doc docs/*
+
+
+# Devel Package
+%files -n %{package_name}-devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/%{orig_name}/
+%dir %{_includedir}/%{orig_name}/asio/
+%dir %{_includedir}/%{orig_name}/asio/detail/
+%dir %{_includedir}/%{orig_name}/asio/impl/
+%dir %{_includedir}/%{orig_name}/asio/ip/
+%dir %{_includedir}/%{orig_name}/asio/ip/detail/
+%dir %{_includedir}/%{orig_name}/asio/ssl/
+%dir %{_includedir}/%{orig_name}/asio/ssl/detail/
+%{_includedir}/%{orig_name}/*.hpp
+%{_includedir}/%{orig_name}/asio/*.hpp
+%{_includedir}/%{orig_name}/asio/detail/*.hpp
+%{_includedir}/%{orig_name}/asio/impl/*.ipp
+%{_includedir}/%{orig_name}/asio/ip/*.hpp
+%{_includedir}/%{orig_name}/asio/ip/detail/*.hpp
+%{_includedir}/%{orig_name}/asio/ssl/*.hpp
+%{_includedir}/%{orig_name}/asio/ssl/detail/*.hpp
+
+
+
+
+
+%{_libdir}/%{orig_name}.a
+%{_libdir}/%{orig_name}.la
+%{_libdir}/%{orig_name}.so
+%{_libdir}/pkgconfig/libtorrent.pc
+
+
+# Library Package
+%files -n %{lib_name}
+%defattr(-,root,root,-)
+%_libdir/%{orig_name}.so.*
+
+
+%changelog
+
+* Wed Aug 23 2006 Christophe Dumez <chris@qbittorrent.org> 10.0.1-2006mdk
+- Added patch for Torrent Properties crash fix
+
+* Sat Jul 1 2006 %{packager} %{version}-%{release}
+- fixed a bug where the requested number of peers in a tracker request could
+  be too big.
+- fixed a bug where empty files were not created in full allocation mode.
+- fixed a bug in storage that would, in rare cases, fail to do a
+  complete check.
+- exposed more settings for tweaking parameters in the piece-picker,
+  downloader and uploader (http_settings replaced by session_settings).
+- tweaked default settings to improve high bandwidth transfers.
+- improved the piece picker performance and made it possible to download
+  popular pieces in sequence to improve disk performance.
+- added the possibility to control upload and download limits per peer.
+- fixed problem with re-requesting skipped pieces when peer was sending pieces
+  out of fifo-order.
+- added support for http seeding (the GetRight protocol)
+- renamed identifiers called 'id' in the public interface to support linking
+  with Objective.C++
+- changed the extensions protocol to use the new one, which is also
+  implemented by uTorrent.
+- factorized the peer_connection and added web_peer_connection which is
+  able to download from http-sources.
+- converted the network code to use asio (resulted in slight api changes
+  dealing with network addresses).
+- made libtorrent build in vc7 (patches from Allen Zhao)
+- fixed bug caused when binding outgoing connections to a non-local interface.
+- add_torrent() will now throw if called while the session object is
+  being closed.
+- added the ability to limit the number of simultaneous half-open
+  TCP connections. Flags in peer_info has been added.
+
+
+* Thu Jun 1 2006 %{packager} %{version}-%{release}
+- Initial Build for Mandriva Linux 
--- a/packaging/ubuntu-dapper/debian/changelog
+++ b/packaging/ubuntu-dapper/debian/changelog
@@ -0,0 +1,134 @@
+qbittorrent (0.6.1-0ubuntu2) dapper; urgency=low
+
+  * Disabled debug mode
+
+ -- Christophe Dumez <chris@qbittorrent.org>  Mon, 28 Aug 2006 19:29:17 +0000
+
+qbittorrent (0.6.1-0ubuntu1) dapper; urgency=low
+  * BUGFIX: Fixed possible segfaults when using context menus
+  * BUGFIX: Cleanup up context menus code
+  * BUGFIX: Used best gzip compressing for manpage
+
+ -- Christophe Dumez <chris@qbittorrent.org>  Thu,  24 Aug 2006 19:53:32 +0200
+
+qbittorrent (0.6.0) dapper; urgency=low
+  * FEATURE: Rewritten the download list from scratch (more flexible)
+  * FEATURE: Rewritten the search results list from scratch (more flexible)
+  * FEATURE: Rewritten the torrent properties list from scratch (more flexible)
+  * FEATURE: Improved and cleaned up search engine code
+  * FEATURE: Search results are now displayed in real time (not sequentially)
+  * FEATURE: Added two command lines parameters (--version, --help)
+  * FEATURE: Added a popup menu for download list
+  * FEATURE: Double-click on an item now toggles the paused state of a download
+  * FEATURE: Improved code to be more portable (Windows & MacOS versions should arrive soon)
+  * FEATURE: Allow to toggle selected state of a file within a torrent using double-click
+  * FEATURE: Remember columns width in download and search results lists
+  * BUGFIX: Don't use pkg-config for libcurl anymore (easier to compile)
+  * BUGFIX: Fixed ETA calculation when downloading while connecting
+  * BUGFIX: Download progress is now displayed correctly during first seconds of execution (was 0% before)
+  * BUGFIX: Code cleanup & optimization
+  * BUGFIX: Fixed sorting in download list
+  * BUGFIX: Fixed sorting in search results list
+  * BUGFIX: Fixed Parameters passing between instances
+  * BUGFIX: Fixed missing icon for clear action in infoBar popup menu
+  * BUGFIX: Fixed truncated lines in search results
+  * BUGFIX: Don't refresh download list when user is in search tab (save CPU)
+  * BUGFIX: Don't update Progress/DL Speed/ETA for finished downloads (save CPU)
+  * BUGFIX: Save selected search engines only when they have changed (faster program exit)
+  * COSMETIC: Increased icon size in toolbar from 24px to 32px
+  * COSMETIC: Display a progress bar to visualize each download progress
+  * COSMETIC: Size of each result in search are displayed in user friendly units
+  * COSMETIC: Display a progress bar to visualize each file progress within a torrent
+  * COSMETIC: Renamed 'ratio' to 'Session ratio' (makes more sense)
+  * COSMETIC: Improved layout of torrent properties window when maximized
+  * COSMETIC: Now number of search results is updated in real time
+  * COSMETIC: Remember last window size
+  * COSMETIC: Improved splash screen look
+  * COSMETIC: Improved default width of columns in download and search results lists
+
+ -- Christophe Dumez <chris@qbittorrent.org>  Wed,  22 Aug 2006 10:42:37 +0200
+
+qbittorrent (0.5.0) dapper; urgency=low
+  * Improved "Download from url" feature (now supports https, ftp & redirections)
+  * Added a torrent creation tool
+  * Display progress for each file within a torrent
+  * Based on new libtorrent v0.10 (lot of improvements)
+  * Now possible to clear log textbox (popup menu)
+  * Added two search engines (isohunt, torrentreactor)
+  * Now Display share ratio on main window
+  * Use OSD (On Screen Display) when a download or a search is finished
+  * Allow only one instance of qBittorrent (and add new parameters to download list)
+  * Remember last selected search engines in search tab
+  * Improved search engines status output (Aborted, timed out, finished, no results)
+  * qBittorrent can now update search plugin from qbittorrent.org
+  * Added Slovak, Italian, Portuguese, Romanian and Traditional Chinese languages
+  * Fixed ThePirateBay parser for search engine (website had changed)
+  * Fixed filenames for results from ThePirateBay search engine
+  * Fixed unicode support for ThePirateBay search engine
+  * Now search results are sorted by seeds
+  * Overwrite nova.py search plugin only if it is outdated
+  * Fixed possible division by 0 in ETA calculation
+  * Improved ETA calculation precision
+  * Fixed default tab in options
+  * When saving options, reconnect only when listening ports changed
+  * qBittorrent has now its own new logo
+  * Display status "downloading" if DL Speed > 0 (even when tracker is down)
+  * Added a splashscreen
+  * qBittorrent has new cute icons
+  * Display number of results in search tab
+  * Added icons for each item in download list according to its state
+  * Redesigned Locale settings
+  * Fixed search engines names width (were cut on the right)
+  * Moved search engines to the left of the window (better ui)
+
+ -- Christophe Dumez <chris@qbittorrent.org>  Wed,  2 Aug 2006 19:46:32 +0200
+
+qbittorrent (0.4.1) dapper; urgency=low
+  * Not counting "protocol chatter" in UP/DL speed anymore
+  * Download speed is now 0 when download is finished
+  * Paused torrents remain paused when qbittorrent is re-started
+  * Added option "go to systray when minimizing"
+  * Added option "Clear finished downloads on exit"
+  * Added option "Ask user for confirmation on exit"
+  * Added "Stalled" status for downloads (colored in orange, paused are in red and finished in green)
+  * Fixed Search window layout on maximizing
+  * Fixed a bug that caused upload limit not to be always applied
+  * Added Bulgarian translation
+  * Updated Translations
+  * Code optimization
+
+ -- Christophe Dumez <chris@qbittorrent.org>  Thu,  22 Jun 2006 20:14:27 +0200
+
+qbittorrent (0.4.0) dapper; urgency=low
+
+  * Added a search engine (supports Mininova & thepiratebay websites)
+  * Fixed critical bug: some options were not applied correctly to BT session
+  * Possibility to download a torrent file from an URL
+  * Added confirmation dialog on qbittorrent exit
+  * Enabled sorting in Download list
+  * Added Ukrainian translation
+  * Support urls as program parameters
+  * Added more actions to trayicon menu
+  * Fixed exception catching when retrieving fastresume data
+  * use Binary prefix standards from IEC 60027-2 for units (B, KiB, MiB, GiB, TiB)
+  * Iconification to systray when minimizing
+  * Code Cleanup & optimization
+
+ -- Christophe Dumez <chris@qbittorrent.org>  Wed,  14 Jun 2006 14:47:27 +0200
+
+qbittorrent (0.3.1) dapper; urgency=low
+
+  * Fixed toolbar layout (spacing).
+  * Added Russian translation.
+  * Resume also finished files on startup (for seeding).
+  * Added colors corresponding to download state.
+  * Fixed a segfault when deleting a download (if no scan dir is set).
+
+ -- Christophe Dumez <chris@qbittorrent.org>  Sat,  6 Jun 2006 21:36:27 +0200
+
+
+qbittorrent (0.3) dapper; urgency=low
+
+  * Initial Release.
+
+ -- Christophe Dumez <chris@qbittorrent.org>  Sat,  3 Jun 2006 21:57:27 +0200
--- a/packaging/ubuntu-dapper/debian/compat
+++ b/packaging/ubuntu-dapper/debian/compat
@@ -0,0 +1 @@
+4
--- a/packaging/ubuntu-dapper/debian/control
+++ b/packaging/ubuntu-dapper/debian/control
@@ -0,0 +1,15 @@
+Source: qbittorrent
+Section: net
+Priority: optional
+Maintainer: Christophe Dumez <chris@qbittorrent.org>
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, libqt4-core (>= 4.1.0), libqt4-dev (>= 4.1.0), libqt4-gui (>= 4.1.0), rb-libtorrent (>= 0.10), libcurl3-dev
+Standards-Version: 3.6.2
+
+Package: qbittorrent
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, rb-libtorrent (>= 0.10), python (>= 2.3)
+Description: Bittorrent client in Qt4.1 / C++
+ qBittorrent is a bittorrent client programmed in C++ / Qt4.1
+ using rb_libtorrent by Arvid Norberg. It aims to be a good 
+ alternative to other bittorrent client out there. It is fast,
+ stable and provides unicode support.
--- a/packaging/ubuntu-dapper/debian/copyright
+++ b/packaging/ubuntu-dapper/debian/copyright
@@ -0,0 +1,26 @@
+This is qbittorrent, written and maintained by Christophe Dumez <chris@qbittorrent.org>
+on Sat,  3 Jun 2006 21:57:27 +0200.
+
+The original source can always be found at:
+	ftp://ftp.debian.org/dists/unstable/main/source/
+
+Copyright (C) 2006  Christophe Dumez
+
+License:
+
+  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 package; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
--- a/packaging/ubuntu-dapper/debian/dirs
+++ b/packaging/ubuntu-dapper/debian/dirs
@@ -0,0 +1,2 @@
+usr/bin
+usr/sbin
--- a/packaging/ubuntu-dapper/debian/docs
+++ b/packaging/ubuntu-dapper/debian/docs
@@ -0,0 +1,3 @@
+NEWS
+README
+TODO
--- a/packaging/ubuntu-dapper/debian/files
+++ b/packaging/ubuntu-dapper/debian/files
@@ -0,0 +1 @@
+qbittorrent_0.6.1-0ubuntu2_i386.deb net optional
--- a/packaging/ubuntu-dapper/debian/qbittorrent.substvars
+++ b/packaging/ubuntu-dapper/debian/qbittorrent.substvars
@@ -0,0 +1 @@
+shlibs:Depends=libboost-date-time1.33.1, libboost-filesystem1.33.1, libboost-thread1.33.1, libc6 (>= 2.3.4-1), libcurl3 (>= 7.15.0-1), libgcc1 (>= 1:4.0.2), libqt4-core (>= 4.1.2), libqt4-gui (>= 4.1.2), libstdc++6 (>= 4.0.2-4), libx11-6, libxext6, zlib1g (>= 1:1.2.1)
--- a/packaging/ubuntu-dapper/debian/rules
+++ b/packaging/ubuntu-dapper/debian/rules
@@ -0,0 +1,107 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+CFLAGS = -Wall
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+config.status: configure
+	dh_testdir
+	# Add here commands to configure the package.
+	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --prefix=/usr
+
+
+build: build-stamp
+
+build-stamp:  config.status
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE)
+	#docbook-to-man debian/qbittorrent.sgml > qbittorrent.1
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
+
+	# Add here commands to clean up after the build process.
+	-$(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	# Add here commands to install the package into debian/qbittorrent.
+	$(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/qbittorrent
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs Changelog
+	dh_installdocs
+	dh_installexamples
+#	dh_install
+#	dh_installmenu
+#	dh_installdebconf	
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_python
+#	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 
--- a/packaging/ubuntu-edgy/debian/changelog
+++ b/packaging/ubuntu-edgy/debian/changelog
@@ -0,0 +1,134 @@
+qbittorrent (0.6.1-0ubuntu2) edgy; urgency=low
+
+  * Disabled debug mode
+
+ -- Christophe Dumez <chris@qbittorrent.org>  Mon, 28 Aug 2006 21:22:48 +0200
+
+qbittorrent (0.6.1-0ubuntu1) edgy; urgency=low
+  * BUGFIX: Fixed possible segfaults when using context menus
+  * BUGFIX: Cleanup up context menus code
+  * BUGFIX: Used best gzip compressing for manpage
+
+ -- Christophe Dumez <chris@qbittorrent.org>  Thu,  24 Aug 2006 19:53:32 +0200
+
+qbittorrent (0.6.0) edgy; urgency=low
+  * FEATURE: Rewritten the download list from scratch (more flexible)
+  * FEATURE: Rewritten the search results list from scratch (more flexible)
+  * FEATURE: Rewritten the torrent properties list from scratch (more flexible)
+  * FEATURE: Improved and cleaned up search engine code
+  * FEATURE: Search results are now displayed in real time (not sequentially)
+  * FEATURE: Added two command lines parameters (--version, --help)
+  * FEATURE: Added a popup menu for download list
+  * FEATURE: Double-click on an item now toggles the paused state of a download
+  * FEATURE: Improved code to be more portable (Windows & MacOS versions should arrive soon)
+  * FEATURE: Allow to toggle selected state of a file within a torrent using double-click
+  * FEATURE: Remember columns width in download and search results lists
+  * BUGFIX: Don't use pkg-config for libcurl anymore (easier to compile)
+  * BUGFIX: Fixed ETA calculation when downloading while connecting
+  * BUGFIX: Download progress is now displayed correctly during first seconds of execution (was 0% before)
+  * BUGFIX: Code cleanup & optimization
+  * BUGFIX: Fixed sorting in download list
+  * BUGFIX: Fixed sorting in search results list
+  * BUGFIX: Fixed Parameters passing between instances
+  * BUGFIX: Fixed missing icon for clear action in infoBar popup menu
+  * BUGFIX: Fixed truncated lines in search results
+  * BUGFIX: Don't refresh download list when user is in search tab (save CPU)
+  * BUGFIX: Don't update Progress/DL Speed/ETA for finished downloads (save CPU)
+  * BUGFIX: Save selected search engines only when they have changed (faster program exit)
+  * COSMETIC: Increased icon size in toolbar from 24px to 32px
+  * COSMETIC: Display a progress bar to visualize each download progress
+  * COSMETIC: Size of each result in search are displayed in user friendly units
+  * COSMETIC: Display a progress bar to visualize each file progress within a torrent
+  * COSMETIC: Renamed 'ratio' to 'Session ratio' (makes more sense)
+  * COSMETIC: Improved layout of torrent properties window when maximized
+  * COSMETIC: Now number of search results is updated in real time
+  * COSMETIC: Remember last window size
+  * COSMETIC: Improved splash screen look
+  * COSMETIC: Improved default width of columns in download and search results lists
+
+ -- Christophe Dumez <chris@qbittorrent.org>  Wed,  22 Aug 2006 10:42:37 +0200
+
+qbittorrent (0.5.0) edgy; urgency=low
+  * Improved "Download from url" feature (now supports https, ftp & redirections)
+  * Added a torrent creation tool
+  * Display progress for each file within a torrent
+  * Based on new libtorrent v0.10 (lot of improvements)
+  * Now possible to clear log textbox (popup menu)
+  * Added two search engines (isohunt, torrentreactor)
+  * Now Display share ratio on main window
+  * Use OSD (On Screen Display) when a download or a search is finished
+  * Allow only one instance of qBittorrent (and add new parameters to download list)
+  * Remember last selected search engines in search tab
+  * Improved search engines status output (Aborted, timed out, finished, no results)
+  * qBittorrent can now update search plugin from qbittorrent.org
+  * Added Slovak, Italian, Portuguese, Romanian and Traditional Chinese languages
+  * Fixed ThePirateBay parser for search engine (website had changed)
+  * Fixed filenames for results from ThePirateBay search engine
+  * Fixed unicode support for ThePirateBay search engine
+  * Now search results are sorted by seeds
+  * Overwrite nova.py search plugin only if it is outdated
+  * Fixed possible division by 0 in ETA calculation
+  * Improved ETA calculation precision
+  * Fixed default tab in options
+  * When saving options, reconnect only when listening ports changed
+  * qBittorrent has now its own new logo
+  * Display status "downloading" if DL Speed > 0 (even when tracker is down)
+  * Added a splashscreen
+  * qBittorrent has new cute icons
+  * Display number of results in search tab
+  * Added icons for each item in download list according to its state
+  * Redesigned Locale settings
+  * Fixed search engines names width (were cut on the right)
+  * Moved search engines to the left of the window (better ui)
+
+ -- Christophe Dumez <chris@qbittorrent.org>  Wed,  2 Aug 2006 19:46:32 +0200
+
+qbittorrent (0.4.1) edgy; urgency=low
+  * Not counting "protocol chatter" in UP/DL speed anymore
+  * Download speed is now 0 when download is finished
+  * Paused torrents remain paused when qbittorrent is re-started
+  * Added option "go to systray when minimizing"
+  * Added option "Clear finished downloads on exit"
+  * Added option "Ask user for confirmation on exit"
+  * Added "Stalled" status for downloads (colored in orange, paused are in red and finished in green)
+  * Fixed Search window layout on maximizing
+  * Fixed a bug that caused upload limit not to be always applied
+  * Added Bulgarian translation
+  * Updated Translations
+  * Code optimization
+
+ -- Christophe Dumez <chris@qbittorrent.org>  Thu,  22 Jun 2006 20:14:27 +0200
+
+qbittorrent (0.4.0) edgy; urgency=low
+
+  * Added a search engine (supports Mininova & thepiratebay websites)
+  * Fixed critical bug: some options were not applied correctly to BT session
+  * Possibility to download a torrent file from an URL
+  * Added confirmation dialog on qbittorrent exit
+  * Enabled sorting in Download list
+  * Added Ukrainian translation
+  * Support urls as program parameters
+  * Added more actions to trayicon menu
+  * Fixed exception catching when retrieving fastresume data
+  * use Binary prefix standards from IEC 60027-2 for units (B, KiB, MiB, GiB, TiB)
+  * Iconification to systray when minimizing
+  * Code Cleanup & optimization
+
+ -- Christophe Dumez <chris@qbittorrent.org>  Wed,  14 Jun 2006 14:47:27 +0200
+
+qbittorrent (0.3.1) edgy; urgency=low
+
+  * Fixed toolbar layout (spacing).
+  * Added Russian translation.
+  * Resume also finished files on startup (for seeding).
+  * Added colors corresponding to download state.
+  * Fixed a segfault when deleting a download (if no scan dir is set).
+
+ -- Christophe Dumez <chris@qbittorrent.org>  Sat,  6 Jun 2006 21:36:27 +0200
+
+
+qbittorrent (0.3) edgy; urgency=low
+
+  * Initial Release.
+
+ -- Christophe Dumez <chris@qbittorrent.org>  Sat,  3 Jun 2006 21:57:27 +0200
--- a/packaging/ubuntu-edgy/debian/compat
+++ b/packaging/ubuntu-edgy/debian/compat
@@ -0,0 +1 @@
+4
--- a/packaging/ubuntu-edgy/debian/control
+++ b/packaging/ubuntu-edgy/debian/control
@@ -0,0 +1,15 @@
+Source: qbittorrent
+Section: net
+Priority: optional
+Maintainer: Christophe Dumez <chris@qbittorrent.org>
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, libqt4-core (>= 4.1.0), libqt4-dev (>= 4.1.0), libqt4-gui (>= 4.1.0), rb-libtorrent (>= 0.10), libcurl3-dev
+Standards-Version: 3.6.2
+
+Package: qbittorrent
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, rb-libtorrent (>= 0.10), python (>= 2.3)
+Description: Bittorrent client in Qt4.1 / C++
+ qBittorrent is a bittorrent client programmed in C++ / Qt4.1
+ using rb_libtorrent by Arvid Norberg. It aims to be a good 
+ alternative to other bittorrent client out there. It is fast,
+ stable and provides unicode support.
--- a/packaging/ubuntu-edgy/debian/copyright
+++ b/packaging/ubuntu-edgy/debian/copyright
@@ -0,0 +1,26 @@
+This is qbittorrent, written and maintained by Christophe Dumez <chris@qbittorrent.org>
+on Sat,  3 Jun 2006 21:57:27 +0200.
+
+The original source can always be found at:
+	ftp://ftp.debian.org/dists/unstable/main/source/
+
+Copyright (C) 2006  Christophe Dumez
+
+License:
+
+  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 package; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
--- a/packaging/ubuntu-edgy/debian/dirs
+++ b/packaging/ubuntu-edgy/debian/dirs
@@ -0,0 +1,2 @@
+usr/bin
+usr/sbin
--- a/packaging/ubuntu-edgy/debian/docs
+++ b/packaging/ubuntu-edgy/debian/docs
@@ -0,0 +1,3 @@
+NEWS
+README
+TODO
--- a/packaging/ubuntu-edgy/debian/files
+++ b/packaging/ubuntu-edgy/debian/files
@@ -0,0 +1 @@
+qbittorrent_0.6.1-0ubuntu2_i386.deb net optional
--- a/packaging/ubuntu-edgy/debian/qbittorrent.substvars
+++ b/packaging/ubuntu-edgy/debian/qbittorrent.substvars
@@ -0,0 +1 @@
+shlibs:Depends=libboost-date-time1.33.1, libboost-filesystem1.33.1, libboost-thread1.33.1, libc6 (>= 2.4-1), libcurl3 (>= 7.15.4-1), libgcc1 (>= 1:4.1.1-11ubuntu1), libqt4-core (>= 4.1.4), libqt4-gui (>= 4.1.4), libstdc++6 (>= 4.1.1-11ubuntu1), libx11-6, libxext6, zlib1g (>= 1:1.2.1)
--- a/packaging/ubuntu-edgy/debian/rules
+++ b/packaging/ubuntu-edgy/debian/rules
@@ -0,0 +1,107 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+CFLAGS = -Wall
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+config.status: configure
+	dh_testdir
+	# Add here commands to configure the package.
+	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --prefix=/usr
+
+
+build: build-stamp
+
+build-stamp:  config.status
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE)
+	#docbook-to-man debian/qbittorrent.sgml > qbittorrent.1
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
+
+	# Add here commands to clean up after the build process.
+	-$(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	# Add here commands to install the package into debian/qbittorrent.
+	$(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/qbittorrent
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs Changelog
+	dh_installdocs
+	dh_installexamples
+#	dh_install
+#	dh_installmenu
+#	dh_installdebconf	
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_python
+#	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 
--- a/qbittorrent.qc
+++ b/qbittorrent.qc
@@ -6,7 +6,7 @@
  <dep type='qt4'>
    <required/>
  </dep>
-  <dep type='libtorrent-rasterbar'>
+  <dep type='libtorrent'>
    <required/>
  </dep>
  <dep type='libboost'>
--- a/qcm/libtorrent-rasterbar.qcm
+++ b/qcm/libtorrent-rasterbar.qcm
@@ -1,17 +1,17 @@
 /*
 -----BEGIN QCMOD-----
-name: libtorrent-rasterbar
-arg: with-libtorrent-inc=[path], Path to libtorrent-rasterbar include files
-arg: with-libtorrent-lib=[path], Path to libtorrent-rasterbar library files
-arg: with-libtorrent-static-lib=[path], Path to libtorrent-rasterbar .a file
+name: libtorrent
+arg: with-libtorrent-inc=[path], Path to libtorrent include files
+arg: with-libtorrent-lib=[path], Path to libtorrent library files
+arg: with-libtorrent-static-lib=[path], Path to libtorrent .a file
 -----END QCMOD-----
 */
-class qc_libtorrent_rasterbar : public ConfObj
+class qc_libtorrent : public ConfObj
 {
 public:
-	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent-rasterbar >= 0.13"; }
-	QString shortname() const { return "libtorrent-rasterbar"; }
+	qc_libtorrent(Conf *c) : ConfObj(c) {}
+	QString name() const { return "libtorrent >= 0.13"; }
+	QString shortname() const { return "libtorrent"; }
 	bool exec(){
        	QString s;
 		s = conf->getenv("QC_WITH_LIBTORRENT_INC");
@@ -45,7 +45,7 @@ public:

 		s = conf->getenv("QC_WITH_LIBTORRENT_LIB");
 		if(!s.isEmpty()) {
-      			if(!conf->checkLibrary(s, "torrent-rasterbar")) {
+      			if(!conf->checkLibrary(s, "torrent")) {
 			        return false;
 			}
      			conf->addLib(QString("-L") + s);
@@ -57,7 +57,7 @@ public:
 			sl << "/usr/local/lib64/";
 			bool found = false;
 			foreach(s, sl){
-				if(conf->checkLibrary(s, "torrent-rasterbar")){
+				if(conf->checkLibrary(s, "torrent")){
 					found = true;
 					break;
 				}
--- a/qcm/qt4.qcm
+++ b/qcm/qt4.qcm
@@ -11,10 +11,6 @@ public:
 	QString shortname() const { return "Qt 4.3"; }
 	bool exec()
 	{
-		if(QT_VERSION >= 0x040400) {
-			conf->addDefine("QT_4_4");
-		}
 		return(QT_VERSION >= 0x040300);
-		
 	}
 };
--- a/src/DLListDelegate.h
+++ b/src/DLListDelegate.h
@@ -40,8 +40,7 @@
 #define SEEDSLEECH 5
 #define RATIO 6
 #define ETA 7
-#define PRIORITY 8
-#define HASH 9
+#define HASH 8

 class DLListDelegate: public QItemDelegate {
  Q_OBJECT
--- a/src/FinishedListDelegate.h
+++ b/src/FinishedListDelegate.h
@@ -37,8 +37,7 @@
 #define F_UPSPEED 2
 #define F_LEECH 3
 #define F_RATIO 4
-#define F_PRIORITY 5
-#define F_HASH 6
+#define F_HASH 5

 class FinishedListDelegate: public QItemDelegate {
  Q_OBJECT
--- a/src/FinishedTorrents.cpp
+++ b/src/FinishedTorrents.cpp
@@ -31,24 +31,20 @@
 #include <QStandardItemModel>
 #include <QHeaderView>
 #include <QMenu>
-#include <QMessageBox>

 FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : parent(parent), BTSession(BTSession), nbFinished(0){
  setupUi(this);
  actionStart->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/play.png")));
  actionPause->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/pause.png")));
  connect(BTSession, SIGNAL(addedTorrent(QString, QTorrentHandle&, bool)), this, SLOT(torrentAdded(QString, QTorrentHandle&, bool)));
-  finishedListModel = new QStandardItemModel(0,7);
+  finishedListModel = new QStandardItemModel(0,6);
  finishedListModel->setHeaderData(F_NAME, Qt::Horizontal, tr("Name", "i.e: file name"));
  finishedListModel->setHeaderData(F_SIZE, Qt::Horizontal, tr("Size", "i.e: file size"));
  finishedListModel->setHeaderData(F_UPSPEED, Qt::Horizontal, tr("UP Speed", "i.e: Upload speed"));
  finishedListModel->setHeaderData(F_LEECH, Qt::Horizontal, tr("Leechers", "i.e: full/partial sources"));
  finishedListModel->setHeaderData(F_RATIO, Qt::Horizontal, tr("Ratio"));
-  finishedListModel->setHeaderData(F_PRIORITY, Qt::Horizontal, tr("Priority"));
  finishedList->setModel(finishedListModel);
  loadHiddenColumns();
-  // Hide priority column
-  finishedList->hideColumn(F_PRIORITY);
  // Hide hash column
  finishedList->hideColumn(F_HASH);
  // Load last columns width for download list
@@ -64,8 +60,8 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
  connect(finishedList, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayFinishedListMenu(const QPoint&)));
  finishedList->header()->setContextMenuPolicy(Qt::CustomContextMenu);
  connect(finishedList->header(), SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayFinishedHoSMenu(const QPoint&)));
+
  connect(finishedList, SIGNAL(doubleClicked(const QModelIndex&)), this, SLOT(notifyTorrentDoubleClicked(const QModelIndex&)));
-  connect(BTSession, SIGNAL(forceFinishedListUpdate()), this, SLOT(updateFinishedList()));
  actionDelete->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/delete.png")));
  actionPreview_file->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/preview.png")));
  actionDelete_Permanently->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/delete_perm.png")));
@@ -74,8 +70,6 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
  connect(actionPause, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionPause_triggered()));
  connect(actionStart, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionStart_triggered()));
  connect(actionDelete, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionDelete_triggered()));
-  connect(actionIncreasePriority, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionIncreasePriority_triggered()));
-  connect(actionDecreasePriority, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionDecreasePriority_triggered()));
  connect(actionPreview_file, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionPreview_file_triggered()));
  connect(actionDelete_Permanently, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionDelete_Permanently_triggered()));
  connect(actionOpen_destination_folder, SIGNAL(triggered()), (GUI*)parent, SLOT(openDestinationFolder()));
@@ -87,7 +81,6 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
  connect(actionHOSColUpSpeed, SIGNAL(triggered()), this, SLOT(hideOrShowColumnUpSpeed()));
  connect(actionHOSColLeechers, SIGNAL(triggered()), this, SLOT(hideOrShowColumnLeechers()));
  connect(actionHOSColRatio, SIGNAL(triggered()), this, SLOT(hideOrShowColumnRatio()));
-  connect(actionHOSColPriority, SIGNAL(triggered()), this, SLOT(hideOrShowColumnPriority()));
 }

 FinishedTorrents::~FinishedTorrents(){
@@ -103,10 +96,6 @@ void FinishedTorrents::notifyTorrentDoubleClicked(const QModelIndex& index) {
  emit torrentDoubleClicked(hash, true);
 }

-void FinishedTorrents::hidePriorityColumn(bool hide) {
-  finishedList->setColumnHidden(F_PRIORITY, hide);
-}
-
 void FinishedTorrents::addTorrent(QString hash){
  if(!BTSession->isFinished(hash)){
    BTSession->setFinishedTorrent(hash);
@@ -122,8 +111,6 @@ void FinishedTorrents::addTorrent(QString hash){
  finishedListModel->setData(finishedListModel->index(row, F_UPSPEED), QVariant((double)0.));
  finishedListModel->setData(finishedListModel->index(row, F_LEECH), QVariant("0"));
  finishedListModel->setData(finishedListModel->index(row, F_RATIO), QVariant(QString::fromUtf8(misc::toString(BTSession->getRealRatio(hash)).c_str())));
-  if(BTSession->isQueueingEnabled())
-    finishedListModel->setData(finishedListModel->index(row, F_PRIORITY), QVariant((int)BTSession->getUpTorrentPriority(hash)));
  finishedListModel->setData(finishedListModel->index(row, F_HASH), QVariant(hash));
  if(h.is_paused()) {
    finishedListModel->setData(finishedListModel->index(row, F_NAME), QIcon(":/Icons/skin/paused.png"), Qt::DecorationRole);
@@ -249,31 +236,16 @@ void FinishedTorrents::updateFinishedList(){
      row = getRowFromHash(hash);
    }
    Q_ASSERT(row != -1);
-    // Update priority
-    if(BTSession->isQueueingEnabled()) {
-      finishedListModel->setData(finishedListModel->index(row, F_PRIORITY), QVariant((int)BTSession->getUpTorrentPriority(hash)));
-      if(h.is_paused() && BTSession->isUploadQueued(hash)) {
-        finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/queued.png"))), Qt::DecorationRole);
-        setRowColor(row, QString::fromUtf8("grey"));
-      }
-    }
    if(h.is_paused()) continue;
    if(BTSession->getTorrentsToPauseAfterChecking().indexOf(hash) != -1) {
      continue;
    }
    if(h.state() == torrent_status::downloading || (h.state() != torrent_status::checking_files && h.state() != torrent_status::queued_for_checking && h.progress() < 1.)) {
      // What are you doing here? go back to download tab!
-      int reponse = QMessageBox::question(this, tr("Incomplete torrent in seeding list"), tr("It appears that the state of '%1' torrent changed from 'seeding' to 'downloading'. Would you like to move it back to download list? (otherwise the torrent will simply be deleted)").arg(h.name()), QMessageBox::Yes | QMessageBox::No);
-      if (reponse == QMessageBox::Yes) {
-        qDebug("Info: a torrent was moved from finished to download tab");
-        deleteTorrent(hash);
-        BTSession->setUnfinishedTorrent(hash);
-        emit torrentMovedFromFinishedList(hash);
-      }
-      else if (reponse == QMessageBox::No) {
-		    qDebug("Deleted from the finished");
-		    BTSession->deleteTorrent(hash, true);
-      }
+      qDebug("Info: a torrent was moved from finished to download tab");
+      deleteTorrent(hash);
+      BTSession->setFinishedTorrent(hash);
+      emit torrentMovedFromFinishedList(hash);
      continue;
    }
    if(h.state() == torrent_status::checking_files){
@@ -409,17 +381,12 @@ void FinishedTorrents::displayFinishedListMenu(const QPoint& pos){
  myFinishedListMenu.addSeparator();
  myFinishedListMenu.addAction(actionOpen_destination_folder);
  myFinishedListMenu.addAction(actionTorrent_Properties);
-  if(BTSession->isQueueingEnabled()) {
-    myFinishedListMenu.addSeparator();
-    myFinishedListMenu.addAction(actionIncreasePriority);
-    myFinishedListMenu.addAction(actionDecreasePriority);
-  }
  myFinishedListMenu.addSeparator();
  myFinishedListMenu.addAction(actionBuy_it);

  // Call menu
  // XXX: why mapToGlobal() is not enough?
-  myFinishedListMenu.exec(mapToGlobal(pos)+QPoint(10,58));
+  myFinishedListMenu.exec(mapToGlobal(pos)+QPoint(10,55));
 }


@@ -431,17 +398,11 @@ void FinishedTorrents::displayFinishedListMenu(const QPoint& pos){
 void FinishedTorrents::displayFinishedHoSMenu(const QPoint& pos){
  QMenu hideshowColumn(this);
  hideshowColumn.setTitle(tr("Hide or Show Column"));
-  int lastCol;
-  if(BTSession->isQueueingEnabled()) {
-    lastCol = F_PRIORITY;
-  } else {
-    lastCol = F_RATIO;
-  }
  for(int i=0; i<=F_RATIO; i++) {
    hideshowColumn.addAction(getActionHoSCol(i));
  }
  // Call menu
-  hideshowColumn.exec(mapToGlobal(pos)+QPoint(10,34));
+  hideshowColumn.exec(mapToGlobal(pos)+QPoint(10,55));
 }

 // toggle hide/show a column
@@ -495,10 +456,6 @@ void FinishedTorrents::hideOrShowColumnRatio() {
  hideOrShowColumn(F_RATIO);
 }

-void FinishedTorrents::hideOrShowColumnPriority() {
-  hideOrShowColumn(F_PRIORITY);
-}
-
 // load the previous settings, and hide the columns
 bool FinishedTorrents::loadHiddenColumns() {
  bool loaded = false;
@@ -560,9 +517,6 @@ QAction* FinishedTorrents::getActionHoSCol(int index) {
    case F_RATIO :
      return actionHOSColRatio;
      break;
-    case F_PRIORITY :
-      return actionHOSColPriority;
-      break;
    default :
      return NULL;
  }
--- a/src/FinishedTorrents.h
+++ b/src/FinishedTorrents.h
@@ -72,7 +72,6 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
    void hideOrShowColumnUpSpeed();
    void hideOrShowColumnLeechers();
    void hideOrShowColumnRatio();
-    void hideOrShowColumnPriority();

  public slots:
    void addTorrent(QString hash);
@@ -82,7 +81,6 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
    void propertiesSelection();
    void deleteTorrent(QString hash);
    void showPropertiesFromHash(QString hash);
-    void hidePriorityColumn(bool hide);

  signals:
    void torrentMovedFromFinishedList(QString);
--- a/src/GUI.cpp
+++ b/src/GUI.cpp
@@ -23,18 +23,8 @@
 #include <QDesktopWidget>
 #include <QTimer>
 #include <QDesktopServices>
-#include <QStatusBar>
-#include <QFrame>
-#ifdef QT_4_4
-  #include <QLocalServer>
-  #include <QLocalSocket>
-  #include <unistd.h>
-  #include <sys/types.h>
-#else
-  #include <QTcpServer>
-  #include <QTcpSocket>
-#endif
-
+#include <QTcpServer>
+#include <QTcpSocket>
 #include <QCloseEvent>
 #include <QShortcut>
 #include <QLabel>
@@ -109,13 +99,16 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
  actionSet_global_upload_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png")));
  actionSet_global_download_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/downloading.png")));
  actionDocumentation->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/qb_question.png")));
-  prioSeparator = toolBar->insertSeparator(actionDecreasePriority);
-  prioSeparator2 = menu_Edit->insertSeparator(actionDecreasePriority);
-  prioSeparator->setVisible(false);
-  prioSeparator2->setVisible(false);
+  connecStatusLblIcon = new QLabel();
+  connecStatusLblIcon->setFrameShape(QFrame::NoFrame);
+  connecStatusLblIcon->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/disconnected.png")));
+  connecStatusLblIcon->setToolTip(QString::fromUtf8("<b>")+tr("Connection status:")+QString::fromUtf8("</b><br>")+tr("Offline")+QString::fromUtf8("<br><i>")+tr("No peers found...")+QString::fromUtf8("</i>"));
+  toolBar->addWidget(connecStatusLblIcon);
  actionDelete_Permanently->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/delete_perm.png")));
  actionTorrent_Properties->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/properties.png")));
  actionCreate_torrent->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/new.png")));
+  // Set default ratio
+  lbl_ratio_icon->setPixmap(QPixmap(QString::fromUtf8(":/Icons/stare.png")));
  // Fix Tool bar layout
  toolBar->layout()->setSpacing(7);
  // creating options
@@ -132,15 +125,13 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
  connect(BTSession, SIGNAL(deletedTorrent(QString)), this, SLOT(deleteTorrent(QString)));
  connect(BTSession, SIGNAL(torrent_ratio_deleted(QString)), this, SLOT(deleteRatioTorrent(QString)));
  connect(BTSession, SIGNAL(pausedTorrent(QString)), this, SLOT(pauseTorrent(QString)));
-  connect(BTSession, SIGNAL(updateUnfinishedTorrentNumber()), this, SLOT(updateUnfinishedTorrentNumberCalc()));
-  connect(BTSession, SIGNAL(updateFinishedTorrentNumber()), this, SLOT(updateFinishedTorrentNumberCalc()));
  qDebug("create tabWidget");
  tabs = new QTabWidget();
  // Download torrents tab
  downloadingTorrentTab = new DownloadingTorrents(this, BTSession);
  tabs->addTab(downloadingTorrentTab, tr("Downloads") + QString::fromUtf8(" (0/0)"));
  tabs->setTabIcon(0, QIcon(QString::fromUtf8(":/Icons/skin/downloading.png")));
-  vboxLayout->addWidget(tabs);
+  verticalLayout->addWidget(tabs);
  connect(downloadingTorrentTab, SIGNAL(unfinishedTorrentsNumberChanged(unsigned int)), this, SLOT(updateUnfinishedTorrentNumber(unsigned int)));
  connect(downloadingTorrentTab, SIGNAL(torrentDoubleClicked(QString, bool)), this, SLOT(torrentDoubleClicked(QString, bool)));
  // Finished torrents tab
@@ -148,14 +139,8 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
  tabs->addTab(finishedTorrentTab, tr("Finished") + QString::fromUtf8(" (0/0)"));
  tabs->setTabIcon(1, QIcon(QString::fromUtf8(":/Icons/skin/seeding.png")));
  connect(finishedTorrentTab, SIGNAL(torrentDoubleClicked(QString, bool)), this, SLOT(torrentDoubleClicked(QString, bool)));
+
  connect(finishedTorrentTab, SIGNAL(finishedTorrentsNumberChanged(unsigned int)), this, SLOT(updateFinishedTorrentNumber(unsigned int)));
-  // Search engine tab
-  searchEngine = new SearchEngine(BTSession, myTrayIcon, systrayIntegration);
-  tabs->addTab(searchEngine, tr("Search"));
-  tabs->setTabIcon(2, QIcon(QString::fromUtf8(":/Icons/skin/search.png")));
-  readSettings();
-  // RSS Tab
-  rssWidget = 0;
  // Smooth torrent switching between tabs Downloading <--> Finished
  connect(downloadingTorrentTab, SIGNAL(torrentFinished(QString)), finishedTorrentTab, SLOT(addTorrent(QString)));
  connect(finishedTorrentTab, SIGNAL(torrentMovedFromFinishedList(QString)), downloadingTorrentTab, SLOT(addTorrent(QString)));
@@ -167,6 +152,15 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
  configureSession(true);
  // Resume unfinished torrents
  BTSession->resumeUnfinishedTorrents();
+  // Search engine tab
+  searchEngine = new SearchEngine(BTSession, myTrayIcon, systrayIntegration);
+  tabs->addTab(searchEngine, tr("Search"));
+  tabs->setTabIcon(2, QIcon(QString::fromUtf8(":/Icons/skin/search.png")));
+  // RSS tab
+  rssWidget = new RSSImp();
+  tabs->addTab(rssWidget, tr("RSS"));
+  tabs->setTabIcon(3, QIcon(QString::fromUtf8(":/Icons/rss32.png")));
+  readSettings();
  // Add torrent given on command line
  processParams(torrentCmdLine);
  // Initialize Web UI
@@ -179,23 +173,11 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
    initWebUi(username, password, port);
  }
  // Use a tcp server to allow only one instance of qBittorrent
-#ifdef QT_4_4
-  localServer = new QLocalServer();
-  QString uid = QString::number(getuid());
-  if (!localServer->listen("qBittorrent-"+uid)) {
-#else
-  localServer = new QTcpServer();
-  if (!localServer->listen(QHostAddress::LocalHost)) {
-#endif
+  tcpServer = new QTcpServer();
+  if (!tcpServer->listen(QHostAddress::LocalHost, 1666)) {
    std::cerr  << "Couldn't create socket, single instance mode won't work...\n";
  }
-#ifndef QT_4_4  
-  else {
-    QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
-    settings.setValue(QString::fromUtf8("uniqueInstancePort"), localServer->serverPort());
-  }
-#endif
-  connect(localServer, SIGNAL(newConnection()), this, SLOT(acceptConnection()));
+  connect(tcpServer, SIGNAL(newConnection()), this, SLOT(acceptConnection()));
  // Start connection checking timer
  checkConnect = new QTimer(this);
  connect(checkConnect, SIGNAL(timeout()), this, SLOT(checkConnectionStatus()));
@@ -206,51 +188,13 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
    show();
  }
  createKeyboardShortcuts();
-  connecStatusLblIcon = new QLabel();
-  connecStatusLblIcon->setFrameShape(QFrame::NoFrame);
-  connecStatusLblIcon->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/firewalled.png")));
-  connecStatusLblIcon->setToolTip(QString::fromUtf8("<b>")+tr("Connection status:")+QString::fromUtf8("</b><br>")+QString::fromUtf8("<i>")+tr("No direct connections. This may indicate network configuration problems.")+QString::fromUtf8("</i>"));
-  dlSpeedLbl = new QLabel(tr("DL: %1 KiB/s").arg("0.0"));
-  upSpeedLbl = new QLabel(tr("UP: %1 KiB/s").arg("0.0"));
-  ratioLbl = new QLabel(tr("Ratio: %1").arg("1.0"));
-  DHTLbl = new QLabel(tr("DHT: %1 nodes").arg(0));
-  statusSep1 = new QFrame();
-  statusSep1->setFixedWidth(1);
-  statusSep1->setFrameStyle(QFrame::Box);
-  statusSep2 = new QFrame();
-  statusSep2->setFixedWidth(1);
-  statusSep2->setFrameStyle(QFrame::Box);
-  statusSep3 = new QFrame();
-  statusSep3->setFixedWidth(1);
-  statusSep3->setFrameStyle(QFrame::Box);
-  statusSep4 = new QFrame();
-  statusSep4->setFixedWidth(1);
-  statusSep4->setFrameStyle(QFrame::Box);
-  QMainWindow::statusBar()->addPermanentWidget(DHTLbl);
-  QMainWindow::statusBar()->addPermanentWidget(statusSep1);
-  QMainWindow::statusBar()->addPermanentWidget(connecStatusLblIcon);
-  QMainWindow::statusBar()->addPermanentWidget(statusSep2);
-  QMainWindow::statusBar()->addPermanentWidget(dlSpeedLbl);
-  QMainWindow::statusBar()->addPermanentWidget(statusSep3);
-  QMainWindow::statusBar()->addPermanentWidget(upSpeedLbl);
-  QMainWindow::statusBar()->addPermanentWidget(statusSep4);
-  QMainWindow::statusBar()->addPermanentWidget(ratioLbl);
  qDebug("GUI Built");
 }

 // Destructor
 GUI::~GUI() {
  qDebug("GUI destruction");
-  delete dlSpeedLbl;
-  delete upSpeedLbl;
-  delete ratioLbl;
-  delete DHTLbl;
-  delete statusSep1;
-  delete statusSep2;
-  delete statusSep3;
-  delete statusSep4;
-  if(rssWidget != 0)
-    delete rssWidget;
+  delete rssWidget;
  delete searchEngine;
  delete refresher;
  delete downloadingTorrentTab;
@@ -265,7 +209,7 @@ GUI::~GUI() {
    delete myTrayIconMenu;
  }
  qDebug("2");
-  delete localServer;
+  delete tcpServer;
  delete connecStatusLblIcon;
  delete tabs;
  // HTTP Server
@@ -283,20 +227,6 @@ GUI::~GUI() {
  qDebug("5");
 }

-void GUI::displayRSSTab(bool enable) {
-  if(enable) {
-    // RSS tab
-    rssWidget = new RSSImp();
-    tabs->addTab(rssWidget, tr("RSS"));
-    tabs->setTabIcon(3, QIcon(QString::fromUtf8(":/Icons/rss32.png")));
-  } else {
-    if(rssWidget != 0) {
-      delete rssWidget;
-      rssWidget = 0;
-    }
-  }
-}
-
 void GUI::updateRatio() {
  // Update ratio info
  float ratio = 1.;
@@ -311,9 +241,16 @@ void GUI::updateRatio() {
    if(ratio > 10.)
      ratio = 10.;
  }
-  ratioLbl->setText(tr("Ratio: %1").arg(QString(QByteArray::number(ratio, 'f', 1))));
-  // Update DHT nodes
-  DHTLbl->setText(tr("DHT: %1 nodes").arg(QString::number(sessionStatus.dht_nodes)));
+  LCD_Ratio->display(QString(QByteArray::number(ratio, 'f', 1)));
+  if(ratio < 0.5) {
+    lbl_ratio_icon->setPixmap(QPixmap(QString::fromUtf8(":/Icons/unhappy.png")));
+  }else{
+    if(ratio > 1.0) {
+      lbl_ratio_icon->setPixmap(QPixmap(QString::fromUtf8(":/Icons/smile.png")));
+    }else{
+      lbl_ratio_icon->setPixmap(QPixmap(QString::fromUtf8(":/Icons/stare.png")));
+    }
+  }
 }

 void GUI::on_actionWebsite_triggered() const {
@@ -421,8 +358,6 @@ void GUI::createKeyboardShortcuts() {
  actionStart_All->setShortcut(QKeySequence(QString::fromUtf8("Ctrl+Shift+S")));
  actionPause->setShortcut(QKeySequence(QString::fromUtf8("Ctrl+P")));
  actionPause_All->setShortcut(QKeySequence(QString::fromUtf8("Ctrl+Shift+P")));
-  actionDecreasePriority->setShortcut(QKeySequence(QString::fromUtf8("Ctrl+-")));
-  actionIncreasePriority->setShortcut(QKeySequence(QString::fromUtf8("Ctrl++")));
 }

 // Keyboard shortcuts slots
@@ -464,7 +399,7 @@ void GUI::balloonClicked() {
 }

 void GUI::acceptConnection() {
-  clientConnection = localServer->nextPendingConnection();
+  clientConnection = tcpServer->nextPendingConnection();
  connect(clientConnection, SIGNAL(disconnected()), this, SLOT(readParamsOnSocket()));
  qDebug("accepted connection from another instance");
 }
@@ -665,18 +600,15 @@ void GUI::on_actionCreate_torrent_triggered() {
  connect(ct, SIGNAL(torrent_to_seed(QString)), this, SLOT(addTorrent(QString)));
 }

-bool GUI::event(QEvent * e) {
-  if(e->type() == QEvent::WindowStateChange) {
-    //Now check to see if the window is minimised
-    if(isMinimized()) {
-      qDebug("minimisation");
-      QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
-      if(systrayIntegration && settings.value(QString::fromUtf8("Preferences/General/MinimizeToTray"), false).toBool()) {
-        hide();
-      }
-    }
+// Called when we minimize the program
+void GUI::hideEvent(QHideEvent *e) {
+  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+  if(systrayIntegration && settings.value(QString::fromUtf8("Preferences/General/MinimizeToTray"), false).toBool()) {
+    // Hide window
+    hide();
  }
-  return QMainWindow::event(e);
+  // Accept hiding
+  e->accept();
 }

 // Action executed when a file is dropped
@@ -936,11 +868,6 @@ void GUI::configureSession(bool deleteOptions) {
    setWindowTitle(tr("qBittorrent %1", "e.g: qBittorrent v0.x").arg(QString::fromUtf8(VERSION)));
  }
  displaySpeedInTitle = new_displaySpeedInTitle;
-  if(options->isToolbarDisplayed()) {
-    toolBar->setVisible(true);
-  } else {
-    toolBar->setVisible(false);
-  }
  unsigned int new_refreshInterval = options->getRefreshInterval();
  if(refreshInterval != new_refreshInterval) {
    refreshInterval = new_refreshInterval;
@@ -1051,8 +978,6 @@ void GUI::configureSession(bool deleteOptions) {
  } else {
    sessionSettings.user_agent = "qBittorrent "VERSION;
  }
-  sessionSettings.upnp_ignore_nonrouters = true;
-  sessionSettings.use_dht_as_fallback = false;
  BTSession->setSessionSettings(sessionSettings);
  // Bittorrent
  // * Max connections limit
@@ -1125,42 +1050,6 @@ void GUI::configureSession(bool deleteOptions) {
    BTSession->disableIPFilter();
    downloadingTorrentTab->setBottomTabEnabled(1, false);
  }
-  // RSS
-  if(options->isRSSEnabled()) {
-    displayRSSTab(true);
-  } else {
-    displayRSSTab(false);
-  }
-  // Queueing System
-  if(options->isQueueingSystemEnabled()) {
-    if(!BTSession->isQueueingEnabled()) {
-      downloadingTorrentTab->hidePriorityColumn(false);
-      finishedTorrentTab->hidePriorityColumn(false);
-      actionDecreasePriority->setVisible(true);
-      actionIncreasePriority->setVisible(true);
-      prioSeparator->setVisible(true);
-      prioSeparator2->setVisible(true);
-      toolBar->layout()->setSpacing(7);
-    }
-    int max_torrents = options->getMaxActiveTorrents();
-    int max_downloads = options->getMaxActiveDownloads();
-    if(max_torrents < max_downloads)
-      max_torrents = max_downloads;
-    BTSession->setMaxActiveTorrents(max_torrents);
-    BTSession->setMaxActiveDownloads(max_downloads);
-    BTSession->setQueueingEnabled(true);
-  } else {
-    if(BTSession->isQueueingEnabled()) {
-      BTSession->setQueueingEnabled(false);
-      downloadingTorrentTab->hidePriorityColumn(true);
-      finishedTorrentTab->hidePriorityColumn(true);
-      actionDecreasePriority->setVisible(false);
-      actionIncreasePriority->setVisible(false);
-      prioSeparator->setVisible(false);
-      prioSeparator2->setVisible(false);
-      toolBar->layout()->setSpacing(7);
-    }
-  }
  // Clean up
  if(deleteOptions) {
    delete options;
@@ -1173,23 +1062,11 @@ void GUI::updateUnfinishedTorrentNumber(unsigned int nb) {
  tabs->setTabText(0, tr("Downloads") +QString::fromUtf8(" (")+misc::toQString(nb-paused)+"/"+misc::toQString(nb)+QString::fromUtf8(")"));
 }

-void GUI::updateUnfinishedTorrentNumberCalc() {
-  unsigned int paused = BTSession->getUnfinishedPausedTorrentsNb();
-  unsigned int nb = BTSession->getUnfinishedTorrents().size();
-  tabs->setTabText(0, tr("Downloads") +QString::fromUtf8(" (")+misc::toQString(nb-paused)+"/"+misc::toQString(nb)+QString::fromUtf8(")"));
-}
-
 void GUI::updateFinishedTorrentNumber(unsigned int nb) {
  unsigned int paused = BTSession->getFinishedPausedTorrentsNb();
  tabs->setTabText(1, tr("Finished") +QString::fromUtf8(" (")+misc::toQString(nb-paused)+"/"+misc::toQString(nb)+QString::fromUtf8(")"));
 }

-void GUI::updateFinishedTorrentNumberCalc() {
-  unsigned int paused = BTSession->getFinishedPausedTorrentsNb();
-  unsigned int nb = BTSession->getFinishedTorrents().size();
-  tabs->setTabText(1, tr("Finished") +QString::fromUtf8(" (")+misc::toQString(nb-paused)+"/"+misc::toQString(nb)+QString::fromUtf8(")"));
-}
-
 // Allow to change action on double-click
 void GUI::torrentDoubleClicked(QString hash, bool finished) {
  int action;
@@ -1229,7 +1106,7 @@ void GUI::togglePausedState(QString hash) {
  if(tabs->currentIndex() == 1)
    inDownloadList = false;
  QTorrentHandle h = BTSession->getTorrentHandle(hash);
-  if(BTSession->isPaused(hash) && !(BTSession->isQueueingEnabled() && (BTSession->isDownloadQueued(hash) || BTSession->isUploadQueued(hash)))) {
+  if(BTSession->isPaused(hash)) {
    BTSession->resumeTorrent(hash);
    downloadingTorrentTab->setInfoBar(tr("'%1' resumed.", "e.g: xxx.avi resumed.").arg(h.name()));
    if(inDownloadList) {
@@ -1277,51 +1154,6 @@ void GUI::on_actionPause_All_triggered() {
  }
 }

-void GUI::on_actionIncreasePriority_triggered() {
-  bool inDownloadList = true;
-  if(tabs->currentIndex() > 1) return;
-  if(tabs->currentIndex() == 1)
-    inDownloadList = false;
-  QStringList hashes;
-  if(inDownloadList) {
-    hashes = downloadingTorrentTab->getSelectedTorrents();
-  } else {
-    hashes = finishedTorrentTab->getSelectedTorrents();
-  }
-  foreach(QString hash, hashes) {
-    if(inDownloadList) {
-      BTSession->increaseDlTorrentPriority(hash);
-      downloadingTorrentTab->updateDlList();
-    } else {
-      BTSession->increaseUpTorrentPriority(hash);
-      finishedTorrentTab->updateFinishedList();
-    }
-  }
-}
-
-void GUI::on_actionDecreasePriority_triggered() {
-  bool inDownloadList = true;
-  if(tabs->currentIndex() > 1) return;
-  if(tabs->currentIndex() == 1)
-    inDownloadList = false;
-  QStringList hashes;
-  if(inDownloadList) {
-    hashes = downloadingTorrentTab->getSelectedTorrents();
-  } else {
-    hashes = finishedTorrentTab->getSelectedTorrents();
-  }
-  QString hash;
-  foreach(QString hash, hashes) {
-    if(inDownloadList) {
-      BTSession->decreaseDlTorrentPriority(hash);
-      downloadingTorrentTab->updateDlList();
-    } else {
-      BTSession->decreaseUpTorrentPriority(hash);
-      finishedTorrentTab->updateFinishedList();
-    }
-  }
-}
-
 // pause selected items in the list
 void GUI::on_actionPause_triggered() {
  bool inDownloadList = true;
@@ -1429,8 +1261,8 @@ void GUI::on_actionTorrent_Properties_triggered() {

 void GUI::updateLists() {
  // update global informations
-  dlSpeedLbl->setText(tr("DL: %1 KiB/s").arg(QString(QByteArray::number(BTSession->getPayloadDownloadRate()/1024., 'f', 1))));
-  upSpeedLbl->setText(tr("UP: %1 KiB/s").arg(QString(QByteArray::number(BTSession->getPayloadUploadRate()/1024., 'f', 1))));
+  LCD_UpSpeed->display(QString(QByteArray::number(BTSession->getPayloadUploadRate()/1024., 'f', 1))); // UP LCD
+  LCD_DownSpeed->display(QString(QByteArray::number(BTSession->getPayloadDownloadRate()/1024., 'f', 1))); // DL LCD
  switch(getCurrentTabIndex()){
    case 0:
      downloadingTorrentTab->updateDlList();
@@ -1480,8 +1312,15 @@ void GUI::checkConnectionStatus() {
    connecStatusLblIcon->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/connected.png")));
    connecStatusLblIcon->setToolTip(QString::fromUtf8("<b>")+tr("Connection Status:")+QString::fromUtf8("</b><br>")+tr("Online"));
  }else{
-    connecStatusLblIcon->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/firewalled.png")));
-    connecStatusLblIcon->setToolTip(QString::fromUtf8("<b>")+tr("Connection status:")+QString::fromUtf8("</b><br>")+QString::fromUtf8("<i>")+tr("No direct connections. This may indicate network configuration problems.")+QString::fromUtf8("</i>"));
+    if(sessionStatus.num_peers) {
+      // Firewalled ?
+      connecStatusLblIcon->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/firewalled.png")));
+      connecStatusLblIcon->setToolTip("<b>"+tr("Connection Status:")+QString::fromUtf8("</b><br>")+tr("Firewalled?", "i.e: Behind a firewall/router?")+QString::fromUtf8("<br><i>")+tr("No incoming connections...")+QString::fromUtf8("</i>"));
+    }else{
+      // Disconnected
+      connecStatusLblIcon->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/disconnected.png")));
+      connecStatusLblIcon->setToolTip(QString::fromUtf8("<b>")+tr("Connection status:")+QString::fromUtf8("</b><br>")+tr("Offline")+QString::fromUtf8("<br><i>")+tr("No peers found...")+QString::fromUtf8("</i>"));
+    }
  }
 }

@@ -1601,9 +1440,9 @@ bool GUI::initWebUi(QString username, QString password, int port)
  httpServer->setAuthorization(username, password);
  bool success = httpServer->listen(QHostAddress::Any, port);
  if (success)
-    qDebug("Web UI listening on port %d", port);
+    qDebug()<<"Web UI listening on port "<<port;
  else
-    QMessageBox::critical(this, "Web User Interface Error", "Unable to initialize HTTP Server on port " + misc::toQString(port));
+    QMessageBox::critical(this, "Web User Interface Error", "Unable to initialize HTTP Server on port " + port);
  return success;
 }

--- a/src/GUI.h
+++ b/src/GUI.h
@@ -35,13 +35,8 @@ class DownloadingTorrents;
 class FinishedTorrents;
 class downloadFromURL;
 class SearchEngine;
-#ifdef QT_4_4
-  class QLocalServer;
-  class QLocalSocket;
-#else
-  class QTcpServer;
-  class QTcpSocket;
-#endif
+class QTcpServer;
+class QTcpSocket;
 class QCloseEvent;
 class RSSImp;
 class QShortcut;
@@ -52,7 +47,6 @@ class QTabWidget;
 class QLabel;
 class QModelIndex;
 class HttpServer;
-class QFrame;

 class GUI : public QMainWindow, private Ui::MainWindow{
  Q_OBJECT
@@ -76,22 +70,12 @@ class GUI : public QMainWindow, private Ui::MainWindow{
    bool force_exit;
    unsigned int refreshInterval;
    QTimer *refresher;
-    QLabel *dlSpeedLbl;
-    QLabel *upSpeedLbl;
-    QLabel *ratioLbl;
-    QLabel *DHTLbl;
-    QFrame *statusSep1;
-    QFrame *statusSep2;
-    QFrame *statusSep3;
-    QFrame *statusSep4;
    // Keyboard shortcuts
    QShortcut *switchSearchShortcut;
    QShortcut *switchSearchShortcut2;
    QShortcut *switchDownShortcut;
    QShortcut *switchUpShortcut;
    QShortcut *switchRSSShortcut;
-    QAction *prioSeparator;
-    QAction *prioSeparator2;
    // Search
    SearchEngine *searchEngine;
    // RSS
@@ -99,13 +83,8 @@ class GUI : public QMainWindow, private Ui::MainWindow{
    // Web UI
    HttpServer *httpServer;
    // Misc
-#ifdef QT_4_4
-    QLocalServer *localServer;
-    QLocalSocket *clientConnection;
-#else
-    QTcpServer *localServer;
+    QTcpServer *tcpServer;
    QTcpSocket *clientConnection;
-#endif

  protected slots:
    // GUI related slots
@@ -127,8 +106,6 @@ class GUI : public QMainWindow, private Ui::MainWindow{
    void readSettings();
    void on_actionExit_triggered();
    void createTrayIcon();
-    void updateUnfinishedTorrentNumberCalc();
-    void updateFinishedTorrentNumberCalc();
    void updateUnfinishedTorrentNumber(unsigned int nb);
    void updateFinishedTorrentNumber(unsigned int nb);
    void fullDiskError(QTorrentHandle& h) const;
@@ -167,8 +144,6 @@ class GUI : public QMainWindow, private Ui::MainWindow{
    void updateLists();
    bool initWebUi(QString username, QString password, int port);
    void pauseTorrent(QString hash);
-    void on_actionIncreasePriority_triggered();
-    void on_actionDecreasePriority_triggered();
    // Options slots
    void on_actionOptions_triggered();
    void OptionsSaved(QString info, bool deleteOptions);
@@ -185,8 +160,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{

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

  public:
    // Construct / Destruct
--- a/src/Icons/gnome-shutdown.png
+++ b/src/Icons/gnome-shutdown.png
--- a/src/Icons/qBittorrent.desktop
+++ b/src/Icons/qBittorrent.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
-Categories=Qt;Network;P2P
-Comment=V1.2.0
-Exec=qbittorrent %f
+Categories=Qt;Application;Network;P2P
+Comment=V1.1.0
+Exec=qbittorrent
 GenericName=Bittorrent client
 GenericName[bg]=Торент клиент
 GenericName[de]=Bittorren Client
@@ -19,7 +19,7 @@ GenericName[tr]=Bittorrent istemcisi
 GenericName[uk]=Bittorrent-клієнт
 GenericName[zh]=Bittorrent之用户
 Icon=qbittorrent
-MimeType=application/x-bittorrent;
+MimeType=application/x-bittorrent
 Name=qBittorrent
 Name[ko]=큐비토런트
 Terminal=false
--- a/src/Icons/skin/connected.png
+++ b/src/Icons/skin/connected.png
--- a/src/Icons/skin/decrease.png
+++ b/src/Icons/skin/decrease.png
--- a/src/Icons/skin/disconnected.png
+++ b/src/Icons/skin/disconnected.png
--- a/src/Icons/skin/firewalled.png
+++ b/src/Icons/skin/firewalled.png
--- a/src/Icons/skin/increase.png
+++ b/src/Icons/skin/increase.png
--- a/src/Icons/skin/queued.png
+++ b/src/Icons/skin/queued.png
--- a/src/Icons/smile.png
+++ b/src/Icons/smile.png
--- a/src/Icons/splash.png
+++ b/src/Icons/splash.png
--- a/src/Icons/stare.png
+++ b/src/Icons/stare.png
--- a/src/Icons/unhappy.png
+++ b/src/Icons/unhappy.png
--- a/src/MainWindow.ui
+++ b/src/MainWindow.ui
@@ -5,7 +5,7 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>914</width>
+    <width>849</width>
    <height>563</height>
   </rect>
  </property>
@@ -16,14 +16,202 @@
   <string/>
  </property>
  <widget class="QWidget" name="centralwidget" >
-   <layout class="QVBoxLayout" />
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>58</y>
+     <width>849</width>
+     <height>505</height>
+    </rect>
+   </property>
+   <layout class="QVBoxLayout" name="verticalLayout" >
+    <item>
+     <layout class="QHBoxLayout" name="_3" >
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <property name="margin" >
+       <number>0</number>
+      </property>
+      <item>
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0" >
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QLabel" name="lbl_DLSpeed_2" >
+        <property name="text" >
+         <string>Total DL Speed:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLCDNumber" name="LCD_DownSpeed" >
+        <property name="autoFillBackground" >
+         <bool>true</bool>
+        </property>
+        <property name="frameShadow" >
+         <enum>QFrame::Raised</enum>
+        </property>
+        <property name="smallDecimalPoint" >
+         <bool>false</bool>
+        </property>
+        <property name="numDigits" >
+         <number>6</number>
+        </property>
+        <property name="segmentStyle" >
+         <enum>QLCDNumber::Flat</enum>
+        </property>
+        <property name="value" stdset="0" >
+         <double>0.000000000000000</double>
+        </property>
+        <property name="intValue" stdset="0" >
+         <number>0</number>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="unitDL_2" >
+        <property name="text" >
+         <string>KiB/s</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0" >
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QLabel" name="label_2" >
+        <property name="text" >
+         <string>Session ratio: </string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLCDNumber" name="LCD_Ratio" >
+        <property name="autoFillBackground" >
+         <bool>true</bool>
+        </property>
+        <property name="numDigits" >
+         <number>4</number>
+        </property>
+        <property name="segmentStyle" >
+         <enum>QLCDNumber::Flat</enum>
+        </property>
+        <property name="value" stdset="0" >
+         <double>1.000000000000000</double>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="lbl_ratio_icon" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0" >
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QLabel" name="lbl_UPSpeed_2" >
+        <property name="text" >
+         <string>Total UP Speed:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLCDNumber" name="LCD_UpSpeed" >
+        <property name="autoFillBackground" >
+         <bool>true</bool>
+        </property>
+        <property name="smallDecimalPoint" >
+         <bool>false</bool>
+        </property>
+        <property name="numDigits" >
+         <number>6</number>
+        </property>
+        <property name="segmentStyle" >
+         <enum>QLCDNumber::Flat</enum>
+        </property>
+        <property name="value" stdset="0" >
+         <double>0.000000000000000</double>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="unitUP_2" >
+        <property name="text" >
+         <string>KiB/s</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0" >
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </item>
+   </layout>
  </widget>
  <widget class="QMenuBar" name="menubar" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-     <width>914</width>
+     <width>849</width>
     <height>26</height>
    </rect>
   </property>
@@ -41,8 +229,6 @@
    <addaction name="separator" />
    <addaction name="actionDelete" />
    <addaction name="actionDelete_Permanently" />
-    <addaction name="actionDecreasePriority" />
-    <addaction name="actionIncreasePriority" />
   </widget>
   <widget class="QMenu" name="menu_Help" >
    <property name="title" >
@@ -77,6 +263,14 @@
   <property name="enabled" >
    <bool>true</bool>
   </property>
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>26</y>
+     <width>849</width>
+     <height>32</height>
+    </rect>
+   </property>
   <property name="contextMenuPolicy" >
    <enum>Qt::NoContextMenu</enum>
   </property>
@@ -92,9 +286,6 @@
     <height>32</height>
    </size>
   </property>
-   <property name="floatable" >
-    <bool>false</bool>
-   </property>
   <attribute name="toolBarArea" >
    <enum>TopToolBarArea</enum>
   </attribute>
@@ -116,13 +307,9 @@
   <addaction name="actionPause_All" />
   <addaction name="separator" />
   <addaction name="actionOptions" />
-   <addaction name="actionDecreasePriority" />
-   <addaction name="actionIncreasePriority" />
-   <addaction name="separator" />
   <addaction name="actionExit" />
   <addaction name="separator" />
  </widget>
-  <widget class="QStatusBar" name="statusBar" />
  <action name="actionOpen" >
   <property name="text" >
    <string>Open</string>
@@ -233,31 +420,7 @@
    <string>Set global upload limit</string>
   </property>
  </action>
-  <action name="actionDecreasePriority" >
-   <property name="icon" >
-    <iconset resource="icons.qrc" >:/Icons/skin/decrease.png</iconset>
-   </property>
-   <property name="text" >
-    <string>Decrease priority</string>
-   </property>
-   <property name="visible" >
-    <bool>false</bool>
-   </property>
-  </action>
-  <action name="actionIncreasePriority" >
-   <property name="icon" >
-    <iconset resource="icons.qrc" >:/Icons/skin/increase.png</iconset>
-   </property>
-   <property name="text" >
-    <string>Increase priority</string>
-   </property>
-   <property name="visible" >
-    <bool>false</bool>
-   </property>
-  </action>
 </widget>
- <resources>
-  <include location="icons.qrc" />
- </resources>
+ <resources/>
 <connections/>
 </ui>
--- a/src/SearchTab.cpp
+++ b/src/SearchTab.cpp
@@ -1,189 +0,0 @@
-/*
- * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2006  Christophe Dumez
- *
- * 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.
- *
- * Contact : chris@qbittorrent.org
- */
-
-#include <QDir>
-#include <QTreeView>
-#include <QStandardItemModel>
-#include <QHeaderView>
-#include <QSettings>
-
-#include "SearchTab.h"
-#include "SearchListDelegate.h"
-#include "misc.h"
-#include "searchEngine.h"
-
-#define SEARCH_NAME 0
-#define SEARCH_SIZE 1
-#define SEARCH_SEEDERS 2
-#define SEARCH_LEECHERS 3
-#define SEARCH_ENGINE 4
-
-SearchTab::SearchTab(SearchEngine *parent) : QWidget()
-{
-    box=new QVBoxLayout();
-    results_lbl=new QLabel();
-    resultsBrowser = new QTreeView();
-    resultsBrowser->setSelectionMode(QAbstractItemView::ExtendedSelection);
-    box->addWidget(results_lbl);
-    box->addWidget(resultsBrowser);
-    
-    setLayout(box);
-    // Set Search results list model
-    SearchListModel = new QStandardItemModel(0,5);
-    SearchListModel->setHeaderData(SEARCH_NAME, Qt::Horizontal, tr("Name", "i.e: file name"));
-    SearchListModel->setHeaderData(SEARCH_SIZE, Qt::Horizontal, tr("Size", "i.e: file size"));
-    SearchListModel->setHeaderData(SEARCH_SEEDERS, Qt::Horizontal, tr("Seeders", "i.e: Number of full sources"));
-    SearchListModel->setHeaderData(SEARCH_LEECHERS, Qt::Horizontal, tr("Leechers", "i.e: Number of partial sources"));
-    SearchListModel->setHeaderData(SEARCH_ENGINE, Qt::Horizontal, tr("Search engine"));
-    resultsBrowser->setModel(SearchListModel);
-    SearchDelegate = new SearchListDelegate();
-    resultsBrowser->setItemDelegate(SearchDelegate);
-    // Make search list header clickable for sorting
-    resultsBrowser->header()->setClickable(true);
-    resultsBrowser->header()->setSortIndicatorShown(true);
-    
-    // Connect signals to slots (search part)
-    connect(resultsBrowser, SIGNAL(doubleClicked(const QModelIndex&)), parent, SLOT(downloadSelectedItem(const QModelIndex&)));
-    connect(resultsBrowser->header(), SIGNAL(sectionPressed(int)), this, SLOT(sortSearchList(int)));
-    
-    // Load last columns width for search results list
-    if(!loadColWidthSearchList()){
-      resultsBrowser->header()->resizeSection(0, 275);
-    }
-}
-
-SearchTab::~SearchTab()
-{
-    saveColWidthSearchList();
-    delete resultsBrowser;
-    delete SearchListModel;
-    delete SearchDelegate;
-}
-
-QLabel* SearchTab::getCurrentLabel()
-{
-    return results_lbl;
-}
-
-QTreeView* SearchTab::getCurrentTreeView()
-{
-    return resultsBrowser;
-}
-
-QStandardItemModel* SearchTab::getCurrentSearchListModel()
-{
-    return SearchListModel;
-}
-
-// Set the color of a row in data model
-void SearchTab::setRowColor(int row, QString color){
-  for(int i=0; i<SearchListModel->columnCount(); ++i){
-    SearchListModel->setData(SearchListModel->index(row, i), QVariant(QColor(color)), Qt::ForegroundRole);
-  }
-}
-
-void SearchTab::sortSearchList(int index){
-  static Qt::SortOrder sortOrder = Qt::AscendingOrder;
-  if(resultsBrowser->header()->sortIndicatorSection() == index){
-      sortOrder = (sortOrder == Qt::DescendingOrder) ? Qt::AscendingOrder : Qt::DescendingOrder; ;
-  }
-  resultsBrowser->header()->setSortIndicator(index, sortOrder);
-  switch(index){
-    case SEEDERS:
-    case LEECHERS:
-    case SIZE:
-      sortSearchListInt(index, sortOrder);
-      break;
-    default:
-      sortSearchListString(index, sortOrder);
-  }
-}
-
-void SearchTab::sortSearchListInt(int index, Qt::SortOrder sortOrder){
-  QList<QPair<int, qlonglong> > lines;
-  // Insertion sorting
-  for(int i=0; i<SearchListModel->rowCount(); ++i){
-    misc::insertSort(lines, QPair<int,qlonglong>(i, SearchListModel->data(SearchListModel->index(i, index)).toLongLong()), sortOrder);
-  }
-  // Insert items in new model, in correct order
-  int nbRows_old = lines.size();
-  for(int row=0; row<lines.size(); ++row){
-    SearchListModel->insertRow(SearchListModel->rowCount());
-    int sourceRow = lines[row].first;
-    for(int col=0; col<5; ++col){
-      SearchListModel->setData(SearchListModel->index(nbRows_old+row, col), SearchListModel->data(SearchListModel->index(sourceRow, col)));
-      SearchListModel->setData(SearchListModel->index(nbRows_old+row, col), SearchListModel->data(SearchListModel->index(sourceRow, col), Qt::ForegroundRole), Qt::ForegroundRole);
-    }
-  }
-  // Remove old rows
-  SearchListModel->removeRows(0, nbRows_old);
-}
-
-void SearchTab::sortSearchListString(int index, Qt::SortOrder sortOrder){
-  QList<QPair<int, QString> > lines;
-  // Insetion sorting
-  for(int i=0; i<SearchListModel->rowCount(); ++i){
-    misc::insertSortString(lines, QPair<int, QString>(i, SearchListModel->data(SearchListModel->index(i, index)).toString()), sortOrder);
-  }
-  // Insert items in new model, in correct order
-  int nbRows_old = lines.size();
-  for(int row=0; row<nbRows_old; ++row){
-    SearchListModel->insertRow(SearchListModel->rowCount());
-    int sourceRow = lines[row].first;
-    for(int col=0; col<5; ++col){
-      SearchListModel->setData(SearchListModel->index(nbRows_old+row, col), SearchListModel->data(SearchListModel->index(sourceRow, col)));
-      SearchListModel->setData(SearchListModel->index(nbRows_old+row, col), SearchListModel->data(SearchListModel->index(sourceRow, col), Qt::ForegroundRole), Qt::ForegroundRole);
-    }
-  }
-  // Remove old rows
-  SearchListModel->removeRows(0, nbRows_old);
-}
-
-// Save columns width in a file to remember them
-// (download list)
-void SearchTab::saveColWidthSearchList() const{
-  qDebug("Saving columns width in search list");
-  QSettings settings("qBittorrent", "qBittorrent");
-  QStringList width_list;
-  for(int i=0; i<SearchListModel->columnCount(); ++i){
-    width_list << misc::toQString(resultsBrowser->columnWidth(i));
-  }
-  settings.setValue("SearchListColsWidth", width_list.join(" "));
-  qDebug("Search list columns width saved");
-}
-
-// Load columns width in a file that were saved previously
-// (search list)
-bool SearchTab::loadColWidthSearchList(){
-  qDebug("Loading columns width for search list");
-  QSettings settings("qBittorrent", "qBittorrent");
-  QString line = settings.value("SearchListColsWidth", QString()).toString();
-  if(line.isEmpty())
-    return false;
-  QStringList width_list = line.split(' ');
-  if(width_list.size() != SearchListModel->columnCount())
-    return false;
-  for(int i=0; i<width_list.size(); ++i){
-        resultsBrowser->header()->resizeSection(i, width_list.at(i).toInt());
-  }
-  qDebug("Search list columns width loaded");
-  return true;
-}
--- a/src/SearchTab.h
+++ b/src/SearchTab.h
@@ -1,59 +0,0 @@
-/*
- * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2006  Christophe Dumez
- *
- * 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.
- *
- * Contact : chris@qbittorrent.org
- */
-
-#ifndef SEARCH_TAB_H
-#define SEARCH_TAB_H
-
-#include "ui_search.h"
-
-class SearchListDelegate;
-class SearchEngine;
-class QTreeView;
-class QStandardItemModel;
-
-class SearchTab : public QWidget, public Ui::search_engine
-{
-    Q_OBJECT
-            
-    private:
-        QVBoxLayout *box;
-        QLabel *results_lbl;
-        QTreeView *resultsBrowser;
-        QStandardItemModel *SearchListModel;
-        SearchListDelegate *SearchDelegate;
-    public:
-        SearchTab(SearchEngine *parent);
-        ~SearchTab();
-        bool loadColWidthSearchList();
-        QLabel * getCurrentLabel();
-        QStandardItemModel * getCurrentSearchListModel();
-        QTreeView * getCurrentTreeView();
-        void setRowColor(int row, QString color);
-    protected slots:
-        void sortSearchList(int index);
-        void sortSearchListInt(int index, Qt::SortOrder sortOrder);
-        void sortSearchListString(int index, Qt::SortOrder sortOrder);
-        void saveColWidthSearchList() const;
-        
-};
-
-#endif
-
--- a/src/about_imp.h
+++ b/src/about_imp.h
@@ -44,7 +44,7 @@ class about : public QDialog, private Ui::AboutDlg{
      // Thanks
      te_thanks->append(QString::fromUtf8("<a name='top'></a>"));
      te_thanks->append(QString::fromUtf8("<ul><li>I would like to thank sourceforge.net for hosting qBittorrent project.</li>"));
-      te_thanks->append(QString::fromUtf8("<li>I am happy that Ishan Arora and Arnaud Demaizière are contributing to the project as developers. Their help is greatly appreciated</li>"));
+      te_thanks->append(QString::fromUtf8("<li>I am happy that Arnaud Demaizière is contributing to the project as a developer. His help is greatly appreciated</li>"));
      te_thanks->append(QString::fromUtf8("<li>I also want to thank Jeffery Fernandez (jeffery@qbittorrent.org), project consultant, RPM packager, for his help and support.</li>"));
      te_thanks->append(QString::fromUtf8("<li>I am grateful to Peter Koeleman (peter@qbittorrent.org) who is helping port qBittorrent to Windows.</li>"));
      te_thanks->append(QString::fromUtf8("<li>Thanks a lot to our graphist Mateusz Toboła (tobejodok@qbittorrent.org) for his great work.</li></ul><br><br>"));
@@ -56,13 +56,13 @@ class about : public QDialog, private Ui::AboutDlg{
          "<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> Gekko Dam Beer (gekko04@users.sourceforge.net)<br>\
-          - <u>Chinese (Simplified):</u> Guo Yue (yue.guo0418@gmail.com)<br>\
+          - <u>Chinese (Simplified):</u> Guo Yue (guoyue0418@hotmail.com)<br>\
          - <u>Danish:</u> Mathias Nielsen (comoneo@gmail.com)<br>\
-          - <u>Dutch:</u> Joost Schipper (heavyjoost@users.sourceforge.net) and Peter Koeleman (peter@peerweb.nl)<br>\
+          - <u>Dutch:</u> Joost Schipper (heavyjoost@users.sourceforge.net)<br>\
          - <u>Finnish:</u> Niklas Laxström (nikerabbit@users.sourceforge.net)<br>\
          - <u>German:</u> Niels Hoffmann (zentralmaschine@users.sourceforge.net)<br>\
          - <u>Greek:</u> Tsvetan Bankov (emerge_life@users.sourceforge.net)<br>\
-          - <u>Hungarian:</u> Majoros Péter (majoros.peterj@gmail.com)<br>\
+          - <u>Hungarian:</u> Majoros Péter (majoros.j.p@t-online.hu)<br>\
          - <u>Italian:</u> Mirko Ferrari (mirkoferrari@gmail.com) and Ferraro Luciano (luciano.ferraro@gmail.com)<br>\
          - <u>Japanese:</u> Nardog (nardog@e2umail.com)<br>\
          - <u>Korean:</u> Jin Woo Sin (jin828sin@users.sourceforge.net)<br>\
@@ -70,9 +70,9 @@ class about : public QDialog, private Ui::AboutDlg{
          - <u>Polish:</u> Jarek Smieja (ajep9691@wp.pl)<br>\
          - <u>Portuguese:</u> Nick Marinho (nickmarinho@gmail.com)<br>\
          - <u>Romanian:</u> Obada Denis (obadadenis@users.sourceforge.net)<br>\
-          - <u>Russian:</u> Nick Khazov (m2k3d0n@users.sourceforge.net) and Alexey Morsov (samurai@ricom.ru)<br>\
+          - <u>Russian:</u> Nick Khazov (m2k3d0n at users.sourceforge.net)<br>\
          - <u>Slovak:</u>  helix84<br>\
-          - <u>Spanish:</u> Vicente Raul Plata Fonseca (silverxnt@users.sourceforge.net) and Gabriel de Oliveira (deadloop@hotmail.com)<br>\
+          - <u>Spanish:</u> Vicente Raul Plata Fonseca (silverxnt@users.sourceforge.net)<br>\
          - <u>Swedish:</u> Daniel Nylander (po@danielnylander.se)<br>\
          - <u>Turkish:</u> Erdem Bingöl (erdem84@gmail.com)<br>\
          - <u>Ukrainian:</u> Andrey Shpachenko (masterfix@users.sourceforge.net)<br><br>"));
--- a/src/arborescence.h
+++ b/src/arborescence.h
@@ -234,7 +234,7 @@ class arborescence {
    void addFile(QString path, size_type file_size, int index, float progress=0., int priority=1) {
      Q_ASSERT(root->isDir());
      path = QDir::cleanPath(path);
-      //Q_ASSERT(path.startsWith(root->path()));
+      Q_ASSERT(path.startsWith(root->path()));
      QString relative_path = path.remove(0, root->path().size());
      if(relative_path.at(0) ==QDir::separator())
        relative_path.remove(0, 1);
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -43,7 +43,7 @@
 #define MAX_TRACKER_ERRORS 2

 // Main constructor
-bittorrent::bittorrent() : timerScan(0), DHTEnabled(false), preAllocateAll(false), addInPause(false), maxConnecsPerTorrent(500), maxUploadsPerTorrent(4), max_ratio(-1), UPnPEnabled(false), NATPMPEnabled(false), LSDEnabled(false), folderScanInterval(5), queueingEnabled(false), calculateETA(true) {
+bittorrent::bittorrent() : timerScan(0), DHTEnabled(false), preAllocateAll(false), addInPause(false), maxConnecsPerTorrent(500), maxUploadsPerTorrent(4), max_ratio(-1), UPnPEnabled(false), NATPMPEnabled(false), LSDEnabled(false), folderScanInterval(5) {
  // To avoid some exceptions
  fs::path::default_name_check(fs::no_check);
  // Creating bittorrent session
@@ -72,10 +72,6 @@ bittorrent::bittorrent() : timerScan(0), DHTEnabled(false), preAllocateAll(false
  deleter = new deleteThread(this);
  BigRatioTimer = 0;
  filterParser = 0;
-  downloadQueue = 0;
-  queuedDownloads = 0;
-  uploadQueue = 0;
-  queuedUploads = 0;
  qDebug("* BTSession constructed");
 }

@@ -102,16 +98,6 @@ bittorrent::~bittorrent() {
  if(filterParser != 0)
    delete filterParser;
  delete downloader;
-  if(queueingEnabled) {
-    Q_ASSERT(downloadQueue);
-    delete downloadQueue;
-    Q_ASSERT(queuedDownloads);
-    delete queuedDownloads;
-    Q_ASSERT(uploadQueue);
-    delete uploadQueue;
-    Q_ASSERT(queuedUploads);
-    delete queuedUploads;
-  }
  // Delete BT session
  qDebug("Deleting session");
  delete s;
@@ -154,24 +140,6 @@ void bittorrent::deleteBigRatios() {
  }
 }

-void bittorrent::setETACalculation(bool enable) {
-  if(calculateETA != enable) {
-    calculateETA = enable;
-    if(calculateETA) {
-      foreach(QString hash, unfinishedTorrents) {
-        QTorrentHandle h = getTorrentHandle(hash);
-        if(!h.is_paused()) {
-          TorrentsStartData[hash] = h.total_payload_download();
-          TorrentsStartTime[hash] = QDateTime::currentDateTime();
-        }
-      }
-    } else {
-      TorrentsStartData.clear();
-      TorrentsStartTime.clear();
-    }
-  }
-}
-
 void bittorrent::setDownloadLimit(QString hash, long val) {
  QTorrentHandle h = getTorrentHandle(hash);
  if(h.is_valid())
@@ -179,115 +147,6 @@ void bittorrent::setDownloadLimit(QString hash, long val) {
  saveTorrentSpeedLimits(hash);
 }

-bool bittorrent::isQueueingEnabled() const {
-  return queueingEnabled;
-}
-
-void bittorrent::setMaxActiveDownloads(int val) {
-  if(val != maxActiveDownloads) {
-    maxActiveDownloads = val;
-    if(queueingEnabled) {
-      updateDownloadQueue();
-      updateUploadQueue();
-    }
-  }
-}
-
-void bittorrent::setMaxActiveTorrents(int val) {
-  if(val != maxActiveTorrents) {
-    maxActiveTorrents = val;
-    if(queueingEnabled) {
-      updateDownloadQueue();
-      updateUploadQueue();
-    }
-  }
-}
-
-void bittorrent::increaseDlTorrentPriority(QString hash) {
-  Q_ASSERT(queueingEnabled);
-  int index = downloadQueue->indexOf(hash);
-  Q_ASSERT(index != -1);
-  if(index > 0) {
-    downloadQueue->swap(index-1, index);
-    saveTorrentPriority(hash, index-1);
-    saveTorrentPriority(downloadQueue->at(index), index);
-    updateDownloadQueue();
-  }
-}
-
-void bittorrent::increaseUpTorrentPriority(QString hash) {
-  Q_ASSERT(queueingEnabled);
-  int index = uploadQueue->indexOf(hash);
-  Q_ASSERT(index != -1);
-  if(index > 0) {
-    uploadQueue->swap(index-1, index);
-    saveTorrentPriority(hash, index-1);
-    saveTorrentPriority(uploadQueue->at(index), index);
-    updateUploadQueue();
-  }
-}
-
-void bittorrent::decreaseDlTorrentPriority(QString hash) {
-  Q_ASSERT(queueingEnabled);
-  int index = downloadQueue->indexOf(hash);
-  Q_ASSERT(index != -1);
-  if(index >= 0 && index < (downloadQueue->size()-1)) {
-    downloadQueue->swap(index+1, index);
-    saveTorrentPriority(hash, index+1);
-    saveTorrentPriority(downloadQueue->at(index), index);
-    updateDownloadQueue();
-  }
-}
-
-void bittorrent::decreaseUpTorrentPriority(QString hash) {
-  Q_ASSERT(queueingEnabled);
-  int index = uploadQueue->indexOf(hash);
-  Q_ASSERT(index != -1);
-  if(index >= 0 && index < (uploadQueue->size()-1)) {
-    uploadQueue->swap(index+1, index);
-    saveTorrentPriority(hash, index+1);
-    saveTorrentPriority(uploadQueue->at(index), index);
-    updateUploadQueue();
-  }
-}
-
-void bittorrent::saveTorrentPriority(QString hash, int prio) {
-  // Write .queued file
-  QFile prio_file(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".prio");
-  prio_file.open(QIODevice::WriteOnly | QIODevice::Text);
-  prio_file.write(QByteArray::number(prio));
-  prio_file.close();
-}
-
-int bittorrent::loadTorrentPriority(QString hash) {
-  if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".prio")) {
-    // Read .queued file
-    QFile prio_file(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".prio");
-    if(!prio_file.exists()) {
-      return -1;
-    }
-    prio_file.open(QIODevice::ReadOnly | QIODevice::Text);
-    bool ok = false;
-    int prio = prio_file.readAll().toInt(&ok);
-    prio_file.close();
-    if(!ok) {
-      return -1;
-    }
-    return prio;
-  }
-  return -1;
-}
-
-bool bittorrent::isDownloadQueued(QString hash) const {
-  Q_ASSERT(queueingEnabled);
-  return queuedDownloads->contains(hash);
-}
-
-bool bittorrent::isUploadQueued(QString hash) const {
-  Q_ASSERT(queueingEnabled);
-  return queuedUploads->contains(hash);
-}
-
 void bittorrent::setUploadLimit(QString hash, long val) {
  qDebug("Set upload limit rate to %ld", val);
  QTorrentHandle h = getTorrentHandle(hash);
@@ -296,14 +155,6 @@ void bittorrent::setUploadLimit(QString hash, long val) {
  saveTorrentSpeedLimits(hash);
 }

-int bittorrent::getMaximumActiveDownloads() const {
-  return maxActiveDownloads;
-}
-
-int bittorrent::getMaximumActiveTorrents() const {
-  return maxActiveTorrents;
-}
-
 void bittorrent::handleDownloadFailure(QString url, QString reason) {
  emit downloadFromUrlFailure(url, reason);
 }
@@ -312,226 +163,9 @@ void bittorrent::startTorrentsInPause(bool b) {
  addInPause = b;
 }

-void bittorrent::setQueueingEnabled(bool enable) {
-  if(queueingEnabled != enable) {
-    queueingEnabled = enable;
-    if(enable) {
-      // Load priorities
-      QList<QPair<int, QString> > tmp_list;
-      QStringList noprio;
-      QStringList unfinished = getUnfinishedTorrents();
-      foreach(QString hash, unfinished) {
-        int prio = loadTorrentPriority(hash);
-        if(prio != -1) {
-          misc::insertSort2<QString>(tmp_list, QPair<int,QString>(prio,hash), Qt::AscendingOrder);
-        } else {
-          noprio << hash;
-        }
-      }
-      downloadQueue = new QStringList();
-      QPair<int,QString> couple;
-      foreach(couple, tmp_list) {
-        downloadQueue->append(couple.second);
-      }
-      (*downloadQueue)<<noprio;
-      // save priorities
-      int i=0;
-      foreach(QString hash, *downloadQueue) {
-        saveTorrentPriority(hash, i);
-        ++i;
-      }
-      queuedDownloads = new QStringList();
-      updateDownloadQueue();
-      QList<QPair<int, QString> > tmp_list2;
-      QStringList noprio2;
-      QStringList finished = getFinishedTorrents();
-      foreach(QString hash, finished) {
-        int prio = loadTorrentPriority(hash);
-        if(prio != -1) {
-          misc::insertSort2<QString>(tmp_list2, QPair<int,QString>(prio,hash), Qt::AscendingOrder);
-        } else {
-          noprio2 << hash;
-        }
-      }
-      uploadQueue = new QStringList();
-      QPair<int,QString> couple2;
-      foreach(couple2, tmp_list2) {
-        uploadQueue->append(couple2.second);
-      }
-      (*uploadQueue)<<noprio;
-      // save priorities
-      int j=0;
-      foreach(QString hash, *uploadQueue) {
-        saveTorrentPriority(hash, j);
-        ++j;
-      }
-      queuedUploads = new QStringList();
-      updateUploadQueue();
-    } else {
-      // Unqueue torrents
-      foreach(QString hash, *queuedDownloads) {
-        QTorrentHandle h = getTorrentHandle(hash);
-        h.resume();
-        if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued")) {
-          QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued");
-        }
-        if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".prio")) {
-          QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".prio");
-        }
-      }
-      foreach(QString hash, *queuedUploads) {
-        QTorrentHandle h = getTorrentHandle(hash);
-        h.resume();
-        if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued")) {
-          QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued");
-        }
-        if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".prio")) {
-          QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".prio");
-        }
-      }
-      delete downloadQueue;
-      downloadQueue = 0;
-      delete queuedDownloads;
-      queuedDownloads = 0;
-      delete uploadQueue;
-      uploadQueue = 0;
-      delete queuedUploads;
-      queuedUploads = 0;
-    }
-  }
-}
-
-int bittorrent::getDlTorrentPriority(QString hash) const {
-  Q_ASSERT(downloadQueue != 0);
-  return downloadQueue->indexOf(hash);
-}
-
-int bittorrent::getUpTorrentPriority(QString hash) const {
-  Q_ASSERT(uploadQueue != 0);
-  return uploadQueue->indexOf(hash);
-}
-
-void bittorrent::updateUploadQueue() {
-  Q_ASSERT(queueingEnabled);
-  bool change = false;
-  int maxActiveUploads = maxActiveTorrents - currentActiveDownloads;
-  int currentActiveUploads = 0;
-  // Check if it is necessary to queue uploads
-  foreach(QString hash, *uploadQueue) {
-    QTorrentHandle h = getTorrentHandle(hash);
-    if(!h.is_paused()) {
-      if(currentActiveUploads < maxActiveUploads) {
-        ++currentActiveUploads;
-      } else {
-        // Queue it
-        h.pause();
-        change = true;
-        if(!queuedUploads->contains(hash)) {
-          queuedUploads->append(hash);
-          // Create .queued file
-          if(!QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued")) {
-            QFile queued_file(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued");
-            queued_file.open(QIODevice::WriteOnly | QIODevice::Text);
-            queued_file.close();
-          }
-        }
-      }
-    } else {
-      if(currentActiveUploads < maxActiveUploads && isUploadQueued(hash)) {
-        QTorrentHandle h = getTorrentHandle(hash);
-        h.resume();
-        change = true;
-        queuedUploads->removeAll(hash);
-        QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued");
-        ++currentActiveUploads;
-      }
-    }
-  }
-  if(currentActiveUploads < maxActiveUploads) {
-    // Could not fill download slots, unqueue torrents
-    foreach(QString hash, *uploadQueue) {
-      if(uploadQueue->size() != 0 && currentActiveUploads < maxActiveUploads) {
-        if(queuedUploads->contains(hash)) {
-          QTorrentHandle h = getTorrentHandle(hash);
-          h.resume();
-          change = true;
-          queuedUploads->removeAll(hash);
-          QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued");
-          ++currentActiveUploads;
-        }
-      } else {
-        break;
-      }
-    }
-  }
-  if(change) {
-    emit updateFinishedTorrentNumber();
-    emit forceFinishedListUpdate();
-  }
-}
-
-void bittorrent::updateDownloadQueue() {
-  Q_ASSERT(queueingEnabled);
-  bool change = false;
-  currentActiveDownloads = 0;
-  // Check if it is necessary to queue torrents
-  foreach(QString hash, *downloadQueue) {
-    QTorrentHandle h = getTorrentHandle(hash);
-    if(!h.is_paused()) {
-      if(currentActiveDownloads < maxActiveDownloads) {
-        ++currentActiveDownloads;
-      } else {
-        // Queue it
-        h.pause();
-        change = true;
-        if(!queuedDownloads->contains(hash)) {
-          queuedDownloads->append(hash);
-          // Create .queued file
-          if(!QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued")) {
-            QFile queued_file(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued");
-            queued_file.open(QIODevice::WriteOnly | QIODevice::Text);
-            queued_file.close();
-          }
-        }
-      }
-    } else {
-      if(currentActiveDownloads < maxActiveDownloads && isDownloadQueued(hash)) {
-        QTorrentHandle h = getTorrentHandle(hash);
-        h.resume();
-        change = true;
-        queuedDownloads->removeAll(hash);
-        QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued");
-        ++currentActiveDownloads;
-      }
-    }
-  }
-  if(currentActiveDownloads < maxActiveDownloads) {
-    // Could not fill download slots, unqueue torrents
-    foreach(QString hash, *downloadQueue) {
-      if(downloadQueue->size() != 0 && currentActiveDownloads < maxActiveDownloads) {
-        if(queuedDownloads->contains(hash)) {
-          QTorrentHandle h = getTorrentHandle(hash);
-          h.resume();
-          change = true;
-          queuedDownloads->removeAll(hash);
-          QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued");
-          ++currentActiveDownloads;
-        }
-      } else {
-        break;
-      }
-    }
-  }
-  if(change) {
-    emit updateUnfinishedTorrentNumber();
-    emit forceUnfinishedListUpdate();
-  }
-}
-
 // Calculate the ETA using GASA
 // GASA: global Average Speed Algorithm
 qlonglong bittorrent::getETA(QString hash) const {
-  Q_ASSERT(calculateETA);
  QTorrentHandle h = getTorrentHandle(hash);
  if(!h.is_valid()) return -1;
  switch(h.state()) {
@@ -624,10 +258,8 @@ void bittorrent::deleteTorrent(QString hash, bool permanent) {
    torrentBackup.remove(file);
  }
  // Remove it from TorrentsStartTime hash table
-  if(calculateETA) {
-    TorrentsStartTime.remove(hash);
-    TorrentsStartData.remove(hash);
-  }
+  TorrentsStartTime.remove(hash);
+  TorrentsStartData.remove(hash);
  // Remove tracker errors
  trackersErrors.remove(hash);
  // Remove it from ratio table
@@ -643,23 +275,6 @@ void bittorrent::deleteTorrent(QString hash, bool permanent) {
      std::cerr << "Error: Torrent " << hash.toStdString() << " is neither in finished or unfinished list\n";
    }
  }
-  // Remove it from downloadQueue or UploadQueue
-  if(queueingEnabled) {
-    if(downloadQueue->contains(hash)) {
-      downloadQueue->removeAll(hash);
-      queuedDownloads->removeAll(hash);
-      updateDownloadQueue();
-    }
-    if(uploadQueue->contains(hash)) {
-      uploadQueue->removeAll(hash);
-      queuedUploads->removeAll(hash);
-      updateUploadQueue();
-    }
-  }
-  if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".prio"))
-    QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".prio");
-  if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued"))
-    QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued");
  if(permanent && files_arb != 0) {
    // Remove from Hard drive
    qDebug("Removing this on hard drive: %s", qPrintable(savePath+QDir::separator()+fileName));
@@ -694,28 +309,8 @@ void bittorrent::setUnfinishedTorrent(QString hash) {
  if(!unfinishedTorrents.contains(hash)) {
    unfinishedTorrents << hash;
    QTorrentHandle h = getTorrentHandle(hash);
-    if(calculateETA) {
-      TorrentsStartData[hash] = h.total_payload_download();
-      TorrentsStartTime[hash] = QDateTime::currentDateTime();
-    }
-  }
-  if(queueingEnabled) {
-    // Remove it from uploadQueue
-    if(uploadQueue->contains(hash)) {
-      uploadQueue->removeAll(hash);
-      queuedDownloads->removeAll(hash);
-      if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".prio"))
-        QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".prio");
-      if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued"))
-        QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued");
-      updateUploadQueue();
-    }
-    // Add it to downloadQueue
-    if(!downloadQueue->contains(hash)) {
-      downloadQueue->append(hash);
-      saveTorrentPriority(hash, downloadQueue->size()-1);
-      updateDownloadQueue();
-    }
+    TorrentsStartData[hash] = h.total_payload_download();
+    TorrentsStartTime[hash] = QDateTime::currentDateTime();
  }
 }

@@ -734,24 +329,8 @@ void bittorrent::setFinishedTorrent(QString hash) {
    unfinishedTorrents.removeAt(index);
  }
  // Remove it from TorrentsStartTime hash table
-  if(calculateETA) {
-    TorrentsStartTime.remove(hash);
-    TorrentsStartData.remove(hash);
-  }
-  // Remove it from  
-  if(queueingEnabled) {
-    downloadQueue->removeAll(hash);
-    queuedDownloads->removeAll(hash);
-    if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".prio"))
-      QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".prio");
-    if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued"))
-      QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued");
-    updateDownloadQueue();
-    if(!uploadQueue->contains(hash)) {
-      uploadQueue->append(hash);
-      updateUploadQueue();
-    }
-  }
+  TorrentsStartTime.remove(hash);
+  TorrentsStartData.remove(hash);
  // Save fast resume data
  saveFastResumeAndRatioData(hash);
 }
@@ -765,30 +344,13 @@ bool bittorrent::pauseTorrent(QString hash) {
    change = true;
    // Save fast resume data
    saveFastResumeAndRatioData(hash);
-    if(queueingEnabled) {
-      updateDownloadQueue();
-      updateUploadQueue();
-    }
    qDebug("Torrent paused successfully");
    emit pausedTorrent(hash);
  }else{
    if(!h.is_valid()) {
      qDebug("Could not pause torrent %s, reason: invalid", hash.toUtf8().data());
    }else{
-      if(queueingEnabled && (isDownloadQueued(hash)||isUploadQueued(hash))) {
-        // Remove it from queued list if present
-        if(queuedDownloads->contains(hash))
-          queuedDownloads->removeAll(hash);
-        if(queuedUploads->contains(hash))
-          queuedUploads->removeAll(hash);
-        if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued"))
-          QFile::remove(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".queued");
-        updateDownloadQueue();
-        updateUploadQueue();
-        change = true;
-      } else {
-        qDebug("Could not pause torrent %s, reason: already paused", hash.toUtf8().data());
-      }
+      qDebug("Could not pause torrent %s, reason: already paused", hash.toUtf8().data());
    }
  }
  // Create .paused file if necessary
@@ -798,10 +360,8 @@ bool bittorrent::pauseTorrent(QString hash) {
    paused_file.close();
  }
  // Remove it from TorrentsStartTime hash table
-  if(calculateETA) {
-    TorrentsStartTime.remove(hash);
-    TorrentsStartData.remove(hash);
-  }
+  TorrentsStartTime.remove(hash);
+  TorrentsStartData.remove(hash);
  return change;
 }

@@ -810,16 +370,12 @@ bool bittorrent::resumeTorrent(QString hash) {
  bool success = false;
  QTorrentHandle h = getTorrentHandle(hash);
  if(h.is_valid() && h.is_paused()) {
-    if(!(queueingEnabled && (isDownloadQueued(hash)||isUploadQueued(hash)))) {
-      // Save Addition DateTime
-      if(calculateETA) {
-        TorrentsStartData[hash] = h.total_payload_download();
-        TorrentsStartTime[hash] = QDateTime::currentDateTime();
-      }
-      h.resume();
-      success = true;
-      emit resumedTorrent(hash);
-    }
+    // Save Addition DateTime
+    TorrentsStartData[hash] = h.total_payload_download();
+    TorrentsStartTime[hash] = QDateTime::currentDateTime();
+    h.resume();
+    success = true;
+    emit resumedTorrent(hash);
  }
  // Delete .paused file
  if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".paused"))
@@ -829,10 +385,6 @@ bool bittorrent::resumeTorrent(QString hash) {
    torrentsToPauseAfterChecking.removeAt(index);
    success = true;
  }
-  if(queueingEnabled) {
-    updateDownloadQueue();
-    updateUploadQueue();
-  }
  return success;
 }

@@ -1005,19 +557,8 @@ void bittorrent::addTorrent(QString path, bool fromScanDir, QString from_url, bo
    h.resume();
    if(QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".finished")) {
      finishedTorrents << hash;
-      if(queueingEnabled) {
-        uploadQueue->append(hash);
-        saveTorrentPriority(hash, uploadQueue->size()-1);
-        updateUploadQueue();
-      }
    }else{
      unfinishedTorrents << hash;
-      // Add it to downloadQueue
-      if(queueingEnabled) {
-        downloadQueue->append(hash);
-        saveTorrentPriority(hash, downloadQueue->size()-1);
-        updateDownloadQueue();
-      }
    }
    // If download from url, remove temp file
    if(!from_url.isNull()) QFile::remove(file);
@@ -1745,10 +1286,8 @@ void bittorrent::readAlerts() {
          qDebug("%s was paused after checking", hash.toUtf8().data());
        } else {
          // Save Addition DateTime
-          if(calculateETA) {
-            TorrentsStartTime[hash] = QDateTime::currentDateTime();
-            TorrentsStartData[hash] = h.total_payload_download();
-          }
+          TorrentsStartTime[hash] = QDateTime::currentDateTime();
+          TorrentsStartData[hash] = h.total_payload_download();
        }
        emit torrentFinishedChecking(hash);
      }
--- a/src/bittorrent.h
+++ b/src/bittorrent.h
@@ -70,15 +70,6 @@ class bittorrent : public QObject{
    FilterParserThread *filterParser;
    QString filterPath;
    int folderScanInterval; // in seconds
-    bool queueingEnabled;
-    int maxActiveDownloads;
-    int maxActiveTorrents;
-    int currentActiveDownloads;
-    QStringList *downloadQueue;
-    QStringList *queuedDownloads;
-    QStringList *uploadQueue;
-    QStringList *queuedUploads;
-    bool calculateETA;

  protected:
    QString getSavePath(QString hash);
@@ -106,14 +97,6 @@ class bittorrent : public QObject{
    bool has_filtered_files(QString hash) const;
    unsigned int getFinishedPausedTorrentsNb() const;
    unsigned int getUnfinishedPausedTorrentsNb() const;
-    bool isQueueingEnabled() const;
-    int getDlTorrentPriority(QString hash) const;
-    int getUpTorrentPriority(QString hash) const;
-    int getMaximumActiveDownloads() const;
-    int getMaximumActiveTorrents() const;
-    bool isDownloadQueued(QString hash) const;
-    bool isUploadQueued(QString hash) const;
-    int loadTorrentPriority(QString hash);

  public slots:
    void addTorrent(QString path, bool fromScanDir = false, QString from_url = QString(), bool resumed = false);
@@ -133,7 +116,6 @@ class bittorrent : public QObject{
    void enablePeerExchange();
    void enableIPFilter(QString filter);
    void disableIPFilter();
-    void setQueueingEnabled(bool enable);
    void resumeUnfinishedTorrents();
    void saveTorrentSpeedLimits(QString hash);
    void loadTorrentSpeedLimits(QString hash);
@@ -141,13 +123,6 @@ class bittorrent : public QObject{
    void loadDownloadUploadForTorrent(QString hash);
    void handleDownloadFailure(QString url, QString reason);
    void loadWebSeeds(QString fileHash);
-    void updateDownloadQueue();
-    void updateUploadQueue();
-    void increaseDlTorrentPriority(QString hash);
-    void decreaseDlTorrentPriority(QString hash);
-    void increaseUpTorrentPriority(QString hash);
-    void decreaseUpTorrentPriority(QString hash);
-    void saveTorrentPriority(QString hash, int prio);
    // Session configuration - Setters
    void setListeningPortsRange(std::pair<unsigned short, unsigned short> ports);
    void setMaxConnections(int maxConnec);
@@ -174,9 +149,6 @@ class bittorrent : public QObject{
    bool enableDHT(bool b);
    void reloadTorrent(const QTorrentHandle &h, bool full_alloc);
    void setTimerScanInterval(int secs);
-    void setMaxActiveDownloads(int val);
-    void setMaxActiveTorrents(int val);
-    void setETACalculation(bool enable);

  protected slots:
    void scanDirectory();
@@ -210,10 +182,6 @@ class bittorrent : public QObject{
    void torrent_ratio_deleted(QString fileName);
    void UPnPError(QString msg);
    void UPnPSuccess(QString msg);
-    void updateFinishedTorrentNumber();
-    void updateUnfinishedTorrentNumber();
-    void forceUnfinishedListUpdate();
-    void forceFinishedListUpdate();
 };

 #endif
--- a/src/convertPOtoTS.py
+++ b/src/convertPOtoTS.py
@@ -0,0 +1,19 @@
+#!/usr/bin/python
+
+import os
+
+LANG_FOLDER = "lang/"
+PO_FOLDER = 'po_files'
+
+if __name__ == '__main__':
+  po_files = os.listdir(os.path.join(LANG_FOLDER, PO_FOLDER))
+  po_files = [x for x in po_files if os.path.splitext(x)[-1] == ".po"]
+  for file in po_files:
+    # First clean up the ts file
+    ts_file = os.path.join(LANG_FOLDER, os.path.splitext(file)[0]+'.ts')
+    po_file = os.path.join(LANG_FOLDER, PO_FOLDER, file)
+    if os.path.exists(ts_file):
+      os.remove(ts_file)
+    # Convert to PO
+    print "Converting %s..." % (po_file,)
+    os.system("po2ts %s -o %s" % (po_file, ts_file))
--- a/src/convertTStoPO.py
+++ b/src/convertTStoPO.py
@@ -0,0 +1,24 @@
+#!/usr/bin/python
+
+import os
+
+LANG_FOLDER = 'lang/'
+PO_FOLDER = 'po_files'
+
+if __name__ == '__main__':
+  ts_files = os.listdir(LANG_FOLDER)
+  ts_files = [x for x in ts_files if os.path.splitext(x)[-1] == ".ts"]
+  for file in ts_files:
+    # First clean up the po file
+    po_file = os.path.join(LANG_FOLDER, PO_FOLDER, os.path.splitext(file)[0]+'.po')
+    ts_file = os.path.join(LANG_FOLDER, file)
+    if os.path.exists(po_file):
+      os.remove(po_file)
+    # create po folder if it doesn't exist
+    if not os.path.exists(os.path.join(LANG_FOLDER, PO_FOLDER)):
+      os.mkdir(os.path.join(LANG_FOLDER, PO_FOLDER))
+    # Convert to PO
+    print "Converting %s..." % (ts_file,)
+    os.system("ts2po %s -o %s" % (ts_file, po_file))
+    # Making an archive
+    os.system("tar czf %s %s" % (os.path.join(LANG_FOLDER, PO_FOLDER)+'.tar.gz', os.path.join(LANG_FOLDER, PO_FOLDER)))
--- a/src/download.ui
+++ b/src/download.ui
@@ -18,16 +18,7 @@
     <property name="spacing" >
      <number>6</number>
     </property>
-     <property name="leftMargin" >
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
+     <property name="margin" >
      <number>0</number>
     </property>
     <item>
@@ -72,6 +63,14 @@
      <number>0</number>
     </property>
     <widget class="QWidget" name="log_tab" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>765</width>
+        <height>138</height>
+       </rect>
+      </property>
      <attribute name="title" >
       <string>Log</string>
      </attribute>
@@ -79,16 +78,7 @@
       <property name="spacing" >
        <number>6</number>
       </property>
-       <property name="leftMargin" >
-        <number>9</number>
-       </property>
-       <property name="topMargin" >
-        <number>9</number>
-       </property>
-       <property name="rightMargin" >
-        <number>9</number>
-       </property>
-       <property name="bottomMargin" >
+       <property name="margin" >
        <number>9</number>
       </property>
       <item>
@@ -113,6 +103,14 @@
      </layout>
     </widget>
     <widget class="QWidget" name="filter_tab" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>765</width>
+        <height>138</height>
+       </rect>
+      </property>
      <attribute name="title" >
       <string>IP filter</string>
      </attribute>
@@ -120,16 +118,7 @@
       <property name="spacing" >
        <number>6</number>
       </property>
-       <property name="leftMargin" >
-        <number>9</number>
-       </property>
-       <property name="topMargin" >
-        <number>9</number>
-       </property>
-       <property name="rightMargin" >
-        <number>9</number>
-       </property>
-       <property name="bottomMargin" >
+       <property name="margin" >
        <number>9</number>
       </property>
       <item>
@@ -194,7 +183,8 @@
  </action>
  <action name="actionOpen_destination_folder" >
   <property name="icon" >
-    <iconset resource="icons.qrc" >:/Icons/folder.png</iconset>
+    <iconset resource="icons.qrc" >
+     <normaloff>:/Icons/folder.png</normaloff>:/Icons/folder.png</iconset>
   </property>
   <property name="text" >
    <string>Open destination folder</string>
@@ -242,33 +232,15 @@
  </action>
  <action name="actionBuy_it" >
   <property name="icon" >
-    <iconset resource="icons.qrc" >:/Icons/money.png</iconset>
+    <iconset resource="icons.qrc" >
+     <normaloff>:/Icons/money.png</normaloff>:/Icons/money.png</iconset>
   </property>
   <property name="text" >
    <string>Buy it</string>
   </property>
  </action>
-  <action name="actionHOSColPriority" >
-   <property name="text" >
-    <string>Priority</string>
-   </property>
-  </action>
-  <action name="actionIncreasePriority" >
-   <property name="icon" >
-    <iconset resource="icons.qrc" >:/Icons/skin/increase.png</iconset>
-   </property>
-   <property name="text" >
-    <string>Increase priority</string>
-   </property>
-  </action>
-  <action name="actionDecreasePriority" >
-   <property name="icon" >
-    <iconset resource="icons.qrc" >:/Icons/skin/decrease.png</iconset>
-   </property>
-   <property name="text" >
-    <string>Decrease priority</string>
-   </property>
-  </action>
+  <zorder>tabBottom</zorder>
+  <zorder></zorder>
 </widget>
 <resources>
  <include location="icons.qrc" />
--- a/src/downloadThread.cpp
+++ b/src/downloadThread.cpp
@@ -24,8 +24,6 @@
 #include <QSettings>
 #include <stdio.h>

-#define MAX_THREADS 3
-
 // http://curl.rtin.bz/libcurl/c/libcurl-errors.html
 QString subDownloadThread::errorCodeToString(CURLcode status) {
  switch(status){
@@ -152,7 +150,9 @@ downloadThread::~downloadThread(){

 void downloadThread::downloadUrl(QString url){
  QMutexLocker locker(&mutex);
-  urls_queue.enqueue(url);
+  if(downloading_list.contains(url)) return;
+  url_list << url;
+  downloading_list << url;
  if(!isRunning()){
    start();
  }else{
@@ -165,8 +165,8 @@ void downloadThread::run(){
    if(abort)
      return;
    mutex.lock();
-    if(!urls_queue.empty() && subThreads.size() < MAX_THREADS){
-      QString url = urls_queue.dequeue();
+    if(url_list.size() != 0){
+      QString url = url_list.takeFirst();
      mutex.unlock();
      subDownloadThread *st = new subDownloadThread(0, url);
      subThreads << st;
@@ -187,9 +187,9 @@ void downloadThread::propagateDownloadedFile(subDownloadThread* st, QString url,
  delete st;
  emit downloadFinished(url, path);
  mutex.lock();
-  if(!urls_queue.empty()) {
-    condition.wakeOne();
-  }
+  index = downloading_list.indexOf(url);
+  Q_ASSERT(index != -1);
+  downloading_list.removeAt(index);
  mutex.unlock();
 }

@@ -200,8 +200,8 @@ void downloadThread::propagateDownloadFailure(subDownloadThread* st, QString url
  delete st;
  emit downloadFailure(url, reason);
  mutex.lock();
-  if(!urls_queue.empty()) {
-    condition.wakeOne();
-  }
+  index = downloading_list.indexOf(url);
+  Q_ASSERT(index != -1);
+  downloading_list.removeAt(index);
  mutex.unlock();
 }
--- a/src/downloadThread.h
+++ b/src/downloadThread.h
@@ -30,7 +30,6 @@
 #include <QWaitCondition>
 #include <QStringList>
 #include <curl/curl.h>
-#include <QQueue>

 class subDownloadThread : public QThread {
  Q_OBJECT
@@ -56,7 +55,8 @@ class downloadThread : public QThread {
  Q_OBJECT

  private:
-    QQueue<QString> urls_queue;
+    QStringList url_list;
+    QStringList downloading_list;
    QMutex mutex;
    QWaitCondition condition;
    bool abort;
--- a/src/downloadingTorrents.cpp
+++ b/src/downloadingTorrents.cpp
@@ -49,7 +49,7 @@ DownloadingTorrents::DownloadingTorrents(QObject *parent, bittorrent *BTSession)
 //   tabBottom->setTabIcon(1, QIcon(QString::fromUtf8(":/Icons/filter.png")));

  // Set Download list model
-  DLListModel = new QStandardItemModel(0,10);
+  DLListModel = new QStandardItemModel(0,9);
  DLListModel->setHeaderData(NAME, Qt::Horizontal, tr("Name", "i.e: file name"));
  DLListModel->setHeaderData(SIZE, Qt::Horizontal, tr("Size", "i.e: file size"));
  DLListModel->setHeaderData(PROGRESS, Qt::Horizontal, tr("Progress", "i.e: % downloaded"));
@@ -58,12 +58,9 @@ DownloadingTorrents::DownloadingTorrents(QObject *parent, bittorrent *BTSession)
  DLListModel->setHeaderData(SEEDSLEECH, Qt::Horizontal, tr("Seeds/Leechs", "i.e: full/partial sources"));
  DLListModel->setHeaderData(RATIO, Qt::Horizontal, tr("Ratio"));
  DLListModel->setHeaderData(ETA, Qt::Horizontal, tr("ETA", "i.e: Estimated Time of Arrival / Time left"));
-  DLListModel->setHeaderData(PRIORITY, Qt::Horizontal, tr("Priority"));
  downloadList->setModel(DLListModel);
  DLDelegate = new DLListDelegate(downloadList);
  downloadList->setItemDelegate(DLDelegate);
-  // Hide priority column
-  downloadList->hideColumn(PRIORITY);
  // Hide hash column
  downloadList->hideColumn(HASH);
  loadHiddenColumns();
@@ -78,7 +75,6 @@ DownloadingTorrents::DownloadingTorrents(QObject *parent, bittorrent *BTSession)
  connect(BTSession, SIGNAL(urlSeedProblem(QString, QString)), this, SLOT(addUrlSeedError(QString, QString)));
  connect(BTSession, SIGNAL(UPnPError(QString)), this, SLOT(displayUPnPError(QString)));
  connect(BTSession, SIGNAL(UPnPSuccess(QString)), this, SLOT(displayUPnPSuccess(QString)));
-  connect(BTSession, SIGNAL(forceUnfinishedListUpdate()), this, SLOT(updateDlList()));

  // Load last columns width for download list
  if(!loadColWidthDLList()) {
@@ -98,8 +94,6 @@ DownloadingTorrents::DownloadingTorrents(QObject *parent, bittorrent *BTSession)
  connect(actionPause, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionPause_triggered()));
  connect(actionStart, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionStart_triggered()));
  connect(actionDelete, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionDelete_triggered()));
-  connect(actionIncreasePriority, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionIncreasePriority_triggered()));
-  connect(actionDecreasePriority, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionDecreasePriority_triggered()));
  connect(actionPreview_file, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionPreview_file_triggered()));
  connect(actionDelete_Permanently, SIGNAL(triggered()), (GUI*)parent, SLOT(on_actionDelete_Permanently_triggered()));
  connect(actionOpen_destination_folder, SIGNAL(triggered()), (GUI*)parent, SLOT(openDestinationFolder()));
@@ -114,7 +108,6 @@ DownloadingTorrents::DownloadingTorrents(QObject *parent, bittorrent *BTSession)
  connect(actionHOSColSeedersLeechers, SIGNAL(triggered()), this, SLOT(hideOrShowColumnSeedersLeechers()));
  connect(actionHOSColRatio, SIGNAL(triggered()), this, SLOT(hideOrShowColumnRatio()));
  connect(actionHOSColEta, SIGNAL(triggered()), this, SLOT(hideOrShowColumnEta()));
-  connect(actionHOSColPriority, SIGNAL(triggered()), this, SLOT(hideOrShowColumnPriority()));

  // Set info Bar infos
  setInfoBar(tr("qBittorrent %1 started.", "e.g: qBittorrent v0.x started.").arg(QString::fromUtf8(""VERSION)));
@@ -128,13 +121,6 @@ DownloadingTorrents::~DownloadingTorrents() {
  delete DLListModel;
 }

-void DownloadingTorrents::enablePriorityColumn(bool enable) {
-  if(enable) {
-    downloadList->showColumn(PRIORITY);
-  } else {
-    downloadList->hideColumn(PRIORITY);
-  }
-}

 void DownloadingTorrents::notifyTorrentDoubleClicked(const QModelIndex& index) {
  unsigned int row = index.row();
@@ -321,16 +307,11 @@ void DownloadingTorrents::displayDLListMenu(const QPoint& pos) {
  myDLLlistMenu.addSeparator();
  myDLLlistMenu.addAction(actionOpen_destination_folder);
  myDLLlistMenu.addAction(actionTorrent_Properties);
-  if(BTSession->isQueueingEnabled()) {
-    myDLLlistMenu.addSeparator();
-    myDLLlistMenu.addAction(actionIncreasePriority);
-    myDLLlistMenu.addAction(actionDecreasePriority);
-  }
  myDLLlistMenu.addSeparator();
  myDLLlistMenu.addAction(actionBuy_it);
  // Call menu
  // XXX: why mapToGlobal() is not enough?
-  myDLLlistMenu.exec(mapToGlobal(pos)+QPoint(10,35));
+  myDLLlistMenu.exec(mapToGlobal(pos)+QPoint(10,60));
 }


@@ -342,17 +323,11 @@ void DownloadingTorrents::displayDLListMenu(const QPoint& pos) {
 void DownloadingTorrents::displayDLHoSMenu(const QPoint& pos){
  QMenu hideshowColumn(this);
  hideshowColumn.setTitle(tr("Hide or Show Column"));
-  int lastCol;
-  if(BTSession->isQueueingEnabled()) {
-    lastCol = PRIORITY;
-  } else {
-    lastCol = ETA;
-  }
-  for(int i=0; i <= lastCol; ++i) {
+  for(int i=0; i<=ETA; i++) {
    hideshowColumn.addAction(getActionHoSCol(i));
  }
  // Call menu
-  hideshowColumn.exec(mapToGlobal(pos)+QPoint(10,10));
+  hideshowColumn.exec(mapToGlobal(pos)+QPoint(10,55));
 }

 // toggle hide/show a column
@@ -372,19 +347,11 @@ void DownloadingTorrents::hideOrShowColumn(int index) {
    downloadList->setColumnHidden(index, true);
    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_cancel.png")));
    --nbVisibleColumns;
-    if(index == ETA) {
-      BTSession->setETACalculation(false);
-      qDebug("Disable ETA calculation");
-    }
  } else {
    // User want to display the column
    downloadList->setColumnHidden(index, false);
    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_ok.png")));
    ++nbVisibleColumns;
-    if(index == ETA) {
-      BTSession->setETACalculation(true);
-      qDebug("Enable ETA calculation");
-    }
  }
  //resize all others non-hidden columns
  for(unsigned int i=0; i<nbCols; ++i) {
@@ -394,10 +361,6 @@ void DownloadingTorrents::hideOrShowColumn(int index) {
  }
 }

-void DownloadingTorrents::hidePriorityColumn(bool hide) {
-  downloadList->setColumnHidden(PRIORITY, hide);
-}
-
 // save the hidden columns in settings
 void DownloadingTorrents::saveHiddenColumns() {
  QSettings settings("qBittorrent", "qBittorrent");
@@ -473,9 +436,6 @@ void DownloadingTorrents::hideOrShowColumnEta() {
  hideOrShowColumn(ETA);
 }

-void DownloadingTorrents::hideOrShowColumnPriority() {
-  hideOrShowColumn(PRIORITY);
-}

 void DownloadingTorrents::on_actionClearLog_triggered() {
  infoBar->clear();
@@ -508,9 +468,6 @@ QAction* DownloadingTorrents::getActionHoSCol(int index) {
    case ETA :
      return actionHOSColEta;
    break;
-    case PRIORITY :
-      return actionHOSColPriority;
-      break;
    default :
      return NULL;
  }
@@ -567,17 +524,6 @@ void DownloadingTorrents::updateDlList() {
        row = getRowFromHash(hash);
      }
      Q_ASSERT(row != -1);
-      // Update Priority
-      if(BTSession->isQueueingEnabled()) {
-        DLListModel->setData(DLListModel->index(row, PRIORITY), QVariant((int)BTSession->getDlTorrentPriority(hash)));
-        if(h.is_paused() && BTSession->isDownloadQueued(hash)) {
-          DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/queued.png"))), Qt::DecorationRole);
-          if(!downloadList->isColumnHidden(ETA)) {
-            DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)-1));
-          }
-          setRowColor(row, QString::fromUtf8("grey"));
-        }
-      }
      // No need to update a paused torrent
      if(h.is_paused()) continue;
      if(BTSession->getTorrentsToPauseAfterChecking().indexOf(hash) != -1) {
@@ -677,7 +623,6 @@ void DownloadingTorrents::addTorrent(QString hash) {
  }
  QTorrentHandle h = BTSession->getTorrentHandle(hash);
  int row = getRowFromHash(hash);
-  qDebug("DL: addTorrent(): %s, row: %d", (const char*)hash.toUtf8(), row);
  if(row != -1) return;
  row = DLListModel->rowCount();
  // Adding torrent to download list
@@ -688,8 +633,6 @@ void DownloadingTorrents::addTorrent(QString hash) {
  DLListModel->setData(DLListModel->index(row, UPSPEED), QVariant((double)0.));
  DLListModel->setData(DLListModel->index(row, SEEDSLEECH), QVariant(QString::fromUtf8("0/0")));
  DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)-1));
-  if(BTSession->isQueueingEnabled())
-    DLListModel->setData(DLListModel->index(row, PRIORITY), QVariant((int)BTSession->getDlTorrentPriority(hash)));
  DLListModel->setData(DLListModel->index(row, HASH), QVariant(hash));
  // Pause torrent if it was paused last time
  if(BTSession->isPaused(hash)) {
@@ -865,7 +808,6 @@ void DownloadingTorrents::torrentAdded(QString path, QTorrentHandle& h, bool fas
  if(BTSession->isFinished(hash)) {
    return;
  }
-  if(getRowFromHash(hash) != -1) return;
  int row = DLListModel->rowCount();
  // Adding torrent to download list
  DLListModel->insertRow(row);
--- a/src/downloadingTorrents.h
+++ b/src/downloadingTorrents.h
@@ -55,7 +55,6 @@ class DownloadingTorrents : public QWidget, public Ui::downloading{
    QString getHashFromRow(unsigned int row) const;
    QStringList getSelectedTorrents(bool only_one=false) const;
    unsigned int getNbTorrentsInList() const;
-    void enablePriorityColumn(bool enable);

  signals:
    void unfinishedTorrentsNumberChanged(unsigned int);
@@ -93,7 +92,6 @@ class DownloadingTorrents : public QWidget, public Ui::downloading{
    void hideOrShowColumnSeedersLeechers();
    void hideOrShowColumnRatio();
    void hideOrShowColumnEta();
-    void hideOrShowColumnPriority();
    void displayUPnPError(QString msg);
    void displayUPnPSuccess(QString msg);

@@ -108,7 +106,6 @@ class DownloadingTorrents : public QWidget, public Ui::downloading{
    void sortProgressColumnDelayed();
    void updateFileSizeAndProgress(QString hash);
    void showPropertiesFromHash(QString hash);
-    void hidePriorityColumn(bool hide);

 };

--- a/src/eventmanager.cpp
+++ b/src/eventmanager.cpp
@@ -20,12 +20,11 @@


 #include "eventmanager.h"
-#include "bittorrent.h"
 #include "json.h"
 #include <QDebug>

-EventManager::EventManager(QObject *parent, bittorrent *BTSession)
-	: QObject(parent), BTSession(BTSession)
+EventManager::EventManager(QObject *parent)
+	: QObject(parent)
 {
 	revision = 0;
 }
@@ -100,12 +99,10 @@ void EventManager::modifiedTorrent(QTorrentHandle h)
 	QVariantMap event;
 	QVariant v;
 	
-	if(h.is_paused()) {
-		if(BTSession->isDownloadQueued(hash) || BTSession->isUploadQueued(hash))
-			v = QVariant("queued");
-		else
-			v = QVariant("paused");
-	} else {
+	if(h.is_paused())
+		v = QVariant("paused");
+	else
+	{
 		switch(h.state())
 		{
 			case torrent_status::finished:
--- a/src/eventmanager.h
+++ b/src/eventmanager.h
@@ -27,8 +27,6 @@
 #include <QPair>
 #include <QVariant>

-struct bittorrent;
-
 class EventManager : public QObject
 {
 	Q_OBJECT
@@ -36,13 +34,12 @@ class EventManager : public QObject
 		ulong revision;
 		QLinkedList<QPair <ulong, QVariantMap> > events;
 		bool modify(QString hash, QString key, QVariant value);
-		bittorrent* BTSession;

 	protected:
 		void update(QVariantMap event);

 	public:
-		EventManager(QObject *parent, bittorrent* BTSession);
+		EventManager(QObject *parent = 0);
 		QVariant querySince(ulong r) const;
 		bool isUpdated(ulong r) const;

--- a/src/httpconnection.cpp
+++ b/src/httpconnection.cpp
@@ -30,7 +30,6 @@
 #include <QHttpResponseHeader>
 #include <QFile>
 #include <QDebug>
-#include <QTemporaryFile>

 HttpConnection::HttpConnection(QTcpSocket *socket, HttpServer *parent)
 	: QObject(parent), socket(socket), parent(parent)
@@ -46,17 +45,11 @@ HttpConnection::~HttpConnection()

 void HttpConnection::read()
 {
-	QByteArray input = socket->readAll();
+	QString input = socket->readAll();
 	qDebug(" -------");
 	qDebug("|REQUEST|");
 	qDebug(" -------");
-	//qDebug("%s", input.toAscii().constData());
-	if(input.size() > 100000) {
-		qDebug("Request too big");
-		generator.setStatusLine(400, "Bad Request");
-		write();
-		return;
-	}
+	qDebug(input.toAscii().constData());
 	parser.write(input);
 	if(parser.isError())
 	{
@@ -71,17 +64,16 @@ void HttpConnection::read()
 void HttpConnection::write()
 {
 	QByteArray output = generator.toByteArray();
-	/*qDebug(" --------");
+	qDebug(" --------");
 	qDebug("|RESPONSE|");
 	qDebug(" --------");
-	qDebug()<<output;*/
+	qDebug()<<output;
 	socket->write(output);
 	socket->disconnectFromHost();
 }

 void HttpConnection::respond()
 {
-	qDebug("Respond called");
 	QStringList auth = parser.value("Authorization").split(" ", QString::SkipEmptyParts);
 	if (auth.size() != 2 || QString::compare(auth[0], "Basic", Qt::CaseInsensitive) != 0 || !parent->isAuthorized(auth[1].toUtf8()))
 	{
@@ -184,25 +176,6 @@ void HttpConnection::respondCommand(QString command)
 		emit urlsReadyToBeDownloaded(url_list_cleaned);
 		return;
 	}
-	if(command == "upload")
-	{
-		QByteArray torrentfile = parser.torrent();
-		// XXX: Trick to get a unique filename
-		QString filePath;
-		QTemporaryFile *tmpfile = new QTemporaryFile();
-		if (tmpfile->open()) {
-			filePath = tmpfile->fileName();
-		}
-		delete tmpfile;
-		// write it to HD
-		QFile torrent(filePath);
-		if(torrent.open(QIODevice::WriteOnly)) {
-			torrent.write(torrentfile);
-			torrent.close();
-		}
-		emit torrentReadyToBeDownloaded(filePath, false, QString(), false);
-		return;
-	}
 	if(command == "resumeall")
 	{
 		emit resumeAllTorrents();
--- a/src/httpconnection.h
+++ b/src/httpconnection.h
@@ -57,7 +57,6 @@ class HttpConnection : public QObject

 	signals:
 		void urlsReadyToBeDownloaded(const QStringList&);
-		void torrentReadyToBeDownloaded(QString, bool, QString, bool);
 		void deleteTorrent(QString hash);
 		void resumeTorrent(QString hash);
 		void pauseTorrent(QString hash);
--- a/src/httprequestparser.cpp
+++ b/src/httprequestparser.cpp
@@ -49,11 +49,11 @@ QString HttpRequestParser::url() const
 	return path;
 }

-QByteArray HttpRequestParser::message() const
+QString HttpRequestParser::message() const
 {
 	if(isParsable())
 		return data;
-	return QByteArray();
+	return QString();
 }

 QString HttpRequestParser::get(const QString key) const
@@ -66,12 +66,7 @@ QString HttpRequestParser::post(const QString key) const
 	return postMap[key];
 }

-QByteArray HttpRequestParser::torrent() const
-{
-	return torrent_content;
-}
-
-void HttpRequestParser::write(QByteArray str)
+void HttpRequestParser::write(QString str)
 {
 	while (!headerDone && str.size()>0)
 	{
@@ -116,7 +111,7 @@ void HttpRequestParser::write(QByteArray str)
 				if(contentType() == "application/x-www-form-urlencoded")
 				{
 					QUrl url;
-					url.setEncodedQuery(data);
+					url.setEncodedQuery(data.toAscii());
 					QListIterator<QPair<QString, QString> > i(url.queryItems());
 					while (i.hasNext())
 					{
@@ -125,15 +120,9 @@ void HttpRequestParser::write(QByteArray str)
 						qDebug() << pair.first << "=" << post(pair.first);
 					}
 				}
-				if(contentType() == "multipart/form-data")
-				{
-					//qDebug() << data.right(data.size()-data.indexOf("\r\n\r\n")-QByteArray("\r\n\r\n").size());
-					torrent_content = data.right(data.size()-data.indexOf("\r\n\r\n")-QByteArray("\r\n\r\n").size());
-				}
 			}
 		}
 		else
 			error = true;
 	}
-	qDebug() << "isError: " << isError();
 }
--- a/src/httprequestparser.h
+++ b/src/httprequestparser.h
@@ -30,11 +30,10 @@ class HttpRequestParser : public QHttpRequestHeader
 		bool headerDone;
 		bool messageDone;
 		bool error;
-		QByteArray data;
+		QString data;
 		QString path;
 		QMap<QString, QString> postMap;
 		QMap<QString, QString> getMap;
-		QByteArray torrent_content;

 	public:
 		HttpRequestParser();
@@ -42,11 +41,10 @@ class HttpRequestParser : public QHttpRequestHeader
 		bool isParsable() const;
 		bool isError() const;
 		QString url() const;
-		QByteArray message() const;
+		QString message() const;
 		QString get(const QString key) const;
 		QString post(const QString key) const;
-		QByteArray torrent() const;
-		void write(QByteArray str);
+		void write(QString str);
 };

 #endif
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -30,7 +30,7 @@ HttpServer::HttpServer(bittorrent *BTSession, int msec, QObject* parent) : QTcpS
 	base64 = QByteArray(":").toBase64();
 	connect(this, SIGNAL(newConnection()), this, SLOT(newHttpConnection()));
 	HttpServer::BTSession = BTSession;
-	manager = new EventManager(this, BTSession);
+	manager = new EventManager(this);
 	//add torrents
 	QStringList list = BTSession->getUnfinishedTorrents() + BTSession->getFinishedTorrents();
 	QString hash;
@@ -62,7 +62,6 @@ void HttpServer::newHttpConnection()
 		HttpConnection *connection = new HttpConnection(socket, this);
 		//connect connection to BTSession
 		connect(connection, SIGNAL(urlsReadyToBeDownloaded(const QStringList&)), BTSession, SLOT(downloadFromURLList(const QStringList&)));
-		connect(connection, SIGNAL(torrentReadyToBeDownloaded(QString, bool, QString, bool)), BTSession, SLOT(addTorrent(QString, bool, QString, bool)));
 		connect(connection, SIGNAL(deleteTorrent(QString)), BTSession, SLOT(deleteTorrent(QString)));
 		connect(connection, SIGNAL(pauseTorrent(QString)), BTSession, SLOT(pauseTorrent(QString)));
 		connect(connection, SIGNAL(resumeTorrent(QString)), BTSession, SLOT(resumeTorrent(QString)));
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -16,7 +16,6 @@
  <file>Icons/filter.png</file>
  <file>Icons/folder.png</file>
  <file>Icons/gear.png</file>
-  <file>Icons/gnome-shutdown.png</file>
  <file>Icons/home.png</file>
  <file>Icons/loading.png</file>
  <file>Icons/locale.png</file>
@@ -32,16 +31,19 @@
  <file>Icons/refresh.png</file>
  <file>Icons/rss16.png</file>
  <file>Icons/rss32.png</file>
+  <file>Icons/smile.png</file>
  <file>Icons/sphere.png</file>
  <file>Icons/sphere2.png</file>
  <file>Icons/splash.png</file>
  <file>Icons/star.png</file>
+  <file>Icons/stare.png</file>
  <file>Icons/style.png</file>
  <file>Icons/subscribe.png</file>
  <file>Icons/subscribe16.png</file>
  <file>Icons/systemtray.png</file>
  <file>Icons/time.png</file>
  <file>Icons/unavailable.png</file>
+  <file>Icons/unhappy.png</file>
  <file>Icons/unsubscribe.png</file>
  <file>Icons/unsubscribe16.png</file>
  <file>Icons/uparrow.png</file>
@@ -75,14 +77,13 @@
  <file>Icons/skin/add.png</file>
  <file>Icons/skin/connected.png</file>
  <file>Icons/skin/connecting.png</file>
-  <file>Icons/skin/decrease.png</file>
  <file>Icons/skin/delete.png</file>
  <file>Icons/skin/delete_all.png</file>
  <file>Icons/skin/delete_perm.png</file>
+  <file>Icons/skin/disconnected.png</file>
  <file>Icons/skin/downloading.png</file>
  <file>Icons/skin/exit.png</file>
  <file>Icons/skin/firewalled.png</file>
-  <file>Icons/skin/increase.png</file>
  <file>Icons/skin/info.png</file>
  <file>Icons/skin/new.png</file>
  <file>Icons/skin/open.png</file>
@@ -94,7 +95,6 @@
  <file>Icons/skin/preview.png</file>
  <file>Icons/skin/properties.png</file>
  <file>Icons/skin/qb_question.png</file>
-  <file>Icons/skin/queued.png</file>
  <file>Icons/skin/remove.png</file>
  <file>Icons/skin/search.png</file>
  <file>Icons/skin/seeding.png</file>
--- a/src/lang/qbittorrent_bg.qm
+++ b/src/lang/qbittorrent_bg.qm
--- a/src/lang/qbittorrent_bg.ts
+++ b/src/lang/qbittorrent_bg.ts
--- a/src/lang/qbittorrent_ca.qm
+++ b/src/lang/qbittorrent_ca.qm
--- a/src/lang/qbittorrent_ca.ts
+++ b/src/lang/qbittorrent_ca.ts
--- a/src/lang/qbittorrent_da.qm
+++ b/src/lang/qbittorrent_da.qm
--- a/src/lang/qbittorrent_da.ts
+++ b/src/lang/qbittorrent_da.ts
--- a/src/lang/qbittorrent_de.qm
+++ b/src/lang/qbittorrent_de.qm
--- a/src/lang/qbittorrent_de.ts
+++ b/src/lang/qbittorrent_de.ts
--- a/src/lang/qbittorrent_el.qm
+++ b/src/lang/qbittorrent_el.qm
--- a/src/lang/qbittorrent_el.ts
+++ b/src/lang/qbittorrent_el.ts
--- a/src/lang/qbittorrent_en.qm
+++ b/src/lang/qbittorrent_en.qm
--- a/src/lang/qbittorrent_en.ts
+++ b/src/lang/qbittorrent_en.ts
--- a/src/lang/qbittorrent_es.qm
+++ b/src/lang/qbittorrent_es.qm
--- a/src/lang/qbittorrent_es.ts
+++ b/src/lang/qbittorrent_es.ts
--- a/src/lang/qbittorrent_fi.qm
+++ b/src/lang/qbittorrent_fi.qm
--- a/src/lang/qbittorrent_fi.ts
+++ b/src/lang/qbittorrent_fi.ts
--- a/src/lang/qbittorrent_fr.qm
+++ b/src/lang/qbittorrent_fr.qm
--- a/src/lang/qbittorrent_fr.ts
+++ b/src/lang/qbittorrent_fr.ts
--- a/src/lang/qbittorrent_hu.qm
+++ b/src/lang/qbittorrent_hu.qm
--- a/src/lang/qbittorrent_hu.ts
+++ b/src/lang/qbittorrent_hu.ts
--- a/src/lang/qbittorrent_it.qm
+++ b/src/lang/qbittorrent_it.qm
--- a/src/lang/qbittorrent_it.ts
+++ b/src/lang/qbittorrent_it.ts
--- a/src/lang/qbittorrent_ja.qm
+++ b/src/lang/qbittorrent_ja.qm
--- a/src/lang/qbittorrent_ja.ts
+++ b/src/lang/qbittorrent_ja.ts
--- a/src/lang/qbittorrent_ko.qm
+++ b/src/lang/qbittorrent_ko.qm
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`qbittorrent_0.6.1-0ubuntu2_i386.deb net optional`
				`@@ -0,0 +1 @@`
				`shlibs:Depends=libboost-date-time1.33.1, libboost-filesystem1.33.1, libboost-thread1.33.1, libc6 (>= 2.3.4-1), libcurl3 (>= 7.15.0-1), libgcc1 (>= 1:4.0.2), libqt4-core (>= 4.1.2), libqt4-gui (>= 4.1.2), libstdc++6 (>= 4.0.2-4), libx11-6, libxext6, zlib1g (>= 1:1.2.1)`