- Tagged both 1.3.4 and 1.4.0beta3 releases

- bump to v1.3.4

Changelog

@@ -1,3 +1,17 @@
+* Sun Jul 12 2009 - Christophe DUMEZ <chris@qbittorrent.org> - v1.3.4
+    - BUGFIX: Fixed IP filter file parsing on 64bits
+    - BUGFIX: Suppressed QLayout: Attempting to add QLayout "" to properties "properties" warning message when opening a properties dialog
+    - BUGFIX: Fixed a little bug in search engine plugins helper file
+    - BUGFIX: Fixed compilation problems with Qt 4.3
+    - BUGFIX: Percentages no longer disapear with default cleanlooks style
+    - BUGFIX: Cleanly fixed popup menus position in lists (no more workarounds)
+    - BUGFIX: Fixed memory leak in search engine
+    - BUGFIX: Torrents with an infinite ratio are no longer affected by ratio_limit set in program preferences
+    - BUGFIX: Display a ratio of 0.0 if total_upload and total_download are both 0
+    - BUGFIX: Remove last separator in top tool bar
+    - BUGFIX: Tuned lists properties to make sure display is correct
+    - COSMETIC: Display date as well as time in log window
+
 * Sun Apr 5 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.3.3
     - BUGFIX: Fixed Web UI torrent upload form
     - BUGFIX: Fixed unicode support in search engine

src/FinishedListDelegate.h

@@ -48,6 +48,8 @@
 #define F_RATIO 4
 #define F_HASH 5
 
+#define MAX_RATIO 100.
+
 class FinishedListDelegate: public QItemDelegate {
   Q_OBJECT
 
@@ -72,7 +74,7 @@ class FinishedListDelegate: public QItemDelegate {
         case F_RATIO:{
           QItemDelegate::drawBackground(painter, opt, index);
           double ratio = index.data().toDouble();
-          if(ratio > 100.)
+          if(ratio > MAX_RATIO)
             QItemDelegate::drawDisplay(painter, opt, opt.rect, QString::fromUtf8("∞"));
           else
             QItemDelegate::drawDisplay(painter, opt, opt.rect, QString(QByteArray::number(ratio, 'f', 1)));

src/FinishedTorrents.cpp

@@ -53,6 +53,8 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
   finishedListModel->setHeaderData(F_LEECH, Qt::Horizontal, tr("Leechers", "i.e: full/partial sources"));
   finishedListModel->setHeaderData(F_RATIO, Qt::Horizontal, tr("Ratio"));
   finishedList->setModel(finishedListModel);
+  finishedList->setRootIsDecorated(false);
+  finishedList->setAllColumnsShowFocus(true);
   loadHiddenColumns();
   // Hide hash column
   finishedList->hideColumn(F_HASH);
@@ -355,7 +357,7 @@ void FinishedTorrents::forceRecheck(){
   }
 }
 
-void FinishedTorrents::displayFinishedListMenu(const QPoint& pos){
+void FinishedTorrents::displayFinishedListMenu(const QPoint&){
   QMenu myFinishedListMenu(this);
   // Enable/disable pause/start action given the DL state
   QModelIndexList selectedIndexes = finishedList->selectionModel()->selectedIndexes();
@@ -399,8 +401,7 @@ void FinishedTorrents::displayFinishedListMenu(const QPoint& pos){
   myFinishedListMenu.addAction(actionBuy_it);
 
   // Call menu
-  // XXX: why mapToGlobal() is not enough?
-  myFinishedListMenu.exec(mapToGlobal(pos)+QPoint(10,58));
+  myFinishedListMenu.exec(QCursor::pos());
 }
 
 

src/Icons/qBittorrent.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Categories=Qt;Network;P2P
-Comment=V1.3.3
+Comment=V1.3.4
 Exec=qbittorrent %f
 GenericName=Bittorrent client
 GenericName[bg]=Торент клиент

src/MainWindow.ui

@@ -121,7 +121,6 @@
    <addaction name="actionIncreasePriority" />
    <addaction name="separator" />
    <addaction name="actionExit" />
-   <addaction name="separator" />
   </widget>
   <widget class="QStatusBar" name="statusBar" />
   <action name="actionOpen" >

src/bittorrent.cpp

@@ -29,7 +29,7 @@
  */
 
 #include <QDir>
-#include <QTime>
+#include <QDateTime>
 #include <QString>
 #include <QTimer>
 #include <QFileSystemWatcher>
@@ -52,9 +52,10 @@
 #include <boost/filesystem/exception.hpp>
 
 #define MAX_TRACKER_ERRORS 2
+#define MAX_RATIO 100.
 
 // Main constructor
-bittorrent::bittorrent() : DHTEnabled(false), preAllocateAll(false), addInPause(false), maxConnecsPerTorrent(500), maxUploadsPerTorrent(4), max_ratio(-1), UPnPEnabled(false), NATPMPEnabled(false), LSDEnabled(false), queueingEnabled(false) {
+bittorrent::bittorrent() : DHTEnabled(false), preAllocateAll(false), addInPause(false), maxConnecsPerTorrent(500), maxUploadsPerTorrent(4), ratio_limit(-1), UPnPEnabled(false), NATPMPEnabled(false), LSDEnabled(false), queueingEnabled(false) {
   // To avoid some exceptions
   fs::path::default_name_check(fs::no_check);
   // Creating bittorrent session
@@ -124,7 +125,7 @@ void bittorrent::preAllocateAllFiles(bool b) {
 }
 
 void bittorrent::deleteBigRatios() {
-  if(max_ratio == -1) return;
+  if(ratio_limit == -1) return;
     std::vector<torrent_handle> torrents = getTorrents();
     std::vector<torrent_handle>::iterator torrentIT;
     for(torrentIT = torrents.begin(); torrentIT != torrents.end(); torrentIT++) {
@@ -132,7 +133,8 @@ void bittorrent::deleteBigRatios() {
         if(!h.is_valid()) continue;
         if(h.is_seed()) {
             QString hash = h.hash();
-            if(getRealRatio(hash) > max_ratio) {
+            float ratio = getRealRatio(hash);
+            if(ratio <= MAX_RATIO && ratio > ratio_limit) {
               QString fileName = h.name();
               addConsoleMessage(tr("%1 reached the maximum ratio you set.").arg(fileName));
               deleteTorrent(hash);
@@ -769,7 +771,9 @@ float bittorrent::getRealRatio(QString hash) const{
   Q_ASSERT(h.all_time_download() >= 0);
   Q_ASSERT(h.all_time_upload() >= 0);
   if(h.all_time_download() == 0) {
-      return 101;
+    if(h.all_time_upload() == 0)
+      return 0;
+    return 101;
   }
   float ratio = (float)h.all_time_upload()/(float)h.all_time_download();
   Q_ASSERT(ratio >= 0.);
@@ -848,7 +852,7 @@ void bittorrent::addConsoleMessage(QString msg, QColor color) {
   if(consoleMessages.size() > 100) {
     consoleMessages.removeFirst(); 
   }
-  consoleMessages.append(QString::fromUtf8("<font color='grey'>")+ QTime::currentTime().toString(QString::fromUtf8("hh:mm:ss")) + QString::fromUtf8("</font> - <font color='") + color.name() +QString::fromUtf8("'><i>") + msg + QString::fromUtf8("</i></font>"));
+  consoleMessages.append(QString::fromUtf8("<font color='grey'>")+ QDateTime::currentDateTime().toString(QString::fromUtf8("dd/MM/yyyy hh:mm:ss")) + QString::fromUtf8("</font> - <font color='") + color.name() +QString::fromUtf8("'><i>") + msg + QString::fromUtf8("</i></font>"));
 }
 
 void bittorrent::addPeerBanMessage(QString ip, bool from_ipfilter) {
@@ -856,9 +860,9 @@ void bittorrent::addPeerBanMessage(QString ip, bool from_ipfilter) {
     peerBanMessages.removeFirst(); 
   }
   if(from_ipfilter)
-    peerBanMessages.append(QString::fromUtf8("<font color='grey'>")+ QTime::currentTime().toString(QString::fromUtf8("hh:mm:ss")) + QString::fromUtf8("</font> - ")+tr("<font color='red'>%1</font> <i>was blocked due to your IP filter</i>", "x.y.z.w was blocked").arg(ip));
+    peerBanMessages.append(QString::fromUtf8("<font color='grey'>")+ QDateTime::currentDateTime().toString(QString::fromUtf8("dd/MM/yyyy hh:mm:ss")) + QString::fromUtf8("</font> - ")+tr("<font color='red'>%1</font> <i>was blocked due to your IP filter</i>", "x.y.z.w was blocked").arg(ip));
   else
-    peerBanMessages.append(QString::fromUtf8("<font color='grey'>")+ QTime::currentTime().toString(QString::fromUtf8("hh:mm:ss")) + QString::fromUtf8("</font> - ")+tr("<font color='red'>%1</font> <i>was banned due to corrupt pieces</i>", "x.y.z.w was banned").arg(ip));
+    peerBanMessages.append(QString::fromUtf8("<font color='grey'>")+ QDateTime::currentDateTime().toString(QString::fromUtf8("dd/MM/yyyy hh:mm:ss")) + QString::fromUtf8("</font> - ")+tr("<font color='red'>%1</font> <i>was banned due to corrupt pieces</i>", "x.y.z.w was banned").arg(ip));
 }
 
 bool bittorrent::isFilePreviewPossible(QString hash) const{
@@ -981,19 +985,19 @@ void bittorrent::setGlobalRatio(float ratio) {
 // be automatically deleted
 void bittorrent::setDeleteRatio(float ratio) {
   if(ratio != -1 && ratio < 1.) ratio = 1.;
-  if(max_ratio == -1 && ratio != -1) {
+  if(ratio_limit == -1 && ratio != -1) {
     Q_ASSERT(!BigRatioTimer);
     BigRatioTimer = new QTimer(this);
     connect(BigRatioTimer, SIGNAL(timeout()), this, SLOT(deleteBigRatios()));
     BigRatioTimer->start(5000);
   } else {
-    if(max_ratio != -1 && ratio == -1) {
+    if(ratio_limit != -1 && ratio == -1) {
       delete BigRatioTimer;
     }
   }
-  if(max_ratio != ratio) {
-    max_ratio = ratio;
-    qDebug("* Set deleteRatio to %.1f", max_ratio);
+  if(ratio_limit != ratio) {
+    ratio_limit = ratio;
+    qDebug("* Set deleteRatio to %.1f", ratio_limit);
     deleteBigRatios();
   }
 }

src/bittorrent.h

@@ -67,7 +67,7 @@ class bittorrent : public QObject {
     bool addInPause;
     int maxConnecsPerTorrent;
     int maxUploadsPerTorrent;
-    float max_ratio;
+    float ratio_limit;
     bool UPnPEnabled;
     bool NATPMPEnabled;
     bool LSDEnabled;

src/downloadingTorrents.cpp

@@ -68,6 +68,8 @@ DownloadingTorrents::DownloadingTorrents(QObject *parent, bittorrent *BTSession)
   DLListModel->setHeaderData(ETA, Qt::Horizontal, tr("ETA", "i.e: Estimated Time of Arrival / Time left"));
   DLListModel->setHeaderData(PRIORITY, Qt::Horizontal, tr("Priority"));
   downloadList->setModel(DLListModel);
+  downloadList->setRootIsDecorated(false);
+  downloadList->setAllColumnsShowFocus(true);
   DLDelegate = new DLListDelegate(downloadList);
   downloadList->setItemDelegate(DLDelegate);
   // Hide priority column
@@ -236,7 +238,7 @@ void DownloadingTorrents::forceRecheck() {
     }
 }
 
-void DownloadingTorrents::displayDLListMenu(const QPoint& pos) {
+void DownloadingTorrents::displayDLListMenu(const QPoint&) {
   QMenu myDLLlistMenu(this);
   // Enable/disable pause/start action given the DL state
   QModelIndexList selectedIndexes = downloadList->selectionModel()->selectedIndexes();
@@ -285,8 +287,7 @@ void DownloadingTorrents::displayDLListMenu(const QPoint& pos) {
   myDLLlistMenu.addSeparator();
   myDLLlistMenu.addAction(actionBuy_it);
   // Call menu
-  // XXX: why mapToGlobal() is not enough?
-  myDLLlistMenu.exec(mapToGlobal(pos)+QPoint(10,35));
+  myDLLlistMenu.exec(QCursor::pos());
 }
 
 
@@ -578,6 +579,7 @@ void DownloadingTorrents::addTorrent(QString hash) {
   DLListModel->setData(DLListModel->index(row, UPSPEED), QVariant((double)0.));
   DLListModel->setData(DLListModel->index(row, SEEDSLEECH), QVariant(QString::fromUtf8("0/0")));
   DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)h.progress()));
+  DLListModel->setData(DLListModel->index(row, RATIO), QVariant((double)0.));
   DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)-1));
   if(BTSession->isQueueingEnabled())
     DLListModel->setData(DLListModel->index(row, PRIORITY), QVariant((int)BTSession->getDlTorrentPriority(hash)));

src/filterParserThread.h

@@ -191,9 +191,9 @@ class FilterParserThread : public QThread  {
               if(IPv4) {
                 //IPv4 addresses
                 IP = strStartIP.split('.');
-                address_v4 start((IP.at(0).toInt() << 24) + (IP.at(1).toInt() << 16) + (IP.at(2).toInt() << 8) + IP.at(3).toInt());
+                address_v4 start((IP.at(0).toUInt() << 24) + (IP.at(1).toUInt() << 16) + (IP.at(2).toUInt() << 8) + IP.at(3).toUInt());
                 IP = strEndIP.split('.');
-                address_v4 last((IP.at(0).toInt() << 24) + (IP.at(1).toInt() << 16) + (IP.at(2).toInt() << 8) + IP.at(3).toInt());
+                address_v4 last((IP.at(0).toUInt() << 24) + (IP.at(1).toUInt() << 16) + (IP.at(2).toUInt() << 8) + IP.at(3).toUInt());
                 // Apply to bittorrent session
                 filter.add_rule(start, last, ip_filter::blocked);
               } else {
@@ -250,9 +250,9 @@ class FilterParserThread : public QThread  {
           if(strStartIP.contains(is_ipv4) && strEndIP.contains(is_ipv4)) {
             // IPv4
             IP = strStartIP.split('.');
-            address_v4 start((IP.at(0).toInt() << 24) + (IP.at(1).toInt() << 16) + (IP.at(2).toInt() << 8) + IP.at(3).toInt());
+            address_v4 start((IP.at(0).toUInt() << 24) + (IP.at(1).toUInt() << 16) + (IP.at(2).toUInt() << 8) + IP.at(3).toUInt());
             IP = strEndIP.split('.');
-            address_v4 last((IP.at(0).toInt() << 24) + (IP.at(1).toInt() << 16) + (IP.at(2).toInt() << 8) + IP.at(3).toInt());
+            address_v4 last((IP.at(0).toUInt() << 24) + (IP.at(1).toUInt() << 16) + (IP.at(2).toUInt() << 8) + IP.at(3).toUInt());
             // Apply to bittorrent session
             filter.add_rule(start, last, ip_filter::blocked);
           } else {

src/main.cpp

@@ -103,8 +103,12 @@ void useStyle(QApplication *app, int style){
     app->setStyle(new QWindowsXPStyle());
     break;
 #endif
-   /*default:
-    app->setStyle(new QPlastiqueStyle());*/
+   default:
+    if(app->style()->objectName() == "cleanlooks") {
+      // Force our own cleanlooks style
+      qDebug("Forcing our own cleanlooks style");
+      app->setStyle(new QGnomeLookStyle());
+    }
   }
 }
 

src/properties_imp.cpp

@@ -136,9 +136,8 @@ properties::properties(QWidget *parent, bittorrent *BTSession, QTorrentHandle &h
   updateInfosTimer->start(3000);
   progressBar = new RealProgressBar(this);
   progressBar->setForegroundColor(Qt::blue);
-  QVBoxLayout *vbox = new QVBoxLayout(this);
-  vbox->addWidget(progressBar);
-  RealProgressBox->setLayout(vbox);
+  progressBarVbox = new QVBoxLayout(RealProgressBox);
+  progressBarVbox->addWidget(progressBar);
   progressBarUpdater = new RealProgressBarThread(progressBar, h);
   progressBarUpdater->start();
 //  progressBarUpdater->refresh();
@@ -153,6 +152,7 @@ properties::~properties(){
   delete PropListModel;
   delete progressBarUpdater;
   delete progressBar;
+  delete progressBarVbox;
 }
 
 void properties::addFilesToTree(const torrent_file *root, QStandardItem *parent) {
@@ -362,7 +362,7 @@ void properties::getPriorities(QStandardItem *parent, int *priorities) {
   }
 }
 
-void properties::displayFilesListMenu(const QPoint& pos){
+void properties::displayFilesListMenu(const QPoint&){
   if(h.get_torrent_info().num_files() == 1) return;
   QMenu myFilesLlistMenu(this);
   QModelIndex index;
@@ -374,8 +374,7 @@ void properties::displayFilesListMenu(const QPoint& pos){
   myFilesLlistMenu.addAction(actionHigh);
   myFilesLlistMenu.addAction(actionMaximum);
   // Call menu
-  // XXX: why mapToGlobal() is not enough?
-  myFilesLlistMenu.exec(mapToGlobal(pos)+QPoint(22,95));
+  myFilesLlistMenu.exec(QCursor::pos());
 }
 
 void properties::ignoreSelection(){

src/properties_imp.h

@@ -59,6 +59,7 @@ class properties : public QDialog, private Ui::properties{
     QStringList urlSeeds;
     RealProgressBar *progressBar;
     RealProgressBarThread *progressBarUpdater;
+    QVBoxLayout *progressBarVbox;
 
   protected slots:
     void on_okButton_clicked();

src/searchEngine.cpp

@@ -177,6 +177,7 @@ void SearchEngine::on_search_button_clicked(){
     // verify the max size of the history
     if(searchHistory.size() > SEARCHHISTORY_MAXSIZE)
       searchHistory = searchHistory.mid(searchHistory.size()/2,searchHistory.size()/2);
+    delete searchCompleter;
     searchCompleter = new QCompleter(searchHistory, this);
     searchCompleter->setCaseSensitivity(Qt::CaseInsensitive);
     search_pattern->setCompleter(searchCompleter);
@@ -269,7 +270,7 @@ void SearchEngine::downloadFinished(int exitcode, QProcess::ExitStatus) {
 				}
 		}
 		qDebug("Deleting downloadProcess");
-		downloaders.removeOne(downloadProcess);
+		downloaders.removeAll(downloadProcess);
 		delete downloadProcess;
 }
 

src/search_engine/helpers.py

@@ -1,5 +1,3 @@
-#VERSION: 1.0
-
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
 #
@@ -24,6 +22,11 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+#VERSION: 1.02
+
+# Author:
+#  Christophe DUMEZ (chris@qbittorrent.org)
+
 import re, htmlentitydefs
 import urllib2
 import tempfile
@@ -66,7 +69,7 @@ def download_file(url):
 		file = os.fdopen(file, "wb")
 		# Download url
 		req = urllib2.Request(url)
-		response = urllib2.urlopen(url)
+		response = urllib2.urlopen(req)
 		dat = response.read()
 		# Write it to a file
 		file.write(dat)

src/src.pro

@@ -14,10 +14,10 @@ CONFIG += qt \
     network
 
 # Update this VERSION for each release
-DEFINES += VERSION=\\\"v1.3.3\\\"
+DEFINES += VERSION=\\\"v1.3.4\\\"
 DEFINES += VERSION_MAJOR=1
 DEFINES += VERSION_MINOR=3
-DEFINES += VERSION_BUGFIX=3
+DEFINES += VERSION_BUGFIX=4
 !mac:QMAKE_LFLAGS += -Wl,--as-needed
 contains(DEBUG_MODE, 1) { 
     CONFIG += debug

src/torrentAddition.h

@@ -290,7 +290,7 @@ class torrentAdditionDialog : public QDialog, private Ui_addTorrentDialog{
       return true;
     }
 
-    void displayFilesListMenu(const QPoint& pos){
+    void displayFilesListMenu(const QPoint&){
       if(nbFiles == 1) return;
       QMenu myFilesLlistMenu(this);
       QModelIndex index;
@@ -302,8 +302,7 @@ class torrentAdditionDialog : public QDialog, private Ui_addTorrentDialog{
       myFilesLlistMenu.addAction(actionHigh);
       myFilesLlistMenu.addAction(actionMaximum);
       // Call menu
-      // XXX: why mapToGlobal() is not enough?
-      myFilesLlistMenu.exec(mapToGlobal(pos)+QPoint(10,145));
+      myFilesLlistMenu.exec(QCursor::pos());
     }
 
     void ignoreSelection(){