From 870bb42e4f3b80ce21b162068585d5710c012c71 Mon Sep 17 00:00:00 2001 From: sledgehammer999 Date: Fri, 27 Jan 2023 17:42:48 +0200 Subject: [PATCH 1/2] [WebUI] Use new pause icon color for toolbar/menu This the webui part of PR #18110 --- src/webui/www/private/images/torrent-stop.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/webui/www/private/images/torrent-stop.svg b/src/webui/www/private/images/torrent-stop.svg index 48141141c..6a6f574f0 100644 --- a/src/webui/www/private/images/torrent-stop.svg +++ b/src/webui/www/private/images/torrent-stop.svg @@ -1 +1 @@ - \ No newline at end of file + From 10153f006371eb1d992530a85b8c2a6b9ef7758d Mon Sep 17 00:00:00 2001 From: sledgehammer999 Date: Fri, 27 Jan 2023 17:46:39 +0200 Subject: [PATCH 2/2] Use previous color for pause icon for indicating status Affects transfer list and status filters Related to PR #18110 --- src/gui/transferlistfilterswidget.cpp | 2 +- src/gui/transferlistmodel.cpp | 2 +- src/icons/icons.qrc | 1 + src/icons/stopped.svg | 1 + src/webui/www/private/images/stopped.svg | 1 + src/webui/www/private/scripts/dynamicTable.js | 2 +- src/webui/www/private/views/filters.html | 2 +- src/webui/www/webui.qrc | 1 + 8 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 src/icons/stopped.svg create mode 100644 src/webui/www/private/images/stopped.svg diff --git a/src/gui/transferlistfilterswidget.cpp b/src/gui/transferlistfilterswidget.cpp index 5d4da8d24..394596d78 100644 --- a/src/gui/transferlistfilterswidget.cpp +++ b/src/gui/transferlistfilterswidget.cpp @@ -188,7 +188,7 @@ StatusFilterWidget::StatusFilterWidget(QWidget *parent, TransferListWidget *tran resumed->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"torrent-start"_qs, u"media-playback-start"_qs)); auto *paused = new QListWidgetItem(this); paused->setData(Qt::DisplayRole, tr("Paused (0)")); - paused->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"torrent-stop"_qs, u"media-playback-pause"_qs)); + paused->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"stopped"_qs, u"media-playback-pause"_qs)); auto *active = new QListWidgetItem(this); active->setData(Qt::DisplayRole, tr("Active (0)")); active->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"filter-active"_qs, u"filteractive"_qs)); diff --git a/src/gui/transferlistmodel.cpp b/src/gui/transferlistmodel.cpp index 4547935d1..71edfab78 100644 --- a/src/gui/transferlistmodel.cpp +++ b/src/gui/transferlistmodel.cpp @@ -162,7 +162,7 @@ TransferListModel::TransferListModel(QObject *parent) , m_completedIcon {UIThemeManager::instance()->getIcon(u"checked-completed"_qs, u"completed"_qs)} , m_downloadingIcon {UIThemeManager::instance()->getIcon(u"downloading"_qs)} , m_errorIcon {UIThemeManager::instance()->getIcon(u"error"_qs)} - , m_pausedIcon {UIThemeManager::instance()->getIcon(u"torrent-stop"_qs, u"media-playback-pause"_qs)} + , m_pausedIcon {UIThemeManager::instance()->getIcon(u"stopped"_qs, u"media-playback-pause"_qs)} , m_queuedIcon {UIThemeManager::instance()->getIcon(u"queued"_qs)} , m_stalledDLIcon {UIThemeManager::instance()->getIcon(u"stalledDL"_qs)} , m_stalledUPIcon {UIThemeManager::instance()->getIcon(u"stalledUP"_qs)} diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc index 68d214309..30bb4f8f0 100644 --- a/src/icons/icons.qrc +++ b/src/icons/icons.qrc @@ -336,6 +336,7 @@ splash.png stalledDL.svg stalledUP.svg + stopped.svg system-log-out.svg tags.svg task-complete.svg diff --git a/src/icons/stopped.svg b/src/icons/stopped.svg new file mode 100644 index 000000000..06140f883 --- /dev/null +++ b/src/icons/stopped.svg @@ -0,0 +1 @@ + diff --git a/src/webui/www/private/images/stopped.svg b/src/webui/www/private/images/stopped.svg new file mode 100644 index 000000000..06140f883 --- /dev/null +++ b/src/webui/www/private/images/stopped.svg @@ -0,0 +1 @@ + diff --git a/src/webui/www/private/scripts/dynamicTable.js b/src/webui/www/private/scripts/dynamicTable.js index 426c88c0f..39cac136d 100644 --- a/src/webui/www/private/scripts/dynamicTable.js +++ b/src/webui/www/private/scripts/dynamicTable.js @@ -972,7 +972,7 @@ window.qBittorrent.DynamicTable = (function() { break; case "pausedDL": state = "torrent-stop"; - img_path = "images/torrent-stop.svg"; + img_path = "images/stopped.svg"; break; case "pausedUP": state = "checked-completed"; diff --git a/src/webui/www/private/views/filters.html b/src/webui/www/private/views/filters.html index b87fd552e..3e07e09d2 100644 --- a/src/webui/www/private/views/filters.html +++ b/src/webui/www/private/views/filters.html @@ -8,7 +8,7 @@
  • SeedingQBT_TR(Seeding (0))QBT_TR[CONTEXT=StatusFilterWidget]
  • CompletedQBT_TR(Completed (0))QBT_TR[CONTEXT=StatusFilterWidget]
  • ResumedQBT_TR(Resumed (0))QBT_TR[CONTEXT=StatusFilterWidget]
    • -
  • PausedQBT_TR(Paused (0))QBT_TR[CONTEXT=StatusFilterWidget]
    • +
  • PausedQBT_TR(Paused (0))QBT_TR[CONTEXT=StatusFilterWidget]
  • ActiveQBT_TR(Active (0))QBT_TR[CONTEXT=StatusFilterWidget]
  • InactiveQBT_TR(Inactive (0))QBT_TR[CONTEXT=StatusFilterWidget]
  • StalledQBT_TR(Stalled (0))QBT_TR[CONTEXT=StatusFilterWidget]
    • diff --git a/src/webui/www/webui.qrc b/src/webui/www/webui.qrc index bdf1b6c8b..e26ba2e93 100644 --- a/src/webui/www/webui.qrc +++ b/src/webui/www/webui.qrc @@ -346,6 +346,7 @@ private/images/spinner.gif private/images/stalledDL.svg private/images/stalledUP.svg + private/images/stopped.svg private/images/system-log-out.svg private/images/tabs.gif private/images/tags.svg