Tag today's releases

Cleaned up main() function

AUTHORS

@@ -3,12 +3,19 @@ Author:
 
 Contributors:
 * Stefanos Antaris <santaris@csd.auth.gr>
+* Mohammad Dib <mdib@qbittorrent.org>
+* Mirco Chinelli <infinity89@fastwebmail.it>
 * Ishan Arora <ishan@qbittorrent.org>
 * Arnaud Demaizière <arnaud@qbittorrent.org>
 * Grigis Gaëtan <cipher16@gmail.com>
 * Christian Kandeler <zambesi@users.sourceforge.net>
+* Silvan Scherrer <silvan.scherrer@aroa.ch>
 
 Code from other projects:
+* files src/qtsingleapp/*
+  copyright: Nokia Corporation
+  license: LGPL
+
 * files src/ico.cpp src/ico.h
   copyright: Malte Starostik <malte@kde.org>
   license: LGPL
@@ -60,11 +67,13 @@ Images Authors:
 Translations authors:
 * files: src/lang/*.ts
   copyright:
+  - Arabic: SDERAWI (abz8868@msn.com) and sn51234 (nesseyan@gmail.com)
   - Brazilian: Nick Marinho (nickmarinho@gmail.com)
   - Bulgarian: Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net)
   - Catalan: Francisco Luque Contreras (frannoe@ya.com)
   - Chinese (Simplified): Guo Yue (yue.guo0418@gmail.com)
   - Chinese (Traditional): Yi-Shun Wang (dnextstep@gmail.com)
+  - Croatian: Oliver Mucafir (oliver.untwist@gmail.com)
   - Czech: Jirka Vilim (web@tets.cz)
   - Danish: Mathias Nielsen (comoneo@gmail.com)
   - Dutch: Joost Schipper (heavyjoost@users.sourceforge.net)

Changelog

@@ -1,29 +1,28 @@
-* Sun Apr 04 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.3
+* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.3.0
-    - BUGFIX: Fix possible crash when deleting a torrent just after pausing it
+    - FEATURE: Simplified torrent root folder renaming/truncating (< v2.3.0 is no longer forward compatible)
-    - BUGFIX: Enable Apply button when alternative rate limits are changed
+    - FEATURE: Remember previous save paths in torrent addition dialog
-    - BUGFIX: Source compatibility with Windows (Thanks Ishan Arora)
+    - FEATURE: Max number of half-open connections can now be edited
-    - BUGFIX: Source compatibility with eCS (OS/2) (Thanks Silvan Scherrer)
+    - FEATURE: Added support for strict super seeding
-    - BUGFIX: Cleaner binutils gold linker support
+    - FEATURE: The user can force listening on a particular network interface
-    - BUGFIX: Clean fix for progress display with cleanlooks style
+    - FEATURE: Added cookie support for RSS feeds
-
+    - FEATURE: User can force tracker reannounce
-* Mon Mar 22 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.2
+    - FEATURE: Added "No action" setting for double-click action
-    - FEATURE: DHT port can be set from Web UI
+    - FEATURE: Several torrents can be moved at once
-    - BUGFIX: Fix possible crash with folder scanning
+    - FEATURE: Added error state for torrents (error is displayed in a tooltip)
-    - BUGFIX: Fix Mac compilation
+    - FEATURE: Added filter for paused/error torrents
-    - BUGFIX: Save fast resume data every 3 minutes (for robustness)
+    - FEATURE: Add Check/Uncheck all feature in Web UI
-    - I18N: Updated Polish translation (thanks Szymon Świerkosz)
+    - FEATURE: Search engine can now be disabled
-
+    - FEATURE: Torrents can be automatically paused once they reach a given ratio
-* Sat Mar 20 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.1
+    - FEATURE: Several files can now be disabled at once
-    - FEATURE: Display pieces that are being downloaded
+    - FEATURE: Added "Select All/None" buttons to files list
-    - FEATURE: Added back folder watching in Web UI
+    - BUGFIX: Hide seeding torrents files priorities in Web UI
-    - FEATURE: Added back file prioritizing in Web UI
+    - BUGFIX: The user can disable permanently recursive torrent download
-    - BUGFIX: Fix compilation with Qt 4.4
+    - BUGFIX: Peer Exchange status is now correctly reported
-    - BUGFIX: Fix Web UI compatibility with Safari
+    - BUGFIX: Use an INI file instead of the registry on Windows (More reliable)
-    - BUGFIX: Fix progress display with cleanlook style
+    - COSMETIC: Display peers country name in tooltip
-    - BUGFIX: Fix file filtering in complex torrents
+    - COSMETIC: Display number of torrents in transfers tab label
-    - BUGFIX: Ask for user confirmation for recursive torrent download
+    - COSMETIC: Simplified program preferences
-    - BUGFIX: Fix "add file" dialog in torrent creation tool
+    - COSMETIC: Fix naming of actions opening new dialogs (use Name...)
-    - BUGFIX: Fix "Ctrl+A" in Web UI
 
 * Sun Mar 14 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.0
     - FEATURE: User can set alternative speed limits for fast toggling

INSTALL

@@ -14,11 +14,13 @@ 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 (>= 0.14.4 REQUIRED, compatible with v0.15.x)
         -> http://www.libtorrent.net
         Be careful: another library (the one used by rTorrent) uses a similar name.
 
-    - libboost: libboost-filesystem, libboost-date-time, libboost-thread, libboost-serialization
+    - libboost 1.34.x (libboost-filesystem, libboost-thread, libboost-date-time) + libasio
+      or
+    - libboost >= 1.35.x (libboost-system, libboost-filesystem, libboost-thread, libboost-date-time)
 
     - python >= 2.3 (needed by search engine)
         * Run time only dependency

README.os2

@@ -0,0 +1,62 @@
+qBittorrent - A BitTorrent client in Qt4
+------------------------------------------
+
+This is the eComStation (OS/2) qBittorrent part of the readme. See also README for more general information.
+
+
+Building qBittorrent
+********************
+
+
+Requirements
+============
+
+- gcc based build env (recommended gcc v4.4.2 or greater)
+  
+- Qt4 for eCS (OS/2) dev package (see http://svn.netlabs.org/qt4 for more information)
+
+- libtorrent-rasterbar for eCS (OS/2) port (see http://svn.netlabs.org/ports for more information)
+
+- boost for eCS (OS/2) port (see http://svn.netlabs.org/ports for more information)
+
+
+How to build
+============
+
+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
+DATADIR = ./share
+
+CONFIG += staticlib
+INCLUDEPATH += x:/trees/libtorrent/trunk/include
+LIBS += -Lx:/trees/libtorrent/trunk/src/.libs \
+        -Lx:/trees/boost/trunk/stage/lib \
+        -Lx:/trees/openssl \
+	-Lx:/extras/lib
+##### conf.pri content end #####
+
+Of course all the above path references have to be adjusted to your build env.
+
+It should now be easy to build qBittorrent:
+
+Simply type:
+$ qmake
+
+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:
+#netlabs on irc.freenode.net
+
+------------------------------------------
+Silvan Scherrer <silvan.scherrer@aroa.ch>
+
+

qbittorrent.qc

@@ -19,4 +19,6 @@
   </dep>
   <dep type='geoip-database'>
   </dep>
+  <dep type='qtsingleapplication'>
+  </dep>
 </qconf>

qcm/libboost.qcm

@@ -5,12 +5,36 @@ arg: with-libboost-inc=[path], Path to libboost include files
 arg: with-libboost-lib=[path], Path to libboost library files
 -----END QCMOD-----
 */
+#include <boost/version.hpp>
 class qc_libboost : public ConfObj
 {
 public:
 	qc_libboost(Conf *c) : ConfObj(c) {}
 	QString name() const { return "libboost"; }
 	QString shortname() const { return "libboost"; }
+  QString findBoostLib(QString path, QString lib) const {
+    QString name;
+    QDir libDir(path);
+    QStringList filters;
+    filters << "libboost_"+lib+"*-mt*.so";
+    QStringList result = libDir.entryList(filters, QDir::Files);
+    if(!result.empty()) {
+      name = result.first().mid(3);
+      // Remove .so
+      name.chop(3);
+    } else {
+      // Fall back to non -mt boost lib
+      filters.clear();
+      filters << "libboost_"+lib+"*.so";
+      result = libDir.entryList(filters, QDir::Files);
+      if(!result.empty()) {
+        name = result.first().mid(3);
+        // Remove .so
+        name.chop(3);
+      }
+    }
+    return name;
+  }
 	bool exec(){
         	QString s;
 		s = conf->getenv("QC_WITH_LIBBOOST_INC");
@@ -54,28 +78,41 @@ public:
 		conf->addIncludePath(s);
 		// Find library
 		s = conf->getenv("QC_WITH_LIBBOOST_LIB");
-                if(!s.isEmpty()) {
+    QStringList required_libs;
-                        if(!conf->checkLibrary(s, "boost_system-mt")) {
+#if BOOST_VERSION >= 103500
-                                return false;
+      required_libs << "system"; 
-                        }
+#endif
-                }else{
+    if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-                        QStringList sl;
+      // Not required by nox
-                        sl << "/usr/lib/";
+      required_libs << "filesystem" << "thread";
-                        sl << "/usr/lib64/";
+    }
-                        sl << "/usr/local/lib/";
+    QStringList libDirs;
-                        sl << "/usr/local/lib64/";
+    libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
-                        bool found = false;
+    foreach(const QString& lib, required_libs) {
-                        foreach(s, sl){
+      if(!s.isEmpty()) {
-                                if(conf->checkLibrary(s, "boost_system-mt")) {
+        QString detected_name = findBoostLib(s, lib);
-                                        found = true;
+        if(detected_name.isEmpty()) {
-                                        break;
+          printf("Could not find boost %s library!\n", qPrintable(lib));
-                                }
+          return false;
-                        }
+        } else {
-                        if(!found)
+          conf->addLib("-l"+detected_name);
-                                return false;
+        }
-                }
+      } else {
-                conf->addLib(QString("-L") + s);
+        bool found = false;
-		conf->addLib("-lboost_system-mt -lboost_filesystem-mt -lboost_thread-mt");
+        foreach(const QString& libDir, libDirs) {
+          QString detected_name = findBoostLib(libDir, lib);
+          if(!detected_name.isEmpty()) {
+            conf->addLib("-l"+detected_name);
+            found = true;
+            break;
+          }
+        }
+        if(!found) {
+          printf("Could not find boost %s library!\n", qPrintable(lib));
+          return false;
+        }
+      }
+    }
 		return true;
 	}
 };

qcm/libnotify.qcm

@@ -40,10 +40,21 @@ public:
 			} else {
 				return false;
 			}
+			QStringList incs3;
+                        QString req_ver3 = "2.0";
+                        QString version3, libs3, other3;
+			if(conf->findPkgConfig("gtk+-2.0", mode, req_ver3, &version3, &incs3, &libs3, &other3)) {
+                                for(int n = 0; n < incs3.count(); ++n)
+                                conf->addIncludePath(incs3[n]);
+                                if(!libs3.isEmpty())
+                                        conf->addLib(libs3);
+                        } else {
+                                return false;
+                        }
 		} else {
 			return false;
 		}
-		
+
 		return true;
 	}
 };

qcm/libtorrent-rasterbar.qcm

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

src/GUI.h

@@ -37,13 +37,10 @@
 #include "ui_mainwindow.h"
 #include "qtorrenthandle.h"
 
-enum TabIndex{TAB_TRANSFER, TAB_SEARCH, TAB_RSS};
-
 class Bittorrent;
 class QTimer;
 class downloadFromURL;
 class SearchEngine;
-class QLocalServer;
 class QCloseEvent;
 class RSSImp;
 class QShortcut;
@@ -59,6 +56,7 @@ class consoleDlg;
 class about;
 class createtorrent;
 class downloadFromURL;
+class HidableTabWidget;
 
 class GUI : public QMainWindow, private Ui::MainWindow{
   Q_OBJECT
@@ -68,8 +66,9 @@ public:
   GUI(QWidget *parent=0, QStringList torrentCmdLine=QStringList());
   ~GUI();
   // Methods
-  int getCurrentTabIndex() const;
+  QWidget* getCurrentTabWidget() const;
   TransferListWidget* getTransferList() const { return transferList; }
+  QMenu* getTrayIconMenu();
 
 public slots:
   void trackerAuthenticationRequired(QTorrentHandle& h);
@@ -77,6 +76,7 @@ public slots:
   void showNotificationBaloon(QString title, QString msg) const;
   void downloadFromURLList(const QStringList& urls);
   void updateAltSpeedsBtn(bool alternative);
+  void updateNbTorrents(unsigned int nb_downloading, unsigned int nb_seeding, unsigned int nb_active, unsigned int nb_inactive, unsigned int nb_paused);
 
 protected slots:
   // GUI related slots
@@ -88,8 +88,6 @@ protected slots:
   void on_actionWebsite_triggered() const;
   void on_actionBugReport_triggered() const;
   void on_actionShow_console_triggered();
-  void readParamsOnSocket();
-  void acceptConnection();
   void balloonClicked();
   void writeSettings();
   void readSettings();
@@ -111,6 +109,7 @@ protected slots:
   void on_actionOpen_triggered();
   void updateGUI();
   void loadPreferences(bool configure_session=true);
+  void processParams(const QString& params);
   void processParams(const QStringList& params);
   void addTorrent(QString path);
   void addUnauthenticatedTracker(const QPair<QTorrentHandle,QString> &tracker);
@@ -128,6 +127,7 @@ protected:
   void showEvent(QShowEvent *);
   bool event(QEvent * event);
   void displayRSSTab(bool enable);
+  void displaySearchTab(bool enable);
 
 private:
   // Bittorrent
@@ -135,7 +135,7 @@ private:
   QList<QPair<QTorrentHandle,QString> > unauthenticated_trackers; // Still needed?
   // GUI related
   QTimer *guiUpdater;
-  QTabWidget *tabs;
+  HidableTabWidget *tabs;
   StatusBar *status_bar;
   QPointer<options_imp> options;
   QPointer<consoleDlg> console;
@@ -144,7 +144,7 @@ private:
   QPointer<downloadFromURL> downloadFromURLDialog;
   QPointer<QSystemTrayIcon> systrayIcon;
   QPointer<QTimer> systrayCreator;
-  QMenu *myTrayIconMenu;
+  QPointer<QMenu> myTrayIconMenu;
   TransferListWidget *transferList;
   TransferListFiltersWidget *transferListFilters;
   PropertiesWidget *properties;
@@ -161,11 +161,15 @@ private:
   QSplitter *hSplitter;
   QSplitter *vSplitter;
   // Search
-  SearchEngine *searchEngine;
+  QPointer<SearchEngine> searchEngine;
   // RSS
   QPointer<RSSImp> rssWidget;
-  // Misc
+
-  QLocalServer *localServer;
+private slots:
+    void on_actionSearch_engine_triggered();
+    void on_actionRSS_Reader_triggered();
+    void on_actionSpeed_in_title_bar_triggered();
+    void on_actionTop_tool_bar_triggered();
 };
 
 #endif

src/Icons/qBittorrent.desktop

@@ -1,8 +1,9 @@
 [Desktop Entry]
 Categories=Qt;Network;P2P;
-Comment=V2.2.3
+Comment=V2.3.0
 Exec=qbittorrent %f
 GenericName=Bittorrent client
+GenericName[ar]=العميل Bittorrent
 GenericName[bg]=Торент клиент
 GenericName[cs]=Bittorrent klient
 GenericName[de]=Bittorren Client
@@ -10,6 +11,7 @@ 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 クライアント