Tagged v1.4.1 and v1.5.0beta1 releases

Changelog

@@ -1,28 +1,13 @@
 * Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.5.0
     - FEATURE: Added Magnet URI support
-    - FEATURE: Search engine supports category-based requests
     - FEATURE: Make use of torrent enclosure in RSS feeds for direct download
     - FEATURE: Implemented a RSS feed downloader with filter support
     - FEATURE: Save old RSS item to hard disk to remember them on start up
     - FEATURE: Display free disk space in torrent addition dialog
     - FEATURE: In torrent addition from URL, paste clipboard content if it contains an URL
-    - FEATURE: RSS feeds URLs can now be copied to clipboard
-    - FEATURE: RSS feeds can now be grouped into folders
-    - FEATURE: Added "Unread" item to RSS feed list to display all unread news
+    - FEATURE: RSS Feeds URLs can now be copied to clipboard
     - FEATURE: If a torrent contains a torrent file, process downloaded torrent file too
-    - FEATURE: A random listening port can be chosen automatically
     - BUGFIX: torrent resume code rewrited
-    - BUGFIX: Greatly improved column sorting code
-    - BUGFIX: Possibility to create trackerless torrents
-    - COSMETIC: Redesigned search tab to improve usability
-    - COSMETIC: Redesigned RSS tab to improve usability
-
-* Sun Aug 21 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.4.1
-    - BUGFIX: Fix problems when changing save path (if using temporary download folder)
-    - BUGFIX: Display real save path instead of the temporary one in torrent properties
-    - BUGFIX: Catching invalid_handle exception to avoid rare crashes
-    - BUGFIX: Fixed popup menu position in RSS feeds list
-    - BUGFIX: Don't save RSS feed state if it could not be updated
 
 * Thu Aug 13 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.4.0
     - FEATURE: Display swarm information in lists

src/FeedDownloader.h

@@ -83,7 +83,7 @@ public:
   }
 
   QString getMatchingTokens_str() const {
-    return this->value("matches", "").toString();
+    return this->value("matches", "*").toString();
   }
 
   void setMatchingTokens(QString tokens) {
@@ -353,7 +353,7 @@ protected slots:
         if(!filters.hasFilter(new_name)) {
           validated = true;
         } else {
-          QMessageBox::warning(0, tr("Invalid filter name"), tr("This filter name is already in use."));
+          QMessageBox::critical(0, tr("Invalid filter name"), tr("This filter name is already in use."));
         }
       }while(!validated);
       // Rename the filter
@@ -392,7 +392,7 @@ protected slots:
       new_name = new_name.trimmed();
       if(new_name.isEmpty()) {
         // Cannot be left empty
-        QMessageBox::warning(0, tr("Invalid filter name"), tr("The filter name cannot be left empty."));
+        QMessageBox::critical(0, tr("Invalid filter name"), tr("The filter name cannot be left empty."));
       } else {
         validated = true;
       }
@@ -408,7 +408,7 @@ protected slots:
       if(filter_name.isNull()) return;
       if(filters.hasFilter(filter_name)) {
         // Filter alread exists
-        QMessageBox::warning(0, tr("Invalid filter name"), tr("This filter name is already in use."));
+        QMessageBox::critical(0, tr("Invalid filter name"), tr("This filter name is already in use."));
       } else {
         validated = true;
       }
@@ -430,7 +430,7 @@ protected slots:
     if(selected_filter.isEmpty()) return;
     QString s = test_line->text().trimmed();
     if(s.isEmpty()) {
-      QMessageBox::warning(0, tr("Filter testing error"), tr("Please specify a test torrent name."));
+      QMessageBox::critical(0, tr("Filter testing error"), tr("Please specify a test torrent name."));
       return;
     }
     // Get current filter
@@ -455,7 +455,7 @@ protected slots:
         filtersList->setCurrentItem(filtersList->item(0));
       QMessageBox::information(0, tr("Import successful"), tr("Filters import was successful."));
     } else {
-      QMessageBox::warning(0, tr("Import failure"), tr("Filters could not be imported due to an I/O error."));
+      QMessageBox::critical(0, tr("Import failure"), tr("Filters could not be imported due to an I/O error."));
     }
   }
 
@@ -466,13 +466,13 @@ protected slots:
     if(!destination.endsWith(".filters"))
       destination += ".filters";
     if(QFile::exists(destination)) {
-      int ret = QMessageBox::question(0, tr("Overwriting confirmation"), tr("Are you sure you want to overwrite existing file?"), QMessageBox::Yes|QMessageBox::No);
+      int ret = QMessageBox::question(0, tr("Overwriting confirmation"), tr("Are you sure you want to overwrite existing file?"));
       if(ret != QMessageBox::Yes) return;
     }
     if(filters.serialize(destination))
       QMessageBox::information(0, tr("Export successful"), tr("Filters export was successful."));
     else
-      QMessageBox::warning(0, tr("Export failure"), tr("Filters could not be exported due to an I/O error."));
+      QMessageBox::critical(0, tr("Export failure"), tr("Filters could not be exported due to an I/O error."));
   }
 
 };

src/FinishedTorrents.cpp

@@ -38,7 +38,6 @@
 #include <QFile>
 #include <QSettings>
 #include <QStandardItemModel>
-#include <QSortFilterProxyModel>
 #include <QHeaderView>
 #include <QMenu>
 #include <QMessageBox>
@@ -55,16 +54,9 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
   finishedListModel->setHeaderData(F_PEERS, Qt::Horizontal, tr("Connected peers"));
   finishedListModel->setHeaderData(F_UPLOAD, Qt::Horizontal, tr("Total uploaded", "i.e: Total amount of uploaded data"));
   finishedListModel->setHeaderData(F_RATIO, Qt::Horizontal, tr("Ratio"));
-
-  proxyModel = new QSortFilterProxyModel();
-  proxyModel->setDynamicSortFilter(true);
-  proxyModel->setSourceModel(finishedListModel);
-  finishedList->setModel(proxyModel);
-
+  finishedList->setModel(finishedListModel);
   finishedList->setRootIsDecorated(false);
   finishedList->setAllColumnsShowFocus(true);
-  finishedList->setSortingEnabled(true);
-
   loadHiddenColumns();
   // Hide hash column
   finishedList->hideColumn(F_HASH);
@@ -77,6 +69,7 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
   // Make download list header clickable for sorting
   finishedList->header()->setClickable(true);
   finishedList->header()->setSortIndicatorShown(true);
+  connect(finishedList->header(), SIGNAL(sectionPressed(int)), this, SLOT(toggleFinishedListSortOrder(int)));
   finishedListDelegate = new FinishedListDelegate(finishedList);
   finishedList->setItemDelegate(finishedListDelegate);
   connect(finishedList, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayFinishedListMenu(const QPoint&)));
@@ -111,11 +104,9 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
 }
 
 FinishedTorrents::~FinishedTorrents(){
-  saveLastSortedColumn();
   saveColWidthFinishedList();
   saveHiddenColumns();
   delete finishedListDelegate;
-  delete proxyModel;
   delete finishedListModel;
 }
 
@@ -150,8 +141,8 @@ void FinishedTorrents::addTorrent(QString hash){
   // Update the number of finished torrents
   ++nbFinished;
   emit finishedTorrentsNumberChanged(nbFinished);
-
-  loadLastSortedColumn();
+  // Sort List
+  sortFinishedList();
 }
 
 // Set the color of a row in data model
@@ -168,7 +159,7 @@ QStringList FinishedTorrents::getSelectedTorrents(bool only_one) const{
   foreach(const QModelIndex &index, selectedIndexes) {
     if(index.column() == F_NAME) {
       // Get the file hash
-      QString hash = getHashFromRow(index.row());
+      QString hash = finishedListModel->data(finishedListModel->index(index.row(), F_HASH)).toString();
       res << hash;
       if(only_one) break;
     }
@@ -217,18 +208,6 @@ bool FinishedTorrents::loadColWidthFinishedList(){
   return true;
 }
 
-void FinishedTorrents::saveLastSortedColumn() {
-  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
-  Qt::SortOrder sortOrder = finishedList->header()->sortIndicatorOrder();
-  QString sortOrderLetter;
-  if(sortOrder == Qt::AscendingOrder)
-    sortOrderLetter = QString::fromUtf8("a");
-  else
-    sortOrderLetter = QString::fromUtf8("d");
-  int index = finishedList->header()->sortIndicatorSection();
-  settings.setValue(QString::fromUtf8("FinishedListSortedCol"), misc::toQString(index)+sortOrderLetter);
-}
-
 void FinishedTorrents::loadLastSortedColumn() {
   // Loading last sorted column
   QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
@@ -241,7 +220,7 @@ void FinishedTorrents::loadLastSortedColumn() {
       sortOrder = Qt::AscendingOrder;
     sortedCol = sortedCol.left(sortedCol.size()-1);
     int index = sortedCol.toInt();
-    finishedList->sortByColumn(index, sortOrder);
+    sortFinishedList(index, sortOrder);
   }
 }
 
@@ -286,7 +265,7 @@ void FinishedTorrents::on_actionSet_upload_limit_triggered(){
   foreach(const QModelIndex &index, selectedIndexes){
     if(index.column() == F_NAME){
       // Get the file hash
-      hashes << getHashFromRow(index.row());
+      hashes << finishedListModel->data(finishedListModel->index(index.row(), F_HASH)).toString();
     }
   }
   new BandwidthAllocationDialog(this, true, BTSession, hashes);
@@ -372,8 +351,8 @@ void FinishedTorrents::pauseTorrent(QString hash) {
 }
 
 QString FinishedTorrents::getHashFromRow(unsigned int row) const {
-  Q_ASSERT(row < (unsigned int)proxyModel->rowCount());
-  return proxyModel->data(proxyModel->index(row, F_HASH)).toString();
+  Q_ASSERT(row < (unsigned int)finishedListModel->rowCount());
+  return finishedListModel->data(finishedListModel->index(row, F_HASH)).toString();
 }
 
 // Will move it to download tab
@@ -390,7 +369,7 @@ void FinishedTorrents::deleteTorrent(QString hash){
 
 // Show torrent properties dialog
 void FinishedTorrents::showProperties(const QModelIndex &index){
-  showPropertiesFromHash(getHashFromRow(index.row()));
+  showPropertiesFromHash(finishedListModel->data(finishedListModel->index(index.row(), F_HASH)).toString());
 }
 
 void FinishedTorrents::showPropertiesFromHash(QString hash){
@@ -421,7 +400,7 @@ void FinishedTorrents::forceRecheck(){
   QModelIndexList selectedIndexes = finishedList->selectionModel()->selectedIndexes();
   foreach(const QModelIndex &index, selectedIndexes){
       if(index.column() == F_NAME){
-          QString hash = getHashFromRow(index.row());
+          QString hash = finishedListModel->data(finishedListModel->index(index.row(), F_HASH)).toString();
           QTorrentHandle h = BTSession->getTorrentHandle(hash);
           qDebug("Forcing recheck for torrent %s", hash.toLocal8Bit().data());
           h.force_recheck();
@@ -437,7 +416,7 @@ void FinishedTorrents::displayFinishedListMenu(const QPoint&){
   foreach(const QModelIndex &index, selectedIndexes) {
     if(index.column() == F_NAME) {
       // Get the file name
-      QString hash = getHashFromRow(index.row());
+      QString hash = finishedListModel->data(finishedListModel->index(index.row(), F_HASH)).toString();
       // Get handle and pause the torrent
       QTorrentHandle h = BTSession->getTorrentHandle(hash);
       if(!h.is_valid()) continue;
@@ -483,7 +462,7 @@ void FinishedTorrents::displayFinishedListMenu(const QPoint&){
  */
 
 // hide/show columns menu
-void FinishedTorrents::displayFinishedHoSMenu(const QPoint&){
+void FinishedTorrents::displayFinishedHoSMenu(const QPoint& pos){
   QMenu hideshowColumn(this);
   hideshowColumn.setTitle(tr("Hide or Show Column"));
   int lastCol = F_RATIO;
@@ -491,7 +470,7 @@ void FinishedTorrents::displayFinishedHoSMenu(const QPoint&){
     hideshowColumn.addAction(getActionHoSCol(i));
   }
   // Call menu
-  hideshowColumn.exec(QCursor::pos());
+  hideshowColumn.exec(mapToGlobal(pos)+QPoint(10,34));
 }
 
 // toggle hide/show a column
@@ -624,3 +603,97 @@ QAction* FinishedTorrents::getActionHoSCol(int index) {
       return NULL;
   }
 }
+
+
+/*
+ * Sorting functions
+ */
+
+void FinishedTorrents::toggleFinishedListSortOrder(int index) {
+  Qt::SortOrder sortOrder = Qt::AscendingOrder;
+  if(finishedList->header()->sortIndicatorSection() == index){
+    sortOrder = (Qt::SortOrder)!(bool)finishedList->header()->sortIndicatorOrder();
+  }
+  switch(index) {
+    case F_SIZE:
+    case F_UPSPEED:
+    case F_RATIO:
+    case F_UPLOAD:
+      sortFinishedListFloat(index, sortOrder);
+      break;
+    default:
+      sortFinishedListString(index, sortOrder);
+  }
+  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+  QString sortOrderLetter;
+  if(sortOrder == Qt::AscendingOrder)
+    sortOrderLetter = QString::fromUtf8("a");
+  else
+    sortOrderLetter = QString::fromUtf8("d");
+  settings.setValue(QString::fromUtf8("FinishedListSortedCol"), misc::toQString(index)+sortOrderLetter);
+}
+
+void FinishedTorrents::sortFinishedList(int index, Qt::SortOrder sortOrder){
+  if(index == -1) {
+    index = finishedList->header()->sortIndicatorSection();
+    sortOrder = finishedList->header()->sortIndicatorOrder();
+  } else {
+    finishedList->header()->setSortIndicator(index, sortOrder);
+  }
+  switch(index) {
+    case F_SIZE:
+    case F_UPSPEED:
+    case F_UPLOAD:
+    case F_RATIO:
+      sortFinishedListFloat(index, sortOrder);
+      break;
+    default:
+      sortFinishedListString(index, sortOrder);
+  }
+}
+
+void FinishedTorrents::sortFinishedListFloat(int index, Qt::SortOrder sortOrder){
+  QList<QPair<int, double> > lines;
+  // insertion sorting
+  unsigned int nbRows = finishedListModel->rowCount();
+  for(unsigned int i=0; i<nbRows; ++i){
+    misc::insertSort(lines, QPair<int,double>(i, finishedListModel->data(finishedListModel->index(i, index)).toDouble()), sortOrder);
+  }
+  // Insert items in new model, in correct order
+  unsigned int nbRows_old = lines.size();
+  for(unsigned int row=0; row<nbRows_old; ++row){
+    finishedListModel->insertRow(finishedListModel->rowCount());
+    unsigned int sourceRow = lines[row].first;
+    unsigned int nbColumns = finishedListModel->columnCount();
+    for(unsigned int col=0; col<nbColumns; ++col){
+      finishedListModel->setData(finishedListModel->index(nbRows_old+row, col), finishedListModel->data(finishedListModel->index(sourceRow, col)));
+      finishedListModel->setData(finishedListModel->index(nbRows_old+row, col), finishedListModel->data(finishedListModel->index(sourceRow, col), Qt::DecorationRole), Qt::DecorationRole);
+      finishedListModel->setData(finishedListModel->index(nbRows_old+row, col), finishedListModel->data(finishedListModel->index(sourceRow, col), Qt::ForegroundRole), Qt::ForegroundRole);
+    }
+  }
+  // Remove old rows
+  finishedListModel->removeRows(0, nbRows_old);
+}
+
+void FinishedTorrents::sortFinishedListString(int index, Qt::SortOrder sortOrder){
+  QList<QPair<int, QString> > lines;
+  // Insertion sorting
+  unsigned int nbRows = finishedListModel->rowCount();
+  for(unsigned int i=0; i<nbRows; ++i){
+    misc::insertSortString(lines, QPair<int, QString>(i, finishedListModel->data(finishedListModel->index(i, index)).toString()), sortOrder);
+  }
+  // Insert items in new model, in correct order
+  unsigned int nbRows_old = lines.size();
+  for(unsigned int row=0; row<nbRows_old; ++row){
+    finishedListModel->insertRow(finishedListModel->rowCount());
+    unsigned int sourceRow = lines[row].first;
+    unsigned int nbColumns = finishedListModel->columnCount();
+    for(unsigned int col=0; col<nbColumns; ++col){
+      finishedListModel->setData(finishedListModel->index(nbRows_old+row, col), finishedListModel->data(finishedListModel->index(sourceRow, col)));
+      finishedListModel->setData(finishedListModel->index(nbRows_old+row, col), finishedListModel->data(finishedListModel->index(sourceRow, col), Qt::DecorationRole), Qt::DecorationRole);
+      finishedListModel->setData(finishedListModel->index(nbRows_old+row, col), finishedListModel->data(finishedListModel->index(sourceRow, col), Qt::ForegroundRole), Qt::ForegroundRole);
+    }
+  }
+  // Remove old rows
+  finishedListModel->removeRows(0, nbRows_old);
+}

src/FinishedTorrents.h

@@ -35,7 +35,6 @@
 #include "qtorrenthandle.h"
 
 class QStandardItemModel;
-class QSortFilterProxyModel;
 class bittorrent;
 class FinishedListDelegate;
 
@@ -48,7 +47,6 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     bittorrent *BTSession;
     FinishedListDelegate *finishedListDelegate;
     QStandardItemModel *finishedListModel;
-    QSortFilterProxyModel *proxyModel;
     unsigned int nbFinished;
     void hideOrShowColumn(int index);
     bool loadHiddenColumns();
@@ -71,6 +69,10 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     void displayFinishedHoSMenu(const QPoint&);
     void setRowColor(int row, QString color);
     void saveColWidthFinishedList() const;
+    void toggleFinishedListSortOrder(int index);
+    void sortFinishedList(int index=-1, Qt::SortOrder sortOrder=Qt::AscendingOrder);
+    void sortFinishedListFloat(int index, Qt::SortOrder sortOrder);
+    void sortFinishedListString(int index, Qt::SortOrder sortOrder);
     void updateFileSize(QString hash);
     void on_actionSet_upload_limit_triggered();
     void notifyTorrentDoubleClicked(const QModelIndex& index);
@@ -91,7 +93,6 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     void deleteTorrent(QString hash);
     void showPropertiesFromHash(QString hash);
     void loadLastSortedColumn();
-    void saveLastSortedColumn();
     void updateMetadata(QTorrentHandle &h);
 
   signals:

src/GUI.cpp

@@ -163,7 +163,7 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
   // Search engine tab
   searchEngine = new SearchEngine(BTSession, myTrayIcon, systrayIntegration);
   tabs->addTab(searchEngine, tr("Search"));
-  tabs->setTabIcon(2, QIcon(QString::fromUtf8(":/Icons/oxygen/edit-find.png")));
+  tabs->setTabIcon(2, QIcon(QString::fromUtf8(":/Icons/skin/search.png")));
   readSettings();
   // RSS Tab
   rssWidget = 0;
@@ -911,7 +911,7 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
       inDownloadList = false;
       break;
     case 3: //RSSImp
-      rssWidget->deleteSelectedItems();
+      rssWidget->on_delStream_button_clicked();
       return;
     default:
       return;
@@ -1027,7 +1027,7 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
     // Connection
     // * Ports binding
     unsigned short old_listenPort = BTSession->getListenPort();
-    BTSession->setListeningPort(options->getPort());
+    BTSession->setListeningPortsRange(options->getPorts());
     unsigned short new_listenPort = BTSession->getListenPort();
     if(new_listenPort != old_listenPort) {
       BTSession->addConsoleMessage(tr("qBittorrent is bound to port: TCP/%1", "e.g: qBittorrent is bound to port: 6881").arg( misc::toQString(new_listenPort)));

src/Icons/qBittorrent.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Categories=Qt;Network;P2P;
+Categories=Qt;Network;P2P
 Comment=V1.5.0
 Exec=qbittorrent %f
 GenericName=Bittorrent client

src/SearchTab.cpp

@@ -33,7 +33,6 @@
 #include <QStandardItemModel>
 #include <QHeaderView>
 #include <QSettings>
-#include <QSortFilterProxyModel>
 
 #include "SearchTab.h"
 #include "SearchListDelegate.h"
@@ -46,63 +45,45 @@
 #define SEARCH_LEECHERS 3
 #define SEARCH_ENGINE 4
 
-SearchTab::SearchTab(SearchEngine *parent) : QWidget(), parent(parent)
+SearchTab::SearchTab(SearchEngine *parent) : QWidget()
 {
-  box=new QVBoxLayout();
-  results_lbl=new QLabel();
-  resultsBrowser = new QTreeView();
-  resultsBrowser->setSelectionMode(QAbstractItemView::ExtendedSelection);
-  box->addWidget(results_lbl);
-  box->addWidget(resultsBrowser);
-
-  setLayout(box);
-  // Set Search results list model
-  SearchListModel = new QStandardItemModel(0,6);
-  SearchListModel->setHeaderData(SEARCH_NAME, Qt::Horizontal, tr("Name", "i.e: file name"));
-  SearchListModel->setHeaderData(SEARCH_SIZE, Qt::Horizontal, tr("Size", "i.e: file size"));
-  SearchListModel->setHeaderData(SEARCH_SEEDERS, Qt::Horizontal, tr("Seeders", "i.e: Number of full sources"));
-  SearchListModel->setHeaderData(SEARCH_LEECHERS, Qt::Horizontal, tr("Leechers", "i.e: Number of partial sources"));
-  SearchListModel->setHeaderData(SEARCH_ENGINE, Qt::Horizontal, tr("Search engine"));
-  resultsBrowser->hideColumn(URL_COLUMN); // Hide url column
-
-  proxyModel = new QSortFilterProxyModel();
-  proxyModel->setDynamicSortFilter(true);
-  proxyModel->setSourceModel(SearchListModel);
-  resultsBrowser->setModel(proxyModel);
-
-  SearchDelegate = new SearchListDelegate();
-  resultsBrowser->setItemDelegate(SearchDelegate);
-
-  resultsBrowser->setRootIsDecorated(false);
-  resultsBrowser->setAllColumnsShowFocus(true);
-  resultsBrowser->setSortingEnabled(true);
-
-  // Connect signals to slots (search part)
-  connect(resultsBrowser, SIGNAL(doubleClicked(const QModelIndex&)), this, SLOT(downloadSelectedItem(const QModelIndex&)));
-
-  // Load last columns width for search results list
-  if(!loadColWidthResultsList()){
-    resultsBrowser->header()->resizeSection(0, 275);
-  }
-
-  // Sort by Seeds
-  resultsBrowser->sortByColumn(SEEDERS, Qt::DescendingOrder);
-}
-
-void SearchTab::downloadSelectedItem(const QModelIndex& index) {
-  QString engine_url = proxyModel->data(proxyModel->index(index.row(), ENGINE_URL_COLUMN)).toString();
-  QString torrent_url = proxyModel->data(proxyModel->index(index.row(), URL_COLUMN)).toString();
-  setRowColor(index.row(), "red");
-  parent->downloadTorrent(engine_url, torrent_url);
+    box=new QVBoxLayout();
+    results_lbl=new QLabel();
+    resultsBrowser = new QTreeView();
+    resultsBrowser->setSelectionMode(QAbstractItemView::ExtendedSelection);
+    box->addWidget(results_lbl);
+    box->addWidget(resultsBrowser);
+    
+    setLayout(box);
+    // Set Search results list model
+    SearchListModel = new QStandardItemModel(0,6);
+    SearchListModel->setHeaderData(SEARCH_NAME, Qt::Horizontal, tr("Name", "i.e: file name"));
+    SearchListModel->setHeaderData(SEARCH_SIZE, Qt::Horizontal, tr("Size", "i.e: file size"));
+    SearchListModel->setHeaderData(SEARCH_SEEDERS, Qt::Horizontal, tr("Seeders", "i.e: Number of full sources"));
+    SearchListModel->setHeaderData(SEARCH_LEECHERS, Qt::Horizontal, tr("Leechers", "i.e: Number of partial sources"));
+    SearchListModel->setHeaderData(SEARCH_ENGINE, Qt::Horizontal, tr("Search engine"));
+    resultsBrowser->setModel(SearchListModel);
+    resultsBrowser->hideColumn(URL_COLUMN); // Hide url column
+    SearchDelegate = new SearchListDelegate();
+    resultsBrowser->setItemDelegate(SearchDelegate);
+    // Make search list header clickable for sorting
+    resultsBrowser->header()->setClickable(true);
+    resultsBrowser->header()->setSortIndicatorShown(true);
+    
+    // Connect signals to slots (search part)
+    connect(resultsBrowser, SIGNAL(doubleClicked(const QModelIndex&)), parent, SLOT(downloadSelectedItem(const QModelIndex&)));
+    connect(resultsBrowser->header(), SIGNAL(sectionPressed(int)), this, SLOT(sortSearchList(int)));
+    
+    // Load last columns width for search results list
+    if(!loadColWidthResultsList()){
+      resultsBrowser->header()->resizeSection(0, 275);
+    }
 }
 
 SearchTab::~SearchTab() {
-  delete box;
-  delete results_lbl;
-  delete resultsBrowser;
-  delete SearchListModel;
-  delete proxyModel;
-  delete SearchDelegate;
+    delete resultsBrowser;
+    delete SearchListModel;
+    delete SearchDelegate;
 }
 
 QHeaderView* SearchTab::header() const {
@@ -119,31 +100,87 @@ bool SearchTab::loadColWidthResultsList() {
     return false;
   unsigned int listSize = width_list.size();
   for(unsigned int i=0; i<listSize; ++i){
-    resultsBrowser->header()->resizeSection(i, width_list.at(i).toInt());
+        resultsBrowser->header()->resizeSection(i, width_list.at(i).toInt());
   }
   return true;
 }
 
 QLabel* SearchTab::getCurrentLabel()
 {
-  return results_lbl;
+    return results_lbl;
 }
 
 QTreeView* SearchTab::getCurrentTreeView()
 {
-  return resultsBrowser;
+    return resultsBrowser;
 }
 
 QStandardItemModel* SearchTab::getCurrentSearchListModel()
 {
-  return SearchListModel;
+    return SearchListModel;
 }
 
 // Set the color of a row in data model
 void SearchTab::setRowColor(int row, QString color){
-  for(int i=0; i<proxyModel->columnCount(); ++i){
-    proxyModel->setData(proxyModel->index(row, i), QVariant(QColor(color)), Qt::ForegroundRole);
+  for(int i=0; i<SearchListModel->columnCount(); ++i){
+    SearchListModel->setData(SearchListModel->index(row, i), QVariant(QColor(color)), Qt::ForegroundRole);
   }
 }
 
+void SearchTab::sortSearchList(int index){
+  static Qt::SortOrder sortOrder = Qt::AscendingOrder;
+  if(resultsBrowser->header()->sortIndicatorSection() == index){
+      sortOrder = (sortOrder == Qt::DescendingOrder) ? Qt::AscendingOrder : Qt::DescendingOrder; ;
+  }
+  resultsBrowser->header()->setSortIndicator(index, sortOrder);
+  switch(index){
+    case SEEDERS:
+    case LEECHERS:
+    case SIZE:
+      sortSearchListInt(index, sortOrder);
+      break;
+    default:
+      sortSearchListString(index, sortOrder);
+  }
+}
+
+void SearchTab::sortSearchListInt(int index, Qt::SortOrder sortOrder){
+  QList<QPair<int, qlonglong> > lines;
+  // Insertion sorting
+  for(int i=0; i<SearchListModel->rowCount(); ++i){
+    misc::insertSort(lines, QPair<int,qlonglong>(i, SearchListModel->data(SearchListModel->index(i, index)).toLongLong()), sortOrder);
+  }
+  // Insert items in new model, in correct order
+  int nbRows_old = lines.size();
+  for(int row=0; row<lines.size(); ++row){
+    SearchListModel->insertRow(SearchListModel->rowCount());
+    int sourceRow = lines[row].first;
+    for(int col=0; col<6; ++col){
+      SearchListModel->setData(SearchListModel->index(nbRows_old+row, col), SearchListModel->data(SearchListModel->index(sourceRow, col)));
+      SearchListModel->setData(SearchListModel->index(nbRows_old+row, col), SearchListModel->data(SearchListModel->index(sourceRow, col), Qt::ForegroundRole), Qt::ForegroundRole);
+    }
+  }
+  // Remove old rows
+  SearchListModel->removeRows(0, nbRows_old);
+}
+
+void SearchTab::sortSearchListString(int index, Qt::SortOrder sortOrder){
+  QList<QPair<int, QString> > lines;
+  // Insetion sorting
+  for(int i=0; i<SearchListModel->rowCount(); ++i){
+    misc::insertSortString(lines, QPair<int, QString>(i, SearchListModel->data(SearchListModel->index(i, index)).toString()), sortOrder);
+  }
+  // Insert items in new model, in correct order
+  int nbRows_old = lines.size();
+  for(int row=0; row<nbRows_old; ++row){
+    SearchListModel->insertRow(SearchListModel->rowCount());
+    int sourceRow = lines[row].first;
+    for(int col=0; col<6; ++col){
+      SearchListModel->setData(SearchListModel->index(nbRows_old+row, col), SearchListModel->data(SearchListModel->index(sourceRow, col)));
+      SearchListModel->setData(SearchListModel->index(nbRows_old+row, col), SearchListModel->data(SearchListModel->index(sourceRow, col), Qt::ForegroundRole), Qt::ForegroundRole);
+    }
+  }
+  // Remove old rows
+  SearchListModel->removeRows(0, nbRows_old);
+}
 

src/SearchTab.h

@@ -41,34 +41,32 @@ class SearchEngine;
 class QTreeView;
 class QHeaderView;
 class QStandardItemModel;
-class QSortFilterProxyModel;
-
-class SearchTab: public QWidget, public Ui::search_engine {
-  Q_OBJECT
-
-private:
-  QVBoxLayout *box;
-  QLabel *results_lbl;
-  QTreeView *resultsBrowser;
-  QStandardItemModel *SearchListModel;
-  QSortFilterProxyModel *proxyModel;
-  SearchListDelegate *SearchDelegate;
-  SearchEngine *parent;
-
-protected slots:
-  void downloadSelectedItem(const QModelIndex& index);
-
-public:
-  SearchTab(SearchEngine *parent);
-  ~SearchTab();
-  bool loadColWidthResultsList();
-  QLabel * getCurrentLabel();
-  QStandardItemModel * getCurrentSearchListModel();
-  QTreeView * getCurrentTreeView();
-  void setRowColor(int row, QString color);
-  QHeaderView* header() const;
 
+class SearchTab : public QWidget, public Ui::search_engine
+{
+    Q_OBJECT
+            
+    private:
+        QVBoxLayout *box;
+        QLabel *results_lbl;
+        QTreeView *resultsBrowser;
+        QStandardItemModel *SearchListModel;
+        SearchListDelegate *SearchDelegate;
+    public:
+        SearchTab(SearchEngine *parent);
+        ~SearchTab();
+        bool loadColWidthResultsList();
+        QLabel * getCurrentLabel();
+        QStandardItemModel * getCurrentSearchListModel();
+        QTreeView * getCurrentTreeView();
+        void setRowColor(int row, QString color);
+        QHeaderView* header() const;
 
+    protected slots:
+        void sortSearchList(int index);
+        void sortSearchListInt(int index, Qt::SortOrder sortOrder);
+        void sortSearchListString(int index, Qt::SortOrder sortOrder);
+        
 };
 
 #endif

src/bittorrent.h

@@ -114,9 +114,6 @@ class bittorrent : public QObject {
   public slots:
     QTorrentHandle addTorrent(QString path, bool fromScanDir = false, QString from_url = QString(), bool resumed = false);
     QTorrentHandle addMagnetUri(QString magnet_uri, bool resumed=false);
-    void importOldTorrents();
-    void applyFormerAttributeFiles(QTorrentHandle h);
-    void importOldTempData(QString torrent_path);
     void loadSessionState();
     void saveSessionState();
     void downloadFromUrl(QString url);
@@ -136,6 +133,7 @@ class bittorrent : public QObject {
     void enableIPFilter(QString filter);
     void disableIPFilter();
     void setQueueingEnabled(bool enable);
+    void saveTorrentSpeedLimits(QString hash);
     void loadTorrentSpeedLimits(QString hash);
     void handleDownloadFailure(QString url, QString reason);
     void loadWebSeeds(QString fileHash);
@@ -143,7 +141,7 @@ class bittorrent : public QObject {
     void decreaseDlTorrentPriority(QString hash);
     void downloadUrlAndSkipDialog(QString url, QString save_path=QString::null);
     // Session configuration - Setters
-    void setListeningPort(int port);
+    void setListeningPortsRange(std::pair<unsigned short, unsigned short> ports);
     void setMaxConnections(int maxConnec);
     void setMaxConnectionsPerTorrent(int max);
     void setMaxUploadsPerTorrent(int max);
@@ -169,7 +167,6 @@ class bittorrent : public QObject {
     void addPeerBanMessage(QString msg, bool from_ipfilter);
     void processDownloadedFile(QString, QString);
     void saveTrackerFile(QString hash);
-    void addMagnetSkipAddDlg(QString uri);
 
   protected slots:
     void scanDirectory(QString);

src/createtorrent.ui

@@ -62,22 +62,22 @@
      <item>
       <widget class="QPushButton" name="addFile_button">
        <property name="text">
-        <string>Add file</string>
+        <string>Add a file</string>
        </property>
        <property name="icon">
         <iconset resource="icons.qrc">
-         <normaloff>:/Icons/oxygen/document-new.png</normaloff>:/Icons/oxygen/document-new.png</iconset>
+         <normaloff>:/Icons/add_file.png</normaloff>:/Icons/add_file.png</iconset>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="addFolder_button">
        <property name="text">
-        <string>Add folder</string>
+        <string>Add a folder</string>
        </property>
        <property name="icon">
         <iconset resource="icons.qrc">
-         <normaloff>:/Icons/oxygen/folder-new.png</normaloff>:/Icons/oxygen/folder-new.png</iconset>
+         <normaloff>:/Icons/add_folder.png</normaloff>:/Icons/add_folder.png</iconset>
        </property>
       </widget>
      </item>

src/createtorrent_imp.cpp

@@ -166,10 +166,10 @@ void createtorrent::on_createButton_clicked(){
     return;
   }
   QStringList trackers = allItems(trackers_list);
-  /*if(!trackers.size()){
+  if(!trackers.size()){
     QMessageBox::critical(0, tr("No tracker path set"), tr("Please set at least one tracker"));
     return;
-  }*/
+  }
   QString destination = QFileDialog::getSaveFileName(this, tr("Select destination torrent file"), QDir::homePath(), tr("Torrent Files")+QString::fromUtf8(" (*.torrent)"));
   if(!destination.isEmpty()) {
     if(!destination.endsWith(QString::fromUtf8(".torrent")))

src/download.ui

@@ -142,7 +142,7 @@
   <action name="actionBuy_it">
    <property name="icon">
     <iconset resource="icons.qrc">
-     <normaloff>:/Icons/oxygen/wallet.png</normaloff>:/Icons/oxygen/wallet.png</iconset>
+     <normaloff>:/Icons/money.png</normaloff>:/Icons/money.png</iconset>
    </property>
    <property name="text">
     <string>Buy it</string>

src/downloadThread.cpp

@@ -77,20 +77,13 @@ subDownloadThread::~subDownloadThread(){
 }
 
 void subDownloadThread::run(){
-  // Get a unique filename
+  // XXX: Trick to get a unique filename
   QString filePath;
-  QTemporaryFile tmpfile;
-  tmpfile.setAutoRemove(false);
-  if (tmpfile.open()) {
-    filePath = tmpfile.fileName();
-    qDebug("Temporary filename is: %s", filePath.toLocal8Bit().data());
-  } else {
-    emit downloadFailureST(this, url, tr("I/O Error"));
-    return;
+  QTemporaryFile *tmpfile = new QTemporaryFile();
+  if (tmpfile->open()) {
+    filePath = tmpfile->fileName();
   }
-  tmpfile.close();
-  // Now temporary file is created but closed so that
-  // curl can use it
+  delete tmpfile;
   FILE *f = fopen(filePath.toLocal8Bit().data(), "wb");
   if(!f) {
     std::cerr << "couldn't open destination file" << "\n";
@@ -141,7 +134,6 @@ void subDownloadThread::run(){
     qDebug("Downloading %s", url.toLocal8Bit().data());
     if(!abort)
         res = curl_easy_perform(curl);
-    qDebug("done downloading %s", url.toLocal8Bit().data());
     /* always cleanup */
     curl_easy_cleanup(curl);
     fclose(f);
@@ -152,7 +144,6 @@ void subDownloadThread::run(){
     } else {
       emit downloadFinishedST(this, url, filePath);      
     }
-    qDebug("%s Raised the signal", url.toLocal8Bit().data());
   } else {
     std::cerr << "Could not initialize CURL" << "\n";
   }
@@ -167,9 +158,7 @@ downloadThread::~downloadThread(){
   abort = true;
   condition.wakeOne();
   mutex.unlock();
-  //qDebug("downloadThread deleting subthreads...");
   qDeleteAll(subThreads);
-  //qDebug("downloadThread deleted subthreads");
   wait();
 }
 
@@ -185,37 +174,28 @@ void downloadThread::downloadUrl(QString url){
 
 void downloadThread::run(){
   forever{
-    if(abort) {
-      qDebug("DownloadThread aborting...");
+    if(abort)
       return;
-    }
     mutex.lock();
     if(!urls_queue.empty() && subThreads.size() < MAX_THREADS){
       QString url = urls_queue.dequeue();
       mutex.unlock();
-      //qDebug("DownloadThread downloading %s...", url.toLocal8Bit().data());
       subDownloadThread *st = new subDownloadThread(0, url);
       subThreads << st;
       connect(st, SIGNAL(downloadFinishedST(subDownloadThread*, QString, QString)), this, SLOT(propagateDownloadedFile(subDownloadThread*, QString, QString)));
       connect(st, SIGNAL(downloadFailureST(subDownloadThread*, QString, QString)), this, SLOT(propagateDownloadFailure(subDownloadThread*, QString, QString)));
       st->start();
     }else{
-      //qDebug("DownloadThread sleeping...");
       condition.wait(&mutex);
-      //qDebug("DownloadThread woke up");
       mutex.unlock();
     }
   }
 }
 
 void downloadThread::propagateDownloadedFile(subDownloadThread* st, QString url, QString path){
-  qDebug("Downloading %s was successful", url.toLocal8Bit().data());
-  mutex.lock();
   int index = subThreads.indexOf(st);
   Q_ASSERT(index != -1);
   subThreads.removeAt(index);
-  mutex.unlock();
-  qDebug("Deleting subthread");
   delete st;
   emit downloadFinished(url, path);
   mutex.lock();
@@ -223,16 +203,12 @@ void downloadThread::propagateDownloadedFile(subDownloadThread* st, QString url,
     condition.wakeOne();
   }
   mutex.unlock();
-  qDebug("Out of propagateDownloadedFile");
 }
 
 void downloadThread::propagateDownloadFailure(subDownloadThread* st, QString url, QString reason){
-  qDebug("Downloading %s failed", url.toLocal8Bit().data());
-  mutex.lock();
   int index = subThreads.indexOf(st);
   Q_ASSERT(index != -1);
   subThreads.removeAt(index);
-  mutex.unlock();
   delete st;
   emit downloadFailure(url, reason);
   mutex.lock();