Bump to 3.1.4

2. Use more reliable session_status.total_download/upload for statistics

.gitignore

@@ -1,6 +1,6 @@
 src/geoip/GeoIP.dat
 src/qbittorrent
-qbittorrent.pro.user
+qbittorrent.pro.user*
 conf.pri
 Makefile
 *.pyc
@@ -12,3 +12,4 @@ moc_*.cpp
 qrc_*.cpp
 ui_*.h
 *.moc
+src/lang/qbittorrent_*.qm

.travis.yml

@@ -0,0 +1,53 @@
+language:
+  - cpp
+
+env:
+  # use libtorrent 0.15.10
+  - 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_svn gui=false
+
+branches:
+  except:
+    - search_encoding_windows
+    - v2_9_x
+
+notifications:
+  email:
+    on_success: change
+    on_failure: change 
+
+before_install:
+  - shopt -s expand_aliases
+  - alias sudo="sudo "
+  # Using nprocs/2 sometimes may fail (gcc is killed by system), just use two threads
+  - alias make="colormake -j2 "
+
+  # 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
+  - ltconf=" --with-libgeoip=system"
+
+  - echo settings
+  - echo $lt_source
+  - echo $ltconf
+  - echo $gui
+  - echo $qbtconf
+
+  - 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 libboost-dev libboost-filesystem-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_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
+
+script:
+  - qt-qconf
+  - ./configure $qbtconf && sudo make install
+  
+after_success:
+  - if $gui ; then qbittorrent --version ; else qbittorrent-nox --version ; fi

.tx/config

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

AUTHORS

@@ -1,4 +1,7 @@
-Author:
+Current maintainer:
+* Sledgehammer999 <sledgehammer999@qbittorrent.org>
+
+Original author:
 * Christophe Dumez <chris@qbittorrent.org>
 
 Contributors:
@@ -11,6 +14,7 @@ Contributors:
 * Grigis Gaëtan <cipher16@gmail.com>
 * Christian Kandeler <zambesi@users.sourceforge.net>
 * Silvan Scherrer <silvan.scherrer@aroa.ch>
+* Nick Tiskov <daymansmail@gmail.com>
 
 Code from other projects:
 * files src/qtsingleapp/* src/lineedit/*
@@ -25,6 +29,10 @@ Code from other projects:
   copyright: Dan Haim <negativeiq@users.sourceforge.net>
   license: BSD
 
+* file src/stacktrace_win.h
+  copyright: Quassel Project
+  license: GPLv2/3
+
 Images Authors:
 * files: src/Icons/*.png
   copyright: Gnome Icon Theme
@@ -71,41 +79,46 @@ Images Authors:
 
 Translations authors:
 * files: src/lang/*.ts
+* file: src/Icons/qBittorrent.desktop
   copyright:
-  - Arabic: SDERAWI (abz8868@msn.com) and sn51234 (nesseyan@gmail.com)
+  - Arabic: SDERAWI (abz8868@msn.com), sn51234 (nesseyan@gmail.com) and  Ibrahim Saed ibraheem_alex(Transifex)
   - 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)
+  - Chinese (Traditional): Yi-Shun Wang (dnextstep@gmail.com) and 冥王歐西里斯 s8321414(Transifex)
   - Croatian: Oliver Mucafir (oliver.untwist@gmail.com)
-  - Czech: Jirka Vilim (web@tets.cz)
+  - Czech: Jirka Vilim (web@tets.cz) and Petr Cernobila abr(Transifex)
   - Danish: Mathias Nielsen (comoneo@gmail.com)
   - Dutch: Pieter Heyvaert (pieter_heyvaert@hotmail.com)
   - English: Christophe Dumez (chris@qbittorrent.org)
-  - Finnish: Niklas Laxström (nikerabbit@users.sourceforge.net)
+  - English(Australia): Robert Readman readmanr(Transifex)
+  - English(United Kingdom): Robert Readman readmanr(Transifex)
+  - Finnish: Niklas Laxström (nikerabbit@users.sourceforge.net), Pekka Niemi (pekka.niemi@iki.fi) and Jiri Grönroos artnay(Transifex)
   - French: Christophe Dumez (chris@qbittorrent.org)
-  - Galician: Marcos Lans (marcoslansgarza@gmail.com)
+  - Galician: Marcos Lans (marcoslansgarza@gmail.com) and antiparvos(Transifex)
   - 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)
+  - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net), Stephanos Antaris (santaris@csd.auth.gr), sledgehammer999(hammered999@gmail.com) and Γιάννης Ανθυμίδης Evropi(Transifex)
+  - Hebrew: David Deutsch (d.deffo@gmail.com)
   - Hungarian: Majoros Péter (majoros.j.p@t-online.hu)
-  - Italian: Matteo Sechi (bu17714@gmail.com)
+  - Italian: bovirus (bovirus@live.it) and Matteo Sechi (bu17714@gmail.com)
   - Japanese: Masato Hashimoto (cabezon.hashimoto@gmail.com)
   - Korean: Jin Woo Sin (jin828sin@users.sourceforge.net)
   - Lithuanian: Naglis Jonaitis (njonaitis@gmail.com)
   - Norwegian: Tomaso
   - Polish: Mariusz Fik (fisiu@opensuse.org)
-  - Portuguese: Nick Marinho (nickmarinho@gmail.com)
-  - Romanian: Obada Denis (obadadenis@users.sourceforge.net)
-  - Russian: Nick Khazov (m2k3d0n at users.sourceforge.net)
+  - Portuguese: Sérgio Marques smarquespt(Transifex)
+  - Portuguese(Brazil): Nick Marinho (nickmarinho@gmail.com)
+  - Romanian: Obada Denis (obadadenis@users.sourceforge.net), Adrian Gabor Adriannho(Transifex) and Mihai Coman z0id(Transifex)
+  - Russian: Nick Khazov (m2k3d0n at users.sourceforge.net), Alexey Morsov (samurai@ricom.ru), Nick Tiskov Dayman(daymansmail (at) gmail (dot) com), Dmitry DmitryKX(Transifex) and kraleksandr kraleksandr(Transifex)
   - Serbian: Anaximandar Milet (anaximandar at operamail.com)
   - Slovak:  helix84
-  - Spanish: Francisco Luque Contreras (frannoe@ya.com)
-  - Swedish: Daniel Nylander (po@danielnylander.se)
+  - Spanish: Francisco Luque Contreras (frannoe@ya.com), Alfredo Monclus alfrix(Transifex) and José Antonio Moray moray33(Transifex)
+  - Swedish: Daniel Nylander (po@danielnylander.se) and Emil Hammarberg Ooglogput(Transifex)
   - Turkish: Hasan Yilmaz (iletisim@hedefturkce.com)
-  - Ukrainian: Oleh Prypin (blaxpirit@gmail.com)
+  - Ukrainian: Oleh Prypin (blaxpirit@gmail.com) and zubr139(Transifex)
+  - Vietnamese: Anh Phan ppanhh(Transifex)
   license: GPLv2

COPYING

@@ -69,7 +69,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -124,7 +124,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -182,7 +182,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -239,7 +239,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -292,7 +292,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest

Changelog

@@ -1,3 +1,97 @@
+* Sun 29 Dec 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.4
+    - FEATURE: Statistics dialog (Gelmir)
+    - FEATURE: Tooltips explaining each peer's connection flags (sledgehammer999)
+    - FEATURE: Win/Mac Check for program updates every 15min and allow the user to manually check for updates through the help menu. (sledgehammer999)
+    - BUGFIX: Better dialog message for torrent delete confirmation (sledgehammer999)
+    - BUGFIX: Fix resizing grip location. Closes #1146. (sledgehammer999)
+    - BUGFIX: Lock toolbar in place. Closes #1144. (sledgehammer999)
+    - BUGFIX: Second attempt at fixing saving settings on shutdown. (sledgehammer999)
+    - BUGFIX: Sort labels in 'Add new torrent' dialog. Closes #1150 #411. (sledgehammer999)
+    - LINUX: Fix build under Ubuntu 13.10 (sledgehammer999)
+    - LINUX: Make sleep and shutdown functions work on systemd's logind (Faheem Pervez)
+
+* Mon Nov 20 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.3
+    - FEATURE: Add a key shortcut to "Add link to torrent..." (Angel Alonso)
+    - BUGFIX: Make all columns and headers use the same text alignment in the transferlist. (sledgehammer999)
+    - BUGFIX: Fix build system for Unix/Linux. (sledgehammer999)
+    - BUGFIX: Case insensitive sort in Peers list. Closes #1066. (sledgehammer999)
+    - BUGFIX: Small optimization of WebUI responses when there isn't a data payload. (sledgehammer999)
+    - BUGFIX: Hide empty folders after filtering. Closes #74. (sledgehammer999)
+    - BUGFIX: Expand folders when filtering files. Closes #1076. (sledgehammer999)
+    - BUGFIX: Updated search plugin's URL (Zach Thibeau)
+    - BUGFIX: Strip some png to fix incorrect sRGB profiles. (Angel Alonso)
+    - BUGFIX: Fixed font issues on OSX Mavericks (Zach Thibeau)
+    - BUGFIX: Improve text in the About dialog (Artem S. Tashkinov)
+    - BUGFIX: Always show a peer IP address as a tool tip (Artem S. Tashkinov)
+    - BUGFIX: Fix inhibit system functionality. Closes #766. (sledgehammer999)
+    - BUGFIX: WebUI: Don't gzip too small payloads. (sledgehammer999)
+    - BUGFIX: Correctly detect if the browser supports gzip compression. (sledgehammer999)
+    - BUGFIX: Fix WebUI link to 'Anonymous mode' explanation. Closes #1093. (sledgehammer999)
+    - BUGFIX: Correctly update tracker tier number in the trackers tab. Closes #1075. (sledgehammer999)
+    - BUGFIX: Speed improvements.(sledgehammer999)
+    - OTHER: Updated translations.
+    
+* Tue Nov 05 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.2
+    - BUGFIX: Fix WebUI gzip compression. Closes #1037. (sledgehammer999)
+    - BUGFIX: Fix compilation with qt < 4.8.0. Closes #1043. (sledgehammer999)
+    - OTHER: Updated translations.
+
+* Mon Oct 28 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.1
+    - FEATURE: Show external IP in the log. Closes #968. (sledgehammer999)
+    - FEATURE: Enable gzip compression in the webui. It should be faster now. (sledgehammer999)
+    - FEATURE: Torrents show more states(queued for checking, downloading metadata, allocating, checking resume). (sledgehammer999)
+    - FEATURE: Reenable "force reannounce" to all trackers. (sledgehammer999)
+    - FEATURE: Allow to clear the UI lock password. Closes #973. (sledgehammer999)
+    - FEATURE: New translations: English(Australia) and English(United Kingdom)
+    - BUGFIX: Expose all available translation in the WebUI. Closes #976. (sledgehammer999)
+    - BUGFIX: Copy IP copied wrong data. Closes #970 (sledgehammer999)
+    - BUGFIX: "Preview file..." didn't work on single file torrents. (sledgehammer999)
+    - BUGFIX: Fix and improve the scheduler (Gelmir and sledgehammer999)
+    - BUGFIX: RSS fixes. Closes #960, #998 (Gelmir)
+    - BUGFIX: Fix 'append label to save path' with magnet links. (sledgehammer999)
+    - BUGFIX: Can download up to 10MB .torrent file when a link is provided. Closes #879 (sledgehammer999)
+    - OTHER: Updated translations.
+    - LINUX: Fix missing conf.pri error (leigh123linux)
+    - WINDOWS: Don't remove file associations if they aren't our own. (sledgehammer999)
+
+* 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)
+    - FEATURE: Add "Shutdown qBittorrent" button to Web UI (ngaro)
+    - FEATURE: Add setting to copy .torrent files for finished downloads (Driim)
+    - FEATURE: Add option to start qBittorrent on Windows startup (sledgehammer999)
+    - FEATURE: Add context menu to Web seed list (Gelmir)
+    - FEATURE: Add support for tracker tiers / groups to creator (Gelmir)
+    - FEATURE: Allow clearing execution and ban logs (Gelmir)
+    - FEATURE: Add option to use random port on each startup (ireallylikeher)
+    - FEATURE: Expose the cache expiry to the user (Gelmir)
+    - FEATURE: Support Atom feeds (Gelmir)
+    - FEATURE: Add "save path" column (John Peterson)
+    - FEATURE: Add μTorrent-compatible "Flags" column in the peer tab(sledgehammer999)
+    - FEATURE: Load magnet metadata in the background while the "Add New Torrent" Dialog is showing (Gelmir)
+    - FEATURE: Allow to enter only an info-hash for download(sledgehammer999)
+    - FEATURE: Bring the "Add New Torrent" Dialog to the front(glassez)
+    - BUGFIX: Add confirmation dialog for "Force recheck" action (closes #131)
+    - BUGFIX: Greatly improve RSS manager performance (closes #34)
+    - BUGFIX: Ensure that all columns in the tranferlist have a size > 0.
+    - BUGFIX: Don't mark RSS item as read when it failed to download (Gelmir)
+    - BUGFIX: Fix ETA calculation when some files are downloaded and marked afterwards as 'do not download'(sledgehammer999)
+    - BUGFIX: Make the UI show that PEX/DHT/LSD are actually disabled on private torrents(sledgehammer999)
+    - BUGFIX: Scheduler should be much more robust and correct now(sledgehammer999)
+    - BUGFIX: Now qBt won't forget torrent settings after an unclean shutdown(sledgehammer999)
+    - BUGFIX: Text boxes in edit dialogs will fit to text width(Gelmir)
+    - BUGFIX: Enable edit/rename via F2 or double click in various places(Gelmir)
+    - BUGFIX: Allow to edit trackers and copy their urls(Gelmir and Driim)
+    - BUGFIX: Add Uploaded column to main view(Gelmir)
+    - BUGFIX: Calculate ETA for seeding torrents(Gelmir)    
+    - BUGFIX: Add option to ignore global share ratio limits for created torrents(Gelmir)
+    - OTHER: Many RSS bugfixes and improvements all over the place(Gelmir)
+    - OTHER: Generate translations at configure time to reduce tarball size
+    - OTHER: Make peer tab sortable by ip too (Gelmir)
+    - OTHER: Translations moved to Transifex(https://www.transifex.com/projects/p/qbittorrent/)
+    - OTHER: New Translation - Vietnamese (Anh Phan)
+    - PERFORMANCE: Impove drawing speed of tranferlist when there are many torrents(>100)
+    - PERFORMANCE: Impove drawing speed of peers list when there are many peers
+
 * Thu Aug 09 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.0
     - FEATURE: Brand new torrent addition dialog
     - FEATURE: Add the ability to choose the save path when using magnet links (mutoso)

README.os2

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

@@ -507,11 +507,11 @@ public:
 #if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16
     required_libs << "filesystem" ;
 #endif
-    required_libs << "thread";
+    //required_libs << "thread";
     QStringList libDirs;
     if (!s.isEmpty())
       libDirs << s;
-    libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
+    libDirs << "/usr/lib/" << "/usr/lib/i386-linux-gnu/" << "/usr/lib64/" << "/usr/lib/x86_64-linux-gnu/" << "/usr/local/lib/" << "/usr/lib/local/i386-linux-gnu/" << "/usr/local/lib64/" << "/usr/local/lib/x86_64-linux-gnu/";
 
     foreach(const QString& lib, required_libs) {
       bool found = false;

doc/qbittorrent-nox.1

@@ -8,7 +8,7 @@ qBittorrent\-nox \- a command line Bittorrent client written in C++ / Qt4
 
 .SH "SYNOPSIS"
 
-\fBqbittorrent\-nox\fR [\-\-webui-port=x] [TORRENT_FILE | URL]...
+\fBqbittorrent\-nox\fR [\-\-d|\-\-daemon] [\-\-webui-port=x] [TORRENT_FILE | URL]...
 
 \fBqbittorrent\-nox\fR \-\-help
 

install.os2

@@ -67,7 +67,7 @@ ZIP Installation:
 klibc
 -----
 
-  1. Download klibc 0.6.4 or better (see http://svn.netlabs.org/libc for more information)
+  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
@@ -146,6 +146,19 @@ development, you can do so in one of the following ways:
 7. HISTORY
 ==========
 
+2012-09-19
+
+  * updated to 3.0.4 code level of QBittorrent
+  * updated libtorrent to 0.16.3 level
+
+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

macxconf.pri

@@ -16,16 +16,52 @@ LIBS += -lssl -lcrypto
 # Boost system lib
 LIBS += -lboost_system-mt
 # Boost filesystem lib (Not needed for libtorrent >= 0.16.0)
-LIBS += -lboost_filesystem-mt
+#LIBS += -lboost_filesystem-mt
 # Carbon
 LIBS += -framework Carbon -framework IOKit
+# Zlib
+LIBS += -lz
 
 document_icon.path = Contents/Resources
-document_icon.files = Icons/qBitTorrentDocument.icns
-
+document_icon.files = mac/qBitTorrentDocument.icns
 QMAKE_BUNDLE_DATA += document_icon
-ICON = Icons/qbittorrent_mac.icns
-QMAKE_INFO_PLIST = Info.plist
+
+qt_conf.path = Contents/Resources
+qt_conf.files = mac/qt.conf
+QMAKE_BUNDLE_DATA += qt_conf
+
+qt_translations.path = Contents/MacOS/translations
+qt_translations.files = qt-translations/qt_ar.qm \
+                        qt-translations/qt_bg.qm \
+                        qt-translations/qt_ca.qm \
+                        qt-translations/qt_cs.qm \
+                        qt-translations/qt_da.qm \
+                        qt-translations/qt_de.qm \
+                        qt-translations/qt_es.qm \
+                        qt-translations/qt_fi.qm \
+                        qt-translations/qt_fr.qm \
+                        qt-translations/qt_gl.qm \
+                        qt-translations/qt_he.qm \
+                        qt-translations/qt_hu.qm \
+                        qt-translations/qt_it.qm \
+                        qt-translations/qt_ja.qm \
+                        qt-translations/qt_ko.qm \
+                        qt-translations/qt_lt.qm \
+                        qt-translations/qt_nl.qm \
+                        qt-translations/qt_pl.qm \
+                        qt-translations/qt_pt.qm \
+                        qt-translations/qt_pt_BR.qm \
+                        qt-translations/qt_ru.qm \
+                        qt-translations/qt_sk.qm \
+                        qt-translations/qt_sv.qm \
+                        qt-translations/qt_tr.qm \
+                        qt-translations/qt_uk.qm \
+                        qt-translations/qt_zh_CN.qm \
+                        qt-translations/qt_zh_TW.qm
+QMAKE_BUNDLE_DATA += qt_translations
+
+ICON = mac/qbittorrent_mac.icns
+QMAKE_INFO_PLIST = mac/Info.plist
 
 DEFINES += WITH_GEOIP_EMBEDDED
 message("On Mac OS X, GeoIP database must be embedded.")

os2conf.pri

@@ -7,12 +7,13 @@ LIBS += -ltorrent-rasterbar \
         -lboost_thread \
         -lboost_system \
         -lboost_filesystem \
-        -lssl -lcrypto -lidn -lpthread
+        -lssl -lcrypto -lidn -lpthread -lz
 
 RC_FILE = qbittorrent_os2.rc
 
 # LIBTORRENT DEFINES
 DEFINES += WITH_SHIPPED_GEOIP_H
+DEFINES += BOOST_ASIO_DYN_LINK
 
 DEFINES += WITH_GEOIP_EMBEDDED
 message("On eCS(OS/2), GeoIP database must be embedded.")

qbittorrent.pro

@@ -3,6 +3,7 @@ TEMPLATE = subdirs
 SUBDIRS += src
 
 include(version.pri)
+include(qm_gen.pri)
 
 # Dist
 dist.commands += rm -fR ../$${PROJECT_NAME}-$${PROJECT_VERSION}/ &&

qcm/libboost.qcm

@@ -71,11 +71,11 @@ public:
 #if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16
     required_libs << "filesystem" ;
 #endif
-    required_libs << "thread";
+    //required_libs << "thread";
     QStringList libDirs;
     if (!s.isEmpty())
       libDirs << s;
-    libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
+    libDirs << "/usr/lib/" << "/usr/lib/i386-linux-gnu/" << "/usr/lib64/" << "/usr/lib/x86_64-linux-gnu/" << "/usr/local/lib/" << "/usr/lib/local/i386-linux-gnu/" << "/usr/local/lib64/" << "/usr/local/lib/x86_64-linux-gnu/";
 
     foreach(const QString& lib, required_libs) {
       bool found = false;

qm_gen.pri

@@ -0,0 +1,19 @@
+TS_IN = $$fromfile(src/src.pro,TRANSLATIONS)
+TS_IN_NOEXT = $$replace(TS_IN,".ts","")
+             
+isEmpty(QMAKE_LRELEASE) {
+    win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
+    else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
+    unix {
+        !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt4 }
+    } else {
+        !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
+    }
+}
+
+message("Building translations")
+for(L,TS_IN_NOEXT) {
+    message("Processing $${L}")
+    system("$$QMAKE_LRELEASE -silent src/$${L}.ts -qm src/$${L}.qm")
+    !exists("src/$${L}.qm"):error("Building translations failed, cannot continue")
+}

src/Icons/qBittorrent.desktop

@@ -2,40 +2,118 @@
 Categories=Network;FileTransfer;P2P;Qt;
 Exec=qbittorrent %U
 GenericName=BitTorrent client
-GenericName[ar]=العميل BitTorrent
-GenericName[bg]=Торент клиент
-GenericName[cs]=BitTorrent klient
-GenericName[de]=BitTorren Client
-GenericName[el]=BitTorrent πελάτης
-GenericName[es]=Cliente BitTorrent
-GenericName[fi]=BitTorrent-ohjelma
-GenericName[fr]=Client BitTorrent
-GenericName[hr]=BitTorrent klijent
-GenericName[hu]=BitTorrent kliens
-GenericName[it]=Client BitTorrent
-GenericName[ja]=BitTorrent クライアント
-GenericName[ko]=비토렌트 클라이언트
-GenericName[lt]=BitTorrent klientas
-GenericName[nl]=BitTorrent-cliënt
-GenericName[pl]=Klient BitTorrent
-GenericName[pt]=Cliente BitTorrent
-GenericName[pt_BR]=Cliente BitTorrent
-GenericName[ro]=Client BitTorrent
-GenericName[ru]=клиент BitTorrent
-GenericName[sk]=Klient siete BitTorrent
-GenericName[sr]=BitTorrent-клијент
-GenericName[sv]=BitTorrent-klient
-GenericName[tr]=BitTorrent istemcisi
-GenericName[uk]=BitTorrent-клієнт
-GenericName[zh]=BitTorrent之用户
-GenericName[zh_TW]=BitTorrent客戶端
 Comment=Download and share files over BitTorrent
-Comment[fr]=Télécharger et partager des fichiers avec BitTorrent
-Comment[pl]=Dzielenie się plikami przez BitTorrent
 Icon=qbittorrent
 MimeType=application/x-bittorrent;x-scheme-handler/magnet;
 Name=qBittorrent
-Name[ko]=큐비토런트
 Terminal=false
 Type=Application
 
+
+
+# Translations
+
+
+# Translations
+GenericName[ar]=العميل BitTorrent
+Comment[be]=Сцягванне і раздача файлаў праз пратакол BitTorrent
+GenericName[be]=BitTorrent-кліент
+Name[be]=qBittorrent
+Icon[be]=qbittorrent
+GenericName[bg]=Торент клиент
+Comment[cs]=Stahování a sdílení souborů přes síť BitTorrent
+GenericName[cs]=BitTorrent klient
+Name[cs]=qBittorrent
+Icon[cs]=qbittorrent
+GenericName[de]=BitTorren Client
+Comment[el]=Λήψη και διαμοιρασμός αρχείων μέσω BitTorrent
+GenericName[el]=BitTorrent πελάτης
+Name[el]=qBittorrent
+Icon[el]=qbittorrent
+Comment[en_GB]=Download and share files over BitTorrent
+GenericName[en_GB]=BitTorrent client
+Name[en_GB]=qBittorrent
+Icon[en_GB]=qbittorrent
+Comment[es]=Descarga y comparte archivos por BitTorrent
+GenericName[es]=Cliente BitTorrent
+Name[es]=qBittorrent
+Icon[es]=qbittorrent
+Comment[eu]=Jeitsi eta elkarbanatu agiriak BitTorrent-en
+GenericName[eu]=BitTorrent bezeroa
+Name[eu]=qBittorrent
+Icon[eu]=qbittorrent
+Comment[fi]=Lataa ja jaa tiedostoja BitTorrentia käyttäen
+GenericName[fi]=BitTorrent-ohjelma
+Name[fi]=qBittorrent
+Icon[fi]=qbittorrent
+Comment[fr]=Télécharger et partager des fichiers avec BitTorrent
+GenericName[fr]=Client BitTorrent
+Comment[gl]=Descargue e comparta ficheiros co protocolo BitTorrent
+GenericName[gl]=Cliente BitTorrent
+Name[gl]=qBittorrent
+Icon[gl]=qbittorrent
+GenericName[hr]=BitTorrent klijent
+GenericName[hu]=BitTorrent kliens
+Comment[it]=Client BitTorrent per il download di file via internet
+GenericName[it]=Client BitTorrent
+Name[it]=qBittorrent
+Icon[it]=qbittorrent
+Comment[ja]=BitTorrent でファイルをダウンロードおよび共有します
+GenericName[ja]=BitTorrent クライアント
+Name[ja]=qBittorrent
+Icon[ja]=qbittorrent
+GenericName[ko]=비토렌트 클라이언트
+Name[ko]=큐비토런트
+GenericName[zh]=BitTorrent之用户
+Comment[lt]=Atsisiųskite bei dalinkitės failais BitTorrent tinkle
+GenericName[lt]=BitTorrent klientas
+Name[lt]=qBittorrent
+Icon[lt]=qbittorrent
+Comment[nb]=Last ned og del filer over BitTorrent
+GenericName[nb]=BitTorrent-klient
+Name[nb]=qBittorrent
+Icon[nb]=qbittorrent
+GenericName[nl]=BitTorrent-cliënt
+Comment[pl]=Dzielenie się plikami przez BitTorrent
+GenericName[pl]=Klient BitTorrent
+Name[pl]=qBittorrent
+Icon[pl]=qbittorrent
+Comment[pt]=Transferir e partilhar ficheiros por BitTorrent
+GenericName[pt]=Aplicação BitTorrent
+Name[pt]=qBittorrent
+Icon[pt]=qbittorrent
+Comment[pt_BR]=Baixe e compartilhe arquivos através do qBittorrent
+GenericName[pt_BR]=Cliente BitTorrent
+Name[pt_BR]=qBittorrent
+Icon[pt_BR]=qbittorrent
+Comment[ro]=Descărcați  și partajați fișiere prin BitTorrent
+GenericName[ro]=Client BitTorrent
+Name[ro]=qBittorrent
+Icon[ro]=qbittorrent
+Comment[ru]=Скачивайте и делитесь файлами с помощью BitTorrent
+GenericName[ru]=клиент BitTorrent
+Name[ru]=qBittorrent
+Icon[ru]=qbittorrent
+GenericName[sk]=Klient siete BitTorrent
+GenericName[sr]=BitTorrent-клијент
+Comment[sv]=Hämta och dela filer över BitTorrent
+GenericName[sv]=BitTorrent-klient
+Name[sv]=qBittorrent
+Icon[sv]=qbittorrent
+GenericName[tr]=BitTorrent istemcisi
+Comment[uk]=Завантажувати і обмінюватися файлами через BitTorrent
+GenericName[uk]=BitTorrent-клієнт
+Name[uk]=qBittorrent
+Icon[uk]=qbittorrent
+Comment[vi]=Tải về và chia sẻ các tập tin thông qua BitTorrent
+GenericName[vi]=Máy trạm dạng BitTorrent
+Name[vi]=qBittorrent
+Icon[vi]=qbittorrent
+Comment[zh_TW]=經由 BitTorrent 下載並分享檔案
+GenericName[zh_TW]=BitTorrent 客戶端
+Name[zh_TW]=qBittorrent
+Icon[zh_TW]=qbittorrent
+Comment[en_AU]=Download and share files over BitTorrent
+GenericName[en_AU]=BitTorrent client
+Name[en_AU]=qBittorrent
+Icon[en_AU]=qbittorrent

src/about_imp.h

@@ -48,10 +48,28 @@ class about : public QDialog, private Ui::AboutDlg{
     about(QWidget *parent): QDialog(parent) {
       setupUi(this);
       setAttribute(Qt::WA_DeleteOnClose);
+      // About
+      QString aboutText =
+          QString::fromUtf8("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\"><html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">p, li { white-space: pre-wrap; }</style></head><body style=\" font-size:11pt; font-weight:400; font-style:normal;\"><p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">") +
+          tr("An advanced BitTorrent client programmed in C++, based on Qt4 toolkit and libtorrent-rasterbar.") +
+          QString::fromUtf8(" <br /><br />") +
+          trUtf8("Copyright ©2006-2013 The qBittorrent project") +
+          QString::fromUtf8("<br /><br />") +
+          tr("Home Page: ") +
+          QString::fromUtf8("<a href=\"http://www.qbittorrent.org\"><span style=\" text-decoration: underline; color:#0000ff;\">http://www.qbittorrent.org</span></a></p><p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">") +
+          tr("Bug Tracker: ") +
+          QString::fromUtf8("<a href=\"http://bugs.qbittorrent.org\"><span style=\" text-decoration: underline; color:#0000ff;\">http://bugs.qbittorrent.org</span></a><br />") +
+          tr("Forum: ") +
+          QString::fromUtf8(
+              "<a href=\"http://forum.qbittorrent.org\"><span style=\" text-decoration: underline; color:#0000ff;\">http://forum.qbittorrent.org</span></a></p><p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">") +
+          tr("IRC: #qbittorrent on Freenode") +
+          QString::fromUtf8(
+              "</p></body></html>");
+      lb_about->setText(aboutText);
       // Set icons
       logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/qbittorrent22.png")));
       //Title
-      lb_name->setText(QString::fromUtf8("<b><h1>")+tr("qBittorrent")+QString::fromUtf8(" "VERSION"</h1></b>"));
+      lb_name->setText(QString::fromUtf8("<b><h1>qBittorrent")+QString::fromUtf8(" "VERSION"</h1></b>"));
       // Thanks
       QString thanks_txt;
       thanks_txt += QString::fromUtf8("<p>I would first like to thank sourceforge.net for hosting qBittorrent project and for their support.</p>");
@@ -62,40 +80,44 @@ class about : public QDialog, private Ui::AboutDlg{
       te_thanks->setHtml(thanks_txt);
       // Translation
       QString trans_txt = "<p>"+tr("I would like to thank the following people who volunteered to translate qBittorrent:")+"</p>";
-      trans_txt += QString::fromUtf8("<ul><li><u>Arabic:</u> SDERAWI (abz8868@msn.com) and sn51234 (nesseyan@gmail.com)</li>\
+      trans_txt += QString::fromUtf8("<ul><li><u>Arabic:</u> SDERAWI (abz8868@msn.com), sn51234 (nesseyan@gmail.com) and  Ibrahim Saed ibraheem_alex(Transifex)</li>\
           <li><u>Armenian:</u> Hrant Ohanyan (hrantohanyan@mail.am)</li>\
           <li><u>Basque:</u> Xabier Aramendi (azpidatziak@gmail.com)</li>\
           <li><u>Belarusian:</u> Mihas Varantsou (meequz@gmail.com)</li>\
-          <li><u>Brazilian:</u> Nick Marinho (nickmarinho@gmail.com)</li>\
           <li><u>Bulgarian:</u> Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net)</li>\
           <li><u>Catalan:</u> Francisco Luque Contreras (frannoe@ya.com)</li>\
           <li><u>Chinese (Simplified):</u> Guo Yue (yue.guo0418@gmail.com)</li>\
-          <li><u>Chinese (Traditional):</u> Yi-Shun Wang (dnextstep@gmail.com)</li>\
+          <li><u>Chinese (Traditional):</u> Yi-Shun Wang (dnextstep@gmail.com) and 冥王歐西里斯 s8321414(Transifex)</li>\
           <li><u>Croatian:</u> Oliver Mucafir (oliver.untwist@gmail.com)</li>\
-          <li><u>Czech:</u> Jirka Vilim (web@tets.cz)</li>\
+          <li><u>Czech:</u> Jirka Vilim (web@tets.cz) and Petr Cernobila abr(Transifex)</li>\
           <li><u>Danish:</u> Mathias Nielsen (comoneo@gmail.com)</li>\
           <li><u>Dutch:</u> Pieter Heyvaert (pieter_heyvaert@hotmail.com)</li>\
-          <li><u>Finnish:</u> Niklas Laxström (nikerabbit@users.sourceforge.net) and Pekka Niemi (pekka.niemi@iki.fi)</li>\
-          <li><u>Galician:</u> Marcos Lans (marcoslansgarza@gmail.com)</li>\
+          <li><u>English(Australia):</u> Robert Readman readmanr(Transifex)</li>\
+          <li><u>English(United Kingdom):</u> Robert Readman readmanr(Transifex)</li>\
+          <li><u>Finnish:</u> Niklas Laxström (nikerabbit@users.sourceforge.net), Pekka Niemi (pekka.niemi@iki.fi) and Jiri Grönroos artnay(Transifex)</li>\
+          <li><u>Galician:</u> Marcos Lans (marcoslansgarza@gmail.com) and antiparvos(Transifex)</li>\
           <li><u>Georgian:</u> Beqa Arabuli (arabulibeqa@yahoo.com)</li>\
           <li><u>German:</u> Niels Hoffmann (zentralmaschine@users.sourceforge.net)</li>\
-          <li><u>Greek:</u> Tsvetan Bankov (emerge_life@users.sourceforge.net)</li>\
+          <li><u>Greek:</u> Tsvetan Bankov (emerge_life@users.sourceforge.net), Stephanos Antaris (santaris@csd.auth.gr), sledgehammer999(hammered999@gmail.com) and Γιάννης Ανθυμίδης Evropi(Transifex)</li>\
+          <li><u>Hebrew:</u> David Deutsch (d.deffo@gmail.com)</li>\
           <li><u>Hungarian:</u> Majoros Péter (majoros.peterj@gmail.com)</li>\
-          <li><u>Italian:</u> Matteo Sechi (bu17714@gmail.com)</li>\
+          <li><u>Italian:</u> bovirus (bovirus@live.it) and Matteo Sechi (bu17714@gmail.com)</li>\
           <li><u>Japanese:</u> Masato Hashimoto (cabezon.hashimoto@gmail.com)</li>\
           <li><u>Korean:</u> Jin Woo Sin (jin828sin@users.sourceforge.net)</li>\
           <li><u>Lithuanian:</u> Naglis Jonaitis (njonaitis@gmail.com)</li>\
           <li><u>Norwegian:</u> Tomaso</li>\
           <li><u>Polish:</u> Mariusz Fik (fisiu@opensuse.org)</li>\
-          <li><u>Portuguese:</u> Nick Marinho (nickmarinho@gmail.com)</li>\
-          <li><u>Romanian:</u> Obada Denis (obadadenis@users.sourceforge.net)</li>\
-          <li><u>Russian:</u> Nick Khazov (m2k3d0n@users.sourceforge.net) and Alexey Morsov (samurai@ricom.ru)</li>\
+          <li><u>Portuguese:</u> Sérgio Marques smarquespt(Transifex)</li>\
+          <li><u>Portuguese(Brazil):</u> Nick Marinho (nickmarinho@gmail.com)</li>\
+          <li><u>Romanian:</u> Obada Denis (obadadenis@users.sourceforge.net), Adrian Gabor Adriannho(Transifex) and Mihai Coman z0id(Transifex)</li>\
+          <li><u>Russian:</u> Nick Khazov (m2k3d0n at users.sourceforge.net), Alexey Morsov (samurai@ricom.ru), Nick Tiskov Dayman(daymansmail (at) gmail (dot) com), Dmitry DmitryKX(Transifex) and kraleksandr kraleksandr(Transifex)</li>\
           <li><u>Serbian:</u> Anaximandar Milet (anaximandar@operamail.com)</li>\
           <li><u>Slovak:</u>  helix84</li>\
-          <li><u>Spanish:</u> Francisco Luque Contreras (frannoe@ya.com)</li>\
-          <li><u>Swedish:</u> Daniel Nylander (po@danielnylander.se)</li>\
+          <li><u>Spanish:</u> Alfredo Monclús (alfrix), Francisco Luque Contreras (frannoe@ya.com) and José Antonio Moray moray33(Transifex)</li>\
+          <li><u>Swedish:</u> Daniel Nylander (po@danielnylander.se) and Emil Hammarberg Ooglogput(Transifex)</li>\
           <li><u>Turkish:</u> Hasan YILMAZ (iletisim@hedefturkce.com) and Erdem Bingöl (erdem84@gmail.com)</li>\
-          <li><u>Ukrainian:</u> Oleh Prypin (blaxpirit@gmail.com)</li></ul>");
+          <li><u>Ukrainian:</u> Oleh Prypin (blaxpirit@gmail.com)</li>\
+          <li><u>Vietnamese:</u> Anh Phan ppanhh(Transifex)</li></ul>");
       trans_txt += "<p>"+tr("Please contact me if you would like to translate qBittorrent into your own language.")+"</p>";
       te_translation->setHtml(trans_txt);
       // License

src/addnewtorrentdialog.h

@@ -31,9 +31,11 @@
 #ifndef ADDNEWTORRENTDIALOG_H
 #define ADDNEWTORRENTDIALOG_H
 
+#include <QShortcut>
 #include <QDialog>
 #include <QUrl>
 #include <libtorrent/torrent_info.hpp>
+#include "qtorrenthandle.h"
 
 QT_BEGIN_NAMESPACE
 namespace Ui {
@@ -54,15 +56,22 @@ public:
   static void showTorrent(const QString& torrent_path, const QString& from_url = QString());
   static void showMagnet(const QString& torrent_link);
 
+protected:
+  void showEvent(QShowEvent *event);
+
 private slots:
   void showAdvancedSettings(bool show);
   void displayContentTreeMenu(const QPoint&);
-  void on_buttonBox_accepted();
   void updateDiskSpaceLabel();
   void onSavePathChanged(int);
   void relayout();
   void renameSelectedFile();
   void setdialogPosition();
+  void updateMetadata(const QTorrentHandle& h);
+
+protected slots:
+  virtual void accept();
+  virtual void reject();
 
 private:
   explicit AddNewTorrentDialog(QWidget *parent = 0);
@@ -74,18 +83,21 @@ private:
   void updateFileNameInSavePaths(const QString& new_filename);
   void loadState();
   void saveState();
+  void setMetadataProgressIndicator(bool visibleIndicator, const QString &labelText = QString());
 
 private:
   Ui::AddNewTorrentDialog *ui;
   TorrentContentFilterModel *m_contentModel;
   PropListDelegate *m_contentDelegate;
   bool m_isMagnet;
+  bool m_hasMetadata;
   QString m_filePath;
   QString m_url;
   QString m_hash;
   boost::intrusive_ptr<libtorrent::torrent_info> m_torrentInfo;
   QStringList m_filesPath;
   bool m_hasRenamedFile;
+  QShortcut *editHotkey;
 };
 
 #endif // ADDNEWTORRENTDIALOG_H