Tagged v2.0.7 release

- BUGFIX: Fix crash when renaming currently displayed RSS filter
    - BUGFIX: Remove overwriting confirmation when exporting RSS filters since Qt takes care of it

AUTHORS

@@ -2,8 +2,9 @@ Author:
 * Christophe Dumez <chris@qbittorrent.org>
 
 Contributors:
-* Arnaud Demaizière <arnaud@qbittorrent.org>
+* Stefanos Antaris <santaris@csd.auth.gr>
 * Ishan Arora <ishan@qbittorrent.org>
+* Arnaud Demaizière <arnaud@qbittorrent.org>
 * Grigis Gaëtan <cipher16@gmail.com>
 
 Code from other projects:
@@ -56,7 +57,7 @@ Translations authors:
   copyright:
   - Brazilian: Nick Marinho (nickmarinho@gmail.com)
   - Bulgarian: Tsvetan & Boiko Bankov (emerge_life@users.sourceforge.net)
-  - Catalan: Gekko Dam Beer (gekko04@users.sourceforge.net)
+  - Catalan: Francisco Luque Contreras (frannoe@ya.com)
   - Chinese (Simplified): Guo Yue (yue.guo0418@gmail.com)
   - Chinese (Traditional): Yi-Shun Wang (dnextstep@gmail.com)
   - Czech: Jirka Vilim (web@tets.cz)
@@ -66,19 +67,20 @@ Translations authors:
   - Finnish: Niklas Laxström (nikerabbit@users.sourceforge.net)
   - French: Christophe Dumez (chris@qbittorrent.org)
   - German: Niels Hoffmann (zentralmaschine@users.sourceforge.net)
-  - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net)
+  - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net) and Stephanos Antaris (santaris@csd.auth.gr)
   - Hungarian: Majoros Péter (majoros.j.p@t-online.hu)
   - Italian: Mirko Ferrari (mirkoferrari@gmail.com) and Ferraro Luciano (luciano.ferraro@gmail.com)
-  - Japanese: Nardog (nardog@e2umail.com)
+  - Japanese: Nardog (alphisation@gmail.com)
   - Korean: Jin Woo Sin (jin828sin@users.sourceforge.net)
   - Norwegian: Lars-Erik Labori (hamil@users.sourceforge.net)
-  - Polish: Jarek Smieja (ajep9691@wp.pl)
+  - Polish: Mariusz Fik (fisiu@opensuse.org)
   - Portuguese: Nick Marinho (nickmarinho@gmail.com)
   - Romanian: Obada Denis (obadadenis@users.sourceforge.net)
   - Russian: Nick Khazov (m2k3d0n at users.sourceforge.net)
+  - Serbian: Anaximandar Milet (anaximandar at operamail.com)
   - Slovak:  helix84
-  - Spanish: Vicente Raul Plata Fonseca (silverxnt@users.sourceforge.net)
+  - Spanish: Francisco Luque Contreras (frannoe@ya.com)
   - Swedish: Daniel Nylander (po@danielnylander.se)
-  - Turkish: Erdem Bingöl (erdem84@gmail.com)
+  - Turkish: Hasan Yilmaz (iletisim@hedefturkce.com)
   - Ukrainian: Andrey Shpachenko (masterfix@users.sourceforge.net)
   license: GPLv2

Changelog

@@ -1,3 +1,192 @@
+* Mon Jan 11 2009 - 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 2009 - 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
+    - BUGFIX: Handle paths with [~, ., ..] properly
+    - BUGFIX: Trackers are now displayed for torrents without metadata
+    - BUGFIX: Fix issue with speed limiting (unlimited was not handled properly)
+    - BUGFIX: Use the save path set in program preferences as a default in torrent addition dialog
+
+* Fri Dec 18 2009 - Christophe Dumez <chris@qbittorrent.org> - v2.0.2
+    - BUGFIX: Fix .qbittorrent folder not being created (critical bug introduced in v2.0.1 that makes qBittorrent unusuable for new users)
+    - BUGFIX: Fix RSS Feed downloader for some feeds
+    - BUGFIX: Do not use home folder as a fallback when the save path is not accessible
+    - BUGFIX: Fix Mininova, ThePirateBay search engine plugins
+    - BUGFIX: Read RSS articles are remembered on restart for feeds with no torrents attached
+
+* Sun Dec 13 2009 - Christophe Dumez <chris@qbittorrent.org> - v2.0.1
+    - BUGFIX: µTorrent user-agent is now spoofed correctly
+    - BUGFIX: Fix column hiding behavior when queueing system is disabled
+    - BUGFIX: Fix link to plugins.qbittorrent.org in plugins dialog
+    - BUGFIX: ~/qBT_dir is created only when it is actually used
+    - BUGFIX: Fix possible missing slot message (toggleSelectedTorrentsSuperSeeding)
+    - BUGFIX: Fix possible crash in torrent properties (files)
+    - BUGFIX: Added Hex Magnet Links support (Thanks Haypo)
+
+* Thu Dec 10 2009 - Christophe Dumez <chris@qbittorrent.org> - v2.0.0
+    - FEATURE: Added program option to disable splash screen
+    - FEATURE: Dropped dependency on libcurl and libzzip
+    - FEATURE: Display more information regarding the torrent in its properties
+    - FEATURE: Various optimizations to save CPU and memory
+    - FEATURE: Folder scanning now works with CIFS and NFS mounted folders
+    - FEATURE: Speed up qBittorrent startup and shutdown
+    - FEATURE: Display per-torrent peer list
+    - FEATURE: Make sure torrent files are always sorted by name
+    - FEATURE: Seeds and Peers columns are now sortable
+    - FEATURE: Torrents can be rechecked from Web UI (Stephanos Antaris)
+    - FEATURE: New peers can manually be added to the torrents
+    - FEATURE: Support per-peer rate limiting
+    - FEATURE: Support peer manual ban
+    - FEATURE: Display total amounts transferred in status bar
+    - FEATURE: Display trackers status as well as error/warning messages
+    - FEATURE: Display the number of peers returned by each tracker & DHT/PeX/LSD
+    - FEATURE: Global upload/download speeds can be capped from status bar (µTorrent behavior)
+    - FEATURE: Added option to download first and last piece of a torrent main file first (for preview)
+    - FEATURE: Graphically display piece availability in torrent properties
+    - FEATURE: Dropped Qt 4.3 support (Qt >= 4.4 is now required)
+    - FEATURE: Display close tab button into the tabs in search engine (Qt >= 4.5 only)
+    - FEATURE: Show official documentation when pressing F1 key
+    - FEATURE: Search engine plugins now handle HTTP protocol gzip compression
+    - FEATURE: Enabled lazy bitfield as a counter-measure for ISP speed throttling
+    - FEATURE: Fall back to a random port if qBittorrent could not listen on the chosen port
+    - FEATURE: Announce to all trackers specified for a torrent (µTorrent behavior) (libtorrent >= v0.15 only)
+    - FEATURE: Added per-torrent super seeding mode (libtorrent >= v0.15 only)
+    - FEATURE: Support for storing symbolic links in .torrent files (libtorrent >= v0.15 only)
+    - FEATURE: Support for uTorrent interpretation of multi-tracker torrents (libtorrent >= v0.15 only)
+    - FEATURE: Handle torrents with duplicate filenames (libtorrent >= v0.15 only)
+    - FEATURE: Support for merkle hash tree torrents (.merkle.torrent) (libtorrent >= v0.15 only)
+    - FEATURE: Metadata download from swarm is now compatible with µtorrent (libtorrent >= v0.15 only)
+    - FEATURE: Support tracker exchange between peers (libtorrent >= v0.15 only)
+    - FEATURE: Better http seed support (libtorrent >= v0.15 only)
+    - FEATURE: Tracker connections are now also subject to IP filtering (libtorrent >= v0.15 only)
+    - FEATURE: Include DHT traffic in the rate limiter (libtorrent >= v0.15 only)
+    - FEATURE: Support for bitcomet padding files (libtorrent >= v0.15 only)
+    - FEATURE: Option to skip file checking and start seeding immediately in torrent addition dialog (Stephanos Antaris) (libtorrent >= v0.15 only)
+    - BUGFIX: Made sure qBittorrent does not scrape the tracker too frequently (libtorrent >= 0.15 only)
+    - BUGFIX: Fix Paste action in search engine field
+    - BUGFIX: Fix possible double free in search engine destructor
+    - BUGFIX: Properly handle trackers error messages
+    - WEB UI: Remodeled Web UI to match new qBittorrent UI (Properties and preferences available)
+    - WEB UI: Added internationalization support
+    - WEB UI: Reduced computation in Javascript (do this one server side instead)
+    - WEB UI: Fixed Transfer list flickering
+    - WEB UI: Password is now stored as md5
+    - I18N: Added Serbian translation (By Anaximandar Milet)
+    - COSMETIC: Merged download / upload lists
+    - COSMETIC: Torrents can be filtered based on their status
+    - COSMETIC: Torrent properties are now displayed in main window
+    - COSMETIC: Made program preferences scrollable for usability on small screens (e.g. netbooks)
+    - COSMETIC: Added a "torrent status" column to transfer list
+    - COSMETIC: Display Seeds and Peers in two separate columns
+    - COSMETIC: New deletion confirmation dialog (Merged delete/delete permanently actions)
+    - COSMETIC: Improved status bar layout spacing
+    - COSMETIC: Display speeds with more user friendly units instead of always using KiB/s
+    - COSMETIC: New torrent status icons by Mateusz Tolola
+    - COSMETIC: Make use of libnotify if available for system notifications (Ubuntu, ...)
+
+* Tue Nov 17 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.5.6
+  - BUGFIX: RSS feed articles can now be displayed using keyboard arrows
+  - BUGFIX: RSS feed downloader can only process unread articles now
+  - BUGFIX: Fixed memory leak in RSS parser
+  - BUGFIX: Fixed possible crash in search autocompletion
+  - BUGFIX: Improved ETA calculation for big torrents
+  - BUGFIX: Fixed per-torrent speed limiting
+
+* Wed Nov 4 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.5.5
+  - BUGFIX: Fixed man page
+  - BUGFIX: Fix crash on torrent addition (if libtorrent-rasterbar has debug enabled)
+  - BUGFIX: Fix trackers addition to torrents (bug introduced in v1.5.4)
+  - BUGFIX: Suppress compilation warning regarding sortNewsList() not being used
+  - BUGFIX: Make sure scan folder is different than qBittorrent backup directory to avoid torrents deletion
+  - BUGFIX: Added safety mecanism which adds the torrents back to the list in case qbittorrent-resume.conf gets deleted or corrupted.
+
+* Sun Oct 25 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.5.4
+  - BUGFIX: Updated man page
+  - BUGFIX: Fixed possible crash with torrents containing unicode characters
+  - BUGFIX: Fixed problem when disabling systray integration and starting minimized
+  - BUGFIX: Fixed PirateBay search plugin
+  - BUGFIX: Using Download button in search results list now downloads the right torrents
+  - BUGFIX: The search results list is no longer sorted automatically when a row color is updated
+
+* Wed Sep 30 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.5.3
+  - BUGFIX: Fix a possible crash when pausing then deleting a torrent quickly
+  - BUGFIX: Fix a race condition in folder scanning and torrent downloader
+  - BUGFIX: Hide download url column in search results
+  - BUGFIX: Fix a crash when scanned directory does not exist
+  - BUGFIX: Fix compilation on Mac OS
+  - BUGFIX: Added a command line parameter to disable splash screen
+  - BUGFIX: Ignore permanent deletion button when no torrent is selected
+  - BUGFIX: When a selected torrent is deleted, select next suitable torrent
+
+* Sun Sep 20 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.5.2
+  - BUGFIX: Some torrents were pausing for no reason
+  - I18N: Updated Korean translation
+
+* Thu Sep 7 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.5.1
+   - BUGFIX: Fix crash in torrent addition dialog when save path does not exist (closes #425227)
+   - BUGFIX: Fix downloading from URL (broken in v1.5.0)
+   - BUGFIX: Pause torrents in error state
+
+* Thu Sep 3 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.5.0
+    - FEATURE: Added Magnet URI support
+    - FEATURE: Search engine supports category-based requests
+    - FEATURE: Make use of torrent enclosure in RSS feeds for direct download
+    - FEATURE: Implemented a RSS feed downloader with filter support
+    - FEATURE: Save old RSS item to hard disk to remember them on start up
+    - FEATURE: Display free disk space in torrent addition dialog
+    - FEATURE: In torrent addition from URL, paste clipboard content if it contains an URL
+    - FEATURE: RSS feeds URLs can now be copied to clipboard
+    - FEATURE: RSS feeds can now be grouped into folders
+    - FEATURE: Added "Unread" item to RSS feed list to display all unread news
+    - FEATURE: If a torrent contains a torrent file, process downloaded torrent file too
+    - FEATURE: A random listening port can be chosen automatically
+    - BUGFIX: torrent resume code rewrited
+    - BUGFIX: Fixed uTorrent spoofing code
+    - BUGFIX: Greatly improved column sorting code
+    - BUGFIX: Possibility to create trackerless torrents
+    - BUGFIX: Better item coloring in torrent content filtering dialog
+    - COSMETIC: Redesigned search tab to improve usability
+    - COSMETIC: Redesigned RSS tab to improve usability
+    - COSMETIC: Improved tracker errors readability
+
+* Sun Aug 21 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.4.1
+    - BUGFIX: Fix problems when changing save path (if using temporary download folder)
+    - BUGFIX: Display real save path instead of the temporary one in torrent properties
+    - BUGFIX: Catching invalid_handle exception to avoid rare crashes
+    - BUGFIX: Fixed popup menu position in RSS feeds list
+    - BUGFIX: Don't save RSS feed state if it could not be updated
+
 * Thu Aug 13 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.4.0
     - FEATURE: Display swarm information in lists
     - FEATURE: Allow to define temporary download folder

INSTALL

@@ -1,12 +1,6 @@
 qBittorrent - A BitTorrent client in C++ / Qt4
 ------------------------------------------
 
-*** Necessary if qt3 is default on your system ***
-export QTDIR=/usr/include/qt4
-export PATH=$QTDIR/bin:$PATH
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$QTDIR/lib
-*** End ***
-
 ./configure
 make && make install
 qbittorrent
@@ -14,29 +8,25 @@ qbittorrent
 will install and execute qBittorrent hopefully without any problems.
 
 Dependencies:
-- Qt >= 4.3.0 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml)
+- Qt >= 4.4.0 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml)
-  Qt >= 4.4.0 is advised
 
-- libtorrent-rasterbar by Arvid Norberg (>= v0.14.0 REQUIRED)
+- 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.
 
 - libboost: libboost-filesystem, libboost-date-time, libboost-thread, libboost-serialization
 
-- libcurl
-
 - python >= 2.3 (needed by search engine)
+  * Run time only dependency
 
-- libmagick++ (advised, not required)
+- libnotify >= 0.4.2, glib-2.0 (optional)
-  * Needed for favicons support (RSS / Search plugins)
+  * Can be used for system notifications to replace standard Qt notifications
+    so that it integrates better into the Desktop
 
-- libzzip (advised, not required)
+- geoip-database (optional)
-  * Needed for zip support (Search plugins)
+  * 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
-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

@@ -10,6 +10,9 @@ It aims to be a good alternative to all other bittorrent clients
 out there. qBittorrent is fast, stable and provides unicode
 support as well as many features.
 
+This product includes GeoLite data created by MaxMind, available from
+http://maxmind.com/
+
 Installation:
 ********************************
 For installation, follow the instructions from INSTALL file, but simple:
@@ -23,6 +26,9 @@ will install and execute qBittorrent hopefully without any problem.
 For more information please visit:
 http://www.qbittorrent.org
 
+or our wiki here:
+http://wiki.qbittorrent.org
+
 Please report any bug (or feature request) to:
 http://bugs.qbittorrent.org
 

configure

@@ -18,12 +18,12 @@ Main options:
   --help              This help text.
 
 Dependency options:
-  --with-libboost-inc=[path]     Path to libboost include files
+  --with-libboost-inc=[path]         Path to libboost include files
-  --with-libcurl-inc=[path]      Path to libcurl include files
+  --disable-libnotify               Disable use of libnotify
-  --with-libcurl-lib=[path]      Path to libcurl library files
+  --disable-geoip-database          Disable use of geoip-database
-  --disable-libzzip             Disable use of libzzip
+  --with-geoip-database-embedded     Geoip Database will be embedded in
-  --with-libzzip-inc=[path]      Path to libzzip++ include files
+                                    qBittorrent executable (please follow
-  --with-libzzip-lib=[path]      Path to libzzip++ library files
+                                    instructions in src/geoip/README)
 
 EOT
 }
@@ -145,28 +145,18 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
-		--with-libcurl-inc=*)
+		--disable-libnotify)
-			QC_WITH_LIBCURL_INC=$optarg
+			QC_DISABLE_libnotify="Y"
 			shift
 			;;
 
-		--with-libcurl-lib=*)
+		--disable-geoip-database)
-			QC_WITH_LIBCURL_LIB=$optarg
+			QC_DISABLE_geoip_database="Y"
 			shift
 			;;
 
-		--disable-libzzip)
+		--with-geoip-database-embedded)
-			QC_DISABLE_libzzip="Y"
+			QC_WITH_GEOIP_DATABASE_EMBEDDED="Y"
-			shift
-			;;
-
-		--with-libzzip-inc=*)
-			QC_WITH_LIBZZIP_INC=$optarg
-			shift
-			;;
-
-		--with-libzzip-lib=*)
-			QC_WITH_LIBZZIP_LIB=$optarg
 			shift
 			;;
 
@@ -192,11 +182,9 @@ echo BINDIR=$BINDIR
 echo DATADIR=$DATADIR
 echo EX_QTDIR=$EX_QTDIR
 echo QC_WITH_LIBBOOST_INC=$QC_WITH_LIBBOOST_INC
-echo QC_WITH_LIBCURL_INC=$QC_WITH_LIBCURL_INC
+echo QC_DISABLE_libnotify=$QC_DISABLE_libnotify
-echo QC_WITH_LIBCURL_LIB=$QC_WITH_LIBCURL_LIB
+echo QC_DISABLE_geoip_database=$QC_DISABLE_geoip_database
-echo QC_DISABLE_libzzip=$QC_DISABLE_libzzip
+echo QC_WITH_GEOIP_DATABASE_EMBEDDED=$QC_WITH_GEOIP_DATABASE_EMBEDDED
-echo QC_WITH_LIBZZIP_INC=$QC_WITH_LIBZZIP_INC
-echo QC_WITH_LIBZZIP_LIB=$QC_WITH_LIBZZIP_LIB
 echo
 fi
 
@@ -301,21 +289,21 @@ cat >$1/modules.cpp <<EOT
 #line 1 "qt4.qcm"
 /*
 -----BEGIN QCMOD-----
-name: Qt >= 4.3
+name: Qt >= 4.4
 -----END QCMOD-----
 */
 class qc_qt4 : public ConfObj
 {
 public:
 	qc_qt4(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Qt >= 4.3"; }
+	QString name() const { return "Qt >= 4.4"; }
-	QString shortname() const { return "Qt 4.3"; }
+	QString shortname() const { return "Qt 4.4"; }
 	bool exec()
 	{
-		if(QT_VERSION >= 0x040400) {
+		if(QT_VERSION >= 0x040500) {
-			conf->addDefine("QT_4_4");
+                        conf->addDefine("QT_4_5");
-		}
+                }
-		return(QT_VERSION >= 0x040300);
+		return(QT_VERSION >= 0x040400);
 		
 	}
 };
@@ -330,12 +318,12 @@ class qc_libtorrent_rasterbar : public ConfObj
 {
 public:
 	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent-rasterbar >= 0.14.0 (>= 0.14.4 advised)"; }
+	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.0";
-		QString adv_ver = "0.14.4";
+		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))
@@ -345,7 +333,9 @@ public:
 		if(!libs.isEmpty())
 			conf->addLib(libs);
 		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other))
-			printf("\nWarning: libtorrent-rasterbar v%s was detected. Although it will compile and run, you will probably experience some bugs. Please consider updating to v%s!\n", version.toUtf8().data(), adv_ver.toUtf8().data());
+                        printf("\nWarning: libtorrent-rasterbar v%s was detected.\nAlthough it will compile and run, you will be missing some features. Please consider updating to v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
+		else
+			conf->addDefine("LIBTORRENT_0_15");
 		return true;
 	}
 };
@@ -406,138 +396,76 @@ public:
 		return true;
 	}
 };
-#line 1 "libcurl.qcm"
+#line 1 "libnotify.qcm"
 /*
 -----BEGIN QCMOD-----
-name: libcommoncpp2
+name: libnotify
-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
+// see  Conf::findPkgConfig
+class qc_libnotify : public ConfObj
 {
 public:
-	qc_libcurl(Conf *c) : ConfObj(c) {}
+	qc_libnotify(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libcurl"; }
+	QString name() const { return "libnotify >= 0.4.2 (optional)"; }
-	QString shortname() const { return "libcurl"; }
+	QString shortname() const { return "libnotify"; }
 	bool exec(){
-    QString s;
+		QStringList incs;
-		s = conf->getenv("QC_WITH_LIBCURL_INC");
+		QString req_ver = "0.4.2";
-		if(!s.isEmpty()) {
+		QString version, libs, other;
-			if(!conf->checkHeader(s, "curl/curl.h")) {
+		VersionMode mode = VersionMin;
+		if(conf->findPkgConfig("libnotify", mode, req_ver, &version, &incs, &libs, &other)) {
+			conf->addDefine("WITH_LIBNOTIFY");
+			for(int n = 0; n < incs.count(); ++n)
+				conf->addIncludePath(incs[n]);
+			if(!libs.isEmpty())
+				conf->addLib(libs);
+			QStringList incs2;
+			QString req_ver2 = "2.0";
+			QString version2, libs2, other2;
+			if(conf->findPkgConfig("glib-2.0", mode, req_ver2, &version2, &incs2, &libs2, &other2)) {
+				for(int n = 0; n < incs2.count(); ++n)
+				conf->addIncludePath(incs2[n]);
+				if(!libs2.isEmpty())
+					conf->addLib(libs2);
+			} else {
 				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) {
+		} else {
-				return false;
+			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;
 	}
 };
-#line 1 "libzzip.qcm"
+#line 1 "geoip-database.qcm"
 /*
 -----BEGIN QCMOD-----
-name: libzzip
+name: geoip-database
-arg: with-libzzip-inc=[path], Path to libzzip++ include files
+arg: with-geoip-database-embedded, Geoip Database will be embedded in qBittorrent executable (please follow instructions in src/geoip/README)
-arg: with-libzzip-lib=[path], Path to libzzip++ library files
 -----END QCMOD-----
 */
-#include <QProcess>
+// see  Conf::findPkgConfig
-class qc_libzzip : public ConfObj
+class qc_geoip_database : public ConfObj
 {
 public:
-	qc_libzzip(Conf *c) : ConfObj(c) {}
+	qc_geoip_database(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Zzip library (libzzip)"; }
+	QString name() const { return "GeoIP Database (optional)"; }
-	QString shortname() const { return "libzzip"; }
+	QString shortname() const { return "GeoIP Database"; }
-	QString checkString() const {
+	bool exec() {
-		if(!conf->getenv("QC_DISABLE_LIBZZIP").isEmpty())
+#ifdef Q_WS_X11
-			return "";
+		if(!conf->getenv("QC_WITH_GEOIP_DATABASE_EMBEDDED").isEmpty()) {
-		return ConfObj::checkString();
+#endif
-	}
+			conf->addDefine("WITH_GEOIP_EMBEDDED");
-	bool exec(){
+                        printf(" embedded and");
-		if(!conf->getenv("QC_DISABLE_LIBZZIP").isEmpty())
+			return true;
-			return false;
+#ifdef Q_WS_X11
-		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);
+                if(QFile::exists("/usr/share/GeoIP/GeoIP.dat") || QFile::exists("/usr/local/share/GeoIP/GeoIP.dat") || QFile::exists("/var/lib/GeoIP/GeoIP.dat"))
-
+			return true;
-		s = conf->getenv("QC_WITH_LIBZZIP_LIB");
+                printf("\nWarning: GeoIP database was not found at /usr/share/GeoIP/GeoIP.dat or /var/lib/GeoIP/GeoIP.dat\nCountry resolution will be slow.");
-		if(!s.isEmpty()) {
+		return false;
-			if(!QFile::exists(s+QString("/libzzip.so"))){
+#endif
-                          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;
 	}
 };
 
@@ -552,10 +480,10 @@ cat >$1/modules_new.cpp <<EOT
     o = new qc_libboost(conf);
     o->required = true;
     o->disabled = false;
-    o = new qc_libcurl(conf);
+    o = new qc_libnotify(conf);
-    o->required = true;
+    o->required = false;
     o->disabled = false;
-    o = new qc_libzzip(conf);
+    o = new qc_geoip_database(conf);
     o->required = false;
     o->disabled = false;
 
@@ -1504,11 +1432,9 @@ export BINDIR
 export DATADIR
 export EX_QTDIR
 export QC_WITH_LIBBOOST_INC
-export QC_WITH_LIBCURL_INC
+export QC_DISABLE_libnotify
-export QC_WITH_LIBCURL_LIB
+export QC_DISABLE_geoip_database
-export QC_DISABLE_libzzip
+export QC_WITH_GEOIP_DATABASE_EMBEDDED
-export QC_WITH_LIBZZIP_INC
-export QC_WITH_LIBZZIP_LIB
 export QC_VERBOSE
 rm -rf .qconftemp
 (

doc/qbittorrent.1

@@ -1,17 +1,19 @@
 .\" 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" ""
+.TH "QBITTORRENT" "1" "September 30th 2009" "Bittorrent client written in C++ / Qt4" ""
 
-.SH NAME
+.SH "NAME"
 qBittorrent \- a Bittorrent client written in C++ / Qt4
-.SH SYNOPSIS
 
-\fBqbittorrent\fR [FILE | URL] [FILE | URL...]
+.SH "SYNOPSIS"
+
+\fBqbittorrent\fR [\-\-no-splash] [TORRENT_FILE | URL]...
 
 \fBqbittorrent\fR \-\-help
 
 \fBqbittorrent\fR \-\-version
+
 .PP
 .SH "DESCRIPTION"
 
@@ -19,10 +21,21 @@ qBittorrent \- a 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).
+It also comes with UPnP port forwarding / NAT-PMP, encryption (Azureus compatible), 
+FAST extension (mainline) and PeX support (utorrent compatible).
+
+.SH "OPTIONS"
+
+\fB--help\fR Prints the command line options.
+
+\fB--version\fR Prints qbittorrent program version number.
+
+\fB--no-splash\fR Disables splash screen on startup.
+
+.SH "BUGS"
+
+If you find a bug, please report it at http://bugs.qbittorrent.org
 
-Please report any problem to http://bugs.qbittorrent.org
-.PP
 .SH "AUTHOR"
 
 Christophe Dumez <chris@qbittorrent.org>

qbittorrent.qc

@@ -12,8 +12,8 @@
   <dep type='libboost'>
     <required/>
   </dep>
-  <dep type='libcurl'>
+  <dep type='libnotify'>
-    <required/>
+  </dep>
+  <dep type='geoip-database'>
   </dep>
-  <dep type='libzzip'/>
 </qconf>

qcm/geoip-database.qcm

@@ -0,0 +1,29 @@
+/*
+-----BEGIN QCMOD-----
+name: geoip-database
+arg: with-geoip-database-embedded, Geoip Database will be embedded in qBittorrent executable (please follow instructions in src/geoip/README)
+-----END QCMOD-----
+*/
+// see  Conf::findPkgConfig
+class qc_geoip_database : public ConfObj
+{
+public:
+	qc_geoip_database(Conf *c) : ConfObj(c) {}
+	QString name() const { return "GeoIP Database (optional)"; }
+	QString shortname() const { return "GeoIP Database"; }
+	bool exec() {
+#ifdef Q_WS_X11
+		if(!conf->getenv("QC_WITH_GEOIP_DATABASE_EMBEDDED").isEmpty()) {
+#endif
+			conf->addDefine("WITH_GEOIP_EMBEDDED");
+                        printf(" embedded and");
+			return true;
+#ifdef Q_WS_X11
+		}
+                if(QFile::exists("/usr/share/GeoIP/GeoIP.dat") || QFile::exists("/usr/local/share/GeoIP/GeoIP.dat") || QFile::exists("/var/lib/GeoIP/GeoIP.dat"))
+			return true;
+                printf("\nWarning: GeoIP database was not found at /usr/share/GeoIP/GeoIP.dat or /var/lib/GeoIP/GeoIP.dat\nCountry resolution will be slow.");
+		return false;
+#endif
+	}
+};

qcm/libcurl.qcm

@@ -1,61 +0,0 @@
-/*
------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/libnotify.qcm

@@ -0,0 +1,41 @@
+/*
+-----BEGIN QCMOD-----
+name: libnotify
+-----END QCMOD-----
+*/
+// see  Conf::findPkgConfig
+class qc_libnotify : public ConfObj
+{
+public:
+	qc_libnotify(Conf *c) : ConfObj(c) {}
+	QString name() const { return "libnotify >= 0.4.2 (optional)"; }
+	QString shortname() const { return "libnotify"; }
+	bool exec(){
+		QStringList incs;
+		QString req_ver = "0.4.2";
+		QString version, libs, other;
+		VersionMode mode = VersionMin;
+		if(conf->findPkgConfig("libnotify", mode, req_ver, &version, &incs, &libs, &other)) {
+			conf->addDefine("WITH_LIBNOTIFY");
+			for(int n = 0; n < incs.count(); ++n)
+				conf->addIncludePath(incs[n]);
+			if(!libs.isEmpty())
+				conf->addLib(libs);
+			QStringList incs2;
+			QString req_ver2 = "2.0";
+			QString version2, libs2, other2;
+			if(conf->findPkgConfig("glib-2.0", mode, req_ver2, &version2, &incs2, &libs2, &other2)) {
+				for(int n = 0; n < incs2.count(); ++n)
+				conf->addIncludePath(incs2[n]);
+				if(!libs2.isEmpty())
+					conf->addLib(libs2);
+			} else {
+				return false;
+			}
+		} else {
+			return false;
+		}
+		
+		return true;
+	}
+};

qcm/libtorrent-rasterbar.qcm

@@ -8,12 +8,12 @@ class qc_libtorrent_rasterbar : public ConfObj
 {
 public:
 	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent-rasterbar >= 0.14.0 (>= 0.14.4 advised)"; }
+	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.0";
-		QString adv_ver = "0.14.4";
+		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))
@@ -23,7 +23,9 @@ public:
 		if(!libs.isEmpty())
 			conf->addLib(libs);
 		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other))
-			printf("\nWarning: libtorrent-rasterbar v%s was detected. Although it will compile and run, you will probably experience some bugs. Please consider updating to v%s!\n", version.toUtf8().data(), adv_ver.toUtf8().data());
+                        printf("\nWarning: libtorrent-rasterbar v%s was detected.\nAlthough it will compile and run, you will be missing some features. Please consider updating to v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
+		else
+			conf->addDefine("LIBTORRENT_0_15");
 		return true;
 	}
 };

qcm/libzzip.qcm

@@ -1,71 +0,0 @@
-/*
------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/qt4.qcm

@@ -1,20 +1,20 @@
 /*
 -----BEGIN QCMOD-----
-name: Qt >= 4.3
+name: Qt >= 4.4
 -----END QCMOD-----
 */
 class qc_qt4 : public ConfObj
 {
 public:
 	qc_qt4(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Qt >= 4.3"; }
+	QString name() const { return "Qt >= 4.4"; }
-	QString shortname() const { return "Qt 4.3"; }
+	QString shortname() const { return "Qt 4.4"; }
 	bool exec()
 	{
-		if(QT_VERSION >= 0x040400) {
+		if(QT_VERSION >= 0x040500) {
-			conf->addDefine("QT_4_4");
+                        conf->addDefine("QT_4_5");
-		}
+                }
-		return(QT_VERSION >= 0x040300);
+		return(QT_VERSION >= 0x040400);
 		
 	}
 };

src/DLListDelegate.h

@@ -1,116 +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.
- *
- * In addition, as a special exception, the copyright holders give permission to
- * link this program with the OpenSSL project's "OpenSSL" library (or with
- * modified versions of it that use the same license as the "OpenSSL" library),
- * and distribute the linked executables. You must obey the GNU General Public
- * License in all respects for all of the code used other than "OpenSSL".  If you
- * modify file(s), you may extend this exception to your version of the file(s),
- * but you are not obligated to do so. If you do not wish to do so, delete this
- * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
- */
-
-#ifndef DLLISTDELEGATE_H
-#define DLLISTDELEGATE_H
-
-#include <QItemDelegate>
-#include <QModelIndex>
-#include <QPainter>
-#include <QStyleOptionProgressBarV2>
-#include <QStyleOptionViewItemV2>
-#include <QProgressBar>
-#include <QApplication>
-#include "misc.h"
-
-// Defines for download list list columns
-#define NAME 0
-#define SIZE 1
-#define PROGRESS 2
-#define DLSPEED 3
-#define UPSPEED 4
-#define SEEDSLEECH 5
-#define RATIO 6
-#define ETA 7
-#define PRIORITY 8
-#define HASH 9
-
-class DLListDelegate: public QItemDelegate {
-  Q_OBJECT
-
-  public:
-    DLListDelegate(QObject *parent) : QItemDelegate(parent){}
-
-    ~DLListDelegate(){}
-
-    void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const{
-      QStyleOptionViewItemV2 opt = QItemDelegate::setOptions(index, option);
-      switch(index.column()){
-        case SIZE:
-          QItemDelegate::drawBackground(painter, opt, index);
-          QItemDelegate::drawDisplay(painter, opt, option.rect, misc::friendlyUnit(index.data().toLongLong()));
-          break;
-        case ETA:
-          QItemDelegate::drawBackground(painter, opt, index);
-          QItemDelegate::drawDisplay(painter, opt, option.rect, misc::userFriendlyDuration(index.data().toLongLong()));
-          break;
-        case UPSPEED:
-        case DLSPEED:{
-          QItemDelegate::drawBackground(painter, opt, index);
-          double speed = index.data().toDouble();
-          QItemDelegate::drawDisplay(painter, opt, opt.rect, QString(QByteArray::number(speed/1024., 'f', 1))+QString::fromUtf8(" ")+tr("KiB/s"));
-          break;
-        }
-        case RATIO:{
-          QItemDelegate::drawBackground(painter, opt, index);
-          double ratio = index.data().toDouble();
-          if(ratio > 100.)
-              QItemDelegate::drawDisplay(painter, opt, opt.rect, QString::fromUtf8("∞"));
-          else
-              QItemDelegate::drawDisplay(painter, opt, opt.rect, QString(QByteArray::number(ratio, 'f', 1)));
-          break;
-        }
-        case 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 = true;
-          QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt,
-          painter);
-          break;
-        }
-        default:
-          QItemDelegate::paint(painter, option, index);
-      }
-    }
-
-    QWidget* createEditor(QWidget*, const QStyleOptionViewItem &, const QModelIndex &) const {
-      // No editor here
-      return 0;
-    }
-
-};
-
-#endif

src/FinishedListDelegate.h

@@ -1,98 +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.
- *
- * In addition, as a special exception, the copyright holders give permission to
- * link this program with the OpenSSL project's "OpenSSL" library (or with
- * modified versions of it that use the same license as the "OpenSSL" library),
- * and distribute the linked executables. You must obey the GNU General Public
- * License in all respects for all of the code used other than "OpenSSL".  If you
- * modify file(s), you may extend this exception to your version of the file(s),
- * but you are not obligated to do so. If you do not wish to do so, delete this
- * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
- */
-
-#ifndef FINISHEDLISTDELEGATE_H
-#define FINISHEDLISTDELEGATE_H
-
-#include <QItemDelegate>
-#include <QModelIndex>
-#include <QPainter>
-#include <QStyleOptionProgressBarV2>
-#include <QStyleOptionViewItemV2>
-#include <QProgressBar>
-#include <QApplication>
-#include "misc.h"
-
-// Defines for download list list columns
-#define F_NAME 0
-#define F_SIZE 1
-#define F_UPSPEED 2
-#define F_SWARM 3
-#define F_PEERS 4
-#define F_UPLOAD 5
-#define F_RATIO 6
-#define F_HASH 7
-
-#define MAX_RATIO 100.
-
-class FinishedListDelegate: public QItemDelegate {
-  Q_OBJECT
-
-  public:
-    FinishedListDelegate(QObject *parent) : QItemDelegate(parent){}
-
-    ~FinishedListDelegate(){}
-
-    void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const{
-      QStyleOptionViewItemV2 opt = QItemDelegate::setOptions(index, option);
-      switch(index.column()){
-        case F_SIZE:
-        case F_UPLOAD:
-          QItemDelegate::drawBackground(painter, opt, index);
-          QItemDelegate::drawDisplay(painter, opt, option.rect, misc::friendlyUnit(index.data().toLongLong()));
-          break;
-        case F_UPSPEED:{
-          QItemDelegate::drawBackground(painter, opt, index);
-          double speed = index.data().toDouble();
-          QItemDelegate::drawDisplay(painter, opt, opt.rect, QString(QByteArray::number(speed/1024., 'f', 1))+QString::fromUtf8(" ")+tr("KiB/s"));
-          break;
-        }
-        case F_RATIO:{
-          QItemDelegate::drawBackground(painter, opt, index);
-          double ratio = index.data().toDouble();
-          if(ratio > MAX_RATIO)
-            QItemDelegate::drawDisplay(painter, opt, opt.rect, QString::fromUtf8("∞"));
-          else
-            QItemDelegate::drawDisplay(painter, opt, opt.rect, QString(QByteArray::number(ratio, 'f', 1)));
-          break;
-        }
-        default:
-          QItemDelegate::paint(painter, option, index);
-      }
-    }
-
-    QWidget* createEditor(QWidget*, const QStyleOptionViewItem &, const QModelIndex &) const {
-      // No editor here
-      return 0;
-    }
-
-};
-
-#endif

src/FinishedTorrents.cpp

@@ -1,682 +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.
- *
- * In addition, as a special exception, the copyright holders give permission to
- * link this program with the OpenSSL project's "OpenSSL" library (or with
- * modified versions of it that use the same license as the "OpenSSL" library),
- * and distribute the linked executables. You must obey the GNU General Public
- * License in all respects for all of the code used other than "OpenSSL".  If you
- * modify file(s), you may extend this exception to your version of the file(s),
- * but you are not obligated to do so. If you do not wish to do so, delete this
- * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
- */
-#include "FinishedTorrents.h"
-#include "misc.h"
-#include "properties_imp.h"
-#include "bittorrent.h"
-#include "allocationDlg.h"
-#include "FinishedListDelegate.h"
-#include "GUI.h"
-
-#include <QFile>
-#include <QSettings>
-#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")));
-  finishedListModel = new QStandardItemModel(0,8);
-  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_SWARM, Qt::Horizontal, tr("Seeds / Leechers"));
-  finishedListModel->setHeaderData(F_PEERS, Qt::Horizontal, tr("Connected peers"));
-  finishedListModel->setHeaderData(F_UPLOAD, Qt::Horizontal, tr("Total uploaded", "i.e: Total amount of uploaded data"));
-  finishedListModel->setHeaderData(F_RATIO, Qt::Horizontal, tr("Ratio"));
-  finishedList->setModel(finishedListModel);
-  finishedList->setRootIsDecorated(false);
-  finishedList->setAllColumnsShowFocus(true);
-  loadHiddenColumns();
-  // Hide hash column
-  finishedList->hideColumn(F_HASH);
-  // Load last columns width for download list
-  if(!loadColWidthFinishedList()){
-    finishedList->header()->resizeSection(0, 200);
-  }
-  // Make download list header clickable for sorting
-  finishedList->header()->setClickable(true);
-  finishedList->header()->setSortIndicatorShown(true);
-  connect(finishedList->header(), SIGNAL(sectionPressed(int)), this, SLOT(toggleFinishedListSortOrder(int)));
-  finishedListDelegate = new FinishedListDelegate(finishedList);
-  finishedList->setItemDelegate(finishedListDelegate);
-  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&)));
-  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")));
-  actionTorrent_Properties->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/properties.png")));
-  actionSet_upload_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png")));
-  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(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()));
-  connect(actionBuy_it, SIGNAL(triggered()), (GUI*)parent, SLOT(goBuyPage()));
-  connect(actionTorrent_Properties, SIGNAL(triggered()), this, SLOT(propertiesSelection()));
-  connect(actionForce_recheck, SIGNAL(triggered()), this, SLOT(forceRecheck()));
-
-  connect(actionHOSColName, SIGNAL(triggered()), this, SLOT(hideOrShowColumnName()));
-  connect(actionHOSColSize, SIGNAL(triggered()), this, SLOT(hideOrShowColumnSize()));
-  connect(actionHOSColUpSpeed, SIGNAL(triggered()), this, SLOT(hideOrShowColumnUpSpeed()));
-  connect(actionHOSColSwarm, SIGNAL(triggered()), this, SLOT(hideOrShowColumnSwarm()));
-  connect(actionHOSColPeers, SIGNAL(triggered()), this, SLOT(hideOrShowColumnPeers()));
-  connect(actionHOSColUpload, SIGNAL(triggered()), this, SLOT(hideOrShowColumnUpload()));
-  connect(actionHOSColRatio, SIGNAL(triggered()), this, SLOT(hideOrShowColumnRatio()));
-}
-
-FinishedTorrents::~FinishedTorrents(){
-  saveColWidthFinishedList();
-  saveHiddenColumns();
-  delete finishedListDelegate;
-  delete finishedListModel;
-}
-
-void FinishedTorrents::notifyTorrentDoubleClicked(const QModelIndex& index) {
-  unsigned int row = index.row();
-  QString hash = getHashFromRow(row);
-  emit torrentDoubleClicked(hash, true);
-}
-
-void FinishedTorrents::addTorrent(QString hash){
-  int row = getRowFromHash(hash);
-  if(row != -1) return;
-  row = finishedListModel->rowCount();
-  QTorrentHandle h = BTSession->getTorrentHandle(hash);
-  // Adding torrent to download list
-  finishedListModel->insertRow(row);
-  finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(h.name()));
-  finishedListModel->setData(finishedListModel->index(row, F_SIZE), QVariant((qlonglong)h.actual_size()));
-  finishedListModel->setData(finishedListModel->index(row, F_UPSPEED), QVariant((double)0.));
-  finishedListModel->setData(finishedListModel->index(row, F_SWARM), QVariant("-1/-1"));
-  finishedListModel->setData(finishedListModel->index(row, F_PEERS), QVariant("0"));
-  finishedListModel->setData(finishedListModel->index(row, F_UPLOAD), QVariant((qlonglong)h.all_time_upload()));
-  finishedListModel->setData(finishedListModel->index(row, F_RATIO), QVariant(QString::fromUtf8(misc::toString(BTSession->getRealRatio(hash)).c_str())));
-  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);
-    setRowColor(row, "red");
-  }else{
-    finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(":/Icons/skin/seeding.png")), Qt::DecorationRole);
-    setRowColor(row, "orange");
-  }
-  // Update the number of finished torrents
-  ++nbFinished;
-  emit finishedTorrentsNumberChanged(nbFinished);
-  // Sort List
-  sortFinishedList();
-}
-
-// Set the color of a row in data model
-void FinishedTorrents::setRowColor(int row, QString color){
-  unsigned int nbColumns = finishedListModel->columnCount()-1;
-  for(unsigned int i=0; i<nbColumns; ++i){
-    finishedListModel->setData(finishedListModel->index(row, i), QVariant(QColor(color)), Qt::ForegroundRole);
-  }
-}
-
-QStringList FinishedTorrents::getSelectedTorrents(bool only_one) const{
-  QStringList res;
-  QModelIndexList selectedIndexes = finishedList->selectionModel()->selectedIndexes();
-  foreach(const QModelIndex &index, selectedIndexes) {
-    if(index.column() == F_NAME) {
-      // Get the file hash
-      QString hash = finishedListModel->data(finishedListModel->index(index.row(), F_HASH)).toString();
-      res << hash;
-      if(only_one) break;
-    }
-  }
-  return res;
-}
-
-unsigned int FinishedTorrents::getNbTorrentsInList() const {
-  return nbFinished;
-}
-
-// Load columns width in a file that were saved previously
-// (finished list)
-bool FinishedTorrents::loadColWidthFinishedList(){
-  qDebug("Loading columns width for finished list");
-  QSettings settings("qBittorrent", "qBittorrent");
-  QString line = settings.value("FinishedListColsWidth", QString()).toString();
-  if(line.isEmpty())
-    return false;
-  QStringList width_list = line.split(' ');
-  if(width_list.size() < finishedListModel->columnCount()-1)
-    return false;
-  unsigned int listSize = width_list.size();
-  for(unsigned int i=0; i<listSize; ++i){
-        finishedList->header()->resizeSection(i, width_list.at(i).toInt());
-  }
-  loadLastSortedColumn();
-  QVariantList visualIndexes = settings.value(QString::fromUtf8("FinishedListVisualIndexes"), QVariantList()).toList();
-  if(visualIndexes.size() != finishedListModel->columnCount()-1) {
-    qDebug("Corrupted values for download list columns sizes");
-    return false;
-  }
-  bool change = false;
-  do {
-    change = false;
-    for(int i=0;i<visualIndexes.size(); ++i) {
-      int new_visual_index = visualIndexes.at(finishedList->header()->logicalIndex(i)).toInt();
-      if(i != new_visual_index) {
-        qDebug("Moving column from %d to %d", finishedList->header()->logicalIndex(i), new_visual_index);
-        finishedList->header()->moveSection(i, new_visual_index);
-        change = true;
-      }
-    }
-  }while(change);
-  qDebug("Finished list columns width loaded");
-  return true;
-}
-
-void FinishedTorrents::loadLastSortedColumn() {
-  // Loading last sorted column
-  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
-  QString sortedCol = settings.value(QString::fromUtf8("FinishedListSortedCol"), QString()).toString();
-  if(!sortedCol.isEmpty()) {
-    Qt::SortOrder sortOrder;
-    if(sortedCol.endsWith(QString::fromUtf8("d")))
-      sortOrder = Qt::DescendingOrder;
-    else
-      sortOrder = Qt::AscendingOrder;
-    sortedCol = sortedCol.left(sortedCol.size()-1);
-    int index = sortedCol.toInt();
-    sortFinishedList(index, sortOrder);
-  }
-}
-
-// Save columns width in a file to remember them
-// (finished list)
-void FinishedTorrents::saveColWidthFinishedList() const{
-  qDebug("Saving columns width in finished list");
-  QSettings settings("qBittorrent", "qBittorrent");
-  QStringList width_list;
-  QStringList new_width_list;
-  short nbColumns = finishedListModel->columnCount()-1;
-
-  QString line = settings.value("FinishedListColsWidth", QString()).toString();
-  if(!line.isEmpty()) {
-    width_list = line.split(' ');
-  }
-  for(short i=0; i<nbColumns; ++i){
-    if(finishedList->columnWidth(i)<1 && width_list.size() == nbColumns && width_list.at(i).toInt()>=1) {
-      // load the former width
-      new_width_list << width_list.at(i);
-    } else if(finishedList->columnWidth(i)>=1) { 
-      // usual case, save the current width
-      new_width_list << QString::fromUtf8(misc::toString(finishedList->columnWidth(i)).c_str());
-    } else { 
-      // default width
-      finishedList->resizeColumnToContents(i);
-      new_width_list << QString::fromUtf8(misc::toString(finishedList->columnWidth(i)).c_str());
-    }
-  }
-  settings.setValue("FinishedListColsWidth", new_width_list.join(" "));
-  QVariantList visualIndexes;
-  for(int i=0; i<nbColumns; ++i) {
-    visualIndexes.append(finishedList->header()->visualIndex(i));
-  }
-  settings.setValue(QString::fromUtf8("FinishedListVisualIndexes"), visualIndexes);
-  qDebug("Finished list columns width saved");
-}
-
-void FinishedTorrents::on_actionSet_upload_limit_triggered(){
-  QModelIndexList selectedIndexes = finishedList->selectionModel()->selectedIndexes();
-  QStringList hashes;
-  foreach(const QModelIndex &index, selectedIndexes){
-    if(index.column() == F_NAME){
-      // Get the file hash
-      hashes << finishedListModel->data(finishedListModel->index(index.row(), F_HASH)).toString();
-    }
-  }
-  new BandwidthAllocationDialog(this, true, BTSession, hashes);
-}
-
-void FinishedTorrents::updateTorrent(QTorrentHandle h) {
-    QString hash = h.hash();
-    int row = getRowFromHash(hash);
-    if(row == -1){
-      qDebug("Cannot find torrent in finished list, adding it");
-      addTorrent(hash);
-      row = getRowFromHash(hash);
-    }
-    Q_ASSERT(row != -1);
-    if(!finishedList->isColumnHidden(F_SWARM)) {
-      finishedListModel->setData(finishedListModel->index(row, F_SWARM), misc::toQString(h.num_complete())+QString("/")+misc::toQString(h.num_incomplete()));
-    }
-    if(h.is_paused()) return;
-    // Update queued torrent
-    if(BTSession->isQueueingEnabled() && h.is_queued()) {
-        if(h.state() == torrent_status::checking_files || h.state() == torrent_status::queued_for_checking){
-            finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/oxygen/time.png"))), Qt::DecorationRole);
-        } else {
-            finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/queued.png"))), Qt::DecorationRole);
-        }
-        // Reset upload speed and seeds/leech
-        finishedListModel->setData(finishedListModel->index(row, F_UPSPEED), 0.);
-        finishedListModel->setData(finishedListModel->index(row, F_PEERS), "0");
-        setRowColor(row, QString::fromUtf8("grey"));
-        return;
-    }
-    if(h.state() == torrent_status::checking_files || h.state() == torrent_status::queued_for_checking){
-      finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/oxygen/time.png"))), Qt::DecorationRole);
-      setRowColor(row, QString::fromUtf8("grey"));
-      return;
-    }
-    setRowColor(row, QString::fromUtf8("orange"));
-    finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png"))), Qt::DecorationRole);
-    if(!finishedList->isColumnHidden(F_UPSPEED)) {
-      finishedListModel->setData(finishedListModel->index(row, F_UPSPEED), QVariant((double)h.upload_payload_rate()));
-    }
-    if(!finishedList->isColumnHidden(F_PEERS)) {
-      finishedListModel->setData(finishedListModel->index(row, F_PEERS), misc::toQString(h.num_peers() - h.num_seeds(), true));
-    }
-    if(!finishedList->isColumnHidden(F_UPLOAD)) {
-      finishedListModel->setData(finishedListModel->index(row, F_UPLOAD), QVariant((double)h.all_time_upload()));
-    }
-    if(!finishedList->isColumnHidden(F_RATIO)) {
-      finishedListModel->setData(finishedListModel->index(row, F_RATIO), QVariant(misc::toQString(BTSession->getRealRatio(hash))));
-    }
-}
-
-int FinishedTorrents::getRowFromHash(QString hash) const{
-  unsigned int nbRows = finishedListModel->rowCount();
-  for(unsigned int i=0; i<nbRows; ++i){
-    if(finishedListModel->data(finishedListModel->index(i, F_HASH)) == hash){
-      return i;
-    }
-  }
-  return -1;
-}
-
-// Note: does not actually pause the torrent in BT Session
-void FinishedTorrents::pauseTorrent(QString hash) {
-  int row = getRowFromHash(hash);
-  if(row == -1)
-    return;
-  finishedListModel->setData(finishedListModel->index(row, F_UPSPEED), QVariant((double)0.0));
-  finishedListModel->setData(finishedListModel->index(row, F_NAME), QIcon(QString::fromUtf8(":/Icons/skin/paused.png")), Qt::DecorationRole);
-  finishedListModel->setData(finishedListModel->index(row, F_PEERS), QVariant(QString::fromUtf8("0")));
-  setRowColor(row, QString::fromUtf8("red"));
-}
-
-QString FinishedTorrents::getHashFromRow(unsigned int row) const {
-  Q_ASSERT(row < (unsigned int)finishedListModel->rowCount());
-  return finishedListModel->data(finishedListModel->index(row, F_HASH)).toString();
-}
-
-// Will move it to download tab
-void FinishedTorrents::deleteTorrent(QString hash){
-  int row = getRowFromHash(hash);
-  if(row == -1){
-    qDebug("Torrent is not in finished list, nothing to delete");
-    return;
-  }
-  finishedListModel->removeRow(row);
-  --nbFinished;
-  emit finishedTorrentsNumberChanged(nbFinished);
-}
-
-// Show torrent properties dialog
-void FinishedTorrents::showProperties(const QModelIndex &index){
-  showPropertiesFromHash(finishedListModel->data(finishedListModel->index(index.row(), F_HASH)).toString());
-}
-
-void FinishedTorrents::showPropertiesFromHash(QString hash){
-  QTorrentHandle h = BTSession->getTorrentHandle(hash);
-  properties *prop = new properties(this, BTSession, h);
-  connect(prop, SIGNAL(filteredFilesChanged(QString)), this, SLOT(updateFileSize(QString)));
-  connect(prop, SIGNAL(trackersChanged(QString)), BTSession, SLOT(saveTrackerFile(QString)));
-  prop->show();
-}
-
-void FinishedTorrents::updateFileSize(QString hash){
-  int row = getRowFromHash(hash);
-  QTorrentHandle h = BTSession->getTorrentHandle(hash);
-  finishedListModel->setData(finishedListModel->index(row, F_SIZE), QVariant((qlonglong)h.actual_size()));
-}
-
-// display properties of selected items
-void FinishedTorrents::propertiesSelection(){
-  QModelIndexList selectedIndexes = finishedList->selectionModel()->selectedIndexes();
-  foreach(const QModelIndex &index, selectedIndexes){
-    if(index.column() == F_NAME){
-      showProperties(index);
-    }
-  }
-}
-
-void FinishedTorrents::forceRecheck(){
-  QModelIndexList selectedIndexes = finishedList->selectionModel()->selectedIndexes();
-  foreach(const QModelIndex &index, selectedIndexes){
-      if(index.column() == F_NAME){
-          QString hash = finishedListModel->data(finishedListModel->index(index.row(), F_HASH)).toString();
-          QTorrentHandle h = BTSession->getTorrentHandle(hash);
-          qDebug("Forcing recheck for torrent %s", hash.toLocal8Bit().data());
-          h.force_recheck();
-      }
-  }
-}
-
-void FinishedTorrents::displayFinishedListMenu(const QPoint&){
-  QMenu myFinishedListMenu(this);
-  // Enable/disable pause/start action given the DL state
-  QModelIndexList selectedIndexes = finishedList->selectionModel()->selectedIndexes();
-  bool has_pause = false, has_start = false, has_preview = false;
-  foreach(const QModelIndex &index, selectedIndexes) {
-    if(index.column() == F_NAME) {
-      // Get the file name
-      QString hash = finishedListModel->data(finishedListModel->index(index.row(), F_HASH)).toString();
-      // Get handle and pause the torrent
-      QTorrentHandle h = BTSession->getTorrentHandle(hash);
-      if(!h.is_valid()) continue;
-      if(h.is_paused()) {
-        if(!has_start) {
-          myFinishedListMenu.addAction(actionStart);
-          has_start = true;
-        }
-      }else{
-        if(!has_pause) {
-          myFinishedListMenu.addAction(actionPause);
-          has_pause = true;
-        }
-      }
-      if(BTSession->isFilePreviewPossible(hash) && !has_preview) {
-         myFinishedListMenu.addAction(actionPreview_file);
-         has_preview = true;
-      }
-      if(has_pause && has_start && has_preview) break;
-    }
-  }
-  myFinishedListMenu.addSeparator();
-  myFinishedListMenu.addAction(actionDelete);
-  myFinishedListMenu.addAction(actionDelete_Permanently);
-  myFinishedListMenu.addSeparator();
-  myFinishedListMenu.addAction(actionSet_upload_limit);
-  myFinishedListMenu.addSeparator();
-  myFinishedListMenu.addAction(actionForce_recheck);
-  myFinishedListMenu.addSeparator();
-  myFinishedListMenu.addAction(actionOpen_destination_folder);
-  myFinishedListMenu.addAction(actionTorrent_Properties);
-  myFinishedListMenu.addSeparator();
-  myFinishedListMenu.addAction(actionBuy_it);
-
-  // Call menu
-  myFinishedListMenu.exec(QCursor::pos());
-}
-
-
-/*
- * Hiding Columns functions
- */
-
-// hide/show columns menu
-void FinishedTorrents::displayFinishedHoSMenu(const QPoint& pos){
-  QMenu hideshowColumn(this);
-  hideshowColumn.setTitle(tr("Hide or Show Column"));
-  int lastCol = F_RATIO;
-  for(int i=0; i<=lastCol; i++) {
-    hideshowColumn.addAction(getActionHoSCol(i));
-  }
-  // Call menu
-  hideshowColumn.exec(mapToGlobal(pos)+QPoint(10,34));
-}
-
-// toggle hide/show a column
-void FinishedTorrents::hideOrShowColumn(int index) {
-  unsigned int nbVisibleColumns = 0;
-  unsigned int nbCols = finishedListModel->columnCount();
-  // Count visible columns
-  for(unsigned int i=0; i<nbCols; ++i) {
-    if(!finishedList->isColumnHidden(i))
-      ++nbVisibleColumns;
-  }
-  if(!finishedList->isColumnHidden(index)) {
-    // User wants to hide the column
-    // Is there at least one other visible column?
-    if(nbVisibleColumns <= 1) return;
-    // User can hide the column, do it.
-    finishedList->setColumnHidden(index, true);
-    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_cancel.png")));
-    --nbVisibleColumns;
-  } else {
-    // User want to display the column
-    finishedList->setColumnHidden(index, false);
-    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_ok.png")));
-    ++nbVisibleColumns;
-  }
-  //resize all others non-hidden columns
-  for(unsigned int i=0; i<nbCols; ++i) {
-    if(!finishedList->isColumnHidden(i)) {
-      finishedList->setColumnWidth(i, (int)ceil(finishedList->columnWidth(i)+(finishedList->columnWidth(index)/nbVisibleColumns)));
-    }
-  }
-}
-
-void FinishedTorrents::hideOrShowColumnName() {
-  hideOrShowColumn(F_NAME);
-}
-
-void FinishedTorrents::hideOrShowColumnSize() {
-  hideOrShowColumn(F_SIZE);
-}
-
-void FinishedTorrents::hideOrShowColumnUpSpeed() {
-  hideOrShowColumn(F_UPSPEED);
-}
-
-void FinishedTorrents::hideOrShowColumnSwarm() {
-  hideOrShowColumn(F_SWARM);
-}
-
-void FinishedTorrents::hideOrShowColumnPeers() {
-  hideOrShowColumn(F_PEERS);
-}
-
-void FinishedTorrents::hideOrShowColumnUpload() {
-  hideOrShowColumn(F_UPLOAD);
-}
-
-void FinishedTorrents::hideOrShowColumnRatio() {
-  hideOrShowColumn(F_RATIO);
-}
-
-// load the previous settings, and hide the columns
-bool FinishedTorrents::loadHiddenColumns() {
-  bool loaded = false;
-  QSettings settings("qBittorrent", "qBittorrent");
-  QString line = settings.value("FinishedListColsHoS", QString()).toString();
-  QStringList ishidden_list;
-  if(!line.isEmpty()) {
-    ishidden_list = line.split(' ');
-    if(ishidden_list.size() == finishedListModel->columnCount()-1) {
-      unsigned int listSize = ishidden_list.size();
-      for(unsigned int i=0; i<listSize; ++i){
-            finishedList->header()->resizeSection(i, ishidden_list.at(i).toInt());
-      }
-      loaded = true;
-    }
-  }
-  for(int i=0; i<finishedListModel->columnCount()-1; i++) {
-    if(loaded && ishidden_list.at(i) == "0") {
-      finishedList->setColumnHidden(i, true);
-      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_cancel.png")));
-    } else {
-      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_ok.png")));
-    }
-  }
-  return loaded;
-}
-
-// save the hidden columns in settings
-void FinishedTorrents::saveHiddenColumns() {
-  QSettings settings("qBittorrent", "qBittorrent");
-  QStringList ishidden_list;
-  short nbColumns = finishedListModel->columnCount()-1;
-
-  for(short i=0; i<nbColumns; ++i){
-    if(finishedList->isColumnHidden(i)) {
-      ishidden_list << QString::fromUtf8(misc::toString(0).c_str());
-    } else {
-      ishidden_list << QString::fromUtf8(misc::toString(1).c_str());
-    }
-  }
-  settings.setValue("FinishedListColsHoS", ishidden_list.join(" "));
-}
-
-// getter, return the action hide or show whose id is index
-QAction* FinishedTorrents::getActionHoSCol(int index) {
-  switch(index) {
-    case F_NAME :
-      return actionHOSColName;
-      break;
-    case F_SIZE :
-      return actionHOSColSize;
-      break;
-    case F_UPSPEED :
-      return actionHOSColUpSpeed;
-      break;
-    case F_SWARM :
-      return actionHOSColSwarm;
-      break;
-    case F_PEERS :
-      return actionHOSColPeers;
-      break;
-    case F_UPLOAD :
-      return actionHOSColUpload;
-      break;
-    case F_RATIO :
-      return actionHOSColRatio;
-      break;
-    default :
-      return NULL;
-  }
-}
-
-
-/*
- * Sorting functions
- */
-
-void FinishedTorrents::toggleFinishedListSortOrder(int index) {
-  Qt::SortOrder sortOrder = Qt::AscendingOrder;
-  if(finishedList->header()->sortIndicatorSection() == index){
-    sortOrder = (Qt::SortOrder)!(bool)finishedList->header()->sortIndicatorOrder();
-  }
-  switch(index) {
-    case F_SIZE:
-    case F_UPSPEED:
-    case F_RATIO:
-    case F_UPLOAD:
-      sortFinishedListFloat(index, sortOrder);
-      break;
-    default:
-      sortFinishedListString(index, sortOrder);
-  }
-  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
-  QString sortOrderLetter;
-  if(sortOrder == Qt::AscendingOrder)
-    sortOrderLetter = QString::fromUtf8("a");
-  else
-    sortOrderLetter = QString::fromUtf8("d");
-  settings.setValue(QString::fromUtf8("FinishedListSortedCol"), misc::toQString(index)+sortOrderLetter);
-}
-
-void FinishedTorrents::sortFinishedList(int index, Qt::SortOrder sortOrder){
-  if(index == -1) {
-    index = finishedList->header()->sortIndicatorSection();
-    sortOrder = finishedList->header()->sortIndicatorOrder();
-  } else {
-    finishedList->header()->setSortIndicator(index, sortOrder);
-  }
-  switch(index) {
-    case F_SIZE:
-    case F_UPSPEED:
-    case F_UPLOAD:
-    case F_RATIO:
-      sortFinishedListFloat(index, sortOrder);
-      break;
-    default:
-      sortFinishedListString(index, sortOrder);
-  }
-}
-
-void FinishedTorrents::sortFinishedListFloat(int index, Qt::SortOrder sortOrder){
-  QList<QPair<int, double> > lines;
-  // insertion sorting
-  unsigned int nbRows = finishedListModel->rowCount();
-  for(unsigned int i=0; i<nbRows; ++i){
-    misc::insertSort(lines, QPair<int,double>(i, finishedListModel->data(finishedListModel->index(i, index)).toDouble()), sortOrder);
-  }
-  // Insert items in new model, in correct order
-  unsigned int nbRows_old = lines.size();
-  for(unsigned int row=0; row<nbRows_old; ++row){
-    finishedListModel->insertRow(finishedListModel->rowCount());
-    unsigned int sourceRow = lines[row].first;
-    unsigned int nbColumns = finishedListModel->columnCount();
-    for(unsigned int col=0; col<nbColumns; ++col){
-      finishedListModel->setData(finishedListModel->index(nbRows_old+row, col), finishedListModel->data(finishedListModel->index(sourceRow, col)));
-      finishedListModel->setData(finishedListModel->index(nbRows_old+row, col), finishedListModel->data(finishedListModel->index(sourceRow, col), Qt::DecorationRole), Qt::DecorationRole);
-      finishedListModel->setData(finishedListModel->index(nbRows_old+row, col), finishedListModel->data(finishedListModel->index(sourceRow, col), Qt::ForegroundRole), Qt::ForegroundRole);
-    }
-  }
-  // Remove old rows
-  finishedListModel->removeRows(0, nbRows_old);
-}
-
-void FinishedTorrents::sortFinishedListString(int index, Qt::SortOrder sortOrder){
-  QList<QPair<int, QString> > lines;
-  // Insertion sorting
-  unsigned int nbRows = finishedListModel->rowCount();
-  for(unsigned int i=0; i<nbRows; ++i){
-    misc::insertSortString(lines, QPair<int, QString>(i, finishedListModel->data(finishedListModel->index(i, index)).toString()), sortOrder);
-  }
-  // Insert items in new model, in correct order
-  unsigned int nbRows_old = lines.size();
-  for(unsigned int row=0; row<nbRows_old; ++row){
-    finishedListModel->insertRow(finishedListModel->rowCount());
-    unsigned int sourceRow = lines[row].first;
-    unsigned int nbColumns = finishedListModel->columnCount();
-    for(unsigned int col=0; col<nbColumns; ++col){
-      finishedListModel->setData(finishedListModel->index(nbRows_old+row, col), finishedListModel->data(finishedListModel->index(sourceRow, col)));
-      finishedListModel->setData(finishedListModel->index(nbRows_old+row, col), finishedListModel->data(finishedListModel->index(sourceRow, col), Qt::DecorationRole), Qt::DecorationRole);
-      finishedListModel->setData(finishedListModel->index(nbRows_old+row, col), finishedListModel->data(finishedListModel->index(sourceRow, col), Qt::ForegroundRole), Qt::ForegroundRole);
-    }
-  }
-  // Remove old rows
-  finishedListModel->removeRows(0, nbRows_old);
-}

src/FinishedTorrents.h

@@ -1,104 +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.
- *
- * In addition, as a special exception, the copyright holders give permission to
- * link this program with the OpenSSL project's "OpenSSL" library (or with
- * modified versions of it that use the same license as the "OpenSSL" library),
- * and distribute the linked executables. You must obey the GNU General Public
- * License in all respects for all of the code used other than "OpenSSL".  If you
- * modify file(s), you may extend this exception to your version of the file(s),
- * but you are not obligated to do so. If you do not wish to do so, delete this
- * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
- */
-
-#ifndef SEEDING_H
-#define SEEDING_H
-
-#include "ui_seeding.h"
-#include "qtorrenthandle.h"
-
-class QStandardItemModel;
-class bittorrent;
-class FinishedListDelegate;
-
-using namespace libtorrent;
-
-class FinishedTorrents : public QWidget, public Ui::seeding {
-  Q_OBJECT
-  private:
-    QObject *parent;
-    bittorrent *BTSession;
-    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);
-    ~FinishedTorrents();
-    // Methods
-    bool loadColWidthFinishedList();
-    int getRowFromHash(QString hash) const;
-    QStringList getSelectedTorrents(bool only_one=false) const;
-    unsigned int getNbTorrentsInList() const;
-    QString getHashFromRow(unsigned int row) const;
-
-  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 toggleFinishedListSortOrder(int index);
-    void sortFinishedList(int index=-1, Qt::SortOrder sortOrder=Qt::AscendingOrder);
-    void sortFinishedListFloat(int index, Qt::SortOrder sortOrder);
-    void sortFinishedListString(int index, Qt::SortOrder sortOrder);
-    void updateFileSize(QString hash);
-    void on_actionSet_upload_limit_triggered();
-    void notifyTorrentDoubleClicked(const QModelIndex& index);
-    void hideOrShowColumnName();
-    void hideOrShowColumnSize();
-    void hideOrShowColumnUpSpeed();
-    void hideOrShowColumnSwarm();
-    void hideOrShowColumnPeers();
-    void hideOrShowColumnUpload();
-    void hideOrShowColumnRatio();
-    void forceRecheck();
-
-  public slots:
-    void addTorrent(QString hash);
-    void updateTorrent(QTorrentHandle h);
-    void pauseTorrent(QString hash);
-    void propertiesSelection();
-    void deleteTorrent(QString hash);
-    void showPropertiesFromHash(QString hash);
-    void loadLastSortedColumn();
-
-  signals:
-    void torrentMovedFromFinishedList(QString);
-    void torrentDoubleClicked(QString hash, bool finished);
-    void finishedTorrentsNumberChanged(unsigned int);
-
-};
-
-#endif

src/GUI.h

@@ -34,88 +34,64 @@
 #include <QProcess>
 #include <QSystemTrayIcon>
 #include <QPointer>
-#include "ui_MainWindow.h"
+#include "ui_mainwindow.h"
 #include "qtorrenthandle.h"
 
-class bittorrent;
+enum TabIndex{TAB_TRANSFER, TAB_SEARCH, TAB_RSS};
-class createtorrent;
+
+class Bittorrent;
 class QTimer;
-class DownloadingTorrents;
-class FinishedTorrents;
 class downloadFromURL;
 class SearchEngine;
-#ifdef QT_4_4
+class QLocalServer;
-  class QLocalServer;
-  class QLocalSocket;
-#else
-  class QTcpServer;
-  class QTcpSocket;
-#endif
 class QCloseEvent;
 class RSSImp;
 class QShortcut;
 class about;
-class previewSelect;
 class options_imp;
 class QTabWidget;
-class QLabel;
+class TransferListWidget;
-class QModelIndex;
+class TransferListFiltersWidget;
-class HttpServer;
+class QSplitter;
-class QFrame;
+class PropertiesWidget;
+class StatusBar;
 
 class GUI : public QMainWindow, private Ui::MainWindow{
   Q_OBJECT
 
   private:
     // Bittorrent
-    bittorrent *BTSession;
+    Bittorrent *BTSession;
-    QTimer *checkConnect;
+    QList<QPair<QTorrentHandle,QString> > unauthenticated_trackers; // Still needed?
-    QTimer *scrapeTimer;
-    QList<QPair<QTorrentHandle,QString> > unauthenticated_trackers;
     // GUI related
+    QTimer *guiUpdater;
     QTabWidget *tabs;
+    StatusBar *status_bar;
     QPointer<options_imp> options;
-    QSystemTrayIcon *myTrayIcon;
+    QPointer<QSystemTrayIcon> systrayIcon;
     QPointer<QTimer> systrayCreator;
     QMenu *myTrayIconMenu;
-    DownloadingTorrents *downloadingTorrentTab;
+    TransferListWidget *transferList;
-    FinishedTorrents *finishedTorrentTab;
+    TransferListFiltersWidget *transferListFilters;
-    QLabel *connecStatusLblIcon;
+    PropertiesWidget *properties;
-    bool systrayIntegration;
     bool displaySpeedInTitle;
     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 *switchTransferShortcut;
-    QShortcut *switchUpShortcut;
     QShortcut *switchRSSShortcut;
+    // Widgets
     QAction *prioSeparator;
     QAction *prioSeparator2;
+    QSplitter *hSplitter;
+    QSplitter *vSplitter;
     // Search
     SearchEngine *searchEngine;
     // RSS
-    RSSImp *rssWidget;
+    QPointer<RSSImp> rssWidget;
-    // Web UI
-    QPointer<HttpServer> httpServer;
     // Misc
-#ifdef QT_4_4
     QLocalServer *localServer;
-    QLocalSocket *clientConnection;
-#else
-    QTcpServer *localServer;
-    QTcpSocket *clientConnection;
-#endif
 
   protected slots:
     // GUI related slots
@@ -129,59 +105,36 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     void on_actionShow_console_triggered();
     void readParamsOnSocket();
     void acceptConnection();
-    void togglePausedState(QString hash);
-    void torrentDoubleClicked(QString hash, bool finished);
-    void on_actionPreview_file_triggered();
-    void previewFile(QString filePath);
     void balloonClicked();
     void writeSettings();
     void readSettings();
     void on_actionExit_triggered();
     void createTrayIcon();
-    void updateUnfinishedTorrentNumber(unsigned int nb);
-    void updateFinishedTorrentNumber(unsigned int nb);
     void fullDiskError(QTorrentHandle& h, QString msg) const;
     void handleDownloadFromUrlFailure(QString, QString) const;
     void createSystrayDelayed();
+    void tab_changed(int);
     // Keyboard shortcuts
     void createKeyboardShortcuts();
-    void displayDownTab() const;
+    void displayTransferTab() const;
-    void displayUpTab() const;
     void displaySearchTab() const;
     void displayRSSTab() const;
     // Torrent actions
-    void on_actionTorrent_Properties_triggered();
-    void on_actionPause_triggered();
-    void on_actionPause_All_triggered();
-    void on_actionStart_triggered();
-    void on_actionStart_All_triggered();
-    void on_actionOpen_triggered();
-    void on_actionDelete_Permanently_triggered();
-    void on_actionDelete_triggered();
     void on_actionSet_global_upload_limit_triggered();
     void on_actionSet_global_download_limit_triggered();
     void on_actionDocumentation_triggered() const;
-    void checkConnectionStatus();
+    void on_actionOpen_triggered();
-    void configureSession(bool deleteOptions);
+    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 deleteTorrent(QString hash);
     void finishedTorrent(QTorrentHandle& h) const;
-    void addedTorrent(QTorrentHandle& h) const;
-    void checkedTorrent(QTorrentHandle& h) const;
-    void pausedTorrent(QTorrentHandle& h) const;
-    void resumedTorrent(QTorrentHandle& h) const;
-    void updateLists(bool force=false);
-    bool initWebUi(QString username, QString password, int port);
-    void on_actionIncreasePriority_triggered();
-    void on_actionDecreasePriority_triggered();
-    void scrapeTrackers();
     // Options slots
     void on_actionOptions_triggered();
-    void OptionsSaved(bool deleteOptions);
+    void optionsSaved();
     // HTTP slots
     void on_actionDownload_from_URL_triggered();
 
@@ -189,9 +142,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
   public slots:
     void trackerAuthenticationRequired(QTorrentHandle& h);
     void setTabText(int index, QString text) const;
-    void openDestinationFolder() const;
+    void showNotificationBaloon(QString title, QString msg) const;
-    void goBuyPage() const;
-    void updateRatio();
 
   protected:
     void closeEvent(QCloseEvent *);
@@ -206,6 +157,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     // Methods
     int getCurrentTabIndex() const;
     QPoint screenCenter() const;
+  TransferListWidget* getTransferList() const { return transferList; }
 };
 
 #endif

src/Icons/qBittorrent.desktop

@@ -1,23 +1,32 @@
 [Desktop Entry]
-Categories=Qt;Network;P2P
+Categories=Qt;Network;P2P;
-Comment=V1.4.0
+Comment=V2.0.7
 Exec=qbittorrent %f
 GenericName=Bittorrent client
 GenericName[bg]=Торент клиент
+GenericName[cs]=Bittorrent klient
 GenericName[de]=Bittorren Client
-GenericName[el]=Τορεντ πελάτης
+GenericName[el]=Bittorrent πελάτης
 GenericName[es]=Cliente Bittorrent
+GenericName[fi]=Bittorrent-ohjelma
 GenericName[fr]=Client Bittorrent
+GenericName[hu]=Bittorrent kliens
 GenericName[it]=Client Bittorrent
 GenericName[ja]=Bittorrent クライアント
 GenericName[ko]=비토렌트 클라이언트
-GenericName[nl]=Bittorrent client
+GenericName[nl]=Bittorrent-cliënt
 GenericName[pl]=Klient Bittorrent
+GenericName[pt]=Cliente Bittorrent
+GenericName[pt_BR]=Cliente Bittorrent
+GenericName[ro]=Client Bittorrent
 GenericName[ru]=клиент Bittorrent
+GenericName[sk]=Klient siete Bittorrent
+GenericName[sr]=Bittorrent-клијент
 GenericName[sv]=Bittorrent-klient
 GenericName[tr]=Bittorrent istemcisi
 GenericName[uk]=Bittorrent-клієнт
 GenericName[zh]=Bittorrent之用户
+GenericName[zh_TW]=Bittorrent客戶端
 Icon=qbittorrent
 MimeType=application/x-bittorrent;
 Name=qBittorrent