Tagged v2.2.6 release

- BUGFIX: Improved reliability of torrent moving

.gitignore

@@ -1,14 +0,0 @@
-src/geoip/GeoIP.dat
-src/qbittorrent
-qbittorrent.pro.user
-conf.pri
-Makefile
-*.pyc
-*.log
-# Compiled object files
-*.o
-# Generated MOC, resource and UI files
-moc_*.cpp
-qrc_*.cpp
-ui_*.h
-*.moc

AUTHORS

@@ -2,21 +2,13 @@ Author:
 * Christophe Dumez <chris@qbittorrent.org>
 
 Contributors:
-* Vladimir Golovnev <glassez@yandex.ru>
 * 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
@@ -37,9 +29,9 @@ Images Authors:
   url: http://www.oxygen-icons.org
 
 * files: src/Icons/flags/*.png
-  copyright: Mark James <mjames@gmail.com>
+  copyright: Open Clip Art Library
-  license: Public Domain
+  license: Creative Commons Public Domain Dedication
-  url: http://www.famfamfam.com
+  url: http://www.openclipart.org
 
 * files: src/Icons/skin/*.png
   files: src/menuicons/YYxYY/*.png
@@ -50,10 +42,6 @@ Images Authors:
   copyright: Greg Houston <gregory.houston@gmail.com>
   license: MIT
 
-* file: src/Icons/skin/qbittorrent_mono*
-  copyright: Daniel Eguren <deguren@gmail.com>
-  license: LGPL
-
 * file: src/search_engine/engines/btjunkie.png
   copyright: Downloaded from btjunkie.org
 
@@ -73,32 +61,24 @@ Translations authors:
 * files: src/lang/*.ts
   copyright:
   - Arabic: SDERAWI (abz8868@msn.com) and sn51234 (nesseyan@gmail.com)
-  - Armenian: Hrant Ohanyan (hrantohanyan@mail.am)
-  - Basque: Xabier Aramendi (azpidatziak@gmail.com)
-  - Belarusian: Mihas Varantsou (meequz@gmail.com)
   - Brazilian: Nick Marinho (nickmarinho@gmail.com)
   - Bulgarian: Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net)
   - Catalan: Francisco Luque Contreras (frannoe@ya.com)
   - Chinese (Simplified): Guo Yue (yue.guo0418@gmail.com)
   - Chinese (Traditional): Yi-Shun Wang (dnextstep@gmail.com)
-  - Croatian: Oliver Mucafir (oliver.untwist@gmail.com)
   - Czech: Jirka Vilim (web@tets.cz)
   - Danish: Mathias Nielsen (comoneo@gmail.com)
-  - Dutch: Pieter Heyvaert (pieter_heyvaert@hotmail.com)
+  - Dutch: Joost Schipper (heavyjoost@users.sourceforge.net)
   - English: Christophe Dumez (chris@qbittorrent.org)
   - Finnish: Niklas Laxström (nikerabbit@users.sourceforge.net)
   - French: Christophe Dumez (chris@qbittorrent.org)
-  - Galician: Marcos Lans (marcoslansgarza@gmail.com)
-  - Georgian: Beqa Arabuli (arabulibeqa@yahoo.com)
   - German: Niels Hoffmann (zentralmaschine@users.sourceforge.net)
   - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net) and Stephanos Antaris (santaris@csd.auth.gr)
-  - Hebrew: David Deutsch (d.deffo@gmail.com)
   - Hungarian: Majoros Péter (majoros.j.p@t-online.hu)
-  - Italian: Matteo Sechi (bu17714@gmail.com)
+  - Italian: Mirko Ferrari (mirkoferrari@gmail.com) and Ferraro Luciano (luciano.ferraro@gmail.com)
-  - Japanese: Masato Hashimoto (cabezon.hashimoto@gmail.com)
+  - Japanese: Nardog (alphisation@gmail.com)
   - Korean: Jin Woo Sin (jin828sin@users.sourceforge.net)
-  - Lithuanian: Naglis Jonaitis (njonaitis@gmail.com)
+  - Norwegian: Lars-Erik Labori (hamil@users.sourceforge.net)
-  - Norwegian: Tomaso
   - Polish: Mariusz Fik (fisiu@opensuse.org)
   - Portuguese: Nick Marinho (nickmarinho@gmail.com)
   - Romanian: Obada Denis (obadadenis@users.sourceforge.net)
@@ -108,5 +88,5 @@ Translations authors:
   - Spanish: Francisco Luque Contreras (frannoe@ya.com)
   - Swedish: Daniel Nylander (po@danielnylander.se)
   - Turkish: Hasan Yilmaz (iletisim@hedefturkce.com)
-  - Ukrainian: Oleh Prypin (blaxpirit@gmail.com)
+  - Ukrainian: Andrey Shpachenko (masterfix@users.sourceforge.net) and Oleh Prypin (blaxpirit@gmail.com)
   license: GPLv2

Changelog

@@ -1,179 +1,60 @@
-* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v3.0.3
+* Sun Apr 18 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.6
-    - BUGFIX: Bypass cache when uploading a torrent file in Web UI (closes #68)
+    - BUGFIX: Announce to all trackers at once
-    - BUGFIX: "Completed On" column is not updated until restart (closes #84)
+    - BUGFIX: Added support for single-thread boost
-    - BUGFIX: Fix possible build error on some systems
+    - BUGFIX: Remove old folder when moving a torrent
-    - I18N: Add hebrew translation
+    - BUGFIX: Improved reliability of torrent moving
+    - BUGFIX: Stop rechecking torrents when they are moved
+    - BUGFIX: Status filters height stays correct when the visual style changes
+    - I18N: Added Arabic translation
 
-* Sat Sep 1 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.2
+* Wed Apr 07 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.5
-    - FEATURE: Add "clear" functionality to search field (closes #59)
+    - BUGFIX: Fix crash when adding a new torrent label
-    - BUGFIX: Attempt to use qBittorrent icon from theme if available (closes #49)
+    - BUGFIX: Fix HTTPS protocol support in torrent/rss downloader
-    - BUGFIX: Fix crash when a fastresume file is empty (closes #52)
+    - BUGFIX: Fix default width of file name column in torrent content
-    - BUGFIX: Fix encoding problem for detected XDG Download folder (closes #53)
+    - BUGFIX: Fix torrent addition dialog buttons height
-    - BUGFIX: Improve performance when showing torrent content panel (Improves #24)
+    - BUGFIX: Fix deprecation warnings with libtorrent v0.15
-    - BUGFIX: Fix label-based filtering of torrents whose label contains special characters
+    - BUGFIX: Fix "Download from URL" title size in Web UI
-    - BUGFIX: Fix possible crash due to labels (closes #64)
+    - BUGFIX: Fix transparency of speed limits icons
+    - BUGFIX: Dropped dependency on Qt gif library
+    - BUGFIX: Improved libboost detection by configure file
+    - BUGFIX: Bring back compatibility with boost v1.34
+    - COSMETIC: Added icons to menu actions in Web UI
 
-* Tue Aug 21 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.1
+* Tue Apr 06 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.4
-    - BUGFIX: Fix possible crash when adding a tracker to a magnet torrent without metadata (Closes #1034254)
+    - BUGFIX: Fix possible crash when adding a torrent
-    - BUGFIX: Remember queue position for torrents without metadata (closes #17)
+    - BUGFIX: Fix failure to remember some torrents on startup
-    - BUGFIX: Fix crash when using unauthorized characters in label names (closes #19)
+    - BUGFIX: Fix torrent addition window layout (torrent content not expanding)
-    - BUGFIX: Fix search plugins updating (closes #25)
+    - BUGFIX: Fix about dialog in Web UI
-    - BUGFIX: Make uTP connections rate limited by default
+    - BUGFIX: Correctly clear trackers error messages once they work
+    - BUGFIX: Display correct share ratio for paused torrents
+    - COSMETIC: Improved alternative speed limits icons
 
-* Thu Aug 09 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.0
+* Sun Apr 04 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.3
-    - FEATURE: Brand new torrent addition dialog
+    - BUGFIX: Fix possible crash when deleting a torrent just after pausing it
-    - FEATURE: Add the ability to choose the save path when using magnet links (mutoso)
+    - BUGFIX: Enable Apply button when alternative rate limits are changed
-    - FEATURE: Add support for adding multiple local torrents at once (Web UI)
+    - BUGFIX: Source compatibility with Windows (Thanks Ishan Arora)
-    - COSMETIC: Improve style of left panel
+    - BUGFIX: Source compatibility with eCS (OS/2) (Thanks Silvan Scherrer)
-    - BUGFIX: Lower panels no longer gets disabled
+    - BUGFIX: Cleaner binutils gold linker support
-    - BUGFIX: Major code refactoring and various optimizations.
+    - BUGFIX: Clean fix for progress display with cleanlooks style
-    - BUGFIX: No longer strip root folder from torrent files
-    - OTHER: Drop support for libtorrent v0.14.x
-    - OTHER: Drop support for Qt 4.5
 
-* Sat Oct 08 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.9.0
+* Mon Mar 22 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.2
-    - FEATURE: Add file association settings to program preferences (Windows)
+    - FEATURE: DHT port can be set from Web UI
-    - FEATURE: Add setting to ignore slow torrents in queueing system
+    - BUGFIX: Fix possible crash with folder scanning
-    - FEATURE: Add advanced setting to announce to all trackers
+    - BUGFIX: Fix Mac compilation
-    - FEATURE: Add support for anonymous mode (libtorrent >= v0.16)
+    - BUGFIX: Save fast resume data every 3 minutes (for robustness)
-    - FEATURE: Add quick "set as default save path" checkbox to torrent addition dialog (sledgehammer999)
+    - I18N: Updated Polish translation (thanks Szymon Świerkosz)
-    - BUGFIX: Add tray menu entry for toggling window visibility
-    - BUGFIX: Fix execution log lines selection and copying
-    - BUGFIX: Reduce CPU usage when running Web UI
-    - BUGFIX: Save RSS items to disk regularly for safety
-    - BUGFIX: Fix ratio calculation (use all_time_download)
-    - BUGFIX: Fix torrent upload issues (Web UI)
-    - BUGFIX: Fix some IE incompatibilities (Web UI)
-    - COSMETIC: Display speed at the beginning of the Window title
-    - COSMETIC: Several cosmetic fixes to the Web UI
-    - COSMETIC: Make top toolbar follow system style
-    - OTHER: Display libraries versions in about dialog (sledgehammer999)
-    - OTHER: Display qBittorrent version in Web UI about dialog
 
-* Thu Jun 02 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.8.0
+* Sat Mar 20 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.1
-    - FEATURE: Added full libtorrent v0.16 support (uTP, ...)
+    - FEATURE: Display pieces that are being downloaded
-    - FEATURE: Proxy can be disabled for peer connections
+    - FEATURE: Added back folder watching in Web UI
-    - FEATURE: Added support for secure SMTP connection (SSL)
+    - FEATURE: Added back file prioritizing in Web UI
-    - FEATURE: Added support for SMTP authentication
+    - BUGFIX: Fix compilation with Qt 4.4
-    - FEATURE: Added UPnP/NAT-PMP port forward for the Web UI port
+    - BUGFIX: Fix Web UI compatibility with Safari
-    - FEATURE: qBittorrent can update dynamic DNS services (DynDNS, no-ip)
+    - BUGFIX: Fix progress display with cleanlook style
-    - FEATURE: Display peer connection type in peer list (BT, uTP, Web)
+    - BUGFIX: Fix file filtering in complex torrents
-    - FEATURE: Added full regex support to RSS downloader
+    - BUGFIX: Ask for user confirmation for recursive torrent download
-    - FEATURE: Added regex help and validation in RSS downloader
+    - BUGFIX: Fix "add file" dialog in torrent creation tool
-    - FEATURE: Added HTTPS support to Web UI (Ishan Arora)
+    - BUGFIX: Fix "Ctrl+A" in Web UI
-    - BUGFIX: Change systray icon on the fly (no restart needed)
-    - BUGFIX: Remember peer-level rate limits (requires libtorrent v0.16)
-    - BUGFIX: Stop annoncing to trackers an all tiers (more respectful)
-    - BUGFIX: Stop sharing private trackers with other peers
-    - BUGFIX: Tracker exchange extension can be disabled
-    - BUGFIX: Cleaner program exit on system log out
-    - BUGFIX: Fix possible magnet link parsing problems
-    - BUGFIX: Fix possible RSS URL parsing problems
-    - COSMETIC: Added monochrome icon for light themes 
-
-* Sun Mar 20 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.7.0
-    - FEATURE: Added search field for torrent content
-    - FEATURE: Added auto-shutdown confirmation dialog
-    - FEATURE: Added option to skip torrent deletion confirmation (Ville Kiiskinen)
-    - FEATURE: IP address reported to trackers is now customizable
-    - FEATURE: Inhibit system sleep when torrents are active (Vladimir Golovnev)
-    - FEATURE: Added option to bypass Web UI authentication for localhost
-    - FEATURE: Added option to disable program exit confirmation
-    - FEATURE: Added per-torrent ratio limiting (Christian Kandeler)
-    - FEATURE: Torrent content list is now sortable
-    - BUGFIX: Fix compilation with namespaced Qt (Christian Kandeler)
-    - BUGFIX: Added length restriction on UI lock password
-    - COSMETIC: Added monochrome tray icon
-    - COSMETIC: Improved status bar's style
-    - OTHER: Make QtDBus dependency optional (X11)
-
-* Sun Jan 9 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.0
-    - FEATURE: Use system icons (Linux, Qt >= 4.6)
-    - FEATURE: Improved ETA calculation
-    - FEATURE: Simplify program preferences
-    - FEATURE: Software update check can now be disabled (Mac OS X / Windows)
-    - FEATURE: Display pieces size in torrent properties
-    - FEATURE: Added "Time Active/Seeded" column to transfer list
-    - FEATURE: Give feedback regarding the IP filter parsing
-    - FEATURE: Added a button to reload the IP filter
-    - FEATURE: Search engine results can now be opened in a Web browser
-    - FEATURE: Added a search engine plugin to extratorrent.com
-    - FEATURE: Added a search engine plugin for kickasstorrents.com
-    - FEATURE: Added auto-suspend upon downloads completion feature
-    - BUGFIX: Hide unwanted files that have to be partly downloaded
-    - BUGFIX: Do not allocate space for unwanted files (preallocation mode)
-    - I18N: Added Galician translation
-    - COSMETIC: Same deletion confirmation dialog in the GUI and Web UI
-    - COSMETIC: Simplified the top toolbar
-    - COSMETIC: Display execution log as a tab instead of a modal window
-
-* Sun Dec 5 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.5.0
-    - FEATURE: qBittorrent can now act as a tracker
-    - FEATURE: New and improved RSS feed automated downloader
-    - FEATURE: Added feature to shutdown qbittorrent on torrents completion
-    - FEATURE: Added a torrent import assistant to seed or keep downloading outside torrents
-    - FEATURE: qBittorrent can update itself from Sourceforge (Windows/Mac OS X only)
-    - FEATURE: Added a transfer list column to display the current tracker
-    - FEATURE: Remember the last trackers used in the torrent creation tool
-    - FEATURE: The optimal piece size is now automatically computed in the torrent creation tool
-    - FEATURE: Bring up the connection settings when clicking on the connection status icon
-    - FEATURE: Major code refactoring and optimization
-    - FEATURE: Added "Amount downloaded/left" columns to transfer list
-    - FEATURE: Simplified proxy settings
-    - FEATURE: Optimized and improved the peer country resolution code
-    - FEATURE: Download first/last pieces first when sequential download is
-    enabled (Thanks Ahmad)
-    - FEATURE: Download first/last pieces first now applies to all media files
-    in the torrent (Thanks Ahmad)
-    - BUGFIX: Fix SOCKS5 proxy authentication in search engine(closes #680072)
-    - BUGFIX: Fix two advanced settings (ignore limits on LAN and protocol
-    overhead inclusion in rate limiter)
-    - BUGFIX: Fix strict super seeding (was not working)
-    - BUGFIX: Improve magnet save path handling (closes #683395)
-    - BUGFIX: Disable overwrite confirmation in torrent addition dialog (closes # 685269)
-    - COSMETIC: Replaced message box by on-screen notification for download errors
-    - COSMETIC: Improved the torrent creation tool appearance
-    - COSMETIC: Use country flags by Mark James (Thanks to Dmytro Pukha)
-    - COSMETIC: Use bigger alternative speed icon
-    - OTHERS: Dropped support for Qt <= 4.4
-
-* 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

INSTALL

@@ -10,23 +10,25 @@ qBittorrent - A BitTorrent client in C++ / Qt4
   will install and execute qBittorrent hopefully without any problems.
 
   Dependencies:
-    - Qt >= 4.6.0 (libqtgui, libqtcore, libqtnetwork, libqtxml, libqtdbus/optional)
+    - Qt >= 4.4.0 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml)
 
     - pkg-config executable
 
-    - libtorrent-rasterbar by Arvid Norberg (>= 0.15.0)
+    - 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°) + libasio
+    - libboost 1.34.x (libboost-filesystem, libboost-thread, libboost-date-time) + libasio
       or
-    - libboost >= 1.35.x (libboost-system, libboost-filesystem°)
+    - libboost >= 1.35.x (libboost-system, libboost-filesystem, libboost-thread, libboost-date-time)
-      
-    °libboost-filesystem is not needed if libtorrent-rasterbar >= v0.16.x is used
 
     - 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
@@ -44,7 +46,7 @@ qBittorrent - A BitTorrent client in C++ / Qt4
 
     - pkg-config executable
 
-    - libtorrent-rasterbar by Arvid Norberg (>= v0.15.0)
+    - 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.
 

README.os2

@@ -27,6 +27,7 @@ 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
@@ -42,10 +43,7 @@ LIBS += -Lx:/trees/libtorrent/trunk/src/.libs \
 
 Of course all the above path references have to be adjusted to your build env.
 
-Now you can either do a normal build or a shadow build. A shadow build has the
+It should now be easy to build qBittorrent:
-advantage that no created files are in the same dir as the sources are.
-
-For a normal build do the following:
 
 Simply type:
 $ qmake
@@ -53,16 +51,6 @@ $ qmake
 Followed by:
 $ make
 
-For a shadow build do the following:
-given your sources are in x:\trees\qbittorrent\trunk create a 
-x:\trees\qbittorrent\build directory
-
-Now switch to the created directory and type:
-$ qmake ..\trunk
-
-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:

configure

@@ -18,24 +18,15 @@ Main options:
   --help              This help text.
 
 Dependency options:
-  --enable-debug                                  Enable debug mode
+  --disable-gui                      Disable qBittorrent Graphical user
-  --disable-gui                                   Disable qBittorrent
+                                    interface for headless running
-                                                 Graphical user interface for
+  --with-libboost-inc=[path]         Path to libboost include files
-                                                 headless running
+  --with-libboost-lib=[path]         Path to libboost library files
-  --disable-qt-dbus                              Disable use of qt-dbus
+  --disable-libnotify               Disable use of libnotify
-  --with-libboost-inc=[path]                      Path to libboost include
+  --disable-geoip-database          Disable use of geoip-database
-                                                 files
+  --with-geoip-database-embedded     Geoip Database will be embedded in
-  --with-libboost-lib=[path]                      Path to libboost library
+                                    qBittorrent executable (please follow
-                                                 files
+                                    instructions in src/geoip/README)
-  --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)
-  --with-qtsingleapplication=[system|shipped]     Use the shipped
-                                                 qtsingleapplication library
-                                                 or the system one
 
 EOT
 }
@@ -152,21 +143,11 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
-		--enable-debug)
-			QC_ENABLE_DEBUG="Y"
-			shift
-			;;
-
 		--disable-gui)
 			QC_DISABLE_GUI="Y"
 			shift
 			;;
 
-		--disable-qt-dbus)
-			QC_DISABLE_qt_dbus="Y"
-			shift
-			;;
-
 		--with-libboost-inc=*)
 			QC_WITH_LIBBOOST_INC=$optarg
 			shift
@@ -177,6 +158,11 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
+		--disable-libnotify)
+			QC_DISABLE_libnotify="Y"
+			shift
+			;;
+
 		--disable-geoip-database)
 			QC_DISABLE_geoip_database="Y"
 			shift
@@ -187,11 +173,6 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
-		--with-qtsingleapplication=*)
-			QC_WITH_QTSINGLEAPPLICATION=$optarg
-			shift
-			;;
-
 		--verbose)
 			QC_VERBOSE="Y"
 			shift
@@ -213,14 +194,12 @@ echo PREFIX=$PREFIX
 echo BINDIR=$BINDIR
 echo DATADIR=$DATADIR
 echo EX_QTDIR=$EX_QTDIR
-echo QC_ENABLE_DEBUG=$QC_ENABLE_DEBUG
 echo QC_DISABLE_GUI=$QC_DISABLE_GUI
-echo QC_DISABLE_qt_dbus=$QC_DISABLE_qt_dbus
 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_WITH_QTSINGLEAPPLICATION=$QC_WITH_QTSINGLEAPPLICATION
 echo
 fi
 
@@ -325,8 +304,7 @@ cat >$1/modules.cpp <<EOT
 #line 1 "qt4.qcm"
 /*
 -----BEGIN QCMOD-----
-name: Qt >= 4.6
+name: Qt >= 4.4
-arg: enable-debug, Enable debug mode
 arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
 -----END QCMOD-----
 */
@@ -334,61 +312,14 @@ class qc_qt4 : public ConfObj
 {
 public:
 	qc_qt4(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Qt >= 4.6"; }
+	QString name() const { return "Qt >= 4.4"; }
-	QString shortname() const { return "Qt 4.6"; }
+	QString shortname() const { return "Qt 4.4"; }
 	bool exec()
 	{
-                // NOX mode
 		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-			conf->addExtra("CONFIG += nox");
+			conf->addDefine("DISABLE_GUI");
-		}
+		}	
-                // Debug mode
+		return(QT_VERSION >= 0x040400);
-                if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) {
-                  conf->addExtra("CONFIG -= release");
-                  conf->addExtra("CONFIG += debug");
-                } else {
-                  conf->addExtra("CONFIG -= debug");
-                  conf->addExtra("CONFIG += release");
-                }
-                #ifdef Q_OS_FREEBSD
-                  conf->addLib("-lexecinfo");
-                  conf->addExtra("MANPREFIX = \$\$PREFIX");
-                #else
-                  conf->addExtra("MANPREFIX = \$\$PREFIX/share"); 
-                #endif
-		return(QT_VERSION >= 0x040600);
-	}
-};
-#line 1 "qt-dbus.qcm"
-/*
------BEGIN QCMOD-----
-name: qt-dbus
------END QCMOD-----
-*/
-// see  Conf::findPkgConfig
-class qc_qt_dbus : public ConfObj
-{
-public:
-	qc_qt_dbus(Conf *c) : ConfObj(c) {}
-	QString name() const { return "QtDBus >= 4.5"; }
-	QString shortname() const { return "qt-dbus"; }
-        QString checkString() const {
-                if(!conf->getenv("QC_DISABLE_qt_dbus").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
-                        return "";
-                return ConfObj::checkString();
-        }
-	bool exec(){
-                if(!conf->getenv("QC_DISABLE_qt_dbus").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
-                  return false;
-		QStringList incs;
-		QString req_ver = "4.5.0";
-		QString version, libs, other;
-		VersionMode mode = VersionMin;
-		if(conf->findPkgConfig("QtDBus", mode, req_ver, &version, &incs, &libs, &other)) {
-                        conf->addExtra("CONFIG += dbus");
-			return true;
-                }
-		return false;
 	}
 };
 #line 1 "pkg-config.qcm"
@@ -419,17 +350,35 @@ class qc_libtorrent_rasterbar : public ConfObj
 {
 public:
 	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent-rasterbar >= 0.15.0"; }
+	QString name() const { return "libtorrent-rasterbar >= 0.14.4"; }
 	QString shortname() const { return "libtorrent-rasterbar"; }
 	bool exec(){
 		QStringList incs;
-		QString req_ver = "0.15.0";
+		QString req_ver = "0.14.4";
+		QString adv_ver = "0.15.0";
 		QString version, libs, other;
 		VersionMode mode = VersionMin;
 		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other))
 			return false;
 		for(int n = 0; n < incs.count(); ++n)
 			conf->addIncludePath(incs[n]);
+		//if(!libs.isEmpty())
+		//	conf->addLib(libs);
+		if(conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other)) {
+                        //printf("\nWarning: libtorrent-rasterbar v%s was detected. Some feature will be disabled because they require v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
+		//else
+			conf->addDefine("LIBTORRENT_0_15");
+		}
+		// Get linking parameters
+		//QStringList params;
+		//QByteArray staticlibs;
+		//params << "--static" << "--libs" << "libtorrent-rasterbar";
+		//conf->doCommand("pkg-config", params, &staticlibs);
+		//conf->addLib(staticlibs.trimmed());
+		//libcrypto
+		if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+  		  conf->addLib("-lcrypto");
+                }
 		return true;
 	}
 };
@@ -442,15 +391,12 @@ arg: with-libboost-lib=[path], Path to libboost library files
 -----END QCMOD-----
 */
 #include <boost/version.hpp>
-#include <libtorrent/version.hpp>
-
 class qc_libboost : public ConfObj
 {
 public:
-  qc_libboost(Conf *c) : ConfObj(c) {}
+	qc_libboost(Conf *c) : ConfObj(c) {}
-  QString name() const { return "libboost"; }
+	QString name() const { return "libboost"; }
-  QString shortname() const { return "libboost"; }
+	QString shortname() const { return "libboost"; }
-
   QString findBoostLib(QString path, QString lib) const {
     QString name;
     QDir libDir(path);
@@ -474,62 +420,136 @@ public:
     }
     return name;
   }
-
+	bool exec(){
-  bool exec(){
+        	QString s;
-    QStringList sl;
+		s = conf->getenv("QC_WITH_LIBBOOST_INC");
-    QString s = conf->getenv("QC_WITH_LIBBOOST_INC");
+		if(!s.isEmpty()) {
-    if (!s.isEmpty())
+			if(!conf->checkHeader(s, "boost/format.hpp")) {
-      sl << s;
+				return false;
-    sl << "/usr/include";
+      			}
-    sl << "/usr/local/include";
+			if(!conf->checkHeader(s, "boost/date_time/posix_time/posix_time.hpp")) {
-    bool found = false;
+				return false;
-    foreach (s, sl) {
+      			}
-      if (conf->checkHeader(s, "boost/format.hpp")
+			if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
-#if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16
+				return false;
-          && conf->checkHeader(s, "boost/filesystem/path.hpp")
+      			}
-#endif
+			if(!conf->checkHeader(s, "boost/thread.hpp")) {
-         ) {
+				return false;
-        found = true;
+      			}
-        break;
+		}else{
-      }
+			QStringList sl;
-    }
+			sl << "/usr/include";
-    if (!found)
+			sl << "/usr/local/include";
-      return false;
+			bool found = false;
-
+			foreach(s, sl){
-    conf->addIncludePath(s);
+				if(conf->checkHeader(s, "boost/format.hpp")){
-
+					found = true;
-    // Find library
+					break;
-    s = conf->getenv("QC_WITH_LIBBOOST_LIB");
+				}
+			}
+			if(!found) {
+				return false;
+          		}
+			if(!conf->checkHeader(s, "boost/date_time/posix_time/posix_time.hpp")) {
+				return false;
+      			}
+			if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
+				return false;
+      			}
+			if(!conf->checkHeader(s, "boost/thread.hpp")) {
+				return false;
+      			}
+		}
+		conf->addIncludePath(s);
+		// Find library
+		s = conf->getenv("QC_WITH_LIBBOOST_LIB");
     QStringList required_libs;
 #if BOOST_VERSION >= 103500
       required_libs << "system"; 
 #endif
-#if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16
+    if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-    required_libs << "filesystem" ;
+      // Not required by nox
-#endif
+      required_libs << "filesystem" << "thread";
-    required_libs << "thread";
+    }
     QStringList libDirs;
-    if (!s.isEmpty())
-      libDirs << s;
     libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
-
     foreach(const QString& lib, required_libs) {
-      bool found = false;
+      if(!s.isEmpty()) {
-      foreach(const QString& libDir, libDirs) {
+        QString detected_name = findBoostLib(s, lib);
-        QString detected_name = findBoostLib(libDir, lib);
+        if(detected_name.isEmpty()) {
-        if(!detected_name.isEmpty()) {
+          printf("Could not find boost %s library!\n", qPrintable(lib));
+          return false;
+        } else {
           conf->addLib("-l"+detected_name);
-          found = true;
+        }
-          break;
+      } 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;
         }
       }
-      if(!found) {
-        printf("Could not find boost %s library!\n", qPrintable(lib));
-        return false;
-      }
     }
-    return true;
+		return true;
-  }
+	}
+};
+#line 1 "libnotify.qcm"
+/*
+-----BEGIN QCMOD-----
+name: libnotify
+-----END QCMOD-----
+*/
+// see  Conf::findPkgConfig
+class qc_libnotify : public ConfObj
+{
+public:
+	qc_libnotify(Conf *c) : ConfObj(c) {}
+	QString name() const { return "libnotify >= 0.4.2 (optional)"; }
+	QString shortname() const { return "libnotify"; }
+        QString checkString() const {
+                if(!conf->getenv("QC_DISABLE_libnotify").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
+                        return "";
+                return ConfObj::checkString();
+        }
+	bool exec(){
+		if(!conf->getenv("QC_DISABLE_libnotify").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+			return false;
+		}
+		QStringList incs;
+		QString req_ver = "0.4.2";
+		QString version, libs, other;
+		VersionMode mode = VersionMin;
+		if(conf->findPkgConfig("libnotify", mode, req_ver, &version, &incs, &libs, &other)) {
+			conf->addDefine("WITH_LIBNOTIFY");
+			for(int n = 0; n < incs.count(); ++n)
+				conf->addIncludePath(incs[n]);
+			if(!libs.isEmpty())
+				conf->addLib(libs);
+			QStringList incs2;
+			QString req_ver2 = "2.0";
+			QString version2, libs2, other2;
+			if(conf->findPkgConfig("glib-2.0", mode, req_ver2, &version2, &incs2, &libs2, &other2)) {
+				for(int n = 0; n < incs2.count(); ++n)
+				conf->addIncludePath(incs2[n]);
+				if(!libs2.isEmpty())
+					conf->addLib(libs2);
+			} else {
+				return false;
+			}
+		} else {
+			return false;
+		}
+		
+		return true;
+	}
 };
 #line 1 "geoip-database.qcm"
 /*
@@ -569,42 +589,12 @@ public:
 #endif
 	}
 };
-#line 1 "qtsingleapplication.qcm"
-/*
------BEGIN QCMOD-----
-name: qtsingleapplication
-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->addExtra("CONFIG += usesystemqtsingleapplication");
-                  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_qt_dbus(conf);
-    o->required = false;
-    o->disabled = false;
     o = new qc_pkg_config(conf);
     o->required = true;
     o->disabled = false;
@@ -614,11 +604,11 @@ cat >$1/modules_new.cpp <<EOT
     o = new qc_libboost(conf);
     o->required = true;
     o->disabled = false;
-    o = new qc_geoip_database(conf);
+    o = new qc_libnotify(conf);
     o->required = false;
     o->disabled = false;
-    o = new qc_qtsingleapplication(conf);
+    o = new qc_geoip_database(conf);
-    o->required = true;
+    o->required = false;
     o->disabled = false;
 
 EOT
@@ -1565,14 +1555,12 @@ export PREFIX
 export BINDIR
 export DATADIR
 export EX_QTDIR
-export QC_ENABLE_DEBUG
 export QC_DISABLE_GUI
-export QC_DISABLE_qt_dbus
 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_WITH_QTSINGLEAPPLICATION
 export QC_VERBOSE
 rm -rf .qconftemp
 (

install.os2

@@ -1,182 +0,0 @@
-QBittorrent installation
-
-
-
-0. CONTENTS OF THIS FILE
-========================
-
-1. INTRODUCTION
-
-2. REQUIREMENTS
-
-3. INSTALLATION
-
-4. BUGREPORTS
-
-5. CREDITS
-
-6. SUPPORT AND DONATIONS
-
-7. HISTORY
-
-
-1. INTRODUCTION
-===============
-
-Welcome to QBittorrent port for OS/2 and eComStation.
-
-
-2. REQUIREMENTS
-===============
-
-The following requirements can be installed either by rpm or by zip files.
-
-RPM Installation:
-
-klibc
------
-
-  1. yum install libc
-
-openssl 1.0
------------
-
-  1. yum install openssl
-
-pthread
--------
-
-  1. yum install pthread
-
-GCC4Core
---------
-
-  1. yum install libgcc
-  2. yum install gcc-stack-protector
-  3. yum install gcc-stdc++-shared-library
-  4. yum install gcc-supc++-shared-library
-
-Qt4 dll
--------
-
-  1. yum install libqt4
-
-
-ZIP Installation:
-
-klibc
------
-
-  1. Download klibc 0.6.5 or better (see http://svn.netlabs.org/libc for more information)
-  2. Install the files to your libpath eg x:\ecs\dll
-
-openssl 1.0
------------
-
-  1. Download the zip file from http://rpm.netlabs.org/release/00/zip
-  2. Install the files to your libpath eg. x:\ecs\dll
-
-pthread
--------
-
-  1. Download pthread 2012-03-13 or better from http://rpm.netlabs.org/release/00/zip
-  2. Install the files to your libpath eg. x:\ecs\dll
-
-GCC4Core
---------
-
-  1. Download GCC4Core 1.2.1 or better from http://ftp.netlabs.org/pub/gcc
-  2. Install the files to your libpath eg. x:\ecs\dll
-
-Qt4 dll
--------
-
-  1. Download Qt4 4.7.3 or better (see http://svn.netlabs.org/qt4 for more information)
-  2. Install the files according to the readme
-
-
-3. INSTALLATION
-===============
-          
-To install QBittorrent, do the following:
-
-  1. Create a directory for QBittorrent.
-  2. Extract the QBittorrent package to the new directory.
-  3. Create a WPS object for QBittorrent.exe.
-  4. Start QBittorrent
-  5. Happy torrenting
-  
-
-4. BUGREPORTS
-=============
-
-Please create bugreports at http://svn.netlabs.org/qtapps
-Only bug reports with a reproducable bug are accepted. :-)
-
-
-5. CREDITS
-==========
-
-The port was done by:
-
-Silvan Scherrer aka _diver
-
-Thanks go to:
-
-  * Dmitry A. Kuminov
-
-They either helped me when I had some nasty questions or did some testing for
-me.
-
-
-6. SUPPORT AND DONATIONS
-========================
-
-QBittorrent port is based on volunteer work. If you would like to support further
-development, you can do so in one of the following ways:
-
-
-  * Donate to the Qt4 project: see qt.netlabs.org for more information
-
-  * Contribute to the project: Besides actual development, this also includes
-    maintaining the documentation and the project web site as well as help
-    for users.
-
-
-7. HISTORY
-==========
-
-2012-09-06
-
-  * updated to 3.0.2 code level of QBittorrent
-
-2012-05-14
-
-  * updated to 2.9.8 code level of QBittorrent
-
-2012-03-15
-
-  * updated to 2.9.5 code level of QBittorrent
-
-2011-09-26
-
-  * updated to 2.8.5 code level of QBittorrent
-  * updated to Qt 4.7.3
-
-2011-06-20
-
-  * updated to 2.7.3 code level of QBittorrent
-  * updated libtorrent to 0.15.6 level
-
-2010-12-23
-
-  * updated to 2.5.2 code level of QBittorrent
-
-2010-11-22
-
-  * updated to 2.4.11 code level of QBittorrent
-
-2010-xx-xx
-
-  * initial port
-

macxconf.pri

@@ -1,31 +0,0 @@
-PREFIX = /usr/local
-BINDIR = /usr/local/bin
-DATADIR = /usr/local/share
-
-# Use pkg-config to get all necessary libtorrent DEFINES
-CONFIG += link_pkgconfig
-PKGCONFIG += libtorrent-rasterbar
-DEFINES += BOOST_ASIO_DYN_LINK
-
-# Special include/libs paths (macports)
-INCLUDEPATH += /usr/include/openssl /usr/include /opt/local/include/boost /opt/local/include
-LIBS += -L/opt/local/lib
-
-# OpenSSL lib
-LIBS += -lssl -lcrypto
-# Boost system lib
-LIBS += -lboost_system-mt
-# Boost filesystem lib (Not needed for libtorrent >= 0.16.0)
-LIBS += -lboost_filesystem-mt
-# Carbon
-LIBS += -framework Carbon -framework IOKit
-
-document_icon.path = Contents/Resources
-document_icon.files = Icons/qBitTorrentDocument.icns
-
-QMAKE_BUNDLE_DATA += document_icon
-ICON = Icons/qbittorrent_mac.icns
-QMAKE_INFO_PLIST = Info.plist
-
-DEFINES += WITH_GEOIP_EMBEDDED
-message("On Mac OS X, GeoIP database must be embedded.")

os2conf.pri

@@ -1,18 +0,0 @@
-exists(conf.pri) {
-    # to the conf.pri goes all system dependent stuff
-    include(conf.pri)
-}
-
-LIBS += -ltorrent-rasterbar \
-        -lboost_thread \
-        -lboost_system \
-        -lboost_filesystem \
-        -lssl -lcrypto -lidn -lpthread
-
-RC_FILE = qbittorrent_os2.rc
-
-# LIBTORRENT DEFINES
-DEFINES += WITH_SHIPPED_GEOIP_H
-
-DEFINES += WITH_GEOIP_EMBEDDED
-message("On eCS(OS/2), GeoIP database must be embedded.")

qBittorrent.kdevelop

@@ -0,0 +1,199 @@
+<?xml version = '1.0'?>
+<kdevelop>
+  <general>
+    <author>Christophe Dumez</author>
+    <email>chris@qbittorrent.org</email>
+    <version>1.0.0</version>
+    <projectmanagement>KDevTrollProject</projectmanagement>
+    <primarylanguage>C++</primarylanguage>
+    <keywords>
+      <keyword>Qt</keyword>
+    </keywords>
+    <projectname>qBittorrent</projectname>
+    <ignoreparts/>
+    <projectdirectory>.</projectdirectory>
+    <absoluteprojectpath>false</absoluteprojectpath>
+    <description/>
+    <defaultencoding/>
+    <versioncontrol>kdevsubversion</versioncontrol>
+  </general>
+  <kdevfileview>
+    <groups>
+      <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
+      <group pattern="*.ui" name="User Interface" />
+      <group pattern="*.png" name="Icons" />
+      <group pattern="*" name="Others" />
+      <hidenonprojectfiles>false</hidenonprojectfiles>
+      <hidenonlocation>false</hidenonlocation>
+    </groups>
+    <tree>
+      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
+      <hidenonprojectfiles>false</hidenonprojectfiles>
+      <showvcsfields>false</showvcsfields>
+    </tree>
+  </kdevfileview>
+  <kdevdoctreeview>
+    <ignoretocs>
+      <toc>bash</toc>
+      <toc>bash_bugs</toc>
+      <toc>clanlib</toc>
+      <toc>w3c-dom-level2-html</toc>
+      <toc>fortran_bugs_gcc</toc>
+      <toc>gnome1</toc>
+      <toc>gnustep</toc>
+      <toc>gtk</toc>
+      <toc>gtk_bugs</toc>
+      <toc>haskell</toc>
+      <toc>haskell_bugs_ghc</toc>
+      <toc>java_bugs_gcc</toc>
+      <toc>java_bugs_sun</toc>
+      <toc>kde2book</toc>
+      <toc>opengl</toc>
+      <toc>pascal_bugs_fp</toc>
+      <toc>php</toc>
+      <toc>php_bugs</toc>
+      <toc>perl</toc>
+      <toc>perl_bugs</toc>
+      <toc>python</toc>
+      <toc>python_bugs</toc>
+      <toc>qt-kdev3</toc>
+      <toc>ruby</toc>
+      <toc>ruby_bugs</toc>
+      <toc>sdl</toc>
+      <toc>stl</toc>
+      <toc>w3c-svg</toc>
+      <toc>sw</toc>
+      <toc>w3c-uaag10</toc>
+      <toc>wxwidgets_bugs</toc>
+    </ignoretocs>
+    <ignoredoxygen>
+      <toc>KDE Libraries (Doxygen)</toc>
+    </ignoredoxygen>
+  </kdevdoctreeview>
+  <kdevdebugger>
+    <general>
+      <dbgshell/>
+      <gdbpath/>
+      <configGdbScript/>
+      <runShellScript/>
+      <runGdbScript/>
+      <breakonloadinglibs>true</breakonloadinglibs>
+      <separatetty>false</separatetty>
+      <floatingtoolbar>false</floatingtoolbar>
+    </general>
+    <display>
+      <staticmembers>false</staticmembers>
+      <demanglenames>true</demanglenames>
+      <outputradix>10</outputradix>
+    </display>
+  </kdevdebugger>
+  <kdevcppsupport>
+    <qt>
+      <version>4</version>
+      <used>true</used>
+      <includestyle>4</includestyle>
+      <designerintegration>ExternalDesigner</designerintegration>
+      <root>/usr/lib/qt4</root>
+      <qmake>/usr/bin/qmake</qmake>
+      <designer>/usr/bin/designer</designer>
+      <designerpluginpaths/>
+    </qt>
+    <references>
+      <pcs>automatic_%2Fhome%2Fishanarora%2Fprojects%2Fqbittorrent</pcs>
+    </references>
+    <codecompletion>
+      <automaticCodeCompletion>true</automaticCodeCompletion>
+      <automaticArgumentsHint>true</automaticArgumentsHint>
+      <automaticHeaderCompletion>true</automaticHeaderCompletion>
+      <codeCompletionDelay>250</codeCompletionDelay>
+      <argumentsHintDelay>400</argumentsHintDelay>
+      <headerCompletionDelay>250</headerCompletionDelay>
+      <showOnlyAccessibleItems>false</showOnlyAccessibleItems>
+      <completionBoxItemOrder>0</completionBoxItemOrder>
+      <howEvaluationContextMenu>true</howEvaluationContextMenu>
+      <showCommentWithArgumentHint>true</showCommentWithArgumentHint>
+      <statusBarTypeEvaluation>false</statusBarTypeEvaluation>
+      <namespaceAliases>std=_GLIBCXX_STD;__gnu_cxx=std</namespaceAliases>
+      <processPrimaryTypes>true</processPrimaryTypes>
+      <processFunctionArguments>true</processFunctionArguments>
+      <preProcessAllHeaders>true</preProcessAllHeaders>
+      <parseMissingHeadersExperimental>true</parseMissingHeadersExperimental>
+      <resolveIncludePathsUsingMakeExperimental>true</resolveIncludePathsUsingMakeExperimental>
+      <alwaysParseInBackground>true</alwaysParseInBackground>
+      <usePermanentCaching>true</usePermanentCaching>
+      <alwaysIncludeNamespaces>false</alwaysIncludeNamespaces>
+      <includePaths>.;</includePaths>
+    </codecompletion>
+    <creategettersetter>
+      <prefixGet>get</prefixGet>
+      <prefixSet>set</prefixSet>
+      <prefixVariable>m_,_</prefixVariable>
+      <parameterName>theValue</parameterName>
+      <inlineGet>true</inlineGet>
+      <inlineSet>true</inlineSet>
+    </creategettersetter>
+    <splitheadersource>
+      <enabled>false</enabled>
+      <synchronize>true</synchronize>
+      <orientation>Vertical</orientation>
+    </splitheadersource>
+  </kdevcppsupport>
+  <kdevfilecreate>
+    <filetypes/>
+    <useglobaltypes>
+      <type ext="ui" />
+      <type ext="cpp" />
+      <type ext="h" />
+    </useglobaltypes>
+  </kdevfilecreate>
+  <kdevtrollproject>
+    <general>
+      <activedir>src</activedir>
+    </general>
+    <run>
+      <directoryradio>executable</directoryradio>
+      <mainprogram>/home/ishanarora/projects/qbittorrent/src/qbittorrent</mainprogram>
+      <programargs/>
+      <globaldebugarguments/>
+      <globalcwd>/home/ishanarora/projects/qbittorrent</globalcwd>
+      <useglobalprogram>true</useglobalprogram>
+      <terminal>false</terminal>
+      <autocompile>true</autocompile>
+      <autoinstall>false</autoinstall>
+      <autokdesu>false</autokdesu>
+      <envvars/>
+    </run>
+    <make>
+      <abortonerror>true</abortonerror>
+      <runmultiplejobs>false</runmultiplejobs>
+      <numberofjobs>1</numberofjobs>
+      <dontact>false</dontact>
+      <makebin/>
+      <prio>0</prio>
+      <envvars/>
+    </make>
+    <qmake>
+      <savebehaviour>2</savebehaviour>
+      <replacePaths>false</replacePaths>
+      <disableDefaultOpts>true</disableDefaultOpts>
+    </qmake>
+  </kdevtrollproject>
+  <cppsupportpart>
+    <filetemplates>
+      <interfacesuffix>.h</interfacesuffix>
+      <implementationsuffix>.cpp</implementationsuffix>
+    </filetemplates>
+  </cppsupportpart>
+  <ctagspart>
+    <customArguments/>
+    <customTagfilePath>/home/ishanarora/projects/qbittorrent/tags</customTagfilePath>
+    <activeTagsFiles/>
+  </ctagspart>
+  <kdevdocumentation>
+    <projectdoc>
+      <docsystem/>
+      <docurl/>
+      <usermanualurl/>
+    </projectdoc>
+  </kdevdocumentation>
+</kdevelop>

qbittorrent.pro

@@ -2,17 +2,3 @@ TEMPLATE = subdirs
 
 SUBDIRS += src
 
-include(version.pri)
-
-# Dist
-dist.commands += rm -fR ../$${PROJECT_NAME}-$${PROJECT_VERSION}/ &&
-dist.commands += git clone . ../$${PROJECT_NAME}-$${PROJECT_VERSION} &&
-dist.commands += rm -fR ../$${PROJECT_NAME}-$${PROJECT_VERSION}/.git &&
-dist.commands += rm -f ../$${PROJECT_NAME}-$${PROJECT_VERSION}/.gitignore &&
-dist.commands += cd .. &&
-dist.commands += tar czf $${PROJECT_NAME}-$${PROJECT_VERSION}.tar.gz $${PROJECT_NAME}-$${PROJECT_VERSION} &&
-dist.commands += tar cf $${PROJECT_NAME}-$${PROJECT_VERSION}.tar $${PROJECT_NAME}-$${PROJECT_VERSION} &&
-dist.commands += xz -f $${PROJECT_NAME}-$${PROJECT_VERSION}.tar &&
-dist.commands += rm -fR $${PROJECT_NAME}-$${PROJECT_VERSION}
-
-QMAKE_EXTRA_TARGETS += dist

qbittorrent.qc

@@ -6,8 +6,6 @@
   <dep type='qt4'>
     <required/>
   </dep>
-  <dep type='qt-dbus'>
-  </dep>
   <dep type='pkg-config'>
     <required/>
   </dep>
@@ -17,9 +15,8 @@
   <dep type='libboost'>
     <required/>
   </dep>
+  <dep type='libnotify'>
+  </dep>
   <dep type='geoip-database'>
   </dep>
-  <dep type='qtsingleapplication'>
-    <required/>
-  </dep>
 </qconf>

qcm/libboost.qcm

@@ -6,15 +6,12 @@ arg: with-libboost-lib=[path], Path to libboost library files
 -----END QCMOD-----
 */
 #include <boost/version.hpp>
-#include <libtorrent/version.hpp>
-
 class qc_libboost : public ConfObj
 {
 public:
-  qc_libboost(Conf *c) : ConfObj(c) {}
+	qc_libboost(Conf *c) : ConfObj(c) {}
-  QString name() const { return "libboost"; }
+	QString name() const { return "libboost"; }
-  QString shortname() const { return "libboost"; }
+	QString shortname() const { return "libboost"; }
-
   QString findBoostLib(QString path, QString lib) const {
     QString name;
     QDir libDir(path);
@@ -38,60 +35,84 @@ public:
     }
     return name;
   }
-
+	bool exec(){
-  bool exec(){
+        	QString s;
-    QStringList sl;
+		s = conf->getenv("QC_WITH_LIBBOOST_INC");
-    QString s = conf->getenv("QC_WITH_LIBBOOST_INC");
+		if(!s.isEmpty()) {
-    if (!s.isEmpty())
+			if(!conf->checkHeader(s, "boost/format.hpp")) {
-      sl << s;
+				return false;
-    sl << "/usr/include";
+      			}
-    sl << "/usr/local/include";
+			if(!conf->checkHeader(s, "boost/date_time/posix_time/posix_time.hpp")) {
-    bool found = false;
+				return false;
-    foreach (s, sl) {
+      			}
-      if (conf->checkHeader(s, "boost/format.hpp")
+			if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
-#if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16
+				return false;
-          && conf->checkHeader(s, "boost/filesystem/path.hpp")
+      			}
-#endif
+			if(!conf->checkHeader(s, "boost/thread.hpp")) {
-         ) {
+				return false;
-        found = true;
+      			}
-        break;
+		}else{
-      }
+			QStringList sl;
-    }
+			sl << "/usr/include";
-    if (!found)
+			sl << "/usr/local/include";
-      return false;
+			bool found = false;
-
+			foreach(s, sl){
-    conf->addIncludePath(s);
+				if(conf->checkHeader(s, "boost/format.hpp")){
-
+					found = true;
-    // Find library
+					break;
-    s = conf->getenv("QC_WITH_LIBBOOST_LIB");
+				}
+			}
+			if(!found) {
+				return false;
+          		}
+			if(!conf->checkHeader(s, "boost/date_time/posix_time/posix_time.hpp")) {
+				return false;
+      			}
+			if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
+				return false;
+      			}
+			if(!conf->checkHeader(s, "boost/thread.hpp")) {
+				return false;
+      			}
+		}
+		conf->addIncludePath(s);
+		// Find library
+		s = conf->getenv("QC_WITH_LIBBOOST_LIB");
     QStringList required_libs;
 #if BOOST_VERSION >= 103500
       required_libs << "system"; 
 #endif
-#if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16
+    if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-    required_libs << "filesystem" ;
+      // Not required by nox
-#endif
+      required_libs << "filesystem" << "thread";
-    required_libs << "thread";
+    }
     QStringList libDirs;
-    if (!s.isEmpty())
-      libDirs << s;
     libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
-
     foreach(const QString& lib, required_libs) {
-      bool found = false;
+      if(!s.isEmpty()) {
-      foreach(const QString& libDir, libDirs) {
+        QString detected_name = findBoostLib(s, lib);
-        QString detected_name = findBoostLib(libDir, lib);
+        if(detected_name.isEmpty()) {
-        if(!detected_name.isEmpty()) {
+          printf("Could not find boost %s library!\n", qPrintable(lib));
+          return false;
+        } else {
           conf->addLib("-l"+detected_name);
-          found = true;
+        }
-          break;
+      } 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;
         }
       }
-      if(!found) {
-        printf("Could not find boost %s library!\n", qPrintable(lib));
-        return false;
-      }
     }
-    return true;
+		return true;
-  }
+	}
 };

qcm/libnotify.qcm

@@ -24,7 +24,7 @@ public:
 		QString version, libs, other;
 		VersionMode mode = VersionMin;
 		if(conf->findPkgConfig("libnotify", mode, req_ver, &version, &incs, &libs, &other)) {
-			conf->addExtra("CONFIG += libnotify");
+			conf->addDefine("WITH_LIBNOTIFY");
 			for(int n = 0; n < incs.count(); ++n)
 				conf->addIncludePath(incs[n]);
 			if(!libs.isEmpty())
@@ -40,21 +40,10 @@ 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;
 		}
-
+		
 		return true;
 	}
 };

qcm/libtorrent-rasterbar.qcm

@@ -8,17 +8,35 @@ class qc_libtorrent_rasterbar : public ConfObj
 {
 public:
 	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent-rasterbar >= 0.15.0"; }
+	QString name() const { return "libtorrent-rasterbar >= 0.14.4"; }
 	QString shortname() const { return "libtorrent-rasterbar"; }
 	bool exec(){
 		QStringList incs;
-		QString req_ver = "0.15.0";
+		QString req_ver = "0.14.4";
+		QString adv_ver = "0.15.0";
 		QString version, libs, other;
 		VersionMode mode = VersionMin;
 		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other))
 			return false;
 		for(int n = 0; n < incs.count(); ++n)
 			conf->addIncludePath(incs[n]);
+		//if(!libs.isEmpty())
+		//	conf->addLib(libs);
+		if(conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other)) {
+                        //printf("\nWarning: libtorrent-rasterbar v%s was detected. Some feature will be disabled because they require v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
+		//else
+			conf->addDefine("LIBTORRENT_0_15");
+		}
+		// Get linking parameters
+		//QStringList params;
+		//QByteArray staticlibs;
+		//params << "--static" << "--libs" << "libtorrent-rasterbar";
+		//conf->doCommand("pkg-config", params, &staticlibs);
+		//conf->addLib(staticlibs.trimmed());
+		//libcrypto
+		if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+  		  conf->addLib("-lcrypto");
+                }
 		return true;
 	}
 };

qcm/qt-dbus.qcm

@@ -1,31 +0,0 @@
-/*
------BEGIN QCMOD-----
-name: qt-dbus
------END QCMOD-----
-*/
-// see  Conf::findPkgConfig
-class qc_qt_dbus : public ConfObj
-{
-public:
-	qc_qt_dbus(Conf *c) : ConfObj(c) {}
-	QString name() const { return "QtDBus >= 4.5"; }
-	QString shortname() const { return "qt-dbus"; }
-        QString checkString() const {
-                if(!conf->getenv("QC_DISABLE_qt_dbus").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
-                        return "";
-                return ConfObj::checkString();
-        }
-	bool exec(){
-                if(!conf->getenv("QC_DISABLE_qt_dbus").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
-                  return false;
-		QStringList incs;
-		QString req_ver = "4.5.0";
-		QString version, libs, other;
-		VersionMode mode = VersionMin;
-		if(conf->findPkgConfig("QtDBus", mode, req_ver, &version, &incs, &libs, &other)) {
-                        conf->addExtra("CONFIG += dbus");
-			return true;
-                }
-		return false;
-	}
-};

qcm/qt-svg.qcm

@@ -1,31 +0,0 @@
-/*
------BEGIN QCMOD-----
-name: qt-svg
------END QCMOD-----
-*/
-// see  Conf::findPkgConfig
-class qc_qt_svg : public ConfObj
-{
-public:
-	qc_qt_svg(Conf *c) : ConfObj(c) {}
-	QString name() const { return "QtSvg >= 4.5"; }
-	QString shortname() const { return "qt-svg"; }
-        QString checkString() const {
-                if(!conf->getenv("QC_DISABLE_qt_svg").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
-                        return "";
-                return ConfObj::checkString();
-        }
-	bool exec(){
-                if(!conf->getenv("QC_DISABLE_qt_svg").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
-                  return false;
-		QStringList incs;
-		QString req_ver = "4.5.0";
-		QString version, libs, other;
-		VersionMode mode = VersionMin;
-		if(conf->findPkgConfig("QtSvg", mode, req_ver, &version, &incs, &libs, &other)) {
-                        conf->addExtra("CONFIG += svg");
-			return true;
-                }
-		return false;
-	}
-};

qcm/qt4.qcm

@@ -1,7 +1,6 @@
 /*
 -----BEGIN QCMOD-----
-name: Qt >= 4.6
+name: Qt >= 4.4
-arg: enable-debug, Enable debug mode
 arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
 -----END QCMOD-----
 */
@@ -9,28 +8,13 @@ class qc_qt4 : public ConfObj
 {
 public:
 	qc_qt4(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Qt >= 4.6"; }
+	QString name() const { return "Qt >= 4.4"; }
-	QString shortname() const { return "Qt 4.6"; }
+	QString shortname() const { return "Qt 4.4"; }
 	bool exec()
 	{
-                // NOX mode
 		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-			conf->addExtra("CONFIG += nox");
+			conf->addDefine("DISABLE_GUI");
-		}
+		}	
-                // Debug mode
+		return(QT_VERSION >= 0x040400);
-                if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) {
-                  conf->addExtra("CONFIG -= release");
-                  conf->addExtra("CONFIG += debug");
-                } else {
-                  conf->addExtra("CONFIG -= debug");
-                  conf->addExtra("CONFIG += release");
-                }
-                #ifdef Q_OS_FREEBSD
-                  conf->addLib("-lexecinfo");
-                  conf->addExtra("MANPREFIX = $$PREFIX");
-                #else
-                  conf->addExtra("MANPREFIX = $$PREFIX/share"); 
-                #endif
-		return(QT_VERSION >= 0x040600);
 	}
 };

qcm/qtsingleapplication.qcm

@@ -1,26 +0,0 @@
-/*
------BEGIN QCMOD-----
-name: qtsingleapplication
-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->addExtra("CONFIG += usesystemqtsingleapplication");
-                  printf(" [system] ");
-                } else {
-                  printf(" [shipped] ");
-                }
-                return true;
-        }
-};

src/GUI.cpp

@@ -0,0 +1,990 @@
+/*
+ * 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
+ */
+#ifdef WITH_LIBNOTIFY
+#include <glib.h>
+#include <unistd.h>
+#include <libnotify/notify.h>
+#endif
+
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QTimer>
+#include <QDesktopServices>
+#include <QStatusBar>
+#include <QClipboard>
+#include <QLocalServer>
+#include <QLocalSocket>
+#include <QCloseEvent>
+#include <QShortcut>
+
+#include "GUI.h"
+#include "transferlistwidget.h"
+#include "misc.h"
+#include "createtorrent_imp.h"
+#include "downloadfromurldlg.h"
+#include "torrentadditiondlg.h"
+#include "searchengine.h"
+#include "rss_imp.h"
+#include "bittorrent.h"
+#include "about_imp.h"
+#include "trackerlogin.h"
+#include "options_imp.h"
+#include "speedlimitdlg.h"
+#include "preferences.h"
+#include "console_imp.h"
+#include "trackerlist.h"
+#include "peerlistwidget.h"
+#include "torrentpersistentdata.h"
+#include "transferlistfilterswidget.h"
+#include "propertieswidget.h"
+#include "statusbar.h"
+
+#ifdef Q_WS_WIN
+#include <windows.h>
+const int UNLEN = 256;
+#endif
+
+using namespace libtorrent;
+
+#define TIME_TRAY_BALLOON 5000
+
+/*****************************************************
+ *                                                   *
+ *                       GUI                         *
+ *                                                   *
+ *****************************************************/
+
+// Constructor
+GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), displaySpeedInTitle(false), force_exit(false) {
+  setupUi(this);
+
+  setWindowTitle(tr("qBittorrent %1", "e.g: qBittorrent v0.x").arg(QString::fromUtf8(VERSION)));
+  // Setting icons
+  this->setWindowIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png")));
+  actionOpen->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/open.png")));
+  actionExit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/exit.png")));
+  actionDownload_from_URL->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/url.png")));
+  actionOptions->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/settings.png")));
+  actionAbout->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/info.png")));
+  actionWebsite->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png")));
+  actionBugReport->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/bug.png")));
+  actionStart->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/play.png")));
+  actionPause->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/pause.png")));
+  actionDelete->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/delete.png")));
+  actionPause_All->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/pause_all.png")));
+  actionStart_All->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/play_all.png")));
+  actionClearLog->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/delete.png")));
+  actionPreview_file->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/preview.png")));
+  actionSet_upload_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png")));
+  actionSet_download_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/download.png")));
+  actionSet_global_upload_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png")));
+  actionSet_global_download_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/download.png")));
+  actionDocumentation->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/qb_question.png")));
+  prioSeparator = toolBar->insertSeparator(actionDecreasePriority);
+  prioSeparator2 = menu_Edit->insertSeparator(actionDecreasePriority);
+  prioSeparator->setVisible(false);
+  prioSeparator2->setVisible(false);
+  actionCreate_torrent->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/new.png")));
+  // Fix Tool bar layout
+  toolBar->layout()->setSpacing(7);
+  // Creating Bittorrent session
+  BTSession = new Bittorrent();
+  connect(BTSession, SIGNAL(fullDiskError(QTorrentHandle&, QString)), this, SLOT(fullDiskError(QTorrentHandle&, QString)));
+  connect(BTSession, SIGNAL(finishedTorrent(QTorrentHandle&)), this, SLOT(finishedTorrent(QTorrentHandle&)));
+  connect(BTSession, SIGNAL(trackerAuthenticationRequired(QTorrentHandle&)), this, SLOT(trackerAuthenticationRequired(QTorrentHandle&)));
+  connect(BTSession, SIGNAL(newDownloadedTorrent(QString, QString)), this, SLOT(processDownloadedFiles(QString, QString)));
+  connect(BTSession, SIGNAL(downloadFromUrlFailure(QString, QString)), this, SLOT(handleDownloadFromUrlFailure(QString, QString)));
+  connect(BTSession, SIGNAL(alternativeSpeedsModeChanged(bool)), this, SLOT(updateAltSpeedsBtn(bool)));
+  connect(BTSession, SIGNAL(recursiveTorrentDownloadPossible(QTorrentHandle&)), this, SLOT(askRecursiveTorrentDownloadConfirmation(QTorrentHandle&)));
+
+  qDebug("create tabWidget");
+  tabs = new QTabWidget();
+  connect(tabs, SIGNAL(currentChanged(int)), this, SLOT(tab_changed(int)));
+  vSplitter = new QSplitter(Qt::Horizontal);
+  //vSplitter->setChildrenCollapsible(false);
+  hSplitter = new QSplitter(Qt::Vertical);
+  hSplitter->setChildrenCollapsible(false);
+
+  // Transfer List tab
+  transferList = new TransferListWidget(hSplitter, this, BTSession);
+  properties = new PropertiesWidget(hSplitter, this, transferList, BTSession);
+  transferListFilters = new TransferListFiltersWidget(vSplitter, transferList);
+  hSplitter->addWidget(transferList);
+  hSplitter->addWidget(properties);
+  vSplitter->addWidget(transferListFilters);
+  vSplitter->addWidget(hSplitter);
+  vSplitter->setCollapsible(0, true);
+  vSplitter->setCollapsible(1, false);
+  tabs->addTab(vSplitter, QIcon(QString::fromUtf8(":/Icons/oxygen/folder-remote.png")), tr("Transfers"));
+  vboxLayout->addWidget(tabs);
+
+  // Transfer list slots
+  connect(actionStart, SIGNAL(triggered()), transferList, SLOT(startSelectedTorrents()));
+  connect(actionStart_All, SIGNAL(triggered()), transferList, SLOT(startAllTorrents()));
+  connect(actionPause, SIGNAL(triggered()), transferList, SLOT(pauseSelectedTorrents()));
+  connect(actionPause_All, SIGNAL(triggered()), transferList, SLOT(pauseAllTorrents()));
+  connect(actionDelete, SIGNAL(triggered()), transferList, SLOT(deleteSelectedTorrents()));
+  connect(actionIncreasePriority, SIGNAL(triggered()), transferList, SLOT(increasePrioSelectedTorrents()));
+  connect(actionDecreasePriority, SIGNAL(triggered()), transferList, SLOT(decreasePrioSelectedTorrents()));
+
+  // Search engine tab
+  searchEngine = new SearchEngine(this, BTSession);
+  tabs->addTab(searchEngine, QIcon(QString::fromUtf8(":/Icons/oxygen/edit-find.png")), tr("Search"));
+
+  // Configure BT session according to options
+  loadPreferences(false);
+  // Resume unfinished torrents
+  BTSession->startUpTorrents();
+  // Add torrent given on command line
+  processParams(torrentCmdLine);
+  // Use a tcp server to allow only one instance of qBittorrent
+  localServer = new QLocalServer();
+  QString uid = "";
+#ifdef Q_WS_WIN
+  char buffer[UNLEN+1] = {0};
+  DWORD buffer_len = UNLEN + 1;
+  if (!GetUserName(buffer, &buffer_len))
+    uid = QString(buffer)
+#else
+    uid = QString::number(getuid());
+#endif
+#ifdef Q_WS_X11
+  if(QFile::exists(QDir::tempPath()+QDir::separator()+QString("qBittorrent-")+uid)) {
+    // Socket was not closed cleanly
+    std::cerr << "Warning: Local domain socket was not closed cleanly, deleting file...\n";
+    QFile::remove(QDir::tempPath()+QDir::separator()+QString("qBittorrent-")+uid);
+  }
+#endif
+  if (!localServer->listen("qBittorrent-"+uid)) {
+    std::cerr  << "Couldn't create socket, single instance mode won't work...\n";
+  }
+  connect(localServer, SIGNAL(newConnection()), this, SLOT(acceptConnection()));
+  // Start connection checking timer
+  guiUpdater = new QTimer(this);
+  connect(guiUpdater, SIGNAL(timeout()), this, SLOT(updateGUI()));
+  guiUpdater->start(2000);
+  // Accept drag 'n drops
+  setAcceptDrops(true);
+  createKeyboardShortcuts();
+  // Create status bar
+  status_bar = new StatusBar(QMainWindow::statusBar(), BTSession);
+  connect(actionUse_alternative_speed_limits, SIGNAL(triggered()), status_bar, SLOT(toggleAlternativeSpeeds()));
+
+  show();
+
+  // Load Window state and sizes
+  readSettings();
+  properties->readSettings();
+
+  // Limit status filters list height
+  int cur_height = 80;
+  do {
+    transferListFilters->getStatusFilters()->setFixedHeight(cur_height);
+    cur_height += 10;
+    transferListFilters->getStatusFilters()->scrollToBottom();
+  }while(transferListFilters->getStatusFilters()->verticalScrollBar()->sliderPosition() > 0);
+  transferListFilters->getStatusFilters()->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+
+  if(Preferences::startMinimized()) {
+    setWindowState(Qt::WindowMinimized);
+  }
+
+  qDebug("GUI Built");
+}
+
+// Destructor
+GUI::~GUI() {
+  qDebug("GUI destruction");
+  hide();
+  // Async deletion of Bittorrent session as early as possible
+  // in order to speed up exit
+  session_proxy sp = BTSession->asyncDeletion();
+  // Some saving
+  properties->saveSettings();
+  disconnect(tabs, SIGNAL(currentChanged(int)), this, SLOT(tab_changed(int)));
+  // Delete other GUI objects
+  delete status_bar;
+  delete transferList;
+  delete guiUpdater;
+  if(createTorrentDlg)
+    delete createTorrentDlg;
+  if(console)
+    delete console;
+  if(aboutDlg)
+    delete aboutDlg;
+  if(options)
+    delete options;
+  if(downloadFromURLDialog)
+    delete downloadFromURLDialog;
+  if(rssWidget)
+    delete rssWidget;
+  delete searchEngine;
+  delete transferListFilters;
+  delete properties;
+  delete hSplitter;
+  delete vSplitter;
+  if(systrayCreator) {
+    delete systrayCreator;
+  }
+  if(systrayIcon) {
+    delete systrayIcon;
+    delete myTrayIconMenu;
+  }
+  localServer->close();
+  delete localServer;
+  delete tabs;
+  // Keyboard shortcuts
+  delete switchSearchShortcut;
+  delete switchSearchShortcut2;
+  delete switchTransferShortcut;
+  delete switchRSSShortcut;
+  // Delete BTSession objects
+  delete BTSession;
+  // Deleting remaining top level widgets
+  qDebug("Deleting remaining top level widgets");
+  foreach (QWidget *win, QApplication::topLevelWidgets()) {
+    if(win && win != this)
+      delete win;
+  }
+  // May freeze for a few seconds after the next line
+  // because the Bittorrent session proxy will
+  // actually be deleted now and destruction
+  // becomes synchronous
+  qDebug("Exiting GUI destructor...");
+}
+
+void GUI::displayRSSTab(bool enable) {
+  if(enable) {
+    // RSS tab
+    if(!rssWidget) {
+      rssWidget = new RSSImp(BTSession);
+      int index_tab = tabs->addTab(rssWidget, tr("RSS"));
+      tabs->setTabIcon(index_tab, QIcon(QString::fromUtf8(":/Icons/rss32.png")));
+    }
+  } else {
+    if(rssWidget) {
+      delete rssWidget;
+    }
+  }
+}
+
+void GUI::on_actionWebsite_triggered() const {
+  QDesktopServices::openUrl(QUrl(QString::fromUtf8("http://www.qbittorrent.org")));
+}
+
+void GUI::on_actionDocumentation_triggered() const {
+  QDesktopServices::openUrl(QUrl(QString::fromUtf8("http://doc.qbittorrent.org")));
+}
+
+void GUI::on_actionBugReport_triggered() const {
+  QDesktopServices::openUrl(QUrl(QString::fromUtf8("http://bugs.qbittorrent.org")));
+}
+
+void GUI::tab_changed(int new_tab) {
+  if(new_tab == TAB_TRANSFER) {
+    qDebug("Changed tab to transfer list, refreshing the list");
+    transferList->refreshList();
+    properties->loadDynamicData();
+  }
+}
+
+void GUI::writeSettings() {
+  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+  settings.beginGroup(QString::fromUtf8("MainWindow"));
+  settings.setValue(QString::fromUtf8("size"), size());
+  settings.setValue(QString::fromUtf8("pos"), pos());
+  // Splitter size
+  QStringList sizes_str;
+  sizes_str << QString::number(vSplitter->sizes().first());
+  sizes_str << QString::number(vSplitter->sizes().last());
+  settings.setValue(QString::fromUtf8("vSplitterSizes"), sizes_str);
+  settings.endGroup();
+}
+
+// called when a torrent has finished
+void GUI::finishedTorrent(QTorrentHandle& h) const {
+  if(!TorrentPersistentData::isSeed(h.hash()))
+    showNotificationBaloon(tr("Download completion"), tr("%1 has finished downloading.", "e.g: xxx.avi has finished downloading.").arg(h.name()));
+}
+
+// Notification when disk is full
+void GUI::fullDiskError(QTorrentHandle& h, QString msg) const {
+  if(!h.is_valid()) return;
+  showNotificationBaloon(tr("I/O Error", "i.e: Input/Output Error"), tr("An I/O error occured for torrent %1.\n Reason: %2", "e.g: An error occured for torrent xxx.avi.\n Reason: disk is full.").arg(h.name()).arg(msg));
+}
+
+void GUI::createKeyboardShortcuts() {
+  actionCreate_torrent->setShortcut(QKeySequence(QString::fromUtf8("Ctrl+N")));
+  actionOpen->setShortcut(QKeySequence(QString::fromUtf8("Ctrl+O")));
+  actionExit->setShortcut(QKeySequence(QString::fromUtf8("Ctrl+Q")));
+  switchTransferShortcut = new QShortcut(QKeySequence(tr("Alt+1", "shortcut to switch to first tab")), this);
+  connect(switchTransferShortcut, SIGNAL(activated()), this, SLOT(displayTransferTab()));
+  switchSearchShortcut = new QShortcut(QKeySequence(tr("Alt+2", "shortcut to switch to third tab")), this);
+  connect(switchSearchShortcut, SIGNAL(activated()), this, SLOT(displaySearchTab()));
+  switchSearchShortcut2 = new QShortcut(QKeySequence(tr("Ctrl+F", "shortcut to switch to search tab")), this);
+  connect(switchSearchShortcut2, SIGNAL(activated()), this, SLOT(displaySearchTab()));
+  switchRSSShortcut = new QShortcut(QKeySequence(tr("Alt+3", "shortcut to switch to fourth tab")), this);
+  connect(switchRSSShortcut, SIGNAL(activated()), this, SLOT(displayRSSTab()));
+  actionDocumentation->setShortcut(QKeySequence("F1"));
+  actionOptions->setShortcut(QKeySequence(QString::fromUtf8("Alt+O")));
+  actionDelete->setShortcut(QKeySequence(QString::fromUtf8("Del")));
+  actionStart->setShortcut(QKeySequence(QString::fromUtf8("Ctrl+S")));
+  actionStart_All->setShortcut(QKeySequence(QString::fromUtf8("Ctrl+Shift+S")));
+  actionPause->setShortcut(QKeySequence(QString::fromUtf8("Ctrl+P")));
+  actionPause_All->setShortcut(QKeySequence(QString::fromUtf8("Ctrl+Shift+P")));
+  actionDecreasePriority->setShortcut(QKeySequence(QString::fromUtf8("Ctrl+-")));
+  actionIncreasePriority->setShortcut(QKeySequence(QString::fromUtf8("Ctrl++")));
+}
+
+// Keyboard shortcuts slots
+void GUI::displayTransferTab() const {
+  tabs->setCurrentIndex(TAB_TRANSFER);
+}
+
+void GUI::displaySearchTab() const {
+  tabs->setCurrentIndex(TAB_SEARCH);
+}
+
+void GUI::displayRSSTab() const {
+  tabs->setCurrentIndex(TAB_RSS);
+}
+
+// End of keyboard shortcuts slots
+
+void GUI::readSettings() {
+  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+  settings.beginGroup(QString::fromUtf8("MainWindow"));
+  resize(settings.value(QString::fromUtf8("size"), size()).toSize());
+  move(settings.value(QString::fromUtf8("pos"), misc::screenCenter(this)).toPoint());
+  const QStringList &sizes_str = settings.value("vSplitterSizes", QStringList()).toStringList();
+  // Splitter size
+  QList<int> sizes;
+  if(sizes_str.size() == 2) {
+    sizes << sizes_str.first().toInt();
+    sizes << sizes_str.last().toInt();
+  } else {
+    qDebug("Default splitter size");
+    sizes << 120;
+    sizes << vSplitter->width()-120;
+  }
+  vSplitter->setSizes(sizes);
+  settings.endGroup();
+}
+
+void GUI::balloonClicked() {
+  if(isHidden()) {
+    show();
+    if(isMinimized()) {
+      showNormal();
+    }
+    raise();
+    activateWindow();
+  }
+}
+
+void GUI::acceptConnection() {
+  QLocalSocket *clientConnection = localServer->nextPendingConnection();
+  connect(clientConnection, SIGNAL(disconnected()), this, SLOT(readParamsOnSocket()));
+  qDebug("accepted connection from another instance");
+}
+
+void GUI::readParamsOnSocket() {
+  QLocalSocket *clientConnection = static_cast<QLocalSocket*>(sender());
+  if(clientConnection) {
+    const QByteArray &params = clientConnection->readAll();
+    if(!params.isEmpty()) {
+      processParams(QString::fromLocal8Bit(params.constData()).split("\n"));
+      qDebug("Received parameters from another instance");
+    }
+    clientConnection->deleteLater();
+  }
+}
+
+void GUI::askRecursiveTorrentDownloadConfirmation(QTorrentHandle &h) {
+  if(QMessageBox::question(this, tr("Recursive download confirmation"), tr("The torrent %1 contains torrent files, do you want to proceed with their download?").arg(h.name()), QMessageBox::Yes|QMessageBox::No) == QMessageBox::Yes) {
+    BTSession->recursiveTorrentDownload(h);
+  }
+}
+
+void GUI::handleDownloadFromUrlFailure(QString url, QString reason) const{
+  // Display a message box
+  QMessageBox::critical(0, tr("Url download error"), tr("Couldn't download file at url: %1, reason: %2.").arg(url).arg(reason));
+}
+
+void GUI::on_actionSet_global_upload_limit_triggered() {
+  qDebug("actionSet_global_upload_limit_triggered");
+  bool ok;
+  const long new_limit = SpeedLimitDialog::askSpeedLimit(&ok, tr("Global Upload Speed Limit"), BTSession->getSession()->upload_rate_limit());
+  if(ok) {
+    qDebug("Setting global upload rate limit to %.1fKb/s", new_limit/1024.);
+    BTSession->getSession()->set_upload_rate_limit(new_limit);
+    if(new_limit <= 0)
+      Preferences::setGlobalUploadLimit(-1);
+    else
+      Preferences::setGlobalUploadLimit(new_limit/1024.);
+  }
+}
+
+void GUI::on_actionShow_console_triggered() {
+  if(!console) {
+    console = new consoleDlg(this, BTSession);
+  } else {
+    console->setFocus();
+  }
+}
+
+void GUI::on_actionSet_global_download_limit_triggered() {
+  qDebug("actionSet_global_download_limit_triggered");
+  bool ok;
+  const long new_limit = SpeedLimitDialog::askSpeedLimit(&ok, tr("Global Download Speed Limit"), BTSession->getSession()->download_rate_limit());
+  if(ok) {
+    qDebug("Setting global download rate limit to %.1fKb/s", new_limit/1024.);
+    BTSession->getSession()->set_download_rate_limit(new_limit);
+    if(new_limit <= 0)
+      Preferences::setGlobalDownloadLimit(-1);
+    else
+      Preferences::setGlobalDownloadLimit(new_limit/1024.);
+  }
+}
+
+// Necessary if we want to close the window
+// in one time if "close to systray" is enabled
+void GUI::on_actionExit_triggered() {
+  force_exit = true;
+  close();
+}
+
+int GUI::getCurrentTabIndex() const {
+  if(isMinimized() || !isVisible())
+    return -1;
+  return tabs->currentIndex();
+}
+
+void GUI::setTabText(int index, QString text) const {
+  tabs->setTabText(index, text);
+}
+
+// Toggle Main window visibility
+void GUI::toggleVisibility(QSystemTrayIcon::ActivationReason e) {
+  if(e == QSystemTrayIcon::Trigger || e == QSystemTrayIcon::DoubleClick) {
+    if(isHidden()) {
+      show();
+      if(isMinimized()) {
+        if(isMaximized()) {
+          showMaximized();
+        }else{
+          showNormal();
+        }
+      }
+      raise();
+      activateWindow();
+    }else{
+      hide();
+    }
+  }
+}
+
+// Display About Dialog
+void GUI::on_actionAbout_triggered() {
+  //About dialog
+  if(aboutDlg) {
+    aboutDlg->setFocus();
+  } else {
+    aboutDlg = new about(this);
+  }
+}
+
+void GUI::showEvent(QShowEvent *e) {
+  qDebug("** Show Event **");
+  if(getCurrentTabIndex() == TAB_TRANSFER) {
+    qDebug("-> Refreshing transfer list");
+    transferList->refreshList();
+    properties->loadDynamicData();
+  }
+  e->accept();
+}
+
+// Called when we close the program
+void GUI::closeEvent(QCloseEvent *e) {
+  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+  const bool goToSystrayOnExit = settings.value(QString::fromUtf8("Preferences/General/CloseToTray"), false).toBool();
+  if(!force_exit && systrayIcon && goToSystrayOnExit && !this->isHidden()) {
+    hide();
+    //e->ignore();
+    e->accept();
+    return;
+  }
+  if(settings.value(QString::fromUtf8("Preferences/General/ExitConfirm"), true).toBool() && BTSession->hasActiveTorrents()) {
+    show();
+    if(!isMaximized())
+      showNormal();
+    if(e->spontaneous() || force_exit) {
+      if(QMessageBox::question(this,
+                               tr("Are you sure you want to quit?")+QString::fromUtf8(" -- ")+tr("qBittorrent"),
+                               tr("Some files are currently transferring.\nAre you sure you want to quit qBittorrent?"),
+                               tr("&Yes"), tr("&No"),
+                               QString(), 0, 1)) {
+        e->ignore();
+        force_exit = false;
+        return;
+      }
+    }
+  }
+  hide();
+  if(systrayIcon) {
+    // Hide tray icon
+    systrayIcon->hide();
+  }
+  // Save window size, columns size
+  writeSettings();
+  // Accept exit
+  e->accept();
+  qApp->exit();
+}
+
+
+// Display window to create a torrent
+void GUI::on_actionCreate_torrent_triggered() {
+  if(createTorrentDlg) {
+    createTorrentDlg->setFocus();
+  } else {
+    createTorrentDlg = new createtorrent(this);
+    connect(createTorrentDlg, SIGNAL(torrent_to_seed(QString)), this, SLOT(addTorrent(QString)));
+  }
+}
+
+bool GUI::event(QEvent * e) {
+  if(e->type() == QEvent::WindowStateChange) {
+    //Now check to see if the window is minimised
+    if(isMinimized()) {
+      qDebug("minimisation");
+      QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+      if(systrayIcon && settings.value(QString::fromUtf8("Preferences/General/MinimizeToTray"), false).toBool()) {
+        hide();
+      }
+    }
+  }
+  return QMainWindow::event(e);
+}
+
+// Action executed when a file is dropped
+void GUI::dropEvent(QDropEvent *event) {
+  event->acceptProposedAction();
+  QStringList files;
+  if(event->mimeData()->hasUrls()) {
+    const QList<QUrl> &urls = event->mimeData()->urls();
+    foreach(const QUrl &url, urls) {
+      const QString tmp = url.toString().trimmed();
+      if(!tmp.isEmpty())
+        files << url.toString();
+    }
+  } else {
+    files = event->mimeData()->text().split(QString::fromUtf8("\n"));
+  }
+  // Add file to download list
+  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+  const bool useTorrentAdditionDialog = settings.value(QString::fromUtf8("Preferences/Downloads/AdditionDialog"), true).toBool();
+  foreach(QString file, files) {
+    file = file.trimmed().replace(QString::fromUtf8("file://"), QString::fromUtf8(""), Qt::CaseInsensitive);
+    qDebug("Dropped file %s on download list", file.toLocal8Bit().data());
+    if(file.startsWith(QString::fromUtf8("http://"), Qt::CaseInsensitive) || file.startsWith(QString::fromUtf8("ftp://"), Qt::CaseInsensitive) || file.startsWith(QString::fromUtf8("https://"), Qt::CaseInsensitive)) {
+      BTSession->downloadFromUrl(file);
+      continue;
+    }
+    if(file.startsWith("magnet:", Qt::CaseInsensitive)) {
+      // FIXME: Possibly skipped torrent addition dialog
+      BTSession->addMagnetUri(file);
+      continue;
+    }
+    if(useTorrentAdditionDialog) {
+      torrentAdditionDialog *dialog = new torrentAdditionDialog(this, BTSession);
+      dialog->showLoad(file);
+    }else{
+      BTSession->addTorrent(file);
+    }
+  }
+}
+
+// Decode if we accept drag 'n drop or not
+void GUI::dragEnterEvent(QDragEnterEvent *event) {
+  foreach(const QString &mime, event->mimeData()->formats()){
+    qDebug("mimeData: %s", mime.toLocal8Bit().data());
+  }
+  if (event->mimeData()->hasFormat(QString::fromUtf8("text/plain")) || event->mimeData()->hasFormat(QString::fromUtf8("text/uri-list"))) {
+    event->acceptProposedAction();
+  }
+}
+
+/*****************************************************
+ *                                                   *
+ *                     Torrent                       *
+ *                                                   *
+ *****************************************************/
+
+// Display a dialog to allow user to add
+// torrents to download list
+void GUI::on_actionOpen_triggered() {
+  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+  // Open File Open Dialog
+  // Note: it is possible to select more than one file
+  const QStringList &pathsList = QFileDialog::getOpenFileNames(0,
+                                                               tr("Open Torrent Files"), settings.value(QString::fromUtf8("MainWindowLastDir"), QDir::homePath()).toString(),
+                                                               tr("Torrent Files")+QString::fromUtf8(" (*.torrent)"));
+  if(!pathsList.empty()) {
+    const bool useTorrentAdditionDialog = settings.value(QString::fromUtf8("Preferences/Downloads/AdditionDialog"), true).toBool();
+    const uint listSize = pathsList.size();
+    for(uint i=0; i<listSize; ++i) {
+      if(useTorrentAdditionDialog) {
+        torrentAdditionDialog *dialog = new torrentAdditionDialog(this, BTSession);
+        dialog->showLoad(pathsList.at(i));
+      }else{
+        BTSession->addTorrent(pathsList.at(i));
+      }
+    }
+    // Save last dir to remember it
+    QStringList top_dir = pathsList.at(0).split(QDir::separator());
+    top_dir.removeLast();
+    settings.setValue(QString::fromUtf8("MainWindowLastDir"), top_dir.join(QDir::separator()));
+  }
+}
+
+// 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 GUI::processParams(const QStringList& params) {
+  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+  const bool useTorrentAdditionDialog = settings.value(QString::fromUtf8("Preferences/Downloads/AdditionDialog"), true).toBool();
+  foreach(QString param, params) {
+    param = param.trimmed();
+    if(param.startsWith("--")) continue;
+    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("magnet:", Qt::CaseInsensitive)) {
+        if(useTorrentAdditionDialog) {
+          torrentAdditionDialog *dialog = new torrentAdditionDialog(this, BTSession);
+          dialog->showLoadMagnetURI(param);
+        } else {
+          BTSession->addMagnetUri(param);
+        }
+      } else {
+        if(useTorrentAdditionDialog) {
+          torrentAdditionDialog *dialog = new torrentAdditionDialog(this, BTSession);
+          dialog->showLoad(param);
+        }else{
+          BTSession->addTorrent(param);
+        }
+      }
+    }
+  }
+}
+
+void GUI::addTorrent(QString path) {
+  BTSession->addTorrent(path);
+}
+
+void GUI::processDownloadedFiles(QString path, QString url) {
+  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+  const bool useTorrentAdditionDialog = settings.value(QString::fromUtf8("Preferences/Downloads/AdditionDialog"), true).toBool();
+  if(useTorrentAdditionDialog) {
+    torrentAdditionDialog *dialog = new torrentAdditionDialog(this, BTSession);
+    dialog->showLoad(path, url);
+  }else{
+    BTSession->addTorrent(path, false, url);
+  }
+}
+
+void GUI::optionsSaved() {
+  loadPreferences();
+}
+
+// Load program preferences
+void GUI::loadPreferences(bool configure_session) {
+  BTSession->addConsoleMessage(tr("Options were saved successfully."));
+  const bool newSystrayIntegration = Preferences::systrayIntegration();
+  if(newSystrayIntegration != (systrayIcon!=0)) {
+    if(newSystrayIntegration) {
+      // create the trayicon
+      if(!QSystemTrayIcon::isSystemTrayAvailable()) {
+        if(!configure_session) { // Program startup
+          systrayCreator = new QTimer(this);
+          connect(systrayCreator, SIGNAL(timeout()), this, SLOT(createSystrayDelayed()));
+          systrayCreator->setSingleShot(true);
+          systrayCreator->start(2000);
+          qDebug("Info: System tray is unavailable, trying again later.");
+        }  else {
+          qDebug("Warning: System tray is unavailable.");
+        }
+      } else {
+        createTrayIcon();
+      }
+    } else {
+      // Destroy trayicon
+      delete systrayIcon;
+      delete myTrayIconMenu;
+    }
+  }
+  // General
+  const bool new_displaySpeedInTitle = Preferences::speedInTitleBar();
+  if(!new_displaySpeedInTitle && new_displaySpeedInTitle != displaySpeedInTitle) {
+    // Reset title
+    setWindowTitle(tr("qBittorrent %1", "e.g: qBittorrent vx.x").arg(QString::fromUtf8(VERSION)));
+  }
+  displaySpeedInTitle = new_displaySpeedInTitle;
+  if(Preferences::isToolbarDisplayed()) {
+    toolBar->setVisible(true);
+    toolBar->layout()->setSpacing(7);
+  } else {
+    toolBar->setVisible(false);
+  }
+  const uint new_refreshInterval = Preferences::getRefreshInterval();
+  transferList->setRefreshInterval(new_refreshInterval);
+  transferList->setAlternatingRowColors(Preferences::useAlternatingRowColors());
+  properties->getFilesList()->setAlternatingRowColors(Preferences::useAlternatingRowColors());
+  properties->getTrackerList()->setAlternatingRowColors(Preferences::useAlternatingRowColors());
+  properties->getPeerList()->setAlternatingRowColors(Preferences::useAlternatingRowColors());
+  // Queueing System
+  if(Preferences::isQueueingSystemEnabled()) {
+    if(!configure_session || !BTSession->isQueueingEnabled()) {
+      transferList->hidePriorityColumn(false);
+      actionDecreasePriority->setVisible(true);
+      actionIncreasePriority->setVisible(true);
+      prioSeparator->setVisible(true);
+      prioSeparator2->setVisible(true);
+      toolBar->layout()->setSpacing(7);
+    }
+  } else {
+    if(BTSession->isQueueingEnabled()) {
+      transferList->hidePriorityColumn(true);
+      actionDecreasePriority->setVisible(false);
+      actionIncreasePriority->setVisible(false);
+      prioSeparator->setVisible(false);
+      prioSeparator2->setVisible(false);
+      toolBar->layout()->setSpacing(7);
+    }
+  }
+
+  // RSS
+  if(Preferences::isRSSEnabled()) {
+    displayRSSTab(true);
+    rssWidget->updateRefreshInterval(Preferences::getRSSRefreshInterval());
+  } else {
+    displayRSSTab(false);
+  }
+
+  // Torrent properties
+  properties->reloadPreferences();
+
+  if(configure_session)
+    BTSession->configureSession();
+
+  qDebug("GUI settings loaded");
+}
+
+void GUI::addUnauthenticatedTracker(const QPair<QTorrentHandle,QString> &tracker) {
+  // Trackers whose authentication was cancelled
+  if(unauthenticated_trackers.indexOf(tracker) < 0) {
+    unauthenticated_trackers << tracker;
+  }
+}
+
+// Called when a tracker requires authentication
+void GUI::trackerAuthenticationRequired(QTorrentHandle& h) {
+  if(unauthenticated_trackers.indexOf(QPair<QTorrentHandle,QString>(h, h.current_tracker())) < 0) {
+    // Tracker login
+    new trackerLogin(this, h);
+  }
+}
+
+// Check connection status and display right icon
+void GUI::updateGUI() {
+  // update global informations
+  if(systrayIcon) {
+#if defined(Q_WS_X11) || defined(Q_WS_MAC)
+    QString html = "<div style='background-color: #678db2; color: #fff;height: 18px; font-weight: bold; margin-bottom: 5px;'>";
+    html += tr("qBittorrent");
+    html += "</div>";
+    html += "<div style='vertical-align: baseline; height: 18px;'>";
+    html += "<img src=':/Icons/skin/download.png'/>&nbsp;"+tr("DL speed: %1 KiB/s", "e.g: Download speed: 10 KiB/s").arg(QString::number(BTSession->getPayloadDownloadRate()/1024., 'f', 1));
+    html += "</div>";
+    html += "<div style='vertical-align: baseline; height: 18px;'>";
+    html += "<img src=':/Icons/skin/seeding.png'/>&nbsp;"+tr("UP speed: %1 KiB/s", "e.g: Upload speed: 10 KiB/s").arg(QString::number(BTSession->getPayloadUploadRate()/1024., 'f', 1));
+    html += "</div>";
+#else
+    // OSes such as Windows do not support html here
+    QString html =tr("DL speed: %1 KiB/s", "e.g: Download speed: 10 KiB/s").arg(QString::number(BTSession->getPayloadDownloadRate()/1024., 'f', 1));
+    html += "\n";
+    html += tr("UP speed: %1 KiB/s", "e.g: Upload speed: 10 KiB/s").arg(QString::number(BTSession->getPayloadUploadRate()/1024., 'f', 1));
+#endif
+    systrayIcon->setToolTip(html); // tray icon
+  }
+  if(displaySpeedInTitle) {
+    setWindowTitle(tr("qBittorrent %1 (Down: %2/s, Up: %3/s)", "%1 is qBittorrent version").arg(QString::fromUtf8(VERSION)).arg(misc::friendlyUnit(BTSession->getSessionStatus().payload_download_rate)).arg(misc::friendlyUnit(BTSession->getSessionStatus().payload_upload_rate)));
+  }
+}
+
+void GUI::showNotificationBaloon(QString title, QString msg) const {
+  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+  if(settings.value(QString::fromUtf8("Preferences/General/NotificationBaloons"), true).toBool()) {
+#ifdef WITH_LIBNOTIFY
+    if (notify_init ("summary-body")) {
+      NotifyNotification* notification;
+      notification = notify_notification_new (qPrintable(title), qPrintable(msg), "qbittorrent", 0);
+      gboolean success = notify_notification_show (notification, NULL);
+      g_object_unref(G_OBJECT(notification));
+      notify_uninit ();
+      if(success) {
+        return;
+      }
+    }
+#endif
+    if(systrayIcon)
+      systrayIcon->showMessage(title, msg, QSystemTrayIcon::Information, TIME_TRAY_BALLOON);
+  }
+}
+
+/*****************************************************
+ *                                                   *
+ *                      Utils                        *
+ *                                                   *
+ *****************************************************/
+
+void GUI::downloadFromURLList(const QStringList& url_list) {
+  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+  const bool useTorrentAdditionDialog = settings.value(QString::fromUtf8("Preferences/Downloads/AdditionDialog"), true).toBool();
+  foreach(const QString& url, url_list) {
+    if(url.startsWith("magnet:", Qt::CaseInsensitive)) {
+      if(useTorrentAdditionDialog) {
+        torrentAdditionDialog *dialog = new torrentAdditionDialog(this, BTSession);
+        dialog->showLoadMagnetURI(url);
+      } else {
+        BTSession->addMagnetUri(url);
+      }
+    } else {
+      BTSession->downloadFromUrl(url);
+    }
+  }
+}
+
+/*****************************************************
+ *                                                   *
+ *                     Options                       *
+ *                                                   *
+ *****************************************************/
+
+void GUI::createSystrayDelayed() {
+  static int timeout = 20;
+  if(QSystemTrayIcon::isSystemTrayAvailable()) {
+    // Ok, systray integration is now supported
+    // Create systray icon
+    createTrayIcon();
+    delete systrayCreator;
+  } else {
+    if(timeout) {
+      // Retry a bit later
+      systrayCreator->start(2000);
+      --timeout;
+    } else {
+      // Timed out, apparently system really does not
+      // support systray icon
+      delete systrayCreator;
+      // Disable it in program preferences to
+      // avoid trying at earch startup
+      Preferences::setSystrayIntegration(false);
+    }
+  }
+}
+
+void GUI::updateAltSpeedsBtn(bool alternative) {
+  if(alternative) {
+    actionUse_alternative_speed_limits->setIcon(QIcon(":/Icons/slow.png"));
+    actionUse_alternative_speed_limits->setText(tr("Use normal speed limits"));
+  } else {
+    actionUse_alternative_speed_limits->setIcon(QIcon(":/Icons/slow_off.png"));
+    actionUse_alternative_speed_limits->setText(tr("Use alternative speed limits"));
+  }
+}
+
+void GUI::createTrayIcon() {
+  // Tray icon
+#ifdef Q_WS_WIN
+  systrayIcon = new QSystemTrayIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent16.png")), this);
+#endif
+#ifndef Q_WS_WIN
+  systrayIcon = new QSystemTrayIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent22.png")), this);
+#endif
+  // Tray icon Menu
+  myTrayIconMenu = new QMenu(this);
+  myTrayIconMenu->addAction(actionOpen);
+  myTrayIconMenu->addAction(actionDownload_from_URL);
+  myTrayIconMenu->addSeparator();
+  updateAltSpeedsBtn(Preferences::isAltBandwidthEnabled());
+  myTrayIconMenu->addAction(actionUse_alternative_speed_limits);
+  myTrayIconMenu->addAction(actionSet_global_download_limit);
+  myTrayIconMenu->addAction(actionSet_global_upload_limit);
+  myTrayIconMenu->addSeparator();
+  myTrayIconMenu->addAction(actionStart_All);
+  myTrayIconMenu->addAction(actionPause_All);
+  myTrayIconMenu->addSeparator();
+  myTrayIconMenu->addAction(actionExit);
+  systrayIcon->setContextMenu(myTrayIconMenu);
+  connect(systrayIcon, SIGNAL(messageClicked()), this, SLOT(balloonClicked()));
+  // End of Icon Menu
+  connect(systrayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(toggleVisibility(QSystemTrayIcon::ActivationReason)));
+  systrayIcon->show();
+}
+
+// Display Program Options
+void GUI::on_actionOptions_triggered() {
+  if(options) {
+    // Get focus
+    options->setFocus();
+  } else {
+    options = new options_imp(this);
+    connect(options, SIGNAL(status_changed()), this, SLOT(optionsSaved()));
+  }
+}
+
+/*****************************************************
+ *                                                   *
+ *                 HTTP Downloader                   *
+ *                                                   *
+ *****************************************************/
+
+// Display an input dialog to prompt user for
+// an url
+void GUI::on_actionDownload_from_URL_triggered() {
+  if(!downloadFromURLDialog) {
+    downloadFromURLDialog = new downloadFromURL(this);
+    connect(downloadFromURLDialog, SIGNAL(urlsReadyToBeDownloaded(const QStringList&)), this, SLOT(downloadFromURLList(const QStringList&)));
+  }
+}
+

src/GUI.h

@@ -37,81 +37,68 @@
 #include "ui_mainwindow.h"
 #include "qtorrenthandle.h"
 
-class QBtSession;
+enum TabIndex{TAB_TRANSFER, TAB_SEARCH, TAB_RSS};
+
+class Bittorrent;
+class QTimer;
 class downloadFromURL;
 class SearchEngine;
+class QLocalServer;
+class QCloseEvent;
 class RSSImp;
+class QShortcut;
 class about;
 class options_imp;
+class QTabWidget;
 class TransferListWidget;
 class TransferListFiltersWidget;
+class QSplitter;
 class PropertiesWidget;
 class StatusBar;
 class consoleDlg;
 class about;
-class TorrentCreatorDlg;
+class createtorrent;
 class downloadFromURL;
-class HidableTabWidget;
-class LineEdit;
-class ExecutionLog;
-class PowerManagement;
 
-QT_BEGIN_NAMESPACE
+class GUI : public QMainWindow, private Ui::MainWindow{
-class QCloseEvent;
-class QFileSystemWatcher;
-class QShortcut;
-class QSplitter;
-class QTabWidget;
-class QTimer;
-QT_END_NAMESPACE
-
-class MainWindow : public QMainWindow, private Ui::MainWindow{
   Q_OBJECT
 
 public:
   // Construct / Destruct
-  MainWindow(QWidget *parent=0, const QStringList& torrentCmdLine = QStringList());
+  GUI(QWidget *parent=0, QStringList torrentCmdLine=QStringList());
-  ~MainWindow();
+  ~GUI();
   // Methods
-  QWidget* getCurrentTabWidget() const;
+  int getCurrentTabIndex() const;
   TransferListWidget* getTransferList() const { return transferList; }
-  QMenu* getTrayIconMenu();
-  PropertiesWidget *getProperties() const { return properties; }
 
 public slots:
-  void trackerAuthenticationRequired(const QTorrentHandle& h);
+  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();
-  void deleteBTSession();
 
 protected slots:
   // GUI related slots
   void dropEvent(QDropEvent *event);
   void dragEnterEvent(QDragEnterEvent *event);
-  void toggleVisibility(QSystemTrayIcon::ActivationReason e = QSystemTrayIcon::Trigger);
+  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(const QTorrentHandle& h, QString msg) const;
+  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);
-  void showConnectionSettings();
-  void minimizeWindow();
-  void updateTrayIconMenu();
   // Keyboard shortcuts
   void createKeyboardShortcuts();
   void displayTransferTab() const;
@@ -124,58 +111,45 @@ protected slots:
   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 processNewMagnetLink(const QString& link);
+  void finishedTorrent(QTorrentHandle& h) const;
-  void finishedTorrent(const QTorrentHandle& h) const;
+  void askRecursiveTorrentDownloadConfirmation(QTorrentHandle &h);
-  void askRecursiveTorrentDownloadConfirmation(const QTorrentHandle &h);
   // Options slots
   void on_actionOptions_triggered();
   void optionsSaved();
   // HTTP slots
   void on_actionDownload_from_URL_triggered();
-#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
-  void handleUpdateCheckFinished(bool update_available, QString new_version);
-  void handleUpdateInstalled(QString error_msg);
-#endif
 
 protected:
   void closeEvent(QCloseEvent *);
   void showEvent(QShowEvent *);
   bool event(QEvent * event);
   void displayRSSTab(bool enable);
-  void displaySearchTab(bool enable);
 
 private:
-  QIcon getSystrayIcon() const;
-
-private:
-  QFileSystemWatcher *executable_watcher;
   // Bittorrent
+  Bittorrent *BTSession;
   QList<QPair<QTorrentHandle,QString> > unauthenticated_trackers; // Still needed?
   // GUI related
-  bool m_posInitialized;
   QTimer *guiUpdater;
-  HidableTabWidget *tabs;
+  QTabWidget *tabs;
   StatusBar *status_bar;
   QPointer<options_imp> options;
   QPointer<consoleDlg> console;
   QPointer<about> aboutDlg;
-  QPointer<TorrentCreatorDlg> createTorrentDlg;
+  QPointer<createtorrent> createTorrentDlg;
   QPointer<downloadFromURL> downloadFromURLDialog;
   QPointer<QSystemTrayIcon> systrayIcon;
   QPointer<QTimer> systrayCreator;
-  QPointer<QMenu> myTrayIconMenu;
+  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;
@@ -183,32 +157,15 @@ private:
   QShortcut *switchRSSShortcut;
   // Widgets
   QAction *prioSeparator;
-  QAction *prioSeparatorMenu;
+  QAction *prioSeparator2;
   QSplitter *hSplitter;
   QSplitter *vSplitter;
   // Search
-  QPointer<SearchEngine> searchEngine;
+  SearchEngine *searchEngine;
   // RSS
   QPointer<RSSImp> rssWidget;
-  // Execution Log
+  // Misc
-  QPointer<ExecutionLog> m_executionLog;
+  QLocalServer *localServer;
-  // Power Management
-  PowerManagement *m_pwr;
-  QTimer *preventTimer;
-
-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_action_Import_Torrent_triggered();
-    void on_actionDonate_money_triggered();
-    void on_actionExecution_Logs_triggered(bool checked);
-    void on_actionAutoExit_qBittorrent_toggled(bool );
-    void on_actionAutoSuspend_system_toggled(bool );
-    void on_actionAutoShutdown_system_toggled(bool );
-    // Check for active torrents and set preventing from suspend state
-    void checkForActiveTorrents();
 };
 
 #endif