Tagging the v0.9.2 release

- Disabled debug mode

Changelog

@@ -1,4 +1,15 @@
-* Unknown - Christophe Dumez <chris@qbittorrent.org> - v0.9.0
+* Tue Apr 10 2007 - Christophe Dumez <chris@qbittorrent.org> - v0.9.2
+		- BUGFIX: Window can now stay maximized on exit
+		- BUGFIX: Use PKGCONFIG again for configuring libtorrent
+		- BUGFIX: Allow to compile with libtorrent v0.11
+		- BUGFIX: Disabled main window context menu (annoying)
+		- I18N: Added Japanese translation
+		- I18N: Updated Turkish translation
+
+* Wed Apr 04 2007 - Christophe Dumez <chris@qbittorrent.org> - v0.9.1
+    - BUGFIX: A lot of fixes in configure file
+
+* Sun Apr 01 2007 - Christophe Dumez <chris@qbittorrent.org> - v0.9.0
     - FEATURE: Based on libtorrent v0.12
     - FEATURE: Based on Qt4.2
     - FEATURE: Brand new trayicon from Qt4.2
@@ -12,6 +23,7 @@
     - FEATURE: Added Autocompletion to search engine
     - FEATURE: Splitted BT & GUI parts (huge code rewriting & optimization)
     - FEATURE: New parameters for configure file to point to custom locations for libtorrent/libcurl
+    - FEATURE: Update application style according to the system (WindowsXP, MacOS, X11)
     - BUGFIX: Two torrents can now have the same name although they are different (use their hash)
     - BUGFIX: Fixed download from url that would fail sometimes
     - BUGFIX: Save directory was reset to default when filtering files in torrent
@@ -25,6 +37,9 @@
     - BUGFIX: Create Options object only when necessary (to save memory)
     - BUGFIX: Let libtorrent store the torrent handles (save memory)
     - BUGFIX: Set DHT Port only when DHT is enabled
+    - BUGFIX: Made ipfilter.dat parser less sensitive to errors
+    - BUGFIX: Bring main window to foreground when asking for exit confirmation
+    - I18N: Added Danish translation
     - I18N: Better internationalization thanks to dynamic text support
     - COSMETIC: Replaced OSD messages by Qt4.2 systray messages
 

INSTALL

@@ -16,7 +16,7 @@ will install and execute qBittorrent hopefully without any problems.
 Dependencies:
 - Qt >= 4.2 (libqt-devel, libqtgui, libqtcore, libqtnetwork)
 
-- libtorrent by Arvid Norberg (>= v0.12 REQUIRED)
+- libtorrent by Arvid Norberg (>= v0.11 REQUIRED, >= 0.12 ADVISED)
     -> http://libtorrent.sf.net
     Be carefull: another library (the one used by rtorrent) use the same name.
     These are TWO different libraries and qBittorrent will only work with the one provided

TODO

@@ -37,6 +37,5 @@
 - UPnP support?
 
 // In v0.9.0
-- Update translations (FR, SV, NB, PL, RU, DE done)
-- Bug squashing
-- Wait for libtorrent v0.12 official release
+- Update translations (FR, SV, NB, PL, RU, DE, SK, KO, ZH_CN, EL, BG, ES, DA, UK, PT, IT, NL done)
+- Wait for libtorrent v0.12 official release

qcm/libboost.qcm

@@ -1,6 +1,7 @@
 /*
 -----BEGIN QCMOD-----
 name: libboost
+arg: with-libboost-inc=[path], Path to libboost include files
 -----END QCMOD-----
 */
 class qc_libboost : public ConfObj
@@ -10,31 +11,46 @@ public:
 	QString name() const { return "libboost"; }
 	QString shortname() const { return "libboost"; }
 	bool exec(){
-          QString s;
-          QStringList sl;
-          sl += "/usr/include";
-          sl += "/usr/local/include";
-          sl += "/sw/include";
-          if(!conf->findHeader("boost/format.hpp", sl, &s)) {
-            qWarning("libboost includes not found!");
-            return false;
-          }
-	  conf->addIncludePath(s);
-          if(!conf->findHeader("boost/date_time/posix_time/posix_time.hpp", sl, &s)) {
-            qWarning("libboost-date-time includes not found!");
-            return false;
-          }
-	  conf->addIncludePath(s);
-          if(!conf->findHeader("boost/filesystem/path.hpp", sl, &s)) {
-            qWarning("libboost-filesystem includes not found!");
-            return false;
-          }
-          if(!conf->findHeader("boost/thread.hpp", sl, &s)) {
-            qWarning("libboost-thread includes not found!");
-            return false;
-          }
-	  conf->addIncludePath(s);
-
-          return true;
+        	QString s;
+		s = conf->getenv("QC_WITH_LIBBOOST_INC");
+		if(!s.isEmpty()) {
+			if(!conf->checkHeader(s, "boost/format.hpp")) {
+				return false;
+      			}
+			if(!conf->checkHeader(s, "boost/date_time/posix_time/posix_time.hpp")) {
+				return false;
+      			}
+			if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
+				return false;
+      			}
+			if(!conf->checkHeader(s, "boost/thread.hpp")) {
+				return false;
+      			}
+		}else{
+			QStringList sl;
+			sl << "/usr/include";
+			sl << "/usr/local/include";
+			bool found = false;
+			foreach(s, sl){
+				if(conf->checkHeader(s, "boost/format.hpp")){
+					found = true;
+					break;
+				}
+			}
+			if(!found) {
+				return false;
+          		}
+			if(!conf->checkHeader(s, "boost/date_time/posix_time/posix_time.hpp")) {
+				return false;
+      			}
+			if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
+				return false;
+      			}
+			if(!conf->checkHeader(s, "boost/thread.hpp")) {
+				return false;
+      			}
+		}
+		conf->addIncludePath(s);
+		return true;
 	}
 };

qcm/libcurl.qcm

@@ -12,43 +12,50 @@ public:
 	QString name() const { return "libcurl"; }
 	QString shortname() const { return "libcurl"; }
 	bool exec(){
-          QString s;
-					s = conf->getenv("QC_WITH_LIBCURL_INC");
-					if(!s.isEmpty()) {
-						if(!conf->checkHeader(s, "curl/curl.h")) {
-        			qWarning("libcurl includes not found!");
-							return false;
+        	QString s;
+		s = conf->getenv("QC_WITH_LIBCURL_INC");
+		if(!s.isEmpty()) {
+			if(!conf->checkHeader(s, "curl/curl.h")) {
+				return false;
       			}
-      			conf->addIncludePath(s);
-					}else{
-	          QStringList sl;
-  	        sl += "/usr/include";
-    	      sl += "/usr/local/include";
-        	  if(!conf->findHeader("curl/curl.h", sl, &s)) {
-          	  qWarning("libcurl includes not found!");
-            	return false;
-          	}
-	  				conf->addIncludePath(s);
-					}
+		}else{
+			QStringList sl;
+			sl << "/usr/include";
+			sl << "/usr/local/include";
+			bool found = false;
+			foreach(s, sl){
+				if(conf->checkHeader(s, "curl/curl.h")){
+					found = true;
+					break;
+				}
+			}
+			if(!found) {
+				return false;
+          		}
+		}
+		conf->addIncludePath(s);
 
-					s = conf->getenv("QC_WITH_LIBCURL_LIB");
-          if(!s.isEmpty()) {
-            if(!conf->checkLibrary(s, "curl")) {
-              qWarning("libcurl library not found!");
-              return false;
-            }
-            conf->addLib(QString("-L") + s);
-          }else{
-            if(!conf->findLibrary("curl", &s)) {
-              qWarning("libcurl library not found!");
-              return false;
-            }
-            if (!s.isEmpty())
-              conf->addLib(QString("-L") + s);
-          }
-
-          conf->addLib("-lcurl");
-
-          return true;
+		s = conf->getenv("QC_WITH_LIBCURL_LIB");
+		if(!s.isEmpty()) {
+      			if(!conf->checkLibrary(s, "curl")) {
+			        return false;
+			}
+      			conf->addLib(QString("-L") + s);
+		}else{
+			QStringList sl;
+			sl << "/usr/lib/";
+			sl << "/usr/local/lib/";
+			bool found = false;
+			foreach(s, sl){
+				if(conf->checkLibrary(s, "curl")){
+					found = true;
+					break;
+				}
+			}
+			if(!found) return false;
+			conf->addLib(QString("-L") + s);
+		}
+		conf->addLib("-lcurl");
+		return true;
 	}
 };

qcm/libtorrent.qcm

@@ -9,46 +9,60 @@ class qc_libtorrent : public ConfObj
 {
 public:
 	qc_libtorrent(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent >= 0.12"; }
+	QString name() const { return "libtorrent >= 0.11 (>= 0.12 ADVISED)"; }
 	QString shortname() const { return "libtorrent"; }
 	bool exec(){
-          QString s;
-					s = conf->getenv("QC_WITH_LIBTORRENT_INC");
-					if(!s.isEmpty()) {
-						if(!conf->checkHeader(s, "libtorrent/extensions/ut_pex.hpp")) {
-        			qWarning("libtorrent v0.12 includes not found!\nYou can download it at http://www.libtorrent.net");
-							return false;
+        	QString s;
+		s = conf->getenv("QC_WITH_LIBTORRENT_INC");
+		if(!s.isEmpty()) {
+		  if(!conf->checkHeader(s, "libtorrent/kademlia/node.hpp")){
+				return false;
+			}
+			if(!conf->checkHeader(s, "libtorrent/extensions/ut_pex.hpp")) {
+				qWarning("Libtorrent >= v0.12 was not detected, PeX will be disabled.");
+				conf->addDefine("NO_PEX");
       			}
-      			conf->addIncludePath(s);
-					}else{
-						QStringList sl;
-						sl << "/usr/include/";
-						sl << "/usr/local/include";
-        	  if(!conf->findHeader("libtorrent/extensions/ut_pex.hpp", sl, &s)) {
-          	  qWarning("libtorrent v0.12 includes not found!\nYou can download it at http://www.libtorrent.net");
-            	return false;
-          	}
-	  				conf->addIncludePath(s);
-					}
+		}else{
+			QStringList sl;
+			sl << "/usr/include";
+			sl << "/usr/local/include";
+			bool found = false;
+			foreach(s, sl){
+        if(conf->checkHeader(s, "libtorrent/kademlia/node.hpp")){
+          found = true;
+          break;
+       	}
+			}
+			if(!found) return false;
+				if(!conf->checkHeader(s, "libtorrent/extensions/ut_pex.hpp")){
+					qWarning("Libtorrent >= v0.12 was not detected, PeX will be disabled.");
+  	      conf->addDefine("NO_PEX");
+				}
+		}
+		conf->addIncludePath(s);
+		conf->addIncludePath(s+QDir::separator()+"libtorrent");
 
-					s = conf->getenv("QC_WITH_LIBTORRENT_LIB");
-			    if(!s.isEmpty()) {
+		s = conf->getenv("QC_WITH_LIBTORRENT_LIB");
+		if(!s.isEmpty()) {
       			if(!conf->checkLibrary(s, "torrent")) {
-			        qWarning("libtorrent library not found!");
 			        return false;
-			      }
+			}
       			conf->addLib(QString("-L") + s);
-			    }else{
-			      if(!conf->findLibrary("torrent", &s)) {
-      			  qWarning("libtorrent library not found!");
-			        return false;
-      			}
-			      if (!s.isEmpty())
-			        conf->addLib(QString("-L") + s);
-			    }
-
-			    conf->addLib("-ltorrent");
-
-					return true;
+		}else{
+			QStringList sl;
+			sl << "/usr/lib/";
+			sl << "/usr/local/lib/";
+			bool found = false;
+			foreach(s, sl){
+				if(conf->checkLibrary(s, "torrent")){
+					found = true;
+					break;
+				}
+			}
+			if(!found) return false;
+			conf->addLib(QString("-L") + s);
+		}
+		//conf->addLib("-ltorrent");
+		return true;
 	}
 };

src/GUI.cpp

@@ -22,27 +22,22 @@
 #include <QTime>
 #include <QMessageBox>
 #include <QDesktopWidget>
-#include <QTemporaryFile>
-#include <QTextStream>
-#include <QInputDialog>
 #include <QTimer>
-#include <QPainter>
-#include <QToolTip>
-#include <QStandardItemModel>
-#include <QModelIndex>
-#include <QHeaderView>
-#include <QScrollBar>
-#include <QSettings>
+//#include <QSettings>
 #include <QDesktopServices>
 #include <QCompleter>
-
+#include <QTcpServer>
+#include <QTcpSocket>
+#include <QCloseEvent>
 #include <boost/format.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/filesystem/exception.hpp>
 #include <curl/curl.h>
 
+#ifndef NO_PEX
 #include <libtorrent/extensions/metadata_transfer.hpp>
 #include <libtorrent/extensions/ut_pex.hpp>
+#endif
 
 #include "GUI.h"
 #include "misc.h"
@@ -136,6 +131,7 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent){
   connect(options, SIGNAL(status_changed(const QString&, bool)), this, SLOT(OptionsSaved(const QString&, bool)));
   // Configure BT session according to options
   configureSession(true);
+  force_exit = false;
   // Resume unfinished torrents
   BTSession.resumeUnfinishedTorrents();
   // Add torrent given on command line
@@ -163,7 +159,7 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent){
   connect(downloadList, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayDLListMenu(const QPoint&)));
   connect(actionWebsite, SIGNAL(triggered()), this, SLOT(openqBTHomepage()));
   connect(actionBugReport, SIGNAL(triggered()), this, SLOT(openqBTBugTracker()));
-  connect(this, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayGUIMenu(const QPoint&)));
+  //connect(this, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayGUIMenu(const QPoint&)));
   connect(actionPreview_file, SIGNAL(triggered()), this, SLOT(previewFileSelection()));
   connect(infoBar, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayInfoBarMenu(const QPoint&)));
   // Create tray icon
@@ -408,7 +404,7 @@ void GUI::displayDLListMenu(const QPoint& pos){
 // Necessary if we want to close the window
 // in one time if "close to systray" is enabled
 void GUI::forceExit(){
-  hide();
+  force_exit = true;
   close();
 }
 
@@ -476,8 +472,13 @@ void GUI::updateDlList(bool force){
   LCD_UpSpeed->display(tmp); // UP LCD
   LCD_DownSpeed->display(tmp2); // DL LCD
   // browse handles
+#ifndef NO_PEX
   std::vector<torrent_handle> handles = BTSession.getTorrentHandles();
-  for(unsigned int i=0; i<handles.size(); ++i){
+#endif
+#ifdef NO_PEX
+	QList<torrent_handle> handles = BTSession.getTorrentHandles();
+#endif
+  for(unsigned int i=0; i<(unsigned int)handles.size(); ++i){
     torrent_handle h = handles[i];
     try{
       torrent_status torrentStatus = h.status();
@@ -815,12 +816,15 @@ void GUI::showAbout(){
 void GUI::closeEvent(QCloseEvent *e){
   QSettings settings("qBittorrent", "qBittorrent");
   bool goToSystrayOnExit = settings.value("Options/Misc/Behaviour/GoToSystrayOnExit", false).toBool();
-  if(goToSystrayOnExit && !this->isHidden()){
+  if(!force_exit && goToSystrayOnExit && !this->isHidden()){
     hide();
     e->ignore();
     return;
   }
   if(settings.value("Options/Misc/Behaviour/ConfirmOnExit", true).toBool()){
+    show();
+		if(!isMaximized())
+	    showNormal();
     if(QMessageBox::question(this,
        tr("Are you sure you want to quit?")+" -- "+tr("qBittorrent"),
        tr("Are you sure you want to quit qBittorrent?"),
@@ -1028,7 +1032,7 @@ void GUI::torrentAdded(const QString& path, torrent_handle& h, bool fastResume){
   QString hash = QString(misc::toString(h.info_hash()).c_str());
   // Adding torrent to download list
   DLListModel->insertRow(row);
-  DLListModel->setData(DLListModel->index(row, NAME), QVariant(h.name().c_str()));
+  DLListModel->setData(DLListModel->index(row, NAME), QVariant(h.get_torrent_info().name().c_str()));
   DLListModel->setData(DLListModel->index(row, SIZE), QVariant((qlonglong)h.get_torrent_info().total_size()));
   DLListModel->setData(DLListModel->index(row, DLSPEED), QVariant((double)0.));
   DLListModel->setData(DLListModel->index(row, UPSPEED), QVariant((double)0.));
@@ -1172,12 +1176,14 @@ void GUI::configureSession(bool deleteOptions){
   }else{
     BTSession.disableDHT();
   }
+#ifndef NO_PEX
   if(!options->isPeXDisabled()){
     qDebug("Enabling Peer eXchange (PeX)");
     BTSession.enablePeerExchange();
   }else{
     qDebug("Peer eXchange (PeX) disabled");
   }
+#endif
   // Apply filtering settings
   if(options->isFilteringEnabled()){
     BTSession.enableIPFilter(options->getFilter());
@@ -1248,7 +1254,7 @@ void GUI::pauseSelection(){
         DLListModel->setData(DLListModel->index(row, UPSPEED), QVariant((double)0.0));
         DLListModel->setData(DLListModel->index(row, STATUS), QVariant(tr("Paused")));
         DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)-1));
-        setInfoBar(tr("'%1' paused.", "xxx.avi paused.").arg(QString(BTSession.getTorrentHandle(fileHash).name().c_str())));
+        setInfoBar(tr("'%1' paused.", "xxx.avi paused.").arg(QString(BTSession.getTorrentHandle(fileHash).get_torrent_info().name().c_str())));
         DLListModel->setData(DLListModel->index(row, NAME), QIcon(":/Icons/skin/paused.png"), Qt::DecorationRole);
         DLListModel->setData(DLListModel->index(row, SEEDSLEECH), QVariant("0/0"));
         setRowColor(row, "red");
@@ -1291,7 +1297,7 @@ void GUI::startSelection(){
         // Update DL status
         int row = index.row();
         DLListModel->setData(DLListModel->index(row, STATUS), QVariant(tr("Connecting...")));
-        setInfoBar(tr("'%1' resumed.", "e.g: xxx.avi resumed.").arg(QString(BTSession.getTorrentHandle(fileHash).name().c_str())));
+        setInfoBar(tr("'%1' resumed.", "e.g: xxx.avi resumed.").arg(QString(BTSession.getTorrentHandle(fileHash).get_torrent_info().name().c_str())));
         DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(":/Icons/skin/connecting.png")), Qt::DecorationRole);
         setRowColor(row, "grey");
       }
@@ -1320,7 +1326,7 @@ void GUI::propertiesSelection(){
 // called when a torrent has finished
 void GUI::finishedTorrent(torrent_handle& h){
     QSettings settings("qBittorrent", "qBittorrent");
-    QString fileName = QString(h.name().c_str());
+    QString fileName = QString(h.get_torrent_info().name().c_str());
     setInfoBar(tr("%1 has finished downloading.", "e.g: xxx.avi has finished downloading.").arg(fileName));
     int useOSD = settings.value("Options/OSDEnabled", 1).toInt();
     if(useOSD == 1 || (useOSD == 2 && (isMinimized() || isHidden()))) {
@@ -1333,7 +1339,7 @@ void GUI::fullDiskError(torrent_handle& h){
   QSettings settings("qBittorrent", "qBittorrent");
   int useOSD = settings.value("Options/OSDEnabled", 1).toInt();
   if(useOSD == 1 || (useOSD == 2 && (isMinimized() || isHidden()))) {
-    myTrayIcon->showMessage(tr("I/O Error", "i.e: Input/Output Error"), tr("An error occured when trying to read or write %1. The disk is probably full, download has been paused", "e.g: An error occured when trying to read or write xxx.avi. The disk is probably full, download has been paused").arg(QString(h.name().c_str())), QSystemTrayIcon::Critical, TIME_TRAY_BALLOON);
+    myTrayIcon->showMessage(tr("I/O Error", "i.e: Input/Output Error"), tr("An error occured when trying to read or write %1. The disk is probably full, download has been paused", "e.g: An error occured when trying to read or write xxx.avi. The disk is probably full, download has been paused").arg(QString(h.get_torrent_info().name().c_str())), QSystemTrayIcon::Critical, TIME_TRAY_BALLOON);
   }
   // Download will be paused by libtorrent. Updating GUI information accordingly
   int row = getRowFromHash(QString(misc::toString(h.info_hash()).c_str()));

src/GUI.h

@@ -23,11 +23,8 @@
 #define GUI_H
 
 #include <QMainWindow>
-#include <QHash>
 #include <QProcess>
 #include <QTcpServer>
-#include <QTcpSocket>
-#include <QCloseEvent>
 #include <QSystemTrayIcon>
 
 #include <libtorrent/entry.hpp>
@@ -55,6 +52,8 @@ class DLListDelegate;
 class SearchListDelegate;
 class downloadThread;
 class downloadFromURL;
+class QTcpSocket;
+class QCloseEvent;
 
 using namespace libtorrent;
 namespace fs = boost::filesystem;
@@ -82,6 +81,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     SearchListDelegate *SearchDelegate;
     unsigned int nbTorrents;
     QLabel *connecStatusLblIcon;
+    bool force_exit;
     // Preview
     previewSelect *previewSelection;
     QProcess *previewProcess;

src/Icons/qBittorrent.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Categories=Qt;Application;Network;P2P
-Comment=V0.9.0
+Comment=V0.9.2
 Encoding=UTF-8
 Exec=qbittorrent
 GenericName=Bittorrent client

src/MainWindow.ui

@@ -782,6 +782,9 @@
    <property name="enabled" >
     <bool>true</bool>
    </property>
+   <property name="contextMenuPolicy" >
+    <enum>Qt::NoContextMenu</enum>
+   </property>
    <property name="movable" >
     <bool>false</bool>
    </property>

src/about_imp.h

@@ -45,17 +45,19 @@ class about : public QDialog, private Ui::AboutDlg{
       te_translation->append(QString::fromUtf8(
           "<i>- <u>Bulgarian:</u> Tsvetan & Boiko Bankov (emerge_life@users.sourceforge.net)<br>\
           - <u>Catalan:</u> Gekko Dam Beer (gekko04@users.sourceforge.net)<br>\
-          - <u>Chinese (Simplified):</u> Chen Wuyang (wuyang@gmail.com)<br>\
+          - <u>Chinese (Simplified):</u> Guo Yue (guoyue0418@hotmail.com)<br>\
           - <u>Chinese (Traditional):</u> Jeff Chen (jeff.cn.chen@gmail.com)<br>\
+          - <u>Danish:</u> Mathias Nielsen (comoneo@gmail.com)<br>\
 	  - <u>Dutch:</u> Luke Niesink (luke@lukeniesink.net)<br>\
           - <u>Finnish:</u> Niklas Laxström (nikerabbit@users.sourceforge.net)<br>\
           - <u>German:</u> Niels Hoffmann (zentralmaschine@users.sourceforge.net)<br>\
 	  - <u>Greek:</u> Tsvetan Bankov (emerge_life@users.sourceforge.net)<br>\
           - <u>Italian:</u> Ferraro Luciano (luciano.ferraro@gmail.com)<br>\
+          - <u>Japanese:</u> Nardog (nardog@e2umail.com)<br>\
           - <u>Korean:</u> Jin Woo Sin (jin828sin@users.sourceforge.net)<br>\
           - <u>Norwegian:</u> Lars-Erik Labori (hamil@users.sourceforge.net)<br>\
           - <u>Polish:</u> Adam Babol (a-b@users.sourceforge.net)<br>\
-          - <u>Portuguese:</u> Bruno Nunes (brunopatriarca@users.sourceforge.net)<br>\
+          - <u>Portuguese:</u> Nick Marinho (nickmarinho@gmail.com)<br>\
           - <u>Romanian:</u> Obada Denis (obadadenis@users.sourceforge.net)<br>\
           - <u>Russian:</u> Nick Khazov (m2k3d0n at users.sourceforge.net)<br>\
           - <u>Slovak:</u>  helix84<br>\

src/bittorrent.cpp

@@ -27,6 +27,8 @@
 
 // Main constructor
 bittorrent::bittorrent(){
+  // To avoid some exceptions
+	fs::path::default_name_check(fs::no_check);
   // Supported preview extensions
   // XXX: might be incomplete
   supported_preview_extensions << "AVI" << "DIVX" << "MPG" << "MPEG" << "MP3" << "OGG" << "WMV" << "WMA" << "RMV" << "RMVB" << "ASF" << "MOV" << "WAV" << "MP2" << "SWF" << "AC3";
@@ -36,8 +38,10 @@ bittorrent::bittorrent(){
   s->set_severity_level(alert::info);
   // DHT (Trackerless), disabled until told otherwise
   DHTEnabled = false;
+#ifndef NO_PEX
   // Enabling metadata plugin
   s->add_extension(&create_metadata_plugin);
+#endif
   timerAlerts = new QTimer(this);
   connect(timerAlerts, SIGNAL(timeout()), this, SLOT(readAlerts()));
   timerAlerts->start(3000);
@@ -61,13 +65,23 @@ bittorrent::~bittorrent(){
 
 // Return the torrent handle, given its hash
 torrent_handle bittorrent::getTorrentHandle(const QString& hash) const{
+#ifndef NO_PEX
   return s->find_torrent(misc::fromString<sha1_hash>((hash.toStdString())));
+#endif
+#ifdef NO_PEX
+	return torrent_list.value(hash);
+#endif
 }
 
 // Return true if the torrent corresponding to the
 // hash is paused
 bool bittorrent::isPaused(const QString& hash) const{
+#ifndef NO_PEX
   torrent_handle h = s->find_torrent(misc::fromString<sha1_hash>((hash.toStdString())));
+#endif
+#ifdef NO_PEX
+	torrent_handle h = torrent_list.value(hash);
+#endif
   if(!h.is_valid()){
     qDebug("/!\\ Error: Invalid handle");
     return true;
@@ -78,13 +92,18 @@ bool bittorrent::isPaused(const QString& hash) const{
 // Delete a torrent from the session, given its hash
 // permanent = true means that the torrent will be removed from the hard-drive too
 void bittorrent::deleteTorrent(const QString& hash, bool permanent){
-  torrent_handle h = s->find_torrent(misc::fromString<sha1_hash>((hash.toStdString())));
-  if(!h.is_valid()){
+  #ifndef NO_PEX
+	  torrent_handle h = s->find_torrent(misc::fromString<sha1_hash>((hash.toStdString())));
+	#endif
+	#ifdef NO_PEX
+	  torrent_handle h = torrent_list.value(hash);
+	#endif
+	if(!h.is_valid()){
     qDebug("/!\\ Error: Invalid handle");
     return;
   }
   QString savePath = QString::fromUtf8(h.save_path().string().c_str());
-  QString fileName = QString(h.name().c_str());
+  QString fileName = QString(h.get_torrent_info().name().c_str());
   // Remove it from session
   s->remove_torrent(h);
   // Remove it from torrent backup directory
@@ -112,7 +131,12 @@ void bittorrent::cleanDeleter(deleteThread* deleter){
 
 // Pause a running torrent
 void bittorrent::pauseTorrent(const QString& hash){
+#ifndef NO_PEX
   torrent_handle h = s->find_torrent(misc::fromString<sha1_hash>((hash.toStdString())));
+#endif
+#ifdef NO_PEX
+  torrent_handle h = torrent_list.value(hash);
+#endif
   if(h.is_valid() && !h.is_paused()){
     h.pause();
     // Create .paused file
@@ -124,7 +148,12 @@ void bittorrent::pauseTorrent(const QString& hash){
 
 // Resume a torrent in paused state
 void bittorrent::resumeTorrent(const QString& hash){
+#ifndef NO_PEX
   torrent_handle h = s->find_torrent(misc::fromString<sha1_hash>((hash.toStdString())));
+#endif
+#ifdef NO_PEX
+  torrent_handle h = torrent_list.value(hash);
+#endif
   if(h.is_valid() && h.is_paused()){
     h.resume();
     // Delete .paused file
@@ -162,7 +191,12 @@ void bittorrent::addTorrent(const QString& path, bool fromScanDir, const QString
     // Getting torrent file informations
     torrent_info t(e);
     QString hash = QString(misc::toString(t.info_hash()).c_str());
+#ifndef NO_PEX
     if(s->find_torrent(t.info_hash()).is_valid()){
+#endif
+#ifdef NO_PEX
+		if(torrent_list.value(hash, torrent_handle()).is_valid()){
+#endif
       // Update info Bar
       if(!fromScanDir){
         if(!from_url.isNull()){
@@ -212,6 +246,9 @@ void bittorrent::addTorrent(const QString& path, bool fromScanDir, const QString
       qDebug("/!\\ Error: Invalid handle");
       return;
     }
+#ifdef NO_PEX
+		torrent_list.insert(QString(misc::toString(h.info_hash()).c_str()), h);
+#endif
     // Is this really useful and appropriate ?
     //h.set_max_connections(60);
     h.set_max_uploads(-1);
@@ -320,12 +357,12 @@ bool bittorrent::isDHTEnabled() const{
 // Enable DHT
 void bittorrent::enableDHT(){
   if(!DHTEnabled){
-    boost::filesystem::ifstream dht_state_file((const char*)(misc::qBittorrentPath()+QString("dht_state")).toUtf8(), std::ios_base::binary);
-    dht_state_file.unsetf(std::ios_base::skipws);
-    entry dht_state;
-    try{
-      dht_state = bdecode(std::istream_iterator<char>(dht_state_file), std::istream_iterator<char>());
-    }catch (std::exception&) {}
+	  entry dht_state;
+	  try{
+    	boost::filesystem::ifstream dht_state_file((const char*)(misc::qBittorrentPath()+QString("dht_state")).toUtf8(), std::ios_base::binary);
+			dht_state_file.unsetf(std::ios_base::skipws);
+			dht_state = bdecode(std::istream_iterator<char>(dht_state_file), std::istream_iterator<char>());
+		}catch(std::exception&) {	}
     s->start_dht(dht_state);
     s->add_dht_router(std::make_pair(std::string("router.bittorrent.com"), 6881));
     s->add_dht_router(std::make_pair(std::string("router.utorrent.com"), 6881));
@@ -388,8 +425,13 @@ void bittorrent::saveFastResumeData(){
     torrentBackup.mkpath(torrentBackup.path());
   }
   // Write fast resume data
+#ifndef NO_PEX
   std::vector<torrent_handle> handles = s->get_torrents();
-  for(unsigned int i=0; i<handles.size(); ++i){
+#endif
+#ifdef NO_PEX
+	QList<torrent_handle> handles = torrent_list.values();
+#endif
+  for(unsigned int i=0; i<(unsigned int)handles.size(); ++i){
     torrent_handle &h = handles[i];
     if(!h.is_valid()){
       qDebug("/!\\ Error: Invalid handle");
@@ -402,7 +444,7 @@ void bittorrent::saveFastResumeData(){
       QString fileHash = QString(misc::toString(h.info_hash()).c_str());
       if(QFile::exists(torrentBackup.path()+QDir::separator()+fileHash+".torrent")){
         // Remove old .fastresume data in case it exists
-        QFile::remove(fileHash + ".fastresume");
+        QFile::remove(torrentBackup.path()+QDir::separator()+fileHash + ".fastresume");
         // Write fast resume data
         entry resumeData = h.write_resume_data();
         file = fileHash + ".fastresume";
@@ -419,7 +461,12 @@ void bittorrent::saveFastResumeData(){
 
 bool bittorrent::isFilePreviewPossible(const QString& hash) const{
   // See if there are supported files in the torrent
+#ifndef NO_PEX
   torrent_handle h = s->find_torrent(misc::fromString<sha1_hash>((hash.toStdString())));
+#endif
+#ifdef NO_PEX
+  torrent_handle h = torrent_list.value(hash);
+#endif
   if(!h.is_valid()){
     qDebug("/!\\ Error: Invalid handle");
     return false;
@@ -500,8 +547,13 @@ void bittorrent::setUploadRateLimit(int rate){
 // libtorrent allow to adjust ratio for each torrent
 // This function will apply to same ratio to all torrents
 void bittorrent::setGlobalRatio(float ratio){
+#ifndef NO_PEX
   std::vector<torrent_handle> handles = s->get_torrents();
-  for(unsigned int i=0; i<handles.size(); ++i){
+#endif
+#ifdef NO_PEX
+	QList<torrent_handle> handles = torrent_list.values();
+#endif
+  for(unsigned int i=0; i<(unsigned int)handles.size(); ++i){
     torrent_handle h = handles[i];
     if(!h.is_valid()){
       qDebug("/!\\ Error: Invalid handle");
@@ -513,8 +565,13 @@ void bittorrent::setGlobalRatio(float ratio){
 
 // Pause all torrents in session
 void bittorrent::pauseAllTorrents(){
+#ifndef NO_PEX
   std::vector<torrent_handle> handles = s->get_torrents();
-  for(unsigned int i=0; i<handles.size(); ++i){
+#endif
+#ifdef NO_PEX
+  QList<torrent_handle> handles = torrent_list.values();
+#endif
+  for(unsigned int i=0; i<(unsigned int)handles.size(); ++i){
     torrent_handle h = handles[i];
     if(h.is_valid() && !h.is_paused()){
       h.pause();
@@ -524,8 +581,13 @@ void bittorrent::pauseAllTorrents(){
 
 // Resume all torrents in session
 void bittorrent::resumeAllTorrents(){
+#ifndef NO_PEX
   std::vector<torrent_handle> handles = s->get_torrents();
-  for(unsigned int i=0; i<handles.size(); ++i){
+#endif
+#ifdef NO_PEX
+  QList<torrent_handle> handles = torrent_list.values();
+#endif
+  for(unsigned int i=0; i<(unsigned int)handles.size(); ++i){
     torrent_handle h = handles[i];
     if(h.is_valid() && h.is_paused()){
       h.resume();
@@ -533,10 +595,12 @@ void bittorrent::resumeAllTorrents(){
   }
 }
 
+#ifndef NO_PEX
 // Add uT PeX extension to bittorrent session
 void bittorrent::enablePeerExchange(){
   s->add_extension(&create_ut_pex_plugin);
 }
+#endif
 
 // Set DHT port (>= 1000)
 void bittorrent::setDHTPort(int dht_port){
@@ -598,7 +662,7 @@ void bittorrent::reloadTorrent(const torrent_handle &h, bool compact_mode){
   }
   QDir torrentBackup(misc::qBittorrentPath() + "BT_backup");
   fs::path saveDir = h.save_path();
-  QString fileName = QString(h.name().c_str());
+  QString fileName = QString(h.get_torrent_info().name().c_str());
   QString fileHash = QString(misc::toString(h.info_hash()).c_str());
   qDebug("Reloading torrent: %s", (const char*)fileName.toUtf8());
   torrent_handle new_h;
@@ -731,9 +795,16 @@ float bittorrent::getPayloadUploadRate() const{
 }
 
 // Return a vector with all torrent handles in it
+#ifndef NO_PEX
 std::vector<torrent_handle> bittorrent::getTorrentHandles() const{
   return s->get_torrents();
 }
+#endif
+#ifdef NO_PEX
+QList<torrent_handle> bittorrent::getTorrentHandles() const {
+	return torrent_list.values();
+}
+#endif
 
 // Return a vector with all finished torrent handles in it
 QList<torrent_handle> bittorrent::getFinishedTorrentHandles() const{

src/bittorrent.h

@@ -21,9 +21,6 @@
 #ifndef __BITTORRENT_H__
 #define __BITTORRENT_H__
 
-#include <QHash>
-#include <QString>
-#include <QStringList>
 #include <QTimer>
 
 #include <libtorrent/entry.hpp>
@@ -33,9 +30,15 @@
 #include <libtorrent/session_settings.hpp>
 #include <libtorrent/identify_client.hpp>
 #include <libtorrent/alert_types.hpp>
+#include <libtorrent/ip_filter.hpp>
+
+#ifndef NO_PEX
 #include <libtorrent/extensions/metadata_transfer.hpp>
 #include <libtorrent/extensions/ut_pex.hpp>
-#include <libtorrent/ip_filter.hpp>
+#endif
+#ifdef NO_PEX
+#include <QHash>
+#endif
 
 #include <boost/format.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
@@ -60,6 +63,9 @@ class bittorrent : public QObject{
     downloadThread *downloader;
     QStringList supported_preview_extensions;
     QString defaultSavePath;
+#ifdef NO_PEX
+		QHash<QString, torrent_handle> torrent_list;
+#endif
 
   protected:
     QString getSavePath(const QString& hash);
@@ -69,7 +75,12 @@ class bittorrent : public QObject{
     bittorrent();
     ~bittorrent();
     torrent_handle getTorrentHandle(const QString& hash) const;
+#ifndef NO_PEX
     std::vector<torrent_handle> getTorrentHandles() const;
+#endif
+#ifdef NO_PEX
+		QList<torrent_handle> getTorrentHandles() const;
+#endif
     bool isPaused(const QString& hash) const;
     bool hasFilteredFiles(const QString& fileHash) const;
     bool isFilePreviewPossible(const QString& fileHash) const;
@@ -95,7 +106,9 @@ class bittorrent : public QObject{
     void saveFastResumeData();
     void enableDirectoryScanning(const QString& scan_dir);
     void disableDirectoryScanning();
+#ifndef NO_PEX
     void enablePeerExchange();
+#endif
     void enableIPFilter(ip_filter filter);
     void disableIPFilter();
     void reloadTorrent(const torrent_handle &h, bool compact_mode = true);

src/createtorrent_imp.cpp

@@ -32,7 +32,10 @@
 #include <libtorrent/file.hpp>
 #include <libtorrent/storage.hpp>
 #include <libtorrent/hasher.hpp>
+
+#ifndef NO_PEX
 #include <libtorrent/file_pool.hpp>
+#endif
 
 #include "createtorrent_imp.h"
 
@@ -105,9 +108,13 @@ void createtorrent::on_createButton_clicked(){
 
     add_files(t, full_path.branch_path(), full_path.leaf());
     t.set_piece_size(piece_size);
-
+#ifndef NO_PEX
     file_pool fp;
     storage st(t, full_path.branch_path(), fp);
+#endif
+#ifdef NO_PEX
+		storage st(t, full_path.branch_path());
+#endif
     QStringList trackers = txt_announce->toPlainText().split('\n');
     for(int i=0; i<trackers.size(); ++i){
       t.add_tracker((const char*)trackers.at(i).toUtf8());

src/icons.qrc

@@ -2,13 +2,13 @@
 <qresource>
   <file>Icons/encrypted.png</file>
   <file>Icons/locale.png</file>
+  <file>Icons/newmsg.png</file>
   <file>Icons/style.png</file>
   <file>Icons/wizard.png</file>
   <file>Icons/button_cancel.png</file>
   <file>Icons/button_ok.png</file>
   <file>Icons/smile.png</file>
   <file>Icons/stare.png</file>
-  <file>Icons/newmsg.png</file>
   <file>Icons/qbittorrent22.png</file>
   <file>Icons/proxy.png</file>
   <file>Icons/log.png</file>
@@ -29,19 +29,20 @@
   <file>Icons/flags/south_korea.png</file>
   <file>Icons/flags/slovakia.png</file>
   <file>Icons/flags/spain.png</file>
+  <file>Icons/flags/finland.png</file>
   <file>Icons/flags/poland.png</file>
-  <file>Icons/flags/spain_catalunya.png</file>
   <file>Icons/flags/china_hong_kong.png</file>
+  <file>Icons/flags/spain_catalunya.png</file>
+  <file>Icons/flags/norway.png</file>
   <file>Icons/flags/italy.png</file>
   <file>Icons/flags/china.png</file>
-  <file>Icons/flags/norway.png</file>
+  <file>Icons/flags/denmark.png</file>
   <file>Icons/flags/turkey.png</file>
   <file>Icons/flags/sweden.png</file>
   <file>Icons/flags/romania.png</file>
   <file>Icons/flags/bulgaria.png</file>
   <file>Icons/flags/greece.png</file>
-  <file>Icons/flags/finland.png</file>
-  <file>Icons/skin/delete_perm.png</file>
+  <file>Icons/flags/japan.png</file>
   <file>Icons/skin/properties.png</file>
   <file>Icons/skin/play_all.png</file>
   <file>Icons/skin/remove.png</file>
@@ -51,9 +52,9 @@
   <file>Icons/skin/delete.png</file>
   <file>Icons/skin/connected.png</file>
   <file>Icons/skin/url.png</file>
-  <file>Icons/skin/play.png</file>
   <file>Icons/skin/pause_all.png</file>
   <file>Icons/skin/downloading.png</file>
+  <file>Icons/skin/play.png</file>
   <file>Icons/skin/search.png</file>
   <file>Icons/skin/exit.png</file>
   <file>Icons/skin/pause.png</file>
@@ -61,6 +62,7 @@
   <file>Icons/skin/seeding.png</file>
   <file>Icons/skin/paused.png</file>
   <file>Icons/skin/preview.png</file>
+  <file>Icons/skin/delete_perm.png</file>
   <file>Icons/skin/connecting.png</file>
   <file>Icons/skin/add.png</file>
   <file>Icons/skin/stalled.png</file>

src/lang.qrc

@@ -6,6 +6,7 @@
   <file>lang/qbittorrent_uk.qm</file>
   <file>lang/qbittorrent_ro.qm</file>
   <file>lang/qbittorrent_ru.qm</file>
+  <file>lang/qbittorrent_nb.qm</file>
   <file>lang/qbittorrent_el.qm</file>
   <file>lang/qbittorrent_en.qm</file>
   <file>lang/qbittorrent_fr.qm</file>
@@ -16,11 +17,12 @@
   <file>lang/qbittorrent_pt.qm</file>
   <file>lang/qbittorrent_ca.qm</file>
   <file>lang/qbittorrent_tr.qm</file>
-  <file>lang/qbittorrent_sv.qm</file>
   <file>lang/qbittorrent_bg.qm</file>
   <file>lang/qbittorrent_de.qm</file>
-  <file>lang/qbittorrent_zh_HK.qm</file>
-  <file>lang/qbittorrent_nb.qm</file>
+  <file>lang/qbittorrent_sv.qm</file>
   <file>lang/qbittorrent_fi.qm</file>
+  <file>lang/qbittorrent_zh_HK.qm</file>
+  <file>lang/qbittorrent_da.qm</file>
+  <file>lang/qbittorrent_ja.qm</file>
 </qresource>
 </RCC>