Bump version to v3.0.3

Added version info for the binary.

.gitignore

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

.travis.yml

@@ -1,53 +0,0 @@
-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

@@ -1,18 +0,0 @@
-[main]
-host = https://www.transifex.com
-
-[qbittorrent.qbittorrent_ents]
-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]
-source_file = src/Icons/qBittorrent.desktop
-source_lang = en
-type = DESKTOP
-minimum_perc = 23
-mode = developer

AUTHORS

@@ -1,7 +1,4 @@
-Current maintainer:
-* Sledgehammer999 <sledgehammer999@qbittorrent.org>
-
-Original author:
+Author:
 * Christophe Dumez <chris@qbittorrent.org>
 
 Contributors:
@@ -14,7 +11,6 @@ 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/*
@@ -29,10 +25,6 @@ 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
@@ -79,16 +71,16 @@ Images Authors:
 
 Translations authors:
 * files: src/lang/*.ts
-* file: src/Icons/qBittorrent.desktop
   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) and 冥王歐西里斯 s8321414(Transifex)
+  - 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)
@@ -96,27 +88,25 @@ Translations authors:
   - 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) and antiparvos(Transifex)
+  - 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), Stephanos Antaris (santaris@csd.auth.gr), sledgehammer999(hammered999@gmail.com) and Γιάννης Ανθυμίδης Evropi(Transifex)
+  - 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: bovirus (bovirus@live.it) and Matteo Sechi (bu17714@gmail.com)
+  - Italian: 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: Sérgio Marques smarquespt(Transifex)
-  - Portuguese(Brazil): Nick Marinho (nickmarinho@gmail.com)
+  - Portuguese: Nick Marinho (nickmarinho@gmail.com)
   - Romanian: Obada Denis (obadadenis@users.sourceforge.net)
-  - 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)
+  - Russian: Nick Khazov (m2k3d0n at users.sourceforge.net)
   - Serbian: Anaximandar Milet (anaximandar at operamail.com)
   - Slovak:  helix84
-  - Spanish: Francisco Luque Contreras (frannoe@ya.com), Alfredo Monclus alfrix(Transifex) and José Antonio Moray moray33(Transifex)
+  - 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) and zubr139(Transifex)
-  - Vietnamese: Anh Phan ppanhh(Transifex)
+  - Ukrainian: Oleh Prypin (blaxpirit@gmail.com)
   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,40 +1,26 @@
-* 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
+* Sun Sep 16 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.3
+    - BUGFIX: Fix issue with temporary directory not being taken into consideration (closes #94)
+    - BUGFIX: Address encoding issues when using search engine on Windows (closes #29)
+    - BUGFIX: Bypass cache when uploading a torrent file in Web UI (closes #68)
+    - BUGFIX: "Completed On" column is not updated until restart (closes #84)
+    - BUGFIX: Fix possible build error on some systems
+    - I18N: Add hebrew translation
+
+* Sat Sep 1 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.2
+    - FEATURE: Add "clear" functionality to search field (closes #59)
+    - BUGFIX: Attempt to use qBittorrent icon from theme if available (closes #49)
+    - BUGFIX: Fix crash when a fastresume file is empty (closes #52)
+    - BUGFIX: Fix encoding problem for detected XDG Download folder (closes #53)
+    - BUGFIX: Improve performance when showing torrent content panel (Improves #24)
+    - BUGFIX: Fix label-based filtering of torrents whose label contains special characters
+    - BUGFIX: Fix possible crash due to labels (closes #64)
+
+* Tue Aug 21 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.1
+    - BUGFIX: Fix possible crash when adding a tracker to a magnet torrent without metadata (Closes #1034254)
+    - BUGFIX: Remember queue position for torrents without metadata (closes #17)
+    - BUGFIX: Fix crash when using unauthorized characters in label names (closes #19)
+    - BUGFIX: Fix search plugins updating (closes #25)
+    - BUGFIX: Make uTP connections rate limited by default
 
 * Thu Aug 09 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.0
     - FEATURE: Brand new torrent addition dialog

configure

@@ -507,7 +507,7 @@ 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;

doc/qbittorrent-nox.1

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

install.os2

@@ -146,11 +146,6 @@ 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

macxconf.pri

@@ -16,52 +16,16 @@ 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 = mac/qBitTorrentDocument.icns
+document_icon.files = Icons/qBitTorrentDocument.icns
+
 QMAKE_BUNDLE_DATA += document_icon
-
-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
+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

@@ -7,13 +7,12 @@ LIBS += -ltorrent-rasterbar \
         -lboost_thread \
         -lboost_system \
         -lboost_filesystem \
-        -lssl -lcrypto -lidn -lpthread -lz
+        -lssl -lcrypto -lidn -lpthread
 
 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,7 +3,6 @@ TEMPLATE = subdirs
 SUBDIRS += src
 
 include(version.pri)
-include(qm_gen.pri)
 
 # Dist
 dist.commands += rm -fR ../$${PROJECT_NAME}-$${PROJECT_VERSION}/ &&

qcm/libboost.qcm

@@ -71,7 +71,7 @@ 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;

qm_gen.pri

@@ -1,19 +0,0 @@
-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,92 +2,40 @@
 Categories=Network;FileTransfer;P2P;Qt;
 Exec=qbittorrent %U
 GenericName=BitTorrent client
-Comment=Download and share files over BitTorrent
-Icon=qbittorrent
-MimeType=application/x-bittorrent;x-scheme-handler/magnet;
-Name=qBittorrent
-Terminal=false
-Type=Application
-
-
-
-# Translations
 GenericName[ar]=العميل BitTorrent
-Comment[be]=Сцягванне і раздача файлаў праз пратакол BitTorrent
-GenericName[be]=BitTorrent-кліент
-Name[be]=qBittorrent
-Icon[be]=qbittorrent
 GenericName[bg]=Торент клиент
 GenericName[cs]=BitTorrent klient
 GenericName[de]=BitTorren Client
-Comment[el]=Λήψη και διαμοιρασμός αρχείων μέσω BitTorrent
 GenericName[el]=BitTorrent πελάτης
-Name[el]=qBittorrent
-Icon[el]=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
 GenericName[fi]=BitTorrent-ohjelma
-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]=Cliente BitTorrent
 GenericName[pt_BR]=Cliente BitTorrent
-Name[pt_BR]=qBittorrent
-Icon[pt_BR]=qbittorrent
 GenericName[ro]=Client BitTorrent
-Comment[ru]=Скачивайте и делитесь файлами с помощью BitTorrent
 GenericName[ru]=клиент BitTorrent
-Name[ru]=qBittorrent
-Icon[ru]=qbittorrent
 GenericName[sk]=Klient siete BitTorrent
 GenericName[sr]=BitTorrent-клијент
 GenericName[sv]=BitTorrent-klient
 GenericName[tr]=BitTorrent istemcisi
 GenericName[uk]=BitTorrent-клієнт
-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
+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
+

src/Info.plist

@@ -45,7 +45,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.0</string>
+	<string>3.0.3</string>
 	<key>CFBundleSignature</key>
 	<string>qBit</string>
 	<key>CFBundleExecutable</key>
@@ -55,7 +55,7 @@
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2006-2013 The qBittorrent project</string>
+	<string>Copyright © 2006-2012 Christophe Dumez</string>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>

src/about_imp.h

@@ -48,28 +48,10 @@ 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-family:'Lucida Grande'; font-size:13pt; 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>qBittorrent")+QString::fromUtf8(" "VERSION"</h1></b>"));
+      lb_name->setText(QString::fromUtf8("<b><h1>")+tr("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>");
@@ -84,19 +66,20 @@ class about : public QDialog, private Ui::AboutDlg{
           <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) and 冥王歐西里斯 s8321414(Transifex)</li>\
+          <li><u>Chinese (Traditional):</u> Yi-Shun Wang (dnextstep@gmail.com)</li>\
           <li><u>Croatian:</u> Oliver Mucafir (oliver.untwist@gmail.com)</li>\
           <li><u>Czech:</u> Jirka Vilim (web@tets.cz)</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) and antiparvos(Transifex)</li>\
+          <li><u>Galician:</u> Marcos Lans (marcoslansgarza@gmail.com)</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), Stephanos Antaris (santaris@csd.auth.gr), sledgehammer999(hammered999@gmail.com) and Γιάννης Ανθυμίδης Evropi(Transifex)</li>\
+          <li><u>Greek:</u> Tsvetan Bankov (emerge_life@users.sourceforge.net)</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> bovirus (bovirus@live.it) and Matteo Sechi (bu17714@gmail.com)</li>\
@@ -105,17 +88,15 @@ class about : public QDialog, private Ui::AboutDlg{
           <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> Sérgio Marques smarquespt(Transifex)</li>\
-          <li><u>Portuguese(Brazil):</u> Nick Marinho (nickmarinho@gmail.com)</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 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>Russian:</u> Nick Khazov (m2k3d0n@users.sourceforge.net) and Alexey Morsov (samurai@ricom.ru)</li>\
           <li><u>Serbian:</u> Anaximandar Milet (anaximandar@operamail.com)</li>\
           <li><u>Slovak:</u>  helix84</li>\
-          <li><u>Spanish:</u> Alfredo Monclús (alfrix), Francisco Luque Contreras (frannoe@ya.com) and José Antonio Moray moray33(Transifex)</li>\
+          <li><u>Spanish:</u> Francisco Luque Contreras (frannoe@ya.com)</li>\
           <li><u>Swedish:</u> Daniel Nylander (po@danielnylander.se)</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>\
-          <li><u>Vietnamese:</u> Anh Phan ppanhh(Transifex)</li></ul>");
+          <li><u>Ukrainian:</u> Oleh Prypin (blaxpirit@gmail.com)</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,11 +31,9 @@
 #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 {
@@ -56,22 +54,15 @@ 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);
@@ -83,21 +74,18 @@ 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

src/addnewtorrentdialog.ui

@@ -22,6 +22,9 @@
     <height>16777215</height>
    </size>
   </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
     <widget class="QGroupBox" name="groupBox">
@@ -186,38 +189,6 @@
    </item>
    <item>
     <layout class="QHBoxLayout" name="buttonsHLayout">
-     <item>
-      <widget class="QProgressBar" name="progMetaLoading">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="maximum">
-        <number>0</number>
-       </property>
-       <property name="value">
-        <number>-1</number>
-       </property>
-       <property name="textVisible">
-        <bool>false</bool>
-       </property>
-       <property name="format">
-        <string notr="true">%p%</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="lblMetaLoading">
-       <property name="enabled">
-        <bool>true</bool>
-       </property>
-       <property name="text">
-        <string notr="true"/>
-       </property>
-      </widget>
-     </item>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">

src/autoexpandabledialog.cpp

@@ -1,121 +0,0 @@
-/*
- * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2013  Nick Tiskov
- *
- * 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 : daymansmail@gmail.com
- */
-
-#include <QDesktopWidget>
-
-#include "mainwindow.h"
-#include "autoexpandabledialog.h"
-#include "ui_autoexpandabledialog.h"
-
-AutoExpandableDialog::AutoExpandableDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AutoExpandableDialog) {
-  ui->setupUi(this);
-}
-
-AutoExpandableDialog::~AutoExpandableDialog() {
-  delete ui;
-}
-
-QString AutoExpandableDialog::getText(QWidget *parent, const QString &title, const QString &label,
-                                      QLineEdit::EchoMode mode, const QString &text, bool *ok,
-                                      Qt::InputMethodHints inputMethodHints) {
-
-  AutoExpandableDialog d(parent);
-  d.setWindowTitle(title);
-  d.ui->textLabel->setText(label);
-  d.ui->textEdit->setText(text);
-  d.ui->textEdit->setEchoMode(mode);
-  d.ui->textEdit->setInputMethodHints(inputMethodHints);
-
-  bool res = d.exec();
-  if (ok)
-    *ok = res;
-
-  if (!res)
-    return QString();
-
-  return d.ui->textEdit->text();
-}
-
-void AutoExpandableDialog::showEvent(QShowEvent *e) {
-  // Overriding showEvent is required for consistent UI with fixed size under custom DPI
-  // Show dialog
-  QDialog::showEvent(e);
-  // and resize textbox to fit the text
-
-  // NOTE: For some strange reason QFontMetrics gets more accurate
-  // when called from showEvent. Only 6 symbols off instead of 11 symbols off.
-  int textW = ui->textEdit->fontMetrics().width(ui->textEdit->text()) + 4;
-  int screenW = QApplication::desktop()->width() / 4;
-  int wd = textW;
-
-  if (!windowTitle().isEmpty()) {
-    int _w = fontMetrics().width(windowTitle());
-    if (_w > wd)
-      wd = _w;
-  }
-
-  if (!ui->textLabel->text().isEmpty()) {
-    int _w = ui->textLabel->fontMetrics().width(ui->textLabel->text());
-    if (_w > wd)
-      wd = _w;
-  }
-
-
-  // Now resize the dialog to fit the contents
-  // Maximum value is whichever is smaller:
-  // 1. screen width / 4
-  // 2. max width of text from either of: label, title, textedit
-  // If the value is less than dialog default size default size is used
-  wd = textW < screenW ? textW : screenW;
-  if (wd > width())
-    resize(width() - ui->horizontalLayout->sizeHint().width() + wd, height());
-
-  // Use old dialog behavior: prohibit resizing the dialog
-  setFixedHeight(height());
-
-  // Update geometry: center on screen
-  QDesktopWidget *desk = QApplication::desktop();
-  MainWindow *wnd = qobject_cast<MainWindow*>(QApplication::activeWindow());
-  QPoint p = QCursor::pos();
-
-  int screenNum = 0;
-  if (wnd == 0)
-    screenNum = desk->screenNumber(p);
-  else if (!wnd->isHidden())
-    screenNum = desk->screenNumber(wnd);
-  else
-    screenNum = desk->screenNumber(p);
-
-  QRect screenRes = desk->screenGeometry(screenNum);
-
-  QRect geom = geometry();
-  geom.moveCenter(QPoint(screenRes.width() / 2, screenRes.height() / 2));
-  setGeometry(geom);
-}

src/autoexpandabledialog.h

@@ -1,60 +0,0 @@
-/*
- * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2013  Nick Tiskov
- *
- * 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 : daymansmail@gmail.com
- */
-
-#ifndef AUTOEXPANDABLEDIALOG_H
-#define AUTOEXPANDABLEDIALOG_H
-
-#include <QDialog>
-#include <QString>
-#include <QLineEdit>
-
-namespace Ui {
-class AutoExpandableDialog;
-}
-
-class AutoExpandableDialog : public QDialog {
-  Q_OBJECT
-  
-public:
-  explicit AutoExpandableDialog(QWidget *parent = 0);
-  ~AutoExpandableDialog();
-
-  static QString getText(QWidget *parent, const QString& title,  const QString& label,
-                         QLineEdit::EchoMode mode = QLineEdit::Normal, const QString & text = QString(),
-                         bool * ok = 0, Qt::InputMethodHints inputMethodHints = Qt::ImhNone);
-
-protected:
-  void showEvent(QShowEvent *e);
-  
-private:
-  Ui::AutoExpandableDialog *ui;
-};
-
-#endif // AUTOEXPANDABLEDIALOG_H

src/autoexpandabledialog.ui

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>AutoExpandableDialog</class>
- <widget class="QDialog" name="AutoExpandableDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>222</width>
-    <height>94</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string notr="true">Dialog</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="QLabel" name="textLabel">
-     <property name="toolTip">
-      <string notr="true"/>
-     </property>
-     <property name="text">
-      <string notr="true"/>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLineEdit" name="textEdit">
-     <property name="toolTip">
-      <string notr="true"/>
-     </property>
-     <property name="text">
-      <string notr="true"/>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QDialogButtonBox" name="buttonBox">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="standardButtons">
-        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>AutoExpandableDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>AutoExpandableDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>

src/dnsupdater.cpp

@@ -40,7 +40,7 @@ DNSUpdater::DNSUpdater(QObject *parent) :
   updateCredentials();
 
   // Load saved settings from previous session
-  QIniSettings settings;
+  QIniSettings settings("qBittorrent", "qBittorrent");
   m_lastIPCheckTime = settings.value("DNSUpdater/lastUpdateTime").toDateTime();
   m_lastIP = QHostAddress(settings.value("DNSUpdater/lastIP").toString());
 
@@ -58,7 +58,7 @@ DNSUpdater::DNSUpdater(QObject *parent) :
 
 DNSUpdater::~DNSUpdater() {
   // Save lastupdate time and last ip
-  QIniSettings settings;
+  QIniSettings settings("qBittorrent", "qBittorrent");
   settings.setValue("DNSUpdater/lastUpdateTime", m_lastIPCheckTime);
   settings.setValue("DNSUpdater/lastIP", m_lastIP.toString());
 }

src/downloadfromurldlg.h

@@ -50,27 +50,9 @@ class downloadFromURL : public QDialog, private Ui::downloadFromURL{
       show();
       // Paste clipboard if there is an URL in it
       QString clip_txt = qApp->clipboard()->text();
-      QStringList clip_txt_list = clip_txt.split(QString::fromUtf8("\n"));
-      clip_txt.clear();
-      QStringList clip_txt_list_cleaned;
-      foreach (clip_txt, clip_txt_list) {
-        clip_txt = clip_txt.trimmed();
-        if (!clip_txt.isEmpty()) {
-          if (clip_txt_list_cleaned.indexOf(QRegExp(clip_txt, Qt::CaseInsensitive, QRegExp::FixedString)) < 0) {
-            if (clip_txt.startsWith("http://", Qt::CaseInsensitive)
-                || clip_txt.startsWith("https://", Qt::CaseInsensitive)
-                || clip_txt.startsWith("ftp://", Qt::CaseInsensitive)
-                || clip_txt.startsWith("magnet:", Qt::CaseInsensitive)
-                || clip_txt.startsWith("bc://bt/", Qt::CaseInsensitive)
-                || (clip_txt.size() == 40 && !clip_txt.contains(QRegExp("[^0-9A-Fa-f]")))
-                || (clip_txt.size() == 32 && !clip_txt.contains(QRegExp("[^2-7A-Za-z]")))) {
-              clip_txt_list_cleaned << clip_txt;
-            }
-          }
-        }
+      if (clip_txt.startsWith("http://", Qt::CaseInsensitive) || clip_txt.startsWith("https://", Qt::CaseInsensitive) || clip_txt.startsWith("ftp://", Qt::CaseInsensitive) || clip_txt.startsWith("magnet:", Qt::CaseInsensitive) || clip_txt.startsWith("bc://bt/", Qt::CaseInsensitive)) {
+        textUrls->setText(clip_txt);
       }
-      if (clip_txt_list_cleaned.size() > 0)
-        textUrls->setText(clip_txt_list_cleaned.join("\n"));
     }
 
     ~downloadFromURL() {}
@@ -80,7 +62,6 @@ class downloadFromURL : public QDialog, private Ui::downloadFromURL{
 
   public slots:
     void on_downloadButton_clicked() {
-      close();
       QString urls = textUrls->toPlainText();
       QStringList url_list = urls.split(QString::fromUtf8("\n"));
       QString url;
@@ -99,6 +80,7 @@ class downloadFromURL : public QDialog, private Ui::downloadFromURL{
       }
       emit urlsReadyToBeDownloaded(url_list_cleaned);
       qDebug("Emitted urlsReadytobedownloaded signal");
+      close();
     }
 
     void on_cancelButton_clicked() {

src/downloadfromurldlg.ui

@@ -52,7 +52,7 @@
       </font>
      </property>
      <property name="text">
-      <string>One per line (HTTP links, Magnet links and info-hashes are supported)</string>
+      <string>Both HTTP and Magnet links are supported</string>
      </property>
     </widget>
    </item>

src/downloadthread.cpp

@@ -40,7 +40,6 @@
 #include "rsssettings.h"
 #endif
 #include "qinisettings.h"
-#include <zlib.h>
 
 /** Download Thread **/
 
@@ -51,56 +50,6 @@ DownloadThread::DownloadThread(QObject* parent) : QObject(parent) {
 #endif
 }
 
-QByteArray DownloadThread::gUncompress(Bytef *inData, size_t len) {
-  if (len <= 4) {
-    qWarning("gUncompress: Input data is truncated");
-    return QByteArray();
-  }
-
-  QByteArray result;
-
-  z_stream strm;
-  static const int CHUNK_SIZE = 1024;
-  char out[CHUNK_SIZE];
-
-  /* allocate inflate state */
-  strm.zalloc = Z_NULL;
-  strm.zfree = Z_NULL;
-  strm.opaque = Z_NULL;
-  strm.avail_in = len;
-  strm.next_in = inData;
-
-  const int windowBits = 15;
-  const int ENABLE_ZLIB_GZIP = 32;
-
-  int ret = inflateInit2(&strm, windowBits|ENABLE_ZLIB_GZIP ); // gzip decoding
-  if (ret != Z_OK)
-    return QByteArray();
-
-  // run inflate()
-  do {
-    strm.avail_out = CHUNK_SIZE;
-    strm.next_out = reinterpret_cast<unsigned char*>(out);
-
-    ret = inflate(&strm, Z_NO_FLUSH);
-    Q_ASSERT(ret != Z_STREAM_ERROR); // state not clobbered
-
-    switch (ret) {
-      case Z_NEED_DICT:
-      case Z_DATA_ERROR:
-      case Z_MEM_ERROR:
-        (void) inflateEnd(&strm);
-        return QByteArray();
-    }
-
-    result.append(out, CHUNK_SIZE - strm.avail_out);
-  } while (!strm.avail_out);
-
-  // clean up and return
-  inflateEnd(&strm);
-  return result;
-}
-
 void DownloadThread::processDlFinished(QNetworkReply* reply) {
   QString url = reply->url().toString();
   qDebug("Download finished: %s", qPrintable(url));
@@ -123,8 +72,7 @@ void DownloadThread::processDlFinished(QNetworkReply* reply) {
     const QString newUrlString = newUrl.toString();
     qDebug("Redirecting from %s to %s", qPrintable(url), qPrintable(newUrlString));
     m_redirectMapping.insert(newUrlString, url);
-    // redirecting with first cookies
-    downloadUrl(newUrlString, m_networkManager.cookieJar()->cookiesForUrl(url));
+    downloadUrl(newUrlString);
     reply->deleteLater();
     return;
   }
@@ -139,12 +87,8 @@ void DownloadThread::processDlFinished(QNetworkReply* reply) {
     QString filePath = tmpfile->fileName();
     qDebug("Temporary filename is: %s", qPrintable(filePath));
     if (reply->isOpen() || reply->open(QIODevice::ReadOnly)) {
-      QByteArray replyData = reply->readAll();
-      if (reply->rawHeader("Content-Encoding") == "gzip") {
-        // uncompress gzip reply
-        replyData = gUncompress(reinterpret_cast<unsigned char*>(replyData.data()), replyData.length());
-      }
-      tmpfile->write(replyData);
+      // TODO: Support GZIP compression
+      tmpfile->write(reply->readAll());
       tmpfile->close();
       // XXX: tmpfile needs to be deleted on Windows before using the file
       // or it will complain that the file is used by another process.
@@ -192,8 +136,6 @@ QNetworkReply* DownloadThread::downloadUrl(const QString &url, const QList<QNetw
     qDebug("%s=%s", m_networkManager.cookieJar()->cookiesForUrl(url).at(i).name().data(), m_networkManager.cookieJar()->cookiesForUrl(url).at(i).value().data());
     qDebug("Domain: %s, Path: %s", qPrintable(m_networkManager.cookieJar()->cookiesForUrl(url).at(i).domain()), qPrintable(m_networkManager.cookieJar()->cookiesForUrl(url).at(i).path()));
   }
-  // accept gzip
-  request.setRawHeader("Accept-Encoding", "gzip");
   return m_networkManager.get(request);
 }
 

src/downloadthread.h

@@ -36,7 +36,6 @@
 #include <QObject>
 #include <QHash>
 #include <QSslError>
-#include <zlib.h>
 
 QT_BEGIN_NAMESPACE
 class QNetworkAccessManager;
@@ -47,8 +46,8 @@ class DownloadThread : public QObject {
 
 public:
   DownloadThread(QObject* parent = 0);
-  QNetworkReply* downloadUrl(const QString &url, const QList<QNetworkCookie>& cookies = QList<QNetworkCookie>());
-  void downloadTorrentUrl(const QString &url, const QList<QNetworkCookie>& cookies = QList<QNetworkCookie>());
+  QNetworkReply* downloadUrl(const QString &url, const QList<QNetworkCookie>& raw_cookies = QList<QNetworkCookie>());
+  void downloadTorrentUrl(const QString &url, const QList<QNetworkCookie>& raw_cookies = QList<QNetworkCookie>());
   //void setProxy(QString IP, int port, QString username, QString password);
 
 signals:
@@ -63,7 +62,6 @@ private slots:
 #endif
 
 private:
-  static QByteArray gUncompress(Bytef *inData, size_t len);
   QString errorCodeToString(QNetworkReply::NetworkError status);
   void applyProxySettings();
 

src/executionlog.cpp

@@ -57,8 +57,6 @@ ExecutionLog::ExecutionLog(QWidget *parent) :
       addBanMessage(msg);
     connect(QBtSession::instance(), SIGNAL(newConsoleMessage(QString)), SLOT(addLogMessage(QString)));
     connect(QBtSession::instance(), SIGNAL(newBanMessage(QString)), SLOT(addBanMessage(QString)));
-    connect(m_logList, SIGNAL(logCleared()), QBtSession::instance(), SLOT(clearConsoleMessages()));
-    connect(m_banList, SIGNAL(logCleared()), QBtSession::instance(), SLOT(clearPeerBanMessages()));
 }
 
 ExecutionLog::~ExecutionLog()