Merge pull request #18466 from sledgehammer999/icon_for_status_pause

Use previous color for pause icon for indicating status
qbittorrent · Jan 27, 2023 · d256db5 · d256db5
2 parents c6a1b97 + 10153f0
commit d256db5
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 5 deletions.
diff --git 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
@@ -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
@@ -336,6 +336,7 @@
  <file>splash.png</file>
  <file>stalledDL.svg</file>
  <file>stalledUP.svg</file>
+ <file>stopped.svg</file>
  <file>system-log-out.svg</file>
  <file>tags.svg</file>
  <file>task-complete.svg</file>

diff --git a/src/icons/stopped.svg b/src/icons/stopped.svg
diff --git a/src/webui/www/private/images/stopped.svg b/src/webui/www/private/images/stopped.svg
diff --git a/src/webui/www/private/images/torrent-stop.svg b/src/webui/www/private/images/torrent-stop.svg
diff --git 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
@@ -8,7 +8,7 @@
  <li id="seeding_filter"><a href="#" onclick="setFilter('seeding');return false;"><img src="images/upload.svg" alt="Seeding" />QBT_TR(Seeding (0))QBT_TR[CONTEXT=StatusFilterWidget]</a></li>
  <li id="completed_filter"><a href="#" onclick="setFilter('completed');return false;"><img src="images/checked-completed.svg" alt="Completed" />QBT_TR(Completed (0))QBT_TR[CONTEXT=StatusFilterWidget]</a></li>
  <li id="resumed_filter"><a href="#" onclick="setFilter('resumed');return false;"><img src="images/torrent-start.svg" alt="Resumed" />QBT_TR(Resumed (0))QBT_TR[CONTEXT=StatusFilterWidget]</a></li>
- <li id="paused_filter"><a href="#" onclick="setFilter('paused');return false;"><img src="images/torrent-stop.svg" alt="Paused" />QBT_TR(Paused (0))QBT_TR[CONTEXT=StatusFilterWidget]</a></li>
+ <li id="paused_filter"><a href="#" onclick="setFilter('paused');return false;"><img src="images/stopped.svg" alt="Paused" />QBT_TR(Paused (0))QBT_TR[CONTEXT=StatusFilterWidget]</a></li>
  <li id="active_filter"><a href="#" onclick="setFilter('active');return false;"><img src="images/filter-active.svg" alt="Active" />QBT_TR(Active (0))QBT_TR[CONTEXT=StatusFilterWidget]</a></li>
  <li id="inactive_filter"><a href="#" onclick="setFilter('inactive');return false;"><img src="images/filter-inactive.svg" alt="Inactive" />QBT_TR(Inactive (0))QBT_TR[CONTEXT=StatusFilterWidget]</a></li>
  <li id="stalled_filter"><a href="#" onclick="setFilter('stalled');return false;"><img src="images/filter-stalled.svg" alt="Stalled" />QBT_TR(Stalled (0))QBT_TR[CONTEXT=StatusFilterWidget]</a></li>

diff --git a/src/webui/www/webui.qrc b/src/webui/www/webui.qrc
@@ -346,6 +346,7 @@
  <file>private/images/spinner.gif</file>
  <file>private/images/stalledDL.svg</file>
  <file>private/images/stalledUP.svg</file>
+ <file>private/images/stopped.svg</file>
  <file>private/images/system-log-out.svg</file>
  <file>private/images/tabs.gif</file>
  <file>private/images/tags.svg</file>