Tagged today's releases

Fix encoding error in file renaming

AUTHORS

@@ -12,7 +12,7 @@ Contributors:
 * Silvan Scherrer <silvan.scherrer@aroa.ch>
 
 Code from other projects:
-* files src/qtsingleapp/*
+* files src/qtsingleapp/* src/lineedit/*
   copyright: Nokia Corporation
   license: LGPL
 

Changelog

@@ -1,7 +1,20 @@
-* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.4.0
+* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.5.0
+    - FEATURE: qBittorrent can now act as a tracker
+    - FEATURE: Added feature to shutdown qbittorrent on torrents completion
+    - FEATURE: Added a torrent import assistant to seed or keep downloading outside torrents
+    - FEATURE: qBittorrent can update itself from Sourceforge (Windows/Mac OS X only)
+    - FEATURE: Added a transfer list column to display the current tracker
+    - COSMETIC: Replaced message box by on-screen notification for download errors
+
+* Tue Aug 24 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.0
     - FEATURE: Added actions to "Move to top/bottom" of priority queue
-    - FEATURE: Added Auto-Shutdown on downloads completion feature
+    - FEATURE: Auto-Shutdown on downloads completion
+    - FEATURE: Email notification on download completion
+    - FEATURE: Added button to password-lock the UI
     - FEATURE: Added label-level Pause/Resume/Delete actions
+    - FEATURE: Torrents can now be filtered by name
+    - FEATURE: Run external program on torrent completion
+    - FEATURE: Detect executable updates in order to advise the user to restart
 
 * Tue Jul 27 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.3.0
     - FEATURE: Simplified torrent root folder renaming/truncating (< v2.3.0 is no longer forward compatible)

INSTALL

@@ -10,7 +10,7 @@ qBittorrent - A BitTorrent client in C++ / Qt4
   will install and execute qBittorrent hopefully without any problems.
 
   Dependencies:
-    - Qt >= 4.4.0 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml)
+    - Qt >= 4.5.0 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml)
 
     - pkg-config executable
 

configure

@@ -325,7 +325,7 @@ cat >$1/modules.cpp <<EOT
 #line 1 "qt4.qcm"
 /*
 -----BEGIN QCMOD-----
-name: Qt >= 4.4
+name: Qt >= 4.5
 arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
 -----END QCMOD-----
 */
@@ -333,14 +333,14 @@ class qc_qt4 : public ConfObj
 {
 public:
 	qc_qt4(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Qt >= 4.4"; }
-	QString shortname() const { return "Qt 4.4"; }
+	QString name() const { return "Qt >= 4.5"; }
+	QString shortname() const { return "Qt 4.5"; }
 	bool exec()
 	{
 		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
 			conf->addDefine("DISABLE_GUI");
 		}	
-		return(QT_VERSION >= 0x040400);
+		return(QT_VERSION >= 0x040500);
 	}
 };
 #line 1 "pkg-config.qcm"
@@ -616,22 +616,22 @@ arg: with-qtsingleapplication=[system|shipped], Use the shipped qtsingleapplicat
 class qc_qtsingleapplication : public ConfObj
 {
 public:
-	qc_qtsingleapplication(Conf *c) : ConfObj(c) {}
-	QString name() const { return "qtsingleapplication library"; }
-	QString shortname() const { return "qtsingleapplication"; }
+        qc_qtsingleapplication(Conf *c) : ConfObj(c) {}
+        QString name() const { return "qtsingleapplication library"; }
+        QString shortname() const { return "qtsingleapplication"; }
 
-	bool exec(){
-        	QString s;
-		s = conf->getenv("QC_WITH_QTSINGLEAPPLICATION");
+        bool exec(){
+                QString s;
+                s = conf->getenv("QC_WITH_QTSINGLEAPPLICATION");
                 if(s.compare("system", Qt::CaseInsensitive) == 0) {
                   // System
                   conf->addDefine("USE_SYSTEM_QTSINGLEAPPLICATION");
                   printf(" [system] ");
                 } else {
                   printf(" [shipped] ");
-		}
-		return true;
-	}
+                }
+                return true;
+        }
 };
 
 EOT

qcm/qt4.qcm

@@ -1,6 +1,6 @@
 /*
 -----BEGIN QCMOD-----
-name: Qt >= 4.4
+name: Qt >= 4.5
 arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
 -----END QCMOD-----
 */
@@ -8,13 +8,13 @@ class qc_qt4 : public ConfObj
 {
 public:
 	qc_qt4(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Qt >= 4.4"; }
-	QString shortname() const { return "Qt 4.4"; }
+	QString name() const { return "Qt >= 4.5"; }
+	QString shortname() const { return "Qt 4.5"; }
 	bool exec()
 	{
 		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
 			conf->addDefine("DISABLE_GUI");
 		}	
-		return(QT_VERSION >= 0x040400);
+		return(QT_VERSION >= 0x040500);
 	}
 };

qcm/qtsingleapplication.qcm

@@ -0,0 +1,26 @@
+/*
+-----BEGIN QCMOD-----
+name: libboost
+arg: with-qtsingleapplication=[system|shipped], Use the shipped qtsingleapplication library or the system one
+-----END QCMOD-----
+*/
+class qc_qtsingleapplication : public ConfObj
+{
+public:
+        qc_qtsingleapplication(Conf *c) : ConfObj(c) {}
+        QString name() const { return "qtsingleapplication library"; }
+        QString shortname() const { return "qtsingleapplication"; }
+
+        bool exec(){
+                QString s;
+                s = conf->getenv("QC_WITH_QTSINGLEAPPLICATION");
+                if(s.compare("system", Qt::CaseInsensitive) == 0) {
+                  // System
+                  conf->addDefine("USE_SYSTEM_QTSINGLEAPPLICATION");
+                  printf(" [system] ");
+                } else {
+                  printf(" [shipped] ");
+                }
+                return true;
+        }
+};

src/GUI.h

@@ -37,7 +37,7 @@
 #include "ui_mainwindow.h"
 #include "qtorrenthandle.h"
 
-class Bittorrent;
+class QBtSession;
 class QTimer;
 class downloadFromURL;
 class SearchEngine;
@@ -54,9 +54,11 @@ class PropertiesWidget;
 class StatusBar;
 class consoleDlg;
 class about;
-class createtorrent;
+class TorrentCreatorDlg;
 class downloadFromURL;
 class HidableTabWidget;
+class LineEdit;
+class QFileSystemWatcher;
 
 class GUI : public QMainWindow, private Ui::MainWindow{
   Q_OBJECT
@@ -69,6 +71,7 @@ public:
   QWidget* getCurrentTabWidget() const;
   TransferListWidget* getTransferList() const { return transferList; }
   QMenu* getTrayIconMenu();
+  PropertiesWidget *getProperties() const { return properties; }
 
 public slots:
   void trackerAuthenticationRequired(QTorrentHandle& h);
@@ -77,6 +80,7 @@ public slots:
   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);
+  void deleteBTSession();
 
 protected slots:
   // GUI related slots
@@ -97,6 +101,10 @@ protected slots:
   void handleDownloadFromUrlFailure(QString, QString) const;
   void createSystrayDelayed();
   void tab_changed(int);
+  void on_actionLock_qBittorrent_triggered();
+  void defineUILockPassword();
+  bool unlockUI();
+  void notifyOfUpdate(QString);
   // Keyboard shortcuts
   void createKeyboardShortcuts();
   void displayTransferTab() const;
@@ -121,6 +129,10 @@ protected slots:
   void optionsSaved();
   // HTTP slots
   void on_actionDownload_from_URL_triggered();
+#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
+  void handleUpdateCheckFinished(bool update_available, QString new_version);
+  void handleUpdateInstalled(QString error_msg);
+#endif
 
 protected:
   void closeEvent(QCloseEvent *);
@@ -130,8 +142,9 @@ protected:
   void displaySearchTab(bool enable);
 
 private:
+  QFileSystemWatcher *executable_watcher;
   // Bittorrent
-  Bittorrent *BTSession;
+  QBtSession *BTSession;
   QList<QPair<QTorrentHandle,QString> > unauthenticated_trackers; // Still needed?
   // GUI related
   QTimer *guiUpdater;
@@ -140,7 +153,7 @@ private:
   QPointer<options_imp> options;
   QPointer<consoleDlg> console;
   QPointer<about> aboutDlg;
-  QPointer<createtorrent> createTorrentDlg;
+  QPointer<TorrentCreatorDlg> createTorrentDlg;
   QPointer<downloadFromURL> downloadFromURLDialog;
   QPointer<QSystemTrayIcon> systrayIcon;
   QPointer<QTimer> systrayCreator;
@@ -150,6 +163,8 @@ private:
   PropertiesWidget *properties;
   bool displaySpeedInTitle;
   bool force_exit;
+  bool ui_locked;
+  LineEdit *search_filter;
   // Keyboard shortcuts
   QShortcut *switchSearchShortcut;
   QShortcut *switchSearchShortcut2;
@@ -160,6 +175,7 @@ private:
   QAction *prioSeparator2;
   QSplitter *hSplitter;
   QSplitter *vSplitter;
+  QMenu *lockMenu;
   // Search
   QPointer<SearchEngine> searchEngine;
   // RSS
@@ -171,6 +187,8 @@ private slots:
     void on_actionSpeed_in_title_bar_triggered();
     void on_actionTop_tool_bar_triggered();
     void on_actionShutdown_when_downloads_complete_triggered();
+    void on_actionShutdown_qBittorrent_when_downloads_complete_triggered();
+    void on_action_Import_Torrent_triggered();
 };
 
 #endif

src/Icons/qBittorrent.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Categories=Qt;Network;P2P;
-Comment=V2.4.0
+Comment=V2.5.0
 Exec=qbittorrent %f
 GenericName=Bittorrent client
 GenericName[ar]=العميل Bittorrent

src/Info.plist

@@ -47,7 +47,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.4.0</string>
+	<string>2.5.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>

src/about.qrc

@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+  <file>gpl.html</file>
+</qresource>
+</RCC>
+

src/advancedsettings.h

@@ -11,15 +11,15 @@
 #include "preferences.h"
 
 enum AdvSettingsCols {PROPERTY, VALUE};
-enum AdvSettingsRows {DISK_CACHE, OUTGOING_PORT_MIN, OUTGOING_PORT_MAX, IGNORE_LIMIT_LAN, COUNT_OVERHEAD, RECHECK_COMPLETED, LIST_REFRESH, RESOLVE_COUNTRIES, RESOLVE_HOSTS, MAX_HALF_OPEN, SUPER_SEEDING, NETWORK_IFACE, PROGRAM_NOTIFICATIONS };
-#define ROW_COUNT 13
+enum AdvSettingsRows {DISK_CACHE, OUTGOING_PORT_MIN, OUTGOING_PORT_MAX, IGNORE_LIMIT_LAN, COUNT_OVERHEAD, RECHECK_COMPLETED, LIST_REFRESH, RESOLVE_COUNTRIES, RESOLVE_HOSTS, MAX_HALF_OPEN, SUPER_SEEDING, NETWORK_IFACE, PROGRAM_NOTIFICATIONS, TRACKER_STATUS, TRACKER_PORT };
+#define ROW_COUNT 15
 
 class AdvancedSettings: public QTableWidget {
   Q_OBJECT
 
 private:
-  QSpinBox *spin_cache, *outgoing_ports_min, *outgoing_ports_max, *spin_list_refresh, *spin_maxhalfopen;
-  QCheckBox *cb_ignore_limits_lan, *cb_count_overhead, *cb_recheck_completed, *cb_resolve_countries, *cb_resolve_hosts, *cb_super_seeding, *cb_program_notifications;
+  QSpinBox *spin_cache, *outgoing_ports_min, *outgoing_ports_max, *spin_list_refresh, *spin_maxhalfopen, *spin_tracker_port;
+  QCheckBox *cb_ignore_limits_lan, *cb_count_overhead, *cb_recheck_completed, *cb_resolve_countries, *cb_resolve_hosts, *cb_super_seeding, *cb_program_notifications, *cb_tracker_status;
   QComboBox *combo_iface;
 
 public:
@@ -53,6 +53,8 @@ public:
     delete cb_super_seeding;
     delete combo_iface;
     delete cb_program_notifications;
+    delete spin_tracker_port;
+    delete cb_tracker_status;
   }
 
 public slots:
@@ -88,6 +90,9 @@ public slots:
     }
     // Program notification
     Preferences::useProgramNotification(cb_program_notifications->isChecked());
+    // Tracker
+    Preferences::setTrackerEnabled(cb_tracker_status->isChecked());
+    Preferences::setTrackerPort(spin_tracker_port->value());
   }
 
 protected slots:
@@ -190,11 +195,25 @@ protected slots:
     connect(combo_iface, SIGNAL(currentIndexChanged(int)), this, SLOT(emitSettingsChanged()));
     setCellWidget(NETWORK_IFACE, VALUE, combo_iface);
     // Program notifications
-    setItem(PROGRAM_NOTIFICATIONS, PROPERTY, new QTableWidgetItem(tr("Display program notification baloons")));
+    setItem(PROGRAM_NOTIFICATIONS, PROPERTY, new QTableWidgetItem(tr("Display program notification balloons")));
     cb_program_notifications = new QCheckBox();
     connect(cb_program_notifications, SIGNAL(toggled(bool)), this, SLOT(emitSettingsChanged()));
     cb_program_notifications->setChecked(Preferences::useProgramNotification());
     setCellWidget(PROGRAM_NOTIFICATIONS, VALUE, cb_program_notifications);
+    // Tracker State
+    setItem(TRACKER_STATUS, PROPERTY, new QTableWidgetItem(tr("Enable embedded tracker")));
+    cb_tracker_status = new QCheckBox();
+    connect(cb_tracker_status, SIGNAL(toggled(bool)), this, SLOT(emitSettingsChanged()));
+    cb_tracker_status->setChecked(Preferences::isTrackerEnabled());
+    setCellWidget(TRACKER_STATUS, VALUE, cb_tracker_status);
+    // Tracker port
+    setItem(TRACKER_PORT, PROPERTY, new QTableWidgetItem(tr("Embedded tracker port")));
+    spin_tracker_port = new QSpinBox();
+    connect(spin_tracker_port, SIGNAL(valueChanged(int)), this, SLOT(emitSettingsChanged()));
+    spin_tracker_port->setMinimum(1);
+    spin_tracker_port->setMaximum(65535);
+    spin_tracker_port->setValue(Preferences::getTrackerPort());
+    setCellWidget(TRACKER_PORT, VALUE, spin_tracker_port);
   }
 
   void emitSettingsChanged() {

src/console_imp.h

@@ -31,7 +31,7 @@
 #ifndef CONSOLE_H
 #define CONSOLE_H
 
-#include "bittorrent.h"
+#include "qbtsession.h"
 #include "ui_console.h"
 
 using namespace libtorrent;
@@ -40,10 +40,10 @@ class consoleDlg : public QDialog, private Ui_ConsoleDlg{
   Q_OBJECT
   
   private:
-    Bittorrent *BTSession;
+    QBtSession *BTSession;
   
   public:
-    consoleDlg(QWidget *parent, Bittorrent* _BTSession) : QDialog(parent) {
+    consoleDlg(QWidget *parent, QBtSession* _BTSession) : QDialog(parent) {
       setupUi(this);
       setAttribute(Qt::WA_DeleteOnClose);
       setModal(true);

src/downloadthread.cpp

@@ -39,8 +39,6 @@
 #include "preferences.h"
 #include "qinisettings.h"
 
-enum ProxyType {HTTP=1, SOCKS5=2, HTTP_PW=3, SOCKS5_PW=4, SOCKS4=5};
-
 /** Download Thread **/
 
 downloadThread::downloadThread(QObject* parent) : QObject(parent) {
@@ -180,7 +178,7 @@ void downloadThread::applyProxySettings() {
     qDebug("Using proxy: %s", qPrintable(IP));
     proxy.setPort(port.toUShort());
     // Default proxy type is HTTP, we must change if it is SOCKS5
-    if(intValue == SOCKS5 || intValue == SOCKS5_PW) {
+    if(intValue == Proxy::SOCKS5 || intValue == Proxy::SOCKS5_PW) {
       qDebug("Proxy is SOCKS5, not HTTP");
       proxy.setType(QNetworkProxy::Socks5Proxy);
     } else {

src/feedList.h

@@ -1,221 +0,0 @@
-#ifndef FEEDLIST_H
-#define FEEDLIST_H
-
-#include <QTreeWidget>
-#include <QTreeWidgetItem>
-#include <QDropEvent>
-#include <QDragMoveEvent>
-#include <QStringList>
-#include <QHash>
-#include <QUrl>
-#include "rss.h"
-
-class FeedList: public QTreeWidget {
-  Q_OBJECT
-
-private:
-  RssManager *rssmanager;
-  QHash<QTreeWidgetItem*, RssFile*> mapping;
-  QHash<QString, QTreeWidgetItem*> feeds_items;
-  QTreeWidgetItem* current_feed;
-  QTreeWidgetItem *unread_item;
-
-public:
-  FeedList(QWidget *parent, RssManager *rssmanager): QTreeWidget(parent), rssmanager(rssmanager) {
-    setContextMenuPolicy(Qt::CustomContextMenu);
-    setDragDropMode(QAbstractItemView::InternalMove);
-    setSelectionMode(QAbstractItemView::ExtendedSelection);
-    setColumnCount(1);
-    QTreeWidgetItem *___qtreewidgetitem = headerItem();
-    ___qtreewidgetitem->setText(0, QApplication::translate("RSS", "RSS feeds", 0, QApplication::UnicodeUTF8));
-    unread_item = new QTreeWidgetItem(this);
-    unread_item->setText(0, tr("Unread") + QString::fromUtf8("  (") + QString::number(rssmanager->getNbUnRead(), 10)+ QString(")"));
-    unread_item->setData(0,Qt::DecorationRole, QVariant(QIcon(":/Icons/oxygen/mail-folder-inbox.png")));
-    itemAdded(unread_item, rssmanager);
-    connect(this, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(updateCurrentFeed(QTreeWidgetItem*)));
-    setCurrentItem(unread_item);
-  }
-
-  ~FeedList() {
-    disconnect(this, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(updateCurrentFeed(QTreeWidgetItem*)));
-    delete unread_item;
-  }
-
-  void itemAdded(QTreeWidgetItem *item, RssFile* file) {
-    mapping[item] = file;
-    if(file->getType() == RssFile::STREAM) {
-      feeds_items[file->getID()] = item;
-    }
-  }
-
-  void itemAboutToBeRemoved(QTreeWidgetItem *item) {
-    RssFile* file = mapping.take(item);
-    if(file->getType() == RssFile::STREAM) {
-      feeds_items.remove(file->getID());
-    } else {
-      QList<RssStream*> feeds = ((RssFolder*)file)->getAllFeeds();
-      foreach(RssStream* feed, feeds) {
-        feeds_items.remove(feed->getID());
-      }
-    }
-  }
-
-  bool hasFeed(QString url) const {
-    return feeds_items.contains(QUrl(url).toString());
-  }
-
-  QList<QTreeWidgetItem*> getAllFeedItems() const {
-    return feeds_items.values();
-  }
-
-  QTreeWidgetItem* getUnreadItem() const {
-    return unread_item;
-  }
-
-  QStringList getItemPath(QTreeWidgetItem* item) const {
-    QStringList path;
-    if(item) {
-      if(item->parent())
-        path << getItemPath(item->parent());
-      path.append(getRSSItem(item)->getID());
-    }
-    return path;
-  }
-
-  QList<QTreeWidgetItem*> getAllOpenFolders(QTreeWidgetItem *parent=0) const {
-    QList<QTreeWidgetItem*> open_folders;
-    int nbChildren;
-    if(parent)
-      nbChildren = parent->childCount();
-    else
-      nbChildren = topLevelItemCount();
-    for(int i=0; i<nbChildren; ++i) {
-      QTreeWidgetItem *item;
-      if(parent)
-        item = parent->child(i);
-      else
-        item = topLevelItem(i);
-      if(getItemType(item) == RssFile::FOLDER && item->isExpanded()) {
-        QList<QTreeWidgetItem*> open_subfolders = getAllOpenFolders(item);
-        if(!open_subfolders.empty()) {
-          open_folders << open_subfolders;
-        } else {
-          open_folders << item;
-        }
-      }
-    }
-    return open_folders;
-  }
-
-  QList<QTreeWidgetItem*> getAllFeedItems(QTreeWidgetItem* folder) {
-    QList<QTreeWidgetItem*> feeds;
-    int nbChildren = folder->childCount();
-    for(int i=0; i<nbChildren; ++i) {
-      QTreeWidgetItem *item = folder->child(i);
-      if(getItemType(item) == RssFile::STREAM) {
-        feeds << item;
-      } else {
-        feeds << getAllFeedItems(item);
-      }
-    }
-    return feeds;
-  }
-
-  RssFile* getRSSItem(QTreeWidgetItem *item) const {
-    return mapping.value(item, 0);
-  }
-
-  RssFile::FileType getItemType(QTreeWidgetItem *item) const {
-    return mapping.value(item)->getType();
-  }
-
-  QString getItemID(QTreeWidgetItem *item) const {
-    return mapping.value(item)->getID();
-  }
-
-  QTreeWidgetItem* getTreeItemFromUrl(QString url) const{
-    return feeds_items.value(url, 0);
-  }
-
-  RssStream* getRSSItemFromUrl(QString url) const {
-    return (RssStream*)getRSSItem(getTreeItemFromUrl(url));
-  }
-
-  QTreeWidgetItem* currentItem() const {
-    return current_feed;
-  }
-
-  QTreeWidgetItem* currentFeed() const {
-    return current_feed;
-  }
-
-signals:
-  void foldersAltered(QList<QTreeWidgetItem*> folders);
-  void overwriteAttempt(QString filename);
-
-protected slots:
-  void updateCurrentFeed(QTreeWidgetItem* new_item) {
-    if(!new_item) return;
-    if(!mapping.contains(new_item)) return;
-    if((getItemType(new_item) == RssFile::STREAM) || new_item == unread_item)
-      current_feed = new_item;
-  }
-
-protected:
-  void dragMoveEvent(QDragMoveEvent * event) {
-    QTreeWidgetItem *item = itemAt(event->pos());
-    if(item == unread_item) {
-      event->ignore();
-    } else {
-      if(item && getItemType(item) != RssFile::FOLDER)
-        event->ignore();
-      else {
-        if(selectedItems().contains(unread_item)) {
-          event->ignore();
-        } else {
-          QTreeWidget::dragMoveEvent(event);
-        }
-      }
-    }
-  }
-
-  void dropEvent(QDropEvent *event) {
-    qDebug("dropEvent");
-    QList<QTreeWidgetItem*> folders_altered;
-    QTreeWidgetItem *dest_folder_item =  itemAt(event->pos());
-    RssFolder *dest_folder;
-    if(dest_folder_item) {
-      dest_folder = (RssFolder*)getRSSItem(dest_folder_item);
-      folders_altered << dest_folder_item;
-    } else {
-      dest_folder = rssmanager;
-    }
-    QList<QTreeWidgetItem *> src_items = selectedItems();
-    // Check if there is not going to overwrite another file
-    foreach(QTreeWidgetItem *src_item, src_items) {
-      RssFile *file = getRSSItem(src_item);
-      if(dest_folder->hasChild(file->getID())) {
-        emit overwriteAttempt(file->getID());
-        return;
-      }
-    }
-    // Proceed with the move
-    foreach(QTreeWidgetItem *src_item, src_items) {
-      QTreeWidgetItem *parent_folder = src_item->parent();
-      if(parent_folder && !folders_altered.contains(parent_folder))
-        folders_altered << parent_folder;
-      // Actually move the file
-      RssFile *file = getRSSItem(src_item);
-      rssmanager->moveFile(file, dest_folder);
-    }
-    QTreeWidget::dropEvent(event);
-    if(dest_folder_item)
-      dest_folder_item->setExpanded(true);
-    // Emit signal for update
-    if(!folders_altered.empty())
-      emit foldersAltered(folders_altered);
-  }
-
-};
-
-#endif // FEEDLIST_H

src/filterparserthread.h

@@ -407,9 +407,12 @@ class FilterParserThread : public QThread  {
       // First, import current filter
       ip_filter filter = s->get_ip_filter();
       foreach(const QString &ip, IPs) {
-        qDebug("Manual ban of peer %s", ip.toLocal8Bit().data());
-        address_v4 addr = address_v4::from_string(ip.toLocal8Bit().data());
-        filter.add_rule(addr, addr, ip_filter::blocked);
+        qDebug("Manual ban of peer %s", ip.toLocal8Bit().constData());
+        boost::system::error_code ec;
+        address_v4 addr = address_v4::from_string(ip.toLocal8Bit().constData(), ec);
+        Q_ASSERT(!ec);
+        if(!ec)
+          filter.add_rule(addr, addr, ip_filter::blocked);
       }
       s->set_ip_filter(filter);
     }

src/headlessloader.h

@@ -34,7 +34,7 @@
 #include <QObject>
 #include <QCoreApplication>
 #include "preferences.h"
-#include "bittorrent.h"
+#include "qbtsession.h"
 
 class HeadlessLoader: public QObject {
   Q_OBJECT
@@ -44,7 +44,7 @@ public:
     // Enable Web UI
     Preferences::setWebUiEnabled(true);
     // Instanciate Bittorrent Object
-    BTSession = new Bittorrent();
+    BTSession = new QBtSession();
     connect(BTSession, SIGNAL(newConsoleMessage(QString)), this, SLOT(displayConsoleMessage(QString)));
     // Resume unfinished torrents
     BTSession->startUpTorrents();
@@ -103,7 +103,7 @@ public slots:
   }
 
 private:
-  Bittorrent *BTSession;
+  QBtSession *BTSession;
 
 };
 

src/icons.qrc

@@ -153,6 +153,7 @@
   <file>Icons/oxygen/cookies.png</file>
   <file>Icons/oxygen/network-server.png</file>
   <file>Icons/oxygen/unsubscribe16.png</file>
+  <file>Icons/oxygen/encrypted32.png</file>
   <file>Icons/oxygen/list-add.png</file>
   <file>Icons/oxygen/edit-paste.png</file>
   <file>Icons/oxygen/folder-remote.png</file>