Bump to 3.2.0

Thanks to pmzqla for finding the root issue.
Closes #2365 #2388.

.gitattributes

@@ -0,0 +1,7 @@
+core.eol=lf
+* text eol=lf
+*.zip binary
+*.png binary
+*.ico binary
+*.qm binary
+*.icns binary

.gitignore

@@ -1,5 +1,7 @@
-src/geoip/GeoIP.dat
+src/gui/geoip/GeoIP.dat
+src/gui/geoip/GeoIP.dat.gz
 src/qbittorrent
+src/qbittorrent-nox
 qbittorrent.pro.user*
 conf.pri
 Makefile
@@ -13,3 +15,11 @@ qrc_*.cpp
 ui_*.h
 *.moc
 src/lang/qbittorrent_*.qm
+.DS_Store
+.qmake.stash
+src/qbittorrent.app
+*.dmg
+#Autotools junk
+aclocal.m4
+autom4te.cache/*
+config.status

.travis.yml

@@ -3,11 +3,14 @@ language:
 
 env:
   # use libtorrent 0.15.10
-  - lt_source=from_dist gui=true
+  # uncomment when Travis doesn't use Ubuntu 12.04 LTS, which has libtorrent 0.15.10 as package
-  - lt_source=from_dist gui=false
+  #- lt_source=from_dist gui=true
+  #- lt_source=from_dist gui=false
   # use libtorrent 0.16.X from RC_0_16 svn branch
-  - lt_source=from_svn gui=true
+  - lt_source=from_svnRC_0_16 gui=true
-  - lt_source=from_svn gui=false
+  - lt_source=from_svnRC_0_16 gui=false
+  - lt_source=from_svnRC_1_0 gui=true
+  - lt_source=from_svnRC_1_0 gui=false
 
 branches:
   except:
@@ -27,6 +30,7 @@ before_install:
 
   # Also setup a virtual display for after_success target when gui == true
   - if ! $gui; then qbtconf="$qbtconf --disable-gui"; else export "DISPLAY=:99.0" && /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 ; fi
+  - qbtconf="$qbtconf --with-qt4"
   - ltconf=" --with-libgeoip=system"
 
   - echo settings
@@ -37,16 +41,19 @@ before_install:
 
   - sudo apt-get -qq update
   # Travis can stall during heavy load if these packages are installed in one step - split the command
-  - sudo apt-get -qq install debhelper qconf colormake libssl-dev libgeoip-dev
+  - sudo apt-get -qq install debhelper autoconf automake colormake libssl-dev libgeoip-dev
-  - sudo apt-get -qq install libboost-dev libboost-filesystem-dev libboost-system-dev
+  # uncomment when Travis doesn't use Ubuntu 12.04 LTS, which has libtorrent 0.15.10 as package
+  #- sudo apt-get -qq install libboost-dev libboost-filesystem-dev libboost-system-dev
+  - sudo apt-get -qq install libboost-dev libboost-system-dev
   - sudo apt-get -qq install libqt4-dev 
 
 install:
-  - if [[ "$lt_source" == "from_dist" ]]; then sudo apt-get -qq install libtorrent-rasterbar-dev; fi
+  #- if [[ "$lt_source" == "from_dist" ]]; then sudo apt-get -qq install libtorrent-rasterbar-dev; fi
-  - if [[ "$lt_source" == "from_svn" ]]; then cd .. && svn co svn://svn.code.sf.net/p/libtorrent/code/branches/RC_0_16 ./libtorrent && (cd libtorrent && ./autotool.sh && ./configure $ltconf && sudo make install) && sudo ldconfig /usr/local/lib && cd $TRAVIS_BUILD_DIR ; fi
+  - if [[ "$lt_source" == "from_svnRC_0_16" ]]; then qbtconf="$qbtconf --with-libtorrent-rasterbar0.16" && cd .. && svn co svn://svn.code.sf.net/p/libtorrent/code/branches/RC_0_16 ./libtorrent && (cd libtorrent && ./autotool.sh && ./configure $ltconf && sudo make install) && sudo ldconfig /usr/local/lib && cd $TRAVIS_BUILD_DIR ; fi
+  - if [[ "$lt_source" == "from_svnRC_1_0" ]]; then cd .. && svn co svn://svn.code.sf.net/p/libtorrent/code/branches/RC_1_0 ./libtorrent && (cd libtorrent && ./autotool.sh && ./configure $ltconf && sudo make install) && sudo ldconfig /usr/local/lib && cd $TRAVIS_BUILD_DIR ; fi
 
 script:
-  - qt-qconf
+  - ./bootstrap.sh
   - ./configure $qbtconf && sudo make install
   
 after_success:

.tx/config

@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[qbittorrent.qbittorrent_v3_1_x]
+[qbittorrent.qbittorrent_v3_2_x]
 file_filter = src/lang/qbittorrent_<lang>.ts
 source_file = src/lang/qbittorrent_en.ts
 source_lang = en
@@ -11,7 +11,7 @@ mode = developer
 
 
 [qbittorrent.qbittorrentdesktop_master]
-source_file = src/Icons/qBittorrent.desktop
+source_file = src/icons/qBittorrent.desktop
 source_lang = en
 type = DESKTOP
 minimum_perc = 23

AUTHORS

@@ -17,7 +17,7 @@ Contributors:
 * Nick Tiskov <daymansmail@gmail.com>
 
 Code from other projects:
-* files src/qtsingleapp/* src/lineedit/*
+* files src/qtsingleapplication/* src/lineedit/*
   copyright: Nokia Corporation
   license: LGPL
 
@@ -34,7 +34,7 @@ Code from other projects:
   license: GPLv2/3
 
 Images Authors:
-* files: src/Icons/*.png
+* files: src/icons/*.png
   copyright: Gnome Icon Theme
   license: GPLv2
   url: http://ftp.acc.umu.se/pub/GNOME/sources/gnome-icon-theme
@@ -44,21 +44,21 @@ Images Authors:
   license: LGPL
   url: http://www.oxygen-icons.org
 
-* files: src/Icons/flags/*.png
+* files: src/icons/flags/*.png
   copyright: Mark James <mjames@gmail.com>
   license: Public Domain
   url: http://www.famfamfam.com
 
-* files: src/Icons/skin/*.png
+* files: src/icons/skin/*.png
   files: src/menuicons/YYxYY/*.png
   copyright: Mateusz Tobola <tobejodok@qbittorrent.org>
   license: GPLv2
 
-* file: src/Icons/skin/tabs.gif
+* file: src/icons/skin/tabs.gif
   copyright: Greg Houston <gregory.houston@gmail.com>
   license: MIT
 
-* file: src/Icons/skin/qbittorrent_mono*
+* file: src/icons/skin/qbittorrent_mono*
   copyright: Daniel Eguren <deguren@gmail.com>
   license: LGPL
 
@@ -77,9 +77,12 @@ Images Authors:
 * file: src/search_engine/engines/torrentreactor.png
   copyright: Downloaded from torrentreactor.net
 
+* file: src/icons/oxygen/checked.png
+  copyright: Victor Buinsky <allok.victor@gmail.com>
+
 Translations authors:
 * files: src/lang/*.ts
-* file: src/Icons/qBittorrent.desktop
+* file: src/icons/qBittorrent.desktop
   copyright:
   - Arabic: SDERAWI (abz8868@msn.com), sn51234 (nesseyan@gmail.com) and  Ibrahim Saed ibraheem_alex(Transifex)
   - Armenian: Hrant Ohanyan (hrantohanyan@mail.am)

CODING_GUIDELINES.md

@@ -0,0 +1,177 @@
+All new code must follow the following coding guidelines.  
+If you make changes in a file that still uses another coding style, make sure that you follow these guidelines for your changes instead.  
+**Note:** I will now take your head if you forget and use another style. However, most probably the request will be delayed until you fix your coding style.
+
+### 1. Curly braces ###
+#### a. Function blocks, class/struct definitions, namespaces ####
+```c++
+int myFunction(int a)
+{
+    //code
+}
+
+myClass::myClass(int *parent)
+    : m_parent(parent)
+{
+    //initialiaze
+}
+
+int myClass::myMethod(int a)
+{
+    //code
+}
+
+class myOtherClass
+{
+public:
+    //code
+protected:
+    //code
+private:
+    //code
+};
+
+namespace id
+{
+    //code
+}
+```
+
+#### b. Other code blocks ####
+```c++
+if (condition) {
+    //code
+}
+
+for (int a = 0; a < b; ++b) {
+    //code
+}
+
+switch (a) {
+case 1:
+    //blah
+case 2:
+    //blah
+default:
+    //blah
+}
+```
+
+#### c. Blocks in switch's case labels ####
+```c++
+switch (var) {
+case 1: {
+        //declare local variables
+        //code
+    }
+    break;
+case 2: {
+        //declare local variables
+        //code
+    }
+    break;
+default:
+    //code
+}
+```
+
+### 2. If blocks ###
+#### a. Multiple tests ####
+```c++
+if (condition) {
+    //code
+}
+else if (condition) {
+    //code
+}
+else {
+    //code
+}
+```
+The `else if`/`else` must be on their own lines.
+
+#### b. Single statement if blocks ####
+**Most** single statement if blocks should look like this:
+```c++
+if (condition)
+    a = a + b;
+```
+
+One acceptable exception to this **can be** `return`, `break` or `continue` statements, provided that the test condition isn't very long. However you can choose to use the first rule instead.
+```c++
+a = myFunction();
+b = a * 1500;
+
+if (b > 0) return;
+c = 100 / b;
+```
+
+#### c. Using curly braces for single statement if blocks ####
+
+However, there are cases where curly braces for single statement if blocks **should** be used.
+* If some branch needs braces then all others should use them. Unless you have multiple `else if` in a row and the one needing the braces is only for a very small sub-block of code.
+* Another exception would be when we have nested if blocks or generally multiple levels of code that affect code readability.
+
+Generally it will depend on the particular piece of code and would be determined on how readable that piece of code is. **If in doubt** always use braces if one of the above exceptions applies.
+
+### 3. Indentation###
+4 spaces.
+
+### 4. File encoding and line endings.###
+
+UTF-8 and Unix-like line ending (LF). Unless some platform speficic files need other encodings/line endings.
+
+### 5. Initialization lists.###
+Initialization lists should be vertical. This will allow for more easily readable diffs. The inilization colon should be indented and in its own line along with first argument. The rest of the arguments should be indented too and have the comma prepended.
+```c++
+myClass::myClass(int a, int b, int c, int d)
+    : priv_a(a)
+    , priv_b(b)
+    , priv_c(c)
+    , priv_d(d)
+{
+    //code
+}
+```
+
+### 6. Enums.###
+Enums should be vertical. This will allow for more easily readable diffs. The members should be indented.
+```c++
+enum days
+{
+    Monday,
+    Tuesday,
+    Wednesday,
+    Thursday,
+    Friday,
+    Saturday,
+    Sunday
+};
+```
+
+### 7. Misc.###
+
+* Line breaks for long lines with operation:
+
+```c++
+a += "b"
+  + "c"
+  + "d";
+```
+
+* Space around operations eg `a = b + c` or `a=b+c`:
+
+Before and after the assignment there should be a space. One exception could be: for loops.
+```c++
+for (int a=0; a<b; ++b) {
+}
+```
+
+* private/public/protected must not be indented
+
+* Preprocessor commands must go at line start
+
+* Method definitions aren't allowed in header files
+
+###8. Not covered above###
+If something isn't covered above, just follow the same style the file you are editing has. If that particular detail isn't present in the file you are editing, then use whatever the rest of the project uses.

Changelog

@@ -1,46 +1,92 @@
-* Mon Nov 20 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.3
+* Sun May 10 2015 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.2.0
-    - FEATURE: Add a key shortcut to "Add link to torrent..." (Angel Alonso)
+    - FEATURE: Show actual protocol for listen success/failure in the log. Needs libtorrent v1.0.0 (Gelmir)
-    - BUGFIX: Make all columns and headers use the same text alignment in the transferlist. (sledgehammer999)
+    - FEATURE: Support per tracker re-announce. Needs libtorrent v1.0.0 (Gelmir)
-    - BUGFIX: Fix build system for Unix/Linux. (sledgehammer999)
+    - FEATURE: Support saving in network locations. (Gelmir)
-    - BUGFIX: Case insensitive sort in Peers list. Closes #1066. (sledgehammer999)
+    - FEATURE: Support Qt5 (mostly Glassez)
-    - BUGFIX: Small optimization of WebUI responses when there isn't a data payload. (sledgehammer999)
+    - FEATURE: Code optimizations resulting in a more CPU efficient and snappier qBittorrent. (sorokin)
-    - BUGFIX: Hide empty folders after filtering. Closes #74. (sledgehammer999)
+    - FEATURE: WEBUI code rewritten, refactored and improved. (glassez, pmzqla, buinsky)
-    - BUGFIX: Expand folders when filtering files. Closes #1076. (sledgehammer999)
+    - FEATURE: Add option to hibernate computer in Auto-Shutdown menu (Bruno Barbieri)
-    - BUGFIX: Updated search plugin's URL (Zach Thibeau)
+    - FEATURE: Cache preferences in memory. Minimize chance of settings corruption. Closes #1272, #1523, #1694. (sledgehammer999)
-    - BUGFIX: Strip some png to fix incorrect sRGB profiles. (Angel Alonso)
+    - FEATURE: Option to disable connections not supported by proxies. Closes #1894. (sledgehammer999)
-    - BUGFIX: Fixed font issues on OSX Mavericks (Zach Thibeau)
+    - FEATURE: Haiku OS support (diger)
-    - BUGFIX: Improve text in the About dialog (Artem S. Tashkinov)
+    - FEATURE: Add a save resume data interval option(useful for SSD). (john-peterson)
-    - BUGFIX: Always show a peer IP address as a tool tip (Artem S. Tashkinov)
+    - FEATURE: Add "Last Seen Complete" column (pmzqla)
-    - BUGFIX: Fix inhibit system functionality. Closes #766. (sledgehammer999)
+    - FEATURE: Add "Last Activity" column (pmzqla)
-    - BUGFIX: WebUI: Don't gzip too small payloads. (sledgehammer999)
+    - FEATURE: Add "Total Size" column (pmzqla)
-    - BUGFIX: Correctly detect if the browser supports gzip compression. (sledgehammer999)
+    - FEATURE: Show current speed limits in the status bar (pmzqla)
-    - BUGFIX: Fix WebUI link to 'Anonymous mode' explanation. Closes #1093. (sledgehammer999)
+    - FEATURE: Episode filtering for RSS (Gelmir)
-    - BUGFIX: Correctly update tracker tier number in the trackers tab. Closes #1075. (sledgehammer999)
+    - FEATURE: Highlight files when opening containing folder on Windows and Linux(nautilus, dolphin, konqueror). (Gelmir, pmzqla)
-    - BUGFIX: Speed improvements.(sledgehammer999)
+    - FEATURE: Setting to ignore RSS rule matches for X days (Gelmir)
-    - OTHER: Updated translations.
+    - FEATURE: Add hotkeys and buttons for Top and Bottom priorities (alfrix)
-    
+    - FEATURE: Implement peer relevance column. Closes #1630. (sledgehammer999)
-* Tue Nov 05 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.2
+    - FEATURE: Show reason why a peer was blocked. Needs libtorrent 1.0.x. (sledgehammer999)
-    - BUGFIX: Fix WebUI gzip compression. Closes #1037. (sledgehammer999)
+    - FEATURE: Use the 'fastest_upload' setting as seed choking algorithm. (sledgehammer999)
-    - BUGFIX: Fix compilation with qt < 4.8.0. Closes #1043. (sledgehammer999)
+    - FEATURE: Allow to set text options for the toolbar icons (pmzqla)
-    - OTHER: Updated translations.
+    - FEATURE: Add 'Resumed' torrent filter (john.s.peterson)
-
+    - FEATURE: 'Add New Torrent` dialog has a button for quickly choosing a location (sledgehammer999)
-* Mon Oct 28 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.1
+    - FEATURE: Copy selected peers as IP:Port format. (ngosang)
-    - FEATURE: Show external IP in the log. Closes #968. (sledgehammer999)
+    - FEATURE: Show info hash in the torrent details in 'Add New Torrent' dialog. (sledgehammer999, chrishirst)
-    - FEATURE: Enable gzip compression in the webui. It should be faster now. (sledgehammer999)
+    - FEATURE: New feature: Remove empty labels (ngosang)
-    - FEATURE: Torrents show more states(queued for checking, downloading metadata, allocating, checking resume). (sledgehammer999)
+    - FEATURE: Add "Copy name" option in right-click menu of torrent list. Closes #2452 (chrishirst)
-    - FEATURE: Reenable "force reannounce" to all trackers. (sledgehammer999)
+    - FEATURE: Implement tracker list in the side panel. Closes #170. (sledgehammer999)
-    - FEATURE: Allow to clear the UI lock password. Closes #973. (sledgehammer999)
+    - FEATURE: Implement a 'Completed' status. Closes #2326 #2483 #939. (sledgehammer999)
-    - FEATURE: New translations: English(Australia) and English(United Kingdom)
+    - FEATURE: Columns for session-based download and upload statistics (LazyBui)
-    - BUGFIX: Expose all available translation in the WebUI. Closes #976. (sledgehammer999)
+    - BUGFIX: Use completed time from libtorrent directly. Closes #1726.
-    - BUGFIX: Copy IP copied wrong data. Closes #970 (sledgehammer999)
+    - BUGFIX: Speedup and fix a bug in torrent moving. (sorokin)
-    - BUGFIX: "Preview file..." didn't work on single file torrents. (sledgehammer999)
+    - BUGFIX: Scan Folder dialog now remembers last location (Bryan Roscoe)
-    - BUGFIX: Fix and improve the scheduler (Gelmir and sledgehammer999)
+    - BUGFIX: Show input box to filter torrent list only when the list is shown (pmzqla)
-    - BUGFIX: RSS fixes. Closes #960, #998 (Gelmir)
+    - BUGFIX: Add placeholder text to the input to filter the torrent list (pmzqla)
-    - BUGFIX: Fix 'append label to save path' with magnet links. (sledgehammer999)
+    - BUGFIX: Put directories first when sorting torrent content by name (pmzqla)
-    - BUGFIX: Can download up to 10MB .torrent file when a link is provided. Closes #879 (sledgehammer999)
+    - BUGFIX: Fix missing icon for open action in file list (Gelmir)
-    - OTHER: Updated translations.
+    - BUGFIX: Set placeholder text to torrent content filter. (sorokin)
-    - LINUX: Fix missing conf.pri error (leigh123linux)
+    - BUGFIX: Fix torrent creation when data is too large (sorokin)
-    - WINDOWS: Don't remove file associations if they aren't our own. (sledgehammer999)
+    - BUGFIX: Load torrents that have big metadata file. Closes #1889. (sledgehammer999)
+    - BUGFIX: Use correct separator for "OR" condition in RSS rules (pmzqla)
+    - BUGFIX: Don't waste UI space in 'Content' window. Closes #2159 (alfrix)
+    - BUGFIX: Fix the language selection in the combobox when the system locale only has a lang equivalent and not a lang_COUNTRY one. Closes #1786. (sledgehammer999)
+    - BUGFIX: Don't overwrite the 'Add Paused' setting from the Add New Torrent Dialog (Gelmir)
+    - BUGFIX: Fix file preview when .!qB extension is used (pmzqla)
+    - BUGFIX: Ensure that the priority column has enough width when queueing is enabled. Closes #2263. (sledgehammer999)
+    - BUGFIX: Don't put limits to the alternative speed limits (pmzqla)
+    - BUGFIX: Make space key change all selected files' checkboxes (sorokin)
+    - BUGFIX: Don't block peers that use privileged ports. (sledgehammer999)
+    - BUGFIX: Accept multiple files at once. Closes #2253 (buinsky)
+    - BUGFIX: Don't touch torrents whose files are missing. Closes #342 #2308 #2469. (sledgehammer999)
+    - BUGFIX: Save the new save path first in the history. Closes #2382. (sledgehammer999)
+    - BUGFIX: Fix default tracker in 'Create Torrent' dialog. (ngosang)
+    - BUGFIX: Let the OS decide the default interface regardless of IPv4/IPv6. Closes #2156. (Chocobo1)
+    - BUGFIX: Delete the correct selected torrents when the list is filtered. Closes #2729. (sledgehammer999)
+    - BUGFIX: Don't use HTML in tray icon pop-up on OSX. Closes #2830. (pmzqla)
+    - BUGFIX: Fix crash when trying to open destination folder on a torrent with no metadata. Closes #2522. (pmzqla)
+    - BUGFIX: Change torrent name when metadata is retrieved. (ngosang)
+    - COSMETIC: Removes white bar in the labels list. Closes #1151. (ngosang)
+    - COSMETIC: Fix speed printing in the tray icon and in the title bar. Closes #2737. (sledgehammer999)
+    - COSMETIC: Change the color scheme used (sledgehammer999)
+    - RSS: Display remote images in the preview (Mladen Milinkovic)
+    - RSS: Format html descriptions in the preview (Mladen Milinkovic)
+    - RSS: Support overriding global "Add paused" option on per rule basis (Gelmir)
+    - WINDOWS: Fix automatic python download. Closes #2076. (sledgehammer999)
+    - WINDOWS: Fix crash when searching the registry for installed python (glassez)
+    - WINDOWS: Tell Windows to wait during shutdown. (sledgehammer999, paolo-sz)
+    - OSX: Use the configure script to prepare the build in Mac OSX too. Closes #2295. (sledgehammer999)
+    - OSX: Fix the build (David Christenson)
+    - LINUX: Distribute systemd service file for the nox build (sledgehammer999, leigh123linux)
+    - LINUX: Create qBittorrent.appdata.xml (alxpl)
+    - SEARCH: Update KickassTorrents plugin (pmzqla)
+    - SEARCH: Remove vertor engine. Closes #2260. (DoumanAsh)
+    - SEARCH: Small fix of import in legittorrents engine (DoumanAsh)
+    - SEARCH: Add combo box for fast search engine switch (DoumanAsh)
+    - SEARCH: Fix error in mininova search engine (ngosang)
+    - SEARCH: Fix piratebay. Closes #2270 (DoumanAsh)
+    - SEARCH: Updated URL in kickasstorrents search engine (ngosang)
+    - SEARCH: Torrentz search engine added (ngosang)
+    - OTHER: Drop libtorrent 0.15.x support
+    - OTHER: Drop Qt < 4.8.0 support
+    - OTHER: Migrate build system to autotools (sledgehammer999)
+    - OTHER: Remove deprecated feature of separate DHT port. (sledgehammer999)
+    - OTHER: Speedup compilation speed (sorokin)
+    - OTHER: Backtrace generation now works on MinGW. (Gelmir)
+    - OTHER: New translation: Hindi(India).
 
 * Sat Oct 12 2013 - Christophe Dumez <chris@qbittorrent.org> and sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.0
     - FEATURE: Add command line option to daemonize qbittorrent-nox (ngaro)

README.md

@@ -1,10 +1,11 @@
-qBittorrent - A BitTorrent client in Qt4
+qBittorrent - A BitTorrent client in Qt
 ------------------------------------------
 
-Description:
+[![Build Status](https://travis-ci.org/qbittorrent/qBittorrent.png?branch=master)](https://travis-ci.org/qbittorrent/qBittorrent)
 ********************************
-qBittorrent is a bittorrent client programmed in C++ / Qt4 that uses
+###Description:
-libtorrent (sometimes called rblibtorrent) by Arvid Norberg.
+qBittorrent is a bittorrent client programmed in C++ / Qt that uses
+libtorrent (sometimes called libtorrent-rasterbar) by Arvid Norberg.
 
 It aims to be a good alternative to all other bittorrent clients
 out there. qBittorrent is fast, stable and provides unicode
@@ -13,13 +14,14 @@ support as well as many features.
 This product includes GeoLite data created by MaxMind, available from
 http://maxmind.com/
 
-Installation:
+### Installation:
-********************************
 For installation, follow the instructions from INSTALL file, but simple:
 
+```
 ./configure
 make && make install
 qbittorrent
+```
 
 will install and execute qBittorrent hopefully without any problem.
 
@@ -32,9 +34,9 @@ http://wiki.qbittorrent.org
 Please report any bug (or feature request) to:
 http://bugs.qbittorrent.org
 
-You can also meet me (chris-qBT) on IRC:
+You can also meet me (sledgehammer_999) on IRC:
-#qbittorrent on irc.freenode.net
+`#qbittorrent on irc.freenode.net`
 
 ------------------------------------------
-Christophe Dumez <chris@qbittorrent.org>
+sledgehammer999 <sledgehammer999@qbittorrent.org>
 

bootstrap.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+aclocal -I m4
+autoconf

build-aux/missing

@@ -0,0 +1,215 @@
+#! /bin/sh
+# Common wrapper for a few potentially missing GNU programs.
+
+scriptversion=2013-10-28.13; # UTC
+
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# 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, 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, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try '$0 --help' for more information"
+  exit 1
+fi
+
+case $1 in
+
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
+
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+
+Supported PROGRAM values:
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
+
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
+
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:

conf.pri.in

@@ -0,0 +1,16 @@
+# @configure_input@
+
+PREFIX = @EXPAND_PREFIX@
+BINDIR = @EXPAND_BINDIR@
+DATADIR = @EXPAND_DATADIR@
+MANPREFIX = @EXPAND_MANDIR@
+
+QMAKE_CXXFLAGS += @QBT_CONF_EXTRA_CFLAGS@
+INCLUDEPATH += @QBT_CONF_INCLUDES@
+LIBS += @LDFLAGS@ @LIBS@
+
+CONFIG += @QBT_ADD_CONFIG@
+CONFIG -= @QBT_REMOVE_CONFIG@
+
+DEFINES += @QBT_ADD_DEFINES@
+DEFINES -= @QBT_REMOVE_DEFINES@

dist/mac/Info.plist

@@ -45,17 +45,21 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.3</string>
+	<string>3.2.0</string>
 	<key>CFBundleSignature</key>
 	<string>qBit</string>
 	<key>CFBundleExecutable</key>
 	<string>qbittorrent</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.qbittorrent</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSHighResolutionCapable</key>
+	<string>True</string>
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2006-2013 The qBittorrent project</string>
+	<string>Copyright © 2006-2015 The qBittorrent project</string>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>

dist/mac/qt.conf

@@ -1,4 +1,3 @@
 [Paths]
- Prefix = MacOS
  Translations = translations
  Plugins = PlugIns