Tagged v2.2.5 release

Dropped dependency on Qt gif library

AUTHORS

@@ -2,9 +2,20 @@ 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>
+* Christian Kandeler <zambesi@users.sourceforge.net>
+
+Code from other projects:
+* 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
@@ -12,18 +23,24 @@ Images Authors:
   license: GPLv2
   url: http://ftp.acc.umu.se/pub/GNOME/sources/gnome-icon-theme
 
+* files: src/oxygen/*.png
+  copyright: Oxygen Icon Theme (KDE)
+  license: LGPL
+  url: http://www.oxygen-icons.org
+
 * files: src/Icons/flags/*.png
   copyright: Open Clip Art Library
   license: Creative Commons Public Domain Dedication
   url: http://www.openclipart.org
 
-* files: src/Icons/skins/*.png
+* files: src/Icons/skin/*.png
+  files: src/menuicons/YYxYY/*.png
   copyright: Mateusz Tobola <tobejodok@qbittorrent.org>
   license: GPLv2
 
-* files: src/menuicons/YYxYY/*.png
-  copyright: Mateusz Tobola <tobejodok@qbittorrent.org>
-  license: GPLv2
+* file: src/Icons/skin/tabs.gif
+  copyright: Greg Houston <gregory.houston@gmail.com>
+  license: MIT
 
 * file: src/search_engine/engines/btjunkie.png
   copyright: Downloaded from btjunkie.org
@@ -44,28 +61,31 @@ Translations authors:
 * files: src/lang/*.ts
   copyright:
   - Brazilian: Nick Marinho (nickmarinho@gmail.com)
-  - Bulgarian: Tsvetan & Boiko Bankov (emerge_life@users.sourceforge.net)
-  - Catalan: Gekko Dam Beer (gekko04@users.sourceforge.net)
-  - Chinese (Simplified): Guo Yue (guoyue0418@hotmail.com)
+  - Bulgarian: Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net)
+  - Catalan: Francisco Luque Contreras (frannoe@ya.com)
+  - Chinese (Simplified): Guo Yue (yue.guo0418@gmail.com)
+  - Chinese (Traditional): Yi-Shun Wang (dnextstep@gmail.com)
+  - Czech: Jirka Vilim (web@tets.cz)
   - Danish: Mathias Nielsen (comoneo@gmail.com)
   - Dutch: Joost Schipper (heavyjoost@users.sourceforge.net)
   - English: Christophe Dumez (chris@qbittorrent.org)
   - Finnish: Niklas Laxström (nikerabbit@users.sourceforge.net)
   - French: Christophe Dumez (chris@qbittorrent.org)
   - German: Niels Hoffmann (zentralmaschine@users.sourceforge.net)
-  - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net)
+  - 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)
-  - Ukrainian: Andrey Shpachenko (masterfix@users.sourceforge.net)
+  - Turkish: Hasan Yilmaz (iletisim@hedefturkce.com)
+  - Ukrainian: Andrey Shpachenko (masterfix@users.sourceforge.net) and Oleh Prypin (blaxpirit@gmail.com)
   license: GPLv2

COPYING

@@ -1,3 +1,17 @@
+qBittorrent is licensed under the GNU General Public License version 2 with the
+addition of the following special exception:
+
+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.
+
+----------
+
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 

Changelog

@@ -1,4 +1,428 @@
-* Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.1.0
+* 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
+    - 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
+    - FEATURE: Display total amount of uploaded data in finished list
+    - FEATURE: Resizing a column in a search results tab affects all tabs
+    - FEATURE: Search results tab columns are now remembered upon startup
+    - FEATURE: Added right click menu in search engine to clear completion history
+    - FEATURE: Allow to set a different port for DHT (UDP) than the one used for Bittorrent
+    - FEATURE: Updated spoofing code to avoid trackers ban
+    - BUGFIX: Provide more helpful explanation when an I/O error occured
+    - BUGFIX: Stop enforcing UTF-8 and use system locale instead
+    - COSMETIC: Redesigned program preferences
+    - COSMETIC: Updated icons set
+
+* Fri Jul 24 2009 - Christophe DUMEZ <chris@qbittorrent.org> - 1.3.5
+    - BUGFIX: Made IP filter parser more robust
+    - BUGFIX: Fixed torrent creation tool
+    - BUGFIX: Fixed possible overflow in progress calculation in arborescence.h
+    - BUGFIX: Save properties window size, position, columns width and restore them
+    - BUGFIX: Set a minimum default width for NAME column in properties
+    - BUGFIX: Remember visual indexes of columns in transfer lists
+
+* Sun Jul 12 2009 - Christophe DUMEZ <chris@qbittorrent.org> - v1.3.4
+    - BUGFIX: Fixed IP filter file parsing on 64bits
+    - BUGFIX: Suppressed QLayout: Attempting to add QLayout "" to properties "properties" warning message when opening a properties dialog
+    - BUGFIX: Fixed a little bug in search engine plugins helper file
+    - BUGFIX: Fixed compilation problems with Qt 4.3
+    - BUGFIX: Percentages no longer disapear with default cleanlooks style
+    - BUGFIX: Cleanly fixed popup menus position in lists (no more workarounds)
+    - BUGFIX: Fixed memory leak in search engine
+    - BUGFIX: Torrents with an infinite ratio are no longer affected by ratio_limit set in program preferences
+    - BUGFIX: Display a ratio of 0.0 if total_upload and total_download are both 0
+    - BUGFIX: Remove last separator in top tool bar
+    - BUGFIX: Tuned lists properties to make sure display is correct
+    - COSMETIC: Display date as well as time in log window
+
+* Sun Apr 5 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.3.3
+    - BUGFIX: Fixed Web UI torrent upload form
+    - BUGFIX: Fixed unicode support in search engine
+    - BUGFIX: Fixed search engine bug that prevented a torrent from appearing more than once among all tabs
+    - LICENSE: Added an exception to the license regarding OpenSSL.
+    - I18N: Updated Finnish translation
+
+* Sat Mar 7 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.3.2
+    - BUGFIX: Fix top toolbar disabling
+    - BUGFIX: Fix building with Qt 4.5
+    - BUGFIX: RSS items read status is now remembered upon restart
+
+* Mon Jan 26 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.3.1
+    - BUGFIX: Torrents paused due to an I/O error were displayed as queued
+    - BUGFIX: qBittorrent now prints backtrace in terminal when segfaulting
+    - BUGFIX: Fixed files progress display in torrent properties
+    - BUGFIX: Improved torrent ratio calculation
+    - BUGFIX: Fixed possible crash when parsing filter file
+    - BUGFIX: Made some code optimization
+    - BUGFIX: Fixed download/upload speed decrease problems
+    - I18N: Updated Finnish, Bulgarian and Greek translations
+
+* Fri Jan 9 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.3.0
+    - FEATURE: Based on libtorrent-rasterbar v0.14.2
+    - FEATURE: Improved ratio calculation system
+    - FEATURE: Torrent creation code cleanup
+    - FEATURE: Allow to set maximum number of active seeds (queueing)
+    - FEATURE: Now seeds priorities are handled automatically by libtorrent-rasterbar (queueing)
+    - FEATURE: Code cleanup and optimization (save memory and cpu)
+    - FEATURE: ETA calculation now relies on average speed over all sessions
+    - FEATURE: Allow to force rechecking torrents
+    - FEATURE: Added support for 2 new extensions (uTorrent metadata and smart ban plugin)
+    - FEATURE: Allow to change the save path of torrents after addition
+    - FEATURE: Got rid of libmagick++ dependency
+    - FEATURE: Updated Web interface to MochaUI v0.9.5
+    - FEATURE: Added notification in WebUI when qBittorrent is not reachable
+    - FEATURE: Rewrote folder scanning code (Now uses a filesystem watcher)
+    - FEATURE: Added torrent deletion from hard drive function in Web UI
+    - FEATURE: Added queueing priority actions in Web UI
+    - FEATURE: Display progress using progress bars in Web UI
+    - BUGFIX: Made usage of fastresume data more reliable
+    - BUGFIX: qBittorrent shutdown is now faster
+    - BUGFIX: Fixed several memory leaks
+    - BUGFIX: WebUI is now working with IE7
+    - BUGFIX: Fixed spacing problem in toolbar when toggling its visibility
+    - BUGFIX: Fixed some compilation and Qt4 warnings
+    - BUGFIX: Do not use an addition dialog for torrents from folder scanning
+    - BUGFIX: Catch SIGTERM to exit cleanly (e.g. computer shutdown)
+    - BUGFIX: Improved proxy support code
+    - BUGFIX: Fixed systray icon tooltip on Windows
+    - BUGFIX: Proxy settings are now saved even if disabled
+
+* Sun Nov 9 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.2.1
+    - BUGFIX: Fixed possible crash when deleting a torrent permanently
+    - BUGFIX: Queued_for_checking torrents were not displayed as checking in seeding list
+    - BUGFIX: Speed up startup time when having a lot of torrents
+
+* Wed Oct 29th 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.2.0
+    - FEATURE: Torrent queueing system (with priorities)
+    - FEATURE: The number of DHT nodes is displayed
+    - FEATURE: RSS can now be disabled from program preferences
+    - FEATURE: Added collapse/expand all buttons in addition and properties dialogs
+    - FEATURE: Can have different proxies for Bittorrent and search engine
+    - FEATURE: Allow multiple item selection in Web UI transfer list
+    - FEATURE: Moved uploads to a separate list in Web UI
+    - BUGFIX: Totally rewritten Web UI list refresh system (fixed memory leak)
+    - BUGFIX: Disable ETA calculation when ETA column is hidden
+    - BUGFIX: Removed "disconnected" connection state, detection was far from perfect
+    - BUGFIX: Torrents are no longer starting from scratch when changing default save path (when torrent addition dialog is disabled)
+    - BUGFIX: Single instance code is now more reliable on Qt >= 4.4
+    - COSMETIC: Transfer speed, ratio, connection status and DHT nodes are displayed in status bar    
+    - COSMETIC: RSS Tab is now hidden as a default
+    - COSMETIC: Allow to hide or display top toolbar
+    - COSMETIC: Log is now in a separate dialog
+
+* Sun Sept 14 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.1.4
+    - FEATURE: DHT is no longer used as fallback only
+    - FEATURE: Ported WebUI to Mootools v1.2
+    - BUGFIX: Fixed 'start seeding after torrent creation' feature
+    - BUGFIX: Fixed compilation with boost v1.36
+    - BUGFIX: Some code optimization
+    - BUGFIX: Fixed memory leak in Web UI
+    - BUGFIX: Fixed problems with column sorting
+    - BUGFIX: Improved code for pausing torrents on startup
+    - BUGFIX: Torrent addition dialog is now disabled for downloads from WebUI
+    - BUGFIX: Give focus to input field in WebUI download dialog
+
+* Tue Aug 26 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.1.3
+    - BUGFIX: Fixed ratio saving for seeding torrents
+    - I18N: Added czech and traditional chinese translations
+
+* Sun Aug 17 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.1.2
+    - BUGFIX: Fixed progress calculation
+    - BUGFIX: Fixed finished torrent detection
+
+* Fri Aug 01 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.1.1
+    - BUGFIX: Fixed bad resource file for icons
+
+* Fri Aug 01 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.1.0
     - FEATURE: Web interface to control qbittorrent (Ishan Arora)
     - FEATURE: Can spoof Azureus peer id to avoid ban
     - FEATURE: Allow to hide/show some columns in download and seeding lists

INSTALL

@@ -1,42 +1,57 @@
 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 ***
+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.3.0 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml)
-  Qt >= 4.4.0 is advised
+  Dependencies:
+    - Qt >= 4.4.0 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml)
 
-- libtorrent-rasterbar by Arvid Norberg (>= v0.13.1 REQUIRED)
-    -> http://www.qbittorrent.org/download.php (advised)
-    -> http://www.libtorrent.net
-    Be careful: another library (the one used by rTorrent) uses a similar name.
+    - 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.
 
-- libcurl
+    - libboost 1.34.x (libboost-filesystem, libboost-thread, libboost-date-time) + libasio
+      or
+    - libboost >= 1.35.x (libboost-system, libboost-filesystem, libboost-thread, libboost-date-time)
 
-- python >= 2.3 (needed by search engine)
+    - python >= 2.3 (needed by search engine)
+        * Run time only dependency
 
-- libmagick++ (advised, not required)
-  * Needed for favicons support (RSS / Search plugins)
+    - 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
 
-- libzzip (advised, not required)
-  * Needed for zip support (Search plugins)
+    - 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
 
-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
 

TODO

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

configure

@@ -18,20 +18,15 @@ Main options:
   --help              This help text.
 
 Dependency options:
-  --with-libtorrent-inc=[path]            Path to libtorrent-rasterbar include
-                                         files
-  --with-libtorrent-lib=[path]            Path to libtorrent-rasterbar library
-                                         files
-  --with-libtorrent-static-lib=[path]     Path to libtorrent-rasterbar .a file
-  --with-libboost-inc=[path]              Path to libboost include files
-  --with-libcurl-inc=[path]               Path to libcurl include files
-  --with-libcurl-lib=[path]               Path to libcurl library files
-  --disable-libmagick                    Disable use of libmagick
-  --with-libmagick-inc=[path]             Path to libmagick++ include files
-  --with-libmagick-lib=[path]             Path to libmagick++ library files
-  --disable-libzzip                      Disable use of libzzip
-  --with-libzzip-inc=[path]               Path to libzzip++ include files
-  --with-libzzip-lib=[path]               Path to libzzip++ library files
+  --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
+                                    qBittorrent executable (please follow
+                                    instructions in src/geoip/README)
 
 EOT
 }
@@ -148,18 +143,8 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
-		--with-libtorrent-inc=*)
-			QC_WITH_LIBTORRENT_INC=$optarg
-			shift
-			;;
-
-		--with-libtorrent-lib=*)
-			QC_WITH_LIBTORRENT_LIB=$optarg
-			shift
-			;;
-
-		--with-libtorrent-static-lib=*)
-			QC_WITH_LIBTORRENT_STATIC_LIB=$optarg
+		--disable-gui)
+			QC_DISABLE_GUI="Y"
 			shift
 			;;
 
@@ -168,43 +153,23 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
-		--with-libcurl-inc=*)
-			QC_WITH_LIBCURL_INC=$optarg
+		--with-libboost-lib=*)
+			QC_WITH_LIBBOOST_LIB=$optarg
 			shift
 			;;
 
-		--with-libcurl-lib=*)
-			QC_WITH_LIBCURL_LIB=$optarg
+		--disable-libnotify)
+			QC_DISABLE_libnotify="Y"
 			shift
 			;;
 
-		--disable-libmagick)
-			QC_DISABLE_libmagick="Y"
+		--disable-geoip-database)
+			QC_DISABLE_geoip_database="Y"
 			shift
 			;;
 
-		--with-libmagick-inc=*)
-			QC_WITH_LIBMAGICK_INC=$optarg
-			shift
-			;;
-
-		--with-libmagick-lib=*)
-			QC_WITH_LIBMAGICK_LIB=$optarg
-			shift
-			;;
-
-		--disable-libzzip)
-			QC_DISABLE_libzzip="Y"
-			shift
-			;;
-
-		--with-libzzip-inc=*)
-			QC_WITH_LIBZZIP_INC=$optarg
-			shift
-			;;
-
-		--with-libzzip-lib=*)
-			QC_WITH_LIBZZIP_LIB=$optarg
+		--with-geoip-database-embedded)
+			QC_WITH_GEOIP_DATABASE_EMBEDDED="Y"
 			shift
 			;;
 
@@ -229,18 +194,12 @@ echo PREFIX=$PREFIX
 echo BINDIR=$BINDIR
 echo DATADIR=$DATADIR
 echo EX_QTDIR=$EX_QTDIR
-echo QC_WITH_LIBTORRENT_INC=$QC_WITH_LIBTORRENT_INC
-echo QC_WITH_LIBTORRENT_LIB=$QC_WITH_LIBTORRENT_LIB
-echo QC_WITH_LIBTORRENT_STATIC_LIB=$QC_WITH_LIBTORRENT_STATIC_LIB
+echo QC_DISABLE_GUI=$QC_DISABLE_GUI
 echo QC_WITH_LIBBOOST_INC=$QC_WITH_LIBBOOST_INC
-echo QC_WITH_LIBCURL_INC=$QC_WITH_LIBCURL_INC
-echo QC_WITH_LIBCURL_LIB=$QC_WITH_LIBCURL_LIB
-echo QC_DISABLE_libmagick=$QC_DISABLE_libmagick
-echo QC_WITH_LIBMAGICK_INC=$QC_WITH_LIBMAGICK_INC
-echo QC_WITH_LIBMAGICK_LIB=$QC_WITH_LIBMAGICK_LIB
-echo QC_DISABLE_libzzip=$QC_DISABLE_libzzip
-echo QC_WITH_LIBZZIP_INC=$QC_WITH_LIBZZIP_INC
-echo QC_WITH_LIBZZIP_LIB=$QC_WITH_LIBZZIP_LIB
+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
 echo
 fi
 
@@ -345,92 +304,79 @@ cat >$1/modules.cpp <<EOT
 #line 1 "qt4.qcm"
 /*
 -----BEGIN QCMOD-----
-name: Qt >= 4.3
+name: Qt >= 4.4
+arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
 -----END QCMOD-----
 */
 class qc_qt4 : public ConfObj
 {
 public:
 	qc_qt4(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Qt >= 4.3"; }
-	QString shortname() const { return "Qt 4.3"; }
+	QString name() const { return "Qt >= 4.4"; }
+	QString shortname() const { return "Qt 4.4"; }
 	bool exec()
 	{
-		if(QT_VERSION >= 0x040400) {
-			conf->addDefine("QT_4_4");
-		}
-		return(QT_VERSION >= 0x040300);
-		
+		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+			conf->addDefine("DISABLE_GUI");
+		}	
+		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"
 /*
 -----BEGIN QCMOD-----
 name: libtorrent-rasterbar
-arg: with-libtorrent-inc=[path], Path to libtorrent-rasterbar include files
-arg: with-libtorrent-lib=[path], Path to libtorrent-rasterbar library files
-arg: with-libtorrent-static-lib=[path], Path to libtorrent-rasterbar .a file
 -----END QCMOD-----
 */
+// see  Conf::findPkgConfig
 class qc_libtorrent_rasterbar : public ConfObj
 {
 public:
 	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent-rasterbar >= 0.13"; }
+	QString name() const { return "libtorrent-rasterbar >= 0.14.4"; }
 	QString shortname() const { return "libtorrent-rasterbar"; }
 	bool exec(){
-        	QString s;
-		s = conf->getenv("QC_WITH_LIBTORRENT_INC");
-		if(!s.isEmpty()) {
-			if(!conf->checkHeader(s, "libtorrent/lsd.hpp")) {
-				return false;
-      			}
-		}else{
-			QStringList sl;
-			sl << "/usr/include";
-			sl << "/usr/local/include";
-			bool found = false;
-			foreach(s, sl){
-				if(conf->checkHeader(s, "libtorrent/lsd.hpp")){
-					found = true;
-					break;
-				}
-			}
-			if(!found) {
-				return false;
-          		}
-		}
-		conf->addIncludePath(s);
-		conf->addIncludePath(s+QDir::separator()+"libtorrent");
-
-		s = conf->getenv("QC_WITH_LIBTORRENT_STATIC_LIB");
-		if(!s.isEmpty() && QFile::exists(s) && s.endsWith(".a")){
-			conf->addLib(s);
-			return true;
-		}
-
-		s = conf->getenv("QC_WITH_LIBTORRENT_LIB");
-		if(!s.isEmpty()) {
-      			if(!conf->checkLibrary(s, "torrent-rasterbar")) {
-			        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(conf->checkLibrary(s, "torrent-rasterbar")){
-					found = true;
-					break;
-				}
-			}
-			if(!found) return false;
-			conf->addLib(QString("-L") + s);
+		QStringList incs;
+		QString req_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))
+			return false;
+		for(int n = 0; n < incs.count(); ++n)
+			conf->addIncludePath(incs[n]);
+		//if(!libs.isEmpty())
+		//	conf->addLib(libs);
+		if(conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other)) {
+                        //printf("\nWarning: libtorrent-rasterbar v%s was detected. Some feature will be disabled because they require v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
+		//else
+			conf->addDefine("LIBTORRENT_0_15");
 		}
+		// Get linking parameters
+		//QStringList params;
+		//QByteArray staticlibs;
+		//params << "--static" << "--libs" << "libtorrent-rasterbar";
+		//conf->doCommand("pkg-config", params, &staticlibs);
+		//conf->addLib(staticlibs.trimmed());
+		//libcrypto
+		conf->addLib("-lcrypto");
 		return true;
 	}
 };
@@ -439,14 +385,29 @@ 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);
+    }
+    return name;
+  }
 	bool exec(){
         	QString s;
 		s = conf->getenv("QC_WITH_LIBBOOST_INC");
@@ -488,221 +449,130 @@ public:
       			}
 		}
 		conf->addIncludePath(s);
-		return true;
-	}
-};
-#line 1 "libcurl.qcm"
-/*
------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;
+		// Find library
+		s = conf->getenv("QC_WITH_LIBBOOST_LIB");
+    QStringList required_libs;
+    required_libs 
+#if BOOST_VERSION >= 103500
+      << "system" 
+#endif
+      << "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;
+        }
       }
-		}
-		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 "libmagick.qcm"
+#line 1 "libnotify.qcm"
 /*
 -----BEGIN QCMOD-----
-name: libmagick
-arg: with-libmagick-inc=[path], Path to libmagick++ include files
-arg: with-libmagick-lib=[path], Path to libmagick++ library files
+name: libnotify
 -----END QCMOD-----
 */
-#include <QProcess>
-class qc_libmagick : public ConfObj
+// see  Conf::findPkgConfig
+class qc_libnotify : public ConfObj
 {
 public:
-	qc_libmagick(Conf *c) : ConfObj(c) {}
-	QString name() const { return "ImageMagick library (libmagick++)"; }
-	QString shortname() const { return "libmagick++"; }
-	QString checkString() const {
-		if(!conf->getenv("QC_DISABLE_libmagick").isEmpty())
-			return "";
-		return ConfObj::checkString();
-	}
+	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_libmagick").isEmpty())
+		if(!conf->getenv("QC_DISABLE_libnotify").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty()) {
 			return false;
-		QString s;
-		s = conf->getenv("QC_WITH_LIBMAGICK_INC");
-		if(!s.isEmpty()) {
-			if(!conf->checkHeader(s, "Magick++.h")) {
-				return false;
-    			}
-		}else{
-			QStringList sl;
-			sl << "/usr/include";
-			sl << "/usr/local/include";
-			bool found = false;
-			foreach(s, sl){
-				if(conf->checkHeader(s, "Magick++.h")){
-					found = true;
-					break;
-				}
-			}
-			if(!found)
-				return false;
 		}
-		conf->addIncludePath(s);
-
-		s = conf->getenv("QC_WITH_LIBMAGICK_LIB");
-		if(!s.isEmpty()) {
-                        if(!conf->checkLibrary(s, "Magick++")) {
+		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{
-			QStringList sl;
-			sl << "/usr/lib/";
-			sl << "/usr/lib64/";
-			sl << "/usr/local/lib/";
-			sl << "/usr/local/lib64/";
-			bool found = false;
-			foreach(s, sl){
-				if(conf->checkLibrary(s, "Magick++")) {
-					found = true;
-                                        break;
-				}
-			}
-			if(!found)
-                         	return false;
+		} else {
+			return false;
 		}
-		conf->addLib(QString("-L") + s);
-		QProcess magickConfig;
-		QStringList params;
-		params << "--libs";
-		magickConfig.start("Magick++-config", params, QIODevice::ReadOnly);
-		magickConfig.waitForStarted();
-		magickConfig.waitForFinished();
-		QByteArray result = magickConfig.readAll();
-		result = result.replace("\n", "");
-		conf->addLib(result.data());
-		conf->addDefine("HAVE_MAGICK");
+		
 		return true;
 	}
 };
-#line 1 "libzzip.qcm"
+#line 1 "geoip-database.qcm"
 /*
 -----BEGIN QCMOD-----
-name: libzzip
-arg: with-libzzip-inc=[path], Path to libzzip++ include files
-arg: with-libzzip-lib=[path], Path to libzzip++ library files
+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-----
 */
-#include <QProcess>
-class qc_libzzip : public ConfObj
+// see  Conf::findPkgConfig
+class qc_geoip_database : 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();
+	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;
 	}
-	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;
+#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
 		}
-		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;
+                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
 	}
 };
 
@@ -711,19 +581,19 @@ 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;
     o = new qc_libboost(conf);
     o->required = true;
     o->disabled = false;
-    o = new qc_libcurl(conf);
-    o->required = true;
-    o->disabled = false;
-    o = new qc_libmagick(conf);
+    o = new qc_libnotify(conf);
     o->required = false;
     o->disabled = false;
-    o = new qc_libzzip(conf);
+    o = new qc_geoip_database(conf);
     o->required = false;
     o->disabled = false;
 
@@ -1671,18 +1541,12 @@ export PREFIX
 export BINDIR
 export DATADIR
 export EX_QTDIR
-export QC_WITH_LIBTORRENT_INC
-export QC_WITH_LIBTORRENT_LIB
-export QC_WITH_LIBTORRENT_STATIC_LIB
+export QC_DISABLE_GUI
 export QC_WITH_LIBBOOST_INC
-export QC_WITH_LIBCURL_INC
-export QC_WITH_LIBCURL_LIB
-export QC_DISABLE_libmagick
-export QC_WITH_LIBMAGICK_INC
-export QC_WITH_LIBMAGICK_LIB
-export QC_DISABLE_libzzip
-export QC_WITH_LIBZZIP_INC
-export QC_WITH_LIBZZIP_LIB
+export QC_WITH_LIBBOOST_LIB
+export QC_DISABLE_libnotify
+export QC_DISABLE_geoip_database
+export QC_WITH_GEOIP_DATABASE_EMBEDDED
 export QC_VERBOSE
 rm -rf .qconftemp
 (

doc/qbittorrent-nox.1

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

doc/qbittorrent.1

@@ -1,28 +1,42 @@
 .\" 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" "January 16th 2010" "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] [\-\-webui-port=x] [TORRENT_FILE | URL]...
 
 \fBqbittorrent\fR \-\-help
 
 \fBqbittorrent\fR \-\-version
+
 .PP
 .SH "DESCRIPTION"
 
 \fBqBittorrent\fR is an advanced Bittorrent client written in C++ / Qt4,
-using the \fBrblibtorrent\fR library by Arvid Norberg. qBittorrent aims
-to be a good alternative to all other bittorrent clients out there. qBittorrent
+using the \fBlibtorrent-rasterbar\fR library by Arvid Norberg. qBittorrent is similar to uTorrent. qBittorrent
 is fast, stable, light, it supports unicode and it provides a good integrated search engine.
-It also comes with UPnP port forwarding / NAT-PMP, encryption (Azureus compatible), FAST extension (mainline) and PeX support (utorrent compatible).
+It also comes with UPnP port forwarding / NAT-PMP, encryption (Vuze 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.
+
+\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
 
-Please report any problem to http://bugs.qbittorrent.org
-.PP
 .SH "AUTHOR"
 
 Christophe Dumez <chris@qbittorrent.org>

qbittorrent.pro

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

qbittorrent.qc

@@ -6,15 +6,17 @@
   <dep type='qt4'>
     <required/>
   </dep>
+  <dep type='pkg-config'>
+    <required/>
+  </dep>
   <dep type='libtorrent-rasterbar'>
     <required/>
   </dep>
   <dep type='libboost'>
     <required/>
   </dep>
-  <dep type='libcurl'>
-    <required/>
+  <dep type='libnotify'>
+  </dep>
+  <dep type='geoip-database'>
   </dep>
-  <dep type='libmagick'/>
-  <dep type='libzzip'/>
 </qconf>

qcm/geoip-database.qcm

@@ -0,0 +1,37 @@
+/*
+-----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"; }
+        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
+			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/libboost.qcm

@@ -2,14 +2,29 @@
 -----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);
+    }
+    return name;
+  }
 	bool exec(){
         	QString s;
 		s = conf->getenv("QC_WITH_LIBBOOST_INC");
@@ -51,6 +66,41 @@ public:
       			}
 		}
 		conf->addIncludePath(s);
+		// Find library
+		s = conf->getenv("QC_WITH_LIBBOOST_LIB");
+    QStringList required_libs;
+    required_libs 
+#if BOOST_VERSION >= 103500
+      << "system" 
+#endif
+      << "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/libcommoncpp2.qcm

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

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/libmagick.qcm

@@ -64,14 +64,11 @@ public:
                          	return false;
 		}
 		conf->addLib(QString("-L") + s);
-		QProcess magickConfig;
+		QString out = "";
 		QStringList params;
-		params << "--libs";
-		magickConfig.start("Magick++-config", params, QIODevice::ReadOnly);
-		magickConfig.waitForStarted();
-		magickConfig.waitForFinished();
-		QByteArray result = magickConfig.readAll();
-		result = result.replace("\n", "");
+                params << "--libs";
+		qconf->doCommand("Magick++-config", params, &out);
+		out = out.replace("\n", "");
 		conf->addLib(result.data());
 		conf->addDefine("HAVE_MAGICK");
 		return true;

qcm/libnotify.qcm

@@ -0,0 +1,49 @@
+/*
+-----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"; }
+        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;
+		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

@@ -1,70 +1,40 @@
 /*
 -----BEGIN QCMOD-----
 name: libtorrent-rasterbar
-arg: with-libtorrent-inc=[path], Path to libtorrent-rasterbar include files
-arg: with-libtorrent-lib=[path], Path to libtorrent-rasterbar library files
-arg: with-libtorrent-static-lib=[path], Path to libtorrent-rasterbar .a file
 -----END QCMOD-----
 */
+// see  Conf::findPkgConfig
 class qc_libtorrent_rasterbar : public ConfObj
 {
 public:
 	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent-rasterbar >= 0.13"; }
+	QString name() const { return "libtorrent-rasterbar >= 0.14.4"; }
 	QString shortname() const { return "libtorrent-rasterbar"; }
 	bool exec(){
-        	QString s;
-		s = conf->getenv("QC_WITH_LIBTORRENT_INC");
-		if(!s.isEmpty()) {
-			if(!conf->checkHeader(s, "libtorrent/lsd.hpp")) {
-				return false;
-      			}
-		}else{
-			QStringList sl;
-			sl << "/usr/include";
-			sl << "/usr/local/include";
-			bool found = false;
-			foreach(s, sl){
-				if(conf->checkHeader(s, "libtorrent/lsd.hpp")){
-					found = true;
-					break;
-				}
-			}
-			if(!found) {
-				return false;
-          		}
-		}
-		conf->addIncludePath(s);
-		conf->addIncludePath(s+QDir::separator()+"libtorrent");
-
-		s = conf->getenv("QC_WITH_LIBTORRENT_STATIC_LIB");
-		if(!s.isEmpty() && QFile::exists(s) && s.endsWith(".a")){
-			conf->addLib(s);
-			return true;
-		}
-
-		s = conf->getenv("QC_WITH_LIBTORRENT_LIB");
-		if(!s.isEmpty()) {
-      			if(!conf->checkLibrary(s, "torrent-rasterbar")) {
-			        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(conf->checkLibrary(s, "torrent-rasterbar")){
-					found = true;
-					break;
-				}
-			}
-			if(!found) return false;
-			conf->addLib(QString("-L") + s);
+		QStringList incs;
+		QString req_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))
+			return false;
+		for(int n = 0; n < incs.count(); ++n)
+			conf->addIncludePath(incs[n]);
+		//if(!libs.isEmpty())
+		//	conf->addLib(libs);
+		if(conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other)) {
+                        //printf("\nWarning: libtorrent-rasterbar v%s was detected. Some feature will be disabled because they require v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
+		//else
+			conf->addDefine("LIBTORRENT_0_15");
 		}
+		// Get linking parameters
+		//QStringList params;
+		//QByteArray staticlibs;
+		//params << "--static" << "--libs" << "libtorrent-rasterbar";
+		//conf->doCommand("pkg-config", params, &staticlibs);
+		//conf->addLib(staticlibs.trimmed());
+		//libcrypto
+		conf->addLib("-lcrypto");
 		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/pkg-config.qcm

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

qcm/qt4.qcm

@@ -1,20 +1,20 @@
 /*
 -----BEGIN QCMOD-----
-name: Qt >= 4.3
+name: Qt >= 4.4
+arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
 -----END QCMOD-----
 */
 class qc_qt4 : public ConfObj
 {
 public:
 	qc_qt4(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Qt >= 4.3"; }
-	QString shortname() const { return "Qt 4.3"; }
+	QString name() const { return "Qt >= 4.4"; }
+	QString shortname() const { return "Qt 4.4"; }
 	bool exec()
 	{
-		if(QT_VERSION >= 0x040400) {
-			conf->addDefine("QT_4_4");
-		}
-		return(QT_VERSION >= 0x040300);
-		
+		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+			conf->addDefine("DISABLE_GUI");
+		}	
+		return(QT_VERSION >= 0x040400);
 	}
 };

src/DLListDelegate.h

@@ -1,103 +0,0 @@
-/*
- * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2006  Christophe Dumez
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * Contact : chris@qbittorrent.org
- */
-
-#ifndef 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 HASH 8
-
-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();
-          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,81 +0,0 @@
-/*
- * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2006  Christophe Dumez
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * Contact : chris@qbittorrent.org
- */
-
-#ifndef 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_LEECH 3
-#define F_RATIO 4
-#define F_HASH 5
-
-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:
-          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();
-          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,602 +0,0 @@
-/*
- * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2006  Christophe Dumez
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * Contact : chris@qbittorrent.org
- */
-#include "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")));
-  connect(BTSession, SIGNAL(addedTorrent(QString, QTorrentHandle&, bool)), this, SLOT(torrentAdded(QString, QTorrentHandle&, bool)));
-  finishedListModel = new QStandardItemModel(0,6);
-  finishedListModel->setHeaderData(F_NAME, Qt::Horizontal, tr("Name", "i.e: file name"));
-  finishedListModel->setHeaderData(F_SIZE, Qt::Horizontal, tr("Size", "i.e: file size"));
-  finishedListModel->setHeaderData(F_UPSPEED, Qt::Horizontal, tr("UP Speed", "i.e: Upload speed"));
-  finishedListModel->setHeaderData(F_LEECH, Qt::Horizontal, tr("Leechers", "i.e: full/partial sources"));
-  finishedListModel->setHeaderData(F_RATIO, Qt::Horizontal, tr("Ratio"));
-  finishedList->setModel(finishedListModel);
-  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(sortFinishedList(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(actionHOSColName, SIGNAL(triggered()), this, SLOT(hideOrShowColumnName()));
-  connect(actionHOSColSize, SIGNAL(triggered()), this, SLOT(hideOrShowColumnSize()));
-  connect(actionHOSColUpSpeed, SIGNAL(triggered()), this, SLOT(hideOrShowColumnUpSpeed()));
-  connect(actionHOSColLeechers, SIGNAL(triggered()), this, SLOT(hideOrShowColumnLeechers()));
-  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){
-  if(!BTSession->isFinished(hash)){
-    BTSession->setFinishedTorrent(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_LEECH), QVariant("0"));
-  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);
-}
-
-void FinishedTorrents::torrentAdded(QString, QTorrentHandle& h, bool) {
-  QString hash = h.hash();
-  if(BTSession->isFinished(hash)) {
-    addTorrent(hash);
-  }
-}
-
-// 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;
-  QModelIndex index;
-  QModelIndexList selectedIndexes = finishedList->selectionModel()->selectedIndexes();
-  foreach(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());
-  }
-  qDebug("Finished list columns width loaded");
-  return true;
-}
-
-// 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() == finishedListModel->columnCount()-1 && 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(" "));
-  qDebug("Finished list columns width saved");
-}
-
-void FinishedTorrents::on_actionSet_upload_limit_triggered(){
-  QModelIndexList selectedIndexes = finishedList->selectionModel()->selectedIndexes();
-  QModelIndex index;
-  QStringList hashes;
-  foreach(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::updateFinishedList(){
-  QString hash;
-  QStringList finishedSHAs = BTSession->getFinishedTorrents();
-  foreach(hash, finishedSHAs){
-    QTorrentHandle h = BTSession->getTorrentHandle(hash);
-    if(!h.is_valid()){
-      qDebug("Problem: This torrent is not valid in finished list");
-      continue;
-    }
-    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(h.is_paused()) continue;
-    if(BTSession->getTorrentsToPauseAfterChecking().indexOf(hash) != -1) {
-      continue;
-    }
-    if(h.state() == torrent_status::downloading || (h.state() != torrent_status::checking_files && h.state() != torrent_status::queued_for_checking && h.progress() < 1.)) {
-      // What are you doing here? go back to download tab!
-      int reponse = QMessageBox::question(this, tr("Incomplete torrent in seeding list"), tr("It appears that the state of '%1' torrent changed from 'seeding' to 'downloading'. Would you like to move it back to download list? (otherwise the torrent will simply be deleted)").arg(h.name()), QMessageBox::Yes | QMessageBox::No);
-      if (reponse == QMessageBox::Yes) {
-        qDebug("Info: a torrent was moved from finished to download tab");
-        deleteTorrent(hash);
-        BTSession->setFinishedTorrent(hash);
-        emit torrentMovedFromFinishedList(hash);
-      }
-      else if (reponse == QMessageBox::No) {
-		    qDebug("Deleted from the finished");
-		    BTSession->deleteTorrent(hash, true);
-      }
-      continue;
-    }
-    if(h.state() == torrent_status::checking_files){
-      finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/time.png"))), Qt::DecorationRole);
-      setRowColor(row, QString::fromUtf8("grey"));
-      continue;
-    }
-    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_LEECH)) {
-      finishedListModel->setData(finishedListModel->index(row, F_LEECH), misc::toQString(h.num_peers() - h.num_seeds(), true));
-    }
-    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_LEECH), QVariant(QString::fromUtf8("0")));
-  setRowColor(row, QString::fromUtf8("red"));
-}
-
-void FinishedTorrents::resumeTorrent(QString hash) {
-    int row = getRowFromHash(hash);
-    Q_ASSERT(row != -1);
-    finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png"))), Qt::DecorationRole);
-    setRowColor(row, QString::fromUtf8("orange"));
-}
-
-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();
-  QModelIndex index;
-  foreach(index, selectedIndexes){
-    if(index.column() == F_NAME){
-      showProperties(index);
-    }
-  }
-}
-
-void FinishedTorrents::displayFinishedListMenu(const QPoint& pos){
-  QMenu myFinishedListMenu(this);
-  QModelIndex index;
-  // 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(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(actionOpen_destination_folder);
-  myFinishedListMenu.addAction(actionTorrent_Properties);
-  myFinishedListMenu.addSeparator();
-  myFinishedListMenu.addAction(actionBuy_it);
-
-  // Call menu
-  // XXX: why mapToGlobal() is not enough?
-  myFinishedListMenu.exec(mapToGlobal(pos)+QPoint(10,59));
-}
-
-
-/*
- * Hiding Columns functions
- */
-
-// hide/show columns menu
-void FinishedTorrents::displayFinishedHoSMenu(const QPoint& pos){
-  QMenu hideshowColumn(this);
-  hideshowColumn.setTitle(tr("Hide or Show Column"));
-  for(int i=0; i<=F_RATIO; i++) {
-    hideshowColumn.addAction(getActionHoSCol(i));
-  }
-  // Call menu
-  hideshowColumn.exec(mapToGlobal(pos)+QPoint(10,32));
-}
-
-// 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/button_cancel.png")));
-    --nbVisibleColumns;
-  } else {
-    // User want to display the column
-    finishedList->setColumnHidden(index, false);
-    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/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::hideOrShowColumnLeechers() {
-  hideOrShowColumn(F_LEECH);
-}
-
-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/button_cancel.png")));
-    } else {
-      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/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_LEECH :
-      return actionHOSColLeechers;
-      break;
-    case F_RATIO :
-      return actionHOSColRatio;
-      break;
-    default :
-      return NULL;
-  }
-}
-
-
-/*
- * Sorting functions
- */
-
-void FinishedTorrents::sortFinishedList(int index){
-  static Qt::SortOrder sortOrder = Qt::AscendingOrder;
-  if(finishedList->header()->sortIndicatorSection() == index){
-    if(sortOrder == Qt::AscendingOrder){
-      sortOrder = Qt::DescendingOrder;
-    }else{
-      sortOrder = Qt::AscendingOrder;
-    }
-  }
-  finishedList->header()->setSortIndicator(index, sortOrder);
-  switch(index){
-    case F_SIZE:
-    case F_UPSPEED:
-      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,92 +0,0 @@
-/*
- * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2006  Christophe Dumez
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * Contact : chris@qbittorrent.org
- */
-
-#ifndef 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 sortFinishedList(int index);
-    void sortFinishedListFloat(int index, Qt::SortOrder sortOrder);
-    void sortFinishedListString(int index, Qt::SortOrder sortOrder);
-    void updateFileSize(QString hash);
-    void torrentAdded(QString path, QTorrentHandle& h, bool fastResume);
-    void on_actionSet_upload_limit_triggered();
-    void notifyTorrentDoubleClicked(const QModelIndex& index);
-    void hideOrShowColumnName();
-    void hideOrShowColumnSize();
-    void hideOrShowColumnUpSpeed();
-    void hideOrShowColumnLeechers();
-    void hideOrShowColumnRatio();
-
-  public slots:
-    void addTorrent(QString hash);
-    void updateFinishedList();
-    void pauseTorrent(QString hash);
-    void resumeTorrent(QString hash);
-    void propertiesSelection();
-    void deleteTorrent(QString hash);
-    void showPropertiesFromHash(QString hash);
-
-  signals:
-    void torrentMovedFromFinishedList(QString);
-    void torrentDoubleClicked(QString hash, bool finished);
-    void finishedTorrentsNumberChanged(unsigned int);
-
-};
-
-#endif

src/GUI.h

@@ -16,6 +16,15 @@
  * 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
  */
 
@@ -24,161 +33,139 @@
 
 #include <QProcess>
 #include <QSystemTrayIcon>
-
-#include "ui_MainWindow.h"
+#include <QPointer>
+#include "ui_mainwindow.h"
 #include "qtorrenthandle.h"
 
-class bittorrent;
-class createtorrent;
+enum TabIndex{TAB_TRANSFER, TAB_SEARCH, TAB_RSS};
+
+class Bittorrent;
 class QTimer;
-class DownloadingTorrents;
-class FinishedTorrents;
 class downloadFromURL;
 class SearchEngine;
-#ifdef QT_4_4
-  class QLocalServer;
-  class QLocalSocket;
-#else
-  class QTcpServer;
-  class QTcpSocket;
-#endif
+class QLocalServer;
 class QCloseEvent;
 class RSSImp;
 class QShortcut;
 class about;
-class previewSelect;
 class options_imp;
 class QTabWidget;
-class QLabel;
-class QModelIndex;
-class HttpServer;
+class TransferListWidget;
+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
 
-  private:
-    // Bittorrent
-    bittorrent *BTSession;
-    QTimer *checkConnect;
-    QList<QPair<QTorrentHandle,QString> > unauthenticated_trackers;
-    // GUI related
-    QTabWidget *tabs;
-    options_imp *options;
-    QSystemTrayIcon *myTrayIcon;
-    QTimer *systrayCreator;
-    QMenu *myTrayIconMenu;
-    DownloadingTorrents *downloadingTorrentTab;
-    FinishedTorrents *finishedTorrentTab;
-    QLabel *connecStatusLblIcon;
-    bool systrayIntegration;
-    bool displaySpeedInTitle;
-    bool force_exit;
-    unsigned int refreshInterval;
-    QTimer *refresher;
-    // Keyboard shortcuts
-    QShortcut *switchSearchShortcut;
-    QShortcut *switchSearchShortcut2;
-    QShortcut *switchDownShortcut;
-    QShortcut *switchUpShortcut;
-    QShortcut *switchRSSShortcut;
-    // Search
-    SearchEngine *searchEngine;
-    // RSS
-    RSSImp *rssWidget;
-    // Web UI
-    HttpServer *httpServer;
-    // Misc
-#ifdef QT_4_4
-    QLocalServer *localServer;
-    QLocalSocket *clientConnection;
-#else
-    QTcpServer *localServer;
-    QTcpSocket *clientConnection;
-#endif
+public:
+  // Construct / Destruct
+  GUI(QWidget *parent=0, QStringList torrentCmdLine=QStringList());
+  ~GUI();
+  // Methods
+  int getCurrentTabIndex() const;
+  TransferListWidget* getTransferList() const { return transferList; }
 
-  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 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) const;
-    void handleDownloadFromUrlFailure(QString, QString) const;
-    void createSystrayDelayed();
-    // Keyboard shortcuts
-    void createKeyboardShortcuts();
-    void displayDownTab() 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 configureSession(bool deleteOptions);
-    void processParams(const QStringList& params);
-    void addTorrent(QString path);
-    void addUnauthenticatedTracker(QPair<QTorrentHandle,QString> tracker);
-    void processScannedFiles(const QStringList& params);
-    void processDownloadedFiles(QString path, QString url);
-    void downloadFromURLList(const QStringList& urls);
-    void deleteTorrent(QString hash);
-    void deleteRatioTorrent(QString fileName);
-    void finishedTorrent(QTorrentHandle& h) const;
-    void torrentChecked(QString hash) const;
-    void updateLists();
-    bool initWebUi(QString username, QString password, int port);
-    void pauseTorrent(QString hash);
-    // Options slots
-    void on_actionOptions_triggered();
-    void OptionsSaved(QString info, bool deleteOptions);
-    // HTTP slots
-    void on_actionDownload_from_URL_triggered();
+public slots:
+  void trackerAuthenticationRequired(QTorrentHandle& h);
+  void setTabText(int index, QString text) const;
+  void showNotificationBaloon(QString title, QString msg) const;
+  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(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();
 
-  public slots:
-    void trackerAuthenticationRequired(QTorrentHandle& h);
-    void setTabText(int index, QString text) const;
-    void openDestinationFolder() const;
-    void goBuyPage() const;
-    void updateRatio();
+protected:
+  void closeEvent(QCloseEvent *);
+  void showEvent(QShowEvent *);
+  bool event(QEvent * event);
+  void displayRSSTab(bool enable);
 
-  protected:
-    void closeEvent(QCloseEvent *);
-    void hideEvent(QHideEvent *);
-
-  public:
-    // Construct / Destruct
-    GUI(QWidget *parent=0, QStringList torrentCmdLine=QStringList());
-    ~GUI();
-    // Methods
-    int getCurrentTabIndex() const;
-    QPoint screenCenter() 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;
+  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;
 };
 
 #endif