diff --git a/src/Icons/oxygen/draw-rectangle.png b/src/Icons/oxygen/draw-rectangle.png deleted file mode 100644 index 04e093770..000000000 Binary files a/src/Icons/oxygen/draw-rectangle.png and /dev/null differ diff --git a/src/Icons/oxygen/draw-triangle2.png b/src/Icons/oxygen/draw-triangle2.png deleted file mode 100644 index 3c29299bb..000000000 Binary files a/src/Icons/oxygen/draw-triangle2.png and /dev/null differ diff --git a/src/Icons/skin/checkingDL.png b/src/Icons/skin/checkingDL.png new file mode 100644 index 000000000..c40034552 Binary files /dev/null and b/src/Icons/skin/checkingDL.png differ diff --git a/src/Icons/skin/checkingUP.png b/src/Icons/skin/checkingUP.png new file mode 100644 index 000000000..3f1c6247b Binary files /dev/null and b/src/Icons/skin/checkingUP.png differ diff --git a/src/Icons/skin/downloading.png b/src/Icons/skin/downloading.png index e54418cf6..e06a5898c 100644 Binary files a/src/Icons/skin/downloading.png and b/src/Icons/skin/downloading.png differ diff --git a/src/Icons/skin/filteractive.png b/src/Icons/skin/filteractive.png new file mode 100644 index 000000000..f72b4406c Binary files /dev/null and b/src/Icons/skin/filteractive.png differ diff --git a/src/Icons/skin/filterall.png b/src/Icons/skin/filterall.png new file mode 100644 index 000000000..69d2e56f2 Binary files /dev/null and b/src/Icons/skin/filterall.png differ diff --git a/src/Icons/skin/filterinactive.png b/src/Icons/skin/filterinactive.png new file mode 100644 index 000000000..b0a44063b Binary files /dev/null and b/src/Icons/skin/filterinactive.png differ diff --git a/src/Icons/skin/pausedDL.png b/src/Icons/skin/pausedDL.png new file mode 100644 index 000000000..9b5a283f0 Binary files /dev/null and b/src/Icons/skin/pausedDL.png differ diff --git a/src/Icons/skin/pausedUP.png b/src/Icons/skin/pausedUP.png new file mode 100644 index 000000000..d4e3939f4 Binary files /dev/null and b/src/Icons/skin/pausedUP.png differ diff --git a/src/Icons/skin/queuedDL.png b/src/Icons/skin/queuedDL.png new file mode 100644 index 000000000..272cb5709 Binary files /dev/null and b/src/Icons/skin/queuedDL.png differ diff --git a/src/Icons/skin/queuedUP.png b/src/Icons/skin/queuedUP.png new file mode 100644 index 000000000..94ed8268d Binary files /dev/null and b/src/Icons/skin/queuedUP.png differ diff --git a/src/Icons/skin/stalledDL.png b/src/Icons/skin/stalledDL.png new file mode 100644 index 000000000..ef2438eb8 Binary files /dev/null and b/src/Icons/skin/stalledDL.png differ diff --git a/src/Icons/skin/stalledUP.png b/src/Icons/skin/stalledUP.png new file mode 100644 index 000000000..dd487b432 Binary files /dev/null and b/src/Icons/skin/stalledUP.png differ diff --git a/src/Icons/skin/uploading.png b/src/Icons/skin/uploading.png new file mode 100644 index 000000000..e1ebf3f69 Binary files /dev/null and b/src/Icons/skin/uploading.png differ diff --git a/src/icons.qrc b/src/icons.qrc index 475cef60e..65d03e0bf 100644 --- a/src/icons.qrc +++ b/src/icons.qrc @@ -10,23 +10,32 @@ Icons/sphere.png Icons/uparrow.png Icons/rss16.png + Icons/skin/checkingUP.png Icons/skin/play.png Icons/skin/qbittorrent22.png + Icons/skin/queuedDL.png Icons/skin/new.png + Icons/skin/queuedUP.png Icons/skin/preview.png Icons/skin/stalled.png Icons/skin/delete.png Icons/skin/url.png + Icons/skin/stalledUP.png + Icons/skin/filteractive.png Icons/skin/connected.png + Icons/skin/pausedDL.png Icons/skin/mascot.png + Icons/skin/pausedUP.png Icons/skin/seeding.png Icons/skin/increase.png Icons/skin/qbittorrent32.png Icons/skin/paused.png + Icons/skin/stalledDL.png Icons/skin/qb_question.png Icons/skin/open.png Icons/skin/qbittorrent16.png Icons/skin/downloading.png + Icons/skin/filterinactive.png Icons/skin/pause_all.png Icons/skin/play_all.png Icons/skin/pause.png @@ -35,11 +44,14 @@ Icons/skin/info.png Icons/skin/tabs.gif Icons/skin/delete_perm.png + Icons/skin/checkingDL.png Icons/skin/settings.png Icons/skin/exit.png Icons/skin/delete_all.png Icons/skin/splash.png Icons/skin/decrease.png + Icons/skin/uploading.png + Icons/skin/filterall.png Icons/flags/czech.png Icons/flags/serbia.png Icons/flags/iceland.png @@ -123,7 +135,6 @@ Icons/oxygen/download.png Icons/oxygen/application-x-kgetlist-no.png Icons/oxygen/gear.png - Icons/oxygen/draw-triangle2.png Icons/oxygen/remove.png Icons/oxygen/dialog-warning.png Icons/oxygen/peer.png @@ -148,7 +159,6 @@ Icons/oxygen/urlseed.png Icons/oxygen/edit-cut.png Icons/oxygen/unsubscribe.png - Icons/oxygen/draw-rectangle.png Icons/oxygen/subscribe16.png \ No newline at end of file diff --git a/src/transferlistfilterswidget.h b/src/transferlistfilterswidget.h index 0495ec602..026c6100a 100644 --- a/src/transferlistfilterswidget.h +++ b/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))); diff --git a/src/transferlistwidget.cpp b/src/transferlistwidget.cpp index 38bba3ac4..c83dff601 100644 --- a/src/transferlistwidget.cpp +++ b/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()) - s = STATE_QUEUED_UP; - else + if(h.is_seed()) { + s = STATE_QUEUED_UP; + 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"); }