Tagged v2.0.0rc2 release

AUTHORS

@@ -3,26 +3,19 @@ Author:
 
 Contributors:
 * Stefanos Antaris <santaris@csd.auth.gr>
-* Mohammad Dib <mdib@qbittorrent.org>
-* Mirco Chinelli <infinity89@fastwebmail.it>
 * Ishan Arora <ishan@qbittorrent.org>
 * Arnaud Demaizière <arnaud@qbittorrent.org>
 * Grigis Gaëtan <cipher16@gmail.com>
-* Christian Kandeler <zambesi@users.sourceforge.net>
-* Silvan Scherrer <silvan.scherrer@aroa.ch>
 
 Code from other projects:
-* files src/qtsingleapp/* src/lineedit/*
-  copyright: Nokia Corporation
-  license: LGPL
-
 * files src/ico.cpp src/ico.h
   copyright: Malte Starostik <malte@kde.org>
   license: LGPL
 
-* files src/search_engine/socks.py
-  copyright: Dan Haim <negativeiq@users.sourceforge.net>
-  license: BSD
+GeoIP database author:
+* files: src/geoip/GeoIP.dat
+  copyright: MaxMind, Inc (http://maxmind.com/)
+  license: Open Data License (see src/geoip/LICENSE.txt)
 
 Images Authors:
 * files: src/Icons/*.png
@@ -67,13 +60,11 @@ Images Authors:
 Translations authors:
 * files: src/lang/*.ts
   copyright:
-  - Arabic: SDERAWI (abz8868@msn.com) and sn51234 (nesseyan@gmail.com)
   - Brazilian: Nick Marinho (nickmarinho@gmail.com)
-  - Bulgarian: Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net)
-  - Catalan: Francisco Luque Contreras (frannoe@ya.com)
+  - Bulgarian: Tsvetan & Boiko Bankov (emerge_life@users.sourceforge.net)
+  - Catalan: Gekko Dam Beer (gekko04@users.sourceforge.net)
   - Chinese (Simplified): Guo Yue (yue.guo0418@gmail.com)
   - Chinese (Traditional): Yi-Shun Wang (dnextstep@gmail.com)
-  - Croatian: Oliver Mucafir (oliver.untwist@gmail.com)
   - Czech: Jirka Vilim (web@tets.cz)
   - Danish: Mathias Nielsen (comoneo@gmail.com)
   - Dutch: Joost Schipper (heavyjoost@users.sourceforge.net)
@@ -81,20 +72,19 @@ Translations authors:
   - Finnish: Niklas Laxström (nikerabbit@users.sourceforge.net)
   - French: Christophe Dumez (chris@qbittorrent.org)
   - German: Niels Hoffmann (zentralmaschine@users.sourceforge.net)
-  - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net) and Stephanos Antaris (santaris@csd.auth.gr)
+  - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net)
   - Hungarian: Majoros Péter (majoros.j.p@t-online.hu)
   - Italian: Mirko Ferrari (mirkoferrari@gmail.com) and Ferraro Luciano (luciano.ferraro@gmail.com)
-  - Japanese: Nardog (alphisation@gmail.com)
+  - Japanese: Nardog (nardog@e2umail.com)
   - Korean: Jin Woo Sin (jin828sin@users.sourceforge.net)
   - Norwegian: Lars-Erik Labori (hamil@users.sourceforge.net)
-  - Polish: Mariusz Fik (fisiu@opensuse.org)
+  - Polish: Jarek Smieja (ajep9691@wp.pl)
   - Portuguese: Nick Marinho (nickmarinho@gmail.com)
   - Romanian: Obada Denis (obadadenis@users.sourceforge.net)
   - Russian: Nick Khazov (m2k3d0n at users.sourceforge.net)
-  - Serbian: Anaximandar Milet (anaximandar at operamail.com)
   - Slovak:  helix84
-  - Spanish: Francisco Luque Contreras (frannoe@ya.com)
+  - Spanish: Vicente Raul Plata Fonseca (silverxnt@users.sourceforge.net)
   - Swedish: Daniel Nylander (po@danielnylander.se)
-  - Turkish: Hasan Yilmaz (iletisim@hedefturkce.com)
-  - Ukrainian: Andrey Shpachenko (masterfix@users.sourceforge.net) and Oleh Prypin (blaxpirit@gmail.com)
+  - Turkish: Erdem Bingöl (erdem84@gmail.com)
+  - Ukrainian: Andrey Shpachenko (masterfix@users.sourceforge.net)
   license: GPLv2

Changelog

@@ -1,178 +1,10 @@
-* Sun Sep 26 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.2
-    - BUGFIX: Fix display of torrent content in addition dialog
-    - BUGFIX: Really fix manual editing of save path in torrent addition dialog
-
-* Sun Sep 26 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.1
-    - I18N: Updated Arabic translation
-    - I18N: Fixes to German translation
-    - BUGFIX: Save path can now be edited in torrent addition dialog
-    - BUGFIX: Fix save path encoding on non-utf8 systems
-    - BUGFIX: Fix saving to drive root on Windows
-    - BUGFIX: OGV can now be previewed
-    - BUGFIX: Maximum download limit is now 10MB/s
-    - BUGFIX: Fix 'download in scan dir' persistence
-    - BUGFIX: Add .torrent extension only when missing (torrent creator)
-    - BUGFIX: Fix possible issue with temporary download path persistence
-    - BUGFIX: Added support for | (OR) operator in RSS feed downloader
-    - BUGFIX: Fix Web UI for spanish users
-    - BUGFIX: Fix locale switching from Web UI
-    - BUGFIX: Use AND operator for torrentdownloads.net searches
-    - BUGFIX: Limit torrent addition dialog width to fit the screen
-    - COSMETIC: Fix progress bars style on Windows
-
-* Tue Aug 24 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.0
-    - FEATURE: Added actions to "Move to top/bottom" of priority queue
-    - FEATURE: Auto-Shutdown on downloads completion
-    - FEATURE: Email notification on download completion
-    - FEATURE: Added button to password-lock the UI
-    - FEATURE: Added label-level Pause/Resume/Delete actions
-    - FEATURE: Torrents can now be filtered by name
-    - FEATURE: Run external program on torrent completion
-    - FEATURE: Detect executable updates in order to advise the user to restart
-
-* Tue Jul 27 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.3.0
-    - FEATURE: Simplified torrent root folder renaming/truncating (< v2.3.0 is no longer forward compatible)
-    - FEATURE: Remember previous save paths in torrent addition dialog
-    - FEATURE: Max number of half-open connections can now be edited
-    - FEATURE: Added support for strict super seeding
-    - FEATURE: The user can force listening on a particular network interface
-    - FEATURE: Added cookie support for RSS feeds
-    - FEATURE: User can force tracker reannounce
-    - FEATURE: Added "No action" setting for double-click action
-    - FEATURE: Several torrents can be moved at once
-    - FEATURE: Added error state for torrents (error is displayed in a tooltip)
-    - FEATURE: Added filter for paused/error torrents
-    - FEATURE: Add Check/Uncheck all feature in Web UI
-    - FEATURE: Search engine can now be disabled
-    - FEATURE: Torrents can be automatically paused once they reach a given ratio
-    - FEATURE: Several files can now be disabled at once
-    - FEATURE: Added "Select All/None" buttons to files list
-    - FEATURE: Added support for BitComet links (bc://bt/...)
-    - BUGFIX: Hide seeding torrents files priorities in Web UI
-    - BUGFIX: The user can disable permanently recursive torrent download
-    - BUGFIX: Peer Exchange status is now correctly reported
-    - BUGFIX: Use an INI file instead of the registry on Windows (More reliable)
-    - BUGFIX: Removed client spoofing feature to avoid tracker blacklisting
-    - COSMETIC: Display peers country name in tooltip
-    - COSMETIC: Display number of torrents in transfers tab label
-    - COSMETIC: Simplified program preferences
-    - COSMETIC: Fix naming of actions opening new dialogs (use Name...)
-
-* 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
+* Unknown - 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: Speed up qBittorrent startup
     - FEATURE: Display per-torrent peer list
     - FEATURE: Make sure torrent files are always sorted by name
     - FEATURE: Seeds and Peers columns are now sortable
@@ -189,9 +21,6 @@
     - 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)
@@ -205,16 +34,10 @@
     - 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
@@ -227,49 +50,6 @@
     - 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

INSTALL

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

README.os2

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

configure

@@ -18,24 +18,8 @@ Main options:
   --help              This help text.
 
 Dependency options:
-  --disable-gui                                   Disable qBittorrent
-                                                 Graphical user interface for
-                                                 headless running
-  --with-libboost-inc=[path]                      Path to libboost include
-                                                 files
-  --with-libboost-lib=[path]                      Path to libboost library
-                                                 files
-  --disable-libnotify                            Disable use of libnotify
-  --disable-geoip-database                       Disable use of geoip-database
-  --with-geoip-database-embedded                  Geoip Database will be
-                                                 embedded in qBittorrent
-                                                 executable (please follow
-                                                 instructions in
-                                                 src/geoip/README)
-  --disable-qtsingleapplication                  Disable use of libboost
-  --with-qtsingleapplication=[system|shipped]     Use the shipped
-                                                 qtsingleapplication library
-                                                 or the system one
+  --with-libboost-inc=[path]     Path to libboost include files
+  --disable-libnotify           Disable use of libnotify
 
 EOT
 }
@@ -152,46 +136,16 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
-		--disable-gui)
-			QC_DISABLE_GUI="Y"
-			shift
-			;;
-
 		--with-libboost-inc=*)
 			QC_WITH_LIBBOOST_INC=$optarg
 			shift
 			;;
 
-		--with-libboost-lib=*)
-			QC_WITH_LIBBOOST_LIB=$optarg
-			shift
-			;;
-
 		--disable-libnotify)
 			QC_DISABLE_libnotify="Y"
 			shift
 			;;
 
-		--disable-geoip-database)
-			QC_DISABLE_geoip_database="Y"
-			shift
-			;;
-
-		--with-geoip-database-embedded)
-			QC_WITH_GEOIP_DATABASE_EMBEDDED="Y"
-			shift
-			;;
-
-		--disable-qtsingleapplication)
-			QC_DISABLE_qtsingleapplication="Y"
-			shift
-			;;
-
-		--with-qtsingleapplication=*)
-			QC_WITH_QTSINGLEAPPLICATION=$optarg
-			shift
-			;;
-
 		--verbose)
 			QC_VERBOSE="Y"
 			shift
@@ -213,14 +167,8 @@ echo PREFIX=$PREFIX
 echo BINDIR=$BINDIR
 echo DATADIR=$DATADIR
 echo EX_QTDIR=$EX_QTDIR
-echo QC_DISABLE_GUI=$QC_DISABLE_GUI
 echo QC_WITH_LIBBOOST_INC=$QC_WITH_LIBBOOST_INC
-echo QC_WITH_LIBBOOST_LIB=$QC_WITH_LIBBOOST_LIB
 echo QC_DISABLE_libnotify=$QC_DISABLE_libnotify
-echo QC_DISABLE_geoip_database=$QC_DISABLE_geoip_database
-echo QC_WITH_GEOIP_DATABASE_EMBEDDED=$QC_WITH_GEOIP_DATABASE_EMBEDDED
-echo QC_DISABLE_qtsingleapplication=$QC_DISABLE_qtsingleapplication
-echo QC_WITH_QTSINGLEAPPLICATION=$QC_WITH_QTSINGLEAPPLICATION
 echo
 fi
 
@@ -326,7 +274,6 @@ cat >$1/modules.cpp <<EOT
 /*
 -----BEGIN QCMOD-----
 name: Qt >= 4.4
-arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
 -----END QCMOD-----
 */
 class qc_qt4 : public ConfObj
@@ -337,27 +284,11 @@ public:
 	QString shortname() const { return "Qt 4.4"; }
 	bool exec()
 	{
-		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-			conf->addDefine("DISABLE_GUI");
-		}	
+		if(QT_VERSION >= 0x040500) {
+                        conf->addDefine("QT_4_5");
+                }
 		return(QT_VERSION >= 0x040400);
-	}
-};
-#line 1 "pkg-config.qcm"
-/*
------BEGIN QCMOD-----
-name: pkg-config
------END QCMOD-----
-*/
-#include <QProcess>
-class qc_pkg_config : public ConfObj
-{
-public:
-	qc_pkg_config(Conf *c) : ConfObj(c) {}
-	QString name() const { return "pkg-config executable"; }
-	QString shortname() const { return "pkg-config"; }
-	bool exec(){
-		return !conf->findProgram("pkg-config").isEmpty();
+		
 	}
 };
 #line 1 "libtorrent-rasterbar.qcm"
@@ -371,20 +302,24 @@ class qc_libtorrent_rasterbar : public ConfObj
 {
 public:
 	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent-rasterbar >= 0.14.4"; }
+	QString name() const { return "libtorrent-rasterbar >= 0.14.0 (>= 0.15.0 advised)"; }
 	QString shortname() const { return "libtorrent-rasterbar"; }
 	bool exec(){
 		QStringList incs;
-		QString req_ver = "0.14.4";
+		QString req_ver = "0.14.0";
+		QString adv_ver = "0.15.0";
 		QString version, libs, other;
 		VersionMode mode = VersionMin;
 		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other))
 			return false;
 		for(int n = 0; n < incs.count(); ++n)
 			conf->addIncludePath(incs[n]);
-		if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-  		  conf->addLib("-lcrypto");
-                }
+		if(!libs.isEmpty())
+			conf->addLib(libs);
+		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other))
+                        printf("\nWarning: libtorrent-rasterbar v%s was detected.\nAlthough it will compile and run, you will be missing some features. Please consider updating to v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
+		else
+			conf->addDefine("LIBTORRENT_0_15");
 		return true;
 	}
 };
@@ -393,39 +328,14 @@ public:
 -----BEGIN QCMOD-----
 name: libboost
 arg: with-libboost-inc=[path], Path to libboost include files
-arg: with-libboost-lib=[path], Path to libboost library files
 -----END QCMOD-----
 */
-#include <boost/version.hpp>
 class qc_libboost : public ConfObj
 {
 public:
 	qc_libboost(Conf *c) : ConfObj(c) {}
 	QString name() const { return "libboost"; }
 	QString shortname() const { return "libboost"; }
-  QString findBoostLib(QString path, QString lib) const {
-    QString name;
-    QDir libDir(path);
-    QStringList filters;
-    filters << "libboost_"+lib+"*-mt*.so";
-    QStringList result = libDir.entryList(filters, QDir::Files);
-    if(!result.empty()) {
-      name = result.first().mid(3);
-      // Remove .so
-      name.chop(3);
-    } else {
-      // Fall back to non -mt boost lib
-      filters.clear();
-      filters << "libboost_"+lib+"*.so";
-      result = libDir.entryList(filters, QDir::Files);
-      if(!result.empty()) {
-        name = result.first().mid(3);
-        // Remove .so
-        name.chop(3);
-      }
-    }
-    return name;
-  }
 	bool exec(){
         	QString s;
 		s = conf->getenv("QC_WITH_LIBBOOST_INC");
@@ -467,43 +377,6 @@ public:
       			}
 		}
 		conf->addIncludePath(s);
-		// Find library
-		s = conf->getenv("QC_WITH_LIBBOOST_LIB");
-    QStringList required_libs;
-#if BOOST_VERSION >= 103500
-      required_libs << "system"; 
-#endif
-    if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-      // Not required by nox
-      required_libs << "filesystem" << "thread";
-    }
-    QStringList libDirs;
-    libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
-    foreach(const QString& lib, required_libs) {
-      if(!s.isEmpty()) {
-        QString detected_name = findBoostLib(s, lib);
-        if(detected_name.isEmpty()) {
-          printf("Could not find boost %s library!\n", qPrintable(lib));
-          return false;
-        } else {
-          conf->addLib("-l"+detected_name);
-        }
-      } else {
-        bool found = false;
-        foreach(const QString& libDir, libDirs) {
-          QString detected_name = findBoostLib(libDir, lib);
-          if(!detected_name.isEmpty()) {
-            conf->addLib("-l"+detected_name);
-            found = true;
-            break;
-          }
-        }
-        if(!found) {
-          printf("Could not find boost %s library!\n", qPrintable(lib));
-          return false;
-        }
-      }
-    }
 		return true;
 	}
 };
@@ -520,15 +393,7 @@ public:
 	qc_libnotify(Conf *c) : ConfObj(c) {}
 	QString name() const { return "libnotify >= 0.4.2 (optional)"; }
 	QString shortname() const { return "libnotify"; }
-        QString checkString() const {
-                if(!conf->getenv("QC_DISABLE_libnotify").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
-                        return "";
-                return ConfObj::checkString();
-        }
 	bool exec(){
-		if(!conf->getenv("QC_DISABLE_libnotify").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-			return false;
-		}
 		QStringList incs;
 		QString req_ver = "0.4.2";
 		QString version, libs, other;
@@ -550,17 +415,6 @@ public:
 			} else {
 				return false;
 			}
-			QStringList incs3;
-                        QString req_ver3 = "2.0";
-                        QString version3, libs3, other3;
-			if(conf->findPkgConfig("gtk+-2.0", mode, req_ver3, &version3, &incs3, &libs3, &other3)) {
-                                for(int n = 0; n < incs3.count(); ++n)
-                                conf->addIncludePath(incs3[n]);
-                                if(!libs3.isEmpty())
-                                        conf->addLib(libs3);
-                        } else {
-                                return false;
-                        }
 		} else {
 			return false;
 		}
@@ -568,80 +422,12 @@ public:
 		return true;
 	}
 };
-#line 1 "geoip-database.qcm"
-/*
------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
-	}
-};
-#line 1 "qtsingleapplication.qcm"
-/*
------BEGIN QCMOD-----
-name: libboost
-arg: with-qtsingleapplication=[system|shipped], Use the shipped qtsingleapplication library or the system one
------END QCMOD-----
-*/
-class qc_qtsingleapplication : public ConfObj
-{
-public:
-	qc_qtsingleapplication(Conf *c) : ConfObj(c) {}
-	QString name() const { return "qtsingleapplication library"; }
-	QString shortname() const { return "qtsingleapplication"; }
-
-	bool exec(){
-        	QString s;
-		s = conf->getenv("QC_WITH_QTSINGLEAPPLICATION");
-                if(s.compare("system", Qt::CaseInsensitive) == 0) {
-                  // System
-                  conf->addDefine("USE_SYSTEM_QTSINGLEAPPLICATION");
-                  printf(" [system] ");
-                } else {
-                  printf(" [shipped] ");
-		}
-		return true;
-	}
-};
 
 EOT
 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;
@@ -651,12 +437,6 @@ cat >$1/modules_new.cpp <<EOT
     o = new qc_libnotify(conf);
     o->required = false;
     o->disabled = false;
-    o = new qc_geoip_database(conf);
-    o->required = false;
-    o->disabled = false;
-    o = new qc_qtsingleapplication(conf);
-    o->required = false;
-    o->disabled = false;
 
 EOT
 cat >$1/conf4.h <<EOT
@@ -1602,14 +1382,8 @@ export PREFIX
 export BINDIR
 export DATADIR
 export EX_QTDIR
-export QC_DISABLE_GUI
 export QC_WITH_LIBBOOST_INC
-export QC_WITH_LIBBOOST_LIB
 export QC_DISABLE_libnotify
-export QC_DISABLE_geoip_database
-export QC_WITH_GEOIP_DATABASE_EMBEDDED
-export QC_DISABLE_qtsingleapplication
-export QC_WITH_QTSINGLEAPPLICATION
 export QC_VERBOSE
 rm -rf .qconftemp
 (

doc/qbittorrent-nox.1

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

doc/qbittorrent.1

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

qbittorrent.pro

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

qbittorrent.qc

@@ -6,9 +6,6 @@
   <dep type='qt4'>
     <required/>
   </dep>
-  <dep type='pkg-config'>
-    <required/>
-  </dep>
   <dep type='libtorrent-rasterbar'>
     <required/>
   </dep>
@@ -17,8 +14,4 @@
   </dep>
   <dep type='libnotify'>
   </dep>
-  <dep type='geoip-database'>
-  </dep>
-  <dep type='qtsingleapplication'>
-  </dep>
 </qconf>

qcm/geoip-database.qcm

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

qcm/libnotify.qcm

@@ -10,15 +10,7 @@ public:
 	qc_libnotify(Conf *c) : ConfObj(c) {}
 	QString name() const { return "libnotify >= 0.4.2 (optional)"; }
 	QString shortname() const { return "libnotify"; }
-        QString checkString() const {
-                if(!conf->getenv("QC_DISABLE_libnotify").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
-                        return "";
-                return ConfObj::checkString();
-        }
 	bool exec(){
-		if(!conf->getenv("QC_DISABLE_libnotify").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-			return false;
-		}
 		QStringList incs;
 		QString req_ver = "0.4.2";
 		QString version, libs, other;
@@ -40,17 +32,6 @@ public:
 			} else {
 				return false;
 			}
-			QStringList incs3;
-                        QString req_ver3 = "2.0";
-                        QString version3, libs3, other3;
-			if(conf->findPkgConfig("gtk+-2.0", mode, req_ver3, &version3, &incs3, &libs3, &other3)) {
-                                for(int n = 0; n < incs3.count(); ++n)
-                                conf->addIncludePath(incs3[n]);
-                                if(!libs3.isEmpty())
-                                        conf->addLib(libs3);
-                        } else {
-                                return false;
-                        }
 		} else {
 			return false;
 		}

qcm/libtorrent-rasterbar.qcm

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

qcm/pkg-config.qcm

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

qcm/qt4.qcm

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

src/GUI.h

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

src/Icons/qBittorrent.desktop

@@ -1,9 +1,8 @@
 [Desktop Entry]
 Categories=Qt;Network;P2P;
-Comment=V2.4.2
+Comment=V2.0.0
 Exec=qbittorrent %f
 GenericName=Bittorrent client
-GenericName[ar]=العميل Bittorrent
 GenericName[bg]=Торент клиент
 GenericName[cs]=Bittorrent klient
 GenericName[de]=Bittorren Client
@@ -11,7 +10,6 @@ GenericName[el]=Bittorrent πελάτης
 GenericName[es]=Cliente Bittorrent
 GenericName[fi]=Bittorrent-ohjelma
 GenericName[fr]=Client Bittorrent
-GenericName[hr]=Bittorrent klijent
 GenericName[hu]=Bittorrent kliens
 GenericName[it]=Client Bittorrent
 GenericName[ja]=Bittorrent クライアント
@@ -23,7 +21,6 @@ GenericName[pt_BR]=Cliente Bittorrent
 GenericName[ro]=Client Bittorrent
 GenericName[ru]=клиент Bittorrent
 GenericName[sk]=Klient siete Bittorrent
-GenericName[sr]=Bittorrent-клијент
 GenericName[sv]=Bittorrent-klient
 GenericName[tr]=Bittorrent istemcisi
 GenericName[uk]=Bittorrent-клієнт

src/Info.plist

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

src/about_imp.h

@@ -47,27 +47,26 @@ class about : public QDialog, private Ui::AboutDlg{
       setAttribute(Qt::WA_DeleteOnClose);
       // Set icons
       logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/qbittorrent22.png")));
+      mascot_lbl->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/mascot.png")));
       //Title
       lb_name->setText(QString::fromUtf8("<b><h1>")+tr("qBittorrent")+QString::fromUtf8(" "VERSION"</h1></b>"));
       // Thanks
       te_thanks->append(QString::fromUtf8("<a name='top'></a>"));
       te_thanks->append(QString::fromUtf8("<ul><li>I would first like to thank sourceforge.net for hosting qBittorrent project and for their support.</li>"));
       te_thanks->append(QString::fromUtf8("<li>I am pleased that people from all over the world are contributing to qBittorrent: Ishan Arora (India), Arnaud Demaizière (France) and Stephanos Antaris (Greece). Their help is greatly appreciated</li>"));
-      te_thanks->append(QString::fromUtf8("<li>I also want to thank Στέφανος Αντάρης (santaris@csd.auth.gr) and Mirco Chinelli (infinity89@fastwebmail.it) for working on Mac OS X packaging.</li>"));
-      te_thanks->append(QString::fromUtf8("<li>I am grateful to Peter Koeleman (peter@qbittorrent.org) and Mohammad Dib (mdib@qbittorrent.org) for working on qBittorrent port to Windows.</li>"));
+      te_thanks->append(QString::fromUtf8("<li>I also want to thank Jeffery Fernandez (jeffery@qbittorrent.org), project consultant, for his help and support since the beginning of this project.</li>"));
+      te_thanks->append(QString::fromUtf8("<li>I am grateful to Peter Koeleman (peter@qbittorrent.org) for working on qBittorrent port to Windows.</li>"));
       te_thanks->append(QString::fromUtf8("<li>Thanks a lot to our graphist Mateusz Toboła (tobejodok@qbittorrent.org) for his great work.</li></ul><br><br>"));
       te_thanks->scrollToAnchor(QString::fromUtf8("top"));
       // Translation
       te_translation->append(QString::fromUtf8("<a name='top'></a>"));
       te_translation->append(tr("I would like to thank the following people who volunteered to translate qBittorrent:")+QString::fromUtf8("<br>"));
       te_translation->append(QString::fromUtf8(
-          "<i><u>Arabic:</u> SDERAWI (abz8868@msn.com) and sn51234 (nesseyan@gmail.com)<br>\
-          - <u>Brazilian:</u> Nick Marinho (nickmarinho@gmail.com)<br>\
-          - <u>Bulgarian:</u> Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net)<br>\
-          - <u>Catalan:</u> Francisco Luque Contreras (frannoe@ya.com)<br>\
+          "<i>- <u>Brazilian:</u> Nick Marinho (nickmarinho@gmail.com)<br>\
+          - <u>Bulgarian:</u> Tsvetan & Boiko Bankov (emerge_life@users.sourceforge.net)<br>\
+          - <u>Catalan:</u> Gekko Dam Beer (gekko04@users.sourceforge.net)<br>\
           - <u>Chinese (Simplified):</u> Guo Yue (yue.guo0418@gmail.com)<br>\
           - <u>Chinese (Traditional):</u> Yi-Shun Wang (dnextstep@gmail.com)<br>\
-          - <u>Croatian:</u> Oliver Mucafir (oliver.untwist@gmail.com)<br>\
           - <u>Czech:</u> Jirka Vilim (web@tets.cz)<br>\
           - <u>Danish:</u> Mathias Nielsen (comoneo@gmail.com)<br>\
           - <u>Dutch:</u> Joost Schipper (heavyjoost@users.sourceforge.net) and Peter Koeleman (peter@peerweb.nl)<br>\
@@ -76,26 +75,22 @@ class about : public QDialog, private Ui::AboutDlg{
           - <u>Greek:</u> Tsvetan Bankov (emerge_life@users.sourceforge.net)<br>\
           - <u>Hungarian:</u> Majoros Péter (majoros.peterj@gmail.com)<br>\
           - <u>Italian:</u> Mirko Ferrari (mirkoferrari@gmail.com) and Ferraro Luciano (luciano.ferraro@gmail.com)<br>\
-          - <u>Japanese:</u> Nardog (alphisation@gmail.com)<br>\
+          - <u>Japanese:</u> Nardog (nardog@e2umail.com)<br>\
           - <u>Korean:</u> Jin Woo Sin (jin828sin@users.sourceforge.net)<br>\
           - <u>Norwegian:</u> Lars-Erik Labori (hamil@users.sourceforge.net)<br>\
-          - <u>Polish:</u> Mariusz Fik (fisiu@opensuse.org)<br>\
+          - <u>Polish:</u> Jarek Smieja (ajep9691@wp.pl)<br>\
           - <u>Portuguese:</u> Nick Marinho (nickmarinho@gmail.com)<br>\
           - <u>Romanian:</u> Obada Denis (obadadenis@users.sourceforge.net)<br>\
           - <u>Russian:</u> Nick Khazov (m2k3d0n@users.sourceforge.net) and Alexey Morsov (samurai@ricom.ru)<br>\
-          - <u>Serbian:</u> Anaximandar Milet (anaximandar@operamail.com)<br>\
           - <u>Slovak:</u>  helix84<br>\
-          - <u>Spanish:</u> Francisco Luque Contreras (frannoe@ya.com)<br>\
+          - <u>Spanish:</u> Vicente Raul Plata Fonseca (silverxnt@users.sourceforge.net) and Gabriel de Oliveira (deadloop@hotmail.com)<br>\
           - <u>Swedish:</u> Daniel Nylander (po@danielnylander.se)<br>\
           - <u>Turkish:</u> Hasan YILMAZ (iletisim@hedefturkce.com) and Erdem Bingöl (erdem84@gmail.com)<br>\
-          - <u>Ukrainian:</u> Andrey Shpachenko (masterfix@users.sourceforge.net) and Oleh Prypin (blaxpirit@gmail.com)<br><br>"));
+          - <u>Ukrainian:</u> Andrey Shpachenko (masterfix@users.sourceforge.net)<br><br>"));
       te_translation->append(tr("Please contact me if you would like to translate qBittorrent into your own language."));
       te_translation->scrollToAnchor(QString::fromUtf8("top"));
       // License
       te_license->append(QString::fromUtf8("<a name='top'></a>"));
-#ifdef Q_WS_WIN
-      te_license->append(QString::fromUtf8("qBittorrent is licensed under the GNU General Public License version 2."));
-#else
       te_license->append(QString::fromUtf8("qBittorrent is licensed under the GNU General Public License version 2 with the\
 addition of the following special exception:\
 <br><br>\
@@ -442,7 +437,6 @@ exception statement from your version.</i>\
           consider it more useful to permit linking proprietary applications with the<br>\
           library.  If this is what you want to do, use the GNU Library General<br>\
           Public License instead of this License.<br>"));
-#endif
           te_license->scrollToAnchor(QString::fromUtf8("top"));
           show();
     }

src/advancedsettings.h

@@ -1,208 +0,0 @@
-#ifndef ADVANCEDSETTINGS_H
-#define ADVANCEDSETTINGS_H
-
-#include <QTableWidget>
-#include <QHeaderView>
-#include <QSpinBox>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QNetworkInterface>
-#include <libtorrent/version.hpp>
-#include "preferences.h"
-
-enum AdvSettingsCols {PROPERTY, VALUE};
-enum AdvSettingsRows {DISK_CACHE, OUTGOING_PORT_MIN, OUTGOING_PORT_MAX, IGNORE_LIMIT_LAN, COUNT_OVERHEAD, RECHECK_COMPLETED, LIST_REFRESH, RESOLVE_COUNTRIES, RESOLVE_HOSTS, MAX_HALF_OPEN, SUPER_SEEDING, NETWORK_IFACE, PROGRAM_NOTIFICATIONS };
-#define ROW_COUNT 13
-
-class AdvancedSettings: public QTableWidget {
-  Q_OBJECT
-
-private:
-  QSpinBox *spin_cache, *outgoing_ports_min, *outgoing_ports_max, *spin_list_refresh, *spin_maxhalfopen;
-  QCheckBox *cb_ignore_limits_lan, *cb_count_overhead, *cb_recheck_completed, *cb_resolve_countries, *cb_resolve_hosts, *cb_super_seeding, *cb_program_notifications;
-  QComboBox *combo_iface;
-
-public:
-  AdvancedSettings(QWidget *parent=0): QTableWidget(parent) {
-    // Set visual appearance
-    setEditTriggers(QAbstractItemView::NoEditTriggers);
-    setAlternatingRowColors(true);
-    setColumnCount(2);
-    QStringList header;
-    header << tr("Property") << tr("Value");
-    setHorizontalHeaderLabels(header);
-    setColumnWidth(0, width()/2);
-    horizontalHeader()->setStretchLastSection(true);
-    verticalHeader()->setVisible(false);
-    setRowCount(ROW_COUNT);
-    // Load settings
-    loadAdvancedSettings();
-  }
-
-  ~AdvancedSettings() {
-    delete spin_cache;
-    delete outgoing_ports_min;
-    delete outgoing_ports_max;
-    delete cb_ignore_limits_lan;
-    delete cb_count_overhead;
-    delete cb_recheck_completed;
-    delete spin_list_refresh;
-    delete cb_resolve_countries;
-    delete cb_resolve_hosts;
-    delete spin_maxhalfopen;
-    delete cb_super_seeding;
-    delete combo_iface;
-    delete cb_program_notifications;
-  }
-
-public slots:
-  void saveAdvancedSettings() {
-    // Disk write cache
-    Preferences::setDiskCacheSize(spin_cache->value());
-    // Outgoing ports
-    Preferences::setOutgoingPortsMin(outgoing_ports_min->value());
-    Preferences::setOutgoingPortsMax(outgoing_ports_max->value());
-    // Ignore limits on LAN
-    Preferences::ignoreLimitsOnLAN(cb_ignore_limits_lan->isChecked());
-    // Include protocol overhead in transfer limits
-    Preferences::includeOverheadInLimits(cb_count_overhead->isChecked());
-    // Recheck torrents on completion
-    Preferences::recheckTorrentsOnCompletion(cb_recheck_completed->isChecked());
-    // Transfer list refresh interval
-    Preferences::setRefreshInterval(spin_list_refresh->value());
-    // Peer resolution
-    Preferences::resolvePeerCountries(cb_resolve_countries->isChecked());
-    Preferences::resolvePeerHostNames(cb_resolve_hosts->isChecked());
-    // Max Half-Open connections
-    Preferences::setMaxHalfOpenConnections(spin_maxhalfopen->value());
-#if LIBTORRENT_VERSION_MINOR > 14
-    // Super seeding
-    Preferences::enableSuperSeeding(cb_super_seeding->isChecked());
-#endif
-    // Network interface
-    if(combo_iface->currentIndex() == 0) {
-      // All interfaces (default)
-      Preferences::setNetworkInterface(QString::null);
-    } else {
-      Preferences::setNetworkInterface(combo_iface->currentText());
-    }
-    // Program notification
-    Preferences::useProgramNotification(cb_program_notifications->isChecked());
-  }
-
-protected slots:
-  void loadAdvancedSettings() {
-    // Disk write cache
-    setItem(DISK_CACHE, PROPERTY, new QTableWidgetItem(tr("Disk write cache size")));
-    spin_cache = new QSpinBox();
-    connect(spin_cache, SIGNAL(valueChanged(int)), this, SLOT(emitSettingsChanged()));
-    spin_cache->setMinimum(1);
-    spin_cache->setMaximum(200);
-    spin_cache->setValue(Preferences::diskCacheSize());
-    spin_cache->setSuffix(tr(" MiB"));
-    setCellWidget(DISK_CACHE, VALUE, spin_cache);
-    // Outgoing port Min
-    setItem(OUTGOING_PORT_MIN, PROPERTY, new QTableWidgetItem(tr("Outgoing ports (Min) [0: Disabled]")));
-    outgoing_ports_min = new QSpinBox();
-    connect(outgoing_ports_min, SIGNAL(valueChanged(int)), this, SLOT(emitSettingsChanged()));
-    outgoing_ports_min->setMinimum(0);
-    outgoing_ports_min->setMaximum(65535);
-    outgoing_ports_min->setValue(Preferences::outgoingPortsMin());
-    setCellWidget(OUTGOING_PORT_MIN, VALUE, outgoing_ports_min);
-    // Outgoing port Min
-    setItem(OUTGOING_PORT_MAX, PROPERTY, new QTableWidgetItem(tr("Outgoing ports (Max) [0: Disabled]")));
-    outgoing_ports_max = new QSpinBox();
-    connect(outgoing_ports_max, SIGNAL(valueChanged(int)), this, SLOT(emitSettingsChanged()));
-    outgoing_ports_max->setMinimum(0);
-    outgoing_ports_max->setMaximum(65535);
-    outgoing_ports_max->setValue(Preferences::outgoingPortsMax());
-    setCellWidget(OUTGOING_PORT_MAX, VALUE, outgoing_ports_max);
-    // Ignore transfer limits on local network
-    setItem(IGNORE_LIMIT_LAN, PROPERTY, new QTableWidgetItem(tr("Ignore transfer limits on local network")));
-    cb_ignore_limits_lan = new QCheckBox();
-    connect(cb_ignore_limits_lan, SIGNAL(toggled(bool)), this, SLOT(emitSettingsChanged()));
-    cb_ignore_limits_lan->setChecked(Preferences::ignoreLimitsOnLAN());
-    setCellWidget(IGNORE_LIMIT_LAN, VALUE, cb_ignore_limits_lan);
-    // Consider protocol overhead in transfer limits
-    setItem(COUNT_OVERHEAD, PROPERTY, new QTableWidgetItem(tr("Include TCP/IP overhead in transfer limits")));
-    cb_count_overhead = new QCheckBox();
-    connect(cb_count_overhead, SIGNAL(toggled(bool)), this, SLOT(emitSettingsChanged()));
-    cb_count_overhead->setChecked(Preferences::includeOverheadInLimits());
-    setCellWidget(COUNT_OVERHEAD, VALUE, cb_count_overhead);
-    // Recheck completed torrents
-    setItem(RECHECK_COMPLETED, PROPERTY, new QTableWidgetItem(tr("Recheck torrents on completion")));
-    cb_recheck_completed = new QCheckBox();
-    connect(cb_recheck_completed, SIGNAL(toggled(bool)), this, SLOT(emitSettingsChanged()));
-    cb_recheck_completed->setChecked(Preferences::recheckTorrentsOnCompletion());
-    setCellWidget(RECHECK_COMPLETED, VALUE, cb_recheck_completed);
-    // Transfer list refresh interval
-    setItem(LIST_REFRESH, PROPERTY, new QTableWidgetItem(tr("Transfer list refresh interval")));
-    spin_list_refresh = new QSpinBox();
-    connect(spin_list_refresh, SIGNAL(valueChanged(int)), this, SLOT(emitSettingsChanged()));
-    spin_list_refresh->setMinimum(30);
-    spin_list_refresh->setMaximum(99999);
-    spin_list_refresh->setValue(Preferences::getRefreshInterval());
-    spin_list_refresh->setSuffix(tr(" ms", " milliseconds"));
-    setCellWidget(LIST_REFRESH, VALUE, spin_list_refresh);
-    // Resolve Peer countries
-    setItem(RESOLVE_COUNTRIES, PROPERTY, new QTableWidgetItem(tr("Resolve peer countries (GeoIP)")));
-    cb_resolve_countries = new QCheckBox();
-    connect(cb_resolve_countries, SIGNAL(toggled(bool)), this, SLOT(emitSettingsChanged()));
-    cb_resolve_countries->setChecked(Preferences::resolvePeerCountries());
-    setCellWidget(RESOLVE_COUNTRIES, VALUE, cb_resolve_countries);
-    // Resolve peer hosts
-    setItem(RESOLVE_HOSTS, PROPERTY, new QTableWidgetItem(tr("Resolve peer host names")));
-    cb_resolve_hosts = new QCheckBox();
-    connect(cb_resolve_hosts, SIGNAL(toggled(bool)), this, SLOT(emitSettingsChanged()));
-    cb_resolve_hosts->setChecked(Preferences::resolvePeerHostNames());
-    setCellWidget(RESOLVE_HOSTS, VALUE, cb_resolve_hosts);
-    // Max Half Open connections
-    setItem(MAX_HALF_OPEN, PROPERTY, new QTableWidgetItem(tr("Maximum number of half-open connections [0: Disabled]")));
-    spin_maxhalfopen = new QSpinBox();
-    connect(spin_maxhalfopen, SIGNAL(valueChanged(int)), this, SLOT(emitSettingsChanged()));
-    spin_maxhalfopen->setMinimum(0);
-    spin_maxhalfopen->setMaximum(99999);
-    spin_maxhalfopen->setValue(Preferences::getMaxHalfOpenConnections());
-    setCellWidget(MAX_HALF_OPEN, VALUE, spin_maxhalfopen);
-    // Super seeding
-    setItem(SUPER_SEEDING, PROPERTY, new QTableWidgetItem(tr("Strict super seeding")));
-    cb_super_seeding = new QCheckBox();
-    connect(cb_super_seeding, SIGNAL(toggled(bool)), this, SLOT(emitSettingsChanged()));
-#if LIBTORRENT_VERSION_MINOR > 14
-    cb_super_seeding->setChecked(Preferences::isSuperSeedingEnabled());
-#else
-    cb_super_seeding->setEnabled(false);
-#endif
-    setCellWidget(SUPER_SEEDING, VALUE, cb_super_seeding);
-    // Network interface
-    setItem(NETWORK_IFACE, PROPERTY, new QTableWidgetItem(tr("Network Interface (requires restart)")));
-    combo_iface = new QComboBox;
-    combo_iface->addItem(tr("Any interface", "i.e. Any network interface"));
-    const QString current_iface = Preferences::getNetworkInterface();
-    int i = 1;
-    foreach(const QNetworkInterface& iface, QNetworkInterface::allInterfaces()) {
-      if(iface.name() == "lo") continue;
-      combo_iface->addItem(iface.name());
-      if(!current_iface.isEmpty() && iface.name() == current_iface)
-        combo_iface->setCurrentIndex(i);
-      ++i;
-    }
-    connect(combo_iface, SIGNAL(currentIndexChanged(int)), this, SLOT(emitSettingsChanged()));
-    setCellWidget(NETWORK_IFACE, VALUE, combo_iface);
-    // Program notifications
-    setItem(PROGRAM_NOTIFICATIONS, PROPERTY, new QTableWidgetItem(tr("Display program notification baloons")));
-    cb_program_notifications = new QCheckBox();
-    connect(cb_program_notifications, SIGNAL(toggled(bool)), this, SLOT(emitSettingsChanged()));
-    cb_program_notifications->setChecked(Preferences::useProgramNotification());
-    setCellWidget(PROGRAM_NOTIFICATIONS, VALUE, cb_program_notifications);
-  }
-
-  void emitSettingsChanged() {
-    emit settingsChanged();
-  }
-
-signals:
-  void settingsChanged();
-};
-
-#endif // ADVANCEDSETTINGS_H

src/bandwidthscheduler.h

@@ -1,111 +0,0 @@
-#ifndef BANDWIDTHSCHEDULER_H
-#define BANDWIDTHSCHEDULER_H
-
-#include <QTimer>
-#include <QTime>
-#include <QDateTime>
-#include "preferences.h"
-#include <iostream>
-
-class BandwidthScheduler: public QTimer {
-  Q_OBJECT
-
-private:
-  bool in_alternative_mode;
-
-public:
-  BandwidthScheduler(QObject *parent): QTimer(parent), in_alternative_mode(false) {
-    Q_ASSERT(Preferences::isSchedulerEnabled());
-    // Signal shot, we call start() again manually
-    setSingleShot(true);
-    // Connect Signals/Slots
-    connect(this, SIGNAL(timeout()), this, SLOT(switchMode()));
-  }
-
-public slots:
-  void start() {
-    Q_ASSERT(Preferences::isSchedulerEnabled());
-
-    QTime startAltSpeeds = Preferences::getSchedulerStartTime();
-    QTime endAltSpeeds = Preferences::getSchedulerEndTime();
-    if(startAltSpeeds == endAltSpeeds) {
-      std::cerr << "Error: bandwidth scheduler have the same start time and end time." << std::endl;
-      std::cerr << "The bandwidth scheduler will be disabled" << std::endl;
-      stop();
-      emit switchToAlternativeMode(false);
-      return;
-    }
-
-    // Determine what the closest QTime is
-    QTime now = QTime::currentTime();
-    uint time_to_start = secsTo(now, startAltSpeeds);
-    uint time_to_end = secsTo(now, endAltSpeeds);
-    if(time_to_end < time_to_start) {
-      // We should be in alternative mode
-      in_alternative_mode = true;
-      // Start counting
-      QTimer::start(time_to_end*1000);
-    } else {
-      // We should be in normal mode
-      in_alternative_mode = false;
-      // Start counting
-      QTimer::start(time_to_start*1000);
-    }
-    // Send signal to notify BTSession
-    emit switchToAlternativeMode(in_alternative_mode);
-  }
-
-  void switchMode() {
-    // Get the day this mode was started (either today or yesterday)
-    QDate current_date = QDateTime::currentDateTime().toLocalTime().date();
-    int day = current_date.dayOfWeek();
-    if(in_alternative_mode) {
-      // It is possible that starttime was yesterday
-      if(QTime::currentTime().secsTo(Preferences::getSchedulerStartTime()) > 0) {
-        current_date.addDays(-1); // Go to yesterday
-        day = current_date.day();
-      }
-    }
-    // Check if the day is in scheduler days
-    // Notify BTSession only if necessary
-    switch(Preferences::getSchedulerDays()) {
-    case EVERY_DAY:
-      emit switchToAlternativeMode(!in_alternative_mode);
-      break;
-    case WEEK_ENDS:
-      if(day == Qt::Saturday || day == Qt::Sunday)
-        emit switchToAlternativeMode(!in_alternative_mode);
-      break;
-    case WEEK_DAYS:
-      if(day != Qt::Saturday && day != Qt::Sunday)
-        emit switchToAlternativeMode(!in_alternative_mode);
-      break;
-    default:
-      // Convert our enum index to Qt enum index
-      int scheduler_day = ((int)Preferences::getSchedulerDays()) - 2;
-      if(day == scheduler_day)
-        emit switchToAlternativeMode(!in_alternative_mode);
-      break;
-    }
-    // Call start again
-    start();
-  }
-
-signals:
-  void switchToAlternativeMode(bool alternative);
-
-private:
-  // Qt function can return negative values and we
-  // don't want that
-  uint secsTo(QTime now, QTime t) {
-    int diff = now.secsTo(t);
-    if(diff < 0) {
-      // 86400 seconds in a day
-      diff += 86400;
-    }
-    Q_ASSERT(diff >= 0);
-    return diff;
-  }
-};
-
-#endif // BANDWIDTHSCHEDULER_H

src/bittorrent.h

@@ -31,19 +31,11 @@
 #define __BITTORRENT_H__
 
 #include <QHash>
-#include <QMap>
-#include <QUrl>
 #include <QStringList>
-#ifdef DISABLE_GUI
-#include <QCoreApplication>
-#else
 #include <QApplication>
 #include <QPalette>
-#endif
 #include <QPointer>
-#include <QTimer>
 
-#include <libtorrent/version.hpp>
 #include <libtorrent/session.hpp>
 #include <libtorrent/ip_filter.hpp>
 #include "qtorrenthandle.h"
@@ -54,17 +46,16 @@ using namespace libtorrent;
 
 class downloadThread;
 class QTimer;
+class FileSystemWatcher;
 class FilterParserThread;
 class HttpServer;
-class BandwidthScheduler;
-class ScanFoldersModel;
 
 class TrackerInfos {
 public:
   QString name_or_url;
   QString last_message;
   unsigned long num_peers;
-#if LIBTORRENT_VERSION_MINOR < 15
+#ifndef LIBTORRENT_0_15
   bool verified;
   uint fail_count;
 #endif
@@ -75,13 +66,13 @@ public:
     Q_ASSERT(!name_or_url.isEmpty());
     last_message = b.last_message;
     num_peers = b.num_peers;
-#if LIBTORRENT_VERSION_MINOR < 15
+#ifndef LIBTORRENT_0_15
     verified = b.verified;
     fail_count = b.fail_count;
 #endif
   }
   TrackerInfos(QString name_or_url): name_or_url(name_or_url), last_message(""), num_peers(0) {
-#if LIBTORRENT_VERSION_MINOR < 15
+#ifndef LIBTORRENT_0_15
     fail_count = 0;
     verified = false;
 #endif
@@ -91,6 +82,49 @@ public:
 class Bittorrent : public QObject {
   Q_OBJECT
 
+private:
+  // Bittorrent
+  session *s;
+  QPointer<QTimer> timerAlerts;
+  QHash<QString, QString> savepath_fromurl;
+  QHash<QString, QHash<QString, TrackerInfos> > trackersInfos;
+  // Ratio
+  QPointer<QTimer> BigRatioTimer;
+  // HTTP
+  QPointer<downloadThread> downloader;
+  // File System
+  QPointer<FileSystemWatcher> FSWatcher;
+  // Console / Log
+  QStringList consoleMessages;
+  QStringList peerBanMessages;
+  // Settings
+  bool preAllocateAll;
+  bool addInPause;
+  float ratio_limit;
+  bool UPnPEnabled;
+  bool NATPMPEnabled;
+  bool LSDEnabled;
+  bool DHTEnabled;
+  bool queueingEnabled;
+  QString defaultSavePath;
+  QString defaultTempPath;
+  // GeoIP
+  bool resolve_countries;
+  bool geoipDBLoaded;
+  // ETA Computation
+  QPointer<QTimer> timerETA;
+  QHash<QString, QList<int> > ETA_samples;
+  // IP filtering
+  QPointer<FilterParserThread> filterParser;
+  QString filterPath;
+  // Web UI
+  QPointer<HttpServer> httpServer;
+  QStringList url_skippingDlg;
+
+protected:
+  QString getSavePath(QString hash);
+  bool initWebUi(QString username, QString password, int port);
+
 public:
   // Constructor / Destructor
   Bittorrent();
@@ -108,7 +142,6 @@ public:
   session* getSession() const;
   QHash<QString, TrackerInfos> getTrackersInfo(QString hash) const;
   bool hasActiveTorrents() const;
-  bool hasDownloadingTorrents() const;
   bool isQueueingEnabled() const;
   int getMaximumActiveDownloads() const;
   int getMaximumActiveTorrents() const;
@@ -118,31 +151,29 @@ public:
   qlonglong getETA(QString hash);
   bool useTemporaryFolder() const;
   QString getDefaultSavePath() const;
-  ScanFoldersModel* getScanFoldersModel() const;
-  bool isPexEnabled() const;
-#if LIBTORRENT_VERSION_MINOR < 15
-  void saveDHTEntry();
-#endif
 
 public slots:
   QTorrentHandle addTorrent(QString path, bool fromScanDir = false, QString from_url = QString(), bool resumed = false);
   QTorrentHandle addMagnetUri(QString magnet_uri, bool resumed=false);
+  void importOldTorrents();
+  void applyFormerAttributeFiles(QTorrentHandle h);
+  void importOldTempData(QString torrent_path);
   void loadSessionState();
   void saveSessionState();
   void downloadFromUrl(QString url);
   void deleteTorrent(QString hash, bool delete_local_files = false);
   void startUpTorrents();
-  session_proxy asyncDeletion();
-  void recheckTorrent(QString hash);
-  void useAlternativeSpeedsLimit(bool alternative);
   /* Needed by Web UI */
   void pauseAllTorrents();
   void pauseTorrent(QString hash);
   void resumeTorrent(QString hash);
   void resumeAllTorrents();
   /* End Web UI */
+  void saveDHTEntry();
   void preAllocateAllFiles(bool b);
   void saveFastResumeData();
+  void enableDirectoryScanning(QString scan_dir);
+  void disableDirectoryScanning();
   void enableIPFilter(QString filter);
   void disableIPFilter();
   void setQueueingEnabled(bool enable);
@@ -155,20 +186,13 @@ public slots:
   void setMaxUploadsPerTorrent(int max);
   void setDownloadRateLimit(long rate);
   void setUploadRateLimit(long rate);
-  void setMaxRatio(float ratio);
+  void setGlobalRatio(float ratio);
+  void setDeleteRatio(float ratio);
   void setDHTPort(int dht_port);
-  void setPeerProxySettings(const proxy_settings &proxySettings);
-  void setHTTPProxySettings(const proxy_settings &proxySettings);
-  void setSessionSettings(const session_settings &sessionSettings);
+  void setProxySettings(proxy_settings proxySettings, bool trackers=true, bool peers=true, bool web_seeds=true, bool dht=true);
+  void setSessionSettings(session_settings sessionSettings);
   void startTorrentsInPause(bool b);
   void setDefaultTempPath(QString temppath);
-  void setAppendLabelToSavePath(bool append);
-  void appendLabelToTorrentSavePath(QTorrentHandle &h);
-  void changeLabelInTorrentSavePath(QTorrentHandle &h, QString old_label, QString new_label);
-#if LIBTORRENT_VERSION_MINOR > 14
-  void appendqBextensionToTorrent(QTorrentHandle &h, bool append);
-  void setAppendqBExtension(bool append);
-#endif
   void applyEncryptionSettings(pe_settings se);
   void setDownloadLimit(QString hash, long val);
   void setUploadLimit(QString hash, long val);
@@ -176,33 +200,19 @@ public slots:
   void enableNATPMP(bool b);
   void enableLSD(bool b);
   bool enableDHT(bool b);
-#ifdef DISABLE_GUI
-  void addConsoleMessage(QString msg, QString color=QString::null);
-#else
   void addConsoleMessage(QString msg, QColor color=QApplication::palette().color(QPalette::WindowText));
-#endif
   void addPeerBanMessage(QString msg, bool from_ipfilter);
   void processDownloadedFile(QString, QString);
   void addMagnetSkipAddDlg(QString uri);
   void downloadFromURLList(const QStringList& urls);
   void configureSession();
   void banIP(QString ip);
-  void recursiveTorrentDownload(const QTorrentHandle &h);
-
-protected:
-  QString getSavePath(QString hash, bool fromScanDir = false, QString filePath = QString::null, QString root_folder=QString::null);
-  bool initWebUi(QString username, QString password, int port);
 
 protected slots:
   void addTorrentsFromScanFolder(QStringList&);
   void readAlerts();
-  void processBigRatios();
+  void deleteBigRatios();
   void takeETASamples();
-  void exportTorrentFiles(QString path);
-  void saveTempFastResumeData();
-  void sendNotificationEmail(QTorrentHandle h);
-  void autoRunExternalProgram(QTorrentHandle h, bool async=true);
-  void cleanUpAutoRunProcess(int);
 
 signals:
   void addedTorrent(QTorrentHandle& h);
@@ -218,66 +228,6 @@ signals:
   void downloadFromUrlFailure(QString url, QString reason);
   void torrentFinishedChecking(QTorrentHandle& h);
   void metadataReceived(QTorrentHandle &h);
-  void savePathChanged(QTorrentHandle &h);
-  void newConsoleMessage(QString msg);
-  void alternativeSpeedsModeChanged(bool alternative);
-  void recursiveTorrentDownloadPossible(QTorrentHandle &h);
-
-private:
-  // Bittorrent
-  session *s;
-  QPointer<QTimer> timerAlerts;
-  QPointer<BandwidthScheduler> bd_scheduler;
-  QMap<QUrl, QString> savepath_fromurl;
-  QHash<QString, QHash<QString, TrackerInfos> > trackersInfos;
-  QHash<QString, QString> savePathsToRemove;
-  QStringList torrentsToPausedAfterChecking;
-  QTimer resumeDataTimer;
-  // Ratio
-  QPointer<QTimer> BigRatioTimer;
-  // HTTP
-  QPointer<downloadThread> downloader;
-  // File System
-  ScanFoldersModel *m_scanFolders;
-  // Console / Log
-  QStringList consoleMessages;
-  QStringList peerBanMessages;
-  // Settings
-  bool preAllocateAll;
-  bool addInPause;
-  float ratio_limit;
-  int high_ratio_action;
-  bool UPnPEnabled;
-  bool NATPMPEnabled;
-  bool LSDEnabled;
-  bool DHTEnabled;
-  int current_dht_port;
-  bool PeXEnabled;
-  bool queueingEnabled;
-  bool appendLabelToSavePath;
-  bool torrentExport;
-#if LIBTORRENT_VERSION_MINOR > 14
-  bool appendqBExtension;
-#endif
-  QString defaultSavePath;
-  QString defaultTempPath;
-  // ETA Computation
-  QPointer<QTimer> timerETA;
-  QHash<QString, QList<int> > ETA_samples;
-  // IP filtering
-  QPointer<FilterParserThread> filterParser;
-  QString filterPath;
-  // Web UI
-  QPointer<HttpServer> httpServer;
-  QList<QUrl> url_skippingDlg;
-  // Fast exit (async)
-  bool exiting;
-  // GeoIP
-#ifndef DISABLE_GUI
-  bool geoipDBLoaded;
-  bool resolve_countries;
-#endif
-
 };
 
 #endif

src/console_imp.h

@@ -46,7 +46,6 @@ class consoleDlg : public QDialog, private Ui_ConsoleDlg{
     consoleDlg(QWidget *parent, Bittorrent* _BTSession) : QDialog(parent) {
       setupUi(this);
       setAttribute(Qt::WA_DeleteOnClose);
-      setModal(true);
       BTSession = _BTSession;
       textConsole->setHtml(BTSession->getConsoleMessages().join("<br>"));
       textBannedPeers->setHtml(BTSession->getPeerBanMessages().join("<br>"));

src/cookiesdlg.cpp

@@ -1,95 +0,0 @@
-/*
- * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2010  Christophe Dumez
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * In addition, as a special exception, the copyright holders give permission to
- * link this program with the OpenSSL project's "OpenSSL" library (or with
- * modified versions of it that use the same license as the "OpenSSL" library),
- * and distribute the linked executables. You must obey the GNU General Public
- * License in all respects for all of the code used other than "OpenSSL".  If you
- * modify file(s), you may extend this exception to your version of the file(s),
- * but you are not obligated to do so. If you do not wish to do so, delete this
- * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org arnaud@qbittorrent.org
- */
-
-#include "cookiesdlg.h"
-#include "ui_cookiesdlg.h"
-
-#include <QNetworkCookie>
-
-enum CookiesCols { COOKIE_KEY, COOKIE_VALUE};
-
-CookiesDlg::CookiesDlg(QWidget *parent, const QList<QByteArray> &raw_cookies) :
-    QDialog(parent),
-    ui(new Ui::CookiesDlg)
-{
-  ui->setupUi(this);
-  ui->infos_lbl->setText(tr("Common keys for cookies are : '%1', '%2'.\nYou should get this information from your Web browser preferences.").arg("uid").arg("pass"));
-  foreach(const QByteArray &raw_cookie, raw_cookies) {
-    QList<QByteArray> cookie_parts = raw_cookie.split('=');
-    if(cookie_parts.size() != 2) continue;
-    const int i = ui->cookiesTable->rowCount();
-    ui->cookiesTable->setRowCount(i+1);
-    ui->cookiesTable->setItem(i, COOKIE_KEY, new QTableWidgetItem(cookie_parts.first().data()));
-    ui->cookiesTable->setItem(i, COOKIE_VALUE, new QTableWidgetItem(cookie_parts.last().data()));
-  }
-}
-
-CookiesDlg::~CookiesDlg()
-{
-  delete ui;
-}
-
-void CookiesDlg::on_add_btn_clicked() {
-  ui->cookiesTable->setRowCount(ui->cookiesTable->rowCount()+1);
-  // Edit first column
-  ui->cookiesTable->editItem(ui->cookiesTable->item(ui->cookiesTable->rowCount()-1, COOKIE_KEY));
-}
-
-void CookiesDlg::on_del_btn_clicked() {
-  // Get selected cookie
-  QList<QTableWidgetItem*> selection = ui->cookiesTable->selectedItems();
-  if(!selection.isEmpty()) {
-    ui->cookiesTable->removeRow(selection.first()->row());
-  }
-}
-
-QList<QByteArray> CookiesDlg::getCookies() const {
-  QList<QByteArray> ret;
-  for(int i=0; i<ui->cookiesTable->rowCount(); ++i) {
-    QString key = ui->cookiesTable->item(i, COOKIE_KEY)->text().trimmed();
-    QString value = ui->cookiesTable->item(i, COOKIE_VALUE)->text().trimmed();
-    if(!key.isEmpty() && !value.isEmpty()) {
-      const QString raw_cookie = key+"="+value;
-      qDebug("Cookie: %s", qPrintable(raw_cookie));
-      ret << raw_cookie.toLocal8Bit();
-    }
-  }
-  return ret;
-}
-
-QList<QByteArray> CookiesDlg::askForCookies(QWidget *parent, const QList<QByteArray> &raw_cookies, bool *ok) {
-  CookiesDlg dlg(parent, raw_cookies);
-  if(dlg.exec()) {
-    *ok = true;
-    return dlg.getCookies();
-  }
-  *ok = false;
-  return QList<QByteArray>();
-}

src/cookiesdlg.h

@@ -1,58 +0,0 @@
-/*
- * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2010  Christophe Dumez
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * In addition, as a special exception, the copyright holders give permission to
- * link this program with the OpenSSL project's "OpenSSL" library (or with
- * modified versions of it that use the same license as the "OpenSSL" library),
- * and distribute the linked executables. You must obey the GNU General Public
- * License in all respects for all of the code used other than "OpenSSL".  If you
- * modify file(s), you may extend this exception to your version of the file(s),
- * but you are not obligated to do so. If you do not wish to do so, delete this
- * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org arnaud@qbittorrent.org
- */
-
-#ifndef COOKIESDLG_H
-#define COOKIESDLG_H
-
-#include <QDialog>
-
-namespace Ui {
-    class CookiesDlg;
-}
-
-class CookiesDlg : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit CookiesDlg(QWidget *parent = 0, const QList<QByteArray> &raw_cookies = QList<QByteArray>());
-    ~CookiesDlg();
-    QList<QByteArray> getCookies() const;
-    static QList<QByteArray> askForCookies(QWidget *parent, const QList<QByteArray> &raw_cookies, bool *ok);
-
-  protected slots:
-    void on_add_btn_clicked();
-    void on_del_btn_clicked();
-
-private:
-    Ui::CookiesDlg *ui;
-};
-
-#endif // COOKIESDLG_H

src/createtorrent_imp.cpp

@@ -37,7 +37,6 @@
 #include <boost/filesystem/fstream.hpp>
 #include <boost/bind.hpp>
 
-#include <libtorrent/version.hpp>
 #include <libtorrent/entry.hpp>
 #include <libtorrent/bencode.hpp>
 #include <libtorrent/torrent_info.hpp>
@@ -47,10 +46,8 @@
 #include <libtorrent/file_pool.hpp>
 #include <libtorrent/create_torrent.hpp>
 
-#include "torrentpersistentdata.h"
 #include "createtorrent_imp.h"
 #include "misc.h"
-#include "qinisettings.h"
 
 using namespace libtorrent;
 using namespace boost::filesystem;
@@ -59,17 +56,16 @@ using namespace boost::filesystem;
 // name starts with a .
 bool file_filter(boost::filesystem::path const& filename)
 {
-  if (filename.leaf()[0] == '.') return false;
-  std::cerr << filename << std::endl;
-  return true;
+        if (filename.leaf()[0] == '.') return false;
+        std::cerr << filename << std::endl;
+        return true;
 }
 
 createtorrent::createtorrent(QWidget *parent): QDialog(parent){
   setupUi(this);
   setAttribute(Qt::WA_DeleteOnClose);
-  setModal(true);
   creatorThread = new torrentCreatorThread(this);
-  connect(creatorThread, SIGNAL(creationSuccess(QString, QString)), this, SLOT(handleCreationSuccess(QString, QString)));
+  connect(creatorThread, SIGNAL(creationSuccess(QString, const char*)), this, SLOT(handleCreationSuccess(QString, const char*)));
   connect(creatorThread, SIGNAL(creationFailure(QString)), this, SLOT(handleCreationFailure(QString)));
   connect(creatorThread, SIGNAL(updateProgress(int)), this, SLOT(updateProgressBar(int)));
   path::default_name_check(no_check);
@@ -81,29 +77,15 @@ createtorrent::~createtorrent() {
 }
 
 void createtorrent::on_addFolder_button_clicked(){
-  QIniSettings settings("qBittorrent", "qBittorrent");
-  QString last_path = settings.value("CreateTorrent/last_add_path", QDir::homePath()).toString();
-  QString dir = QFileDialog::getExistingDirectory(this, tr("Select a folder to add to the torrent"), last_path, QFileDialog::ShowDirsOnly);
-  if(!dir.isEmpty()) {
-    settings.setValue("CreateTorrent/last_add_path", dir);
-#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
-    dir = dir.replace("/", "\\");
-#endif
+  QString dir = QFileDialog::getExistingDirectory(this, tr("Select a folder to add to the torrent"), QDir::homePath(), QFileDialog::ShowDirsOnly);
+  if(!dir.isEmpty())
     textInputPath->setText(dir);
-  }
 }
 
 void createtorrent::on_addFile_button_clicked(){
-  QIniSettings settings("qBittorrent", "qBittorrent");
-  QString last_path = settings.value("CreateTorrent/last_add_path", QDir::homePath()).toString();
-  QString file = QFileDialog::getOpenFileName(this, tr("Select a file to add to the torrent"), last_path);
-  if(!file.isEmpty()) {
-    settings.setValue("CreateTorrent/last_add_path", misc::removeLastPathPart(file));
-#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
-    file = file.replace("/", "\\");
-#endif
+  QString file = QFileDialog::getOpenFileName(this, tr("Select a file to add to the torrent"), QDir::homePath(), QString(), 0, QFileDialog::ShowDirsOnly);
+  if(!file.isEmpty())
     textInputPath->setText(file);
-  }
 }
 
 void createtorrent::on_removeTracker_button_clicked() {
@@ -116,30 +98,30 @@ void createtorrent::on_removeTracker_button_clicked() {
 
 int createtorrent::getPieceSize() const {
   switch(comboPieceSize->currentIndex()) {
-  case 0:
-    return 32*1024;
-  case 1:
-    return 64*1024;
-  case 2:
-    return 128*1024;
-  case 3:
-    return 256*1024;
-  case 4:
-    return 512*1024;
-  case 5:
-    return 1024*1024;
-  case 6:
-    return 2048*1024;
-  default:
-    return 256*1024;
+    case 0:
+      return 32*1024;
+    case 1:
+      return 64*1024;
+    case 2:
+      return 128*1024;
+    case 3:
+      return 256*1024;
+    case 4:
+      return 512*1024;
+    case 5:
+      return 1024*1024;
+    case 6:
+      return 2048*1024;
+    default:
+      return 256*1024;
   }
 }
 
 void createtorrent::on_addTracker_button_clicked() {
   bool ok;
   QString URL = QInputDialog::getText(this, tr("Please type an announce URL"),
-                                      tr("Announce URL:", "Tracker URL"), QLineEdit::Normal,
-                                      "http://", &ok);
+                                       tr("Announce URL:", "Tracker URL"), QLineEdit::Normal,
+                                       "http://", &ok);
   if(ok){
     if(trackers_list->findItems(URL, Qt::MatchFixedString).size() == 0)
       trackers_list->addItem(URL);
@@ -157,8 +139,8 @@ void createtorrent::on_removeURLSeed_button_clicked(){
 void createtorrent::on_addURLSeed_button_clicked(){
   bool ok;
   QString URL = QInputDialog::getText(this, tr("Please type a web seed url"),
-                                      tr("Web seed URL:"), QLineEdit::Normal,
-                                      "http://", &ok);
+                                       tr("Web seed URL:"), QLineEdit::Normal,
+                                       "http://", &ok);
   if(ok){
     if(URLSeeds_list->findItems(URL, Qt::MatchFixedString).size() == 0)
       URLSeeds_list->addItem(URL);
@@ -184,72 +166,45 @@ void createtorrent::on_createButton_clicked(){
     return;
   }
   QStringList trackers = allItems(trackers_list);
-
-  QIniSettings settings("qBittorrent", "qBittorrent");
-  QString last_path = settings.value("CreateTorrent/last_save_path", QDir::homePath()).toString();
-
-  QString destination = QFileDialog::getSaveFileName(this, tr("Select destination torrent file"), last_path, tr("Torrent Files")+QString::fromUtf8(" (*.torrent)"));
+  /*if(!trackers.size()){
+    QMessageBox::critical(0, tr("No tracker path set"), tr("Please set at least one tracker"));
+    return;
+  }*/
+  QString destination = QFileDialog::getSaveFileName(this, tr("Select destination torrent file"), QDir::homePath(), tr("Torrent Files")+QString::fromUtf8(" (*.torrent)"));
   if(!destination.isEmpty()) {
-    settings.setValue("CreateTorrent/last_save_path", misc::removeLastPathPart(destination));
-    if(!destination.toUpper().endsWith(".TORRENT"))
+    if(!destination.endsWith(QString::fromUtf8(".torrent")))
       destination += QString::fromUtf8(".torrent");
   } else {
     return;
   }
-  // Disable dialog
-  setEnabled(false);
-  // Set busy cursor
-  setCursor(QCursor(Qt::WaitCursor));
-  // Actually create the torrent
   QStringList url_seeds = allItems(URLSeeds_list);
   QString comment = txt_comment->toPlainText();
   creatorThread->create(input, destination, trackers, url_seeds, comment, check_private->isChecked(), getPieceSize());
 }
 
 void createtorrent::handleCreationFailure(QString msg) {
-  // Enable dialog
-  setEnabled(true);
-  // Remove busy cursor
-  setCursor(QCursor(Qt::ArrowCursor));
   QMessageBox::information(0, tr("Torrent creation"), tr("Torrent creation was unsuccessful, reason: %1").arg(msg));
 }
 
-void createtorrent::handleCreationSuccess(QString path, QString branch_path) {
-  // Enable Dialog
-  setEnabled(true);
-  // Remove busy cursor
-  setCursor(QCursor(Qt::ArrowCursor));
-  if(checkStartSeeding->isChecked()) {
-    // Create save path temp data
-    boost::intrusive_ptr<torrent_info> t;
-    try {
-      t = new torrent_info(path.toUtf8().data());
-    } catch(std::exception&) {
-      QMessageBox::critical(0, tr("Torrent creation"), tr("Created torrent file is invalid. It won't be added to download list."));
-      return;
+void createtorrent::handleCreationSuccess(QString path, const char* branch_path) {
+    if(checkStartSeeding->isChecked()) {
+        // Create save path file
+        boost::intrusive_ptr<torrent_info> t;
+        try {
+            t = new torrent_info(path.toLocal8Bit().data());
+        } catch(std::exception&) {
+            QMessageBox::critical(0, tr("Torrent creation"), tr("Created torrent file is invalid. It won't be added to download list."));
+            return;
+        }
+        QString hash = misc::toQString(t->info_hash());
+        QFile savepath_file(misc::qBittorrentPath()+QString::fromUtf8("BT_backup")+QDir::separator()+hash+QString::fromUtf8(".savepath"));
+        savepath_file.open(QIODevice::WriteOnly | QIODevice::Text);
+        savepath_file.write(branch_path);
+        savepath_file.close();
+        emit torrent_to_seed(path);
     }
-    QString hash = misc::toQString(t->info_hash());
-    TorrentTempData::setSavePath(hash, branch_path);
-#if LIBTORRENT_VERSION_MINOR > 14
-    // Enable seeding mode (do not recheck the files)
-    TorrentTempData::setSeedingMode(hash, true);
-#endif
-    emit torrent_to_seed(path);
-  }
-  QMessageBox::information(0, tr("Torrent creation"), tr("Torrent was created successfully:")+" "+path);
-  close();
-}
-
-void createtorrent::on_cancelButton_clicked() {
-  // End torrent creation thread
-  if(creatorThread->isRunning()) {
-    creatorThread->abortCreation();
-    creatorThread->terminate();
-    // Wait for termination
-    creatorThread->wait();
-  }
-  // Close the dialog
-  reject();
+    QMessageBox::information(0, tr("Torrent creation"), tr("Torrent was created successfully:")+" "+path);
+    close();
 }
 
 void createtorrent::updateProgressBar(int progress) {
@@ -273,7 +228,7 @@ void torrentCreatorThread::create(QString _input_path, QString _save_path, QStri
 }
 
 void sendProgressUpdateSignal(int i, int num, torrentCreatorThread *parent){
-  parent->sendProgressSignal((int)(i*100./(float)num));
+    parent->sendProgressSignal((int)(i*100./(float)num));
 }
 
 void torrentCreatorThread::sendProgressSignal(int progress) {
@@ -306,7 +261,7 @@ void torrentCreatorThread::run() {
     // Set qBittorrent as creator and add user comment to
     // torrent_info structure
     t.set_creator(creator_str);
-    t.set_comment((const char*)comment.toUtf8());
+    t.set_comment((const char*)comment.toLocal8Bit());
     // Is private ?
     t.set_priv(is_private);
     if(abort) return;
@@ -314,7 +269,7 @@ void torrentCreatorThread::run() {
     ofstream out(complete(path((const char*)save_path.toLocal8Bit())), std::ios_base::binary);
     bencode(std::ostream_iterator<char>(out), t.generate());
     emit updateProgress(100);
-    emit creationSuccess(save_path, QString::fromUtf8(full_path.branch_path().string().c_str()));
+    emit creationSuccess(save_path, full_path.branch_path().string().c_str());
   }
   catch (std::exception& e){
     emit creationFailure(QString::fromUtf8(e.what()));

src/createtorrent_imp.h

@@ -58,14 +58,13 @@ class torrentCreatorThread : public QThread {
     }
     void create(QString _input_path, QString _save_path, QStringList _trackers, QStringList _url_seeds, QString _comment, bool _is_private, int _piece_size);
     void sendProgressSignal(int progress);
-    void abortCreation() { abort = true; }
   
   protected:
     void run();
     
   signals:
     void creationFailure(QString msg);
-    void creationSuccess(QString path, QString branch_path);
+    void creationSuccess(QString path, const char* branch_path);
 
   signals:
     void updateProgress(int progress);
@@ -88,7 +87,6 @@ class createtorrent : public QDialog, private Ui::createTorrentDialog{
 
   public slots:
     void updateProgressBar(int progress);
-    void on_cancelButton_clicked();
 
   protected slots:
     void on_createButton_clicked();
@@ -99,7 +97,7 @@ class createtorrent : public QDialog, private Ui::createTorrentDialog{
     void on_addURLSeed_button_clicked();
     void on_removeURLSeed_button_clicked();
     void handleCreationFailure(QString msg);
-    void handleCreationSuccess(QString path, QString branch_path);
+    void handleCreationSuccess(QString path, const char* branch_path);
 };
 
 #endif

src/deletionconfirmationdlg.h

@@ -33,8 +33,6 @@
 
 #include <QDialog>
 #include "ui_confirmdeletiondlg.h"
-#include "preferences.h"
-#include "misc.h"
 
 class DeletionConfirmationDlg : public QDialog, private Ui::confirmDeletionDlg {
   Q_OBJECT
@@ -42,10 +40,6 @@ class DeletionConfirmationDlg : public QDialog, private Ui::confirmDeletionDlg {
   public:
   DeletionConfirmationDlg(QWidget *parent=0): QDialog(parent) {
     setupUi(this);
-    move(misc::screenCenter(this));
-    checkPermDelete->setChecked(Preferences::deleteTorrentFilesAsDefault());
-    connect(checkPermDelete, SIGNAL(clicked()), this, SLOT(updateRememberButtonState()));
-    buttonBox->setFocus();
   }
 
   bool shouldDeleteLocalFiles() const {
@@ -61,15 +55,6 @@ class DeletionConfirmationDlg : public QDialog, private Ui::confirmDeletionDlg {
     return false;
   }
 
-private slots:
-  void updateRememberButtonState() {
-    rememberBtn->setEnabled(checkPermDelete->isChecked() != Preferences::deleteTorrentFilesAsDefault());
-  }
-
-  void on_rememberBtn_clicked() {
-    Preferences::setDeleteTorrentFilesAsDefault(checkPermDelete->isChecked());
-    rememberBtn->setEnabled(false);
-  }
 };
 
 #endif // DELETIONCONFIRMATIONDLG_H

src/downloadedpiecesbar.h

@@ -36,7 +36,6 @@
 #include <QList>
 #include <QPixmap>
 #include <libtorrent/bitfield.hpp>
-#include <math.h>
 
 using namespace libtorrent;
 #define BAR_HEIGHT 18
@@ -53,69 +52,22 @@ public:
     setFixedHeight(BAR_HEIGHT);
   }
 
-  void setProgress(const bitfield &pieces, const bitfield &downloading_pieces) {
+  void setProgress(bitfield pieces) {
     if(pieces.empty()) {
       // Empty bar
-      QPixmap pix = QPixmap(1, 1);
-      pix.fill();
-      pixmap = pix;
+      pixmap = QPixmap(1, 1);
+      QPainter painter(&pixmap);
+      painter.setPen(Qt::white);
+      painter.drawPoint(0,0);
     } else {
-      const int nb_pieces = pieces.size();
-      // Reduce the number of pieces before creating the pixmap
-      // otherwise it can crash when there are too many pieces
-      if(nb_pieces > width()) {
-        const int ratio = floor(nb_pieces/(double)width());
-        std::vector<bool> scaled_pieces;
-        std::vector<bool> scaled_downloading;
-        for(int i=0; i<nb_pieces; i+= ratio) {
-          bool have = true;
-          for(int j=i; j<qMin(i+ratio, nb_pieces); ++j) {
-            if(!pieces[i]) { have = false; break; }
-          }
-          scaled_pieces.push_back(have);
-          if(have) {
-            scaled_downloading.push_back(false);
-          } else {
-            bool downloading = false;
-            for(int j=i; j<qMin(i+ratio, nb_pieces); ++j) {
-              if(downloading_pieces[i]) { downloading = true; break; }
-            }
-            scaled_downloading.push_back(downloading);
-          }
-        }
-        QPixmap pix = QPixmap(scaled_pieces.size(), 1);
-        pix.fill();
-        QPainter painter(&pix);
-        for(uint i=0; i<scaled_pieces.size(); ++i) {
-          if(scaled_pieces[i]) {
-            painter.setPen(Qt::blue);
-          } else {
-            if(scaled_downloading[i]) {
-              painter.setPen(Qt::yellow);
-            } else {
-              painter.setPen(Qt::white);
-            }
-          }
-          painter.drawPoint(i,0);
-        }
-        pixmap = pix;
-      } else {
-        QPixmap pix = QPixmap(pieces.size(), 1);
-        pix.fill();
-        QPainter painter(&pix);
-        for(uint i=0; i<pieces.size(); ++i) {
-          if(pieces[i]) {
-            painter.setPen(Qt::blue);
-          } else {
-            if(downloading_pieces[i]) {
-              painter.setPen(Qt::yellow);
-            } else {
-              painter.setPen(Qt::white);
-            }
-          }
-          painter.drawPoint(i,0);
-        }
-        pixmap = pix;
+      pixmap = QPixmap(pieces.size(), 1);
+      QPainter painter(&pixmap);
+      for(uint i=0; i<pieces.size(); ++i) {
+        if(pieces[i])
+          painter.setPen(Qt::blue);
+        else
+          painter.setPen(Qt::white);
+        painter.drawPoint(i,0);
       }
     }
     update();

src/downloadfromurldlg.h

@@ -47,11 +47,10 @@ class downloadFromURL : public QDialog, private Ui::downloadFromURL{
       setupUi(this);
       setAttribute(Qt::WA_DeleteOnClose);
       icon_lbl->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/url.png")));
-      setModal(true);
       show();
       // Paste clipboard if there is an URL in it
       QString clip_txt = qApp->clipboard()->text();
-      if(clip_txt.startsWith("http://", Qt::CaseInsensitive) || clip_txt.startsWith("https://", Qt::CaseInsensitive) || clip_txt.startsWith("ftp://", Qt::CaseInsensitive) || clip_txt.startsWith("magnet:", Qt::CaseInsensitive) || clip_txt.startsWith("bc://bt/", Qt::CaseInsensitive)) {
+      if(clip_txt.startsWith("http://", Qt::CaseInsensitive) || clip_txt.startsWith("https://", Qt::CaseInsensitive) || clip_txt.startsWith("ftp://", Qt::CaseInsensitive) || clip_txt.startsWith("magnet:", Qt::CaseInsensitive)) {
         textUrls->setText(clip_txt);
       }
     }

src/downloadthread.cpp

@@ -28,71 +28,51 @@
  * Contact : chris@qbittorrent.org
  */
 
+#include "downloadthread.h"
 #include <QTemporaryFile>
+#include <QSettings>
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkProxy>
-#include <QNetworkCookie>
-#include <QNetworkCookieJar>
-
-#include "downloadthread.h"
-#include "preferences.h"
-#include "qinisettings.h"
-
-enum ProxyType {HTTP=1, SOCKS5=2, HTTP_PW=3, SOCKS5_PW=4, SOCKS4=5};
 
 /** Download Thread **/
 
 downloadThread::downloadThread(QObject* parent) : QObject(parent) {
-  connect(&networkManager, SIGNAL(finished (QNetworkReply*)), this, SLOT(processDlFinished(QNetworkReply*)));
-#ifndef QT_NO_OPENSSL
-  connect(&networkManager, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)), this, SLOT(ignoreSslErrors(QNetworkReply*,QList<QSslError>)));
-#endif
+  networkManager = new QNetworkAccessManager(this);
+  connect(networkManager, SIGNAL(finished (QNetworkReply*)), this, SLOT(processDlFinished(QNetworkReply*)));
+}
+
+downloadThread::~downloadThread(){
+  qDebug("Deleting network manager");
+  delete networkManager;
+  qDebug("Deleted network manager");
 }
 
 void downloadThread::processDlFinished(QNetworkReply* reply) {
-  QString url = reply->url().toEncoded().data();
-  qDebug("Download finished: %s", qPrintable(url));
+  QString url = reply->url().toString();
   if(reply->error() != QNetworkReply::NoError) {
     // Failure
-    qDebug("Download failure (%s), reason: %s", qPrintable(url), qPrintable(errorCodeToString(reply->error())));
     emit downloadFailure(url, errorCodeToString(reply->error()));
   } else {
-    QVariant redirection = reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
-    if(redirection.isValid()) {
-      // We should redirect
-      qDebug("Redirecting from %s to %s", qPrintable(url), qPrintable(redirection.toUrl().toString()));
-      redirect_mapping.insert(redirection.toUrl().toString(), url);
-      downloadUrl(redirection.toUrl().toString());
-      return;
-    }
-    // Checking if it was redirecting, restoring initial URL
-    if(redirect_mapping.contains(url)) {
-      url = redirect_mapping.take(url);
-    }
     // Success
     QString filePath;
-    QTemporaryFile *tmpfile = new QTemporaryFile;
-    tmpfile->setAutoRemove(false);
-    if (tmpfile->open()) {
-      filePath = tmpfile->fileName();
-      qDebug("Temporary filename is: %s", qPrintable(filePath));
+    QTemporaryFile tmpfile;
+    tmpfile.setAutoRemove(false);
+    if (tmpfile.open()) {
+      filePath = tmpfile.fileName();
+      qDebug("Temporary filename is: %s", filePath.toLocal8Bit().data());
       if(reply->open(QIODevice::ReadOnly)) {
-        // TODO: Support GZIP compression
-        tmpfile->write(reply->readAll());
+        tmpfile.write(reply->readAll());
         reply->close();
-        tmpfile->close();
-        delete tmpfile;
+        tmpfile.close();
         // Send finished signal
         emit downloadFinished(url, filePath);
       } else {
         // Error when reading the request
-        tmpfile->close();
-        delete tmpfile;
+        tmpfile.close();
         emit downloadFailure(url, tr("I/O Error"));
       }
     } else {
-      delete tmpfile;
       emit downloadFailure(url, tr("I/O Error"));
     }
   }
@@ -100,87 +80,26 @@ void downloadThread::processDlFinished(QNetworkReply* reply) {
   reply->deleteLater();
 }
 
-void downloadThread::loadCookies(const QString &host_name, QString url) {
-  const QList<QByteArray> raw_cookies = Preferences::getHostNameCookies(host_name);
-  QNetworkCookieJar *cookie_jar = networkManager.cookieJar();
-  QList<QNetworkCookie> cookies;
-  qDebug("Loading cookies for host name: %s", qPrintable(host_name));
-  foreach(const QByteArray& raw_cookie, raw_cookies) {
-    QList<QByteArray> cookie_parts = raw_cookie.split('=');
-    if(cookie_parts.size() == 2) {
-      qDebug("Loading cookie: %s", raw_cookie.constData());
-      cookies << QNetworkCookie(cookie_parts.first(), cookie_parts.last());
-    }
-  }
-  cookie_jar->setCookiesFromUrl(cookies, url);
-  networkManager.setCookieJar(cookie_jar);
-}
-
-void downloadThread::downloadTorrentUrl(QString url){
-  // Load cookies
-  QString host_name = QUrl::fromEncoded(url.toLocal8Bit()).host();
-  if(!host_name.isEmpty())
-    loadCookies(host_name, url);
-  // Process request
-  QNetworkReply *reply = downloadUrl(url);
-  connect(reply, SIGNAL(downloadProgress(qint64,qint64)), this, SLOT(checkDownloadSize(qint64,qint64)));
-}
-
-QNetworkReply* downloadThread::downloadUrl(QString url){
+void downloadThread::downloadUrl(QString url){
   // Update proxy settings
   applyProxySettings();
-  // Load cookies
-  QString host_name = QUrl::fromEncoded(url.toLocal8Bit()).host();
-  if(!host_name.isEmpty())
-    loadCookies(host_name, url);
   // Process download request
-  qDebug("url is %s", qPrintable(url));
-  const QUrl qurl = QUrl::fromEncoded(url.toLocal8Bit());
-  QNetworkRequest request(qurl);
-  // Spoof Firefox 3.5 user agent to avoid
-  // Web server banning
-  request.setRawHeader("User-Agent", "Mozilla/5.0 (X11; U; Linux i686 (x86_64); en-US; rv:1.9.1.5) Gecko/20091102 Firefox/3.5.5");
-  qDebug("Downloading %s...", request.url().toEncoded().data());
-  qDebug("%d cookies for this URL", networkManager.cookieJar()->cookiesForUrl(url).size());
-  for(int i=0; i<networkManager.cookieJar()->cookiesForUrl(url).size(); ++i) {
-    qDebug("%s=%s", networkManager.cookieJar()->cookiesForUrl(url).at(i).name().data(), networkManager.cookieJar()->cookiesForUrl(url).at(i).value().data());
-    qDebug("Domain: %s, Path: %s", qPrintable(networkManager.cookieJar()->cookiesForUrl(url).at(i).domain()), qPrintable(networkManager.cookieJar()->cookiesForUrl(url).at(i).path()));
-  }
-  return networkManager.get(request);
-}
-
-void downloadThread::checkDownloadSize(qint64 bytesReceived, qint64 bytesTotal) {
-  if(bytesTotal > 0) {
-    QNetworkReply *reply = static_cast<QNetworkReply*>(sender());
-    // Total number of bytes is available
-    if(bytesTotal > 1048576) {
-      // More than 1MB, this is probably not a torrent file, aborting...
-      reply->abort();
-    } else {
-      disconnect(reply, SIGNAL(downloadProgress(qint64,qint64)), this, SLOT(checkDownloadSize(qint64,qint64)));
-    }
-  } else {
-    if(bytesReceived  > 1048576) {
-      // More than 1MB, this is probably not a torrent file, aborting...
-      QNetworkReply *reply = static_cast<QNetworkReply*>(sender());
-      reply->abort();
-    }
-  }
+  networkManager->get(QNetworkRequest(QUrl(url)));
 }
 
 void downloadThread::applyProxySettings() {
   QNetworkProxy proxy;
-  QIniSettings settings("qBittorrent", "qBittorrent");
+  QSettings settings("qBittorrent", "qBittorrent");
   int intValue = settings.value(QString::fromUtf8("Preferences/Connection/HTTPProxyType"), 0).toInt();
   if(intValue > 0) {
     // Proxy enabled
     QString IP = settings.value(QString::fromUtf8("Preferences/Connection/HTTPProxy/IP"), "0.0.0.0").toString();
     proxy.setHostName(IP);
     QString port = settings.value(QString::fromUtf8("Preferences/Connection/HTTPProxy/Port"), 8080).toString();
-    qDebug("Using proxy: %s", qPrintable(IP));
+    qDebug("Using proxy: %s", (IP+QString(":")+port).toLocal8Bit().data());
     proxy.setPort(port.toUShort());
     // Default proxy type is HTTP, we must change if it is SOCKS5
-    if(intValue == SOCKS5 || intValue == SOCKS5_PW) {
+    if(intValue%2==0) {
       qDebug("Proxy is SOCKS5, not HTTP");
       proxy.setType(QNetworkProxy::Socks5Proxy);
     } else {
@@ -198,7 +117,7 @@ void downloadThread::applyProxySettings() {
   } else {
     proxy.setType(QNetworkProxy::NoProxy);
   }
-  networkManager.setProxy(proxy);
+  networkManager->setProxy(proxy);
 }
 
 QString downloadThread::errorCodeToString(QNetworkReply::NetworkError status) {
@@ -249,11 +168,3 @@ QString downloadThread::errorCodeToString(QNetworkReply::NetworkError status) {
     return tr("Unknown error");
   }
 }
-
-#ifndef QT_NO_OPENSSL
-void downloadThread::ignoreSslErrors(QNetworkReply* reply,QList<QSslError> errors) {
-  Q_UNUSED(errors)
-  // Ignore all SSL errors
-  reply->ignoreSslErrors();
-}
-#endif

src/downloadthread.h

@@ -33,8 +33,6 @@
 
 #include <QNetworkReply>
 #include <QObject>
-#include <QHash>
-#include <QSslError>
 
 class QNetworkAccessManager;
 
@@ -42,8 +40,7 @@ class downloadThread : public QObject {
   Q_OBJECT
 
 private:
-  QNetworkAccessManager networkManager;
-  QHash<QString, QString> redirect_mapping;
+  QNetworkAccessManager *networkManager;
 
 signals:
   void downloadFinished(QString url, QString file_path);
@@ -51,21 +48,16 @@ signals:
 
 public:
   downloadThread(QObject* parent);
-  QNetworkReply* downloadUrl(QString url);
-  void downloadTorrentUrl(QString url);
+  ~downloadThread();
+  void downloadUrl(QString url);
   //void setProxy(QString IP, int port, QString username, QString password);
 
 protected:
   QString errorCodeToString(QNetworkReply::NetworkError status);
   void applyProxySettings();
-  void loadCookies(const QString &host_name, QString url);
 
 protected slots:
   void processDlFinished(QNetworkReply* reply);
-  void checkDownloadSize(qint64 bytesReceived, qint64 bytesTotal);
-#ifndef QT_NO_OPENSSL
-  void ignoreSslErrors(QNetworkReply*,QList<QSslError>);
-#endif
 
 };
 

src/engineselectdlg.cpp

@@ -36,6 +36,7 @@
 #include "pluginsource.h"
 #include <QProcess>
 #include <QHeaderView>
+#include <QSettings>
 #include <QMenu>
 #include <QMessageBox>
 #include <QFileDialog>
@@ -80,14 +81,9 @@ void engineSelectDlg::dropEvent(QDropEvent *event) {
   QStringList files=event->mimeData()->text().split(QString::fromUtf8("\n"));
   QString file;
   foreach(file, files) {
-    qDebug("dropped %s", qPrintable(file));
-#ifdef Q_WS_WIN
-    file = file.replace("file:///", "");
-#else
+    qDebug("dropped %s", file.toLocal8Bit().data());
     file = file.replace("file://", "");
-#endif
     if(file.startsWith("http://", Qt::CaseInsensitive) || file.startsWith("https://", Qt::CaseInsensitive) || file.startsWith("ftp://", Qt::CaseInsensitive)) {
-      setCursor(QCursor(Qt::WaitCursor));
       downloader->downloadUrl(file);
       continue;
     }
@@ -103,7 +99,7 @@ void engineSelectDlg::dropEvent(QDropEvent *event) {
 void engineSelectDlg::dragEnterEvent(QDragEnterEvent *event) {
   QString mime;
   foreach(mime, event->mimeData()->formats()){
-    qDebug("mimeData: %s", qPrintable(mime));
+    qDebug("mimeData: %s", mime.toLocal8Bit().data());
   }
   if (event->mimeData()->hasFormat(QString::fromUtf8("text/plain")) || event->mimeData()->hasFormat(QString::fromUtf8("text/uri-list"))) {
     event->acceptProposedAction();
@@ -112,7 +108,6 @@ void engineSelectDlg::dragEnterEvent(QDragEnterEvent *event) {
 
 void engineSelectDlg::on_updateButton_clicked() {
   // Download version file from update server on sourceforge
-  setCursor(QCursor(Qt::WaitCursor));
   downloader->downloadUrl(QString(UPDATE_URL)+"versions.txt");
 }
 
@@ -130,17 +125,18 @@ void engineSelectDlg::toggleEngineState(QTreeWidgetItem *item, int) {
 
 void engineSelectDlg::displayContextMenu(const QPoint&) {
   QMenu myContextMenu(this);
+  QModelIndex index;
   // Enable/disable pause/start action given the DL state
   QList<QTreeWidgetItem *> items = pluginsTree->selectedItems();
   bool has_enable = false, has_disable = false;
   QTreeWidgetItem *item;
   foreach(item, items) {
     QString id = item->text(ENGINE_ID);
-    if(supported_engines->value(id)->isEnabled() && !has_disable) {
+    if(supported_engines->value(id)->isEnabled() and !has_disable) {
       myContextMenu.addAction(actionDisable);
       has_disable = true;
     }
-    if(!supported_engines->value(id)->isEnabled() && !has_enable) {
+    if(!supported_engines->value(id)->isEnabled() and !has_enable) {
       myContextMenu.addAction(actionEnable);
       has_enable = true;
     }
@@ -174,7 +170,7 @@ void engineSelectDlg::on_actionUninstall_triggered() {
     }else {
       // Proceed with uninstall
       // remove it from hard drive
-      QDir enginesFolder(misc::searchEngineLocation()+QDir::separator()+"engines");
+      QDir enginesFolder(misc::qBittorrentPath()+"search_engine"+QDir::separator()+"engines");
       QStringList filters;
       filters << id+".*";
       QStringList files = enginesFolder.entryList(filters, QDir::Files, QDir::Unsorted);
@@ -249,27 +245,27 @@ QTreeWidgetItem* engineSelectDlg::findItemWithID(QString id){
 }
 
 bool engineSelectDlg::isUpdateNeeded(QString plugin_name, float new_version) const {
-  float old_version = SearchEngine::getPluginVersion(misc::searchEngineLocation()+QDir::separator()+"engines"+QDir::separator()+plugin_name+".py");
+  float old_version = SearchEngine::getPluginVersion(misc::qBittorrentPath()+"search_engine"+QDir::separator()+"engines"+QDir::separator()+plugin_name+".py");
   qDebug("IsUpdate needed? tobeinstalled: %.2f, alreadyinstalled: %.2f", new_version, old_version);
   return (new_version > old_version);
 }
 
 void engineSelectDlg::installPlugin(QString path, QString plugin_name) {
-  qDebug("Asked to install plugin at %s", qPrintable(path));
+  qDebug("Asked to install plugin at %s", path.toLocal8Bit().data());
   float new_version = SearchEngine::getPluginVersion(path);
   qDebug("Version to be installed: %.2f", new_version);
   if(!isUpdateNeeded(plugin_name, new_version)) {
     qDebug("Apparently update is not needed, we have a more recent version");
-    QMessageBox::information(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("A more recent version of %1 search engine plugin is already installed.", "%1 is the name of the search engine").arg(plugin_name));
+    QMessageBox::information(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("A more recent version of %1 search engine plugin is already installed.", "%1 is the name of the search engine").arg(plugin_name.toLocal8Bit().data()));
     return;
   }
   // Process with install
-  QString dest_path = misc::searchEngineLocation()+QDir::separator()+"engines"+QDir::separator()+plugin_name+".py";
+  QString dest_path = misc::qBittorrentPath()+"search_engine"+QDir::separator()+"engines"+QDir::separator()+plugin_name+".py";
   bool update = false;
   if(QFile::exists(dest_path)) {
     // Backup in case install fails
     QFile::copy(dest_path, dest_path+".bak");
-    misc::safeRemove(dest_path);
+    QFile::remove(dest_path);
     update = true;
   }
   // Copy the plugin
@@ -280,28 +276,28 @@ void engineSelectDlg::installPlugin(QString path, QString plugin_name) {
   if(!supported_engines->contains(plugin_name)) {
     if(update) {
       // Remove broken file
-      misc::safeRemove(dest_path);
+      QFile::remove(dest_path);
       // restore backup
       QFile::copy(dest_path+".bak", dest_path);
-      misc::safeRemove(dest_path+".bak");
-      QMessageBox::warning(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("%1 search engine plugin could not be updated, keeping old version.", "%1 is the name of the search engine").arg(plugin_name));
+      QFile::remove(dest_path+".bak");
+      QMessageBox::warning(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("%1 search engine plugin could not be updated, keeping old version.", "%1 is the name of the search engine").arg(plugin_name.toLocal8Bit().data()));
       return;
     } else {
       // Remove broken file
-      misc::safeRemove(dest_path);
-      QMessageBox::warning(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("%1 search engine plugin could not be installed.", "%1 is the name of the search engine").arg(plugin_name));
+      QFile::remove(dest_path);
+      QMessageBox::warning(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("%1 search engine plugin could not be installed.", "%1 is the name of the search engine").arg(plugin_name.toLocal8Bit().data()));
       return;
     }
   }
   // Install was successful, remove backup
   if(update) {
-    misc::safeRemove(dest_path+".bak");
+    QFile::remove(dest_path+".bak");
   }
   if(update) {
-    QMessageBox::information(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("%1 search engine plugin was successfully updated.", "%1 is the name of the search engine").arg(plugin_name));
+    QMessageBox::information(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("%1 search engine plugin was successfully updated.", "%1 is the name of the search engine").arg(plugin_name.toLocal8Bit().data()));
     return;
   } else {
-    QMessageBox::information(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("%1 search engine plugin was successfully installed.", "%1 is the name of the search engine").arg(plugin_name));
+    QMessageBox::information(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("%1 search engine plugin was successfully installed.", "%1 is the name of the search engine").arg(plugin_name.toLocal8Bit().data()));
     return;
   }
 }
@@ -328,12 +324,12 @@ void engineSelectDlg::addNewEngine(QString engine_name) {
     setRowColor(pluginsTree->indexOfTopLevelItem(item), "red");
   }
   // Handle icon
-  QString iconPath = misc::searchEngineLocation()+QDir::separator()+"engines"+QDir::separator()+engine->getName()+".png";
+  QString iconPath = misc::qBittorrentPath()+"search_engine"+QDir::separator()+"engines"+QDir::separator()+engine->getName()+".png";
   if(QFile::exists(iconPath)) {
     // Good, we already have the icon
     item->setData(ENGINE_NAME, Qt::DecorationRole, QVariant(QIcon(iconPath)));
   } else {
-    iconPath = misc::searchEngineLocation()+QDir::separator()+"engines"+QDir::separator()+engine->getName()+".ico";
+    iconPath = misc::qBittorrentPath()+"search_engine"+QDir::separator()+"engines"+QDir::separator()+engine->getName()+".ico";
     if(QFile::exists(iconPath)) { // ICO support
       item->setData(ENGINE_NAME, Qt::DecorationRole, QVariant(QIcon(iconPath)));
     } else {
@@ -354,10 +350,8 @@ void engineSelectDlg::askForPluginUrl() {
   QString url = QInputDialog::getText(this, tr("New search engine plugin URL"),
                                       tr("URL:"), QLineEdit::Normal,
                                       "http://", &ok);
-  if (ok && !url.isEmpty()) {
-    setCursor(QCursor(Qt::WaitCursor));
+  if (ok && !url.isEmpty())
     downloader->downloadUrl(url);
-  }
 }
 
 void engineSelectDlg::askForLocalPlugin() {
@@ -396,24 +390,23 @@ bool engineSelectDlg::parseVersionsFile(QString versions_file) {
     plugin_name.chop(1); // remove trailing ':'
     bool ok;
     float version = list.last().toFloat(&ok);
-    qDebug("read line %s: %.2f", qPrintable(plugin_name), version);
+    qDebug("read line %s: %.2f", plugin_name.toLocal8Bit().data(), version);
     if(!ok) continue;
     file_correct = true;
     if(isUpdateNeeded(plugin_name, version)) {
-      qDebug("Plugin: %s is outdated", qPrintable(plugin_name));
+      qDebug("Plugin: %s is outdated", plugin_name.toLocal8Bit().data());
       // Downloading update
-      setCursor(QCursor(Qt::WaitCursor));
       downloader->downloadUrl(UPDATE_URL+plugin_name+".py");
       //downloader->downloadUrl(UPDATE_URL+plugin_name+".png");
       updated = true;
     }else {
-      qDebug("Plugin: %s is up to date", qPrintable(plugin_name));
+      qDebug("Plugin: %s is up to date", plugin_name.toLocal8Bit().data());
     }
   }
   // Close file
   versions.close();
   // Clean up tmp file
-  misc::safeRemove(versions_file);
+  QFile::remove(versions_file);
   if(file_correct && !updated) {
     QMessageBox::information(this, tr("Search plugin update")+" -- "+tr("qBittorrent"), tr("All your plugins are already up to date."));
   }
@@ -421,8 +414,7 @@ bool engineSelectDlg::parseVersionsFile(QString versions_file) {
 }
 
 void engineSelectDlg::processDownloadedFile(QString url, QString filePath) {
-  setCursor(QCursor(Qt::ArrowCursor));
-  qDebug("engineSelectDlg received %s", qPrintable(url));
+  qDebug("engineSelectDlg received %s", url.toLocal8Bit().data());
   if(url.endsWith("favicon.ico", Qt::CaseInsensitive)){
     // Icon downloaded
     QImage fileIcon;
@@ -435,37 +427,36 @@ void engineSelectDlg::processDownloadedFile(QString url, QString filePath) {
         QFile icon(filePath);
         icon.open(QIODevice::ReadOnly);
         if(ICOHandler::canRead(&icon))
-          iconPath = misc::searchEngineLocation()+QDir::separator()+"engines"+QDir::separator()+id+".ico";
+          iconPath = misc::qBittorrentPath()+"search_engine"+QDir::separator()+"engines"+QDir::separator()+id+".ico";
         else
-          iconPath = misc::searchEngineLocation()+QDir::separator()+"engines"+QDir::separator()+id+".png";
+          iconPath = misc::qBittorrentPath()+"search_engine"+QDir::separator()+"engines"+QDir::separator()+id+".png";
         QFile::copy(filePath, iconPath);
         item->setData(ENGINE_NAME, Qt::DecorationRole, QVariant(QIcon(iconPath)));
       }
     }
     // Delete tmp file
-    misc::safeRemove(filePath);
+    QFile::remove(filePath);
     return;
   }
   if(url.endsWith("versions.txt")) {
     if(!parseVersionsFile(filePath)) {
       QMessageBox::warning(this, tr("Search plugin update")+" -- "+tr("qBittorrent"), tr("Sorry, update server is temporarily unavailable."));
     }
-    misc::safeRemove(filePath);
+    QFile::remove(filePath);
     return;
   }
   if(url.endsWith(".py", Qt::CaseInsensitive)) {
     QString plugin_name = url.split('/').last();
     plugin_name.replace(".py", "");
     installPlugin(filePath, plugin_name);
-    misc::safeRemove(filePath);
+    QFile::remove(filePath);
     return;
   }
 }
 
 void engineSelectDlg::handleDownloadFailure(QString url, QString reason) {
-  setCursor(QCursor(Qt::ArrowCursor));
   if(url.endsWith("favicon.ico", Qt::CaseInsensitive)){
-    qDebug("Could not download favicon: %s, reason: %s", qPrintable(url), qPrintable(reason));
+    qDebug("Could not download favicon: %s, reason: %s", url.toLocal8Bit().data(), reason.toLocal8Bit().data());
     return;
   }
   if(url.endsWith("versions.txt")) {
@@ -476,6 +467,6 @@ void engineSelectDlg::handleDownloadFailure(QString url, QString reason) {
     // a plugin update download has been failed
     QString plugin_name = url.split('/').last();
     plugin_name.replace(".py", "", Qt::CaseInsensitive);
-    QMessageBox::warning(this, tr("Search plugin update")+" -- "+tr("qBittorrent"), tr("Sorry, %1 search plugin install failed.", "%1 is the name of the search engine").arg(plugin_name));
+    QMessageBox::warning(this, tr("Search plugin update")+" -- "+tr("qBittorrent"), tr("Sorry, %1 search plugin install failed.", "%1 is the name of the search engine").arg(plugin_name.toLocal8Bit().data()));
   }
 }

src/eventmanager.cpp

@@ -29,19 +29,16 @@
  */
 
 
-#include <libtorrent/version.hpp>
 #include "eventmanager.h"
 #include "bittorrent.h"
-#include "scannedfoldersmodel.h"
 #include "misc.h"
 #include "preferences.h"
-//#include "proplistdelegate.h"
+#include "proplistdelegate.h"
 #include "torrentpersistentdata.h"
 #include <QDebug>
-#include <QTranslator>
 
 EventManager::EventManager(QObject *parent, Bittorrent *BTSession)
-  : QObject(parent), BTSession(BTSession)
+    : QObject(parent), BTSession(BTSession)
 {
 }
 
@@ -62,7 +59,7 @@ QList<QVariantMap> EventManager::getPropTrackersInfo(QString hash) const {
       tracker["url"] = tracker_url;
       TrackerInfos data = trackers_data.value(tracker_url, TrackerInfos(tracker_url));
       QString error_message = data.last_message.trimmed();
-#if LIBTORRENT_VERSION_MINOR > 14
+#ifdef LIBTORRENT_0_15
       if(it->verified) {
         tracker["status"] = tr("Working");
       } else {
@@ -97,7 +94,7 @@ QList<QVariantMap> EventManager::getPropTrackersInfo(QString hash) const {
 QList<QVariantMap> EventManager::getPropFilesInfo(QString hash) const {
   QList<QVariantMap> files;
   QTorrentHandle h = BTSession->getTorrentHandle(hash);
-  if(!h.is_valid() || !h.has_metadata()) return files;
+  if(!h.is_valid()) return files;
   std::vector<int> priorities = h.file_priorities();
   std::vector<size_type> fp;
   h.file_progress(fp);
@@ -106,275 +103,74 @@ QList<QVariantMap> EventManager::getPropFilesInfo(QString hash) const {
   int i=0;
   for(fi=t.begin_files(); fi != t.end_files(); fi++) {
     QVariantMap file;
-    QString path = QDir::cleanPath(misc::toQStringU(fi->path.string()));
-    QString name = path.split('/').last();
-    file["name"] = name;
+    if(h.num_files() == 1) {
+      file["name"] = h.name();
+    } else {
+      QString path = QDir::cleanPath(misc::toQString(fi->path.string()));
+      QString name = path.split('/').last();
+      file["name"] = name;
+    }
     file["size"] = misc::friendlyUnit((double)fi->size);
-    if(fi->size > 0)
-      file["progress"] = fp[i]/(double)fi->size;
-    else
-      file["progress"] = 1.; // Empty file...
+    file["progress"] = fp[i]/(double)fi->size;
     file["priority"] = priorities[i];
-    if(i == 0)
-      file["is_seed"] = h.is_seed();
     files << file;
     ++i;
   }
   return files;
 }
 
-void EventManager::setGlobalPreferences(QVariantMap m) const {
-  // UI
-  if(m.contains("locale")) {
-    QString locale = m["locale"].toString();
-    if(Preferences::getLocale() != locale) {
-      QTranslator *translator = new QTranslator;
-      if(translator->load(QString::fromUtf8(":/lang/qbittorrent_") + locale)){
-        qDebug("%s locale recognized, using translation.", qPrintable(locale));
-      }else{
-        qDebug("%s locale unrecognized, using default (en_GB).", qPrintable(locale));
-      }
-      qApp->installTranslator(translator);
-    }
-
-    Preferences::setLocale(locale);
-  }
-  // Downloads
-  if(m.contains("save_path"))
-    Preferences::setSavePath(m["save_path"].toString());
-  if(m.contains("temp_path_enabled"))
-    Preferences::setTempPathEnabled(m["temp_path_enabled"].toBool());
-  if(m.contains("temp_path"))
-    Preferences::setTempPath(m["temp_path"].toString());
-  if(m.contains("scan_dirs") && m.contains("download_in_scan_dirs")) {
-    QVariantList download_at_path_tmp = m["download_in_scan_dirs"].toList();
-    QList<bool> download_at_path;
-    foreach(QVariant var, download_at_path_tmp) {
-      download_at_path << var.toBool();
-    }
-    QStringList old_folders = Preferences::getScanDirs();
-    QStringList new_folders = m["scan_dirs"].toStringList();
-    if(download_at_path.size() == new_folders.size()) {
-      Preferences::setScanDirs(new_folders);
-      Preferences::setDownloadInScanDirs(download_at_path);
-      foreach(const QString &old_folder, old_folders) {
-        // Update deleted folders
-        if(!new_folders.contains(old_folder)) {
-          BTSession->getScanFoldersModel()->removePath(old_folder);
-        }
-      }
-      int i = 0;
-      foreach(const QString &new_folder, new_folders) {
-        qDebug("New watched folder: %s", qPrintable(new_folder));
-        // Update new folders
-        if(!old_folders.contains(new_folder)) {
-          BTSession->getScanFoldersModel()->addPath(new_folder, download_at_path.at(i));
-        }
-        ++i;
-      }
-    }
-  }
-  if(m.contains("export_dir"))
-    Preferences::setExportDir(m["export_dir"].toString());
-  if(m.contains("mail_notification_enabled"))
-    Preferences::setMailNotificationEnabled(m["mail_notification_enabled"].toBool());
-  if(m.contains("mail_notification_email"))
-    Preferences::setMailNotificationEmail(m["mail_notification_email"].toString());
-  if(m.contains("mail_notification_smtp"))
-    Preferences::setMailNotificationSMTP(m["mail_notification_smtp"].toString());
-  if(m.contains("autorun_enabled"))
-    Preferences::setAutoRunEnabled(m["autorun_enabled"].toBool());
-  if(m.contains("autorun_program"))
-    Preferences::setAutoRunProgram(m["autorun_program"].toString());
-  if(m.contains("preallocate_all"))
-    Preferences::preAllocateAllFiles(m["preallocate_all"].toBool());
-  if(m.contains("queueing_enabled"))
-    Preferences::setQueueingSystemEnabled(m["queueing_enabled"].toBool());
-  if(m.contains("max_active_downloads"))
-    Preferences::setMaxActiveDownloads(m["max_active_downloads"].toInt());
-  if(m.contains("max_active_torrents"))
-    Preferences::setMaxActiveTorrents(m["max_active_torrents"].toInt());
-  if(m.contains("max_active_uploads"))
-    Preferences::setMaxActiveUploads(m["max_active_uploads"].toInt());
-#if LIBTORRENT_VERSION_MINOR > 14
-  if(m.contains("incomplete_files_ext"))
-    Preferences::useIncompleteFilesExtension(m["incomplete_files_ext"].toBool());
-#endif
-  // Connection
-  if(m.contains("listen_port"))
-    Preferences::setSessionPort(m["listen_port"].toInt());
-  if(m.contains("upnp"))
-    Preferences::setUPnPEnabled(m["upnp"].toBool());
-  if(m.contains("natpmp"))
-    Preferences::setNATPMPEnabled(m["natpmp"].toBool());
-  if(m.contains("dl_limit"))
-    Preferences::setGlobalDownloadLimit(m["dl_limit"].toInt());
-  if(m.contains("up_limit"))
-    Preferences::setGlobalUploadLimit(m["up_limit"].toInt());
-  if(m.contains("max_connec"))
-    Preferences::setMaxConnecs(m["max_connec"].toInt());
-  if(m.contains("max_connec_per_torrent"))
-    Preferences::setMaxConnecsPerTorrent(m["max_connec_per_torrent"].toInt());
-  if(m.contains("max_uploads_per_torrent"))
-    Preferences::setMaxUploadsPerTorrent(m["max_uploads_per_torrent"].toInt());
-  // Bittorrent
-  if(m.contains("dht"))
-    Preferences::setDHTEnabled(m["dht"].toBool());
-  if(m.contains("dhtSameAsBT"))
-    Preferences::setDHTPortSameAsBT(m["dhtSameAsBT"].toBool());
-  if(m.contains("dht_port"))
-    Preferences::setDHTPort(m["dht_port"].toInt());
-  if(m.contains("pex"))
-    Preferences::setPeXEnabled(m["pex"].toBool());
-  qDebug("Pex support: %d", (int)m["pex"].toBool());
-  if(m.contains("lsd"))
-    Preferences::setLSDEnabled(m["lsd"].toBool());
-  if(m.contains("encryption"))
-    Preferences::setEncryptionSetting(m["encryption"].toInt());
-  // Proxy
-  if(m.contains("proxy_type"))
-    Preferences::setPeerProxyType(m["proxy_type"].toInt());
-  if(m.contains("proxy_ip"))
-    Preferences::setPeerProxyIp(m["proxy_ip"].toString());
-  if(m.contains("proxy_port"))
-    Preferences::setPeerProxyPort(m["proxy_port"].toUInt());
-  if(m.contains("proxy_auth_enabled"))
-    Preferences::setPeerProxyAuthEnabled(m["proxy_auth_enabled"].toBool());
-  if(m.contains("proxy_username"))
-    Preferences::setPeerProxyUsername(m["proxy_username"].toString());
-  if(m.contains("proxy_password"))
-    Preferences::setPeerProxyPassword(m["proxy_password"].toString());
-  if(m.contains("http_proxy_type"))
-    Preferences::setHTTPProxyType(m["http_proxy_type"].toInt());
-  if(m.contains("http_proxy_ip"))
-    Preferences::setHTTPProxyIp(m["http_proxy_ip"].toString());
-  if(m.contains("http_proxy_port"))
-    Preferences::setHTTPProxyPort(m["http_proxy_port"].toUInt());
-  if(m.contains("http_proxy_auth_enabled"))
-    Preferences::setHTTPProxyAuthEnabled(m["http_proxy_auth_enabled"].toBool());
-  if(m.contains("http_proxy_username"))
-    Preferences::setHTTPProxyUsername(m["http_proxy_username"].toString());
-  if(m.contains("http_proxy_password"))
-    Preferences::setHTTPProxyPassword(m["http_proxy_password"].toString());
-  // IP Filter
-  if(m.contains("ip_filter_enabled"))
-    Preferences::setFilteringEnabled(m["ip_filter_enabled"].toBool());
-  if(m.contains("ip_filter_path"))
-    Preferences::setFilter(m["ip_filter_path"].toString());
-  // Web UI
-  if(m.contains("web_ui_port"))
-    Preferences::setWebUiPort(m["web_ui_port"].toUInt());
-  if(m.contains("web_ui_username"))
-    Preferences::setWebUiUsername(m["web_ui_username"].toString());
-  if(m.contains("web_ui_password"))
-    Preferences::setWebUiPassword(m["web_ui_password"].toString());
-  // Reload preferences
-  BTSession->configureSession();
-}
-
 QVariantMap EventManager::getGlobalPreferences() const {
   QVariantMap data;
-  // UI
-  data["locale"] = Preferences::getLocale();
-  // Downloads
-  data["save_path"] = Preferences::getSavePath();
-  data["temp_path_enabled"] = Preferences::isTempPathEnabled();
-  data["temp_path"] = Preferences::getTempPath();
-  data["scan_dirs"] = Preferences::getScanDirs();
-  QVariantList var_list;
-  foreach(bool b, Preferences::getDownloadInScanDirs()) {
-    var_list << b;
-  }
-  data["download_in_scan_dirs"] = var_list;
-  data["export_dir_enabled"] = Preferences::isTorrentExportEnabled();
-  data["export_dir"] = Preferences::getExportDir();
-  data["mail_notification_enabled"] = Preferences::isMailNotificationEnabled();
-  data["mail_notification_email"] = Preferences::getMailNotificationEmail();
-  data["mail_notification_smtp"] = Preferences::getMailNotificationSMTP();
-  data["autorun_enabled"] = Preferences::isAutoRunEnabled();
-  data["autorun_program"] = Preferences::getAutoRunProgram();
-  data["preallocate_all"] = Preferences::preAllocateAllFiles();
-  data["queueing_enabled"] = Preferences::isQueueingSystemEnabled();
-  data["max_active_downloads"] = Preferences::getMaxActiveDownloads();
-  data["max_active_torrents"] = Preferences::getMaxActiveTorrents();
-  data["max_active_uploads"] = Preferences::getMaxActiveUploads();
-#if LIBTORRENT_VERSION_MINOR > 14
-  data["incomplete_files_ext"] = Preferences::useIncompleteFilesExtension();
-#endif
-  // Connection
-  data["listen_port"] = Preferences::getSessionPort();
-  data["upnp"] = Preferences::isUPnPEnabled();
-  data["natpmp"] = Preferences::isNATPMPEnabled();
   data["dl_limit"] = Preferences::getGlobalDownloadLimit();
   data["up_limit"] = Preferences::getGlobalUploadLimit();
+  data["dht"] = Preferences::isDHTEnabled();
   data["max_connec"] = Preferences::getMaxConnecs();
   data["max_connec_per_torrent"] = Preferences::getMaxConnecsPerTorrent();
   data["max_uploads_per_torrent"] = Preferences::getMaxUploadsPerTorrent();
-  // Bittorrent
-  data["dht"] = Preferences::isDHTEnabled();
-  data["dhtSameAsBT"] = Preferences::isDHTPortSameAsBT();
-  data["dht_port"] = Preferences::getDHTPort();
-  data["pex"] = Preferences::isPeXEnabled();
-  data["lsd"] = Preferences::isLSDEnabled();
-  data["encryption"] = Preferences::getEncryptionSetting();
-  // Proxy
-  data["proxy_type"] = Preferences::getPeerProxyType();
-  data["proxy_ip"] = Preferences::getPeerProxyIp();
-  data["proxy_port"] = Preferences::getPeerProxyPort();
-  data["proxy_auth_enabled"] = Preferences::isPeerProxyAuthEnabled();
-  data["proxy_username"] = Preferences::getPeerProxyUsername();
-  data["proxy_password"] = Preferences::getPeerProxyPassword();
-  data["http_proxy_type"] = Preferences::getHTTPProxyType();
-  data["http_proxy_ip"] = Preferences::getHTTPProxyIp();
-  data["http_proxy_port"] = Preferences::getHTTPProxyPort();
-  data["http_proxy_auth_enabled"] = Preferences::isHTTPProxyAuthEnabled();
-  data["http_proxy_username"] = Preferences::getHTTPProxyUsername();
-  data["http_proxy_password"] = Preferences::getHTTPProxyPassword();
-  // IP Filter
-  data["ip_filter_enabled"] = Preferences::isFilteringEnabled();
-  data["ip_filter_path"] = Preferences::getFilter();
-  // Web UI
-  data["web_ui_port"] = Preferences::getWebUiPort();
-  data["web_ui_username"] = Preferences::getWebUiUsername();
-  data["web_ui_password"] = Preferences::getWebUiPassword();
   return data;
 }
 
 QVariantMap EventManager::getPropGeneralInfo(QString hash) const {
   QVariantMap data;
   QTorrentHandle h = BTSession->getTorrentHandle(hash);
-  if(h.is_valid() && h.has_metadata()) {
+  if(h.is_valid()) {
     // Save path
-    QString p = TorrentPersistentData::getSavePath(hash);
-    if(p.isEmpty()) p = h.save_path();
-    data["save_path"] = p;
+    data["save_path"] = TorrentPersistentData::getSavePath(hash);
     // Creation date
     data["creation_date"] = h.creation_date();
     // Comment
     data["comment"] = h.comment();
-    data["total_wasted"] = QVariant(misc::friendlyUnit(h.total_failed_bytes()+h.total_redundant_bytes()));
-    data["total_uploaded"] = QVariant(misc::friendlyUnit(h.all_time_upload()) + " ("+misc::friendlyUnit(h.total_payload_upload())+" "+tr("this session")+")");
-    data["total_downloaded"] = QVariant(misc::friendlyUnit(h.all_time_download()) + " ("+misc::friendlyUnit(h.total_payload_download())+" "+tr("this session")+")");
+    data["total_wasted"] = misc::friendlyUnit(h.total_failed_bytes()+h.total_redundant_bytes());
+    data["total_uploaded"] = misc::friendlyUnit(h.all_time_upload()) + " ("+misc::friendlyUnit(h.total_payload_upload())+" "+tr("this session")+")";
+    data["total_downloaded"] = misc::friendlyUnit(h.all_time_download()) + " ("+misc::friendlyUnit(h.total_payload_download())+" "+tr("this session")+")";
     if(h.upload_limit() <= 0)
       data["up_limit"] = QString::fromUtf8("∞");
     else
-      data["up_limit"] = QVariant(misc::friendlyUnit(h.upload_limit())+tr("/s", "/second (i.e. per second)"));
+      data["up_limit"] = misc::friendlyUnit(h.upload_limit())+tr("/s", "/second (i.e. per second)");
     if(h.download_limit() <= 0)
       data["dl_limit"] = QString::fromUtf8("∞");
     else
-      data["dl_limit"] =  QVariant(misc::friendlyUnit(h.download_limit())+tr("/s", "/second (i.e. per second)"));
+      data["dl_limit"] =  misc::friendlyUnit(h.download_limit())+tr("/s", "/second (i.e. per second)");
     QString elapsed_txt = misc::userFriendlyDuration(h.active_time());
     if(h.is_seed()) {
       elapsed_txt += " ("+tr("Seeded for %1", "e.g. Seeded for 3m10s").arg(misc::userFriendlyDuration(h.seeding_time()))+")";
     }
     data["time_elapsed"] = elapsed_txt;
-    data["nb_connections"] = QVariant(QString::number(h.num_connections())+" ("+tr("%1 max", "e.g. 10 max").arg(QString::number(h.connections_limit()))+")");
+    data["nb_connections"] = QString::number(h.num_connections())+" ("+tr("%1 max", "e.g. 10 max").arg(QString::number(h.connections_limit()))+")";
     // Update ratio info
-    double ratio = BTSession->getRealRatio(h.hash());
-    if(ratio > 100.)
-      data["share_ratio"] = QString::fromUtf8("∞");
-    else
-      data["share_ratio"] = QString(QByteArray::number(ratio, 'f', 1));
+    float ratio;
+    if(h.total_payload_download() == 0){
+      if(h.total_payload_upload() == 0)
+        ratio = 1.;
+      else
+        ratio = 10.; // Max ratio
+    }else{
+      ratio = (double)h.total_payload_upload()/(double)h.total_payload_download();
+      if(ratio > 10.){
+        ratio = 10.;
+      }
+    }
+    data["share_ratio"] = QString(QByteArray::number(ratio, 'f', 1));
   }
   return data;
 }
@@ -395,14 +191,10 @@ void EventManager::modifiedTorrent(QTorrentHandle h)
   QVariantMap event;
   event["eta"] = QVariant(QString::fromUtf8("∞"));
   if(h.is_paused()) {
-    if(h.has_error()) {
-      event["state"] = QVariant("error");
-    } else {
-      if(h.is_seed())
-        event["state"] = QVariant("pausedUP");
-      else
-        event["state"] = QVariant("pausedDL");
-    }
+    if(h.is_seed())
+      event["state"] = QVariant("pausedUP");
+    else
+      event["state"] = QVariant("pausedDL");
   } else {
     if(BTSession->isQueueingEnabled() && h.is_queued()) {
       if(h.is_seed())
@@ -415,7 +207,7 @@ void EventManager::modifiedTorrent(QTorrentHandle h)
       case torrent_status::finished:
       case torrent_status::seeding:
         if(h.upload_payload_rate() > 0) {
-          event["state"] = QVariant("uploading");
+          event["state"] = QVariant("seeding");
         } else {
           event["state"] = QVariant("stalledUP");
         }
@@ -446,7 +238,7 @@ void EventManager::modifiedTorrent(QTorrentHandle h)
   }
   event["name"] = QVariant(h.name());
   event["size"] = QVariant(misc::friendlyUnit(h.actual_size()));
-  event["progress"] = QVariant((double)h.progress());
+  event["progress"] = QVariant(h.progress());
   event["dlspeed"] = QVariant(tr("%1/s", "e.g. 120 KiB/s").arg(misc::friendlyUnit(h.download_payload_rate())));
   if(BTSession->isQueueingEnabled()) {
     if(h.queue_position() >= 0)
@@ -468,7 +260,7 @@ void EventManager::modifiedTorrent(QTorrentHandle h)
   event["seed"] = QVariant(h.is_seed());
   double ratio = BTSession->getRealRatio(hash);
   if(ratio > 100.)
-    event["ratio"] = QString::fromUtf8("∞");
+    QString::fromUtf8("∞");
   else
     event["ratio"] = QVariant(QString::number(ratio, 'f', 1));
   event["hash"] = QVariant(hash);

src/eventmanager.h

@@ -55,7 +55,6 @@ class EventManager : public QObject
                 QList<QVariantMap> getPropTrackersInfo(QString hash) const;
                 QList<QVariantMap> getPropFilesInfo(QString hash) const;
                 QVariantMap getGlobalPreferences() const;
-                void setGlobalPreferences(QVariantMap m) const;
 
 	public slots:
 		void addedTorrent(QTorrentHandle& h);

src/feedList.h

@@ -28,19 +28,14 @@ public:
     setColumnCount(1);
     QTreeWidgetItem *___qtreewidgetitem = headerItem();
     ___qtreewidgetitem->setText(0, QApplication::translate("RSS", "RSS feeds", 0, QApplication::UnicodeUTF8));
+    connect(this, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(updateCurrentFeed(QTreeWidgetItem*)));
     unread_item = new QTreeWidgetItem(this);
     unread_item->setText(0, tr("Unread") + QString::fromUtf8("  (") + QString::number(rssmanager->getNbUnRead(), 10)+ QString(")"));
     unread_item->setData(0,Qt::DecorationRole, QVariant(QIcon(":/Icons/oxygen/mail-folder-inbox.png")));
     itemAdded(unread_item, rssmanager);
-    connect(this, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(updateCurrentFeed(QTreeWidgetItem*)));
     setCurrentItem(unread_item);
   }
 
-  ~FeedList() {
-    disconnect(this, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(updateCurrentFeed(QTreeWidgetItem*)));
-    delete unread_item;
-  }
-
   void itemAdded(QTreeWidgetItem *item, RssFile* file) {
     mapping[item] = file;
     if(file->getType() == RssFile::STREAM) {
@@ -48,16 +43,10 @@ public:
     }
   }
 
-  void itemAboutToBeRemoved(QTreeWidgetItem *item) {
+  void itemRemoved(QTreeWidgetItem *item) {
     RssFile* file = mapping.take(item);
-    if(file->getType() == RssFile::STREAM) {
+    if(file->getType() == RssFile::STREAM)
       feeds_items.remove(file->getID());
-    } else {
-      QList<RssStream*> feeds = ((RssFolder*)file)->getAllFeeds();
-      foreach(RssStream* feed, feeds) {
-        feeds_items.remove(feed->getID());
-      }
-    }
   }
 
   bool hasFeed(QString url) const {
@@ -76,7 +65,7 @@ public:
     QStringList path;
     if(item) {
       if(item->parent())
-        path << getItemPath(item->parent());
+        path.append(getItemPath(item->parent()));
       path.append(getRSSItem(item)->getID());
     }
     return path;
@@ -98,7 +87,7 @@ public:
       if(getItemType(item) == RssFile::FOLDER && item->isExpanded()) {
         QList<QTreeWidgetItem*> open_subfolders = getAllOpenFolders(item);
         if(!open_subfolders.empty()) {
-          open_folders << open_subfolders;
+          open_folders.append(open_subfolders);
         } else {
           open_folders << item;
         }
@@ -115,26 +104,26 @@ public:
       if(getItemType(item) == RssFile::STREAM) {
         feeds << item;
       } else {
-        feeds << getAllFeedItems(item);
+        feeds.append(getAllFeedItems(item));
       }
     }
     return feeds;
   }
 
   RssFile* getRSSItem(QTreeWidgetItem *item) const {
-    return mapping.value(item, 0);
+    return mapping[item];
   }
 
   RssFile::FileType getItemType(QTreeWidgetItem *item) const {
-    return mapping.value(item)->getType();
+    return mapping[item]->getType();
   }
 
   QString getItemID(QTreeWidgetItem *item) const {
-    return mapping.value(item)->getID();
+    return mapping[item]->getID();
   }
 
   QTreeWidgetItem* getTreeItemFromUrl(QString url) const{
-    return feeds_items.value(url, 0);
+    return feeds_items[url];
   }
 
   RssStream* getRSSItemFromUrl(QString url) const {
@@ -155,9 +144,7 @@ signals:
 
 protected slots:
   void updateCurrentFeed(QTreeWidgetItem* new_item) {
-    if(!new_item) return;
-    if(!mapping.contains(new_item)) return;
-    if((getItemType(new_item) == RssFile::STREAM) || new_item == unread_item)
+    if((new_item && getItemType(new_item) == RssFile::STREAM) || new_item == unread_item)
       current_feed = new_item;
   }
 

src/feeddownloader.h

@@ -32,6 +32,8 @@
 #define FEEDDOWNLOADER_H
 
 #include <QString>
+#include <QHash>
+#include <QSettings>
 #include <QListWidget>
 #include <QListWidgetItem>
 #include <QInputDialog>
@@ -44,15 +46,6 @@
 
 #include "bittorrent.h"
 #include "ui_feeddownloader.h"
-#include "qinisettings.h"
-
-#if QT_VERSION >= 0x040500
-#include <QHash>
-#else
-#include <QMap>
-#define QHash QMap
-#define toHash toMap
-#endif
 
 class FeedFilter: public QHash<QString, QVariant> {
 private:
@@ -67,16 +60,14 @@ public:
     foreach(const QString& token, match_tokens) {
       if(token.isEmpty() || token == "")
         continue;
-      QRegExp reg(token, Qt::CaseInsensitive, QRegExp::Wildcard);
-      //reg.setMinimal(false);
+      QRegExp reg(token, Qt::CaseInsensitive);
       if(reg.indexIn(s) < 0) return false;
     }
-    qDebug("Checking not matching tokens");
     // Checking not matching
     QStringList notmatch_tokens = getNotMatchingTokens();
     foreach(const QString& token, notmatch_tokens) {
       if(token.isEmpty()) continue;
-      QRegExp reg(token, Qt::CaseInsensitive, QRegExp::Wildcard);
+      QRegExp reg(token, Qt::CaseInsensitive);
       if(reg.indexIn(s) > -1) return false;
     }
     return true;
@@ -105,7 +96,7 @@ public:
 
   QStringList getNotMatchingTokens() const {
     QString notmatching = this->value("not", "").toString();
-    return notmatching.split(QRegExp("[\\s|]"));
+    return notmatching.split(" ");
   }
 
   QString getNotMatchingTokens_str() const {
@@ -168,20 +159,20 @@ public:
   }
 
   bool isDownloadingEnabled() const {
-    QIniSettings qBTRSS("qBittorrent", "qBittorrent-rss");
+    QSettings qBTRSS("qBittorrent", "qBittorrent-rss");
     QHash<QString, QVariant> feeds_w_downloader = qBTRSS.value("downloader_on", QHash<QString, QVariant>()).toHash();
     return feeds_w_downloader.value(feed_url, false).toBool();
   }
 
   void setDownloadingEnabled(bool enabled) {
-    QIniSettings qBTRSS("qBittorrent", "qBittorrent-rss");
+    QSettings qBTRSS("qBittorrent", "qBittorrent-rss");
     QHash<QString, QVariant> feeds_w_downloader = qBTRSS.value("downloader_on", QHash<QString, QVariant>()).toHash();
     feeds_w_downloader[feed_url] = enabled;
     qBTRSS.setValue("downloader_on", feeds_w_downloader);
   }
 
   static FeedFilters getFeedFilters(QString url) {
-    QIniSettings qBTRSS("qBittorrent", "qBittorrent-rss");
+    QSettings qBTRSS("qBittorrent", "qBittorrent-rss");
     QHash<QString, QVariant> all_feeds_filters = qBTRSS.value("feed_filters", QHash<QString, QVariant>()).toHash();
     return FeedFilters(url, all_feeds_filters.value(url, QHash<QString, QVariant>()).toHash());
   }
@@ -222,9 +213,9 @@ public:
   }
 
   void save() {
-    QIniSettings qBTRSS("qBittorrent", "qBittorrent-rss");
+    QSettings qBTRSS("qBittorrent", "qBittorrent-rss");
     QHash<QString, QVariant> all_feeds_filters = qBTRSS.value("feed_filters", QHash<QString, QVariant>()).toHash();
-    qDebug("Saving filters for feed: %s (%d filters)", qPrintable(feed_url), (*this).size());
+    qDebug("Saving filters for feed: %s (%d filters)", feed_url.toLocal8Bit().data(), (*this).size());
     all_feeds_filters[feed_url] = *this;
     qBTRSS.setValue("feed_filters", all_feeds_filters);
   }
@@ -269,8 +260,6 @@ public:
   }
 
   ~FeedDownloaderDlg() {
-    if(enableDl_cb->isChecked())
-      emit filteringEnabled();
     // Make sure we save everything
     saveCurrentFilterSettings();
     filters.save();
@@ -291,17 +280,6 @@ protected slots:
     }
   }
 
-  void on_browse_button_clicked() {
-    QString default_path = savepath_line->text();
-    if(default_path.isEmpty() || !QDir(default_path).exists()) {
-      default_path = QDir::homePath();
-    }
-    QString dir = QFileDialog::getExistingDirectory(this, tr("Choose save path"), QDir::homePath());
-    if(!dir.isNull() && QDir(dir).exists()) {
-      savepath_line->setText(dir);
-    }
-  }
-
   void fillFiltersList() {
     // Fill filter list
     foreach(QString filter_name, filters.names()) {
@@ -378,8 +356,6 @@ protected slots:
           QMessageBox::warning(0, tr("Invalid filter name"), tr("This filter name is already in use."));
         }
       }while(!validated);
-      // Save the current filter
-      saveCurrentFilterSettings();
       // Rename the filter
       filters.rename(current_name, new_name);
       if(selected_filter == current_name)
@@ -451,11 +427,7 @@ protected slots:
   }
 
   void on_testButton_clicked(bool) {
-    test_res_lbl->clear();
-    if(selected_filter.isEmpty()) {
-      qDebug("No filter is selected!!!");
-      return;
-    }
+    if(selected_filter.isEmpty()) return;
     QString s = test_line->text().trimmed();
     if(s.isEmpty()) {
       QMessageBox::warning(0, tr("Filter testing error"), tr("Please specify a test torrent name."));
@@ -493,22 +465,16 @@ protected slots:
     // Append file extension
     if(!destination.endsWith(".filters"))
       destination += ".filters";
-    /*if(QFile::exists(destination)) {
+    if(QFile::exists(destination)) {
       int ret = QMessageBox::question(0, tr("Overwriting confirmation"), tr("Are you sure you want to overwrite existing file?"), QMessageBox::Yes|QMessageBox::No);
       if(ret != QMessageBox::Yes) return;
-    }*/
+    }
     if(filters.serialize(destination))
       QMessageBox::information(0, tr("Export successful"), tr("Filters export was successful."));
     else
       QMessageBox::warning(0, tr("Export failure"), tr("Filters could not be exported due to an I/O error."));
   }
 
-signals:
-  void filteringEnabled();
-
 };
 
-#undef QHash
-#undef toHash
-
 #endif // FEEDDOWNLOADER_H

src/filesystemwatcher.h

@@ -2,10 +2,10 @@
 #define FILESYSTEMWATCHER_H
 
 #include <QFileSystemWatcher>
-#include <QDir>
 
 #ifndef Q_WS_WIN
 #include <QTimer>
+#include <QDir>
 #include <QPointer>
 #include <QStringList>
 #include <QSet>
@@ -34,14 +34,12 @@
 class FileSystemWatcher: public QFileSystemWatcher {
   Q_OBJECT
 
-private:
 #ifndef Q_WS_WIN
-  QList<QDir> watched_folders;
+private:
+  QDir watched_folder;
   QPointer<QTimer> watch_timer;
-#endif
   QStringList filters;
 
-#ifndef Q_WS_WIN
 protected:
   bool isNetworkFileSystem(QString path) {
     QString file = path;
@@ -49,10 +47,10 @@ protected:
       file += QDir::separator();
     file += ".";
     struct statfs buf;
-    if(!statfs(file.toLocal8Bit().constData(), &buf)) {
+    if(!statfs(file.toLocal8Bit().data(), &buf)) {
       return (buf.f_type == (long)CIFS_MAGIC_NUMBER || buf.f_type == (long)NFS_SUPER_MAGIC);
     } else {
-      std::cerr << "Error: statfs() call failed for " << qPrintable(file) << ". Supposing it is a local folder..." << std::endl;
+      std::cerr << "Error: statfs() call failed for " << file.toLocal8Bit().data() << ". Supposing it is a local folder..." << std::endl;
       switch(errno) {
       case EACCES:
         std::cerr << "Search permission is denied for a component of the path prefix of the path" << std::endl;
@@ -100,7 +98,13 @@ protected:
 public:
   FileSystemWatcher(QObject *parent): QFileSystemWatcher(parent) {
     filters << "*.torrent";
-    connect(this, SIGNAL(directoryChanged(QString)), this, SLOT(scanLocalFolder(QString)));
+    connect(this, SIGNAL(directoryChanged(QString)), this, SLOT(scanFolder()));
+  }
+
+  FileSystemWatcher(QString path, QObject *parent): QFileSystemWatcher(parent) {
+    filters << "*.torrent";
+    connect(this, SIGNAL(directoryChanged(QString)), this, SLOT(scanFolder()));
+    addPath(path);
   }
 
   ~FileSystemWatcher() {
@@ -111,40 +115,33 @@ public:
   }
 
   QStringList directories() const {
-    QStringList dirs;
 #ifndef Q_WS_WIN
-    if(watch_timer) {
-      foreach (const QDir &dir, watched_folders)
-        dirs << dir.canonicalPath();
-    }
+    if(watch_timer)
+      return QStringList(watched_folder.path());
 #endif
-    dirs << QFileSystemWatcher::directories();
-    return dirs;
+    return QFileSystemWatcher::directories();
   }
 
   void addPath(const QString & path) {
 #ifndef Q_WS_WIN
-    QDir dir(path);
-    if (!dir.exists())
-      return;
+    watched_folder = QDir(path);
+    if(!watched_folder.exists()) return;
     // Check if the path points to a network file system or not
     if(isNetworkFileSystem(path)) {
       // Network mode
-      qDebug("Network folder detected: %s", qPrintable(path));
+      Q_ASSERT(!watch_timer);
+      qDebug("Network folder detected: %s", path.toLocal8Bit().data());
       qDebug("Using file polling mode instead of inotify...");
-      watched_folders << dir;
       // Set up the watch timer
-      if (!watch_timer) {
-        watch_timer = new QTimer(this);
-        connect(watch_timer, SIGNAL(timeout()), this, SLOT(scanNetworkFolders()));
-        watch_timer->start(5000); // 5 sec
-      }
+      watch_timer = new QTimer(this);
+      connect(watch_timer, SIGNAL(timeout()), this, SLOT(scanFolder()));
+      watch_timer->start(5000); // 5 sec
     } else {
 #endif
       // Normal mode
-      qDebug("FS Watching is watching %s in normal mode", qPrintable(path));
+      qDebug("FS Watching is watching %s in normal mode", path.toLocal8Bit().data());
       QFileSystemWatcher::addPath(path);
-      scanLocalFolder(path);
+      scanFolder();
 #ifndef Q_WS_WIN
     }
 #endif
@@ -152,65 +149,38 @@ public:
 
   void removePath(const QString & path) {
 #ifndef Q_WS_WIN
-    QDir dir(path);
-    for (int i = 0; i < watched_folders.count(); ++i) {
-      if (QDir(watched_folders.at(i)) == dir) {
-        watched_folders.removeAt(i);
-        if (watched_folders.isEmpty())
-          delete watch_timer;
-        return;
+    if(watch_timer) {
+      // Network mode
+      if(QDir(path) == watched_folder) {
+        delete watch_timer;
       }
+    } else {
+#endif
+      // Normal mode
+      QFileSystemWatcher::removePath(path);
+#ifndef Q_WS_WIN
     }
 #endif
-    // Normal mode
-    QFileSystemWatcher::removePath(path);
   }
 
 protected slots:
-  void scanLocalFolder(QString path) {
-    qDebug("scanLocalFolder(%s) called", qPrintable(path));
+  // XXX: Does not detect file size changes to improve performance.
+  void scanFolder() {
+    qDebug("Scan folder was called");
     QStringList torrents;
-    // Local folders scan
-    addTorrentsFromDir(QDir(path), torrents);
-    // Report detected torrent files
-    if(!torrents.empty()) {
-      qDebug("The following files are being reported: %s", qPrintable(torrents.join("\n")));
+    if(watch_timer) {
+      torrents = watched_folder.entryList(filters, QDir::Files, QDir::Unsorted);
+    } else {
+      torrents = QDir(QFileSystemWatcher::directories().first()).entryList(filters, QDir::Files, QDir::Unsorted);
+      qDebug("FSWatcher: Polling manually folder %s", QFileSystemWatcher::directories().first().toLocal8Bit().data());
+    }
+    if(!torrents.empty())
       emit torrentsAdded(torrents);
-    }
-  }
-
-  void scanNetworkFolders() {
-#ifndef Q_WS_WIN
-    qDebug("scanNetworkFolders() called");
-    QStringList torrents;
-    // Network folders scan
-    foreach (const QDir &dir, watched_folders) {
-      //qDebug("FSWatcher: Polling manually folder %s", qPrintable(dir.path()));
-      addTorrentsFromDir(dir, torrents);
-    }
-    // Report detected torrent files
-    if(!torrents.empty()) {
-      qDebug("The following files are being reported: %s", qPrintable(torrents.join("\n")));
-      emit torrentsAdded(torrents);
-    }
-#endif
   }
 
 signals:
   void torrentsAdded(QStringList &pathList);
 
-private:
-  void addTorrentsFromDir(const QDir &dir, QStringList &torrents) {
-    const QStringList files = dir.entryList(filters, QDir::Files, QDir::Unsorted);
-    foreach(const QString &file, files) {
-#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
-      torrents << dir.absoluteFilePath(file).replace("/", "\\");
-#else
-      torrents << dir.absoluteFilePath(file);
-#endif
-    }
-  }
-
 };
 
 #endif // FILESYSTEMWATCHER_H

src/filterparserthread.h

@@ -34,8 +34,7 @@
 #include <QThread>
 #include <QFile>
 #include <QDataStream>
-#include <QRegExp>
-#include <QStringList>
+#include <QMessageBox>
 
 #include <libtorrent/session.hpp>
 #include <libtorrent/ip_filter.hpp>
@@ -72,7 +71,7 @@ class FilterParserThread : public QThread  {
           // PeerGuardian p2p file
           parseP2PFilterFile(filePath);
         } else {
-            if(filePath.endsWith(".p2b", Qt::CaseInsensitive)) {
+            if(filePath.endsWith(".p2p", Qt::CaseInsensitive)) {
               // PeerGuardian p2b file
               parseP2BFilterFile(filePath);
             } else {
@@ -104,7 +103,7 @@ class FilterParserThread : public QThread  {
       QFile file(filePath);
       if (file.exists()){
         if(!file.open(QIODevice::ReadOnly | QIODevice::Text)){
-          std::cerr << "I/O Error: Could not open ip filer file in read mode." << std::endl;
+          QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("Couldn't open %1 in read mode.").arg(filePath));
           return;
         }
         unsigned int nbLine = 0;
@@ -225,7 +224,7 @@ class FilterParserThread : public QThread  {
       QStringList IP;
       if (file.exists()){
         if(!file.open(QIODevice::ReadOnly | QIODevice::Text)){
-          std::cerr << "I/O Error: Could not open ip filer file in read mode." << std::endl;
+          QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("Couldn't open %1 in read mode.").arg(filePath));
           return;
         }
         unsigned int nbLine = 0;
@@ -293,7 +292,7 @@ class FilterParserThread : public QThread  {
       QFile file(filePath);
       if (file.exists()){
         if(!file.open(QIODevice::ReadOnly)){
-          std::cerr << "I/O Error: Could not open ip filer file in read mode." << std::endl;
+          QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("Couldn't open %1 in read mode.").arg(filePath));
           return;
         }
         QDataStream stream(&file);
@@ -305,7 +304,7 @@ class FilterParserThread : public QThread  {
                 memcmp(buf, "\xFF\xFF\xFF\xFFP2B", 7) ||
                 !stream.readRawData((char*)&version, sizeof(version))
         ) {
-          std::cerr << "Parsing Error: The filter file is not a valid PeerGuardian P2B file." << std::endl;
+          QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("%1 is not a valid PeerGuardian P2B file.").arg(filePath));
           return;
         }
     
@@ -319,7 +318,7 @@ class FilterParserThread : public QThread  {
               !stream.readRawData((char*)&start, sizeof(start)) ||
               !stream.readRawData((char*)&end, sizeof(end))
             ) {
-              std::cerr << "Parsing Error: The filter file is not a valid PeerGuardian P2B file." << std::endl;
+              QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("%1 is not a valid PeerGuardian P2B file.").arg(filePath));
               return;
             }
             // Network byte order to Host byte order
@@ -335,7 +334,7 @@ class FilterParserThread : public QThread  {
           qDebug ("p2b version 3");
           unsigned int namecount;
           if(!stream.readRawData((char*)&namecount, sizeof(namecount))) {
-            std::cerr << "Parsing Error: The filter file is not a valid PeerGuardian P2B file." << std::endl;
+            QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("%1 is not a valid PeerGuardian P2B file.").arg(filePath));
             return;
           }
           namecount=ntohl(namecount);
@@ -343,7 +342,7 @@ class FilterParserThread : public QThread  {
           for(unsigned int i=0; i<namecount; i++) {
             string name;
             if(!getlineInStream(stream, name, '\0')) {
-              std::cerr << "Parsing Error: The filter file is not a valid PeerGuardian P2B file." << std::endl;
+              QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("%1 is not a valid PeerGuardian P2B file.").arg(filePath));
               return;
             }
             if(abort) return;
@@ -351,7 +350,7 @@ class FilterParserThread : public QThread  {
           // Reading the ranges
           unsigned int rangecount;
           if(!stream.readRawData((char*)&rangecount, sizeof(rangecount))) {
-            std::cerr << "Parsing Error: The filter file is not a valid PeerGuardian P2B file." << std::endl;
+            QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("%1 is not a valid PeerGuardian P2B file.").arg(filePath));
             return;
           }
           rangecount=ntohl(rangecount);
@@ -364,7 +363,7 @@ class FilterParserThread : public QThread  {
               !stream.readRawData((char*)&start, sizeof(start)) ||
               !stream.readRawData((char*)&end, sizeof(end))
             ) {
-              std::cerr << "Parsing Error: The filter file is not a valid PeerGuardian P2B file." << std::endl;
+              QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("%1 is not a valid PeerGuardian P2B file.").arg(filePath));
               return;
             }
             // Network byte order to Host byte order
@@ -377,7 +376,7 @@ class FilterParserThread : public QThread  {
             if(abort) return;
           }
         } else {
-          std::cerr << "Parsing Error: The filter file is not a valid PeerGuardian P2B file." << std::endl;
+          QMessageBox::critical(0, tr("I/O Error", "Input/Output Error"), tr("%1 is not a valid PeerGuardian P2B file.").arg(filePath));
           return;
         }
         file.close();

src/geoip.h

@@ -40,62 +40,68 @@
 
 using namespace libtorrent;
 
-class GeoIP : public QObject {
-  Q_OBJECT
+// TODO: Update from Internet
+class GeoIP {
 protected:
-#ifdef WITH_GEOIP_EMBEDDED
   static QString geoipFolder(bool embedded=false) {
     if(embedded)
       return ":/geoip/";
-    return misc::QDesktopServicesDataLocation()+"geoip"+QDir::separator();
-#else
-  static QString geoipFolder(bool) {
-    if(QFile::exists("/usr/local/share/GeoIP/GeoIP.dat"))
-      return "/usr/local/share/GeoIP/";
-    if(QFile::exists("/var/lib/GeoIP/GeoIP.dat"))
-      return "/var/lib/GeoIP/";
-    return "/usr/share/GeoIP/";
-#endif
+    return misc::qBittorrentPath()+"geoip"+QDir::separator();
   }
 
   static QString geoipDBpath(bool embedded=false) {
     return geoipFolder(embedded)+"GeoIP.dat";
   }
 
-#ifdef WITH_GEOIP_EMBEDDED
-  static void exportEmbeddedDb() {
-    if(!QFile::exists(geoipDBpath(false)) || QFile(geoipDBpath(false)).size() != QFile(geoipDBpath(true)).size()) { // Export is required
+  static QString geoipVersionPath(bool embedded=false) {
+    return geoipFolder(embedded)+"VERSION";
+  }
+
+  static int getDBVersion(bool embedded = false) {
+    QFile vFile(geoipVersionPath(embedded));
+    qDebug("Reading file at %s", geoipVersionPath(embedded).toLocal8Bit().data());
+    if(vFile.exists() && vFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+      qDebug("File exists and was opened");
+      QByteArray v = vFile.readAll().trimmed();
+      /*while(!v.isEmpty() && v[0] == '0') {
+        v = v.mid(1);
+      }*/
+      qDebug("Read version: %s", v.data());
+      bool ok = false;
+      int version = v.toInt(&ok);
+      qDebug("Read version %d (Error? %d)", version, (int) !ok);
+      if(ok) return version;
+    }
+    return 0;
+  }
+
+  static void updateLocalDb() {
+    if(getDBVersion(true) > getDBVersion(false)) { // Update required
       qDebug("A local Geoip database update is required, proceeding...");
       // Create geoip folder is necessary
       QDir gfolder(geoipFolder(false));
       if(!gfolder.exists()) {
-          if(!gfolder.mkpath(geoipFolder(false))) {
-              std::cerr << "Failed to create geoip folder at " << qPrintable(geoipFolder(false)) << std::endl;
-              return;
-          }
+        if(!gfolder.mkpath(geoipFolder(false))) return;
       }
       // Remove destination files
       if(QFile::exists(geoipDBpath(false)))
-        misc::safeRemove(geoipDBpath(false));
+        QFile::remove(geoipDBpath(false));
+      if(QFile::exists(geoipVersionPath(false)))
+        QFile::remove(geoipVersionPath(false));
       // Copy from executable to hard disk
-      qDebug("%s -> %s", qPrintable(geoipDBpath(true)), qPrintable(geoipDBpath(false)));
-      if(!QFile::copy(geoipDBpath(true), geoipDBpath(false))) {
-          std::cerr << "ERROR: Failed to copy geoip.dat from executable to hard disk" << std::endl;
-      }
+      QFile::copy(geoipDBpath(true), geoipDBpath(false));
+      QFile::copy(geoipVersionPath(true), geoipVersionPath(false));
       qDebug("Local Geoip database was updated");
     }
   }
-#endif
 
 public:
   static void loadDatabase(session *s) {
- #ifdef WITH_GEOIP_EMBEDDED
-    exportEmbeddedDb();
-#endif
+    updateLocalDb();
     if(QFile::exists(geoipDBpath(false))) {
-      qDebug("Loading GeoIP database from %s...", qPrintable(geoipDBpath(false)));
-      if(!s->load_country_db(geoipDBpath(false).toLocal8Bit().constData())) {
-        std::cerr << "Failed to load Geoip Database at " << qPrintable(geoipDBpath(false)) << std::endl;
+      qDebug("Loading GeoIP database from %s...", geoipDBpath(false).toLocal8Bit().data());
+      if(!s->load_country_db(geoipDBpath(false).toLocal8Bit().data())) {
+        std::cerr << "Failed to load Geoip Database at " << geoipDBpath(false).toLocal8Bit().data() << std::endl;
       }
     } else {
       qDebug("ERROR: Impossible to find local Geoip Database");
@@ -104,7 +110,7 @@ public:
 
   // TODO: Support more countries
   // http://www.iso.org/iso/country_codes/iso_3166_code_lists/english_country_names_and_code_elements.htm
-  static QIcon CountryISOCodeToIcon(const char* iso, QString &country_name) {
+  static QIcon CountryISOCodeToIcon(char* iso) {
     switch(iso[0]) {
     case 0:
     case '-':
@@ -112,107 +118,106 @@ public:
       //qDebug("Not returning any icon because iso is invalid: %s", iso);
       return QIcon();
     case 'A':
-      if(iso[1] == 'U') { country_name = tr("Australia"); return QIcon(":/Icons/flags/australia.png"); }
-      if(iso[1] == 'R') { country_name = tr("Argentina"); return QIcon(":/Icons/flags/argentina.png"); }
-      if(iso[1] == 'T') { country_name = tr("Austria"); return QIcon(":/Icons/flags/austria.png"); }
-      if(iso[1] == 'E') { country_name = tr("United Arab Emirates"); return QIcon(":/Icons/flags/united_arab_emirates.png"); }
+      if(iso[1] == 'U') return QIcon(":/Icons/flags/australia.png");
+      if(iso[1] == 'R') return QIcon(":/Icons/flags/argentina.png");
+      if(iso[1] == 'T') return QIcon(":/Icons/flags/austria.png");
+      if(iso[1] == 'E') return QIcon(":/Icons/flags/united_arab_emirates.png");
       break;
     case 'B':
-      if(iso[1] == 'R') { country_name = tr("Brazil"); return QIcon(":/Icons/flags/brazil.png"); }
-      if(iso[1] == 'G') { country_name = tr("Bulgaria"); return QIcon(":/Icons/flags/bulgaria.png"); }
-      if(iso[1] == 'Y') { country_name = tr("Belarus"); return QIcon(":/Icons/flags/belarus.png"); }
-      if(iso[1] == 'E') { country_name = tr("Belgium"); return QIcon(":/Icons/flags/belgium.png"); }
-      if(iso[1] == 'A') { country_name = tr("Bosnia"); return QIcon(":/Icons/flags/bosnia.png"); }
+      if(iso[1] == 'R') return QIcon(":/Icons/flags/brazil.png");
+      if(iso[1] == 'G') return QIcon(":/Icons/flags/bulgaria.png");
+      if(iso[1] == 'Y') return QIcon(":/Icons/flags/belarus.png");
+      if(iso[1] == 'E') return QIcon(":/Icons/flags/belgium.png");
+      if(iso[1] == 'A') return QIcon(":/Icons/flags/bosnia.png");
       break;
     case 'C':
-      if(iso[1] == 'A') { country_name = tr("Canada"); return QIcon(":/Icons/flags/canada.png"); }
-      if(iso[1] == 'Z') { country_name = tr("Czech Republic"); return QIcon(":/Icons/flags/czech.png"); }
-      if(iso[1] == 'N') { country_name = tr("China"); return QIcon(":/Icons/flags/china.png"); }
-      if(iso[1] == 'R') { country_name = tr("Costa Rica"); return QIcon(":/Icons/flags/costa_rica.png"); }
-      if(iso[1] == 'H') { country_name = tr("Switzerland"); return QIcon(":/Icons/flags/suisse.png"); }
+      if(iso[1] == 'A') return QIcon(":/Icons/flags/canada.png");
+      if(iso[1] == 'Z') return QIcon(":/Icons/flags/czech.png");
+      if(iso[1] == 'N') return QIcon(":/Icons/flags/china.png");
+      if(iso[1] == 'R') return QIcon(":/Icons/flags/costa_rica.png");
+      if(iso[1] == 'H') return QIcon(":/Icons/flags/suisse.png");
       break;
     case 'D':
-      if(iso[1] == 'E') { country_name = tr("Germany"); return QIcon(":/Icons/flags/germany.png"); }
-      if(iso[1] == 'K') { country_name = tr("Denmark"); return QIcon(":/Icons/flags/denmark.png"); }
-      if(iso[1] == 'Z') { country_name = tr("Algeria"); return QIcon(":/Icons/flags/algeria.png"); }
+      if(iso[1] == 'E') return QIcon(":/Icons/flags/germany.png");
+      if(iso[1] == 'K') return QIcon(":/Icons/flags/denmark.png");
+      if(iso[1] == 'Z') return QIcon(":/Icons/flags/algeria.png");
       break;
     case 'E':
-      if(iso[1] == 'S') { country_name = tr("Spain"); return QIcon(":/Icons/flags/spain.png"); }
-      if(iso[1] == 'G') { country_name = tr("Egypt"); return QIcon(":/Icons/flags/egypt.png"); }
+      if(iso[1] == 'S') return QIcon(":/Icons/flags/spain.png");
+      if(iso[1] == 'G') return QIcon(":/Icons/flags/egypt.png");
       break;
     case 'F':
-      if(iso[1] == 'I') { country_name = tr("Finland"); return QIcon(":/Icons/flags/finland.png"); }
-      if(iso[1] == 'R') { country_name = tr("France"); return QIcon(":/Icons/flags/france.png"); }
+      if(iso[1] == 'I') return QIcon(":/Icons/flags/finland.png");
+      if(iso[1] == 'R') return QIcon(":/Icons/flags/france.png");
       break;
     case 'G':
-      if(iso[1] == 'B') { country_name = tr("United Kingdom"); return QIcon(":/Icons/flags/united_kingdom.png"); }
-      if(iso[1] == 'R') { country_name = tr("Greece"); return QIcon(":/Icons/flags/greece.png"); }
-      if(iso[1] == 'E') { country_name = tr("Georgia"); return QIcon(":/Icons/flags/georgia.png"); }
+      if(iso[1] == 'B') return QIcon(":/Icons/flags/united_kingdom.png");
+      if(iso[1] == 'R') return QIcon(":/Icons/flags/greece.png");
+      if(iso[1] == 'E') return QIcon(":/Icons/flags/georgia.png");
       break;
     case 'H':
-      if(iso[1] == 'U') { country_name = tr("Hungary"); return QIcon(":/Icons/flags/hungary.png"); }
-      if(iso[1] == 'K') { country_name = tr("China"); return QIcon(":/Icons/flags/china.png"); }
-      if(iso[1] == 'R') { country_name = tr("Croatia"); return QIcon(":/Icons/flags/croatia.png"); }
+      if(iso[1] == 'U') return QIcon(":/Icons/flags/hungary.png");
+      if(iso[1] == 'K') return QIcon(":/Icons/flags/china.png");
+      if(iso[1] == 'R') return QIcon(":/Icons/flags/croatia.png");
       break;
     case 'I':
-      if(iso[1] == 'T') { country_name = tr("Italy"); return QIcon(":/Icons/flags/italy.png"); }
-      if(iso[1] == 'N') { country_name = tr("India"); return QIcon(":/Icons/flags/india.png"); }
-      if(iso[1] == 'L') { country_name = tr("Israel"); return QIcon(":/Icons/flags/israel.png"); }
-      if(iso[1] == 'E') { country_name = tr("Ireland"); return QIcon(":/Icons/flags/ireland.png"); }
-      if(iso[1] == 'S') { country_name = tr("Iceland"); return QIcon(":/Icons/flags/iceland.png"); }
-      if(iso[1] == 'D') { country_name = tr("Indonesia"); return QIcon(":/Icons/flags/indonesia.png"); }
+      if(iso[1] == 'T') return QIcon(":/Icons/flags/italy.png");
+      if(iso[1] == 'N') return QIcon(":/Icons/flags/india.png");
+      if(iso[1] == 'L') return QIcon(":/Icons/flags/israel.png");
+      if(iso[1] == 'E') return QIcon(":/Icons/flags/ireland.png");
+      if(iso[1] == 'S') return QIcon(":/Icons/flags/iceland.png");
+      if(iso[1] == 'D') return QIcon(":/Icons/flags/indonesia.png");
       break;
     case 'J':
-      if(iso[1] == 'P') { country_name = tr("Japan"); return QIcon(":/Icons/flags/japan.png"); }
+      if(iso[1] == 'P') return QIcon(":/Icons/flags/japan.png");
       break;
     case 'K':
-      if(iso[1] == 'R') { country_name = tr("South Korea"); return QIcon(":/Icons/flags/south_korea.png"); }
+      if(iso[1] == 'R') return QIcon(":/Icons/flags/south_korea.png");
       break;
     case 'L':
-      if(iso[1] == 'U') { country_name = tr("Luxembourg"); return QIcon(":/Icons/flags/luxembourg.png"); }
+      if(iso[1] == 'U') return QIcon(":/Icons/flags/luxembourg.png");
       break;
     case 'M':
-      if(iso[1] == 'Y') { country_name = tr("Malaysia"); return QIcon(":/Icons/flags/malaysia.png"); }
-      if(iso[1] == 'X') { country_name = tr("Mexico"); return QIcon(":/Icons/flags/mexico.png"); }
-      if(iso[1] == 'E') { country_name = tr("Serbia"); return QIcon(":/Icons/flags/serbia.png"); }
-      if(iso[1] == 'A') { country_name = tr("Morocco"); return QIcon(":/Icons/flags/morocco.png"); }
+      if(iso[1] == 'Y') return QIcon(":/Icons/flags/malaysia.png");
+      if(iso[1] == 'X') return QIcon(":/Icons/flags/mexico.png");
+      if(iso[1] == 'E') return QIcon(":/Icons/flags/serbia.png");
+      if(iso[1] == 'A') return QIcon(":/Icons/flags/morocco.png");
       break;
     case 'N':
-      if(iso[1] == 'L') { country_name = tr("Netherlands"); return QIcon(":/Icons/flags/netherlands.png"); }
-      if(iso[1] == 'O') { country_name = tr("Norway"); return QIcon(":/Icons/flags/norway.png"); }
-      if(iso[1] == 'Z') { country_name = tr("New Zealand"); return QIcon(":/Icons/flags/newzealand.png"); }
+      if(iso[1] == 'L') return QIcon(":/Icons/flags/netherlands.png");
+      if(iso[1] == 'O') return QIcon(":/Icons/flags/norway.png");
+      if(iso[1] == 'Z') return QIcon(":/Icons/flags/newzealand.png");
       break;
     case 'P':
-      if(iso[1] == 'T') { country_name = tr("Portugal"); return QIcon(":/Icons/flags/portugal.png"); }
-      if(iso[1] == 'L') { country_name = tr("Poland"); return QIcon(":/Icons/flags/poland.png"); }
-      if(iso[1] == 'K') { country_name = tr("Pakistan"); return QIcon(":/Icons/flags/pakistan.png"); }
-      if(iso[1] == 'H') { country_name = tr("Philippines"); return QIcon(":/Icons/flags/philippines.png"); }
+      if(iso[1] == 'T') return QIcon(":/Icons/flags/portugal.png");
+      if(iso[1] == 'L') return QIcon(":/Icons/flags/poland.png");
+      if(iso[1] == 'K') return QIcon(":/Icons/flags/pakistan.png");
+      if(iso[1] == 'H') return QIcon(":/Icons/flags/philippines.png");
       break;
     case 'R':
-      if(iso[1] == 'U') { country_name = tr("Russia"); return QIcon(":/Icons/flags/russia.png"); }
-      if(iso[1] == 'O') { country_name = tr("Romania"); return QIcon(":/Icons/flags/romania.png"); }
-      if(iso[1] == 'E') { country_name = tr("France (Reunion Island)"); return QIcon(":/Icons/flags/france.png"); }
-      if(iso[1] == 'S') { country_name = tr("Serbia"); return QIcon(":/Icons/flags/serbia.png"); }
+      if(iso[1] == 'U') return QIcon(":/Icons/flags/russia.png");
+      if(iso[1] == 'O') return QIcon(":/Icons/flags/romania.png");
+      if(iso[1] == 'E') return QIcon(":/Icons/flags/france.png");
+      if(iso[1] == 'S') return QIcon(":/Icons/flags/serbia.png");
       break;
     case 'S':
-      if(iso[1] == 'A') { country_name = tr("Saudi Arabia"); return QIcon(":/Icons/flags/saoudi_arabia.png"); }
-      if(iso[1] == 'E') { country_name = tr("Sweden"); return QIcon(":/Icons/flags/sweden.png"); }
-      if(iso[1] == 'K') { country_name = tr("Slovakia"); return QIcon(":/Icons/flags/slovakia.png"); }
-      if(iso[1] == 'G') { country_name = tr("Singapore"); return QIcon(":/Icons/flags/singapore.png"); }
-      if(iso[1] == 'I') { country_name = tr("Slovenia"); return QIcon(":/Icons/flags/slovenia.png"); }
+      if(iso[1] == 'E') return QIcon(":/Icons/flags/sweden.png");
+      if(iso[1] == 'K') return QIcon(":/Icons/flags/slovakia.png");
+      if(iso[1] == 'G') return QIcon(":/Icons/flags/singapore.png");
+      if(iso[1] == 'I') return QIcon(":/Icons/flags/slovenia.png");
       break;
     case 'T':
-      if(iso[1] == 'W') { country_name = tr("Taiwan"); return QIcon(":/Icons/flags/china.png"); }
-      if(iso[1] == 'R') { country_name = tr("Turkey"); return QIcon(":/Icons/flags/turkey.png"); }
-      if(iso[1] == 'H') { country_name = tr("Thailand"); return QIcon(":/Icons/flags/thailand.png"); }
+      if(iso[1] == 'W') return QIcon(":/Icons/flags/china.png");
+      if(iso[1] == 'R') return QIcon(":/Icons/flags/turkey.png");
+      if(iso[1] == 'H') return QIcon(":/Icons/flags/thailand.png");
       break;
     case 'U':
-      if(iso[1] == 'S') { country_name = tr("USA"); return QIcon(":/Icons/flags/usa.png"); }
-      if(iso[1] == 'M') { country_name = tr("USA"); return QIcon(":/Icons/flags/usa.png"); }
-      if(iso[1] == 'A') { country_name = tr("Ukraine"); return QIcon(":/Icons/flags/ukraine.png"); }
+      if(iso[1] == 'S') return QIcon(":/Icons/flags/usa.png");
+      if(iso[1] == 'M') return QIcon(":/Icons/flags/usa.png");
+      if(iso[1] == 'A') return QIcon(":/Icons/flags/ukraine.png");
       break;
     case 'Z':
-      if(iso[1] == 'A') { country_name = tr("South Africa"); return QIcon(":/Icons/flags/south_africa.png"); }
+      if(iso[1] == 'A') return QIcon(":/Icons/flags/south_africa.png");
       break;
     }
     qDebug("Unrecognized country code: %c%c", iso[0], iso[1]);

src/geoip.qrc

@@ -1,5 +1,7 @@
-<RCC>
-    <qresource>
-        <file>geoip/GeoIP.dat</file>
-    </qresource>
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+  <file>geoip/GeoIP.dat</file>
+  <file>geoip/VERSION</file>
+</qresource>
 </RCC>
+

src/geoip/LICENSE.txt

@@ -0,0 +1,39 @@
+There are two licenses, one for the C library software, and one for
+the database.
+
+SOFTWARE LICENSE (C library)
+
+The GeoIP C Library is licensed under the LGPL.  For details see
+the COPYING file.
+
+OPEN DATA LICENSE (GeoLite Country and GeoLite City databases)
+
+Copyright (c) 2008 MaxMind, Inc.  All Rights Reserved.
+
+All advertising materials and documentation mentioning features or use of
+this database must display the following acknowledgment:
+"This product includes GeoLite data created by MaxMind, available from
+http://maxmind.com/"
+
+Redistribution and use with or without modification, are permitted provided
+that the following conditions are met:
+1. Redistributions must retain the above copyright notice, this list of
+conditions and the following disclaimer in the documentation and/or other
+materials provided with the distribution. 
+2. All advertising materials and documentation mentioning features or use of
+this database must display the following acknowledgement:
+"This product includes GeoLite data created by MaxMind, available from
+http://maxmind.com/"
+3. "MaxMind" may not be used to endorse or promote products derived from this
+database without specific prior written permission.
+
+THIS DATABASE IS PROVIDED BY MAXMIND, INC ``AS IS'' AND ANY 
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL MAXMIND BE LIABLE FOR ANY 
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+DATABASE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

src/geoip/README

@@ -1,12 +0,0 @@
-If you wish to embed GeoIP database into qBittorrent executable, please download put GeoIP.dat in this folder.
-
-GeoIP Database can be downloaded from here:
-* http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz
-Note that the database should be uncompressed.
-
-Embedding GeoIP database into qBittorrent executable is advised for:
-* Windows
-* Mac OS X
-* Linux distributions that don't provide GeoIP database in a separate package
-
-On Linux operating system, since this is not the default behavior, you also need to pass --with-geoip-database-embedded parameter to the configure file.

src/geoip/VERSION

@@ -0,0 +1 @@
+0911

src/headlessloader.h

@@ -1,110 +0,0 @@
-/*
- * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2006  Christophe Dumez, Frédéric Lassabe
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * In addition, as a special exception, the copyright holders give permission to
- * link this program with the OpenSSL project's "OpenSSL" library (or with
- * modified versions of it that use the same license as the "OpenSSL" library),
- * and distribute the linked executables. You must obey the GNU General Public
- * License in all respects for all of the code used other than "OpenSSL".  If you
- * modify file(s), you may extend this exception to your version of the file(s),
- * but you are not obligated to do so. If you do not wish to do so, delete this
- * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
- */
-
-#ifndef HEADLESSLOADER_H
-#define HEADLESSLOADER_H
-
-#include <QObject>
-#include <QCoreApplication>
-#include "preferences.h"
-#include "bittorrent.h"
-
-class HeadlessLoader: public QObject {
-  Q_OBJECT
-
-public:
-  HeadlessLoader(QStringList torrentCmdLine) {
-    // Enable Web UI
-    Preferences::setWebUiEnabled(true);
-    // Instanciate Bittorrent Object
-    BTSession = new Bittorrent();
-    connect(BTSession, SIGNAL(newConsoleMessage(QString)), this, SLOT(displayConsoleMessage(QString)));
-    // Resume unfinished torrents
-    BTSession->startUpTorrents();
-    // Process command line parameters
-    processParams(torrentCmdLine);
-    // Display some information to the user
-    std::cout << std::endl << "******** " << qPrintable(tr("Information")) << " ********" << std::endl;
-    std::cout << qPrintable(tr("To control qBittorrent, access the Web UI at http://localhost:%1").arg(QString::number(Preferences::getWebUiPort()))) << std::endl;
-    std::cout << qPrintable(tr("The Web UI administrator user name is: %1").arg(Preferences::getWebUiUsername())) << std::endl;
-    if(Preferences::getWebUiPassword() == "f6fdffe48c908deb0f4c3bd36c032e72") {
-      std::cout << qPrintable(tr("The Web UI administrator password is still the default one: %1").arg("adminadmin")) << std::endl;
-      std::cout << qPrintable(tr("This is a security risk, please consider changing your password from program preferences.")) << std::endl;
-    }
-  }
-
-  ~HeadlessLoader() {
-    delete BTSession;
-  }
-
-public slots:
-  // Call this function to exit qBittorrent headless loader
-  // and return to prompt (object will be deleted by main)
-  void exit() {
-    qApp->quit();
-  }
-
-  void displayConsoleMessage(QString msg) {
-    std::cout << qPrintable(msg) << std::endl;
-  }
-
-  void processParams(const QString& params_str) {
-    processParams(params_str.split(" ", QString::SkipEmptyParts));
-  }
-
-  // As program parameters, we can get paths or urls.
-  // This function parse the parameters and call
-  // the right addTorrent function, considering
-  // the parameter type.
-  void processParams(const QStringList& params) {
-    foreach(QString param, params) {
-      param = param.trimmed();
-      if(param.startsWith(QString::fromUtf8("http://"), Qt::CaseInsensitive) || param.startsWith(QString::fromUtf8("ftp://"), Qt::CaseInsensitive) || param.startsWith(QString::fromUtf8("https://"), Qt::CaseInsensitive)) {
-        BTSession->downloadFromUrl(param);
-      }else{
-        if(param.startsWith("bc://bt/", Qt::CaseInsensitive)) {
-          qDebug("Converting bc link to magnet link");
-          param = misc::bcLinkToMagnet(param);
-        }
-        if(param.startsWith("magnet:", Qt::CaseInsensitive)) {
-          BTSession->addMagnetUri(param);
-        } else {
-          BTSession->addTorrent(param);
-        }
-      }
-    }
-  }
-
-private:
-  Bittorrent *BTSession;
-
-};
-
-#endif

src/hidabletabwidget.h

@@ -1,44 +0,0 @@
-/*
- * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2006  Christophe Dumez
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * In addition, as a special exception, the copyright holders give permission to
- * link this program with the OpenSSL project's "OpenSSL" library (or with
- * modified versions of it that use the same license as the "OpenSSL" library),
- * and distribute the linked executables. You must obey the GNU General Public
- * License in all respects for all of the code used other than "OpenSSL".  If you
- * modify file(s), you may extend this exception to your version of the file(s),
- * but you are not obligated to do so. If you do not wish to do so, delete this
- * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
- */
-
-#ifndef HIDABLETABWIDGET_H
-#define HIDABLETABWIDGET_H
-
-#include <QTabWidget>
-#include <QTabBar>
-
-class HidableTabWidget : public QTabWidget {
-public:
-  void showTabBar(bool show) {
-    tabBar()->setVisible(show);
-  }
-};
-
-#endif // HIDABLETABWIDGET_H

src/httpconnection.cpp

@@ -35,7 +35,6 @@
 #include "preferences.h"
 #include "json.h"
 #include "bittorrent.h"
-#include "misc.h"
 #include <QTcpSocket>
 #include <QDateTime>
 #include <QStringList>
@@ -104,12 +103,12 @@ void HttpConnection::write()
 }
 
 QString HttpConnection::translateDocument(QString data) {
-  std::string contexts[] = {"TransferListFiltersWidget", "TransferListWidget", "PropertiesWidget", "GUI", "MainWindow", "HttpServer", "confirmDeletionDlg", "TrackerList", "TorrentFilesModel", "options_imp", "Preferences", "TrackersAdditionDlg", "ScanFoldersModel"};
+  std::string contexts[] = {"TransferListFiltersWidget", "TransferListWidget", "PropertiesWidget", "GUI", "MainWindow", "HttpServer", "confirmDeletionDlg", "TrackerList", "TorrentFilesModel", "options_imp"};
   int i=0;
   bool found = false;
   do {
     found = false;
-    QRegExp regex(QString::fromUtf8("_\\(([\\w\\s?!:\\/\\(\\),%µ&\\-\\.]+)\\)"));
+    QRegExp regex("_\\(([\\w\\s?!:\\/\\(\\)\\.]+)\\)");
     i = regex.indexIn(data, i);
     if(i >= 0) {
       //qDebug("Found translatable string: %s", regex.cap(1).toUtf8().data());
@@ -117,11 +116,9 @@ QString HttpConnection::translateDocument(QString data) {
       QString translation = word;
       int context_index= 0;
       do {
-        translation = qApp->translate(contexts[context_index].c_str(), word.toLocal8Bit().constData(), 0, QCoreApplication::UnicodeUTF8, 1);
+        translation = qApp->translate(contexts[context_index].c_str(), word.toLocal8Bit().data(), 0, QCoreApplication::UnicodeUTF8, 1);
         ++context_index;
-      }while(translation == word && context_index < 13);
-      // Remove keyboard shortcuts
-      translation = translation.replace("&", "");
+      }while(translation == word && context_index < 10);
       //qDebug("Translation is %s", translation.toUtf8().data());
       data = data.replace(i, regex.matchedLength(), translation);
       i += translation.length();
@@ -131,54 +128,18 @@ QString HttpConnection::translateDocument(QString data) {
   return data;
 }
 
-void HttpConnection::respond() {
+void HttpConnection::respond()
+{
   //qDebug("Respond called");
-  const QString peer_ip = socket->peerAddress().toString();
-  const int nb_fail = parent->NbFailedAttemptsForIp(peer_ip);
-  if(nb_fail >= MAX_AUTH_FAILED_ATTEMPTS) {
-    generator.setStatusLine(403, "Forbidden");
-    generator.setMessage(tr("Your IP address has been banned after too many failed authentication attempts."));
-    write();
-    return;
-  }
-  QString auth = parser.value("Authorization");
-  if(auth.isEmpty()) {
-    // Return unauthorized header
-    qDebug("Auth is Empty...");
+  QStringList auth = parser.value("Authorization").split(" ", QString::SkipEmptyParts);
+  if (auth.size() != 2 || QString::compare(auth[0], "Basic", Qt::CaseInsensitive) != 0 || !parent->isAuthorized(auth[1].toLocal8Bit()))
+  {
     generator.setStatusLine(401, "Unauthorized");
-    generator.setValue("WWW-Authenticate",  "Digest realm=\""+QString(QBT_REALM)+"\", nonce=\""+parent->generateNonce()+"\", opaque=\""+parent->generateNonce()+"\", stale=\"false\", algorithm=\"MD5\", qop=\"auth\"");
+    generator.setValue("WWW-Authenticate",  "Basic realm=\"you know what\"");
     write();
     return;
   }
-  //qDebug("Auth: %s", qPrintable(auth.split(" ").first()));
-  if (QString::compare(auth.split(" ").first(), "Digest", Qt::CaseInsensitive) != 0 || !parent->isAuthorized(auth.toLocal8Bit(), parser.method())) {
-    // Update failed attempt counter
-    parent->increaseNbFailedAttemptsForIp(peer_ip);
-    qDebug("client IP: %s (%d failed attempts)", qPrintable(peer_ip), nb_fail+1);
-    // Return unauthorized header
-    generator.setStatusLine(401, "Unauthorized");
-    generator.setValue("WWW-Authenticate",  "Digest realm=\""+QString(QBT_REALM)+"\", nonce=\""+parent->generateNonce()+"\", opaque=\""+parent->generateNonce()+"\", stale=\"false\", algorithm=\"MD5\", qop=\"auth\"");
-    write();
-    return;
-  }
-  // Client successfully authenticated, reset number of failed attempts
-  parent->resetNbFailedAttemptsForIp(peer_ip);
   QString url  = parser.url();
-  // Favicon
-  if(url.endsWith("favicon.ico")) {
-    qDebug("Returning favicon");
-    QFile favicon(":/Icons/skin/qbittorrent16.png");
-    if(favicon.open(QIODevice::ReadOnly)) {
-      QByteArray data = favicon.readAll();
-      generator.setStatusLine(200, "OK");
-      generator.setContentTypeByExt("png");
-      generator.setMessage(data);
-      write();
-    } else {
-      respondNotFound();
-    }
-    return;
-  }
   QStringList list = url.split('/', QString::SkipEmptyParts);
   if (list.contains(".") || list.contains(".."))
   {
@@ -215,10 +176,6 @@ void HttpConnection::respond() {
       } else {
         if(list[1] == "preferences") {
           respondPreferencesJson();
-        } else {
-          if(list[1] == "transferInfo") {
-            respondGlobalTransferInfoJson();
-          }
         }
       }
     }
@@ -239,7 +196,6 @@ void HttpConnection::respond() {
   QFile file(url);
   if(!file.open(QIODevice::ReadOnly))
   {
-    qDebug("File %s was not found!", qPrintable(url));
     respondNotFound();
     return;
   }
@@ -251,7 +207,7 @@ void HttpConnection::respond() {
     ext.clear();
   QByteArray data = file.readAll();
   // Translate the page
-  if(ext == "html" || (ext == "js" && !list.last().startsWith("excanvas"))) {
+  if(ext == "html" || ext == "js") {
     data = translateDocument(QString::fromUtf8(data.data())).toUtf8();
   }
   generator.setStatusLine(200, "OK");
@@ -312,18 +268,6 @@ void HttpConnection::respondPreferencesJson() {
   write();
 }
 
-void HttpConnection::respondGlobalTransferInfoJson() {
-  QVariantMap info;
-  session_status sessionStatus = BTSession->getSessionStatus();
-  info["DlInfos"] = tr("D: %1/s - T: %2", "Download speed: x KiB/s - Transferred: x MiB").arg(misc::friendlyUnit(sessionStatus.payload_download_rate)).arg(misc::friendlyUnit(sessionStatus.total_payload_download));
-  info["UpInfos"] = tr("U: %1/s - T: %2", "Upload speed: x KiB/s - Transferred: x MiB").arg(misc::friendlyUnit(sessionStatus.payload_upload_rate)).arg(misc::friendlyUnit(sessionStatus.total_payload_upload));
-  QString string = json::toJson(info);
-  generator.setStatusLine(200, "OK");
-  generator.setContentTypeByExt("js");
-  generator.setMessage(string);
-  write();
-}
-
 void HttpConnection::respondCommand(QString command)
 {
   if(command == "download")
@@ -333,10 +277,6 @@ void HttpConnection::respondCommand(QString command)
     foreach(QString url, list){
       url = url.trimmed();
       if(!url.isEmpty()){
-        if(url.startsWith("bc://bt/", Qt::CaseInsensitive)) {
-          qDebug("Converting bc link to magnet link");
-          url = misc::bcLinkToMagnet(url);
-        }
         if(url.startsWith("magnet:", Qt::CaseInsensitive)) {
           emit MagnetReadyToBeDownloaded(url);
         } else {
@@ -347,20 +287,6 @@ void HttpConnection::respondCommand(QString command)
     }
     return;
   }
-  if(command == "addTrackers") {
-    QString hash = parser.post("hash");
-    if(!hash.isEmpty()) {
-      QTorrentHandle h = BTSession->getTorrentHandle(hash);
-      if(h.is_valid() && h.has_metadata()) {
-        QString urls = parser.post("urls");
-        QStringList list = urls.split('\n');
-        foreach(QString url, list) {
-          announce_entry e(url.toStdString());
-          h.add_tracker(e);
-        }
-      }
-    }
-  }
   if(command == "upload")
   {
     QByteArray torrentfile = parser.torrent();
@@ -383,11 +309,6 @@ void HttpConnection::respondCommand(QString command)
       torrent.close();
     }
     emit torrentReadyToBeDownloaded(filePath, false, QString(), false);
-    // Prepare response
-    generator.setStatusLine(200, "OK");
-    generator.setContentTypeByExt("html");
-    generator.setMessage(QString("<script type=\"text/javascript\">window.parent.hideAll();</script>"));
-    write();
     return;
   }
   if(command == "resumeall") {
@@ -403,31 +324,47 @@ void HttpConnection::respondCommand(QString command)
     return;
   }
   if(command == "setPreferences") {
-    QString json_str = parser.post("json");
-    EventManager* manager =  parent->eventManager();
-    manager->setGlobalPreferences(json::fromJson(json_str));
+    bool ok = false;
+    int dl_limit = parser.post("dl_limit").toInt(&ok);
+    if(ok) {
+      BTSession->setDownloadRateLimit(dl_limit*1024);
+      Preferences::setGlobalDownloadLimit(dl_limit);
+    }
+    int up_limit = parser.post("up_limit").toInt(&ok);
+    if(ok) {
+      BTSession->setUploadRateLimit(up_limit*1024);
+      Preferences::setGlobalUploadLimit(up_limit);
+    }
+    int dht_state = parser.post("dht").toInt(&ok);
+    if(ok) {
+      BTSession->enableDHT(dht_state == 1);
+      Preferences::setDHTEnabled(dht_state == 1);
+    }
+    int max_connec = parser.post("max_connec").toInt(&ok);
+    if(ok) {
+      BTSession->setMaxConnections(max_connec);
+      Preferences::setMaxConnecs(max_connec);
+    }
+    int max_connec_per_torrent = parser.post("max_connec_per_torrent").toInt(&ok);
+    if(ok) {
+      BTSession->setMaxConnectionsPerTorrent(max_connec_per_torrent);
+      Preferences::setMaxConnecsPerTorrent(max_connec_per_torrent);
+    }
+    int max_uploads_per_torrent = parser.post("max_uploads_per_torrent").toInt(&ok);
+    if(ok) {
+      BTSession->setMaxUploadsPerTorrent(max_uploads_per_torrent);
+      Preferences::setMaxUploadsPerTorrent(max_uploads_per_torrent);
+    }
   }
   if(command == "setFilePrio") {
     QString hash = parser.post("hash");
     int file_id = parser.post("id").toInt();
     int priority = parser.post("priority").toInt();
     QTorrentHandle h = BTSession->getTorrentHandle(hash);
-    if(h.is_valid() && h.has_metadata()) {
+    if(h.is_valid()) {
       h.file_priority(file_id, priority);
     }
   }
-  if(command == "getGlobalUpLimit") {
-    generator.setStatusLine(200, "OK");
-    generator.setContentTypeByExt("html");
-    generator.setMessage(QString::number(BTSession->getSession()->upload_rate_limit()));
-    write();
-  }
-  if(command == "getGlobalDlLimit") {
-    generator.setStatusLine(200, "OK");
-    generator.setContentTypeByExt("html");
-    generator.setMessage(QString::number(BTSession->getSession()->download_rate_limit()));
-    write();
-  }
   if(command == "getTorrentUpLimit") {
     QString hash = parser.post("hash");
     QTorrentHandle h = BTSession->getTorrentHandle(hash);
@@ -466,18 +403,6 @@ void HttpConnection::respondCommand(QString command)
       h.set_download_limit(limit);
     }
   }
-  if(command == "setGlobalUpLimit") {
-    qlonglong limit = parser.post("limit").toLongLong();
-    if(limit == 0) limit = -1;
-    BTSession->getSession()->set_upload_rate_limit(limit);
-    Preferences::setGlobalUploadLimit(limit/1024.);
-  }
-  if(command == "setGlobalDlLimit") {
-    qlonglong limit = parser.post("limit").toLongLong();
-    if(limit == 0) limit = -1;
-    BTSession->getSession()->set_download_rate_limit(limit);
-    Preferences::setGlobalDownloadLimit(limit/1024.);
-  }
   if(command == "pause") {
     emit pauseTorrent(parser.post("hash"));
     return;
@@ -500,16 +425,6 @@ void HttpConnection::respondCommand(QString command)
     if(h.is_valid()) h.queue_position_down();
     return;
   }
-  if(command == "topPrio") {
-    QTorrentHandle h = BTSession->getTorrentHandle(parser.post("hash"));
-    if(h.is_valid()) h.queue_position_top();
-    return;
-  }
-  if(command == "bottomPrio") {
-    QTorrentHandle h = BTSession->getTorrentHandle(parser.post("hash"));
-    if(h.is_valid()) h.queue_position_bottom();
-    return;
-  }
   if(command == "recheck"){
     recheckTorrent(parser.post("hash"));
     return;
@@ -522,8 +437,8 @@ void HttpConnection::respondCommand(QString command)
 
 void HttpConnection::recheckTorrent(QString hash) {
   QTorrentHandle h = BTSession->getTorrentHandle(hash);
-  if(h.is_valid()){
-    BTSession->recheckTorrent(h.hash());
+  if(h.is_valid() && !h.is_paused()){
+    h.force_recheck();
   }
 }
 
@@ -532,7 +447,7 @@ void HttpConnection::recheckAllTorrents() {
   std::vector<torrent_handle>::iterator torrentIT;
   for(torrentIT = torrents.begin(); torrentIT != torrents.end(); torrentIT++) {
     QTorrentHandle h = QTorrentHandle(*torrentIT);
-    if(h.is_valid())
-      BTSession->recheckTorrent(h.hash());
+    if(h.is_valid() && !h.is_paused())
+      h.force_recheck();
   }
 }

src/httpconnection.h

@@ -60,7 +60,6 @@ class HttpConnection : public QObject
                 void respondTrackersPropertiesJson(QString hash);
                 void respondFilesPropertiesJson(QString hash);
                 void respondPreferencesJson();
-                void respondGlobalTransferInfoJson();
 		void respondCommand(QString command);
 		void respondNotFound();
 		void processDownloadedFile(QString, QString);

src/httpresponsegenerator.cpp

@@ -39,8 +39,7 @@ void HttpResponseGenerator::setMessage(const QByteArray message)
 
 void HttpResponseGenerator::setMessage(const QString message)
 {
-  // This must be UTF-8!
-  setMessage(message.toUtf8());
+  setMessage(message.QString::toLocal8Bit());
 }
 
 void HttpResponseGenerator::stripMessage()

src/httpserver.cpp

@@ -34,236 +34,94 @@
 #include "eventmanager.h"
 #include "bittorrent.h"
 #include <QTimer>
-#include <QCryptographicHash>
-#include <QTime>
-#include <QRegExp>
-#include <QTimer>
 
-const int BAN_TIME = 3600000; // 1 hour
-
-class UnbanTimer: public QTimer {
-  public:
-  UnbanTimer(QObject *parent, QString peer_ip): QTimer(parent), peer_ip(peer_ip){
-    setSingleShot(true);
-    setInterval(BAN_TIME);
-  }
-  ~UnbanTimer() {
-    qDebug("||||||||||||Deleting ban timer|||||||||||||||");
-  }
-  QString peer_ip;
-};
-
-void HttpServer::UnbanTimerEvent() {
-  UnbanTimer* ubantimer = static_cast<UnbanTimer*>(sender());
-  qDebug("Ban period has expired for %s", qPrintable(ubantimer->peer_ip));
-  client_failed_attempts.remove(ubantimer->peer_ip);
-  ubantimer->deleteLater();
-}
-
-int HttpServer::NbFailedAttemptsForIp(QString ip) const {
-  return client_failed_attempts.value(ip, 0);
-}
-
-void HttpServer::increaseNbFailedAttemptsForIp(QString ip) {
-  const int nb_fail = client_failed_attempts.value(ip, 0);
-  client_failed_attempts.insert(ip, nb_fail+1);
-  if(nb_fail == MAX_AUTH_FAILED_ATTEMPTS-1) {
-    // Max number of failed attempts reached
-    // Start ban period
-    UnbanTimer* ubantimer = new UnbanTimer(this, ip);
-    connect(ubantimer, SIGNAL(timeout()), this, SLOT(UnbanTimerEvent()));
-    ubantimer->start();
-  }
-}
-
-void HttpServer::resetNbFailedAttemptsForIp(QString ip) {
-  client_failed_attempts.remove(ip);
-}
-
-HttpServer::HttpServer(Bittorrent *_BTSession, int msec, QObject* parent) : QTcpServer(parent) {
-  username = Preferences::getWebUiUsername().toLocal8Bit();
-  password_ha1 = Preferences::getWebUiPassword().toLocal8Bit();
-  connect(this, SIGNAL(newConnection()), this, SLOT(newHttpConnection()));
-  BTSession = _BTSession;
-  manager = new EventManager(this, BTSession);
-  //add torrents
-  std::vector<torrent_handle> torrents = BTSession->getTorrents();
-  std::vector<torrent_handle>::iterator torrentIT;
-  for(torrentIT = torrents.begin(); torrentIT != torrents.end(); torrentIT++) {
-    QTorrentHandle h = QTorrentHandle(*torrentIT);
-    if(h.is_valid())
-      manager->addedTorrent(h);
-  }
-  //connect BTSession to manager
-  connect(BTSession, SIGNAL(addedTorrent(QTorrentHandle&)), manager, SLOT(addedTorrent(QTorrentHandle&)));
-  connect(BTSession, SIGNAL(deletedTorrent(QString)), manager, SLOT(deletedTorrent(QString)));
-  //set timer
-  timer = new QTimer(this);
-  connect(timer, SIGNAL(timeout()), this, SLOT(onTimer()));
-  timer->start(msec);
-  // Additional translations for Web UI
-  QString a = tr("File");
-  a = tr("Edit");
-  a = tr("Help");
-  a = tr("Delete from HD");
-  a = tr("Download Torrents from their URL or Magnet link");
-  a = tr("Only one link per line");
-  a = tr("Download local torrent");
-  a = tr("Torrent files were correctly added to download list.");
-  a = tr("Point to torrent file");
-  a = tr("Download");
-  a = tr("Are you sure you want to delete the selected torrents from the transfer list and hard disk?");
-  a = tr("Download rate limit must be greater than 0 or disabled.");
-  a = tr("Upload rate limit must be greater than 0 or disabled.");
-  a = tr("Maximum number of connections limit must be greater than 0 or disabled.");
-  a = tr("Maximum number of connections per torrent limit must be greater than 0 or disabled.");
-  a = tr("Maximum number of upload slots per torrent limit must be greater than 0 or disabled.");
-  a = tr("Unable to save program preferences, qBittorrent is probably unreachable.");
-  a = tr("Language");
-  a = tr("Downloaded", "Is the file downloaded or not?");
-  a = tr("The port used for incoming connections must be greater than 1024 and less than 65535.");
-  a = tr("The port used for the Web UI must be greater than 1024 and less than 65535.");
-  a = tr("The Web UI username must be at least 3 characters long.");
-  a = tr("The Web UI password must be at least 3 characters long.");
+HttpServer::HttpServer(Bittorrent *_BTSession, int msec, QObject* parent) : QTcpServer(parent)
+{
+	base64 = QByteArray(":").toBase64();
+	connect(this, SIGNAL(newConnection()), this, SLOT(newHttpConnection()));
+        BTSession = _BTSession;
+	manager = new EventManager(this, BTSession);
+	//add torrents
+        std::vector<torrent_handle> torrents = BTSession->getTorrents();
+        std::vector<torrent_handle>::iterator torrentIT;
+        for(torrentIT = torrents.begin(); torrentIT != torrents.end(); torrentIT++) {
+            QTorrentHandle h = QTorrentHandle(*torrentIT);
+            if(h.is_valid())
+                manager->addedTorrent(h);
+        }
+	//connect BTSession to manager
+	connect(BTSession, SIGNAL(addedTorrent(QTorrentHandle&)), manager, SLOT(addedTorrent(QTorrentHandle&)));
+	connect(BTSession, SIGNAL(deletedTorrent(QString)), manager, SLOT(deletedTorrent(QString)));
+	//set timer
+	timer = new QTimer(this);
+	connect(timer, SIGNAL(timeout()), this, SLOT(onTimer()));
+	timer->start(msec);
+        // Additional translations for Web UI
+        QString a = tr("File");
+        a = tr("Edit");
+        a = tr("Help");
+        a = tr("Delete from HD");
+        a = tr("Download Torrents from their URL or Magnet link");
+        a = tr("Only one link per line");
+        a = tr("Download local torrent");
+        a = tr("Torrent files were correctly added to download list.");
+        a = tr("Point to torrent file");
+        a = tr("Download");
+        a = tr("Are you sure you want to delete the selected torrents from the transfer list and hard disk?");
+        a = tr("Download rate limit must be greater than 0 or disabled.");
+        a = tr("Upload rate limit must be greater than 0 or disabled.");
+        a = tr("Maximum number of connections limit must be greater than 0 or disabled.");
+        a = tr("Maximum number of connections per torrent limit must be greater than 0 or disabled.");
+        a = tr("Maximum number of upload slots per torrent limit must be greater than 0 or disabled.");
+        a = tr("Unable to save program preferences, qBittorrent is probably unreachable.");
 }
 
 HttpServer::~HttpServer()
 {
-  delete timer;
-  delete manager;
+	delete timer;
+	delete manager;
 }
 
 void HttpServer::newHttpConnection()
 {
-  QTcpSocket *socket;
-  while((socket = nextPendingConnection()))
-  {
-    HttpConnection *connection = new HttpConnection(socket, BTSession, this);
-    //connect connection to BTSession
-    connect(connection, SIGNAL(UrlReadyToBeDownloaded(QString)), BTSession, SLOT(downloadUrlAndSkipDialog(QString)));
-    connect(connection, SIGNAL(MagnetReadyToBeDownloaded(QString)), BTSession, SLOT(addMagnetSkipAddDlg(QString)));
-    connect(connection, SIGNAL(torrentReadyToBeDownloaded(QString, bool, QString, bool)), BTSession, SLOT(addTorrent(QString, bool, QString, bool)));
-    connect(connection, SIGNAL(deleteTorrent(QString, bool)), BTSession, SLOT(deleteTorrent(QString, bool)));
-    connect(connection, SIGNAL(pauseTorrent(QString)), BTSession, SLOT(pauseTorrent(QString)));
-    connect(connection, SIGNAL(resumeTorrent(QString)), BTSession, SLOT(resumeTorrent(QString)));
-    connect(connection, SIGNAL(pauseAllTorrents()), BTSession, SLOT(pauseAllTorrents()));
-    connect(connection, SIGNAL(resumeAllTorrents()), BTSession, SLOT(resumeAllTorrents()));
-  }
+	QTcpSocket *socket;
+	while((socket = nextPendingConnection()))
+	{
+                HttpConnection *connection = new HttpConnection(socket, BTSession, this);
+		//connect connection to BTSession
+		connect(connection, SIGNAL(UrlReadyToBeDownloaded(QString)), BTSession, SLOT(downloadUrlAndSkipDialog(QString)));
+                connect(connection, SIGNAL(MagnetReadyToBeDownloaded(QString)), BTSession, SLOT(addMagnetSkipAddDlg(QString)));
+		connect(connection, SIGNAL(torrentReadyToBeDownloaded(QString, bool, QString, bool)), BTSession, SLOT(addTorrent(QString, bool, QString, bool)));
+                connect(connection, SIGNAL(deleteTorrent(QString, bool)), BTSession, SLOT(deleteTorrent(QString, bool)));
+		connect(connection, SIGNAL(pauseTorrent(QString)), BTSession, SLOT(pauseTorrent(QString)));
+		connect(connection, SIGNAL(resumeTorrent(QString)), BTSession, SLOT(resumeTorrent(QString)));
+		connect(connection, SIGNAL(pauseAllTorrents()), BTSession, SLOT(pauseAllTorrents()));
+		connect(connection, SIGNAL(resumeAllTorrents()), BTSession, SLOT(resumeAllTorrents()));
+	}
 }
 
 void HttpServer::onTimer() {
-  std::vector<torrent_handle> torrents = BTSession->getTorrents();
-  std::vector<torrent_handle>::iterator torrentIT;
-  for(torrentIT = torrents.begin(); torrentIT != torrents.end(); torrentIT++) {
-    QTorrentHandle h = QTorrentHandle(*torrentIT);
-    if(h.is_valid())
-      manager->modifiedTorrent(h);
-  }
+        std::vector<torrent_handle> torrents = BTSession->getTorrents();
+        std::vector<torrent_handle>::iterator torrentIT;
+        for(torrentIT = torrents.begin(); torrentIT != torrents.end(); torrentIT++) {
+            QTorrentHandle h = QTorrentHandle(*torrentIT);
+            if(h.is_valid())
+                manager->modifiedTorrent(h);
+        }
 }
 
-QString HttpServer::generateNonce() const {
-  QCryptographicHash md5(QCryptographicHash::Md5);
-  md5.addData(QTime::currentTime().toString("hhmmsszzz").toLocal8Bit());
-  md5.addData(":");
-  md5.addData(QBT_REALM);
-  return md5.result().toHex();
+void HttpServer::setAuthorization(QString username, QString password)
+{
+	QString cat = username + ":" + password;
+  base64 = QByteArray(cat.toLocal8Bit()).toBase64();
 }
 
-void HttpServer::setAuthorization(QString _username, QString _password_ha1) {
-  username = _username.toLocal8Bit();
-  password_ha1 = _password_ha1.toLocal8Bit();
-}
-
-// Parse HTTP AUTH string
-// http://tools.ietf.org/html/rfc2617
-bool HttpServer::isAuthorized(QByteArray auth, QString method) const {
-  //qDebug("AUTH string is %s", auth.data());
-  // Get user name
-  QRegExp regex_user(".*username=\"([^\"]+)\".*"); // Must be a quoted string
-  if(regex_user.indexIn(auth) < 0) return false;
-  QString prop_user = regex_user.cap(1);
-  //qDebug("AUTH: Proposed username is %s, real username is %s", prop_user.toLocal8Bit().data(), username.data());
-  if(prop_user != username) {
-    // User name is invalid, we can reject already
-    qDebug("AUTH-PROB: Username is invalid");
-    return false;
-  }
-  // Get realm
-  QRegExp regex_realm(".*realm=\"([^\"]+)\".*"); // Must be a quoted string
-  if(regex_realm.indexIn(auth) < 0) {
-    qDebug("AUTH-PROB: Missing realm");
-    return false;
-  }
-  QByteArray prop_realm = regex_realm.cap(1).toLocal8Bit();
-  if(prop_realm != QBT_REALM) {
-    qDebug("AUTH-PROB: Wrong realm");
-    return false;
-  }
-  // get nonce
-  QRegExp regex_nonce(".*nonce=[\"]?([\\w=]+)[\"]?.*");
-  if(regex_nonce.indexIn(auth) < 0) {
-    qDebug("AUTH-PROB: missing nonce");
-    return false;
-  }
-  QByteArray prop_nonce = regex_nonce.cap(1).toLocal8Bit();
-  qDebug("prop nonce is: %s", prop_nonce.data());
-  // get uri
-  QRegExp regex_uri(".*uri=\"([^\"]+)\".*");
-  if(regex_uri.indexIn(auth) < 0) {
-    qDebug("AUTH-PROB: Missing uri");
-    return false;
-  }
-  QByteArray prop_uri = regex_uri.cap(1).toLocal8Bit();
-  qDebug("prop uri is: %s", prop_uri.data());
-  // get response
-  QRegExp regex_response(".*response=[\"]?([\\w=]+)[\"]?.*");
-  if(regex_response.indexIn(auth) < 0) {
-    qDebug("AUTH-PROB: Missing response");
-    return false;
-  }
-  QByteArray prop_response = regex_response.cap(1).toLocal8Bit();
-  qDebug("prop response is: %s", prop_response.data());
-  // Compute correct reponse
-  QCryptographicHash md5_ha2(QCryptographicHash::Md5);
-  md5_ha2.addData(method.toLocal8Bit() + ":" + prop_uri);
-  QByteArray ha2 = md5_ha2.result().toHex();
-  QByteArray response = "";
-  if(auth.contains("qop=")) {
-    QCryptographicHash md5_ha(QCryptographicHash::Md5);
-    // Get nc
-    QRegExp regex_nc(".*nc=[\"]?([\\w=]+)[\"]?.*");
-    if(regex_nc.indexIn(auth) < 0) {
-      qDebug("AUTH-PROB: qop but missing nc");
-      return false;
-    }
-    QByteArray prop_nc = regex_nc.cap(1).toLocal8Bit();
-    qDebug("prop nc is: %s", prop_nc.data());
-    QRegExp regex_cnonce(".*cnonce=[\"]?([\\w=]+)[\"]?.*");
-    if(regex_cnonce.indexIn(auth) < 0) {
-      qDebug("AUTH-PROB: qop but missing cnonce");
-      return false;
-    }
-    QByteArray prop_cnonce = regex_cnonce.cap(1).toLocal8Bit();
-    qDebug("prop cnonce is: %s", prop_cnonce.data());
-    QRegExp regex_qop(".*qop=[\"]?(\\w+)[\"]?.*");
-    if(regex_qop.indexIn(auth) < 0) {
-      qDebug("AUTH-PROB: missing qop");
-      return false;
-    }
-    QByteArray prop_qop = regex_qop.cap(1).toLocal8Bit();
-    qDebug("prop qop is: %s", prop_qop.data());
-    md5_ha.addData(password_ha1+":"+prop_nonce+":"+prop_nc+":"+prop_cnonce+":"+prop_qop+":"+ha2);
-    response = md5_ha.result().toHex();
-  } else {
-    QCryptographicHash md5_ha(QCryptographicHash::Md5);
-    md5_ha.addData(password_ha1+":"+prop_nonce+":"+ha2);
-    response = md5_ha.result().toHex();
-  }
-  qDebug("AUTH: comparing reponses: (%d)", static_cast<int>(prop_response == response));
-  return prop_response == response;
+bool HttpServer::isAuthorized(QByteArray auth) const
+{
+	return (auth == base64);
 }
 
 EventManager* HttpServer::eventManager() const
 {
-  return manager;
+	return manager;
 }

src/httpserver.h

@@ -35,41 +35,30 @@
 #include <QPair>
 #include <QTcpServer>
 #include <QByteArray>
-#include <QHash>
-#include "preferences.h"
 
 class Bittorrent;
 class QTimer;
 class EventManager;
 
-const int MAX_AUTH_FAILED_ATTEMPTS = 5;
-
 class HttpServer : public QTcpServer {
-  Q_OBJECT
+	Q_OBJECT
 
-public:
-  HttpServer(Bittorrent *BTSession, int msec, QObject* parent = 0);
-  ~HttpServer();
-  void setAuthorization(QString username, QString password_ha1);
-  bool isAuthorized(QByteArray auth, QString method) const;
-  EventManager *eventManager() const;
-  QString generateNonce() const;
-  int NbFailedAttemptsForIp(QString ip) const;
-  void increaseNbFailedAttemptsForIp(QString ip);
-  void resetNbFailedAttemptsForIp(QString ip);
+	private:
+		QByteArray base64;
+                Bittorrent *BTSession;
+		EventManager *manager;
+		QTimer *timer;
 
-private slots:
-  void newHttpConnection();
-  void onTimer();
-  void UnbanTimerEvent();
+	public:
+                HttpServer(Bittorrent *BTSession, int msec, QObject* parent = 0);
+		~HttpServer();
+		void setAuthorization(QString username, QString password);
+		bool isAuthorized(QByteArray auth) const;
+		EventManager *eventManager() const;
 
-private:
-  QByteArray username;
-  QByteArray password_ha1;
-  Bittorrent *BTSession;
-  EventManager *manager;
-  QTimer *timer;
-  QHash<QString, int> client_failed_attempts;
+	private slots:
+		void newHttpConnection();
+		void onTimer();
 };
 
 #endif

src/icons.qrc

@@ -1,183 +1,175 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-  <file>Icons/url.png</file>
-  <file>Icons/loading.png</file>
-  <file>Icons/rss16.png</file>
   <file>Icons/rss32.png</file>
-  <file>Icons/3-state-checkbox.gif</file>
-  <file>Icons/uparrow.png</file>
-  <file>Icons/sphere.png</file>
-  <file>Icons/downarrow.png</file>
-  <file>Icons/slow_off.png</file>
   <file>Icons/sphere2.png</file>
+  <file>Icons/downarrow.png</file>
+  <file>Icons/url.png</file>
+  <file>Icons/locale.png</file>
+  <file>Icons/loading.png</file>
   <file>Icons/magnet.png</file>
-  <file>Icons/slow.png</file>
-  <file>Icons/L.gif</file>
-  <file>Icons/skin/delete_perm22.png</file>
-  <file>Icons/skin/seeding.png</file>
-  <file>Icons/skin/splash.png</file>
-  <file>Icons/skin/preview.png</file>
-  <file>Icons/skin/tabs.gif</file>
-  <file>Icons/skin/delete.png</file>
-  <file>Icons/skin/increase.png</file>
-  <file>Icons/skin/qbittorrent16.png</file>
-  <file>Icons/skin/connected.png</file>
-  <file>Icons/skin/url.png</file>
-  <file>Icons/skin/qbittorrent22.png</file>
-  <file>Icons/skin/disconnected.png</file>
-  <file>Icons/skin/mascot.png</file>
-  <file>Icons/skin/info.png</file>
-  <file>Icons/skin/paused.png</file>
-  <file>Icons/skin/slider-area.gif</file>
-  <file>Icons/skin/pause22.png</file>
-  <file>Icons/skin/stalledDL.png</file>
-  <file>Icons/skin/play.png</file>
-  <file>Icons/skin/delete_all.png</file>
-  <file>Icons/skin/delete_perm.png</file>
-  <file>Icons/skin/qb_question.png</file>
-  <file>Icons/skin/error.png</file>
-  <file>Icons/skin/settings.png</file>
-  <file>Icons/skin/handle-icon-horizontal.gif</file>
-  <file>Icons/skin/pause.png</file>
-  <file>Icons/skin/qbittorrent32.png</file>
-  <file>Icons/skin/exit.png</file>
-  <file>Icons/skin/knob.gif</file>
-  <file>Icons/skin/open.png</file>
-  <file>Icons/skin/pause_all.png</file>
-  <file>Icons/skin/filterall.png</file>
-  <file>Icons/skin/uploading.png</file>
-  <file>Icons/skin/queued.png</file>
-  <file>Icons/skin/checking.png</file>
-  <file>Icons/skin/handle-icon.gif</file>
-  <file>Icons/skin/arrow-right.gif</file>
-  <file>Icons/skin/filterinactive.png</file>
-  <file>Icons/skin/decrease.png</file>
-  <file>Icons/skin/play22.png</file>
-  <file>Icons/skin/firewalled.png</file>
-  <file>Icons/skin/delete22.png</file>
-  <file>Icons/skin/new.png</file>
-  <file>Icons/skin/downloading.png</file>
-  <file>Icons/skin/play_all.png</file>
-  <file>Icons/skin/toolbox-divider.gif</file>
-  <file>Icons/skin/stalledUP.png</file>
-  <file>Icons/skin/filteractive.png</file>
+  <file>Icons/sphere.png</file>
+  <file>Icons/uparrow.png</file>
+  <file>Icons/rss16.png</file>
+  <file>Icons/skin/checkingUP.png</file>
   <file>Icons/skin/bg-handle-horizontal.gif</file>
+  <file>Icons/skin/play.png</file>
+  <file>Icons/skin/qbittorrent22.png</file>
+  <file>Icons/skin/queuedDL.png</file>
+  <file>Icons/skin/new.png</file>
+  <file>Icons/skin/queuedUP.png</file>
+  <file>Icons/skin/preview.png</file>
+  <file>Icons/skin/stalled.png</file>
+  <file>Icons/skin/delete.png</file>
+  <file>Icons/skin/handle-icon-horizontal.gif</file>
+  <file>Icons/skin/handle-icon.gif</file>
+  <file>Icons/skin/knob.gif</file>
+  <file>Icons/skin/url.png</file>
+  <file>Icons/skin/stalledUP.png</file>
+  <file>Icons/skin/delete_perm22.png</file>
+  <file>Icons/skin/filteractive.png</file>
+  <file>Icons/skin/connected.png</file>
+  <file>Icons/skin/pausedDL.png</file>
+  <file>Icons/skin/mascot.png</file>
+  <file>Icons/skin/pausedUP.png</file>
+  <file>Icons/skin/seeding.png</file>
+  <file>Icons/skin/increase.png</file>
+  <file>Icons/skin/qbittorrent32.png</file>
+  <file>Icons/skin/paused.png</file>
+  <file>Icons/skin/toolbox-divider.gif</file>
+  <file>Icons/skin/stalledDL.png</file>
+  <file>Icons/skin/qb_question.png</file>
   <file>Icons/skin/download.png</file>
-  <file>Icons/flags/pakistan.png</file>
-  <file>Icons/flags/argentina.png</file>
-  <file>Icons/flags/netherlands.png</file>
-  <file>Icons/flags/australia.png</file>
-  <file>Icons/flags/finland.png</file>
-  <file>Icons/flags/croatia.png</file>
-  <file>Icons/flags/indonesia.png</file>
-  <file>Icons/flags/greece.png</file>
-  <file>Icons/flags/belarus.png</file>
-  <file>Icons/flags/morocco.png</file>
-  <file>Icons/flags/portugal.png</file>
-  <file>Icons/flags/egypt.png</file>
-  <file>Icons/flags/georgia.png</file>
-  <file>Icons/flags/costa_rica.png</file>
-  <file>Icons/flags/denmark.png</file>
-  <file>Icons/flags/bosnia.png</file>
-  <file>Icons/flags/newzealand.png</file>
+  <file>Icons/skin/open.png</file>
+  <file>Icons/skin/play22.png</file>
+  <file>Icons/skin/qbittorrent16.png</file>
+  <file>Icons/skin/slider-area.gif</file>
+  <file>Icons/skin/downloading.png</file>
+  <file>Icons/skin/filterinactive.png</file>
+  <file>Icons/skin/pause22.png</file>
+  <file>Icons/skin/pause_all.png</file>
+  <file>Icons/skin/delete22.png</file>
+  <file>Icons/skin/play_all.png</file>
+  <file>Icons/skin/pause.png</file>
+  <file>Icons/skin/firewalled.png</file>
+  <file>Icons/skin/properties.png</file>
+  <file>Icons/skin/info.png</file>
+  <file>Icons/skin/tabs.gif</file>
+  <file>Icons/skin/delete_perm.png</file>
+  <file>Icons/skin/checkingDL.png</file>
+  <file>Icons/skin/settings.png</file>
+  <file>Icons/skin/exit.png</file>
+  <file>Icons/skin/delete_all.png</file>
+  <file>Icons/skin/splash.png</file>
+  <file>Icons/skin/decrease.png</file>
+  <file>Icons/skin/uploading.png</file>
+  <file>Icons/skin/filterall.png</file>
+  <file>Icons/flags/czech.png</file>
   <file>Icons/flags/serbia.png</file>
-  <file>Icons/flags/singapore.png</file>
-  <file>Icons/flags/italy.png</file>
-  <file>Icons/flags/brazil.png</file>
+  <file>Icons/flags/iceland.png</file>
+  <file>Icons/flags/china.png</file>
+  <file>Icons/flags/luxembourg.png</file>
+  <file>Icons/flags/newzealand.png</file>
+  <file>Icons/flags/austria.png</file>
+  <file>Icons/flags/indonesia.png</file>
+  <file>Icons/flags/united_arab_emirates.png</file>
+  <file>Icons/flags/norway.png</file>
+  <file>Icons/flags/india.png</file>
+  <file>Icons/flags/finland.png</file>
+  <file>Icons/flags/australia.png</file>
+  <file>Icons/flags/netherlands.png</file>
+  <file>Icons/flags/south_africa.png</file>
+  <file>Icons/flags/belarus.png</file>
+  <file>Icons/flags/georgia.png</file>
   <file>Icons/flags/taiwan.png</file>
-  <file>Icons/flags/south_korea.png</file>
+  <file>Icons/flags/sweden.png</file>
+  <file>Icons/flags/spain_catalunya.png</file>
+  <file>Icons/flags/ireland.png</file>
+  <file>Icons/flags/singapore.png</file>
+  <file>Icons/flags/israel.png</file>
+  <file>Icons/flags/belgium.png</file>
+  <file>Icons/flags/usa.png</file>
+  <file>Icons/flags/costa_rica.png</file>
+  <file>Icons/flags/romania.png</file>
+  <file>Icons/flags/suisse.png</file>
+  <file>Icons/flags/croatia.png</file>
+  <file>Icons/flags/mexico.png</file>
+  <file>Icons/flags/denmark.png</file>
+  <file>Icons/flags/hungary.png</file>
+  <file>Icons/flags/slovenia.png</file>
+  <file>Icons/flags/ukraine.png</file>
   <file>Icons/flags/turkey.png</file>
   <file>Icons/flags/algeria.png</file>
-  <file>Icons/flags/japan.png</file>
-  <file>Icons/flags/luxembourg.png</file>
-  <file>Icons/flags/poland.png</file>
-  <file>Icons/flags/iceland.png</file>
+  <file>Icons/flags/greece.png</file>
+  <file>Icons/flags/morocco.png</file>
+  <file>Icons/flags/argentina.png</file>
   <file>Icons/flags/spain.png</file>
-  <file>Icons/flags/saoudi_arabia.png</file>
-  <file>Icons/flags/norway.png</file>
+  <file>Icons/flags/portugal.png</file>
   <file>Icons/flags/russia.png</file>
-  <file>Icons/flags/slovakia.png</file>
-  <file>Icons/flags/philippines.png</file>
-  <file>Icons/flags/thailand.png</file>
-  <file>Icons/flags/israel.png</file>
-  <file>Icons/flags/bulgaria.png</file>
-  <file>Icons/flags/czech.png</file>
-  <file>Icons/flags/usa.png</file>
-  <file>Icons/flags/malaysia.png</file>
-  <file>Icons/flags/belgium.png</file>
-  <file>Icons/flags/south_africa.png</file>
-  <file>Icons/flags/slovenia.png</file>
-  <file>Icons/flags/china.png</file>
-  <file>Icons/flags/germany.png</file>
-  <file>Icons/flags/ukraine.png</file>
-  <file>Icons/flags/india.png</file>
-  <file>Icons/flags/spain_catalunya.png</file>
-  <file>Icons/flags/romania.png</file>
   <file>Icons/flags/united_kingdom.png</file>
-  <file>Icons/flags/united_arab_emirates.png</file>
-  <file>Icons/flags/sweden.png</file>
+  <file>Icons/flags/thailand.png</file>
+  <file>Icons/flags/poland.png</file>
+  <file>Icons/flags/germany.png</file>
+  <file>Icons/flags/bulgaria.png</file>
   <file>Icons/flags/canada.png</file>
-  <file>Icons/flags/mexico.png</file>
-  <file>Icons/flags/hungary.png</file>
+  <file>Icons/flags/brazil.png</file>
   <file>Icons/flags/france.png</file>
-  <file>Icons/flags/ireland.png</file>
-  <file>Icons/flags/austria.png</file>
-  <file>Icons/flags/suisse.png</file>
-  <file>Icons/oxygen/peer.png</file>
-  <file>Icons/oxygen/unavailable.png</file>
-  <file>Icons/oxygen/subscribe.png</file>
-  <file>Icons/oxygen/list-remove.png</file>
-  <file>Icons/oxygen/dialog-warning.png</file>
-  <file>Icons/oxygen/mail-folder-inbox.png</file>
-  <file>Icons/oxygen/folder.png</file>
-  <file>Icons/oxygen/edit-copy.png</file>
-  <file>Icons/oxygen/folder-documents.png</file>
-  <file>Icons/oxygen/urlseed.png</file>
-  <file>Icons/oxygen/go-up.png</file>
-  <file>Icons/oxygen/edit-cut.png</file>
-  <file>Icons/oxygen/gear32.png</file>
-  <file>Icons/oxygen/go-bottom.png</file>
-  <file>Icons/oxygen/user-group-delete.png</file>
-  <file>Icons/oxygen/unsubscribe.png</file>
-  <file>Icons/oxygen/tab-close.png</file>
-  <file>Icons/oxygen/file.png</file>
-  <file>Icons/oxygen/services.png</file>
+  <file>Icons/flags/slovakia.png</file>
+  <file>Icons/flags/pakistan.png</file>
+  <file>Icons/flags/egypt.png</file>
+  <file>Icons/flags/italy.png</file>
+  <file>Icons/flags/south_korea.png</file>
+  <file>Icons/flags/bosnia.png</file>
+  <file>Icons/flags/japan.png</file>
+  <file>Icons/flags/malaysia.png</file>
+  <file>Icons/flags/philippines.png</file>
+  <file>Icons/oxygen/mail-queue.png</file>
   <file>Icons/oxygen/view-refresh.png</file>
-  <file>Icons/oxygen/feed-subscribe.png</file>
-  <file>Icons/oxygen/remove.png</file>
-  <file>Icons/oxygen/chronometer.png</file>
-  <file>Icons/oxygen/filter.png</file>
-  <file>Icons/oxygen/run-build.png</file>
-  <file>Icons/oxygen/button_ok.png</file>
-  <file>Icons/oxygen/user-group-new.png</file>
-  <file>Icons/oxygen/cookies.png</file>
-  <file>Icons/oxygen/network-server.png</file>
-  <file>Icons/oxygen/unsubscribe16.png</file>
-  <file>Icons/oxygen/encrypted32.png</file>
-  <file>Icons/oxygen/list-add.png</file>
-  <file>Icons/oxygen/edit-paste.png</file>
-  <file>Icons/oxygen/folder-remote.png</file>
-  <file>Icons/oxygen/help-about.png</file>
-  <file>Icons/oxygen/encrypted.png</file>
+  <file>Icons/oxygen/file.png</file>
   <file>Icons/oxygen/folder-remote16.png</file>
-  <file>Icons/oxygen/go-top.png</file>
-  <file>Icons/oxygen/edit_clear.png</file>
-  <file>Icons/oxygen/bug.png</file>
-  <file>Icons/oxygen/gear.png</file>
-  <file>Icons/oxygen/connection.png</file>
-  <file>Icons/oxygen/document-new.png</file>
-  <file>Icons/oxygen/browse.png</file>
-  <file>Icons/oxygen/proxy.png</file>
-  <file>Icons/oxygen/button_cancel.png</file>
-  <file>Icons/oxygen/preferences-desktop.png</file>
-  <file>Icons/oxygen/bt_settings.png</file>
-  <file>Icons/oxygen/go-down.png</file>
-  <file>Icons/oxygen/subscribe16.png</file>
-  <file>Icons/oxygen/download.png</file>
-  <file>Icons/oxygen/log.png</file>
+  <file>Icons/oxygen/mail-folder-inbox.png</file>
   <file>Icons/oxygen/edit-find.png</file>
-  <file>Icons/oxygen/edit-clear.png</file>
-  <file>Icons/oxygen/webui.png</file>
   <file>Icons/oxygen/folder-new.png</file>
+  <file>Icons/oxygen/folder-remote.png</file>
+  <file>Icons/oxygen/edit-paste.png</file>
+  <file>Icons/oxygen/run-build.png</file>
+  <file>Icons/oxygen/proxy.png</file>
+  <file>Icons/oxygen/user-group-delete.png</file>
+  <file>Icons/oxygen/user-group-new.png</file>
+  <file>Icons/oxygen/log.png</file>
+  <file>Icons/oxygen/unavailable.png</file>
+  <file>Icons/oxygen/button_ok.png</file>
+  <file>Icons/oxygen/button_cancel.png</file>
+  <file>Icons/oxygen/edit-clear.png</file>
+  <file>Icons/oxygen/filter.png</file>
+  <file>Icons/oxygen/encrypted.png</file>
+  <file>Icons/oxygen/edit_clear.png</file>
+  <file>Icons/oxygen/download.png</file>
+  <file>Icons/oxygen/application-x-kgetlist-no.png</file>
+  <file>Icons/oxygen/gear.png</file>
+  <file>Icons/oxygen/remove.png</file>
+  <file>Icons/oxygen/dialog-warning.png</file>
+  <file>Icons/oxygen/peer.png</file>
+  <file>Icons/oxygen/browse.png</file>
+  <file>Icons/oxygen/unsubscribe16.png</file>
+  <file>Icons/oxygen/subscribe.png</file>
+  <file>Icons/oxygen/edit-copy.png</file>
+  <file>Icons/oxygen/bt_settings.png</file>
+  <file>Icons/oxygen/document-new.png</file>
+  <file>Icons/oxygen/preferences-desktop.png</file>
+  <file>Icons/oxygen/tab-close.png</file>
+  <file>Icons/oxygen/wallet.png</file>
+  <file>Icons/oxygen/webui.png</file>
+  <file>Icons/oxygen/list-remove.png</file>
+  <file>Icons/oxygen/connection.png</file>
+  <file>Icons/oxygen/bug.png</file>
+  <file>Icons/oxygen/help-about.png</file>
+  <file>Icons/oxygen/list-add.png</file>
+  <file>Icons/oxygen/network-server.png</file>
+  <file>Icons/oxygen/application-x-kgetlist.png</file>
+  <file>Icons/oxygen/folder.png</file>
+  <file>Icons/oxygen/urlseed.png</file>
+  <file>Icons/oxygen/edit-cut.png</file>
+  <file>Icons/oxygen/unsubscribe.png</file>
+  <file>Icons/oxygen/subscribe16.png</file>
 </qresource>
 </RCC>

src/json.h

@@ -41,23 +41,14 @@ namespace json {
       return "null";
     switch(v.type())
     {
-    case QVariant::Bool:
-    case QVariant::Double:
-    case QVariant::Int:
-    case QVariant::LongLong:
-    case QVariant::UInt:
-    case QVariant::ULongLong:
-    //case QMetaType::Float:
+                case QVariant::Bool:
+                case QVariant::Double:
+                case QVariant::Int:
+                case QVariant::LongLong:
+                case QVariant::UInt:
+                case QVariant::ULongLong:
       return v.value<QString>();
-    case QVariant::StringList:
-    case QVariant::List: {
-        QStringList strList;
-        foreach(const QVariant &var, v.toList()) {
-          strList << toJson(var);
-        }
-        return "["+strList.join(",")+"]";
-      }
-    case QVariant::String:
+                case QVariant::String:
       {
         QString s = v.value<QString>();
         QString result = "\"";
@@ -66,36 +57,35 @@ namespace json {
           QChar ch = s[i];
           switch(ch.toAscii())
           {
-          case '\b':
+                                        case '\b':
             result += "\\b";
             break;
-          case '\f':
+                                        case '\f':
             result += "\\f";
             break;
-          case '\n':
+                                        case '\n':
             result += "\\n";
             break;
-          case '\r':
+                                        case '\r':
             result += "\\r";
             break;
-          case '\t':
+                                        case '\t':
             result += "\\t";
             break;
-          case '\"':
-          case '\'':
-          case '\\':
-          case '&':
+                                        case '\"':
+                                        case '\'':
+                                        case '\\':
+                                        case '&':
             result += '\\';
-          case '\0':
-          default:
+                                        case '\0':
+                                        default:
             result += ch;
           }
         }
         result += "\"";
         return result;
       }
-    default:
-      qDebug("Unknown QVariantType: %d", (int)v.type());
+            default:
       return "undefined";
     }
   }
@@ -108,72 +98,6 @@ namespace json {
     return "{"+vlist.join(",")+"}";
   }
 
-  QVariantMap fromJson(QString json) {
-    qDebug("JSON is %s", qPrintable(json));
-    QVariantMap m;
-    if(json.startsWith("{") && json.endsWith("}")) {
-      json.chop(1);
-      json = json.replace(0, 1, "");
-      QStringList couples;
-      QString tmp = "";
-      bool in_list = false;
-      foreach(QChar c, json) {
-        if(c == ',' && !in_list) {
-          couples << tmp;
-          tmp = "";
-        } else {
-          if(c == '[') {
-            in_list = true;
-          } else {
-            if(c == ']') {
-              in_list = false;
-            }
-          }
-          tmp += c;
-        }
-      }
-      if(!tmp.isEmpty()) couples << tmp;
-      foreach(QString couple, couples) {
-        QStringList parts = couple.split(":");
-        if(parts.size() != 2) continue;
-        QString key = parts.first();
-        if(key.startsWith("\"") && key.endsWith("\"")) {
-          key.chop(1);
-          key = key.replace(0, 1, "");
-        }
-        QString value_str = parts.last();
-        QVariant value;
-        if(value_str.startsWith("[") && value_str.endsWith("]")) {
-          value_str.chop(1);
-          value_str.replace(0, 1, "");
-          QStringList list_elems = value_str.split(",", QString::SkipEmptyParts);
-          QVariantList varlist;
-          foreach(QString list_val, list_elems) {
-            if(list_val.startsWith("\"") && list_val.endsWith("\"")) {
-              list_val.chop(1);
-              list_val = list_val.replace(0, 1, "");
-              varlist << list_val;
-            } else {
-              varlist << list_val.toInt();
-            }
-          }
-          value = varlist;
-        } else {
-          if(value_str.startsWith("\"") && value_str.endsWith("\"")) {
-            value_str.chop(1);
-            value_str = value_str.replace(0, 1, "");
-            value = value_str;
-          } else {
-            value = value_str.toInt();
-          }
-        }
-        m.insert(key,value);
-        qDebug("%s:%s", key.toLocal8Bit().data(), value_str.toLocal8Bit().data());
-      }
-    }
-    return m;
-  }
-
   QString toJson(QList<QVariantMap> v) {
     QStringList res;
     foreach(QVariantMap m, v) {

src/lang.qrc

@@ -1,34 +1,31 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-  <file>lang/qbittorrent_nl.qm</file>
-  <file>lang/qbittorrent_hu.qm</file>
-  <file>lang/qbittorrent_ru.qm</file>
-  <file>lang/qbittorrent_zh_TW.qm</file>
-  <file>lang/qbittorrent_tr.qm</file>
-  <file>lang/qbittorrent_fi.qm</file>
+  <file>lang/qbittorrent_es.qm</file>
   <file>lang/qbittorrent_sk.qm</file>
-  <file>lang/qbittorrent_ja.qm</file>
+  <file>lang/qbittorrent_zh_TW.qm</file>
+  <file>lang/qbittorrent_pt.qm</file>
+  <file>lang/qbittorrent_sv.qm</file>
+  <file>lang/qbittorrent_pl.qm</file>
+  <file>lang/qbittorrent_it.qm</file>
+  <file>lang/qbittorrent_ko.qm</file>
+  <file>lang/qbittorrent_en.qm</file>
+  <file>lang/qbittorrent_ro.qm</file>
+  <file>lang/qbittorrent_bg.qm</file>
+  <file>lang/qbittorrent_ru.qm</file>
+  <file>lang/qbittorrent_nl.qm</file>
+  <file>lang/qbittorrent_nb.qm</file>
+  <file>lang/qbittorrent_fi.qm</file>
+  <file>lang/qbittorrent_uk.qm</file>
+  <file>lang/qbittorrent_cs.qm</file>
+  <file>lang/qbittorrent_pt_BR.qm</file>
   <file>lang/qbittorrent_el.qm</file>
   <file>lang/qbittorrent_ca.qm</file>
-  <file>lang/qbittorrent_pt.qm</file>
-  <file>lang/qbittorrent_it.qm</file>
-  <file>lang/qbittorrent_fr.qm</file>
-  <file>lang/qbittorrent_uk.qm</file>
-  <file>lang/qbittorrent_zh.qm</file>
-  <file>lang/qbittorrent_ko.qm</file>
-  <file>lang/qbittorrent_nb.qm</file>
-  <file>lang/qbittorrent_sv.qm</file>
-  <file>lang/qbittorrent_de.qm</file>
-  <file>lang/qbittorrent_sr.qm</file>
-  <file>lang/qbittorrent_pt_BR.qm</file>
+  <file>lang/qbittorrent_hu.qm</file>
   <file>lang/qbittorrent_da.qm</file>
-  <file>lang/qbittorrent_cs.qm</file>
-  <file>lang/qbittorrent_pl.qm</file>
-  <file>lang/qbittorrent_bg.qm</file>
-  <file>lang/qbittorrent_ar.qm</file>
-  <file>lang/qbittorrent_es.qm</file>
-  <file>lang/qbittorrent_en.qm</file>
-  <file>lang/qbittorrent_hr.qm</file>
-  <file>lang/qbittorrent_ro.qm</file>
+  <file>lang/qbittorrent_de.qm</file>
+  <file>lang/qbittorrent_zh.qm</file>
+  <file>lang/qbittorrent_ja.qm</file>
+  <file>lang/qbittorrent_tr.qm</file>
+  <file>lang/qbittorrent_fr.qm</file>
 </qresource>
 </RCC>