Update Changelog and bump version to v3.0.4

We now ship qt translations.

AUTHORS

@@ -92,6 +92,7 @@ Translations authors:
   - Georgian: Beqa Arabuli (arabulibeqa@yahoo.com)
   - German: Niels Hoffmann (zentralmaschine@users.sourceforge.net)
   - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net) and Stephanos Antaris (santaris@csd.auth.gr)
+  - Hebrew: David Deutsch (d.deffo@gmail.com)
   - Hungarian: Majoros Péter (majoros.j.p@t-online.hu)
   - Italian: Matteo Sechi (bu17714@gmail.com)
   - Japanese: Masato Hashimoto (cabezon.hashimoto@gmail.com)
@@ -107,5 +108,5 @@ Translations authors:
   - Spanish: Francisco Luque Contreras (frannoe@ya.com)
   - Swedish: Daniel Nylander (po@danielnylander.se)
   - Turkish: Hasan Yilmaz (iletisim@hedefturkce.com)
-  - Ukrainian: Andrey Shpachenko (masterfix@users.sourceforge.net) and Oleh Prypin (blaxpirit@gmail.com)
+  - Ukrainian: Oleh Prypin (blaxpirit@gmail.com)
   license: GPLv2

Changelog

@@ -1,52 +1,41 @@
-* Sun Mar 18 2012 - Christophe Dumez <chris@qbittorrent.org> - v2.9.7
+* Tue Sep 18 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.4
-    - BUGFIX: Fix important HTTP request parsing bug (Web UI)
+    - BUGFIX: Fix issue with downloads starting from scratch on startup if temporary
+      directory setting is enabled.
 
-* Sat Mar 17 2012 - Christophe Dumez <chris@qbittorrent.org> - v2.9.6
+* Sun Sep 16 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.3
-    - BUGFIX: Fix download first/last pieces state reporting
+    - BUGFIX: Fix issue with temporary directory not being taken into consideration (closes #94)
-    - BUGFIX: Fix name of progress column in torrent content panel
+    - BUGFIX: Address encoding issues when using search engine on Windows (closes #29)
-    - BUGFIX: Disable system tray icon on Mac OS X
+    - BUGFIX: Bypass cache when uploading a torrent file in Web UI (closes #68)
-    - BUGFIX: RSS downloader should not ignore "Do not start automatically" rule (closes #946910)
+    - BUGFIX: "Completed On" column is not updated until restart (closes #84)
-    - BUGFIX: Fix DHT port setting in Web UI (Closes #952182)
+    - BUGFIX: Fix possible build error on some systems
-    - BUGFIX: Fix possible Web UI authentication problem when using SSL (closes #941343)
+    - I18N: Add hebrew translation
-    - BUGFIX: Fix possible issues with folder removal when removing a torrent
-    - I18N: Add Basque translation
 
-* Sat Feb 18 2012 - Christophe Dumez <chris@qbittorrent.org> - v2.9.5
+* Sat Sep 1 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.2
-    - BUGFIX: Fix crash when disabling then reenabling RSS
+    - FEATURE: Add "clear" functionality to search field (closes #59)
-    - BUGFIX: Fix duplicate torrent detection when adding a magnet link
+    - BUGFIX: Attempt to use qBittorrent icon from theme if available (closes #49)
-    - BUGFIX: Fix import of new trackers when adding a torrent with same hash (Closes #747000)
+    - BUGFIX: Fix crash when a fastresume file is empty (closes #52)
-    - BUGFIX: Fix possible redownload of torrents marked as read (Closes #927495)
+    - BUGFIX: Fix encoding problem for detected XDG Download folder (closes #53)
-    - BUGFIX: Properly remove RSS feed settings/history upon feed removal
+    - 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)
 
-* Sat Feb 18 2012 - Christophe Dumez <chris@qbittorrent.org> - v2.9.4
+* Tue Aug 21 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.1
-    - BUGFIX: qBittorrent does not handle redirection to relative URLs correctly (Closes #919905)
+    - BUGFIX: Fix possible crash when adding a tracker to a magnet torrent without metadata (Closes #1034254)
-    - BUGFIX: Cmd+M minimizes main window on Mac OS X (Closes #928216)
+    - BUGFIX: Remember queue position for torrents without metadata (closes #17)
-    - BUGFIX: Cmd+Del removes torrents on Mac OS X (Closes #928852)
+    - BUGFIX: Fix crash when using unauthorized characters in label names (closes #19)
-    - BUGFIX: Fix potential bug when moving single file torrents to tmp folder (closes #932861)
+    - BUGFIX: Fix search plugins updating (closes #25)
-    - BUGFIX: Fix torrent import dialog layout (Closes #930932)
+    - BUGFIX: Make uTP connections rate limited by default
-    - BUGFIX: Prevent log window buffer from filling up (Closes #929673)
-    - I18N: Add Belarusian translation
 
-* Thu Dec 29 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.9.3
+* Thu Aug 09 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.0
-    - BUGFIX: Fix btdigg plugin (Python3 support + torrent name in magnet links)
+    - FEATURE: Brand new torrent addition dialog
-    - BUGFIX: Fix banning of IPv6 peers (Closes #885021)
+    - FEATURE: Add the ability to choose the save path when using magnet links (mutoso)
-    - BUGFIX: Fix torrent addition dialog layout problem (Closes #84650522)
+    - FEATURE: Add support for adding multiple local torrents at once (Web UI)
-    - BUGFIX: Do not report any progress for disabled files (Closes #56731485)
+    - COSMETIC: Improve style of left panel
-    - BUGFIX: Make torrent sorting case insensitive (Closes #857154)
+    - BUGFIX: Lower panels no longer gets disabled
-    - BUGFIX: Improve Web UI usability of small devices
+    - BUGFIX: Major code refactoring and various optimizations.
-    - BUGFIX: Program updater: More reliable version detection / comparison
+    - BUGFIX: No longer strip root folder from torrent files
-    - I18N: Add Georgian translation
+    - OTHER: Drop support for libtorrent v0.14.x
-
+    - OTHER: Drop support for Qt 4.5
-* Sat Oct 29 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.9.2
-    - BUGFIX: Fix mimimum dimensions for torrent addition dialog
-    - BUGFIX: Remove dependency on boost-datetime
-    - BUGFIX: Remove dependency on boost-filesystem (libtorrent v0.16.x)
-
-* Sun Oct 23 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.9.1
-    - BUGFIX: Add support for speed limits scheduling (Web UI)
-    - BUGFIX: Fix ratio calculation for purely seeded torrents
-    - I18N: Update Russian translation
-    - COSMETIC: Torrent addition dialog layout fixes
 
 * Sat Oct 08 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.9.0
     - FEATURE: Add file association settings to program preferences (Windows)

INSTALL

@@ -10,11 +10,11 @@ qBittorrent - A BitTorrent client in C++ / Qt4
   will install and execute qBittorrent hopefully without any problems.
 
   Dependencies:
-    - Qt >= 4.5.0 (libqtgui, libqtcore, libqtnetwork, libqtxml, libqtdbus/optional)
+    - Qt >= 4.6.0 (libqtgui, libqtcore, libqtnetwork, libqtxml, libqtdbus/optional)
 
     - pkg-config executable
 
-    - libtorrent-rasterbar by Arvid Norberg (>= 0.14.4 REQUIRED, compatible with v0.15.x/v0.16.x)
+    - libtorrent-rasterbar by Arvid Norberg (>= 0.15.0)
         -> http://www.libtorrent.net
         Be careful: another library (the one used by rTorrent) uses a similar name.
 
@@ -44,7 +44,7 @@ qBittorrent - A BitTorrent client in C++ / Qt4
 
     - pkg-config executable
 
-    - libtorrent-rasterbar by Arvid Norberg (>= 0.14.4 REQUIRED, >= v0.15.0 ADVISED)
+    - libtorrent-rasterbar by Arvid Norberg (>= v0.15.0)
         -> http://www.libtorrent.net
         Be careful: another library (the one used by rTorrent) uses a similar name.
 

README.os2

@@ -27,7 +27,6 @@ First you need to create the conf.pri file in the same dir as this readme.os2 is
 the conf.pri file has the following content:
 
 ##### conf.pri content beginn #####
-PREFIX = .
 BINDIR = ./bin
 INCDIR = ./include
 LIBDIR = ./lib
@@ -43,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
@@ -51,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

@@ -325,7 +325,7 @@ cat >$1/modules.cpp <<EOT
 #line 1 "qt4.qcm"
 /*
 -----BEGIN QCMOD-----
-name: Qt >= 4.5
+name: Qt >= 4.6
 arg: enable-debug, Enable debug mode
 arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
 -----END QCMOD-----
@@ -334,8 +334,8 @@ class qc_qt4 : public ConfObj
 {
 public:
 	qc_qt4(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Qt >= 4.5"; }
+	QString name() const { return "Qt >= 4.6"; }
-	QString shortname() const { return "Qt 4.5"; }
+	QString shortname() const { return "Qt 4.6"; }
 	bool exec()
 	{
                 // NOX mode
@@ -356,7 +356,7 @@ public:
                 #else
                   conf->addExtra("MANPREFIX = \$\$PREFIX/share"); 
                 #endif
-		return(QT_VERSION >= 0x040500);
+		return(QT_VERSION >= 0x040600);
 	}
 };
 #line 1 "qt-dbus.qcm"
@@ -419,11 +419,11 @@ class qc_libtorrent_rasterbar : public ConfObj
 {
 public:
 	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent-rasterbar >= 0.14.4"; }
+	QString name() const { return "libtorrent-rasterbar >= 0.15.0"; }
 	QString shortname() const { return "libtorrent-rasterbar"; }
 	bool exec(){
 		QStringList incs;
-		QString req_ver = "0.14.4";
+		QString req_ver = "0.15.0";
 		QString version, libs, other;
 		VersionMode mode = VersionMin;
 		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other))

install.os2

@@ -11,7 +11,7 @@ QBittorrent installation
 
 3. INSTALLATION
 
-4. CONTACT
+4. BUGREPORTS
 
 5. CREDITS
 
@@ -29,17 +29,70 @@ Welcome to QBittorrent port for OS/2 and eComStation.
 2. REQUIREMENTS
 ===============
 
-* klibc 0.6.3 or later
+The following requirements can be installed either by rpm or by zip files.
 
-    ftp://ftp.netlabs.org/pub/gcc/libc-0_6_3-csd3.wpi
+RPM Installation:
 
-* openssl 1.0
+klibc
+-----
 
-    ftp://ftp.netlabs.org/pub/unixos2/ssl10.zip
+  1. yum install libc
 
-* Qt4 dll
+openssl 1.0
+-----------
 
-    see http://svn.netlabs.org/qt4 for more information whats needed and where to get the latest
+  1. yum install openssl
+
+pthread
+-------
+
+  1. yum install pthread
+
+GCC4Core
+--------
+
+  1. yum install libgcc
+  2. yum install gcc-stack-protector
+  3. yum install gcc-stdc++-shared-library
+  4. yum install gcc-supc++-shared-library
+
+Qt4 dll
+-------
+
+  1. yum install libqt4
+
+
+ZIP Installation:
+
+klibc
+-----
+
+  1. Download klibc 0.6.5 or better (see http://svn.netlabs.org/libc for more information)
+  2. Install the files to your libpath eg x:\ecs\dll
+
+openssl 1.0
+-----------
+
+  1. Download the zip file from http://rpm.netlabs.org/release/00/zip
+  2. Install the files to your libpath eg. x:\ecs\dll
+
+pthread
+-------
+
+  1. Download pthread 2012-03-13 or better from http://rpm.netlabs.org/release/00/zip
+  2. Install the files to your libpath eg. x:\ecs\dll
+
+GCC4Core
+--------
+
+  1. Download GCC4Core 1.2.1 or better from http://ftp.netlabs.org/pub/gcc
+  2. Install the files to your libpath eg. x:\ecs\dll
+
+Qt4 dll
+-------
+
+  1. Download Qt4 4.7.3 or better (see http://svn.netlabs.org/qt4 for more information)
+  2. Install the files according to the readme
 
 
 3. INSTALLATION
@@ -47,30 +100,6 @@ Welcome to QBittorrent port for OS/2 and eComStation.
           
 To install QBittorrent, do the following:
 
-klibc
------
-
-  1. Download klibc 0.6.3 csd3 or later.
-  2. Install the package by double-clicking on the WPI file.
-
-
-openssl 1.0
------------
-
-  1. Download the zip file
-  2. Install the files to your libpath eg. x:\ecs\dll
-
-Qt4 dll
--------
-
-  1. Download the package
-  2. Install the package by double-clicking on the wpi file.
-
-
-
-QBittorrent
------------
-
   1. Create a directory for QBittorrent.
   2. Extract the QBittorrent package to the new directory.
   3. Create a WPS object for QBittorrent.exe.
@@ -78,18 +107,13 @@ QBittorrent
   5. Happy torrenting
   
 
+4. BUGREPORTS
+=============
 
-4. CONTACT
+Please create bugreports at http://svn.netlabs.org/qtapps
-==========
-
-Please send bugreports to:
-
-  ecs@aroa.ch
-
 Only bug reports with a reproducable bug are accepted. :-)
 
 
-
 5. CREDITS
 ==========
 
@@ -122,6 +146,28 @@ development, you can do so in one of the following ways:
 7. HISTORY
 ==========
 
+2012-09-06
+
+  * updated to 3.0.2 code level of QBittorrent
+
+2012-05-14
+
+  * updated to 2.9.8 code level of QBittorrent
+
+2012-03-15
+
+  * updated to 2.9.5 code level of QBittorrent
+
+2011-09-26
+
+  * updated to 2.8.5 code level of QBittorrent
+  * updated to Qt 4.7.3
+
+2011-06-20
+
+  * updated to 2.7.3 code level of QBittorrent
+  * updated libtorrent to 0.15.6 level
+
 2010-12-23
 
   * updated to 2.5.2 code level of QBittorrent

macxconf.pri

@@ -5,6 +5,7 @@ DATADIR = /usr/local/share
 # Use pkg-config to get all necessary libtorrent DEFINES
 CONFIG += link_pkgconfig
 PKGCONFIG += libtorrent-rasterbar
+DEFINES += BOOST_ASIO_DYN_LINK
 
 # Special include/libs paths (macports)
 INCLUDEPATH += /usr/include/openssl /usr/include /opt/local/include/boost /opt/local/include
@@ -15,16 +16,50 @@ 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
 
 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.")

qcm/libtorrent-rasterbar.qcm

@@ -8,11 +8,11 @@ class qc_libtorrent_rasterbar : public ConfObj
 {
 public:
 	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent-rasterbar >= 0.14.4"; }
+	QString name() const { return "libtorrent-rasterbar >= 0.15.0"; }
 	QString shortname() const { return "libtorrent-rasterbar"; }
 	bool exec(){
 		QStringList incs;
-		QString req_ver = "0.14.4";
+		QString req_ver = "0.15.0";
 		QString version, libs, other;
 		VersionMode mode = VersionMin;
 		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other))

qcm/qt4.qcm

@@ -1,6 +1,6 @@
 /*
 -----BEGIN QCMOD-----
-name: Qt >= 4.5
+name: Qt >= 4.6
 arg: enable-debug, Enable debug mode
 arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
 -----END QCMOD-----
@@ -9,8 +9,8 @@ class qc_qt4 : public ConfObj
 {
 public:
 	qc_qt4(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Qt >= 4.5"; }
+	QString name() const { return "Qt >= 4.6"; }
-	QString shortname() const { return "Qt 4.5"; }
+	QString shortname() const { return "Qt 4.6"; }
 	bool exec()
 	{
                 // NOX mode
@@ -31,6 +31,6 @@ public:
                 #else
                   conf->addExtra("MANPREFIX = $$PREFIX/share"); 
                 #endif
-		return(QT_VERSION >= 0x040500);
+		return(QT_VERSION >= 0x040600);
 	}
 };

src/about_imp.h

@@ -80,8 +80,9 @@ class about : public QDialog, private Ui::AboutDlg{
           <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>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>\
@@ -95,7 +96,7 @@ class about : public QDialog, private Ui::AboutDlg{
           <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> Andrey Shpachenko (masterfix@users.sourceforge.net) and Oleh Prypin (blaxpirit@gmail.com)</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

@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2006  Christophe Dumez
+ * Copyright (C) 2012  Christophe Dumez
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -28,70 +28,64 @@
  * Contact : chris@qbittorrent.org
  */
 
-#ifndef TORRENTADDITION_H
+#ifndef ADDNEWTORRENTDIALOG_H
-#define TORRENTADDITION_H
+#define ADDNEWTORRENTDIALOG_H
-
-#include <QStringList>
-
-#include "ui_torrentadditiondlg.h"
 
+#include <QDialog>
+#include <QUrl>
 #include <libtorrent/torrent_info.hpp>
 
-class TorrentFilesFilterModel;
+QT_BEGIN_NAMESPACE
+namespace Ui {
+class AddNewTorrentDialog;
+}
+QT_END_NAMESPACE
+
+class TorrentContentFilterModel;
 class PropListDelegate;
 
-class torrentAdditionDialog : public QDialog, private Ui_addTorrentDialog{
+class AddNewTorrentDialog : public QDialog
+{
   Q_OBJECT
   
 public:
-  torrentAdditionDialog(QWidget *parent);
+  ~AddNewTorrentDialog();
-  ~torrentAdditionDialog();
-  void showLoadMagnetURI(QString magnet_uri);
-  void showLoad(QString filePath, QString from_url=QString::null);
-  QString getCurrentTruncatedSavePath(QString* root_folder_or_file_name = 0) const;
-  QString getTruncatedSavePath(QString save_path, QString* root_folder_or_file_name = 0) const;
-  bool allFiltered() const;
 
-public slots:
+  static void showTorrent(const QString& torrent_path, const QString& from_url = QString());
-  void displayContentListMenu(const QPoint&);
+  static void showMagnet(const QString& torrent_link);
+
+private slots:
+  void showAdvancedSettings(bool show);
+  void displayContentTreeMenu(const QPoint&);
+  void on_buttonBox_accepted();
+  void updateDiskSpaceLabel();
+  void onSavePathChanged(int);
+  void relayout();
   void renameSelectedFile();
-  void updateDiskSpaceLabels();
+  void setdialogPosition();
-  void on_browseButton_clicked();
+
-  void on_CancelButton_clicked();
+private:
-  void savePiecesPriorities();
+  explicit AddNewTorrentDialog(QWidget *parent = 0);
-  void on_OkButton_clicked();
+  bool loadTorrent(const QString& torrent_path, const QString& from_url);
-  void hideTorrentContent();
+  bool loadMagnet(const QString& magnet_uri);
-  void limitDialogWidth();
-  void saveTruncatedPathHistory();
   void loadSavePathHistory();
-  void updateLabelInSavePath(QString label);
+  void saveSavePathHistory() const;
-  void updateSavePathCurrentText();
+  int indexOfSavePath(const QString& save_path);
-  void resetComboLabelIndex(QString text);
+  void updateFileNameInSavePaths(const QString& new_filename);
-
+  void loadState();
-protected:
+  void saveState();
-  void closeEvent(QCloseEvent *event);
 
 private:
-  void readSettings();
+  Ui::AddNewTorrentDialog *ui;
-  void saveSettings();
+  TorrentContentFilterModel *m_contentModel;
-
+  PropListDelegate *m_contentDelegate;
-private:
+  bool m_isMagnet;
-  QString fileName;
+  QString m_filePath;
-  QString hash;
+  QString m_url;
-  QString filePath;
+  QString m_hash;
-  QString from_url;
+  boost::intrusive_ptr<libtorrent::torrent_info> m_torrentInfo;
-  QString defaultSavePath;
+  QStringList m_filesPath;
-  QString old_label;
+  bool m_hasRenamedFile;
-  bool appendLabelToSavePath;
-  TorrentFilesFilterModel *PropListModel;
-  PropListDelegate *PropDelegate;
-  unsigned int nbFiles;
-  boost::intrusive_ptr<libtorrent::torrent_info> t;
-  QStringList files_path;
-  bool is_magnet;
-  int hidden_height;
-  QStringList path_history;
-  bool m_showContentList;
 };
 
-#endif
+#endif // ADDNEWTORRENTDIALOG_H

src/dnsupdater.cpp

@@ -175,7 +175,7 @@ void DNSUpdater::processIPUpdateReply(const QString &reply)
   QString code = reply.split(" ").first();
   qDebug() << Q_FUNC_INFO << "Code:" << code;
   if (code == "good" || code == "nochg") {
-    QBtSession::instance()->addConsoleMessage(tr("Your dynamic DNS was successfuly updated."), "green");
+    QBtSession::instance()->addConsoleMessage(tr("Your dynamic DNS was successfully updated."), "green");
     return;
   }
   if (code == "911" || code == "dnserr") {

src/downloadfromurldlg.ui

@@ -14,31 +14,14 @@
    <string>Download from urls</string>
   </property>
   <layout class="QVBoxLayout">
-   <property name="spacing">
-    <number>6</number>
-   </property>
-   <property name="margin">
-    <number>9</number>
-   </property>
    <item>
     <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
-     <property name="margin">
-      <number>0</number>
-     </property>
      <item>
       <widget class="QLabel" name="downloadURL_lbl">
        <property name="font">
         <font>
-         <family>Sans Serif</family>
-         <pointsize>12</pointsize>
          <weight>75</weight>
-         <italic>false</italic>
          <bold>true</bold>
-         <underline>false</underline>
-         <strikeout>false</strikeout>
         </font>
        </property>
        <property name="text">
@@ -65,13 +48,7 @@
      </property>
      <property name="font">
       <font>
-       <family>Sans Serif</family>
-       <pointsize>9</pointsize>
-       <weight>50</weight>
        <italic>true</italic>
-       <bold>false</bold>
-       <underline>false</underline>
-       <strikeout>false</strikeout>
       </font>
      </property>
      <property name="text">
@@ -81,12 +58,6 @@
    </item>
    <item>
     <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
-     <property name="margin">
-      <number>0</number>
-     </property>
      <item>
       <spacer>
        <property name="orientation">

src/downloadthread.cpp

@@ -32,7 +32,6 @@
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkProxy>
-#include <QNetworkCookie>
 #include <QNetworkCookieJar>
 
 #include "downloadthread.h"
@@ -109,39 +108,21 @@ void DownloadThread::processDlFinished(QNetworkReply* reply) {
   reply->deleteLater();
 }
 
-#ifndef DISABLE_GUI
+void DownloadThread::downloadTorrentUrl(const QString &url, const QList<QNetworkCookie>& cookies)
-void DownloadThread::loadCookies(const QString &host_name, QString url) {
+{
-  const QList<QByteArray> raw_cookies = RssSettings().getHostNameCookies(host_name);
-  QNetworkCookieJar *cookie_jar = m_networkManager.cookieJar();
-  QList<QNetworkCookie> cookies;
-  qDebug("Loading cookies for host name: %s", qPrintable(host_name));
-  foreach(const QByteArray& raw_cookie, raw_cookies) {
-    QList<QByteArray> cookie_parts = raw_cookie.split('=');
-    if(cookie_parts.size() == 2) {
-      qDebug("Loading cookie: %s", raw_cookie.constData());
-      cookies << QNetworkCookie(cookie_parts.first(), cookie_parts.last());
-    }
-  }
-  cookie_jar->setCookiesFromUrl(cookies, url);
-  m_networkManager.setCookieJar(cookie_jar);
-}
-#endif
-
-void DownloadThread::downloadTorrentUrl(const QString &url) {
   // Process request
-  QNetworkReply *reply = downloadUrl(url);
+  QNetworkReply *reply = downloadUrl(url, cookies);
   connect(reply, SIGNAL(downloadProgress(qint64,qint64)), this, SLOT(checkDownloadSize(qint64,qint64)));
 }
 
-QNetworkReply* DownloadThread::downloadUrl(const QString &url){
+QNetworkReply* DownloadThread::downloadUrl(const QString &url, const QList<QNetworkCookie>& cookies) {
   // Update proxy settings
   applyProxySettings();
-#ifndef DISABLE_GUI
+  // Set cookies
-  // Load cookies
+  if (!cookies.empty()) {
-  QString host_name = QUrl::fromEncoded(url.toUtf8()).host();
+    qDebug("Setting %d cookies for url: %s", cookies.size(), qPrintable(url));
-  if(!host_name.isEmpty())
+    m_networkManager.cookieJar()->setCookiesFromUrl(cookies, url);
-    loadCookies(host_name, url);
+  }
-#endif
   // Process download request
   qDebug("url is %s", qPrintable(url));
   const QUrl qurl = QUrl::fromEncoded(url.toUtf8());

src/downloadthread.h

@@ -32,6 +32,7 @@
 #define DOWNLOADTHREAD_H
 
 #include <QNetworkReply>
+#include <QNetworkCookie>
 #include <QObject>
 #include <QHash>
 #include <QSslError>
@@ -45,8 +46,8 @@ class DownloadThread : public QObject {
 
 public:
   DownloadThread(QObject* parent = 0);
-  QNetworkReply* downloadUrl(const QString &url);
+  QNetworkReply* downloadUrl(const QString &url, const QList<QNetworkCookie>& raw_cookies = QList<QNetworkCookie>());
-  void downloadTorrentUrl(const QString &url);
+  void downloadTorrentUrl(const QString &url, const QList<QNetworkCookie>& raw_cookies = QList<QNetworkCookie>());
   //void setProxy(QString IP, int port, QString username, QString password);
 
 signals:
@@ -63,9 +64,6 @@ private slots:
 private:
   QString errorCodeToString(QNetworkReply::NetworkError status);
   void applyProxySettings();
-#ifndef DISABLE_GUI
-  void loadCookies(const QString &host_name, QString url);
-#endif
 
 private:
   QNetworkAccessManager m_networkManager;

src/executionlog.h

@@ -37,8 +37,8 @@ QT_BEGIN_NAMESPACE
 namespace Ui {
     class ExecutionLog;
 }
-class LogListWidget;
 QT_END_NAMESPACE
+class LogListWidget;
 
 class ExecutionLog : public QWidget
 {

src/filesystemwatcher.h

@@ -21,6 +21,7 @@
 #endif
 #endif
 
+#include "fs_utils.h"
 #include "misc.h"
 
 #ifndef CIFS_MAGIC_NUMBER
@@ -118,7 +119,7 @@ private:
 
 public:
   FileSystemWatcher(QObject *parent): QFileSystemWatcher(parent) {
-    m_filters << "*.torrent";
+    m_filters << "*.torrent" << "*.magnet";
     connect(this, SIGNAL(directoryChanged(QString)), this, SLOT(scanLocalFolder(QString)));
   }
 
@@ -226,7 +227,7 @@ protected slots:
         m_partialTorrents.remove(torrent_path);
         continue;
       }
-      if(misc::isValidTorrentFile(torrent_path)) {
+      if (fsutils::isValidTorrentFile(torrent_path)) {
         no_longer_partial << torrent_path;
          m_partialTorrents.remove(torrent_path);
       } else {
@@ -271,7 +272,13 @@ private:
     const QStringList files = dir.entryList(m_filters, QDir::Files, QDir::Unsorted);
     foreach (const QString &file, files) {
       const QString file_abspath = dir.absoluteFilePath(file);
-      if(misc::isValidTorrentFile(file_abspath)) {
+      if (file_abspath.endsWith(".magnet")) {
+        QFile f(file_abspath);
+        if (f.open(QIODevice::ReadOnly)
+            && !misc::magnetUriToHash(QString::fromLocal8Bit(f.readAll())).isEmpty()) {
+          torrents << file_abspath;
+        }
+      } else if (fsutils::isValidTorrentFile(file_abspath)) {
         torrents << file_abspath;
       } else {
         if (!m_partialTorrents.contains(file_abspath)) {

src/fs_utils.h

@@ -0,0 +1,73 @@
+/*
+ * Bittorrent Client using Qt4 and libtorrent.
+ * Copyright (C) 2012  Christophe Dumez
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ *
+ * Contact : chris@qbittorrent.org
+ */
+
+#ifndef FS_UTILS_H
+#define FS_UTILS_H
+
+#include <QString>
+#include <QCoreApplication>
+
+/**
+ * Utility functions related to file system.
+ */
+class fsutils
+{
+  Q_DECLARE_TR_FUNCTIONS(fsutils)
+
+public:
+static QString toDisplayPath(const QString& path);
+static QString fileExtension(const QString& filename);
+static QString fileName(const QString& file_path);
+static qint64 computePathSize(const QString& path);
+static bool sameFiles(const QString& path1, const QString& path2);
+static QString updateLabelInSavePath(QString defaultSavePath, QString save_path, const QString& old_label, const QString& new_label);
+static QString toValidFileSystemName(QString filename);
+static bool isValidFileSystemName(const QString& filename);
+static long long freeDiskSpaceOnPath(QString path);
+static QString branchPath(const QString& file_path, QString* removed = 0);
+static bool sameFileNames(const QString& first, const QString& second);
+static QString expandPath(const QString& path);
+static bool isValidTorrentFile(const QString& path);
+static bool smartRemoveEmptyFolderTree(const QString& dir_path);
+static bool forceRemove(const QString& file_path);
+
+/* Ported from Qt4 to drop dependency on QtGui */
+static QString QDesktopServicesDataLocation();
+static QString QDesktopServicesCacheLocation();
+static QString QDesktopServicesDownloadLocation();
+/* End of Qt4 code */
+static QString searchEngineLocation();
+static QString BTBackupLocation();
+static QString cacheLocation();
+
+};
+
+#endif // FS_UTILS_H
+

src/geoip/geoipmanager.cpp

@@ -64,7 +64,7 @@
 #include <QFile>
 #include <QChar>
 
-#include "misc.h"
+#include "fs_utils.h"
 
 using namespace libtorrent;
 
@@ -72,7 +72,7 @@ QString GeoIPManager::geoipFolder(bool embedded) {
 #ifdef WITH_GEOIP_EMBEDDED
   if (embedded)
     return ":/geoip/";
-  return misc::QDesktopServicesDataLocation()+"geoip"+QDir::separator();
+  return fsutils::QDesktopServicesDataLocation()+"geoip"+QDir::separator();
 #else
   Q_UNUSED(embedded);
   if (QFile::exists("/usr/local/share/GeoIP/GeoIP.dat"))
@@ -101,7 +101,7 @@ void GeoIPManager::exportEmbeddedDb() {
     }
     // Remove destination files
     if (QFile::exists(geoipDBpath(false)))
-      misc::safeRemove(geoipDBpath(false));
+      fsutils::forceRemove(geoipDBpath(false));
     // Copy from executable to hard disk
     qDebug("%s -> %s", qPrintable(geoipDBpath(true)), qPrintable(geoipDBpath(false)));
     if (!QFile::copy(geoipDBpath(true), geoipDBpath(false))) {

src/iconprovider.cpp

@@ -35,7 +35,7 @@ IconProvider* IconProvider::m_instance = 0;
 
 IconProvider::IconProvider()
 {
-#if defined(Q_WS_X11) && (QT_VERSION >= QT_VERSION_CHECK(4,6,0))
+#if defined(Q_WS_X11)
   m_useSystemTheme = Preferences().useSystemIconTheme();
 #endif
 }
@@ -57,7 +57,7 @@ void IconProvider::drop()
 
 QIcon IconProvider::getIcon(const QString &iconId)
 {
-#if defined(Q_WS_X11) && (QT_VERSION >= QT_VERSION_CHECK(4,6,0))
+#if defined(Q_WS_X11)
   if (m_useSystemTheme) {
     QIcon icon = QIcon::fromTheme(iconId, QIcon(":/Icons/oxygen/"+iconId+".png"));
     icon = generateDifferentSizes(icon);
@@ -67,7 +67,7 @@ QIcon IconProvider::getIcon(const QString &iconId)
   return QIcon(":/Icons/oxygen/"+iconId+".png");
 }
 
-#if defined(Q_WS_X11) && (QT_VERSION >= QT_VERSION_CHECK(4,6,0))
+#if defined(Q_WS_X11)
 void IconProvider::useSystemIconTheme(bool enable)
 {
   m_useSystemTheme = enable;
@@ -102,7 +102,7 @@ QIcon IconProvider::generateDifferentSizes(const QIcon &icon)
 
 QString IconProvider::getIconPath(const QString& iconId)
 {
-#if defined(Q_WS_X11) && (QT_VERSION >= QT_VERSION_CHECK(4,6,0))
+#if defined(Q_WS_X11)
   if (m_useSystemTheme) {
     QString path = QDir::temp().absoluteFilePath(iconId+".png");
     if (!QFile::exists(path)) {

src/iconprovider.h

@@ -48,7 +48,7 @@ public:
   QIcon getIcon(const QString& iconId);
   QString getIconPath(const QString& iconId);
 
-#if defined(Q_WS_X11) && (QT_VERSION >= QT_VERSION_CHECK(4,6,0))
+#if defined(Q_WS_X11)
 public:
   void useSystemIconTheme(bool enable);
 

src/lang.qrc

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