Tagged v2.0.3 release

ents attached

AUTHORS

@@ -3,26 +3,15 @@ Author:
 
 Contributors:
 * Stefanos Antaris <santaris@csd.auth.gr>
-* Mohammad Dib <mdib@qbittorrent.org>
-* Mirco Chinelli <infinity89@fastwebmail.it>
 * Ishan Arora <ishan@qbittorrent.org>
 * Arnaud Demaizière <arnaud@qbittorrent.org>
 * Grigis Gaëtan <cipher16@gmail.com>
-* Christian Kandeler <zambesi@users.sourceforge.net>
 
 Code from other projects:
-* files src/qtsingleapp/*
-  copyright: Nokia Corporation
-  license: LGPL
-
 * files src/ico.cpp src/ico.h
   copyright: Malte Starostik <malte@kde.org>
   license: LGPL
 
-* files src/search_engine/socks.py
-  copyright: Dan Haim <negativeiq@users.sourceforge.net>
-  license: BSD
-
 Images Authors:
 * files: src/Icons/*.png
   copyright: Gnome Icon Theme
@@ -66,13 +55,11 @@ Images Authors:
 Translations authors:
 * files: src/lang/*.ts
   copyright:
-  - Arabic: SDERAWI (abz8868@msn.com) and sn51234 (nesseyan@gmail.com)
   - Brazilian: Nick Marinho (nickmarinho@gmail.com)
-  - Bulgarian: Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net)
-  - Catalan: Francisco Luque Contreras (frannoe@ya.com)
+  - Bulgarian: Tsvetan & Boiko Bankov (emerge_life@users.sourceforge.net)
+  - Catalan: Gekko Dam Beer (gekko04@users.sourceforge.net)
   - Chinese (Simplified): Guo Yue (yue.guo0418@gmail.com)
   - Chinese (Traditional): Yi-Shun Wang (dnextstep@gmail.com)
-  - Croatian: Oliver Mucafir (oliver.untwist@gmail.com)
   - Czech: Jirka Vilim (web@tets.cz)
   - Danish: Mathias Nielsen (comoneo@gmail.com)
   - Dutch: Joost Schipper (heavyjoost@users.sourceforge.net)
@@ -95,5 +82,5 @@ Translations authors:
   - Spanish: Francisco Luque Contreras (frannoe@ya.com)
   - Swedish: Daniel Nylander (po@danielnylander.se)
   - Turkish: Hasan Yilmaz (iletisim@hedefturkce.com)
-  - Ukrainian: Andrey Shpachenko (masterfix@users.sourceforge.net) and Oleh Prypin (blaxpirit@gmail.com)
+  - Ukrainian: Andrey Shpachenko (masterfix@users.sourceforge.net)
   license: GPLv2

Changelog

@@ -1,176 +1,3 @@
-* Sun Jun 13 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.9
-    - FEATURE: Official support for Win32 platform
-    - FEATURE: Better integration with Mac OS
-    - BUGFIX: Fix torrent availability computation (closes #587337)
-    - BUGFIX: Disable torrent addition dialog as a default
-    - BUGFIX: Fix Web UI authentication with Opera Browser
-    - BUGFIX: Fix Javascript error in Web UI when using IE
-    - BUGFIX: Fix a lot of encoding problems on non UTF-8 systems
-    - BUGFIX: Fix race condition allowing to run multiple instances (closes #286968)
-    - BUGFIX: Fix window hiding problem when having a modal window (closes #589070)
-
-* Mon May 24 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.8
-    - BUGFIX: ETA for finished torrent is now 0 instead of Infinite (closes #583704)
-    - BUGFIX: Fix sorting of ETA column when having infinite values (closes #583347)
-    - BUGFIX: Torrent queue position now starts at 1 (closes #581130)
-    - BUGFIX: Fix unicode issue in start seeding after torrent creation code
-    - BUGFIX: Fix torrent error state clearance on resuming
-    - BUGFIX: Fix possible checkbox update in Web UI
-    - COSMETIC: Fix torrent properties layout
-
-* Wed May 12 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.7
-    - BUGFIX: Fix unicode problem in torrent moving code
-    - BUGFIX: Fix possible initialization problem in Web UI
-    - BUGFIX: Fix torrent moving after completion feature
-    - BUGFIX: Improved empty folder removing code
-    - BUGFIX: Use guid or news url as RSS items identifier (instead of title)
-    - BUGFIX: Fix possible crash in RSS item selection code
-    - BUGFIX: Added support for url encoded ampersands in RSS
-    - COSMETIC: Sort torrent labels in popup menu
-    - I18N: Added Croatian translation
-
-* Sun Apr 18 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.6
-    - BUGFIX: Announce to all trackers at once
-    - BUGFIX: Added support for single-thread boost
-    - BUGFIX: Remove old folder when moving a torrent
-    - BUGFIX: Improved reliability of torrent moving
-    - BUGFIX: Stop rechecking torrents when they are moved
-    - BUGFIX: Status filters height stays correct when the visual style changes
-    - I18N: Added Arabic translation
-
-* Wed Apr 07 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.5
-    - BUGFIX: Fix crash when adding a new torrent label
-    - BUGFIX: Fix HTTPS protocol support in torrent/rss downloader
-    - BUGFIX: Fix default width of file name column in torrent content
-    - BUGFIX: Fix torrent addition dialog buttons height
-    - BUGFIX: Fix deprecation warnings with libtorrent v0.15
-    - BUGFIX: Fix "Download from URL" title size in Web UI
-    - BUGFIX: Fix transparency of speed limits icons
-    - BUGFIX: Dropped dependency on Qt gif library
-    - BUGFIX: Improved libboost detection by configure file
-    - BUGFIX: Bring back compatibility with boost v1.34
-    - COSMETIC: Added icons to menu actions in Web UI
-
-* Tue Apr 06 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.4
-    - BUGFIX: Fix possible crash when adding a torrent
-    - BUGFIX: Fix failure to remember some torrents on startup
-    - BUGFIX: Fix torrent addition window layout (torrent content not expanding)
-    - BUGFIX: Fix about dialog in Web UI
-    - BUGFIX: Correctly clear trackers error messages once they work
-    - BUGFIX: Display correct share ratio for paused torrents
-    - COSMETIC: Improved alternative speed limits icons
-
-* Sun Apr 04 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.3
-    - BUGFIX: Fix possible crash when deleting a torrent just after pausing it
-    - BUGFIX: Enable Apply button when alternative rate limits are changed
-    - BUGFIX: Source compatibility with Windows (Thanks Ishan Arora)
-    - BUGFIX: Source compatibility with eCS (OS/2) (Thanks Silvan Scherrer)
-    - BUGFIX: Cleaner binutils gold linker support
-    - BUGFIX: Clean fix for progress display with cleanlooks style
-
-* Mon Mar 22 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.2
-    - FEATURE: DHT port can be set from Web UI
-    - BUGFIX: Fix possible crash with folder scanning
-    - BUGFIX: Fix Mac compilation
-    - BUGFIX: Save fast resume data every 3 minutes (for robustness)
-    - I18N: Updated Polish translation (thanks Szymon Świerkosz)
-
-* Sat Mar 20 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.1
-    - FEATURE: Display pieces that are being downloaded
-    - FEATURE: Added back folder watching in Web UI
-    - FEATURE: Added back file prioritizing in Web UI
-    - BUGFIX: Fix compilation with Qt 4.4
-    - BUGFIX: Fix Web UI compatibility with Safari
-    - BUGFIX: Fix progress display with cleanlook style
-    - BUGFIX: Fix file filtering in complex torrents
-    - BUGFIX: Ask for user confirmation for recursive torrent download
-    - BUGFIX: Fix "add file" dialog in torrent creation tool
-    - BUGFIX: Fix "Ctrl+A" in Web UI
-
-* Sun Mar 14 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.0
-    - FEATURE: User can set alternative speed limits for fast toggling
-    - FEATURE: Bandwidth scheduler (automatically use alternative speed limits for a given period)
-    - FEATURE: Added "Added/Completed On" columns to transfer list
-    - FEATURE: Added "Upload/Download limit" columns to transfer list
-    - FEATURE: Torrent files can be exported to a given directory
-    - FEATURE: Outgoing ports range can be customized (for QoS)
-    - FEATURE: User can choose to apply transfer limits on LAN too
-    - FEATURE: User can choose to include the protocol overhead in transfer limits
-    - FEATURE: Torrents can be automatically rechecked on completion
-    - FEATURE: If 2 torrents have the same hash, add new trackers/URL seeds to the existing torrent
-    - FEATURE: Trackers can be added from Web UI
-    - FEATURE: Global transfer information are displayed in the new Web UI status bar
-    - FEATURE: Allow to change the priority of several files at once
-    - FEATURE: Support for multiple scan folders (Patch by Christian Kandeler)
-    - BUGFIX: Only one log window can be opened at a time
-    - BUGFIX: Optimized RSS module memory usage
-    - BUGFIX: Consider HTTP downloads >1MB as invalid .torrent files and abort
-    - BUGFIX: Fix Web UI authentication with some browsers
-    - BUGFIX: Set Web UI ban period to 1 hour
-    - COSMETIC: Improved style management
-
-* Mon Jan 18 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.1.0
-    - FEATURE: Graphical User Interface can be disabled at compilation time (headless running)
-    - FEATURE: Torrents can be labeled/categorized
-    - FEATURE: Labeled torrent can be downloaded corresponding subfolders
-    - FEATURE: Disk cache size can be set from preferences
-    - FEATURE: Peer Exchange (PeX) can be disabled from preferences
-    - FEATURE: Append !.qB extension to incomplete files option (libtorrent >= v0.15 only)
-    - FEATURE: Torrent files/folders can be renamed (torrent addition dialog or files properties)
-    - FEATURE: uTorrent compatible tracker list support (use torrentz.com url as a default)
-    - FEATURE: Better proxy support and preferences remodeling
-    - FEATURE: qBittorrent can identify itself as uTorrent, Vuze or KTorrent (Any stable version)
-    - FEATURE: Torrents can be renamed in transfer list
-    - FEATURE: Display torrent addition dialog for magnet links too
-    - FEATURE: Files contained in a torrent are opened on double click (files panel)
-    - FEATURE: Added support for magnet links in search engine
-    - FEATURE: Added vertor.com and torrentdownloads.net search plugins
-    - FEATURE: Search engine can now use a SOCKS5 proxy
-    - FEATURE: HTTP proxy support for peer communication
-    - BUGFIX: Search engine loads new proxy settings without program restart
-    - BUGFIX: Use XDG folders (.cache, .local) instead of .qbittorrent
-    - BUGFIX: Added legal notice on startup that the user must accept
-    - BUGFIX: Protect Web UI authentication against brute forcing
-    - BUGFIX: Use HTTP digest mode for Web UI authentication (instead of Basic)
-    - BUGFIX: Properly display torrents with one file in subfolder(s)
-    - BUGFIX: Display Web UI favicon
-    - BUGFIX: File priority can be set for finished torrents that have filtered files
-    - COSMETIC: Use checkboxes to filter torrent content instead of comboboxes
-    - COSMETIC: Use alternating row colors in transfer list (set in program preferences)
-    - COSMETIC: Added a spin box to speed limiting dialog for manual input
-
-* Mon Jan 11 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.0.7
-    - BUGFIX: Fix 'Add in pause' setting in torrent addition dialog
-    - BUGFIX: Update RSS feed as soon as feed downloader is enabled
-    - BUGFIX: RSS Feed downloader ignores articles above maximum number of articles
-    - BUGFIX: Fix possible bug when deleting a RSS folder
-    - BUGFIX: Remove persistant data when a RSS feed is deleted
-    - BUGFIX: RSS filters are now alphabetically sorted
-    - BUGFIX: Fix crash when renaming currently displayed RSS filter
-    - BUGFIX: Remove overwriting confirmation when exporting RSS filters since Qt takes care of it
-
-* Tue Jan 5 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.0.6
-    - BUGFIX: Fix detection of invalid torrent files
-    - BUGFIX: Stop catching signals once one has been caught to avoid possible infinite loop
-    - BUGFIX: Force data recheck whenever a torrent is moved
-    - BUGFIX: Detect existing torrent data even if incomplete torrents are saved to a different folder
-    - COSMETIC: Improve torrent deletion confirmation dialog so that the text that not get truncated
-
-* Thu Dec 31 2009 - Christophe Dumez <chris@qbittorrent.org> - v2.0.5
-    - BUGFIX: Fix crash with downloaded/availability bars when the torrent has too many pieces
-
-* Wed Dec 30 2009 - Christophe Dumez <chris@qbittorrent.org> - v2.0.4
-    - BUGFIX: Fix PeerGuardian .p2b binary filter support
-    - BUGFIX: Fix possible crash when closing a search engine tab
-    - BUGFIX: Make sure service port does not change
-    - BUGFIX: Fix possible DHT port saving issue
-    - BUGFIX: Fix communication between qBittorrent and Web UI (Qt 4.6)
-    - BUGFIX: Use Wildcard matching instead of full regex in RSS feed downloader
-    - BUGFIX: Fix code for listening on a random port whenever it failed to listen on the one defined
-    - BUGFIX: Use global maximum transfer rates as maximum values in per-torrent speed limiting dialogs
-    - BUGFIX: Fix global download rate limiting from Web UI
-    - COSMETIC: Display a disconnected icon in status bar whenever qBittorrent failed to listen on the port defined
-
 * Wed Dec 23 2009 - Christophe Dumez <chris@qbittorrent.org> - v2.0.3
     - BUGFIX: Minor cosmetic fix to program preferences
     - BUGFIX: Fix "Temp path" button in program preferences

INSTALL

@@ -1,57 +1,32 @@
 qBittorrent - A BitTorrent client in C++ / Qt4
 ------------------------------------------
 
-1) Compile and install qBittorrent with Qt4 Graphical Interface
+./configure
+make && make install
+qbittorrent
 
-  $ ./configure
-  $ make && make install
-  $ qbittorrent
+will install and execute qBittorrent hopefully without any problems.
 
-  will install and execute qBittorrent hopefully without any problems.
+Dependencies:
+- Qt >= 4.4.0 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml)
 
-  Dependencies:
-    - Qt >= 4.4.0 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml)
+- libtorrent-rasterbar by Arvid Norberg (>= 0.14.0 REQUIRED, >= v0.15.0 ADVISED)
+    -> http://www.qbittorrent.org/download.php (advised)
+    -> http://www.libtorrent.net
+    Be careful: another library (the one used by rTorrent) uses a similar name.
 
-    - pkg-config executable
+- libboost: libboost-filesystem, libboost-date-time, libboost-thread, libboost-serialization
 
-    - libtorrent-rasterbar by Arvid Norberg (>= 0.14.4 REQUIRED, compatible with v0.15.x)
-        -> http://www.libtorrent.net
-        Be careful: another library (the one used by rTorrent) uses a similar name.
+- python >= 2.3 (needed by search engine)
+  * Run time only dependency
 
-    - libboost 1.34.x (libboost-filesystem, libboost-thread, libboost-date-time) + libasio
-      or
-    - libboost >= 1.35.x (libboost-system, libboost-filesystem, libboost-thread, libboost-date-time)
-
-    - python >= 2.3 (needed by search engine)
-        * Run time only dependency
-
-    - libnotify >= 0.4.2, glib-2.0 (optional)
-        * Can be used for system notifications to replace standard Qt notifications
-          so that it integrates better into the Desktop
-
-    - geoip-database (optional)
-        * If qBittorrent cannot find this database, it will try to resolve countries using the Internet but it will be a lot slower.
-        * Run time only dependency
-
-2) Compile and install qBittorrent without Qt4 Graphical interface
-
-  $ ./configure --disable-gui
-  $ make && make install
-  $ qbittorrent
-
-  will install and execute qBittorrent hopefully without any problems.
-
-  Dependencies:
-    - Qt >= 4.4.0 (libqt-devel, libqtcore, libqtnetwork)
-
-    - pkg-config executable
-
-    - libtorrent-rasterbar by Arvid Norberg (>= 0.14.4 REQUIRED, >= v0.15.0 ADVISED)
-        -> http://www.libtorrent.net
-        Be careful: another library (the one used by rTorrent) uses a similar name.
-
-    - libboost: libboost-filesystem, libboost-date-time, libboost-thread, libboost-serialization
+- libnotify >= 0.4.2, glib-2.0 (optional)
+  * Can be used for system notifications to replace standard Qt notifications
+    so that it integrates better into the Desktop
 
+- geoip-database (optional)
+  * If qBittorrent cannot find this database, it will try to resolve countries using the Internet but it will be a lot slower.
+  * Run time only dependency
 
 DOCUMENTATION:
 Please note that there is a documentation with a "compiling howto" at http://wiki.qbittorrent.org.

README.os2

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

configure

@@ -18,10 +18,7 @@ Main options:
   --help              This help text.
 
 Dependency options:
-  --disable-gui                      Disable qBittorrent Graphical user
-                                    interface for headless running
   --with-libboost-inc=[path]         Path to libboost include files
-  --with-libboost-lib=[path]         Path to libboost library files
   --disable-libnotify               Disable use of libnotify
   --disable-geoip-database          Disable use of geoip-database
   --with-geoip-database-embedded     Geoip Database will be embedded in
@@ -143,21 +140,11 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
-		--disable-gui)
-			QC_DISABLE_GUI="Y"
-			shift
-			;;
-
 		--with-libboost-inc=*)
 			QC_WITH_LIBBOOST_INC=$optarg
 			shift
 			;;
 
-		--with-libboost-lib=*)
-			QC_WITH_LIBBOOST_LIB=$optarg
-			shift
-			;;
-
 		--disable-libnotify)
 			QC_DISABLE_libnotify="Y"
 			shift
@@ -194,9 +181,7 @@ echo PREFIX=$PREFIX
 echo BINDIR=$BINDIR
 echo DATADIR=$DATADIR
 echo EX_QTDIR=$EX_QTDIR
-echo QC_DISABLE_GUI=$QC_DISABLE_GUI
 echo QC_WITH_LIBBOOST_INC=$QC_WITH_LIBBOOST_INC
-echo QC_WITH_LIBBOOST_LIB=$QC_WITH_LIBBOOST_LIB
 echo QC_DISABLE_libnotify=$QC_DISABLE_libnotify
 echo QC_DISABLE_geoip_database=$QC_DISABLE_geoip_database
 echo QC_WITH_GEOIP_DATABASE_EMBEDDED=$QC_WITH_GEOIP_DATABASE_EMBEDDED
@@ -305,7 +290,6 @@ cat >$1/modules.cpp <<EOT
 /*
 -----BEGIN QCMOD-----
 name: Qt >= 4.4
-arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
 -----END QCMOD-----
 */
 class qc_qt4 : public ConfObj
@@ -316,27 +300,11 @@ public:
 	QString shortname() const { return "Qt 4.4"; }
 	bool exec()
 	{
-		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-			conf->addDefine("DISABLE_GUI");
-		}	
+		if(QT_VERSION >= 0x040500) {
+                        conf->addDefine("QT_4_5");
+                }
 		return(QT_VERSION >= 0x040400);
-	}
-};
-#line 1 "pkg-config.qcm"
-/*
------BEGIN QCMOD-----
-name: pkg-config
------END QCMOD-----
-*/
-#include <QProcess>
-class qc_pkg_config : public ConfObj
-{
-public:
-	qc_pkg_config(Conf *c) : ConfObj(c) {}
-	QString name() const { return "pkg-config executable"; }
-	QString shortname() const { return "pkg-config"; }
-	bool exec(){
-		return !conf->findProgram("pkg-config").isEmpty();
+		
 	}
 };
 #line 1 "libtorrent-rasterbar.qcm"
@@ -350,20 +318,24 @@ class qc_libtorrent_rasterbar : public ConfObj
 {
 public:
 	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent-rasterbar >= 0.14.4"; }
+	QString name() const { return "libtorrent-rasterbar >= 0.14.0 (>= 0.15.0 advised)"; }
 	QString shortname() const { return "libtorrent-rasterbar"; }
 	bool exec(){
 		QStringList incs;
-		QString req_ver = "0.14.4";
+		QString req_ver = "0.14.0";
+		QString adv_ver = "0.15.0";
 		QString version, libs, other;
 		VersionMode mode = VersionMin;
 		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other))
 			return false;
 		for(int n = 0; n < incs.count(); ++n)
 			conf->addIncludePath(incs[n]);
-		if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-  		  conf->addLib("-lcrypto");
-                }
+		if(!libs.isEmpty())
+			conf->addLib(libs);
+		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other))
+                        printf("\nWarning: libtorrent-rasterbar v%s was detected.\nAlthough it will compile and run, you will be missing some features. Please consider updating to v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
+		else
+			conf->addDefine("LIBTORRENT_0_15");
 		return true;
 	}
 };
@@ -372,39 +344,14 @@ public:
 -----BEGIN QCMOD-----
 name: libboost
 arg: with-libboost-inc=[path], Path to libboost include files
-arg: with-libboost-lib=[path], Path to libboost library files
 -----END QCMOD-----
 */
-#include <boost/version.hpp>
 class qc_libboost : public ConfObj
 {
 public:
 	qc_libboost(Conf *c) : ConfObj(c) {}
 	QString name() const { return "libboost"; }
 	QString shortname() const { return "libboost"; }
-  QString findBoostLib(QString path, QString lib) const {
-    QString name;
-    QDir libDir(path);
-    QStringList filters;
-    filters << "libboost_"+lib+"*-mt*.so";
-    QStringList result = libDir.entryList(filters, QDir::Files);
-    if(!result.empty()) {
-      name = result.first().mid(3);
-      // Remove .so
-      name.chop(3);
-    } else {
-      // Fall back to non -mt boost lib
-      filters.clear();
-      filters << "libboost_"+lib+"*.so";
-      result = libDir.entryList(filters, QDir::Files);
-      if(!result.empty()) {
-        name = result.first().mid(3);
-        // Remove .so
-        name.chop(3);
-      }
-    }
-    return name;
-  }
 	bool exec(){
         	QString s;
 		s = conf->getenv("QC_WITH_LIBBOOST_INC");
@@ -446,43 +393,6 @@ public:
       			}
 		}
 		conf->addIncludePath(s);
-		// Find library
-		s = conf->getenv("QC_WITH_LIBBOOST_LIB");
-    QStringList required_libs;
-#if BOOST_VERSION >= 103500
-      required_libs << "system"; 
-#endif
-    if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-      // Not required by nox
-      required_libs << "filesystem" << "thread";
-    }
-    QStringList libDirs;
-    libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
-    foreach(const QString& lib, required_libs) {
-      if(!s.isEmpty()) {
-        QString detected_name = findBoostLib(s, lib);
-        if(detected_name.isEmpty()) {
-          printf("Could not find boost %s library!\n", qPrintable(lib));
-          return false;
-        } else {
-          conf->addLib("-l"+detected_name);
-        }
-      } else {
-        bool found = false;
-        foreach(const QString& libDir, libDirs) {
-          QString detected_name = findBoostLib(libDir, lib);
-          if(!detected_name.isEmpty()) {
-            conf->addLib("-l"+detected_name);
-            found = true;
-            break;
-          }
-        }
-        if(!found) {
-          printf("Could not find boost %s library!\n", qPrintable(lib));
-          return false;
-        }
-      }
-    }
 		return true;
 	}
 };
@@ -499,15 +409,7 @@ public:
 	qc_libnotify(Conf *c) : ConfObj(c) {}
 	QString name() const { return "libnotify >= 0.4.2 (optional)"; }
 	QString shortname() const { return "libnotify"; }
-        QString checkString() const {
-                if(!conf->getenv("QC_DISABLE_libnotify").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
-                        return "";
-                return ConfObj::checkString();
-        }
 	bool exec(){
-		if(!conf->getenv("QC_DISABLE_libnotify").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-			return false;
-		}
 		QStringList incs;
 		QString req_ver = "0.4.2";
 		QString version, libs, other;
@@ -550,15 +452,7 @@ public:
 	qc_geoip_database(Conf *c) : ConfObj(c) {}
 	QString name() const { return "GeoIP Database (optional)"; }
 	QString shortname() const { return "GeoIP Database"; }
-        QString checkString() const {
-                if(!conf->getenv("QC_DISABLE_geoip_database").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
-                        return "";
-                return ConfObj::checkString();
-        }
 	bool exec() {
-	if(!conf->getenv("QC_DISABLE_geoip_database").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-		return false;
-	}
 #ifdef Q_WS_X11
 		if(!conf->getenv("QC_WITH_GEOIP_DATABASE_EMBEDDED").isEmpty()) {
 #endif
@@ -580,9 +474,6 @@ cat >$1/modules_new.cpp <<EOT
     o = new qc_qt4(conf);
     o->required = true;
     o->disabled = false;
-    o = new qc_pkg_config(conf);
-    o->required = true;
-    o->disabled = false;
     o = new qc_libtorrent_rasterbar(conf);
     o->required = true;
     o->disabled = false;
@@ -1540,9 +1431,7 @@ export PREFIX
 export BINDIR
 export DATADIR
 export EX_QTDIR
-export QC_DISABLE_GUI
 export QC_WITH_LIBBOOST_INC
-export QC_WITH_LIBBOOST_LIB
 export QC_DISABLE_libnotify
 export QC_DISABLE_geoip_database
 export QC_WITH_GEOIP_DATABASE_EMBEDDED

doc/qbittorrent-nox.1

@@ -1,44 +0,0 @@
-.\" This manpage has been automatically generated by docbook2man
-.\" from a DocBook document.  This tool can be found at:
-.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>.
-.TH "QBITTORRENT\-NOX" "1" "January 16th 2010" "Command line Bittorrent client written in C++ / Qt4" ""
-
-.SH "NAME"
-qBittorrent\-nox \- a command line Bittorrent client written in C++ / Qt4
-
-.SH "SYNOPSIS"
-
-\fBqbittorrent\-nox\fR [\-\-webui-port=x] [TORRENT_FILE | URL]...
-
-\fBqbittorrent\-nox\fR \-\-help
-
-\fBqbittorrent\-nox\fR \-\-version
-
-.PP
-.SH "DESCRIPTION"
-
-\fBqBittorrent-nox\fR is an advanced command-line Bittorrent client written in C++ / Qt4,
-using the \fBlibtorrent-rasterbar\fR library by Arvid Norberg. qBittorrent\-nox aims
-to be a good alternative to other command line bittorrent clients and provides features similar to popular graphical clients.
-
-qBittorrent\-nox is fast, stable, light and it supports unicode. 
-It also comes with UPnP port forwarding / NAT-PMP, encryption (Vuze compatible), 
-FAST extension (mainline) and PeX support (utorrent compatible).
-
-qBittorrent\-nox is meant to be controlled via its feature-rich Web UI which is accessible as a default on http://localhost:8080. The Web UI access is secured and the default account user name is "admin" with "adminadmin" as a password.
-
-.SH "OPTIONS"
-
-\fB--help\fR Prints the command line options.
-
-\fB--version\fR Prints qbittorrent program version number.
-
-\fB--webui-port=x\fR Changes Web UI port to x (default: 8080).
-
-.SH "BUGS"
-
-If you find a bug, please report it at http://bugs.qbittorrent.org
-
-.SH "AUTHOR"
-
-Christophe Dumez <chris@qbittorrent.org>

doc/qbittorrent.1

@@ -1,14 +1,14 @@
 .\" This manpage has been automatically generated by docbook2man
 .\" from a DocBook document.  This tool can be found at:
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>.
-.TH "QBITTORRENT" "1" "January 16th 2010" "Bittorrent client written in C++ / Qt4" ""
+.TH "QBITTORRENT" "1" "September 30th 2009" "Bittorrent client written in C++ / Qt4" ""
 
 .SH "NAME"
 qBittorrent \- a Bittorrent client written in C++ / Qt4
 
 .SH "SYNOPSIS"
 
-\fBqbittorrent\fR [\-\-no-splash] [\-\-webui-port=x] [TORRENT_FILE | URL]...
+\fBqbittorrent\fR [\-\-no-splash] [TORRENT_FILE | URL]...
 
 \fBqbittorrent\fR \-\-help
 
@@ -18,9 +18,10 @@ qBittorrent \- a Bittorrent client written in C++ / Qt4
 .SH "DESCRIPTION"
 
 \fBqBittorrent\fR is an advanced Bittorrent client written in C++ / Qt4,
-using the \fBlibtorrent-rasterbar\fR library by Arvid Norberg. qBittorrent is similar to uTorrent. qBittorrent
+using the \fBrblibtorrent\fR library by Arvid Norberg. qBittorrent aims
+to be a good alternative to all other bittorrent clients out there. qBittorrent
 is fast, stable, light, it supports unicode and it provides a good integrated search engine.
-It also comes with UPnP port forwarding / NAT-PMP, encryption (Vuze compatible), 
+It also comes with UPnP port forwarding / NAT-PMP, encryption (Azureus compatible), 
 FAST extension (mainline) and PeX support (utorrent compatible).
 
 .SH "OPTIONS"
@@ -31,8 +32,6 @@ FAST extension (mainline) and PeX support (utorrent compatible).
 
 \fB--no-splash\fR Disables splash screen on startup.
 
-\fB--webui-port=x\fR Changes Web UI port to x (default: 8080).
-
 .SH "BUGS"
 
 If you find a bug, please report it at http://bugs.qbittorrent.org

qbittorrent.pro

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

qbittorrent.qc

@@ -6,9 +6,6 @@
   <dep type='qt4'>
     <required/>
   </dep>
-  <dep type='pkg-config'>
-    <required/>
-  </dep>
   <dep type='libtorrent-rasterbar'>
     <required/>
   </dep>

qcm/geoip-database.qcm

@@ -11,15 +11,7 @@ public:
 	qc_geoip_database(Conf *c) : ConfObj(c) {}
 	QString name() const { return "GeoIP Database (optional)"; }
 	QString shortname() const { return "GeoIP Database"; }
-        QString checkString() const {
-                if(!conf->getenv("QC_DISABLE_geoip_database").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
-                        return "";
-                return ConfObj::checkString();
-        }
 	bool exec() {
-	if(!conf->getenv("QC_DISABLE_geoip_database").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-		return false;
-	}
 #ifdef Q_WS_X11
 		if(!conf->getenv("QC_WITH_GEOIP_DATABASE_EMBEDDED").isEmpty()) {
 #endif

qcm/libboost.qcm

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

qcm/libnotify.qcm

@@ -10,15 +10,7 @@ public:
 	qc_libnotify(Conf *c) : ConfObj(c) {}
 	QString name() const { return "libnotify >= 0.4.2 (optional)"; }
 	QString shortname() const { return "libnotify"; }
-        QString checkString() const {
-                if(!conf->getenv("QC_DISABLE_libnotify").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
-                        return "";
-                return ConfObj::checkString();
-        }
 	bool exec(){
-		if(!conf->getenv("QC_DISABLE_libnotify").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-			return false;
-		}
 		QStringList incs;
 		QString req_ver = "0.4.2";
 		QString version, libs, other;

qcm/libtorrent-rasterbar.qcm

@@ -8,20 +8,24 @@ class qc_libtorrent_rasterbar : public ConfObj
 {
 public:
 	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent-rasterbar >= 0.14.4"; }
+	QString name() const { return "libtorrent-rasterbar >= 0.14.0 (>= 0.15.0 advised)"; }
 	QString shortname() const { return "libtorrent-rasterbar"; }
 	bool exec(){
 		QStringList incs;
-		QString req_ver = "0.14.4";
+		QString req_ver = "0.14.0";
+		QString adv_ver = "0.15.0";
 		QString version, libs, other;
 		VersionMode mode = VersionMin;
 		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other))
 			return false;
 		for(int n = 0; n < incs.count(); ++n)
 			conf->addIncludePath(incs[n]);
-		if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-  		  conf->addLib("-lcrypto");
-                }
+		if(!libs.isEmpty())
+			conf->addLib(libs);
+		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other))
+                        printf("\nWarning: libtorrent-rasterbar v%s was detected.\nAlthough it will compile and run, you will be missing some features. Please consider updating to v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
+		else
+			conf->addDefine("LIBTORRENT_0_15");
 		return true;
 	}
 };

qcm/pkg-config.qcm

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

qcm/qt4.qcm

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

src/GUI.h

@@ -43,6 +43,7 @@ class Bittorrent;
 class QTimer;
 class downloadFromURL;
 class SearchEngine;
+class QLocalServer;
 class QCloseEvent;
 class RSSImp;
 class QShortcut;
@@ -54,115 +55,108 @@ class TransferListFiltersWidget;
 class QSplitter;
 class PropertiesWidget;
 class StatusBar;
-class consoleDlg;
-class about;
-class createtorrent;
-class downloadFromURL;
 
 class GUI : public QMainWindow, private Ui::MainWindow{
   Q_OBJECT
 
-public:
-  // Construct / Destruct
-  GUI(QWidget *parent=0, QStringList torrentCmdLine=QStringList());
-  ~GUI();
-  // Methods
-  int getCurrentTabIndex() const;
-  TransferListWidget* getTransferList() const { return transferList; }
-  QMenu* getTrayIconMenu();
+  private:
+    // Bittorrent
+    Bittorrent *BTSession;
+    QList<QPair<QTorrentHandle,QString> > unauthenticated_trackers; // Still needed?
+    // GUI related
+    QTimer *guiUpdater;
+    QTabWidget *tabs;
+    StatusBar *status_bar;
+    QPointer<options_imp> options;
+    QPointer<QSystemTrayIcon> systrayIcon;
+    QPointer<QTimer> systrayCreator;
+    QMenu *myTrayIconMenu;
+    TransferListWidget *transferList;
+    TransferListFiltersWidget *transferListFilters;
+    PropertiesWidget *properties;
+    bool displaySpeedInTitle;
+    bool force_exit;
+    // Keyboard shortcuts
+    QShortcut *switchSearchShortcut;
+    QShortcut *switchSearchShortcut2;
+    QShortcut *switchTransferShortcut;
+    QShortcut *switchRSSShortcut;
+    // Widgets
+    QAction *prioSeparator;
+    QAction *prioSeparator2;
+    QSplitter *hSplitter;
+    QSplitter *vSplitter;
+    // Search
+    SearchEngine *searchEngine;
+    // RSS
+    QPointer<RSSImp> rssWidget;
+    // Misc
+    QLocalServer *localServer;
 
-public slots:
-  void trackerAuthenticationRequired(QTorrentHandle& h);
-  void setTabText(int index, QString text) const;
-  void showNotificationBaloon(QString title, QString msg) const;
-  void downloadFromURLList(const QStringList& urls);
-  void updateAltSpeedsBtn(bool alternative);
+  protected slots:
+    // GUI related slots
+    void dropEvent(QDropEvent *event);
+    void dragEnterEvent(QDragEnterEvent *event);
+    void toggleVisibility(QSystemTrayIcon::ActivationReason e);
+    void on_actionAbout_triggered();
+    void on_actionCreate_torrent_triggered();
+    void on_actionWebsite_triggered() const;
+    void on_actionBugReport_triggered() const;
+    void on_actionShow_console_triggered();
+    void readParamsOnSocket();
+    void acceptConnection();
+    void balloonClicked();
+    void writeSettings();
+    void readSettings();
+    void on_actionExit_triggered();
+    void createTrayIcon();
+    void fullDiskError(QTorrentHandle& h, QString msg) const;
+    void handleDownloadFromUrlFailure(QString, QString) const;
+    void createSystrayDelayed();
+    void tab_changed(int);
+    // Keyboard shortcuts
+    void createKeyboardShortcuts();
+    void displayTransferTab() const;
+    void displaySearchTab() const;
+    void displayRSSTab() const;
+    // Torrent actions
+    void on_actionSet_global_upload_limit_triggered();
+    void on_actionSet_global_download_limit_triggered();
+    void on_actionDocumentation_triggered() const;
+    void on_actionOpen_triggered();
+    void updateGUI();
+    void loadPreferences(bool configure_session=true);
+    void processParams(const QStringList& params);
+    void addTorrent(QString path);
+    void addUnauthenticatedTracker(QPair<QTorrentHandle,QString> tracker);
+    void processDownloadedFiles(QString path, QString url);
+    void downloadFromURLList(const QStringList& urls);
+    void finishedTorrent(QTorrentHandle& h) const;
+    // Options slots
+    void on_actionOptions_triggered();
+    void optionsSaved();
+    // HTTP slots
+    void on_actionDownload_from_URL_triggered();
 
-protected slots:
-  // GUI related slots
-  void dropEvent(QDropEvent *event);
-  void dragEnterEvent(QDragEnterEvent *event);
-  void toggleVisibility(QSystemTrayIcon::ActivationReason e);
-  void on_actionAbout_triggered();
-  void on_actionCreate_torrent_triggered();
-  void on_actionWebsite_triggered() const;
-  void on_actionBugReport_triggered() const;
-  void on_actionShow_console_triggered();
-  void balloonClicked();
-  void writeSettings();
-  void readSettings();
-  void on_actionExit_triggered();
-  void createTrayIcon();
-  void fullDiskError(QTorrentHandle& h, QString msg) const;
-  void handleDownloadFromUrlFailure(QString, QString) const;
-  void createSystrayDelayed();
-  void tab_changed(int);
-  // Keyboard shortcuts
-  void createKeyboardShortcuts();
-  void displayTransferTab() const;
-  void displaySearchTab() const;
-  void displayRSSTab() const;
-  // Torrent actions
-  void on_actionSet_global_upload_limit_triggered();
-  void on_actionSet_global_download_limit_triggered();
-  void on_actionDocumentation_triggered() const;
-  void on_actionOpen_triggered();
-  void updateGUI();
-  void loadPreferences(bool configure_session=true);
-  void processParams(const QString& params);
-  void processParams(const QStringList& params);
-  void addTorrent(QString path);
-  void addUnauthenticatedTracker(const QPair<QTorrentHandle,QString> &tracker);
-  void processDownloadedFiles(QString path, QString url);
-  void finishedTorrent(QTorrentHandle& h) const;
-  void askRecursiveTorrentDownloadConfirmation(QTorrentHandle &h);
-  // Options slots
-  void on_actionOptions_triggered();
-  void optionsSaved();
-  // HTTP slots
-  void on_actionDownload_from_URL_triggered();
 
-protected:
-  void closeEvent(QCloseEvent *);
-  void showEvent(QShowEvent *);
-  bool event(QEvent * event);
-  void displayRSSTab(bool enable);
+  public slots:
+    void trackerAuthenticationRequired(QTorrentHandle& h);
+    void setTabText(int index, QString text) const;
+    void showNotificationBaloon(QString title, QString msg) const;
 
-private:
-  // Bittorrent
-  Bittorrent *BTSession;
-  QList<QPair<QTorrentHandle,QString> > unauthenticated_trackers; // Still needed?
-  // GUI related
-  QTimer *guiUpdater;
-  QTabWidget *tabs;
-  StatusBar *status_bar;
-  QPointer<options_imp> options;
-  QPointer<consoleDlg> console;
-  QPointer<about> aboutDlg;
-  QPointer<createtorrent> createTorrentDlg;
-  QPointer<downloadFromURL> downloadFromURLDialog;
-  QPointer<QSystemTrayIcon> systrayIcon;
-  QPointer<QTimer> systrayCreator;
-  QPointer<QMenu> myTrayIconMenu;
-  TransferListWidget *transferList;
-  TransferListFiltersWidget *transferListFilters;
-  PropertiesWidget *properties;
-  bool displaySpeedInTitle;
-  bool force_exit;
-  // Keyboard shortcuts
-  QShortcut *switchSearchShortcut;
-  QShortcut *switchSearchShortcut2;
-  QShortcut *switchTransferShortcut;
-  QShortcut *switchRSSShortcut;
-  // Widgets
-  QAction *prioSeparator;
-  QAction *prioSeparator2;
-  QSplitter *hSplitter;
-  QSplitter *vSplitter;
-  // Search
-  SearchEngine *searchEngine;
-  // RSS
-  QPointer<RSSImp> rssWidget;
+  protected:
+    void closeEvent(QCloseEvent *);
+    void showEvent(QShowEvent *);
+    bool event(QEvent * event);
+    void displayRSSTab(bool enable);
+
+  public:
+    // Construct / Destruct
+    GUI(QWidget *parent=0, QStringList torrentCmdLine=QStringList());
+    ~GUI();
+    // Methods
+    int getCurrentTabIndex() const;
+    QPoint screenCenter() const;
 };
 
 #endif

src/Icons/qBittorrent.desktop

@@ -1,9 +1,8 @@
 [Desktop Entry]
 Categories=Qt;Network;P2P;
-Comment=V2.2.9
+Comment=V2.0.3
 Exec=qbittorrent %f
 GenericName=Bittorrent client
-GenericName[ar]=العميل Bittorrent
 GenericName[bg]=Торент клиент
 GenericName[cs]=Bittorrent klient
 GenericName[de]=Bittorren Client
@@ -11,7 +10,6 @@ GenericName[el]=Bittorrent πελάτης
 GenericName[es]=Cliente Bittorrent
 GenericName[fi]=Bittorrent-ohjelma
 GenericName[fr]=Client Bittorrent
-GenericName[hr]=Bittorrent klijent
 GenericName[hu]=Bittorrent kliens
 GenericName[it]=Client Bittorrent
 GenericName[ja]=Bittorrent クライアント

src/Info.plist

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDocumentTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>torrent</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>qbittorrentDocument</string>
-			<key>CFBundleTypeName</key>
-			<string>BitTorrent Document</string>
-                        <key>CFBundleTypeMIMETypes</key>
-                	<array>
-        	            <string>application/x-bittorrent</string>
-	                </array>
-			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
-			<key>LSHandlerRank</key>
-			<string>Owner</string>
-			<key>LSItemContentTypes</key>
-			<array>
-				<string>org.bittorrent.torrent</string>
-			</array>
-			<key>LSIsAppleDefaultForType</key>
-			<true/>
-		</dict>
-	</array>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>magnet</string>
-			</array>
-			<key>CFBundleURLName</key>
-			<string>BitTorrent Magnet URL</string>
-		</dict>
-	</array>
-	<key>CFBundleIconFile</key>
-	<string>qbittorrent_mac.icns</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleGetInfoString</key>
-	<string>2.2.9</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleExecutable</key>
-	<string>qbittorrent</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.qbittorrent</string>
-	<key>NOTE</key>
-	<string>This file was generated by Qt/QMake.</string>
-</dict>
-</plist>

src/about_imp.h

@@ -54,21 +54,19 @@ class about : public QDialog, private Ui::AboutDlg{
       te_thanks->append(QString::fromUtf8("<a name='top'></a>"));
       te_thanks->append(QString::fromUtf8("<ul><li>I would first like to thank sourceforge.net for hosting qBittorrent project and for their support.</li>"));
       te_thanks->append(QString::fromUtf8("<li>I am pleased that people from all over the world are contributing to qBittorrent: Ishan Arora (India), Arnaud Demaizière (France) and Stephanos Antaris (Greece). Their help is greatly appreciated</li>"));
-      te_thanks->append(QString::fromUtf8("<li>I also want to thank Στέφανος Αντάρης (santaris@csd.auth.gr) and Mirco Chinelli (infinity89@fastwebmail.it) for working on Mac OS X packaging.</li>"));
-      te_thanks->append(QString::fromUtf8("<li>I am grateful to Peter Koeleman (peter@qbittorrent.org) and Mohammad Dib (mdib@qbittorrent.org) for working on qBittorrent port to Windows.</li>"));
+      te_thanks->append(QString::fromUtf8("<li>I also want to thank Jeffery Fernandez (jeffery@qbittorrent.org), project consultant, for his help and support since the beginning of this project.</li>"));
+      te_thanks->append(QString::fromUtf8("<li>I am grateful to Peter Koeleman (peter@qbittorrent.org) for working on qBittorrent port 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>"));
       te_thanks->scrollToAnchor(QString::fromUtf8("top"));
       // Translation
       te_translation->append(QString::fromUtf8("<a name='top'></a>"));
       te_translation->append(tr("I would like to thank the following people who volunteered to translate qBittorrent:")+QString::fromUtf8("<br>"));
       te_translation->append(QString::fromUtf8(
-          "<i><u>Arabic:</u> SDERAWI (abz8868@msn.com) and sn51234 (nesseyan@gmail.com)<br>\
-          - <u>Brazilian:</u> Nick Marinho (nickmarinho@gmail.com)<br>\
-          - <u>Bulgarian:</u> Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net)<br>\
-          - <u>Catalan:</u> Francisco Luque Contreras (frannoe@ya.com)<br>\
+          "<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 (Traditional):</u> Yi-Shun Wang (dnextstep@gmail.com)<br>\
-          - <u>Croatian:</u> Oliver Mucafir (oliver.untwist@gmail.com)<br>\
           - <u>Czech:</u> Jirka Vilim (web@tets.cz)<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>\
@@ -89,14 +87,11 @@ class about : public QDialog, private Ui::AboutDlg{
           - <u>Spanish:</u> Francisco Luque Contreras (frannoe@ya.com)<br>\
           - <u>Swedish:</u> Daniel Nylander (po@danielnylander.se)<br>\
           - <u>Turkish:</u> Hasan YILMAZ (iletisim@hedefturkce.com) and Erdem Bingöl (erdem84@gmail.com)<br>\
-          - <u>Ukrainian:</u> Andrey Shpachenko (masterfix@users.sourceforge.net) and Oleh Prypin (blaxpirit@gmail.com)<br><br>"));
+          - <u>Ukrainian:</u> Andrey Shpachenko (masterfix@users.sourceforge.net)<br><br>"));
       te_translation->append(tr("Please contact me if you would like to translate qBittorrent into your own language."));
       te_translation->scrollToAnchor(QString::fromUtf8("top"));
       // License
       te_license->append(QString::fromUtf8("<a name='top'></a>"));
-#ifdef Q_WS_WIN
-      te_license->append(QString::fromUtf8("qBittorrent is licensed under the GNU General Public License version 2."));
-#else
       te_license->append(QString::fromUtf8("qBittorrent is licensed under the GNU General Public License version 2 with the\
 addition of the following special exception:\
 <br><br>\
@@ -443,7 +438,6 @@ exception statement from your version.</i>\
           consider it more useful to permit linking proprietary applications with the<br>\
           library.  If this is what you want to do, use the GNU Library General<br>\
           Public License instead of this License.<br>"));
-#endif
           te_license->scrollToAnchor(QString::fromUtf8("top"));
           show();
     }

src/advancedsettings.h

@@ -1,147 +0,0 @@
-#ifndef ADVANCEDSETTINGS_H
-#define ADVANCEDSETTINGS_H
-
-#include <QTableWidget>
-#include <QHeaderView>
-#include <QSpinBox>
-#include <QCheckBox>
-#include <libtorrent/version.hpp>
-#include "preferences.h"
-
-enum AdvSettingsCols {PROPERTY, VALUE};
-enum AdvSettingsRows {DISK_CACHE, OUTGOING_PORT_MIN, OUTGOING_PORT_MAX, IGNORE_LIMIT_LAN, COUNT_OVERHEAD, RECHECK_COMPLETED, LIST_REFRESH, RESOLVE_COUNTRIES, RESOLVE_HOSTS };
-#define ROW_COUNT 9
-
-class AdvancedSettings: public QTableWidget {
-  Q_OBJECT
-
-private:
-  QSpinBox *spin_cache, *outgoing_ports_min, *outgoing_ports_max, *spin_list_refresh;
-  QCheckBox *cb_ignore_limits_lan, *cb_count_overhead, *cb_recheck_completed, *cb_resolve_countries, *cb_resolve_hosts;
-
-public:
-  AdvancedSettings(QWidget *parent=0): QTableWidget(parent) {
-    // Set visual appearance
-    setEditTriggers(QAbstractItemView::NoEditTriggers);
-    setAlternatingRowColors(true);
-    setColumnCount(2);
-    QStringList header;
-    header << tr("Property") << tr("Value");
-    setHorizontalHeaderLabels(header);
-    setColumnWidth(0, width()/2);
-    horizontalHeader()->setStretchLastSection(true);
-    verticalHeader()->setVisible(false);
-    setRowCount(ROW_COUNT);
-    // Load settings
-    loadAdvancedSettings();
-  }
-
-  ~AdvancedSettings() {
-    delete spin_cache;
-    delete outgoing_ports_min;
-    delete outgoing_ports_max;
-    delete cb_ignore_limits_lan;
-    delete cb_count_overhead;
-    delete cb_recheck_completed;
-    delete spin_list_refresh;
-    delete cb_resolve_countries;
-    delete cb_resolve_hosts;
-  }
-
-public slots:
-  void saveAdvancedSettings() {
-    // Disk write cache
-    Preferences::setDiskCacheSize(spin_cache->value());
-    // Outgoing ports
-    Preferences::setOutgoingPortsMin(outgoing_ports_min->value());
-    Preferences::setOutgoingPortsMax(outgoing_ports_max->value());
-    // Ignore limits on LAN
-    Preferences::ignoreLimitsOnLAN(cb_ignore_limits_lan->isChecked());
-    // Include protocol overhead in transfer limits
-    Preferences::includeOverheadInLimits(cb_count_overhead->isChecked());
-    // Recheck torrents on completion
-    Preferences::recheckTorrentsOnCompletion(cb_recheck_completed->isChecked());
-    // Transfer list refresh interval
-    Preferences::setRefreshInterval(spin_list_refresh->value());
-    // Peer resolution
-    Preferences::resolvePeerCountries(cb_resolve_countries->isChecked());
-    Preferences::resolvePeerHostNames(cb_resolve_hosts->isChecked());
-  }
-
-protected slots:
-  void loadAdvancedSettings() {
-    // Disk write cache
-    setItem(DISK_CACHE, PROPERTY, new QTableWidgetItem(tr("Disk write cache size")));
-    spin_cache = new QSpinBox();
-    connect(spin_cache, SIGNAL(valueChanged(int)), this, SLOT(emitSettingsChanged()));
-    spin_cache->setMinimum(1);
-    spin_cache->setMaximum(200);
-    spin_cache->setValue(Preferences::diskCacheSize());
-    spin_cache->setSuffix(tr(" MiB"));
-    setCellWidget(DISK_CACHE, VALUE, spin_cache);
-    // Outgoing port Min
-    setItem(OUTGOING_PORT_MIN, PROPERTY, new QTableWidgetItem(tr("Outgoing ports (Min) [0: Disabled]")));
-    outgoing_ports_min = new QSpinBox();
-    connect(outgoing_ports_min, SIGNAL(valueChanged(int)), this, SLOT(emitSettingsChanged()));
-    outgoing_ports_min->setMinimum(0);
-    outgoing_ports_min->setMaximum(65535);
-    outgoing_ports_min->setValue(Preferences::outgoingPortsMin());
-    setCellWidget(OUTGOING_PORT_MIN, VALUE, outgoing_ports_min);
-    // Outgoing port Min
-    setItem(OUTGOING_PORT_MAX, PROPERTY, new QTableWidgetItem(tr("Outgoing ports (Max) [0: Disabled]")));
-    outgoing_ports_max = new QSpinBox();
-    connect(outgoing_ports_max, SIGNAL(valueChanged(int)), this, SLOT(emitSettingsChanged()));
-    outgoing_ports_max->setMinimum(0);
-    outgoing_ports_max->setMaximum(65535);
-    outgoing_ports_max->setValue(Preferences::outgoingPortsMax());
-    setCellWidget(OUTGOING_PORT_MAX, VALUE, outgoing_ports_max);
-    // Ignore transfer limits on local network
-    setItem(IGNORE_LIMIT_LAN, PROPERTY, new QTableWidgetItem(tr("Ignore transfer limits on local network")));
-    cb_ignore_limits_lan = new QCheckBox();
-    connect(cb_ignore_limits_lan, SIGNAL(toggled(bool)), this, SLOT(emitSettingsChanged()));
-    cb_ignore_limits_lan->setChecked(Preferences::ignoreLimitsOnLAN());
-    setCellWidget(IGNORE_LIMIT_LAN, VALUE, cb_ignore_limits_lan);
-    // Consider protocol overhead in transfer limits
-    setItem(COUNT_OVERHEAD, PROPERTY, new QTableWidgetItem(tr("Include TCP/IP overhead in transfer limits")));
-    cb_count_overhead = new QCheckBox();
-    connect(cb_count_overhead, SIGNAL(toggled(bool)), this, SLOT(emitSettingsChanged()));
-    cb_count_overhead->setChecked(Preferences::includeOverheadInLimits());
-    setCellWidget(COUNT_OVERHEAD, VALUE, cb_count_overhead);
-    // Recheck completed torrents
-    setItem(RECHECK_COMPLETED, PROPERTY, new QTableWidgetItem(tr("Recheck torrents on completion")));
-    cb_recheck_completed = new QCheckBox();
-    connect(cb_recheck_completed, SIGNAL(toggled(bool)), this, SLOT(emitSettingsChanged()));
-    cb_recheck_completed->setChecked(Preferences::recheckTorrentsOnCompletion());
-    setCellWidget(RECHECK_COMPLETED, VALUE, cb_recheck_completed);
-    // Transfer list refresh interval
-    setItem(LIST_REFRESH, PROPERTY, new QTableWidgetItem(tr("Transfer list refresh interval")));
-    spin_list_refresh = new QSpinBox();
-    connect(spin_list_refresh, SIGNAL(valueChanged(int)), this, SLOT(emitSettingsChanged()));
-    spin_list_refresh->setMinimum(30);
-    spin_list_refresh->setMaximum(99999);
-    spin_list_refresh->setValue(Preferences::getRefreshInterval());
-    spin_list_refresh->setSuffix(tr(" ms", " milliseconds"));
-    setCellWidget(LIST_REFRESH, VALUE, spin_list_refresh);
-    // Resolve Peer countries
-    setItem(RESOLVE_COUNTRIES, PROPERTY, new QTableWidgetItem(tr("Resolve peer countries (GeoIP)")));
-    cb_resolve_countries = new QCheckBox();
-    connect(cb_resolve_countries, SIGNAL(toggled(bool)), this, SLOT(emitSettingsChanged()));
-    cb_resolve_countries->setChecked(Preferences::resolvePeerCountries());
-    setCellWidget(RESOLVE_COUNTRIES, VALUE, cb_resolve_countries);
-    // Resolve peer hosts
-    setItem(RESOLVE_HOSTS, PROPERTY, new QTableWidgetItem(tr("Resolve peer host names")));
-    cb_resolve_hosts = new QCheckBox();
-    connect(cb_resolve_hosts, SIGNAL(toggled(bool)), this, SLOT(emitSettingsChanged()));
-    cb_resolve_hosts->setChecked(Preferences::resolvePeerHostNames());
-    setCellWidget(RESOLVE_HOSTS, VALUE, cb_resolve_hosts);
-  }
-
-  void emitSettingsChanged() {
-    emit settingsChanged();
-  }
-
-signals:
-  void settingsChanged();
-};
-
-#endif // ADVANCEDSETTINGS_H