- New torrent status icons by Mateusz Tobola

src/icons.qrc

@@ -10,23 +10,32 @@
   <file>Icons/sphere.png</file>
   <file>Icons/uparrow.png</file>
   <file>Icons/rss16.png</file>
+  <file>Icons/skin/checkingUP.png</file>
   <file>Icons/skin/play.png</file>
   <file>Icons/skin/qbittorrent22.png</file>
+  <file>Icons/skin/queuedDL.png</file>
   <file>Icons/skin/new.png</file>
+  <file>Icons/skin/queuedUP.png</file>
   <file>Icons/skin/preview.png</file>
   <file>Icons/skin/stalled.png</file>
   <file>Icons/skin/delete.png</file>
   <file>Icons/skin/url.png</file>
+  <file>Icons/skin/stalledUP.png</file>
+  <file>Icons/skin/filteractive.png</file>
   <file>Icons/skin/connected.png</file>
+  <file>Icons/skin/pausedDL.png</file>
   <file>Icons/skin/mascot.png</file>
+  <file>Icons/skin/pausedUP.png</file>
   <file>Icons/skin/seeding.png</file>
   <file>Icons/skin/increase.png</file>
   <file>Icons/skin/qbittorrent32.png</file>
   <file>Icons/skin/paused.png</file>
+  <file>Icons/skin/stalledDL.png</file>
   <file>Icons/skin/qb_question.png</file>
   <file>Icons/skin/open.png</file>
   <file>Icons/skin/qbittorrent16.png</file>
   <file>Icons/skin/downloading.png</file>
+  <file>Icons/skin/filterinactive.png</file>
   <file>Icons/skin/pause_all.png</file>
   <file>Icons/skin/play_all.png</file>
   <file>Icons/skin/pause.png</file>
@@ -35,11 +44,14 @@
   <file>Icons/skin/info.png</file>
   <file>Icons/skin/tabs.gif</file>
   <file>Icons/skin/delete_perm.png</file>
+  <file>Icons/skin/checkingDL.png</file>
   <file>Icons/skin/settings.png</file>
   <file>Icons/skin/exit.png</file>
   <file>Icons/skin/delete_all.png</file>
   <file>Icons/skin/splash.png</file>
   <file>Icons/skin/decrease.png</file>
+  <file>Icons/skin/uploading.png</file>
+  <file>Icons/skin/filterall.png</file>
   <file>Icons/flags/czech.png</file>
   <file>Icons/flags/serbia.png</file>
   <file>Icons/flags/iceland.png</file>
@@ -123,7 +135,6 @@
   <file>Icons/oxygen/download.png</file>
   <file>Icons/oxygen/application-x-kgetlist-no.png</file>
   <file>Icons/oxygen/gear.png</file>
-  <file>Icons/oxygen/draw-triangle2.png</file>
   <file>Icons/oxygen/remove.png</file>
   <file>Icons/oxygen/dialog-warning.png</file>
   <file>Icons/oxygen/peer.png</file>
@@ -148,7 +159,6 @@
   <file>Icons/oxygen/urlseed.png</file>
   <file>Icons/oxygen/edit-cut.png</file>
   <file>Icons/oxygen/unsubscribe.png</file>
-  <file>Icons/oxygen/draw-rectangle.png</file>
   <file>Icons/oxygen/subscribe16.png</file>
 </qresource>
 </RCC>

src/transferlistfilterswidget.h

@@ -49,19 +49,19 @@ public:
     // Add filters
     QListWidgetItem *all = new QListWidgetItem(this);
     all->setData(Qt::DisplayRole, tr("All") + " (0)");
-    all->setData(Qt::DecorationRole, QIcon(":/Icons/oxygen/folder-remote16.png"));
+    all->setData(Qt::DecorationRole, QIcon(":/Icons/skin/filterall.png"));
     QListWidgetItem *downloading = new QListWidgetItem(this);
     downloading->setData(Qt::DisplayRole, tr("Downloading") + " (0)");
     downloading->setData(Qt::DecorationRole, QIcon(":/Icons/skin/downloading.png"));
     QListWidgetItem *completed = new QListWidgetItem(this);
     completed->setData(Qt::DisplayRole, tr("Completed") + " (0)");
-    completed->setData(Qt::DecorationRole, QIcon(":/Icons/skin/seeding.png"));
+    completed->setData(Qt::DecorationRole, QIcon(":/Icons/skin/uploading.png"));
     QListWidgetItem *active = new QListWidgetItem(this);
     active->setData(Qt::DisplayRole, tr("Active") + " (0)");
-    active->setData(Qt::DecorationRole, QIcon(":/Icons/oxygen/draw-triangle2.png"));
+    active->setData(Qt::DecorationRole, QIcon(":/Icons/skin/filteractive.png"));
     QListWidgetItem *inactive = new QListWidgetItem(this);
     inactive->setData(Qt::DisplayRole, tr("Inactive") + " (0)");
-    inactive->setData(Qt::DecorationRole, QIcon(":/Icons/oxygen/draw-rectangle.png"));
+    inactive->setData(Qt::DecorationRole, QIcon(":/Icons/skin/filterinactive.png"));
 
     // SIGNAL/SLOT
     connect(this, SIGNAL(currentRowChanged(int)), transferList, SLOT(applyFilter(int)));

src/transferlistwidget.cpp

@@ -155,18 +155,20 @@ void TransferListWidget::addTorrent(QTorrentHandle& h) {
     listModel->setData(listModel->index(row, TR_HASH), QVariant(h.hash()));
     // Pause torrent if it is
     if(h.is_paused()) {
-      listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/paused.png"))), Qt::DecorationRole);
+      if(h.is_seed()) {
-      if(h.is_seed())
         listModel->setData(listModel->index(row, TR_STATUS), STATE_PAUSED_UP);
-      else
+        listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/pausedUP.png"))), Qt::DecorationRole);
+      } else {
         listModel->setData(listModel->index(row, TR_STATUS), STATE_PAUSED_DL);
+        listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/pausedDL.png"))), Qt::DecorationRole);
+      }
       //setRowColor(row, QString::fromUtf8("red"));
     }else{
       if(h.is_seed()) {
-        listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png"))), Qt::DecorationRole);
+        listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/stalledUP.png"))), Qt::DecorationRole);
         listModel->setData(listModel->index(row, TR_STATUS), STATE_STALLED_UP);
       } else {
-        listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/stalled.png"))), Qt::DecorationRole);
+        listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/stalledDL.png"))), Qt::DecorationRole);
         listModel->setData(listModel->index(row, TR_STATUS), STATE_STALLED_DL);
       }
       //setRowColor(row, QString::fromUtf8("grey"));
@@ -204,11 +206,12 @@ void TransferListWidget::pauseTorrent(int row, bool refresh_list) {
   listModel->setData(listModel->index(row, TR_DLSPEED), QVariant((double)0.0));
   listModel->setData(listModel->index(row, TR_UPSPEED), QVariant((double)0.0));
   listModel->setData(listModel->index(row, TR_ETA), QVariant((qlonglong)-1));
-  listModel->setData(listModel->index(row, TR_NAME), QIcon(QString::fromUtf8(":/Icons/skin/paused.png")), Qt::DecorationRole);
   if(h.is_seed()) {
     listModel->setData(listModel->index(row, TR_STATUS), STATE_PAUSED_UP);
+    listModel->setData(listModel->index(row, TR_NAME), QIcon(QString::fromUtf8(":/Icons/skin/pausedUP.png")), Qt::DecorationRole);
   } else {
     listModel->setData(listModel->index(row, TR_STATUS), STATE_PAUSED_DL);
+    listModel->setData(listModel->index(row, TR_NAME), QIcon(QString::fromUtf8(":/Icons/skin/pausedDL.png")), Qt::DecorationRole);
   }
   listModel->setData(listModel->index(row, TR_SEEDS), QVariant(0.0));
   listModel->setData(listModel->index(row, TR_PEERS), QVariant(0.0));
@@ -226,10 +229,10 @@ void TransferListWidget::resumeTorrent(int row, bool refresh_list) {
   QTorrentHandle h = BTSession->getTorrentHandle(getHashFromRow(row));
   if(!h.is_valid()) return;
   if(h.is_seed()) {
-    listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(":/Icons/skin/seeding.png")), Qt::DecorationRole);
+    listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(":/Icons/skin/stalledUP.png")), Qt::DecorationRole);
     listModel->setData(listModel->index(row, TR_STATUS), STATE_STALLED_UP);
   } else {
-    listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(":/Icons/skin/stalled.png")), Qt::DecorationRole);
+    listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(":/Icons/skin/stalledDL.png")), Qt::DecorationRole);
     listModel->setData(listModel->index(row, TR_STATUS), STATE_STALLED_DL);
   }
   if(refresh_list)
@@ -261,20 +264,24 @@ int TransferListWidget::updateTorrent(int row) {
       listModel->setData(listModel->index(row, TR_PRIORITY), QVariant((int)h.queue_position()));
       if(h.is_queued()) {
         if(h.state() == torrent_status::checking_files || h.state() == torrent_status::queued_for_checking) {
-          listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/oxygen/run-build.png"))), Qt::DecorationRole);
           listModel->setData(listModel->index(row, TR_PROGRESS), QVariant((double)h.progress()));
-          if(h.is_seed())
+          if(h.is_seed()) {
             s = STATE_CHECKING_UP;
-          else
+            listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/checkingUP.png"))), Qt::DecorationRole);
+          } else {
             s = STATE_CHECKING_DL;
+            listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/checkingDL.png"))), Qt::DecorationRole);
+          }
           listModel->setData(listModel->index(row, TR_STATUS), s);
         }else {
-          listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/oxygen/mail-queue.png"))), Qt::DecorationRole);
           listModel->setData(listModel->index(row, TR_ETA), QVariant((qlonglong)-1));
-          if(h.is_seed())
+          if(h.is_seed()) {
-            s = STATE_QUEUED_UP;
+            s = STATE_QUEUED_UP;            
-          else
+            listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/queuedUP.png"))), Qt::DecorationRole);
+          } else {
             s =STATE_QUEUED_DL;
+            listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/queuedDL.png"))), Qt::DecorationRole);
+          }
           listModel->setData(listModel->index(row, TR_STATUS), s);
         }
         // Reset speeds and seeds/leech
@@ -312,11 +319,15 @@ int TransferListWidget::updateTorrent(int row) {
     case torrent_status::checking_files:
     case torrent_status::queued_for_checking:
     case torrent_status::checking_resume_data:
-      listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/oxygen/run-build.png"))), Qt::DecorationRole);
+      if(h.is_seed()) {
-      if(h.is_seed())
         s = STATE_CHECKING_UP;
-      else
+
+      listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/checkingUP.png"))), Qt::DecorationRole);
+      } else {
         s = STATE_CHECKING_DL;
+
+      listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/checkingDL.png"))), Qt::DecorationRole);
+      }
       listModel->setData(listModel->index(row, TR_PROGRESS), QVariant((double)h.progress()));
       listModel->setData(listModel->index(row, TR_ETA), QVariant((qlonglong)-1));
       //setRowColor(row, QString::fromUtf8("grey"));
@@ -329,7 +340,7 @@ int TransferListWidget::updateTorrent(int row) {
         s = STATE_DOWNLOADING;
         //setRowColor(row, QString::fromUtf8("green"));
       }else{
-        listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/stalled.png"))), Qt::DecorationRole);
+        listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/stalledDL.png"))), Qt::DecorationRole);
         listModel->setData(listModel->index(row, TR_ETA), QVariant((qlonglong)-1));
         s = STATE_STALLED_DL;
         //setRowColor(row, QApplication::palette().color(QPalette::WindowText));
@@ -364,11 +375,11 @@ void TransferListWidget::setFinished(QTorrentHandle &h) {
     row = getRowFromHash(h.hash());
     if(row >= 0) {
       if(h.is_paused()) {
-        listModel->setData(listModel->index(row, TR_NAME), QIcon(":/Icons/skin/paused.png"), Qt::DecorationRole);
+        listModel->setData(listModel->index(row, TR_NAME), QIcon(":/Icons/skin/pausedUP.png"), Qt::DecorationRole);
         listModel->setData(listModel->index(row, TR_STATUS), STATE_PAUSED_UP);
         //setRowColor(row, "red");
       }else{
-        listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(":/Icons/skin/seeding.png")), Qt::DecorationRole);
+        listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(":/Icons/skin/stalledUP.png")), Qt::DecorationRole);
         listModel->setData(listModel->index(row, TR_STATUS), STATE_STALLED_UP);
         //setRowColor(row, "orange");
       }