- Tagged both 1.3.4 and 1.4.0beta3 releases

- bump to v1.3.4

AUTHORS

@@ -17,11 +17,6 @@ Images Authors:
   license: GPLv2
   url: http://ftp.acc.umu.se/pub/GNOME/sources/gnome-icon-theme
 
-* files: src/oxygen/*.png
-  copyright: Oxygen Icon Theme (KDE)
-  license: LGPL
-  url: http://www.oxygen-icons.org
-
 * files: src/Icons/flags/*.png
   copyright: Open Clip Art Library
   license: Creative Commons Public Domain Dedication

Changelog

@@ -1,15 +1,3 @@
-* Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.4.0
-    - FEATURE: Display swarm information in lists
-    - FEATURE: Allow to define temporary download folder
-    - FEATURE: Display total amount of uploaded data in finished list
-    - FEATURE: Resizing a column in a search results tab affects all tabs
-    - FEATURE: Search results tab columns are now remembered upon startup
-    - FEATURE: Added right click menu in search engine to clear completion history
-    - BUGFIX: Provide more helpful explanation when an I/O error occured
-    - BUGFIX: Stop enforcing UTF-8 and use system locale instead
-    - COSMETIC: Redesigned program preferences
-    - COSMETIC: Updated icons set
-
 * 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

TODO

@@ -1,11 +1,5 @@
 See https://blueprints.launchpad.net/qbittorrent/
 
-// TODO in v1.4.0
-- Display peers information (disabled as a default)
-- Automatically move torrent to another directory on completion (disabled as a default)
-- Rework program preferences (make easier)
-- Provide better errors messages to make debugging easier
-
 // translations done in v1.3.0
 - Romanian
 - Russian

src/FinishedListDelegate.h

@@ -44,11 +44,9 @@
 #define F_NAME 0
 #define F_SIZE 1
 #define F_UPSPEED 2
-#define F_SWARM 3
-#define F_PEERS 4
-#define F_UPLOAD 5
-#define F_RATIO 6
-#define F_HASH 7
+#define F_LEECH 3
+#define F_RATIO 4
+#define F_HASH 5
 
 #define MAX_RATIO 100.
 
@@ -64,7 +62,6 @@ class FinishedListDelegate: public QItemDelegate {
       QStyleOptionViewItemV2 opt = QItemDelegate::setOptions(index, option);
       switch(index.column()){
         case F_SIZE:
-        case F_UPLOAD:
           QItemDelegate::drawBackground(painter, opt, index);
           QItemDelegate::drawDisplay(painter, opt, option.rect, misc::friendlyUnit(index.data().toLongLong()));
           break;

src/FinishedTorrents.cpp

@@ -46,13 +46,11 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
   setupUi(this);
   actionStart->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/play.png")));
   actionPause->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/pause.png")));
-  finishedListModel = new QStandardItemModel(0,8);
+  finishedListModel = new QStandardItemModel(0,6);
   finishedListModel->setHeaderData(F_NAME, Qt::Horizontal, tr("Name", "i.e: file name"));
   finishedListModel->setHeaderData(F_SIZE, Qt::Horizontal, tr("Size", "i.e: file size"));
   finishedListModel->setHeaderData(F_UPSPEED, Qt::Horizontal, tr("UP Speed", "i.e: Upload speed"));
-  finishedListModel->setHeaderData(F_SWARM, Qt::Horizontal, tr("Seeds / Leechers"));
-  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_LEECH, Qt::Horizontal, tr("Leechers", "i.e: full/partial sources"));
   finishedListModel->setHeaderData(F_RATIO, Qt::Horizontal, tr("Ratio"));
   finishedList->setModel(finishedListModel);
   finishedList->setRootIsDecorated(false);
@@ -92,9 +90,7 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par
   connect(actionHOSColName, SIGNAL(triggered()), this, SLOT(hideOrShowColumnName()));
   connect(actionHOSColSize, SIGNAL(triggered()), this, SLOT(hideOrShowColumnSize()));
   connect(actionHOSColUpSpeed, SIGNAL(triggered()), this, SLOT(hideOrShowColumnUpSpeed()));
-  connect(actionHOSColSwarm, SIGNAL(triggered()), this, SLOT(hideOrShowColumnSwarm()));
-  connect(actionHOSColPeers, SIGNAL(triggered()), this, SLOT(hideOrShowColumnPeers()));
-  connect(actionHOSColUpload, SIGNAL(triggered()), this, SLOT(hideOrShowColumnUpload()));
+  connect(actionHOSColLeechers, SIGNAL(triggered()), this, SLOT(hideOrShowColumnLeechers()));
   connect(actionHOSColRatio, SIGNAL(triggered()), this, SLOT(hideOrShowColumnRatio()));
 }
 
@@ -121,9 +117,7 @@ void FinishedTorrents::addTorrent(QString hash){
   finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(h.name()));
   finishedListModel->setData(finishedListModel->index(row, F_SIZE), QVariant((qlonglong)h.actual_size()));
   finishedListModel->setData(finishedListModel->index(row, F_UPSPEED), QVariant((double)0.));
-  finishedListModel->setData(finishedListModel->index(row, F_SWARM), QVariant("-1/-1"));
-  finishedListModel->setData(finishedListModel->index(row, F_PEERS), QVariant("0"));
-  finishedListModel->setData(finishedListModel->index(row, F_UPLOAD), QVariant((qlonglong)h.all_time_upload()));
+  finishedListModel->setData(finishedListModel->index(row, F_LEECH), QVariant("0"));
   finishedListModel->setData(finishedListModel->index(row, F_RATIO), QVariant(QString::fromUtf8(misc::toString(BTSession->getRealRatio(hash)).c_str())));
   finishedListModel->setData(finishedListModel->index(row, F_HASH), QVariant(hash));
   if(h.is_paused()) {
@@ -216,7 +210,7 @@ void FinishedTorrents::saveColWidthFinishedList() const{
     width_list = line.split(' ');
   }
   for(short i=0; i<nbColumns; ++i){
-    if(finishedList->columnWidth(i)<1 && width_list.size() == nbColumns && width_list.at(i).toInt()>=1) {
+    if(finishedList->columnWidth(i)<1 && width_list.size() == finishedListModel->columnCount()-1 && width_list.at(i).toInt()>=1) {
       // load the former width
       new_width_list << width_list.at(i);
     } else if(finishedList->columnWidth(i)>=1) { 
@@ -253,25 +247,22 @@ void FinishedTorrents::updateTorrent(QTorrentHandle h) {
       row = getRowFromHash(hash);
     }
     Q_ASSERT(row != -1);
-    if(!finishedList->isColumnHidden(F_SWARM)) {
-      finishedListModel->setData(finishedListModel->index(row, F_SWARM), misc::toQString(h.num_complete())+QString("/")+misc::toQString(h.num_incomplete()));
-    }
     if(h.is_paused()) return;
     // Update queued torrent
     if(BTSession->isQueueingEnabled() && h.is_queued()) {
         if(h.state() == torrent_status::checking_files || h.state() == torrent_status::queued_for_checking){
-            finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/oxygen/time.png"))), Qt::DecorationRole);
+            finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/time.png"))), Qt::DecorationRole);
         } else {
             finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/queued.png"))), Qt::DecorationRole);
         }
         // Reset upload speed and seeds/leech
         finishedListModel->setData(finishedListModel->index(row, F_UPSPEED), 0.);
-        finishedListModel->setData(finishedListModel->index(row, F_PEERS), "0");
+        finishedListModel->setData(finishedListModel->index(row, F_LEECH), "0");
         setRowColor(row, QString::fromUtf8("grey"));
         return;
     }
     if(h.state() == torrent_status::checking_files || h.state() == torrent_status::queued_for_checking){
-      finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/oxygen/time.png"))), Qt::DecorationRole);
+      finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/time.png"))), Qt::DecorationRole);
       setRowColor(row, QString::fromUtf8("grey"));
       return;
     }
@@ -280,11 +271,8 @@ void FinishedTorrents::updateTorrent(QTorrentHandle h) {
     if(!finishedList->isColumnHidden(F_UPSPEED)) {
       finishedListModel->setData(finishedListModel->index(row, F_UPSPEED), QVariant((double)h.upload_payload_rate()));
     }
-    if(!finishedList->isColumnHidden(F_PEERS)) {
-      finishedListModel->setData(finishedListModel->index(row, F_PEERS), misc::toQString(h.num_peers() - h.num_seeds(), true));
-    }
-    if(!finishedList->isColumnHidden(F_UPLOAD)) {
-      finishedListModel->setData(finishedListModel->index(row, F_UPLOAD), QVariant((double)h.all_time_upload()));
+    if(!finishedList->isColumnHidden(F_LEECH)) {
+      finishedListModel->setData(finishedListModel->index(row, F_LEECH), misc::toQString(h.num_peers() - h.num_seeds(), true));
     }
     if(!finishedList->isColumnHidden(F_RATIO)) {
       finishedListModel->setData(finishedListModel->index(row, F_RATIO), QVariant(misc::toQString(BTSession->getRealRatio(hash))));
@@ -308,7 +296,7 @@ void FinishedTorrents::pauseTorrent(QString hash) {
     return;
   finishedListModel->setData(finishedListModel->index(row, F_UPSPEED), QVariant((double)0.0));
   finishedListModel->setData(finishedListModel->index(row, F_NAME), QIcon(QString::fromUtf8(":/Icons/skin/paused.png")), Qt::DecorationRole);
-  finishedListModel->setData(finishedListModel->index(row, F_PEERS), QVariant(QString::fromUtf8("0")));
+  finishedListModel->setData(finishedListModel->index(row, F_LEECH), QVariant(QString::fromUtf8("0")));
   setRowColor(row, QString::fromUtf8("red"));
 }
 
@@ -364,7 +352,6 @@ void FinishedTorrents::forceRecheck(){
       if(index.column() == F_NAME){
           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();
       }
   }
@@ -449,12 +436,12 @@ void FinishedTorrents::hideOrShowColumn(int index) {
     if(nbVisibleColumns <= 1) return;
     // User can hide the column, do it.
     finishedList->setColumnHidden(index, true);
-    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_cancel.png")));
+    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_cancel.png")));
     --nbVisibleColumns;
   } else {
     // User want to display the column
     finishedList->setColumnHidden(index, false);
-    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_ok.png")));
+    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_ok.png")));
     ++nbVisibleColumns;
   }
   //resize all others non-hidden columns
@@ -477,16 +464,8 @@ void FinishedTorrents::hideOrShowColumnUpSpeed() {
   hideOrShowColumn(F_UPSPEED);
 }
 
-void FinishedTorrents::hideOrShowColumnSwarm() {
-  hideOrShowColumn(F_SWARM);
-}
-
-void FinishedTorrents::hideOrShowColumnPeers() {
-  hideOrShowColumn(F_PEERS);
-}
-
-void FinishedTorrents::hideOrShowColumnUpload() {
-  hideOrShowColumn(F_UPLOAD);
+void FinishedTorrents::hideOrShowColumnLeechers() {
+  hideOrShowColumn(F_LEECH);
 }
 
 void FinishedTorrents::hideOrShowColumnRatio() {
@@ -512,9 +491,9 @@ bool FinishedTorrents::loadHiddenColumns() {
   for(int i=0; i<finishedListModel->columnCount()-1; i++) {
     if(loaded && ishidden_list.at(i) == "0") {
       finishedList->setColumnHidden(i, true);
-      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_cancel.png")));
+      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_cancel.png")));
     } else {
-      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_ok.png")));
+      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_ok.png")));
     }
   }
   return loaded;
@@ -548,14 +527,8 @@ QAction* FinishedTorrents::getActionHoSCol(int index) {
     case F_UPSPEED :
       return actionHOSColUpSpeed;
       break;
-    case F_SWARM :
-      return actionHOSColSwarm;
-      break;
-    case F_PEERS :
-      return actionHOSColPeers;
-      break;
-    case F_UPLOAD :
-      return actionHOSColUpload;
+    case F_LEECH :
+      return actionHOSColLeechers;
       break;
     case F_RATIO :
       return actionHOSColRatio;
@@ -579,7 +552,6 @@ void FinishedTorrents::toggleFinishedListSortOrder(int index) {
     case F_SIZE:
     case F_UPSPEED:
     case F_RATIO:
-    case F_UPLOAD:
       sortFinishedListFloat(index, sortOrder);
       break;
     default:
@@ -604,8 +576,6 @@ void FinishedTorrents::sortFinishedList(int index, Qt::SortOrder sortOrder){
   switch(index) {
     case F_SIZE:
     case F_UPSPEED:
-    case F_UPLOAD:
-    case F_RATIO:
       sortFinishedListFloat(index, sortOrder);
       break;
     default:

src/FinishedTorrents.h

@@ -79,9 +79,7 @@ class FinishedTorrents : public QWidget, public Ui::seeding {
     void hideOrShowColumnName();
     void hideOrShowColumnSize();
     void hideOrShowColumnUpSpeed();
-    void hideOrShowColumnSwarm();
-    void hideOrShowColumnPeers();
-    void hideOrShowColumnUpload();
+    void hideOrShowColumnLeechers();
     void hideOrShowColumnRatio();
     void forceRecheck();
 

src/GUI.cpp

@@ -99,14 +99,14 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
     qDebug("Info: System tray unavailable");
   }
   // Setting icons
-  this->setWindowIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png")));
+  this->setWindowIcon(QIcon(QString::fromUtf8(":/Icons/qbittorrent32.png")));
   actionOpen->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/open.png")));
   actionExit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/exit.png")));
   actionDownload_from_URL->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/url.png")));
   actionOptions->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/settings.png")));
   actionAbout->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/info.png")));
-  actionWebsite->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/qbittorrent32.png")));
-  actionBugReport->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/bug.png")));
+  actionWebsite->setIcon(QIcon(QString::fromUtf8(":/Icons/qbittorrent32.png")));
+  actionBugReport->setIcon(QIcon(QString::fromUtf8(":/Icons/newmsg.png")));
   actionStart->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/play.png")));
   actionPause->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/pause.png")));
   actionDelete->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/delete.png")));
@@ -132,7 +132,7 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
   options = new options_imp(this);
   connect(options, SIGNAL(status_changed(bool)), this, SLOT(OptionsSaved(bool)));
   BTSession = new bittorrent();
-  connect(BTSession, SIGNAL(fullDiskError(QTorrentHandle&, QString)), this, SLOT(fullDiskError(QTorrentHandle&, QString)));
+  connect(BTSession, SIGNAL(fullDiskError(QTorrentHandle&)), this, SLOT(fullDiskError(QTorrentHandle&)));
   connect(BTSession, SIGNAL(finishedTorrent(QTorrentHandle&)), this, SLOT(finishedTorrent(QTorrentHandle&)));
   connect(BTSession, SIGNAL(addedTorrent(QTorrentHandle&)), this, SLOT(addedTorrent(QTorrentHandle&)));
   connect(BTSession, SIGNAL(pausedTorrent(QTorrentHandle&)), this, SLOT(pausedTorrent(QTorrentHandle&)));
@@ -249,9 +249,6 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
   if(!settings.value(QString::fromUtf8("Preferences/General/StartMinimized"), false).toBool()) {
     show();
   }
-  scrapeTimer = new QTimer(this);
-  connect(scrapeTimer, SIGNAL(timeout()), this, SLOT(scrapeTrackers()));
-  scrapeTimer->start(20000);
   qDebug("GUI Built");
 }
 
@@ -263,8 +260,6 @@ GUI::~GUI() {
   BTSession->saveDHTEntry();
   BTSession->saveSessionState();
   BTSession->saveFastResumeData();
-  scrapeTimer->stop();
-  delete scrapeTimer;
   delete dlSpeedLbl;
   delete upSpeedLbl;
   delete ratioLbl;
@@ -324,16 +319,6 @@ void GUI::displayRSSTab(bool enable) {
   }
 }
 
-void GUI::scrapeTrackers() {
-  std::vector<torrent_handle> torrents = BTSession->getTorrents();
-  std::vector<torrent_handle>::iterator torrentIT;
-  for(torrentIT = torrents.begin(); torrentIT != torrents.end(); torrentIT++) {
-    QTorrentHandle h = QTorrentHandle(*torrentIT);
-    if(!h.is_valid()) continue;
-    h.scrape_tracker();
-  }
-}
-
 void GUI::updateRatio() {
   // Update ratio info
   float ratio = 1.;
@@ -433,15 +418,15 @@ void GUI::checkedTorrent(QTorrentHandle& h) const {
 }
 
 // Notification when disk is full
-void GUI::fullDiskError(QTorrentHandle& h, QString msg) const {
+void GUI::fullDiskError(QTorrentHandle& h) const {
   QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
   bool useNotificationBalloons = settings.value(QString::fromUtf8("Preferences/General/NotificationBaloons"), true).toBool();
   if(systrayIntegration && useNotificationBalloons) {
-    myTrayIcon->showMessage(tr("I/O Error", "i.e: Input/Output Error"), tr("An I/O error occured for torrent %1.\n Reason: %2", "e.g: An error occured for torrent xxx.avi.\n Reason: disk is full.").arg(h.name()).arg(msg), 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(h.name()), QSystemTrayIcon::Critical, TIME_TRAY_BALLOON);
   }
   // Download will be paused by libtorrent. Updating GUI information accordingly
   QString hash = h.hash();
-  qDebug("Full disk error, pausing torrent %s", hash.toLocal8Bit().data());
+  qDebug("Full disk error, pausing torrent %s", hash.toUtf8().data());
   if(h.is_seed()) {
     // In finished list
     qDebug("Automatically paused torrent was in finished list");
@@ -685,8 +670,7 @@ void GUI::closeEvent(QCloseEvent *e) {
   bool goToSystrayOnExit = settings.value(QString::fromUtf8("Preferences/General/CloseToTray"), false).toBool();
   if(!force_exit && systrayIntegration && goToSystrayOnExit && !this->isHidden()) {
     hide();
-    //e->ignore();
-    e->accept();
+    e->ignore();
     return;
   }
   if(settings.value(QString::fromUtf8("Preferences/General/ExitConfirm"), true).toBool() && downloadingTorrentTab->getNbTorrentsInList()) {
@@ -758,7 +742,7 @@ void GUI::dropEvent(QDropEvent *event) {
   bool useTorrentAdditionDialog = settings.value(QString::fromUtf8("Preferences/Downloads/AdditionDialog"), true).toBool();
   foreach(QString file, files) {
     file = file.trimmed().replace(QString::fromUtf8("file://"), QString::fromUtf8(""), Qt::CaseInsensitive);
-    qDebug("Dropped file %s on download list", file.toLocal8Bit().data());
+    qDebug("Dropped file %s on download list", file.toUtf8().data());
     if(file.startsWith(QString::fromUtf8("http://"), Qt::CaseInsensitive) || file.startsWith(QString::fromUtf8("ftp://"), Qt::CaseInsensitive) || file.startsWith(QString::fromUtf8("https://"), Qt::CaseInsensitive)) {
       BTSession->downloadFromUrl(file);
       continue;
@@ -775,7 +759,7 @@ void GUI::dropEvent(QDropEvent *event) {
 // Decode if we accept drag 'n drop or not
 void GUI::dragEnterEvent(QDragEnterEvent *event) {
   foreach(const QString &mime, event->mimeData()->formats()){
-    qDebug("mimeData: %s", mime.toLocal8Bit().data());
+    qDebug("mimeData: %s", mime.toUtf8().data());
   }
   if (event->mimeData()->hasFormat(QString::fromUtf8("text/plain")) || event->mimeData()->hasFormat(QString::fromUtf8("text/uri-list"))) {
     event->acceptProposedAction();
@@ -970,11 +954,6 @@ void GUI::configureSession(bool deleteOptions) {
   // Downloads
   // * Save path
   BTSession->setDefaultSavePath(options->getSavePath());
-  if(options->isTempPathEnabled()) {
-    BTSession->setDefaultTempPath(options->getTempPath());
-  } else {
-    BTSession->setDefaultTempPath(QString::null);
-  }
   BTSession->preAllocateAllFiles(options->preAllocateAllFiles());
   BTSession->startTorrentsInPause(options->addTorrentsInPause());
   // * Scan dir
@@ -1191,11 +1170,11 @@ void GUI::configureSession(bool deleteOptions) {
     // We need this for urllib in search engine plugins
 #ifdef Q_WS_WIN
     char proxystr[512];
-    snprintf(proxystr, 512, "http_proxy=%s", proxy_str.toLocal8Bit().data());
+    snprintf(proxystr, 512, "http_proxy=%s", proxy_str.toUtf8().data());
     putenv(proxystr);
 #else
-    qDebug("HTTP: proxy string: %s", proxy_str.toLocal8Bit().data());
-    setenv("http_proxy", proxy_str.toLocal8Bit().data(), 1);
+    qDebug("HTTP: proxy string: %s", proxy_str.toUtf8().data());
+    setenv("http_proxy", proxy_str.toUtf8().data(), 1);
 #endif
   } else {
     qDebug("Disabling search proxy");
@@ -1522,10 +1501,10 @@ void GUI::createSystrayDelayed() {
 void GUI::createTrayIcon() {
   // Tray icon
  #ifdef Q_WS_WIN
-  myTrayIcon = new QSystemTrayIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent16.png")), this);
+  myTrayIcon = new QSystemTrayIcon(QIcon(QString::fromUtf8(":/Icons/qbittorrent16.png")), this);
  #endif
  #ifndef Q_WS_WIN
-  myTrayIcon = new QSystemTrayIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent22.png")), this);
+  myTrayIcon = new QSystemTrayIcon(QIcon(QString::fromUtf8(":/Icons/qbittorrent22.png")), this);
 #endif
   // Tray icon Menu
   myTrayIconMenu = new QMenu(this);

src/GUI.h

@@ -70,7 +70,6 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     // Bittorrent
     bittorrent *BTSession;
     QTimer *checkConnect;
-    QTimer *scrapeTimer;
     QList<QPair<QTorrentHandle,QString> > unauthenticated_trackers;
     // GUI related
     QTabWidget *tabs;
@@ -140,7 +139,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     void createTrayIcon();
     void updateUnfinishedTorrentNumber(unsigned int nb);
     void updateFinishedTorrentNumber(unsigned int nb);
-    void fullDiskError(QTorrentHandle& h, QString msg) const;
+    void fullDiskError(QTorrentHandle& h) const;
     void handleDownloadFromUrlFailure(QString, QString) const;
     void createSystrayDelayed();
     // Keyboard shortcuts
@@ -178,7 +177,6 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     bool initWebUi(QString username, QString password, int port);
     void on_actionIncreasePriority_triggered();
     void on_actionDecreasePriority_triggered();
-    void scrapeTrackers();
     // Options slots
     void on_actionOptions_triggered();
     void OptionsSaved(bool deleteOptions);

src/Icons/qBittorrent.desktop

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

src/MainWindow.ui

@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
+<ui version="4.0" >
  <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow">
-  <property name="geometry">
+ <widget class="QMainWindow" name="MainWindow" >
+  <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
@@ -10,266 +9,263 @@
     <height>563</height>
    </rect>
   </property>
-  <property name="contextMenuPolicy">
+  <property name="contextMenuPolicy" >
    <enum>Qt::CustomContextMenu</enum>
   </property>
-  <property name="windowTitle">
+  <property name="windowTitle" >
    <string/>
   </property>
-  <widget class="QWidget" name="centralwidget">
-   <layout class="QVBoxLayout"/>
+  <widget class="QWidget" name="centralwidget" >
+   <layout class="QVBoxLayout" />
   </widget>
-  <widget class="QMenuBar" name="menubar">
-   <property name="geometry">
+  <widget class="QMenuBar" name="menubar" >
+   <property name="geometry" >
     <rect>
      <x>0</x>
      <y>0</y>
      <width>914</width>
-     <height>23</height>
+     <height>26</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menu_Edit">
-    <property name="title">
+   <widget class="QMenu" name="menu_Edit" >
+    <property name="title" >
      <string>&amp;Edit</string>
     </property>
-    <addaction name="actionStart_All"/>
-    <addaction name="actionPause_All"/>
-    <addaction name="separator"/>
-    <addaction name="actionStart"/>
-    <addaction name="actionPause"/>
-    <addaction name="separator"/>
-    <addaction name="actionTorrent_Properties"/>
-    <addaction name="separator"/>
-    <addaction name="actionDelete"/>
-    <addaction name="actionDelete_Permanently"/>
-    <addaction name="actionDecreasePriority"/>
-    <addaction name="actionIncreasePriority"/>
+    <addaction name="actionStart_All" />
+    <addaction name="actionPause_All" />
+    <addaction name="separator" />
+    <addaction name="actionStart" />
+    <addaction name="actionPause" />
+    <addaction name="separator" />
+    <addaction name="actionTorrent_Properties" />
+    <addaction name="separator" />
+    <addaction name="actionDelete" />
+    <addaction name="actionDelete_Permanently" />
+    <addaction name="actionDecreasePriority" />
+    <addaction name="actionIncreasePriority" />
    </widget>
-   <widget class="QMenu" name="menu_Help">
-    <property name="title">
+   <widget class="QMenu" name="menu_Help" >
+    <property name="title" >
      <string>&amp;Help</string>
     </property>
-    <addaction name="actionBugReport"/>
-    <addaction name="actionWebsite"/>
-    <addaction name="actionDocumentation"/>
-    <addaction name="actionAbout"/>
+    <addaction name="actionBugReport" />
+    <addaction name="actionWebsite" />
+    <addaction name="actionDocumentation" />
+    <addaction name="actionAbout" />
    </widget>
-   <widget class="QMenu" name="menu_Options">
-    <property name="title">
+   <widget class="QMenu" name="menu_Options" >
+    <property name="title" >
      <string>Options</string>
     </property>
-    <addaction name="actionOptions"/>
-    <addaction name="actionShow_console"/>
+    <addaction name="actionOptions" />
+    <addaction name="actionShow_console" />
    </widget>
-   <widget class="QMenu" name="menu_File">
-    <property name="title">
+   <widget class="QMenu" name="menu_File" >
+    <property name="title" >
      <string>&amp;File</string>
     </property>
-    <addaction name="actionOpen"/>
-    <addaction name="actionDownload_from_URL"/>
-    <addaction name="actionCreate_torrent"/>
-    <addaction name="actionExit"/>
+    <addaction name="actionOpen" />
+    <addaction name="actionDownload_from_URL" />
+    <addaction name="actionCreate_torrent" />
+    <addaction name="actionExit" />
    </widget>
-   <addaction name="menu_File"/>
-   <addaction name="menu_Edit"/>
-   <addaction name="menu_Options"/>
-   <addaction name="menu_Help"/>
+   <addaction name="menu_File" />
+   <addaction name="menu_Edit" />
+   <addaction name="menu_Options" />
+   <addaction name="menu_Help" />
   </widget>
-  <widget class="QToolBar" name="toolBar">
-   <property name="enabled">
+  <widget class="QToolBar" name="toolBar" >
+   <property name="enabled" >
     <bool>true</bool>
    </property>
-   <property name="contextMenuPolicy">
+   <property name="contextMenuPolicy" >
     <enum>Qt::NoContextMenu</enum>
    </property>
-   <property name="movable">
+   <property name="movable" >
     <bool>false</bool>
    </property>
-   <property name="orientation">
+   <property name="orientation" >
     <enum>Qt::Horizontal</enum>
    </property>
-   <property name="iconSize">
+   <property name="iconSize" >
     <size>
      <width>32</width>
      <height>32</height>
     </size>
    </property>
-   <property name="floatable">
+   <property name="floatable" >
     <bool>false</bool>
    </property>
-   <attribute name="toolBarArea">
+   <attribute name="toolBarArea" >
     <enum>TopToolBarArea</enum>
    </attribute>
-   <attribute name="toolBarBreak">
+   <attribute name="toolBarBreak" >
     <bool>false</bool>
    </attribute>
-   <addaction name="actionOpen"/>
-   <addaction name="actionDownload_from_URL"/>
-   <addaction name="separator"/>
-   <addaction name="actionDelete"/>
-   <addaction name="actionDelete_Permanently"/>
-   <addaction name="separator"/>
-   <addaction name="actionTorrent_Properties"/>
-   <addaction name="separator"/>
-   <addaction name="actionStart"/>
-   <addaction name="actionPause"/>
-   <addaction name="separator"/>
-   <addaction name="actionStart_All"/>
-   <addaction name="actionPause_All"/>
-   <addaction name="separator"/>
-   <addaction name="actionOptions"/>
-   <addaction name="actionDecreasePriority"/>
-   <addaction name="actionIncreasePriority"/>
-   <addaction name="separator"/>
-   <addaction name="actionExit"/>
+   <addaction name="actionOpen" />
+   <addaction name="actionDownload_from_URL" />
+   <addaction name="separator" />
+   <addaction name="actionDelete" />
+   <addaction name="actionDelete_Permanently" />
+   <addaction name="separator" />
+   <addaction name="actionTorrent_Properties" />
+   <addaction name="separator" />
+   <addaction name="actionStart" />
+   <addaction name="actionPause" />
+   <addaction name="separator" />
+   <addaction name="actionStart_All" />
+   <addaction name="actionPause_All" />
+   <addaction name="separator" />
+   <addaction name="actionOptions" />
+   <addaction name="actionDecreasePriority" />
+   <addaction name="actionIncreasePriority" />
+   <addaction name="separator" />
+   <addaction name="actionExit" />
   </widget>
-  <widget class="QStatusBar" name="statusBar"/>
-  <action name="actionOpen">
-   <property name="text">
+  <widget class="QStatusBar" name="statusBar" />
+  <action name="actionOpen" >
+   <property name="text" >
     <string>Open</string>
    </property>
   </action>
-  <action name="actionExit">
-   <property name="text">
+  <action name="actionExit" >
+   <property name="text" >
     <string>Exit</string>
    </property>
   </action>
-  <action name="actionOptions">
-   <property name="text">
+  <action name="actionOptions" >
+   <property name="text" >
     <string>Preferences</string>
    </property>
   </action>
-  <action name="actionAbout">
-   <property name="text">
+  <action name="actionAbout" >
+   <property name="text" >
     <string>About</string>
    </property>
   </action>
-  <action name="actionStart">
-   <property name="text">
+  <action name="actionStart" >
+   <property name="text" >
     <string>Start</string>
    </property>
   </action>
-  <action name="actionPause">
-   <property name="text">
+  <action name="actionPause" >
+   <property name="text" >
     <string>Pause</string>
    </property>
   </action>
-  <action name="actionDelete">
-   <property name="text">
+  <action name="actionDelete" >
+   <property name="text" >
     <string>Delete</string>
    </property>
   </action>
-  <action name="actionPause_All">
-   <property name="text">
+  <action name="actionPause_All" >
+   <property name="text" >
     <string>Pause All</string>
    </property>
   </action>
-  <action name="actionStart_All">
-   <property name="text">
+  <action name="actionStart_All" >
+   <property name="text" >
     <string>Start All</string>
    </property>
   </action>
-  <action name="actionWebsite">
-   <property name="text">
+  <action name="actionWebsite" >
+   <property name="text" >
     <string>Visit website</string>
    </property>
   </action>
-  <action name="actionDelete_Permanently">
-   <property name="text">
+  <action name="actionDelete_Permanently" >
+   <property name="text" >
     <string>Delete Permanently</string>
    </property>
   </action>
-  <action name="actionTorrent_Properties">
-   <property name="text">
+  <action name="actionTorrent_Properties" >
+   <property name="text" >
     <string>Torrent Properties</string>
    </property>
   </action>
-  <action name="actionDownload_from_URL">
-   <property name="text">
+  <action name="actionDownload_from_URL" >
+   <property name="text" >
     <string>Download from URL</string>
    </property>
   </action>
-  <action name="actionCreate_torrent">
-   <property name="text">
+  <action name="actionCreate_torrent" >
+   <property name="text" >
     <string>Create torrent</string>
    </property>
   </action>
-  <action name="actionPreview_file">
-   <property name="text">
+  <action name="actionPreview_file" >
+   <property name="text" >
     <string>Preview file</string>
    </property>
   </action>
-  <action name="actionClearLog">
-   <property name="text">
+  <action name="actionClearLog" >
+   <property name="text" >
     <string>Clear log</string>
    </property>
   </action>
-  <action name="actionBugReport">
-   <property name="text">
+  <action name="actionBugReport" >
+   <property name="text" >
     <string>Report a bug</string>
    </property>
   </action>
-  <action name="actionSet_upload_limit">
-   <property name="text">
+  <action name="actionSet_upload_limit" >
+   <property name="text" >
     <string>Set upload limit</string>
    </property>
   </action>
-  <action name="actionSet_download_limit">
-   <property name="text">
+  <action name="actionSet_download_limit" >
+   <property name="text" >
     <string>Set download limit</string>
    </property>
   </action>
-  <action name="actionDocumentation">
-   <property name="text">
+  <action name="actionDocumentation" >
+   <property name="text" >
     <string>Documentation</string>
    </property>
   </action>
-  <action name="actionSet_global_download_limit">
-   <property name="text">
+  <action name="actionSet_global_download_limit" >
+   <property name="text" >
     <string>Set global download limit</string>
    </property>
   </action>
-  <action name="actionSet_global_upload_limit">
-   <property name="text">
+  <action name="actionSet_global_upload_limit" >
+   <property name="text" >
     <string>Set global upload limit</string>
    </property>
   </action>
-  <action name="actionDecreasePriority">
-   <property name="icon">
-    <iconset resource="icons.qrc">
-     <normaloff>:/Icons/skin/decrease.png</normaloff>:/Icons/skin/decrease.png</iconset>
+  <action name="actionDecreasePriority" >
+   <property name="icon" >
+    <iconset resource="icons.qrc" >:/Icons/skin/decrease.png</iconset>
    </property>
-   <property name="text">
+   <property name="text" >
     <string>Decrease priority</string>
    </property>
-   <property name="visible">
+   <property name="visible" >
     <bool>false</bool>
    </property>
   </action>
-  <action name="actionIncreasePriority">
-   <property name="icon">
-    <iconset resource="icons.qrc">
-     <normaloff>:/Icons/skin/increase.png</normaloff>:/Icons/skin/increase.png</iconset>
+  <action name="actionIncreasePriority" >
+   <property name="icon" >
+    <iconset resource="icons.qrc" >:/Icons/skin/increase.png</iconset>
    </property>
-   <property name="text">
+   <property name="text" >
     <string>Increase priority</string>
    </property>
-   <property name="visible">
+   <property name="visible" >
     <bool>false</bool>
    </property>
   </action>
-  <action name="actionShow_console">
-   <property name="icon">
-    <iconset resource="icons.qrc">
-     <normaloff>:/Icons/oxygen/log.png</normaloff>:/Icons/oxygen/log.png</iconset>
+  <action name="actionShow_console" >
+   <property name="icon" >
+    <iconset resource="icons.qrc" >:/Icons/log.png</iconset>
    </property>
-   <property name="text">
+   <property name="text" >
     <string>Console</string>
    </property>
   </action>
  </widget>
  <resources>
-  <include location="icons.qrc"/>
+  <include location="icons.qrc" />
  </resources>
  <connections/>
 </ui>

src/SearchTab.cpp

@@ -75,36 +75,19 @@ SearchTab::SearchTab(SearchEngine *parent) : QWidget()
     connect(resultsBrowser->header(), SIGNAL(sectionPressed(int)), this, SLOT(sortSearchList(int)));
     
     // Load last columns width for search results list
-    if(!loadColWidthResultsList()){
+    if(!loadColWidthSearchList()){
       resultsBrowser->header()->resizeSection(0, 275);
     }
 }
 
-SearchTab::~SearchTab() {
+SearchTab::~SearchTab()
+{
+    saveColWidthSearchList();
     delete resultsBrowser;
     delete SearchListModel;
     delete SearchDelegate;
 }
 
-QHeaderView* SearchTab::header() const {
-  return resultsBrowser->header();
-}
-
-bool SearchTab::loadColWidthResultsList() {
-  QSettings settings("qBittorrent", "qBittorrent");
-  QString line = settings.value("SearchResultsColsWidth", QString()).toString();
-  if(line.isEmpty())
-    return false;
-  QStringList width_list = line.split(' ');
-  if(width_list.size() < SearchListModel->columnCount())
-    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());
-  }
-  return true;
-}
-
 QLabel* SearchTab::getCurrentLabel()
 {
     return results_lbl;
@@ -184,3 +167,33 @@ void SearchTab::sortSearchListString(int index, Qt::SortOrder sortOrder){
   SearchListModel->removeRows(0, nbRows_old);
 }
 
+// Save columns width in a file to remember them
+// (download list)
+void SearchTab::saveColWidthSearchList() const{
+  qDebug("Saving columns width in search list");
+  QSettings settings("qBittorrent", "qBittorrent");
+  QStringList width_list;
+  for(int i=0; i<SearchListModel->columnCount(); ++i){
+    width_list << misc::toQString(resultsBrowser->columnWidth(i));
+  }
+  settings.setValue("SearchListColsWidth", width_list.join(" "));
+  qDebug("Search list columns width saved");
+}
+
+// Load columns width in a file that were saved previously
+// (search list)
+bool SearchTab::loadColWidthSearchList(){
+  qDebug("Loading columns width for search list");
+  QSettings settings("qBittorrent", "qBittorrent");
+  QString line = settings.value("SearchListColsWidth", QString()).toString();
+  if(line.isEmpty())
+    return false;
+  QStringList width_list = line.split(' ');
+  if(width_list.size() != SearchListModel->columnCount())
+    return false;
+  for(int i=0; i<width_list.size(); ++i){
+        resultsBrowser->header()->resizeSection(i, width_list.at(i).toInt());
+  }
+  qDebug("Search list columns width loaded");
+  return true;
+}

src/SearchTab.h

@@ -39,7 +39,6 @@
 class SearchListDelegate;
 class SearchEngine;
 class QTreeView;
-class QHeaderView;
 class QStandardItemModel;
 
 class SearchTab : public QWidget, public Ui::search_engine
@@ -55,17 +54,16 @@ class SearchTab : public QWidget, public Ui::search_engine
     public:
         SearchTab(SearchEngine *parent);
         ~SearchTab();
-        bool loadColWidthResultsList();
+        bool loadColWidthSearchList();
         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);
+        void saveColWidthSearchList() const;
         
 };
 

src/about_imp.h

@@ -46,8 +46,8 @@ class about : public QDialog, private Ui::AboutDlg{
       setupUi(this);
       setAttribute(Qt::WA_DeleteOnClose);
       // Set icons
-      logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/qbittorrent22.png")));
-      mascot_lbl->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/mascot.png")));
+      logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/qbittorrent22.png")));
+      mascot_lbl->setPixmap(QPixmap(QString::fromUtf8(":/Icons/mascot.png")));
       //Title
       lb_name->setText(QString::fromUtf8("<b><h1>")+tr("qBittorrent")+QString::fromUtf8(" "VERSION"</h1></b>"));
       // Thanks

src/arborescence.h

@@ -150,7 +150,7 @@ class torrent_file {
     bool removeFromFS(QString saveDir) const {
       QString full_path = saveDir + QDir::separator() + rel_path;
       if(!QFile::exists(full_path)) {
-        qDebug("%s does not exist, no need to remove it", full_path.toLocal8Bit().data());
+        qDebug("%s does not exist, no need to remove it", full_path.toUtf8().data());
         return true;
       }
       bool success = true;
@@ -160,11 +160,11 @@ class torrent_file {
         success = s && success;
       }
       if(is_dir) {
-        qDebug("trying to remove directory: %s", full_path.toLocal8Bit().data());
+        qDebug("trying to remove directory: %s", full_path.toUtf8().data());
         QDir dir(full_path);
         dir.rmdir(full_path);
       } else {
-        qDebug("trying to remove file: %s", full_path.toLocal8Bit().data());
+        qDebug("trying to remove file: %s", full_path.toUtf8().data());
         bool s = QFile::remove(full_path);
         success = s && success;
       }

src/bittorrent.cpp

@@ -260,7 +260,7 @@ unsigned int bittorrent::getUnfinishedPausedTorrentsNb() 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(QString hash, bool permanent) {
-  qDebug("Deleting torrent with hash: %s", hash.toLocal8Bit().data());
+  qDebug("Deleting torrent with hash: %s", hash.toUtf8().data());
   QTorrentHandle h = getTorrentHandle(hash);
   if(!h.is_valid()) {
     qDebug("/!\\ Error: Invalid handle");
@@ -344,7 +344,7 @@ void bittorrent::loadWebSeeds(QString hash) {
   QStringList seeds_to_delete;
   QStringList existing_seeds = h.url_seeds();
   foreach(const QString &existing_seed, existing_seeds) {
-    if(!url_seeds.contains(existing_seed.toLocal8Bit())) {
+    if(!url_seeds.contains(existing_seed.toUtf8())) {
       seeds_to_delete << existing_seed;
     }
   }
@@ -372,7 +372,7 @@ QTorrentHandle bittorrent::addTorrent(QString path, bool fromScanDir, QString fr
   // create it if it is not
   if(! torrentBackup.exists()) {
     if(! torrentBackup.mkpath(torrentBackup.path())) {
-      std::cerr << "Couldn't create the directory: '" << torrentBackup.path().toLocal8Bit().data() << "'\n";
+      std::cerr << "Couldn't create the directory: '" << torrentBackup.path().toUtf8().data() << "'\n";
       exit(1);
     }
   }
@@ -382,11 +382,11 @@ QTorrentHandle bittorrent::addTorrent(QString path, bool fromScanDir, QString fr
     return h;
   }
   Q_ASSERT(!file.startsWith("http://", Qt::CaseInsensitive) && !file.startsWith("https://", Qt::CaseInsensitive) && !file.startsWith("ftp://", Qt::CaseInsensitive));
-  qDebug("Adding %s to download list", file.toLocal8Bit().data());
+  qDebug("Adding %s to download list", file.toUtf8().data());
   boost::intrusive_ptr<torrent_info> t;
   try {
       // Getting torrent file informations
-      t = new torrent_info(file.toLocal8Bit().data());
+      t = new torrent_info(file.toUtf8().data());
   } catch(std::exception&) {
       if(!from_url.isNull()) {
           addConsoleMessage(tr("Unable to decode torrent file: '%1'", "e.g: Unable to decode torrent file: '/home/y/xxx.torrent'").arg(from_url), QString::fromUtf8("red"));
@@ -410,7 +410,7 @@ QTorrentHandle bittorrent::addTorrent(QString path, bool fromScanDir, QString fr
       QFileInfo fi(file);
       QString old_hash = fi.baseName();
       if(old_hash != hash){
-          qDebug("* ERROR: Strange, hash changed from %s to %s", old_hash.toLocal8Bit().data(), hash.toLocal8Bit().data());
+          qDebug("* ERROR: Strange, hash changed from %s to %s", old_hash.toUtf8().data(), hash.toUtf8().data());
       }
   }
   // Check if torrent is already in download list
@@ -436,8 +436,8 @@ QTorrentHandle bittorrent::addTorrent(QString path, bool fromScanDir, QString fr
   add_torrent_params p;
   //Getting fast resume data if existing
   std::vector<char> buf;
-  qDebug("Trying to load fastresume data: %s", (torrentBackup.path()+QDir::separator()+hash+QString(".fastresume")).toLocal8Bit().data());
-  if (load_file((torrentBackup.path()+QDir::separator()+hash+QString(".fastresume")).toLocal8Bit().data(), buf) == 0) {
+  qDebug("Trying to load fastresume data: %s", (torrentBackup.path()+QDir::separator()+hash+QString(".fastresume")).toUtf8().data());
+  if (load_file((torrentBackup.path()+QDir::separator()+hash+QString(".fastresume")).toUtf8().data(), buf) == 0) {
       fastResume = true;
       p.resume_data = &buf;
       qDebug("Successfuly loaded");
@@ -447,14 +447,10 @@ QTorrentHandle bittorrent::addTorrent(QString path, bool fromScanDir, QString fr
   QFile savepath_file(misc::qBittorrentPath()+QString::fromUtf8("BT_backup")+QDir::separator()+hash+QString::fromUtf8(".savepath"));
   if(!savepath_file.exists()) {
       savepath_file.open(QIODevice::WriteOnly | QIODevice::Text);
-      savepath_file.write(savePath.toLocal8Bit());
+      savepath_file.write(savePath.toUtf8());
       savepath_file.close();
   }
-  if(defaultTempPath.isEmpty()) {
-    p.save_path = savePath.toLocal8Bit().data();
-  } else {
-    p.save_path = defaultTempPath.toLocal8Bit().data();
-  }
+  p.save_path = savePath.toUtf8().data();
   p.ti = t;
   // Preallocate all?
   if(preAllocateAll)
@@ -648,7 +644,7 @@ void bittorrent::enableLSD(bool b) {
 }
 
 void bittorrent::loadSessionState() {
-    boost::filesystem::ifstream ses_state_file((misc::qBittorrentPath()+QString::fromUtf8("ses_state")).toLocal8Bit().data()
+    boost::filesystem::ifstream ses_state_file((misc::qBittorrentPath()+QString::fromUtf8("ses_state")).toUtf8().data()
                                                , std::ios_base::binary);
     ses_state_file.unsetf(std::ios_base::skipws);
     s->load_state(bdecode(
@@ -659,7 +655,7 @@ void bittorrent::loadSessionState() {
 void bittorrent::saveSessionState() {
     qDebug("Saving session state to disk...");
     entry session_state = s->state();
-    boost::filesystem::ofstream out((misc::qBittorrentPath()+QString::fromUtf8("ses_state")).toLocal8Bit().data()
+    boost::filesystem::ofstream out((misc::qBittorrentPath()+QString::fromUtf8("ses_state")).toUtf8().data()
                                     , std::ios_base::binary);
     out.unsetf(std::ios_base::skipws);
     bencode(std::ostream_iterator<char>(out), session_state);
@@ -672,7 +668,7 @@ bool bittorrent::enableDHT(bool b) {
       entry dht_state;
       QString dht_state_path = misc::qBittorrentPath()+QString::fromUtf8("dht_state");
       if(QFile::exists(dht_state_path)) {
-        boost::filesystem::ifstream dht_state_file(dht_state_path.toLocal8Bit().data(), std::ios_base::binary);
+        boost::filesystem::ifstream dht_state_file(dht_state_path.toUtf8().data(), std::ios_base::binary);
         dht_state_file.unsetf(std::ios_base::skipws);
         try{
           dht_state = bdecode(std::istream_iterator<char>(dht_state_file), std::istream_iterator<char>());
@@ -701,13 +697,13 @@ bool bittorrent::enableDHT(bool b) {
 }
 
 void bittorrent::saveTorrentSpeedLimits(QString hash) {
-  qDebug("Saving speedLimits file for %s", hash.toLocal8Bit().data());
+  qDebug("Saving speedLimits file for %s", hash.toUtf8().data());
   QTorrentHandle h = getTorrentHandle(hash);
   int download_limit = h.download_limit();
   int upload_limit = h.upload_limit();
   QFile speeds_file(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".speedLimits");
   if(!speeds_file.open(QIODevice::WriteOnly | QIODevice::Text)) {
-    qDebug("* Error: Couldn't open speed limits file for torrent: %s", hash.toLocal8Bit().data());
+    qDebug("* Error: Couldn't open speed limits file for torrent: %s", hash.toUtf8().data());
     return;
   }
   speeds_file.write(misc::toQByteArray(download_limit)+QByteArray(" ")+misc::toQByteArray(upload_limit));
@@ -715,7 +711,7 @@ void bittorrent::saveTorrentSpeedLimits(QString hash) {
 }
 
 void bittorrent::loadTorrentSpeedLimits(QString hash) {
-//   qDebug("Loading speedLimits file for %s", hash.toLocal8Bit().data());
+//   qDebug("Loading speedLimits file for %s", hash.toUtf8().data());
   QTorrentHandle h = getTorrentHandle(hash);
   QFile speeds_file(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".speedLimits");
   if(!speeds_file.open(QIODevice::ReadOnly | QIODevice::Text)) {
@@ -748,7 +744,7 @@ void bittorrent::loadFilesPriorities(QTorrentHandle &h) {
   }
   // Read saved file
   if(!pieces_file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-    qDebug("* Error: Couldn't open priorities file: %s", hash.toLocal8Bit().data());
+    qDebug("* Error: Couldn't open priorities file: %s", hash.toUtf8().data());
     return;
   }
   QByteArray pieces_priorities = pieces_file.readAll();
@@ -835,7 +831,7 @@ void bittorrent::saveFastResumeData() {
       // Remove old fastresume file if it exists
       QFile::remove(torrentBackup.path()+QDir::separator()+ h.hash() + ".fastresume");
       QString file = h.hash()+".fastresume";
-      boost::filesystem::ofstream out(fs::path(torrentBackup.path().toLocal8Bit().data()) / file.toLocal8Bit().data(), std::ios_base::binary);
+      boost::filesystem::ofstream out(fs::path(torrentBackup.path().toUtf8().data()) / file.toUtf8().data(), std::ios_base::binary);
       out.unsetf(std::ios_base::skipws);
       bencode(std::ostream_iterator<char>(out), *rd->resume_data);
       // Remove torrent from session
@@ -890,7 +886,7 @@ bool bittorrent::isFilePreviewPossible(QString hash) const{
 // and add them to download list
 void bittorrent::scanDirectory(QString scan_dir) {
   FSMutex->lock();
-  qDebug("Scanning directory: %s", scan_dir.toLocal8Bit().data());
+  qDebug("Scanning directory: %s", scan_dir.toUtf8().data());
   QDir dir(scan_dir);
   QStringList filters;
   filters << "*.torrent";
@@ -899,10 +895,10 @@ void bittorrent::scanDirectory(QString scan_dir) {
       QString fullPath = dir.path()+QDir::separator()+file;
       QFile torrent(fullPath);
       if(torrent.size() != 0) {
-        qDebug("Adding for scan_dir: %s", fullPath.toLocal8Bit().data());
+        qDebug("Adding for scan_dir: %s", fullPath.toUtf8().data());
         addTorrent(fullPath, true);
       } else {
-          qDebug("Ignoring empty file: %s", fullPath.toLocal8Bit().data());
+          qDebug("Ignoring empty file: %s", fullPath.toUtf8().data());
       }
   }
   FSMutex->unlock();
@@ -912,32 +908,6 @@ void bittorrent::setDefaultSavePath(QString savepath) {
   defaultSavePath = savepath;
 }
 
-void bittorrent::setDefaultTempPath(QString temppath) {
-  if(defaultTempPath == temppath)
-    return;
-  if(temppath.isEmpty()) {
-    // Disabling temp dir
-    // Moving all torrents to their destination folder
-    std::vector<torrent_handle> torrents = getTorrents();
-    std::vector<torrent_handle>::iterator torrentIT;
-    for(torrentIT = torrents.begin(); torrentIT != torrents.end(); torrentIT++) {
-      QTorrentHandle h = QTorrentHandle(*torrentIT);
-      if(!h.is_valid()) continue;
-      h.move_storage(getSavePath(h.hash()));
-    }
-  } else {
-    std::vector<torrent_handle> torrents = getTorrents();
-    std::vector<torrent_handle>::iterator torrentIT;
-    for(torrentIT = torrents.begin(); torrentIT != torrents.end(); torrentIT++) {
-      QTorrentHandle h = QTorrentHandle(*torrentIT);
-      if(!h.is_valid()) continue;
-      if(!h.is_seed())
-        h.move_storage(temppath);
-    }
-  }
-  defaultTempPath = temppath;
-}
-
 // Enable directory scanning
 void bittorrent::enableDirectoryScanning(QString scan_dir) {
   if(!scan_dir.isEmpty()) {
@@ -1057,7 +1027,7 @@ bool bittorrent::loadTrackerFile(QString hash) {
 }
 
 void bittorrent::saveTrackerFile(QString hash) {
-  qDebug("Saving tracker file for %s", hash.toLocal8Bit().data());
+  qDebug("Saving tracker file for %s", hash.toUtf8().data());
   QDir torrentBackup(misc::qBittorrentPath() + "BT_backup");
   QFile tracker_file(torrentBackup.path()+QDir::separator()+ hash + ".trackers");
   if(tracker_file.exists()) {
@@ -1153,17 +1123,8 @@ void bittorrent::readAlerts() {
         QFile finished_file(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash+".finished");
         finished_file.open(QIODevice::WriteOnly | QIODevice::Text);
         finished_file.close();
-        // Move to download directory if necessary
-        if(!defaultTempPath.isEmpty()) {
-          // Check if directory is different
-          QDir current_dir(h.save_path());
-          QDir save_dir(getSavePath(h.hash()));
-          if(current_dir != save_dir) {
-            h.move_storage(save_dir.path());
-          }
-        }
         h.save_resume_data();
-        qDebug("Received finished alert for %s", h.name().toLocal8Bit().data());
+        qDebug("Received finished alert for %s", h.name().toUtf8().data());
       }
     }
     else if (save_resume_data_alert* p = dynamic_cast<save_resume_data_alert*>(a.get())) {
@@ -1173,10 +1134,10 @@ void bittorrent::readAlerts() {
         // Delete old fastresume file if necessary
         if(QFile::exists(file))
             QFile::remove(file);
-        qDebug("Saving fastresume data in %s", file.toLocal8Bit().data());
+        qDebug("Saving fastresume data in %s", file.toUtf8().data());
         if (p->resume_data)
         {
-            boost::filesystem::ofstream out(fs::path(torrentBackup.path().toLocal8Bit().data()) / file.toLocal8Bit().data(), std::ios_base::binary);
+            boost::filesystem::ofstream out(fs::path(torrentBackup.path().toUtf8().data()) / file.toUtf8().data(), std::ios_base::binary);
             out.unsetf(std::ios_base::skipws);
             bencode(std::ostream_iterator<char>(out), *p->resume_data);
         }
@@ -1184,9 +1145,9 @@ void bittorrent::readAlerts() {
     else if (file_error_alert* p = dynamic_cast<file_error_alert*>(a.get())) {
       QTorrentHandle h(p->handle);
       h.auto_managed(false);
-      std::cerr << "File Error: " << p->message().c_str() << std::endl;
+      qDebug("File Error: %s", p->message().c_str());
       if(h.is_valid())
-        emit fullDiskError(h, misc::toQString(p->message()));
+        emit fullDiskError(h);
     }
     else if (dynamic_cast<listen_failed_alert*>(a.get())) {
       // Level: fatal
@@ -1213,7 +1174,7 @@ void bittorrent::readAlerts() {
     else if (tracker_reply_alert* p = dynamic_cast<tracker_reply_alert*>(a.get())) {
       QTorrentHandle h(p->handle);
       if(h.is_valid()){
-        qDebug("Received a tracker reply from %s", (const char*)h.current_tracker().toLocal8Bit());
+        qDebug("Received a tracker reply from %s", (const char*)h.current_tracker().toUtf8());
         QString hash = h.hash();
         QHash<QString, QString> errors = trackersErrors.value(hash, QHash<QString, QString>());
         // p->url requires at least libtorrent v0.13.1
@@ -1241,7 +1202,7 @@ void bittorrent::readAlerts() {
     else if (fastresume_rejected_alert* p = dynamic_cast<fastresume_rejected_alert*>(a.get())) {
       QTorrentHandle h(p->handle);
       if(h.is_valid()){
-        qDebug("/!\\ Fast resume failed for %s, reason: %s", h.name().toLocal8Bit().data(), p->message().c_str());
+        qDebug("/!\\ Fast resume failed for %s, reason: %s", h.name().toUtf8().data(), p->message().c_str());
         addConsoleMessage(tr("Fast resume data was rejected for torrent %1, checking again...").arg(h.name()), QString::fromUtf8("red"));
         //emit fastResumeDataRejected(h.name());
       }
@@ -1254,7 +1215,7 @@ void bittorrent::readAlerts() {
       QTorrentHandle h(p->handle);
       if(h.is_valid()){
         QString hash = h.hash();
-        qDebug("%s have just finished checking", hash.toLocal8Bit().data());
+        qDebug("%s have just finished checking", hash.toUtf8().data());
         emit torrentFinishedChecking(h);
       }
     }
@@ -1293,7 +1254,7 @@ QString bittorrent::getSavePath(QString hash) {
   QDir saveDir(savePath);
   if(!saveDir.exists()) {
     if(!saveDir.mkpath(saveDir.path())) {
-      std::cerr << "Couldn't create the save directory: " << saveDir.path().toLocal8Bit().data() << "\n";
+      std::cerr << "Couldn't create the save directory: " << saveDir.path().toUtf8().data() << "\n";
       // XXX: handle this better
       return QDir::homePath();
     }
@@ -1359,7 +1320,7 @@ void bittorrent::saveDHTEntry() {
   if(DHTEnabled) {
     try{
       entry dht_state = s->dht_state();
-      boost::filesystem::ofstream out((misc::qBittorrentPath()+QString::fromUtf8("dht_state")).toLocal8Bit().data(), std::ios_base::binary);
+      boost::filesystem::ofstream out((misc::qBittorrentPath()+QString::fromUtf8("dht_state")).toUtf8().data(), std::ios_base::binary);
       out.unsetf(std::ios_base::skipws);
       bencode(std::ostream_iterator<char>(out), dht_state);
       qDebug("DHT entry saved");

src/bittorrent.h

@@ -60,7 +60,6 @@ class bittorrent : public QObject {
     bool DHTEnabled;
     QPointer<downloadThread> downloader;
     QString defaultSavePath;
-    QString defaultTempPath;
     QHash<QString, QHash<QString, QString> > trackersErrors;
     QStringList consoleMessages;
     QStringList peerBanMessages;
@@ -152,7 +151,6 @@ class bittorrent : public QObject {
     void setSessionSettings(session_settings sessionSettings);
     void startTorrentsInPause(bool b);
     void setDefaultSavePath(QString savepath);
-    void setDefaultTempPath(QString temppath);
     void applyEncryptionSettings(pe_settings se);
     void loadFilesPriorities(QTorrentHandle& h);
     void setDownloadLimit(QString hash, long val);
@@ -178,7 +176,7 @@ class bittorrent : public QObject {
     void pausedTorrent(QTorrentHandle& h);
     void resumedTorrent(QTorrentHandle& h);
     void finishedTorrent(QTorrentHandle& h);
-    void fullDiskError(QTorrentHandle& h, QString msg);
+    void fullDiskError(QTorrentHandle& h);
     void trackerError(QString hash, QString time, QString msg);
     void trackerAuthenticationRequired(QTorrentHandle& h);
     void newDownloadedTorrent(QString path, QString url);

src/console.ui

@@ -13,7 +13,7 @@
    <string>qBittorrent console</string>
   </property>
   <property name="windowIcon" >
-	  <iconset resource="icons.qrc" >:/Icons/oxygen/log.png</iconset>
+   <iconset resource="icons.qrc" >:/Icons/log.png</iconset>
   </property>
   <layout class="QVBoxLayout" >
    <item>
@@ -26,7 +26,7 @@
        <string>General</string>
       </attribute>
       <attribute name="icon" >
-	      <iconset resource="icons.qrc" >:/Icons/oxygen/log.png</iconset>
+       <iconset resource="icons.qrc" >:/Icons/log.png</iconset>
       </attribute>
       <layout class="QVBoxLayout" >
        <item>

src/createtorrent_imp.cpp

@@ -192,7 +192,7 @@ void createtorrent::handleCreationSuccess(QString path, const char* branch_path)
         // Create save path file
         boost::intrusive_ptr<torrent_info> t;
         try {
-            t = new torrent_info(path.toLocal8Bit().data());
+            t = new torrent_info(path.toUtf8().data());
         } catch(std::exception&) {
             QMessageBox::critical(0, tr("Torrent creation"), tr("Created torrent file is invalid. It won't be added to download list."));
             return;
@@ -238,7 +238,7 @@ void torrentCreatorThread::run() {
   try {
     file_storage fs;
     file_pool fp;
-    path full_path = complete(path(input_path.toLocal8Bit().data()));
+    path full_path = complete(path(input_path.toUtf8().data()));
     // Adding files to the torrent
     add_files(fs, full_path, file_filter);
     if(abort) return;
@@ -247,10 +247,10 @@ void torrentCreatorThread::run() {
     // Add url seeds
     QString seed;
     foreach(seed, url_seeds){
-      t.add_url_seed(seed.toLocal8Bit().data());
+      t.add_url_seed(seed.toUtf8().data());
     }
     for(int i=0; i<trackers.size(); ++i){
-      t.add_tracker(trackers.at(i).toLocal8Bit().data());
+      t.add_tracker(trackers.at(i).toUtf8().data());
     }
     if(abort) return;
     // calculate the hash for all pieces
@@ -258,14 +258,14 @@ void torrentCreatorThread::run() {
     // Set qBittorrent as creator and add user comment to
     // torrent_info structure
     t.set_creator(creator_str);
-    t.set_comment((const char*)comment.toLocal8Bit());
+    t.set_comment((const char*)comment.toUtf8());
     // Is private ?
     if(is_private){
       t.set_priv(true);
     }
     if(abort) return;
     // create the torrent and print it to out
-    ofstream out(complete(path((const char*)save_path.toLocal8Bit())), std::ios_base::binary);
+    ofstream out(complete(path((const char*)save_path.toUtf8())), std::ios_base::binary);
     bencode(std::ostream_iterator<char>(out), t.generate());
     emit updateProgress(100);
     emit creationSuccess(save_path, full_path.branch_path().string().c_str());

src/download.ui

@@ -92,7 +92,7 @@
   <action name="actionOpen_destination_folder" >
    <property name="icon" >
     <iconset resource="icons.qrc" >
-	    <normaloff>:/Icons/oxygen/folder.png</normaloff>:/Icons/oxygen/folder.png</iconset>
+     <normaloff>:/Icons/folder.png</normaloff>:/Icons/folder.png</iconset>
    </property>
    <property name="text" >
     <string>Open destination folder</string>
@@ -173,7 +173,7 @@
   <action name="actionForce_recheck" >
    <property name="icon" >
     <iconset resource="icons.qrc" >
-	    <normaloff>:/Icons/oxygen/gear.png</normaloff>:/Icons/oxygen/gear.png</iconset>
+     <normaloff>:/Icons/gear.png</normaloff>:/Icons/gear.png</iconset>
    </property>
    <property name="text" >
     <string>Force recheck</string>

src/downloadThread.cpp

@@ -84,7 +84,7 @@ void subDownloadThread::run(){
     filePath = tmpfile->fileName();
   }
   delete tmpfile;
-  FILE *f = fopen(filePath.toLocal8Bit().data(), "wb");
+  FILE *f = fopen(filePath.toUtf8().data(), "wb");
   if(!f) {
     std::cerr << "couldn't open destination file" << "\n";
     return;
@@ -93,7 +93,7 @@ void subDownloadThread::run(){
   CURLcode res = (CURLcode)-1;
   curl = curl_easy_init();
   if(curl) {
-    std::string c_url = url.toLocal8Bit().data();
+    std::string c_url = url.toUtf8().data();
     curl_easy_setopt(curl, CURLOPT_URL, c_url.c_str());
     // SSL support
     curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
@@ -105,8 +105,8 @@ void subDownloadThread::run(){
       // Proxy enabled
       QString IP = settings.value(QString::fromUtf8("Preferences/Connection/HTTPProxy/IP"), "0.0.0.0").toString();
       QString port = settings.value(QString::fromUtf8("Preferences/Connection/HTTPProxy/Port"), 8080).toString();
-      qDebug("Using proxy: %s", (IP+QString(":")+port).toLocal8Bit().data());
-      curl_easy_setopt(curl, CURLOPT_PROXYPORT, (IP+QString(":")+port).toLocal8Bit().data());
+      qDebug("Using proxy: %s", (IP+QString(":")+port).toUtf8().data());
+      curl_easy_setopt(curl, CURLOPT_PROXYPORT, (IP+QString(":")+port).toUtf8().data());
       // Default proxy type is HTTP, we must change if it is SOCKS5
       if(intValue%2==0) {
         qDebug("Proxy is SOCKS5, not HTTP");
@@ -117,7 +117,7 @@ void subDownloadThread::run(){
         qDebug("Proxy requires authentication, authenticating");
         QString username = settings.value(QString::fromUtf8("Preferences/Connection/HTTPProxy/Username"), QString()).toString();
         QString password = settings.value(QString::fromUtf8("Preferences/Connection/HTTPProxy/Password"), QString()).toString();
-        curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, (username+QString(":")+password).toLocal8Bit().data());
+        curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, (username+QString(":")+password).toUtf8().data());
       }
     }
     // We have to define CURLOPT_WRITEFUNCTION or it will crash on windows
@@ -131,7 +131,7 @@ void subDownloadThread::run(){
     curl_easy_setopt(curl, CURLOPT_AUTOREFERER, 1);
     curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
     curl_easy_setopt(curl, CURLOPT_MAXREDIRS, -1);
-    qDebug("Downloading %s", url.toLocal8Bit().data());
+    qDebug("Downloading %s", url.toUtf8().data());
     if(!abort)
         res = curl_easy_perform(curl);
     /* always cleanup */

src/downloadingTorrents.cpp

@@ -53,8 +53,8 @@ DownloadingTorrents::DownloadingTorrents(QObject *parent, bittorrent *BTSession)
   actionSet_download_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/downloading.png")));
   actionDelete_Permanently->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/delete_perm.png")));
   actionTorrent_Properties->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/properties.png")));
-//   tabBottom->setTabIcon(0, QIcon(QString::fromUtf8(":/Icons/oxygen/log.png")));
-//   tabBottom->setTabIcon(1, QIcon(QString::fromUtf8(":/Icons/oxygen/filter.png")));
+//   tabBottom->setTabIcon(0, QIcon(QString::fromUtf8(":/Icons/log.png")));
+//   tabBottom->setTabIcon(1, QIcon(QString::fromUtf8(":/Icons/filter.png")));
 
   // Set Download list model
   DLListModel = new QStandardItemModel(0,10);
@@ -327,12 +327,12 @@ void DownloadingTorrents::hideOrShowColumn(int index) {
     if(nbVisibleColumns <= 1) return;
     // User can hide the column, do it.
     downloadList->setColumnHidden(index, true);
-    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_cancel.png")));
+    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_cancel.png")));
     --nbVisibleColumns;
   } else {
     // User want to display the column
     downloadList->setColumnHidden(index, false);
-    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_ok.png")));
+    getActionHoSCol(index)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_ok.png")));
     ++nbVisibleColumns;
   }
   //resize all others non-hidden columns
@@ -346,9 +346,9 @@ void DownloadingTorrents::hideOrShowColumn(int index) {
 void DownloadingTorrents::hidePriorityColumn(bool hide) {
   downloadList->setColumnHidden(PRIORITY, hide);
   if(hide)
-    getActionHoSCol(PRIORITY)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_cancel.png")));
+    getActionHoSCol(PRIORITY)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_cancel.png")));
   else
-    getActionHoSCol(PRIORITY)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_ok.png")));
+    getActionHoSCol(PRIORITY)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_ok.png")));
 }
 
 // save the hidden columns in settings
@@ -386,9 +386,9 @@ bool DownloadingTorrents::loadHiddenColumns() {
   for(int i=0; i<DLListModel->columnCount()-1; i++) {
     if(loaded && ishidden_list.at(i) == "0") {
       downloadList->setColumnHidden(i, true);
-      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_cancel.png")));
+      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_cancel.png")));
     } else {
-      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_ok.png")));
+      getActionHoSCol(i)->setIcon(QIcon(QString::fromUtf8(":/Icons/button_ok.png")));
     }
   }
   return loaded;
@@ -498,7 +498,7 @@ bool DownloadingTorrents::updateTorrent(QTorrentHandle h) {
           DLListModel->setData(DLListModel->index(row, PRIORITY), QVariant((int)BTSession->getDlTorrentPriority(hash)));
           if(h.is_queued()) {
               if(h.state() == torrent_status::checking_files || h.state() == torrent_status::queued_for_checking) {
-                  DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/oxygen/time.png"))), Qt::DecorationRole);
+                  DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/time.png"))), Qt::DecorationRole);
                   if(!downloadList->isColumnHidden(PROGRESS)) {
                       DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)h.progress()));
                   }
@@ -525,7 +525,7 @@ bool DownloadingTorrents::updateTorrent(QTorrentHandle h) {
       switch(h.state()) {
         case torrent_status::checking_files:
         case torrent_status::queued_for_checking:
-          DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/oxygen/time.png"))), Qt::DecorationRole);
+          DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/time.png"))), Qt::DecorationRole);
           setRowColor(row, QString::fromUtf8("grey"));
           break;
         case torrent_status::downloading:
@@ -556,13 +556,7 @@ bool DownloadingTorrents::updateTorrent(QTorrentHandle h) {
           }
       }
       if(!downloadList->isColumnHidden(SEEDSLEECH)) {
-        QString tmp = misc::toQString(h.num_seeds(), true);
-        if(h.num_complete() >= 0)
-          tmp.append(QString("(")+misc::toQString(h.num_complete())+QString(")"));
-        tmp.append(QString("/")+misc::toQString(h.num_peers() - h.num_seeds(), true));
-        if(h.num_incomplete() >= 0)
-          tmp.append(QString("(")+misc::toQString(h.num_incomplete())+QString(")"));
-        DLListModel->setData(DLListModel->index(row, SEEDSLEECH), QVariant(tmp));
+        DLListModel->setData(DLListModel->index(row, SEEDSLEECH), QVariant(misc::toQString(h.num_seeds(), true)+QString::fromUtf8("/")+misc::toQString(h.num_peers() - h.num_seeds(), true)));
       }
       if(!downloadList->isColumnHidden(RATIO)) {
         DLListModel->setData(DLListModel->index(row, RATIO), QVariant(misc::toQString(BTSession->getRealRatio(hash))));
@@ -574,7 +568,7 @@ bool DownloadingTorrents::updateTorrent(QTorrentHandle h) {
 void DownloadingTorrents::addTorrent(QString hash) {
   QTorrentHandle h = BTSession->getTorrentHandle(hash);
   int row = getRowFromHash(hash);
-  qDebug("DL: addTorrent(): %s, row: %d", (const char*)hash.toLocal8Bit(), row);
+  qDebug("DL: addTorrent(): %s, row: %d", (const char*)hash.toUtf8(), row);
   if(row != -1) return;
   row = DLListModel->rowCount();
   // Adding torrent to download list
@@ -725,7 +719,7 @@ void DownloadingTorrents::saveColWidthDLList() const{
     width_list = line.split(' ');
   }
   for(short i=0; i<nbColumns; ++i){
-    if(downloadList->columnWidth(i)<1 && width_list.size() == nbColumns && width_list.at(i).toInt()>=1) {
+    if(downloadList->columnWidth(i)<1 && width_list.size() == DLListModel->columnCount()-1 && width_list.at(i).toInt()>=1) {
       // load the former width
       new_width_list << width_list.at(i);
     } else if(downloadList->columnWidth(i)>=1) { 

src/engineSelectDlg.cpp

@@ -57,8 +57,8 @@ engineSelectDlg::engineSelectDlg(QWidget *parent) : QDialog(parent) {
   pluginsTree->header()->resizeSection(0, 170);
   pluginsTree->header()->resizeSection(1, 220);
   pluginsTree->hideColumn(ENGINE_ID);
-  actionEnable->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_ok.png")));
-  actionDisable->setIcon(QIcon(QString::fromUtf8(":/Icons/oxygen/button_cancel.png")));
+  actionEnable->setIcon(QIcon(QString::fromUtf8(":/Icons/button_ok.png")));
+  actionDisable->setIcon(QIcon(QString::fromUtf8(":/Icons/button_cancel.png")));
   actionUninstall->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/remove.png")));
   connect(actionEnable, SIGNAL(triggered()), this, SLOT(enableSelection()));
   connect(actionDisable, SIGNAL(triggered()), this, SLOT(disableSelection()));
@@ -85,7 +85,7 @@ void engineSelectDlg::dropEvent(QDropEvent *event) {
   QStringList files=event->mimeData()->text().split(QString::fromUtf8("\n"));
   QString file;
   foreach(file, files) {
-    qDebug("dropped %s", file.toLocal8Bit().data());
+    qDebug("dropped %s", file.toUtf8().data());
     file = file.replace("file://", "");
     if(file.startsWith("http://", Qt::CaseInsensitive) || file.startsWith("https://", Qt::CaseInsensitive) || file.startsWith("ftp://", Qt::CaseInsensitive)) {
       downloader->downloadUrl(file);
@@ -108,7 +108,7 @@ void engineSelectDlg::dropEvent(QDropEvent *event) {
 void engineSelectDlg::dragEnterEvent(QDragEnterEvent *event) {
   QString mime;
   foreach(mime, event->mimeData()->formats()){
-    qDebug("mimeData: %s", mime.toLocal8Bit().data());
+    qDebug("mimeData: %s", mime.toUtf8().data());
   }
   if (event->mimeData()->hasFormat(QString::fromUtf8("text/plain")) || event->mimeData()->hasFormat(QString::fromUtf8("text/uri-list"))) {
     event->acceptProposedAction();
@@ -123,7 +123,7 @@ void engineSelectDlg::saveSettings() {
   foreach(engine, installed_engines.keys()) {
     known_engines << engine;
     known_enginesEnabled << QVariant(installed_engines.value(engine, true));
-    qDebug("Engine %s has state: %d", engine.toLocal8Bit().data(), installed_engines.value(engine, true));
+    qDebug("Engine %s has state: %d", engine.toUtf8().data(), installed_engines.value(engine, true));
   }
   QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
   settings.setValue(QString::fromUtf8("SearchEngines/knownEngines"), known_engines);
@@ -264,7 +264,7 @@ bool engineSelectDlg::checkInstalled(QString plugin_name) const {
   result = result.replace("\r", "");
   result = result.replace("\n", "");
   QList<QByteArray> plugins_list = result.split(',');
-  return plugins_list.contains(plugin_name.toLocal8Bit());
+  return plugins_list.contains(plugin_name.toUtf8());
 }
 
 void engineSelectDlg::loadSupportedSearchEngines(bool first) {
@@ -379,7 +379,7 @@ bool engineSelectDlg::isUpdateNeeded(QString plugin_name, float new_version) con
 void engineSelectDlg::installZipPlugin(QString path) {
   QStringList plugins;
   QStringList favicons;
-  ZZIP_DIR* dir = zzip_dir_open(path.toLocal8Bit().data(), 0);
+  ZZIP_DIR* dir = zzip_dir_open(path.toUtf8().data(), 0);
   if(!dir) {
     QMessageBox::warning(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("Search engine plugin archive could not be read."));
     return;
@@ -412,8 +412,8 @@ void engineSelectDlg::installZipPlugin(QString path) {
   foreach(plugin, plugins) {
     QString plugin_name = plugin.split(QDir::separator()).last();
     plugin_name.chop(3); // Remove .py extension
-    qDebug("Detected plugin %s in archive", plugin_name.toLocal8Bit().data());
-    ZZIP_FILE* fp = zzip_file_open(dir, plugin.toLocal8Bit().data(), 0);
+    qDebug("Detected plugin %s in archive", plugin_name.toUtf8().data());
+    ZZIP_FILE* fp = zzip_file_open(dir, plugin.toUtf8().data(), 0);
     if(fp) {
       QTemporaryFile *tmpfile = new QTemporaryFile();
       QString tmpPath;
@@ -430,7 +430,7 @@ void engineSelectDlg::installZipPlugin(QString path) {
         tmpfile->close();
       } else {
         qDebug("Could not open tmp file");
-        QMessageBox::warning(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("%1 search engine plugin could not be installed.", "%1 is the name of the search engine").arg(plugin_name.toLocal8Bit().data()));
+        QMessageBox::warning(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("%1 search engine plugin could not be installed.", "%1 is the name of the search engine").arg(plugin_name.toUtf8().data()));
         delete tmpfile;
         continue;
       }
@@ -441,12 +441,12 @@ void engineSelectDlg::installZipPlugin(QString path) {
       qDebug("Deleted tmpfile");
     } else {
       qDebug("Cannot read file in archive");
-      QMessageBox::warning(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("%1 search engine plugin could not be installed.", "%1 is the name of the search engine").arg(plugin_name.toLocal8Bit().data()));
+      QMessageBox::warning(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("%1 search engine plugin could not be installed.", "%1 is the name of the search engine").arg(plugin_name.toUtf8().data()));
     }
   }
   QString favicon;
   foreach(favicon, favicons) {
-    qDebug("Detected favicon %s in archive", favicon.toLocal8Bit().data());
+    qDebug("Detected favicon %s in archive", favicon.toUtf8().data());
     // Ok we have a favicon here
     QString plugin_name = favicon.split(QDir::separator()).last();
     plugin_name.chop(4); // Remove .png extension
@@ -457,7 +457,7 @@ void engineSelectDlg::installZipPlugin(QString path) {
     if(QFile::exists(iconPath)) {
       QFile::remove(iconPath);
     }
-    ZZIP_FILE* fp = zzip_file_open(dir, favicon.toLocal8Bit().data(), 0);
+    ZZIP_FILE* fp = zzip_file_open(dir, favicon.toUtf8().data(), 0);
     if(fp) {
       QFile dest_icon(iconPath);
       // Write icon
@@ -482,12 +482,12 @@ void engineSelectDlg::installZipPlugin(QString path) {
 #endif
 
 void engineSelectDlg::installPlugin(QString path, QString plugin_name) {
-  qDebug("Asked to install plugin at %s", path.toLocal8Bit().data());
+  qDebug("Asked to install plugin at %s", path.toUtf8().data());
   float new_version = misc::getPluginVersion(path);
   qDebug("Version to be installed: %.2f", new_version);
   if(!isUpdateNeeded(plugin_name, new_version)) {
     qDebug("Apparently update it not needed, we have a more recent version");
-    QMessageBox::information(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("A more recent version of %1 search engine plugin is already installed.", "%1 is the name of the search engine").arg(plugin_name.toLocal8Bit().data()));
+    QMessageBox::information(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("A more recent version of %1 search engine plugin is already installed.", "%1 is the name of the search engine").arg(plugin_name.toUtf8().data()));
     return;
   }
     // Process with install
@@ -509,12 +509,12 @@ void engineSelectDlg::installPlugin(QString path, QString plugin_name) {
         // restore backup
       QFile::copy(dest_path+".bak", dest_path);
       QFile::remove(dest_path+".bak");
-      QMessageBox::warning(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("%1 search engine plugin could not be updated, keeping old version.", "%1 is the name of the search engine").arg(plugin_name.toLocal8Bit().data()));
+      QMessageBox::warning(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("%1 search engine plugin could not be updated, keeping old version.", "%1 is the name of the search engine").arg(plugin_name.toUtf8().data()));
       return;
     } else {
         // Remove broken file
       QFile::remove(dest_path);
-      QMessageBox::warning(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("%1 search engine plugin could not be installed.", "%1 is the name of the search engine").arg(plugin_name.toLocal8Bit().data()));
+      QMessageBox::warning(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("%1 search engine plugin could not be installed.", "%1 is the name of the search engine").arg(plugin_name.toUtf8().data()));
       return;
     }
   }
@@ -525,10 +525,10 @@ void engineSelectDlg::installPlugin(QString path, QString plugin_name) {
     // Refresh plugin list
   loadSupportedSearchEngines();
   if(update) {
-    QMessageBox::information(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("%1 search engine plugin was successfully updated.", "%1 is the name of the search engine").arg(plugin_name.toLocal8Bit().data()));
+    QMessageBox::information(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("%1 search engine plugin was successfully updated.", "%1 is the name of the search engine").arg(plugin_name.toUtf8().data()));
     return;
   } else {
-    QMessageBox::information(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("%1 search engine plugin was successfully installed.", "%1 is the name of the search engine").arg(plugin_name.toLocal8Bit().data()));
+    QMessageBox::information(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("%1 search engine plugin was successfully installed.", "%1 is the name of the search engine").arg(plugin_name.toUtf8().data()));
     return;
   }
 }
@@ -595,17 +595,17 @@ bool engineSelectDlg::parseVersionsFile(QString versions_file, QString updateSer
     plugin_name.chop(1); // remove trailing ':'
     bool ok;
     float version = list.last().toFloat(&ok);
-    qDebug("read line %s: %.2f", plugin_name.toLocal8Bit().data(), version);
+    qDebug("read line %s: %.2f", plugin_name.toUtf8().data(), version);
     if(!ok) continue;
     file_correct = true;
     if(isUpdateNeeded(plugin_name, version)) {
-      qDebug("Plugin: %s is outdated", plugin_name.toLocal8Bit().data());
+      qDebug("Plugin: %s is outdated", plugin_name.toUtf8().data());
       // Downloading update
       downloader->downloadUrl(updateServer+plugin_name+".pyqBT"); // Actually this is really a .py
       downloader->downloadUrl(updateServer+plugin_name+".png");
       updated = true;
     }else {
-      qDebug("Plugin: %s is up to date", plugin_name.toLocal8Bit().data());
+      qDebug("Plugin: %s is up to date", plugin_name.toUtf8().data());
     }
   }
   // Close file
@@ -619,7 +619,7 @@ bool engineSelectDlg::parseVersionsFile(QString versions_file, QString updateSer
 }
 
 void engineSelectDlg::processDownloadedFile(QString url, QString filePath) {
-  qDebug("engineSelectDlg received %s", url.toLocal8Bit().data());
+  qDebug("engineSelectDlg received %s", url.toUtf8().data());
   if(url.endsWith("favicon.ico", Qt::CaseInsensitive)){
     // Icon downloaded
     QImage fileIcon;
@@ -677,7 +677,7 @@ void engineSelectDlg::processDownloadedFile(QString url, QString filePath) {
 
 void engineSelectDlg::handleDownloadFailure(QString url, QString reason) {
   if(url.endsWith("favicon.ico", Qt::CaseInsensitive)){
-    qDebug("Could not download favicon: %s, reason: %s", url.toLocal8Bit().data(), reason.toLocal8Bit().data());
+    qDebug("Could not download favicon: %s, reason: %s", url.toUtf8().data(), reason.toUtf8().data());
     return;
   }
   if(url == "http://www.dchris.eu/search_engine2/versions.txt") {
@@ -695,13 +695,13 @@ void engineSelectDlg::handleDownloadFailure(QString url, QString reason) {
     QString plugin_name = url.split('/').last();
     plugin_name.replace(".pyqBT", "", Qt::CaseInsensitive);
     plugin_name.replace(".py", "", Qt::CaseInsensitive);
-    QMessageBox::warning(this, tr("Search plugin update")+" -- "+tr("qBittorrent"), tr("Sorry, %1 search plugin install failed.", "%1 is the name of the search engine").arg(plugin_name.toLocal8Bit().data()));
+    QMessageBox::warning(this, tr("Search plugin update")+" -- "+tr("qBittorrent"), tr("Sorry, %1 search plugin install failed.", "%1 is the name of the search engine").arg(plugin_name.toUtf8().data()));
   }
 #ifdef HAVE_ZZIP
   if(url.endsWith(".zip", Qt::CaseInsensitive)) {
     QString plugin_name = url.split('/').last();
     plugin_name.replace(".zip", "", Qt::CaseInsensitive);
-    QMessageBox::warning(this, tr("Search plugin update")+" -- "+tr("qBittorrent"), tr("Sorry, %1 search plugin install failed.", "%1 is the name of the search engine").arg(plugin_name.toLocal8Bit().data()));
+    QMessageBox::warning(this, tr("Search plugin update")+" -- "+tr("qBittorrent"), tr("Sorry, %1 search plugin install failed.", "%1 is the name of the search engine").arg(plugin_name.toUtf8().data()));
   }
 #endif
 }

src/filterParserThread.h

@@ -199,9 +199,9 @@ class FilterParserThread : public QThread  {
               } else {
                 // IPv6, ex :   1fff:0000:0a88:85a3:0000:0000:ac1f:8001
                 IP = strStartIP.split(':');
-                address_v6 start = address_v6::from_string(strStartIP.remove(':', 0).toLocal8Bit().data());
+                address_v6 start = address_v6::from_string(strStartIP.remove(':', 0).toUtf8().data());
                 IP = strEndIP.split(':');
-                address_v6 last = address_v6::from_string(strEndIP.remove(':', 0).toLocal8Bit().data());
+                address_v6 last = address_v6::from_string(strEndIP.remove(':', 0).toUtf8().data());
                 // Apply to bittorrent session
                 filter.add_rule(start, last, ip_filter::blocked);
               }

src/httpconnection.cpp

@@ -56,12 +56,12 @@ HttpConnection::~HttpConnection()
 }
 
 void HttpConnection::processDownloadedFile(QString url, QString file_path) {
-  qDebug("URL %s successfully downloaded !", (const char*)url.toLocal8Bit());
+	qDebug("URL %s successfully downloaded !", (const char*)url.toUtf8());
 	emit torrentReadyToBeDownloaded(file_path, false, url, false);	
 }
 
 void HttpConnection::handleDownloadFailure(QString url, QString reason) {
-  std::cerr << "Could not download " << (const char*)url.toLocal8Bit() << ", reason: " << (const char*)reason.toLocal8Bit() << "\n";
+	std::cerr << "Could not download " << (const char*)url.toUtf8() << ", reason: " << (const char*)reason.toUtf8() << "\n";
 }
 
 void HttpConnection::read()
@@ -103,7 +103,7 @@ void HttpConnection::respond()
 {
 	//qDebug("Respond called");
 	QStringList auth = parser.value("Authorization").split(" ", QString::SkipEmptyParts);
-  if (auth.size() != 2 || QString::compare(auth[0], "Basic", Qt::CaseInsensitive) != 0 || !parent->isAuthorized(auth[1].toLocal8Bit()))
+	if (auth.size() != 2 || QString::compare(auth[0], "Basic", Qt::CaseInsensitive) != 0 || !parent->isAuthorized(auth[1].toUtf8()))
 	{
 		generator.setStatusLine(401, "Unauthorized");
 		generator.setValue("WWW-Authenticate",  "Basic realm=\"you know what\"");
@@ -187,7 +187,7 @@ void HttpConnection::respondCommand(QString command)
                 foreach(QString url, list){
 			url = url.trimmed();
 			if(!url.isEmpty()){
-        qDebug("Downloading url: %s", (const char*)url.toLocal8Bit());
+				qDebug("Downloading url: %s", (const char*)url.toUtf8());
 				emit UrlReadyToBeDownloaded(url);
 			}
 		}

src/httpresponsegenerator.cpp

@@ -39,7 +39,7 @@ void HttpResponseGenerator::setMessage(const QByteArray message)
 
 void HttpResponseGenerator::setMessage(const QString message)
 {
-  setMessage(message.QString::toLocal8Bit());
+	setMessage(message.QString::toUtf8());
 }
 
 void HttpResponseGenerator::stripMessage()
@@ -49,7 +49,7 @@ void HttpResponseGenerator::stripMessage()
 
 QByteArray HttpResponseGenerator::toByteArray() const
 {
-  return QHttpResponseHeader::toString().toLocal8Bit() + message;
+	return QHttpResponseHeader::toString().toUtf8() + message;
 }
 
 void HttpResponseGenerator::setContentTypeByExt(const QString ext)

src/httpserver.cpp

@@ -96,7 +96,7 @@ void HttpServer::onTimer() {
 void HttpServer::setAuthorization(QString username, QString password)
 {
 	QString cat = username + ":" + password;
-  base64 = QByteArray(cat.toLocal8Bit()).toBase64();
+	base64 = QByteArray(cat.toUtf8()).toBase64();
 }
 
 bool HttpServer::isAuthorized(QByteArray auth) const

src/icons.qrc

@@ -2,18 +2,51 @@
 <qresource>
   <file>Icons/add_file.png</file>
   <file>Icons/add_folder.png</file>
+  <file>Icons/bt_settings.png</file>
+  <file>Icons/button_cancel.png</file>
+  <file>Icons/button_ok.png</file>
+  <file>Icons/configure.png</file>
+  <file>Icons/connection.png</file>
+  <file>Icons/description.png</file>
   <file>Icons/downarrow.png</file>
+  <file>Icons/download.png</file>
+  <file>Icons/edit_clear.png</file>
+  <file>Icons/encrypted.png</file>
+  <file>Icons/file.png</file>
+  <file>Icons/filter.png</file>
+  <file>Icons/folder.png</file>
+  <file>Icons/gear.png</file>
   <file>Icons/gnome-shutdown.png</file>
+  <file>Icons/home.png</file>
   <file>Icons/loading.png</file>
   <file>Icons/locale.png</file>
+  <file>Icons/log.png</file>
+  <file>Icons/mascot.png</file>
   <file>Icons/money.png</file>
+  <file>Icons/newmsg.png</file>
+  <file>Icons/password.png</file>
+  <file>Icons/proxy.png</file>
+  <file>Icons/qbittorrent16.png</file>
+  <file>Icons/qbittorrent22.png</file>
+  <file>Icons/qbittorrent32.png</file>
   <file>Icons/refresh.png</file>
   <file>Icons/rss16.png</file>
   <file>Icons/rss32.png</file>
   <file>Icons/sphere.png</file>
   <file>Icons/sphere2.png</file>
+  <file>Icons/splash.png</file>
+  <file>Icons/star.png</file>
+  <file>Icons/style.png</file>
+  <file>Icons/subscribe.png</file>
+  <file>Icons/subscribe16.png</file>
+  <file>Icons/systemtray.png</file>
+  <file>Icons/time.png</file>
+  <file>Icons/unavailable.png</file>
+  <file>Icons/unsubscribe.png</file>
+  <file>Icons/unsubscribe16.png</file>
   <file>Icons/uparrow.png</file>
   <file>Icons/url.png</file>
+  <file>Icons/wizard.png</file>
   <file>Icons/flags/brazil.png</file>
   <file>Icons/flags/bulgaria.png</file>
   <file>Icons/flags/china.png</file>
@@ -41,33 +74,6 @@
   <file>Icons/flags/turkey.png</file>
   <file>Icons/flags/ukraine.png</file>
   <file>Icons/flags/united_kingdom.png</file>
-  <file>Icons/oxygen/browse.png</file>
-  <file>Icons/oxygen/bt_settings.png</file>
-  <file>Icons/oxygen/bug.png</file>
-  <file>Icons/oxygen/button_cancel.png</file>
-  <file>Icons/oxygen/button_ok.png</file>
-  <file>Icons/oxygen/configure.png</file>
-  <file>Icons/oxygen/connection.png</file>
-  <file>Icons/oxygen/download.png</file>
-  <file>Icons/oxygen/edit-clear.png</file>
-  <file>Icons/oxygen/edit-copy.png</file>
-  <file>Icons/oxygen/edit-cut.png</file>
-  <file>Icons/oxygen/edit-paste.png</file>
-  <file>Icons/oxygen/edit_clear.png</file>
-  <file>Icons/oxygen/encrypted.png</file>
-  <file>Icons/oxygen/file.png</file>
-  <file>Icons/oxygen/filter.png</file>
-  <file>Icons/oxygen/folder.png</file>
-  <file>Icons/oxygen/gear.png</file>
-  <file>Icons/oxygen/log.png</file>
-  <file>Icons/oxygen/proxy.png</file>
-  <file>Icons/oxygen/subscribe.png</file>
-  <file>Icons/oxygen/subscribe16.png</file>
-  <file>Icons/oxygen/time.png</file>
-  <file>Icons/oxygen/unavailable.png</file>
-  <file>Icons/oxygen/unsubscribe.png</file>
-  <file>Icons/oxygen/unsubscribe16.png</file>
-  <file>Icons/oxygen/webui.png</file>
   <file>Icons/skin/add.png</file>
   <file>Icons/skin/connected.png</file>
   <file>Icons/skin/decrease.png</file>
@@ -79,7 +85,6 @@
   <file>Icons/skin/firewalled.png</file>
   <file>Icons/skin/increase.png</file>
   <file>Icons/skin/info.png</file>
-  <file>Icons/skin/mascot.png</file>
   <file>Icons/skin/new.png</file>
   <file>Icons/skin/open.png</file>
   <file>Icons/skin/pause.png</file>
@@ -90,15 +95,11 @@
   <file>Icons/skin/preview.png</file>
   <file>Icons/skin/properties.png</file>
   <file>Icons/skin/qb_question.png</file>
-  <file>Icons/skin/qbittorrent16.png</file>
-  <file>Icons/skin/qbittorrent22.png</file>
-  <file>Icons/skin/qbittorrent32.png</file>
   <file>Icons/skin/queued.png</file>
   <file>Icons/skin/remove.png</file>
   <file>Icons/skin/search.png</file>
   <file>Icons/skin/seeding.png</file>
   <file>Icons/skin/settings.png</file>
-  <file>Icons/skin/splash.png</file>
   <file>Icons/skin/stalled.png</file>
   <file>Icons/skin/tabs.gif</file>
   <file>Icons/skin/url.png</file>