- Tagged beta2 release

- Added a progress bar in torrent creation
- Display if UPnP/NAT-PMP was successful or not

AUTHORS

@@ -1,5 +1,6 @@
 Author:
 * Christophe Dumez <chris@qbittorrent.org>
 
-Other developers:
+Contributors:
 * Arnaud Demaizière <arnaud@qbittorrent.org>
+* Ishan Arora <ishanarora@gmail.com>

Changelog

@@ -1,10 +1,37 @@
-* Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.0.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: 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
+    - FEATURE: Allow to buy downloads using ShareMonkey
+    - FEATURE: Display if UPnP/NAT-PMP was successful or not
+    - FEATURE: Threadified torrent creation
+    - FEATURE: Improved eMule DAT ip filter parser
+    - FEATURE: Added support for PeerGuardian p2p filters (text)
+    - FEATURE: Added support for PeerGuardian p2b filters (binary)
+    - FEATURE: Allow to customize folder scan interval
+    - FEATURE: Allow to add several trackers at once
+    - BUGFIX: Do not display seeds number in seeding list (always 0)
+    - BUGFIX: Threadified IP filter file parser to avoid GUI freeze
+    - 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
+
+* Fri Apr 11 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.0.0
     - FEATURE: Based on new libtorrent v0.13
     - FEATURE: Added UPnP / NAT-PMP port forwarding support
     - FEATURE: Added encryption support (compatible with Azureus)
     - FEATURE: Bittorrent FAST extension support
     - FEATURE: Added RSS support
     - FEATURE: Support files prioritizing in a torrent
+    - FEATURE: Brand new search engine plugins system
+    - FEATURE: Filtered files don't appear on hard disk anymore
     - FEATURE: Finished torrents are now moved to another tab for seeding
     - FEATURE: Display more infos about the torrent in its properties
     - FEATURE: Allow the user to edit torrents' trackers
@@ -30,6 +57,15 @@
     - FEATURE: User is now warned when fast resume data was rejected
     - FEATURE: Url seeds are now displayed in torrent properties and are editable
     - FEATURE: Allow to drag 'n drop urls on the main window
+    - FEATURE: Improved search engine (multipage support in all plugins)
+    - FEATURE: Added BTJunkie search engine plugin
+    - FEATURE: Added an option to force full disk allocation for all torrents
+    - FEATURE: Added an option to add torrents in paused state
+    - FEATURE: Added an option to set the max number of connections per torrent
+    - FEATURE: Added an option to set the max number of uploads per torrent
+    - FEATURE: Added an option to automatically delete torrents when they reach a given ratio (>= 1.0)
+    - FEATURE: Added an option to display current transfer speeds in title bar
+    - FEATURE: Torrent content is now displayed as a tree
     - I18N: Added Hungarian translation
     - I18N: Added Brazilian translation
     - BUGFIX: Progress of paused torrents is now correct on restart
@@ -52,11 +88,16 @@
     - BUGFIX: Made torrent deletion from hard-drive safer
     - BUGFIX: Prevent downloadFromUrl flooding
     - BUGFIX: ETA was wrong for torrents with filtered files
+    - BUGFIX: Fixed drag'n drop on non-KDE systems
+    - BUGFIX: Removed build dependency on Python
+    - BUGFIX: Catching DHT exception in case there is a problem
     - COSMETIC: Redesigned torrent properties a little
-    - COSMETIC: Redesigned options a little
+    - COSMETIC: Totally redesigned program preferences
     - COSMETIC: Display more logs messages concerning features
     - COSMETIC: Improved lists renderers
     - COSMETIC: Use a different icon for torrents being checked and for connecting ones
+    - COSMETIC: Improved some icons
+    - COSMETIC: Improved systray tooltip style
 
 * Mon May 07 2007 - Christophe Dumez <chris@qbittorrent.org> - v0.9.3
     - BUGFIX: Fixed pause toggle on double-click in download list

INSTALL

@@ -1,4 +1,4 @@
-qBittorrent - A BitTorrent client in C++ / Qt4.2
+qBittorrent - A BitTorrent client in C++ / Qt4
 ------------------------------------------
 
 *** Necessary if qt3 is default on your system ***
@@ -14,25 +14,30 @@ qbittorrent
 will install and execute qBittorrent hopefully without any problems.
 
 Dependencies:
-- Qt >= 4.2 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml)
+- Qt >= 4.3.0 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml)
 
-- libtorrent by Arvid Norberg (>= v0.13 REQUIRED)
+- rblibtorrent by Arvid Norberg (>= v0.13 REQUIRED)
+    -> http://www.qbittorrent.org/download.php (advised)
     -> http://www.libtorrent.net
-    Be carefull: another library (the one used by rtorrent) use the same 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
 
-- libcommoncpp2
+- libcurl
 
-- python >= 2.3 (previous might work - not tested): needed by search engine.
+- python >= 2.3 (needed by search engine)
 
 - libmagick++ (advised, not required)
+  * Needed for favicons support (RSS / Search plugins)
 
-NOTE FOR GNOME USERS:
-- qt4-qtconfig package is advised when using Plastique style (default)
-  or just change qBittorrent style to Cleanlooks (GNOME like)
+- libzzip (advised, not required)
+  * Needed for zip support (Search plugins)
+
+NOTE FOR NON-KDE USERS:
+- qt4-qtconfig package is advised when using other systems than KDE.
+  You can also change qBittorrent style to Cleanlooks (GNOME like)
 
 DOCUMENTATION:
 Please note that there is a documentation with a "compiling howto" at http://wiki.qbittorrent.org.

README

@@ -3,30 +3,30 @@ qBittorrent - A BitTorrent client in Qt4
 
 Description:
 ********************************
-qBittorrent is a bittorrent client programmed in C++ / Qt4 that use
-libtorrent (sometimes called rb_libtorrent) by Arvid Norberg.
+qBittorrent is a bittorrent client programmed in C++ / Qt4 that uses
+libtorrent (sometimes called rblibtorrent) by Arvid Norberg.
 
 It aims to be a good alternative to all other bittorrent clients
 out there. qBittorrent is fast, stable and provides unicode
-support.
+support as well as many features.
 
 Installation:
 ********************************
-For installation follow the instructions from INSTALL file, but simple
+For installation, follow the instructions from INSTALL file, but simple:
 
 ./configure
 make && make install
 qbittorrent
 
-will install and execute qBittorrent hopefully without any problems.
+will install and execute qBittorrent hopefully without any problem.
 
 For more information please visit:
 http://www.qbittorrent.org
 
-Please report any bug (or feature requests) to:
+Please report any bug (or feature request) to:
 http://bugs.qbittorrent.org
 
-You can also meet me on IRC:
+You can also meet me (chris-qBT) on IRC:
 #qbittorrent on irc.freenode.net
 
 ------------------------------------------

TODO

@@ -1,98 +1,37 @@
 // Easy
 - Translations into as many languages as possible
-- Improve man page
 - Use Launchpad/Rosetta for translations once it supports TS files
 
 // Intermediate
-- Port on MacOS, Windows (and create an installer for Windows) - Progressing slowly
-- Add some transparency (menus,...), improve look
+- Port on MacOS, Windows (and create an installer for Windows) - Slow progress
+- Add some transparency (menus,...), improve look / usabilty
+- Skins support? (contact Mateusz)
 
 // Harder
-- Display a progress bar that really displays the pieces we have (like in eMule)
+- Torrent scheduler ala µtorrent/Bitcomet
 
 // Waiting for libtorrent
-- File selection in a torrent in compact mode
-- Allow to prioritize torrents
+- 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
-- Add a torrent scheduler
+- 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)
-- search engines customizing
+- 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
-- Allow user to organize the downloads into categories/folders
+- Allow user to organize the downloads into categories/folders?
 
 // in v1.1.0
-- Tabs support in search
-- Allow to hide columns?
-- Allow to scan multiple directories? (useful?)
-- Web interface (turbogears? php?)
-- improve and test tracker authentication code (remember login/pass) (need a tracker to test this)
-- support zipped torrents? (useful?)
-- Add option for RSS customization (refresh interval, max news per RSS...)
-- Allow to disable UPnP/NAT-PMP/LSD in options?
-- Allow to automatically delete torrents when they reach a given ratio (in options) : easy
-- Allow to limit the number of downloading torrents simultaneously (other are paused until a download finishes)
-- Add "Mark all as read" feature for RSS
-- Allow to customize lists refreshing interval (in options)
-- Use search engines as plugins (split them, load them dynamically) to allow the user to add some
+- Stop calculating ETAs when ETA column is hidden
+-> See https://blueprints.launchpad.net/qbittorrent
 
-// in v1.0.0 (partial) - WIP
-- Check storage st creation + hasher in torrent creation
-- Fix all (or almost all) opened bugs in bug tracker
-- update sorting when a new torrent is added?
-- Keep documention up to date
-- Windows port (Chris - Peerkoel)
-- write patches libtorrent for file_priority(int index), actual_size() ?
-- valgrind --tool=memcheck --leak-check=full src/qbittorrent (Looks ok)
-- 128m  29m  16m S  4.8  2.9   0:02.28 qbittorrent
-* beta 6
-  - Translations update (IN PROGRESS)
-  - Wait for some bug fixes in libtorrent :
-    - Number of seeds non null for finished torrent (Ticket #122)
-
-LANGUAGES UPDATED:
-- French *BETA3*
-- English *BETA3*
-- Japanese *BETA3*
-- Swedish *BETA3*
-- Slovak *BETA3*
-- Ukrainian *BETA3*
-- Chinese (simplified) *BETA4*
-- Hungarian *BETA4*
-- Italian *BETA5*
-- Polish *BETA5*
-- Portuguese *BETA5*
-- Brazilian *BETA5*
-- Spanish *BETA5*
-- German *BETA5*
-- Russian *BETA5*
-- Korean *BETA5*
-- Greek *BETA6*
-- Dutch *BETA6*
-- Romanian *BETA6*
-
-beta5->beta6 changelog:
-- FEATURE: Split download tab from GUI class and cleaned up code
-- FEATURE: A lot of code optimization (CPU & memory usage)
-- FEATURE: Added support for .ico format (useful for RSS favicons)
-- FEATURE: Replaced Meganova search engine by TorrentReactor
-- I18N: Updated Greek, Dutch and Romanian translation
-- I18N: Removed no longer maintained Traditional chinese translation
-- BUGFIX: Made torrent deletion from hard-drive safer
-- BUGFIX: Fixed a bug when switching from finished to downloading list
-- BUGFIX: Showing checking progress for paused torrents too
-- BUGFIX: Fixed progress column sorting on startup
-- BUGFIX: Prevent downloadFromUrl flooding
-- BUGFIX: Fixed pause state toggle for paused and checking torrents
-- BUGFIX: Made finished list context menu more similar to the download list one
-- BUGFIX: Fixed Pause/Start action in lists context menus
-- BUGFIX: Improved ETA calculation
-- BUGFIX: ETA was wrong for torrents with filtered files
-- BUGFIX: Display the torrent that are being checked as 'checking' in seeding list
-- BUGFIX: Fixed file preview and improved previewable files detection
-- BUGFIX: Do not store and calculate ETA values for finished/paused torrents
-- BUGFIX: Fixed memory leak in GUI

doc/qbittorrent.1

@@ -0,0 +1,28 @@
+.\" This manpage has been automatically generated by docbook2man
+.\" from a DocBook document.  This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>.
+.TH "QBITTORRENT" "1" "September 1st 2007" "Bittorrent client written in C++ / Qt4" ""
+
+.SH NAME
+qBittorrent \- a Bittorrent client written in C++ / Qt4
+.SH SYNOPSIS
+
+\fBqbittorrent\fR [FILE | URL] [FILE | URL...]
+
+\fBqbittorrent\fR \-\-help
+
+\fBqbittorrent\fR \-\-version
+.PP
+.SH "DESCRIPTION"
+
+\fBqBittorrent\fR is an advanced Bittorrent client written in C++ / Qt4,
+using the \fBrblibtorrent\fR library by Arvid Norberg. qBittorrent aims
+to be a good alternative to all other bittorrent clients out there. qBittorrent
+is fast, stable, light, it supports unicode and it provides a good integrated search engine.
+It also comes with UPnP port forwarding / NAT-PMP, encryption (Azureus compatible), FAST extension (mainline) and PeX support (utorrent compatible).
+
+Please report any problem to http://bugs.qbittorrent.org
+.PP
+.SH "AUTHOR"
+
+Christophe Dumez <chris@qbittorrent.org>

qBittorrent.kdevelop

@@ -94,13 +94,12 @@
       <includestyle>4</includestyle>
       <designerintegration>ExternalDesigner</designerintegration>
       <root>/usr/lib/qt4</root>
-      <qmake>/usr/bin/qmake-qt4</qmake>
-      <designer>/usr/bin/designer-qt4</designer>
+      <qmake>/usr/bin/qmake</qmake>
+      <designer>/usr/bin/designer</designer>
       <designerpluginpaths/>
     </qt>
     <references>
-      <pcs>automatic_%2Fhome%2Fchris%2Fqbittorrent_svn%2Ftrunk</pcs>
-      <pcs>Qt4</pcs>
+      <pcs>automatic_%2Fhome%2Fishanarora%2Fprojects%2Fqbittorrent</pcs>
     </references>
     <codecompletion>
       <automaticCodeCompletion>true</automaticCodeCompletion>
@@ -149,14 +148,14 @@
   </kdevfilecreate>
   <kdevtrollproject>
     <general>
-      <activedir></activedir>
+      <activedir>src</activedir>
     </general>
     <run>
       <directoryradio>executable</directoryradio>
-      <mainprogram>/home/chris/qbittorrent_svn/trunk/src/qbittorrent</mainprogram>
+      <mainprogram>/home/ishanarora/projects/qbittorrent/src/qbittorrent</mainprogram>
       <programargs/>
       <globaldebugarguments/>
-      <globalcwd>/home/chris/qbittorrent_svn/trunk</globalcwd>
+      <globalcwd>/home/ishanarora/projects/qbittorrent</globalcwd>
       <useglobalprogram>true</useglobalprogram>
       <terminal>false</terminal>
       <autocompile>true</autocompile>
@@ -187,7 +186,7 @@
   </cppsupportpart>
   <ctagspart>
     <customArguments/>
-    <customTagfilePath>/home/chris/qbittorrent_svn/trunk/tags</customTagfilePath>
+    <customTagfilePath>/home/ishanarora/projects/qbittorrent/tags</customTagfilePath>
     <activeTagsFiles/>
   </ctagspart>
   <kdevdocumentation>

qbittorrent.qc

@@ -3,7 +3,7 @@
  <profile>qbittorrent.pro</profile>
  <moddir>qcm</moddir>
  <datadir/>
-  <dep type='qt42'>
+  <dep type='qt4'>
     <required/>
   </dep>
   <dep type='libtorrent'>
@@ -12,11 +12,9 @@
   <dep type='libboost'>
     <required/>
   </dep>
-  <dep type='libcommoncpp2'>
-    <required/>
-  </dep>
-	<dep type='libmagick'/>
-  <dep type='python'>
+  <dep type='libcurl'>
     <required/>
   </dep>
+  <dep type='libmagick'/>
+  <dep type='libzzip'/>
 </qconf>

qcm/libcommoncpp2.qcm

@@ -37,15 +37,17 @@ public:
 
 		s = conf->getenv("QC_WITH_LIBCOMMONCPP2_LIB");
 		if(!s.isEmpty()) {
-			if(!QFile::exists(s+QString("libccext2.so")))
+			if(!QFile::exists(s+QString("/libccext2.so")))
 		    return false;
-			if(!QFile::exists(s+QString("libccgnu2.so")))
+			if(!QFile::exists(s+QString("/libccgnu2.so")))
 				return false;
     	conf->addLib(QString("-L") + s);
 		}else{
 			QStringList sl;
 			sl << "/usr/lib/";
+			sl << "/usr/lib64/";
 			sl << "/usr/local/lib/";
+			sl << "/usr/local/lib64/";
 			bool found = false;
 			foreach(s, sl){
 				if(QFile::exists(s+QString("libccext2.so"))){
@@ -58,16 +60,6 @@ public:
 			if(!found) return false;
 			conf->addLib(QString("-L") + s);
 		}
-		// BUGFIX for Fedora (doesn't support pkg-config?)
-    QFile issue_file("/etc/issue");
-    if(issue_file.open(QIODevice::ReadOnly | QIODevice::Text)){
-      QString content = issue_file.readAll();
-      issue_file.close();
-      if(content.indexOf("Fedora") != -1){
-        qWarning("Fedora detected. WORKAROUND for Fedora pkg-config problem enabled");
-        conf->addLib("-pthread -lccext2 -lz -lccgnu2 -ldl -lrt");
-      }
-    }
 		return true;
 	}
 };

qcm/libcurl.qcm

@@ -0,0 +1,61 @@
+/*
+-----BEGIN QCMOD-----
+name: libcommoncpp2
+arg: with-libcurl-inc=[path], Path to libcurl include files
+arg: with-libcurl-lib=[path], Path to libcurl library files
+-----END QCMOD-----
+*/
+class qc_libcurl : public ConfObj
+{
+public:
+	qc_libcurl(Conf *c) : ConfObj(c) {}
+	QString name() const { return "libcurl"; }
+	QString shortname() const { return "libcurl"; }
+	bool exec(){
+    QString s;
+		s = conf->getenv("QC_WITH_LIBCURL_INC");
+		if(!s.isEmpty()) {
+			if(!conf->checkHeader(s, "curl/curl.h")) {
+				return false;
+    	}
+		}else{
+			QStringList sl;
+			sl << "/usr/include";
+			sl << "/usr/local/include";
+			bool found = false;
+			foreach(s, sl){
+				if(conf->checkHeader(s, "curl/curl.h")){
+					found = true;
+					break;
+				}
+			}
+			if(!found) {
+				return false;
+      }
+		}
+		conf->addIncludePath(s);
+
+		s = conf->getenv("QC_WITH_LIBCURL_LIB");
+		if(!s.isEmpty()) {
+			if(!QFile::exists(s+QString("/libcurl.so")))
+		          return false;
+    	conf->addLib(QString("-L") + s);
+		}else{
+			QStringList sl;
+			sl << "/usr/lib/";
+			sl << "/usr/lib64/";
+			sl << "/usr/local/lib/";
+			sl << "/usr/local/lib64/";
+			bool found = false;
+			foreach(s, sl){
+				if(QFile::exists(s+QString("libcurl.so"))){
+					found = true;
+					break;
+				}
+			}
+			if(!found) return false;
+			conf->addLib(QString("-L") + s);
+		}
+		return true;
+	}
+};

qcm/libmagick.qcm

@@ -44,18 +44,20 @@ public:
 
 		s = conf->getenv("QC_WITH_LIBMAGICK_LIB");
 		if(!s.isEmpty()) {
-			if(!QFile::exists(s+QString("libMagick++.so"))){
-                          return false;
-                        }
+                        if(!conf->checkLibrary(s, "Magick++")) {
+				return false;
+			}
 		}else{
 			QStringList sl;
 			sl << "/usr/lib/";
+			sl << "/usr/lib64/";
 			sl << "/usr/local/lib/";
+			sl << "/usr/local/lib64/";
 			bool found = false;
 			foreach(s, sl){
-				if(QFile::exists(s+QString("libMagick++.so"))){
+				if(conf->checkLibrary(s, "Magick++")) {
 					found = true;
-					break;
+                                        break;
 				}
 			}
 			if(!found)
@@ -69,6 +71,7 @@ public:
 		magickConfig.waitForStarted();
 		magickConfig.waitForFinished();
 		QByteArray result = magickConfig.readAll();
+		result = result.replace("\n", "");
 		conf->addLib(result.data());
 		conf->addDefine("HAVE_MAGICK");
 		return true;

qcm/libtorrent.qcm

@@ -52,7 +52,9 @@ public:
 		}else{
 			QStringList sl;
 			sl << "/usr/lib/";
+			sl << "/usr/lib64/";
 			sl << "/usr/local/lib/";
+			sl << "/usr/local/lib64/";
 			bool found = false;
 			foreach(s, sl){
 				if(conf->checkLibrary(s, "torrent")){
@@ -63,16 +65,6 @@ public:
 			if(!found) return false;
 			conf->addLib(QString("-L") + s);
 		}
-		// BUGFIX for Fedora (doesn't support pkg-config?)
-		QFile issue_file("/etc/issue");
-		if(issue_file.open(QIODevice::ReadOnly | QIODevice::Text)){
-			QString content = issue_file.readAll();
-			issue_file.close();
-			if(content.indexOf("Fedora") != -1){
-				qWarning("Fedora detected. WORKAROUND for Fedora pkg-config problem enabled");
-				conf->addLib("-lssl -lcrypto -lboost_date_time -lboost_filesystem -lboost_thread -lz -ltorrent");
-			}
-		}
 		return true;
 	}
 };

qcm/libzzip.qcm

@@ -0,0 +1,71 @@
+/*
+-----BEGIN QCMOD-----
+name: libzzip
+arg: with-libzzip-inc=[path], Path to libzzip++ include files
+arg: with-libzzip-lib=[path], Path to libzzip++ library files
+-----END QCMOD-----
+*/
+#include <QProcess>
+class qc_libzzip : public ConfObj
+{
+public:
+	qc_libzzip(Conf *c) : ConfObj(c) {}
+	QString name() const { return "Zzip library (libzzip)"; }
+	QString shortname() const { return "libzzip"; }
+	QString checkString() const {
+		if(!conf->getenv("QC_DISABLE_LIBZZIP").isEmpty())
+			return "";
+		return ConfObj::checkString();
+	}
+	bool exec(){
+		if(!conf->getenv("QC_DISABLE_LIBZZIP").isEmpty())
+			return false;
+		QString s;
+		s = conf->getenv("QC_WITH_LIBZZIP_INC");
+		if(!s.isEmpty()) {
+			if(!conf->checkHeader(s, "zzip/zzip.h")) {
+				return false;
+    			}
+		}else{
+			QStringList sl;
+			sl << "/usr/include";
+			sl << "/usr/local/include";
+			bool found = false;
+			foreach(s, sl){
+				if(conf->checkHeader(s, "zzip/zzip.h")){
+					found = true;
+					break;
+				}
+			}
+			if(!found)
+				return false;
+		}
+		conf->addIncludePath(s);
+
+		s = conf->getenv("QC_WITH_LIBZZIP_LIB");
+		if(!s.isEmpty()) {
+			if(!QFile::exists(s+QString("/libzzip.so"))){
+                          return false;
+                        }
+		}else{
+			QStringList sl;
+			sl << "/usr/lib/";
+			sl << "/usr/lib64/";
+			sl << "/usr/local/lib/";
+			sl << "/usr/local/lib64/";
+			bool found = false;
+			foreach(s, sl){
+				if(QFile::exists(s+QString("libzzip.so"))){
+					found = true;
+					break;
+				}
+			}
+			if(!found)
+                         	return false;
+		}
+		conf->addLib(QString("-L") + s);
+		conf->addLib("-lzzip");
+		conf->addDefine("HAVE_ZZIP");
+		return true;
+	}
+};

qcm/python.qcm

@@ -1,19 +0,0 @@
-/*
------BEGIN QCMOD-----
-name: python
------END QCMOD-----
-*/
-class qc_python : public ConfObj
-{
-public:
-	qc_python(Conf *c) : ConfObj(c) {}
-	QString name() const { return "python >= 2.3"; }
-	QString shortname() const { return "python"; }
-	bool exec(){
-          int r = conf->doCommand("python testpython.py");
-	  if(r == 0)
-	    return true;
-	  else
-	    return false;
-	}
-};

qcm/qt4.qcm

@@ -0,0 +1,16 @@
+/*
+-----BEGIN QCMOD-----
+name: Qt >= 4.3
+-----END QCMOD-----
+*/
+class qc_qt4 : public ConfObj
+{
+public:
+	qc_qt4(Conf *c) : ConfObj(c) {}
+	QString name() const { return "Qt >= 4.3"; }
+	QString shortname() const { return "Qt 4.3"; }
+	bool exec()
+	{
+		return(QT_VERSION >= 0x040300);
+	}
+};

qcm/qt42.qcm

@@ -1,16 +0,0 @@
-/*
------BEGIN QCMOD-----
-name: Qt >= 4.2
------END QCMOD-----
-*/
-class qc_qt42 : public ConfObj
-{
-public:
-	qc_qt42(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Qt >= 4.2"; }
-	QString shortname() const { return "qt42"; }
-	bool exec()
-	{
-		return(QT_VERSION >= 0x040200);
-	}
-};

src/DLListDelegate.h

@@ -83,11 +83,9 @@ class DLListDelegate: public QItemDelegate {
           newopt.maximum = 100;
           newopt.minimum = 0;
           newopt.state |= QStyle::State_Enabled;
-          newopt.textVisible = false;
+          newopt.textVisible = true;
           QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt,
           painter);
-          painter->setPen(QColor("Black"));
-          painter->drawText(opt.rect, Qt::AlignCenter, newopt.text);
           break;
         }
         default:

src/FinishedListDelegate.h

@@ -34,11 +34,10 @@
 // Defines for download list list columns
 #define F_NAME 0
 #define F_SIZE 1
-#define F_PROGRESS 2
-#define F_UPSPEED 3
-#define F_SEEDSLEECH 4
-#define F_RATIO 5
-#define F_HASH 6
+#define F_UPSPEED 2
+#define F_LEECH 3
+#define F_RATIO 4
+#define F_HASH 5
 
 class FinishedListDelegate: public QItemDelegate {
   Q_OBJECT
@@ -67,22 +66,6 @@ class FinishedListDelegate: public QItemDelegate {
           QItemDelegate::drawDisplay(painter, opt, opt.rect, QString(QByteArray::number(ratio, 'f', 1)));
           break;
         }
-        case F_PROGRESS:{
-          QStyleOptionProgressBarV2 newopt;
-          double progress = index.data().toDouble()*100.;
-          newopt.rect = opt.rect;
-          newopt.text = QString(QByteArray::number(progress, 'f', 1))+QString::fromUtf8("%");
-          newopt.progress = (int)progress;
-          newopt.maximum = 100;
-          newopt.minimum = 0;
-          newopt.state |= QStyle::State_Enabled;
-          newopt.textVisible = false;
-          QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt,
-          painter);
-          painter->setPen(QColor("Black"));
-          painter->drawText(opt.rect, Qt::AlignCenter, newopt.text);
-          break;
-        }
         default:
           QItemDelegate::paint(painter, option, index);
       }

src/FinishedTorrents.h

@@ -39,6 +39,10 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     FinishedListDelegate *finishedListDelegate;
     QStandardItemModel *finishedListModel;
     unsigned int nbFinished;
+    void hideOrShowColumn(int index);
+    bool loadHiddenColumns();
+    void saveHiddenColumns();
+    QAction* getActionHoSCol(int index);
 
   public:
     FinishedTorrents(QObject *parent, bittorrent *BTSession);
@@ -53,6 +57,7 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
   protected slots:
     void showProperties(const QModelIndex &index);
     void displayFinishedListMenu(const QPoint&);
+    void displayFinishedHoSMenu(const QPoint&);
     void setRowColor(int row, QString color);
     void saveColWidthFinishedList() const;
     void sortFinishedList(int index);
@@ -62,6 +67,11 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     void torrentAdded(QString path, QTorrentHandle& h, bool fastResume);
     void on_actionSet_upload_limit_triggered();
     void notifyTorrentDoubleClicked(const QModelIndex& index);
+    void hideOrShowColumnName();
+    void hideOrShowColumnSize();
+    void hideOrShowColumnUpSpeed();
+    void hideOrShowColumnLeechers();
+    void hideOrShowColumnRatio();
 
   public slots:
     void addTorrent(QString hash);
@@ -70,10 +80,11 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     void resumeTorrent(QString hash);
     void propertiesSelection();
     void deleteTorrent(QString hash);
+    void showPropertiesFromHash(QString hash);
 
   signals:
     void torrentMovedFromFinishedList(QString);
-    void torrentDoubleClicked(QString hash);
+    void torrentDoubleClicked(QString hash, bool finished);
     void finishedTorrentsNumberChanged(unsigned int);
 
 };

src/GUI.h

@@ -46,6 +46,7 @@ class options_imp;
 class QTabWidget;
 class QLabel;
 class QModelIndex;
+class HttpServer;
 
 class GUI : public QMainWindow, private Ui::MainWindow{
   Q_OBJECT
@@ -59,12 +60,15 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     QTabWidget *tabs;
     options_imp *options;
     QSystemTrayIcon *myTrayIcon;
+    QTimer *systrayCreator;
     QMenu *myTrayIconMenu;
     DownloadingTorrents *downloadingTorrentTab;
     FinishedTorrents *finishedTorrentTab;
     QLabel *connecStatusLblIcon;
     bool systrayIntegration;
+    bool displaySpeedInTitle;
     bool force_exit;
+    unsigned int refreshInterval;
     QTimer *refresher;
     // Keyboard shortcuts
     QShortcut *switchSearchShortcut;
@@ -72,12 +76,12 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     QShortcut *switchDownShortcut;
     QShortcut *switchUpShortcut;
     QShortcut *switchRSSShortcut;
-    // Preview
-    QProcess *previewProcess;
     // Search
     SearchEngine *searchEngine;
     // RSS
     RSSImp *rssWidget;
+    // Web UI
+    HttpServer *httpServer;
     // Misc
     QTcpServer *tcpServer;
     QTcpSocket *clientConnection;
@@ -94,9 +98,9 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     void readParamsOnSocket();
     void acceptConnection();
     void togglePausedState(QString hash);
+    void torrentDoubleClicked(QString hash, bool finished);
     void on_actionPreview_file_triggered();
     void previewFile(QString filePath);
-    void cleanTempPreviewFile(int, QProcess::ExitStatus) const;
     void balloonClicked();
     void writeSettings();
     void readSettings();
@@ -106,6 +110,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     void updateFinishedTorrentNumber(unsigned int nb);
     void fullDiskError(QTorrentHandle& h) const;
     void handleDownloadFromUrlFailure(QString, QString) const;
+    void createSystrayDelayed();
     // Keyboard shortcuts
     void createKeyboardShortcuts();
     void displayDownTab() const;
@@ -127,13 +132,18 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     void checkConnectionStatus();
     void configureSession(bool deleteOptions);
     void processParams(const QStringList& params);
+    void addTorrent(QString path);
     void addUnauthenticatedTracker(QPair<QTorrentHandle,QString> tracker);
     void processScannedFiles(const QStringList& params);
     void processDownloadedFiles(QString path, QString url);
     void downloadFromURLList(const QStringList& urls);
+    void deleteTorrent(QString hash);
+    void deleteRatioTorrent(QString fileName);
     void finishedTorrent(QTorrentHandle& h) const;
     void torrentChecked(QString hash) const;
     void updateLists();
+    bool initWebUi(QString username, QString password, int port);
+    void pauseTorrent(QString hash);
     // Options slots
     void on_actionOptions_triggered();
     void OptionsSaved(QString info, bool deleteOptions);
@@ -144,6 +154,9 @@ class GUI : public QMainWindow, private Ui::MainWindow{
   public slots:
     void trackerAuthenticationRequired(QTorrentHandle& h);
     void setTabText(int index, QString text) const;
+    void openDestinationFolder() const;
+    void goBuyPage() const;
+    void updateRatio();
 
   protected:
     void closeEvent(QCloseEvent *);
@@ -154,7 +167,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     GUI(QWidget *parent=0, QStringList torrentCmdLine=QStringList());
     ~GUI();
     // Methods
-    unsigned int getCurrentTabIndex() const;
+    int getCurrentTabIndex() const;
     QPoint screenCenter() const;
 };