From 748226be299376876f4139b88d1cff6bf8d87696 Mon Sep 17 00:00:00 2001 From: "Nowshed H. Imran" Date: Sun, 31 Jul 2022 11:31:38 +0600 Subject: [PATCH] Rename Icons according to the actions Fixes #17357. PR #17366. --- src/gui/categoryfilterwidget.cpp | 4 +- src/gui/cookiesdialog.cpp | 2 +- src/gui/mainwindow.cpp | 12 ++--- src/gui/optionsdialog.cpp | 10 ++-- src/gui/properties/peerlistwidget.cpp | 4 +- src/gui/properties/propertieswidget.cpp | 2 +- src/gui/properties/proptabbar.cpp | 6 +-- src/gui/rss/automatedrssdownloader.cpp | 2 +- src/gui/rss/feedlistwidget.cpp | 6 +-- src/gui/rss/rsswidget.cpp | 2 +- src/gui/search/searchjobwidget.cpp | 6 +-- src/gui/statusbar.cpp | 2 +- src/gui/tagfilterwidget.cpp | 4 +- src/gui/transferlistfilterswidget.cpp | 14 +++--- src/gui/transferlistmodel.cpp | 4 +- src/gui/transferlistwidget.cpp | 10 ++-- ...cation-rss+xml.svg => application-rss.svg} | 0 ...ion-x-mswinurl.svg => application-url.svg} | 0 ...rowser-cookies.svg => browser-cookies.svg} | 0 .../{office-chart-line.svg => chart-line.svg} | 0 .../{inode-directory.svg => directory.svg} | 0 ...et-max-download-speed.svg => download.svg} | 0 src/icons/icons.qrc | 48 +++++++++---------- .../{mail-folder-inbox.svg => mail-inbox.svg} | 0 .../{user-group-new.svg => peers-add.svg} | 0 ...user-group-delete.svg => peers-remove.svg} | 0 src/icons/{edit-find-user.svg => peers.svg} | 0 ...ces-other.svg => preferences-advanced.svg} | 0 ...network.svg => preferences-bittorrent.svg} | 0 .../{webui.svg => preferences-webui.svg} | 0 .../{kt-magnet.svg => torrent-magnet.svg} | 0 ...k-forward.svg => torrent-start-forced.svg} | 0 ...a-playback-start.svg => torrent-start.svg} | 0 ...ia-playback-pause.svg => torrent-stop.svg} | 0 ...kt-set-max-upload-speed.svg => upload.svg} | 0 src/webui/www/private/index.html | 44 ++++++++--------- src/webui/www/private/scripts/dynamicTable.js | 28 ++++++++--- src/webui/www/private/views/filters.html | 6 +-- src/webui/www/private/views/rss.html | 2 +- src/webui/www/private/views/search.html | 4 +- 40 files changed, 119 insertions(+), 103 deletions(-) rename src/icons/{application-rss+xml.svg => application-rss.svg} (100%) rename src/icons/{application-x-mswinurl.svg => application-url.svg} (100%) rename src/icons/{preferences-web-browser-cookies.svg => browser-cookies.svg} (100%) rename src/icons/{office-chart-line.svg => chart-line.svg} (100%) rename src/icons/{inode-directory.svg => directory.svg} (100%) rename src/icons/{kt-set-max-download-speed.svg => download.svg} (100%) rename src/icons/{mail-folder-inbox.svg => mail-inbox.svg} (100%) rename src/icons/{user-group-new.svg => peers-add.svg} (100%) rename src/icons/{user-group-delete.svg => peers-remove.svg} (100%) rename src/icons/{edit-find-user.svg => peers.svg} (100%) rename src/icons/{preferences-other.svg => preferences-advanced.svg} (100%) rename src/icons/{preferences-system-network.svg => preferences-bittorrent.svg} (100%) rename src/icons/{webui.svg => preferences-webui.svg} (100%) rename src/icons/{kt-magnet.svg => torrent-magnet.svg} (100%) rename src/icons/{media-seek-forward.svg => torrent-start-forced.svg} (100%) rename src/icons/{media-playback-start.svg => torrent-start.svg} (100%) rename src/icons/{media-playback-pause.svg => torrent-stop.svg} (100%) rename src/icons/{kt-set-max-upload-speed.svg => upload.svg} (100%) diff --git a/src/gui/categoryfilterwidget.cpp b/src/gui/categoryfilterwidget.cpp index 4f822a6e1..8e4253ac8 100644 --- a/src/gui/categoryfilterwidget.cpp +++ b/src/gui/categoryfilterwidget.cpp @@ -130,9 +130,9 @@ void CategoryFilterWidget::showMenu() menu->addAction(UIThemeManager::instance()->getIcon(u"edit-clear"_qs), tr("Remove unused categories") , this, &CategoryFilterWidget::removeUnusedCategories); menu->addSeparator(); - menu->addAction(UIThemeManager::instance()->getIcon(u"media-playback-start"_qs), tr("Resume torrents") + menu->addAction(UIThemeManager::instance()->getIcon(u"torrent-start"_qs), tr("Resume torrents") , this, &CategoryFilterWidget::actionResumeTorrentsTriggered); - menu->addAction(UIThemeManager::instance()->getIcon(u"media-playback-pause"_qs), tr("Pause torrents") + menu->addAction(UIThemeManager::instance()->getIcon(u"torrent-stop"_qs), tr("Pause torrents") , this, &CategoryFilterWidget::actionPauseTorrentsTriggered); menu->addAction(UIThemeManager::instance()->getIcon(u"list-remove"_qs), tr("Delete torrents") , this, &CategoryFilterWidget::actionDeleteTorrentsTriggered); diff --git a/src/gui/cookiesdialog.cpp b/src/gui/cookiesdialog.cpp index 9f3b16045..4e8ea59ab 100644 --- a/src/gui/cookiesdialog.cpp +++ b/src/gui/cookiesdialog.cpp @@ -52,7 +52,7 @@ CookiesDialog::CookiesDialog(QWidget *parent) { m_ui->setupUi(this); - setWindowIcon(UIThemeManager::instance()->getIcon(u"preferences-web-browser-cookies"_qs)); + setWindowIcon(UIThemeManager::instance()->getIcon(u"browser-cookies"_qs)); m_ui->buttonAdd->setIcon(UIThemeManager::instance()->getIcon(u"list-add"_qs)); m_ui->buttonDelete->setIcon(UIThemeManager::instance()->getIcon(u"list-remove"_qs)); m_ui->buttonAdd->setIconSize(Utils::Gui::mediumIconSize()); diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index a0f62449f..7be560e51 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -161,12 +161,12 @@ MainWindow::MainWindow(IGUIApplication *app, QWidget *parent) m_ui->actionExit->setIcon(UIThemeManager::instance()->getIcon(u"application-exit"_qs)); m_ui->actionLock->setIcon(UIThemeManager::instance()->getIcon(u"object-locked"_qs)); m_ui->actionOptions->setIcon(UIThemeManager::instance()->getIcon(u"configure"_qs)); - m_ui->actionPause->setIcon(UIThemeManager::instance()->getIcon(u"media-playback-pause"_qs)); - m_ui->actionPauseAll->setIcon(UIThemeManager::instance()->getIcon(u"media-playback-pause"_qs)); - m_ui->actionStart->setIcon(UIThemeManager::instance()->getIcon(u"media-playback-start"_qs)); - m_ui->actionStartAll->setIcon(UIThemeManager::instance()->getIcon(u"media-playback-start"_qs)); + m_ui->actionPause->setIcon(UIThemeManager::instance()->getIcon(u"torrent-stop"_qs)); + m_ui->actionPauseAll->setIcon(UIThemeManager::instance()->getIcon(u"torrent-stop"_qs)); + m_ui->actionStart->setIcon(UIThemeManager::instance()->getIcon(u"torrent-start"_qs)); + m_ui->actionStartAll->setIcon(UIThemeManager::instance()->getIcon(u"torrent-start"_qs)); m_ui->menuAutoShutdownOnDownloadsCompletion->setIcon(UIThemeManager::instance()->getIcon(u"task-complete"_qs)); - m_ui->actionManageCookies->setIcon(UIThemeManager::instance()->getIcon(u"preferences-web-browser-cookies"_qs)); + m_ui->actionManageCookies->setIcon(UIThemeManager::instance()->getIcon(u"browser-cookies"_qs)); m_ui->menuLog->setIcon(UIThemeManager::instance()->getIcon(u"help-contents"_qs)); m_ui->actionCheckForUpdates->setIcon(UIThemeManager::instance()->getIcon(u"view-refresh"_qs)); @@ -670,7 +670,7 @@ void MainWindow::displayRSSTab(bool enable) m_tabs->addTab(m_rssWidget, tr("RSS (%1)").arg(RSS::Session::instance()->rootFolder()->unreadCount())); #else const int indexTab = m_tabs->addTab(m_rssWidget, tr("RSS (%1)").arg(RSS::Session::instance()->rootFolder()->unreadCount())); - m_tabs->setTabIcon(indexTab, UIThemeManager::instance()->getIcon(u"application-rss+xml"_qs)); + m_tabs->setTabIcon(indexTab, UIThemeManager::instance()->getIcon(u"application-rss"_qs)); #endif } } diff --git a/src/gui/optionsdialog.cpp b/src/gui/optionsdialog.cpp index a025838d0..013dc6a90 100644 --- a/src/gui/optionsdialog.cpp +++ b/src/gui/optionsdialog.cpp @@ -203,17 +203,17 @@ OptionsDialog::OptionsDialog(IGUIApplication *app, QWidget *parent) // Main icons m_ui->tabSelection->item(TAB_UI)->setIcon(UIThemeManager::instance()->getIcon(u"preferences-desktop"_qs)); - m_ui->tabSelection->item(TAB_BITTORRENT)->setIcon(UIThemeManager::instance()->getIcon(u"preferences-system-network"_qs)); + m_ui->tabSelection->item(TAB_BITTORRENT)->setIcon(UIThemeManager::instance()->getIcon(u"preferences-bittorrent"_qs)); m_ui->tabSelection->item(TAB_CONNECTION)->setIcon(UIThemeManager::instance()->getIcon(u"network-connect"_qs)); - m_ui->tabSelection->item(TAB_DOWNLOADS)->setIcon(UIThemeManager::instance()->getIcon(u"kt-set-max-download-speed"_qs)); + m_ui->tabSelection->item(TAB_DOWNLOADS)->setIcon(UIThemeManager::instance()->getIcon(u"download"_qs)); m_ui->tabSelection->item(TAB_SPEED)->setIcon(UIThemeManager::instance()->getIcon(u"speedometer"_qs)); - m_ui->tabSelection->item(TAB_RSS)->setIcon(UIThemeManager::instance()->getIcon(u"application-rss+xml"_qs)); + m_ui->tabSelection->item(TAB_RSS)->setIcon(UIThemeManager::instance()->getIcon(u"application-rss"_qs)); #ifdef DISABLE_WEBUI m_ui->tabSelection->item(TAB_WEBUI)->setHidden(true); #else - m_ui->tabSelection->item(TAB_WEBUI)->setIcon(UIThemeManager::instance()->getIcon(u"webui"_qs)); + m_ui->tabSelection->item(TAB_WEBUI)->setIcon(UIThemeManager::instance()->getIcon(u"preferences-webui"_qs)); #endif - m_ui->tabSelection->item(TAB_ADVANCED)->setIcon(UIThemeManager::instance()->getIcon(u"preferences-other"_qs)); + m_ui->tabSelection->item(TAB_ADVANCED)->setIcon(UIThemeManager::instance()->getIcon(u"preferences-advanced"_qs)); // set uniform size for all icons int maxHeight = -1; diff --git a/src/gui/properties/peerlistwidget.cpp b/src/gui/properties/peerlistwidget.cpp index ca6a275ef..4d8da73df 100644 --- a/src/gui/properties/peerlistwidget.cpp +++ b/src/gui/properties/peerlistwidget.cpp @@ -269,7 +269,7 @@ void PeerListWidget::showPeerListMenu() menu->setAttribute(Qt::WA_DeleteOnClose); menu->setToolTipsVisible(true); - QAction *addNewPeer = menu->addAction(UIThemeManager::instance()->getIcon(u"user-group-new"_qs), tr("Add peers...") + QAction *addNewPeer = menu->addAction(UIThemeManager::instance()->getIcon(u"peers-add"_qs), tr("Add peers...") , this, [this, torrent]() { const QVector peersList = PeersAdditionDialog::askForPeers(this); @@ -285,7 +285,7 @@ void PeerListWidget::showPeerListMenu() QAction *copyPeers = menu->addAction(UIThemeManager::instance()->getIcon(u"edit-copy"_qs), tr("Copy IP:port") , this, &PeerListWidget::copySelectedPeers); menu->addSeparator(); - QAction *banPeers = menu->addAction(UIThemeManager::instance()->getIcon(u"user-group-delete"_qs), tr("Ban peer permanently") + QAction *banPeers = menu->addAction(UIThemeManager::instance()->getIcon(u"peers-remove"_qs), tr("Ban peer permanently") , this, &PeerListWidget::banSelectedPeers); // disable actions diff --git a/src/gui/properties/propertieswidget.cpp b/src/gui/properties/propertieswidget.cpp index 0d2d2ad8b..155bfc056 100644 --- a/src/gui/properties/propertieswidget.cpp +++ b/src/gui/properties/propertieswidget.cpp @@ -646,7 +646,7 @@ void PropertiesWidget::displayFilesListMenu() menu->addAction(UIThemeManager::instance()->getIcon(u"folder-documents"_qs), tr("Open") , this, [this, index]() { openItem(index); }); - menu->addAction(UIThemeManager::instance()->getIcon(u"inode-directory"_qs), tr("Open containing folder") + menu->addAction(UIThemeManager::instance()->getIcon(u"directory"_qs), tr("Open containing folder") , this, [this, index]() { openParentFolder(index); }); menu->addAction(UIThemeManager::instance()->getIcon(u"edit-rename"_qs), tr("Rename...") , this, [this]() { m_ui->filesList->renameSelectedFile(*m_torrent); }); diff --git a/src/gui/properties/proptabbar.cpp b/src/gui/properties/proptabbar.cpp index 964ce72ac..81941f9fa 100644 --- a/src/gui/properties/proptabbar.cpp +++ b/src/gui/properties/proptabbar.cpp @@ -63,7 +63,7 @@ PropTabBar::PropTabBar(QWidget *parent) // Peers tab QPushButton *peersButton = new QPushButton( #ifndef Q_OS_MACOS - UIThemeManager::instance()->getIcon(u"edit-find-user"_qs), + UIThemeManager::instance()->getIcon(u"peers"_qs), #endif tr("Peers"), parent); peersButton->setShortcut(Qt::ALT + Qt::Key_R); @@ -81,7 +81,7 @@ PropTabBar::PropTabBar(QWidget *parent) // Files tab QPushButton *filesButton = new QPushButton( #ifndef Q_OS_MACOS - UIThemeManager::instance()->getIcon(u"inode-directory"_qs), + UIThemeManager::instance()->getIcon(u"directory"_qs), #endif tr("Content"), parent); filesButton->setShortcut(Qt::ALT + Qt::Key_Z); @@ -92,7 +92,7 @@ PropTabBar::PropTabBar(QWidget *parent) // Speed tab QPushButton *speedButton = new QPushButton( #ifndef Q_OS_MACOS - UIThemeManager::instance()->getIcon(u"office-chart-line"_qs), + UIThemeManager::instance()->getIcon(u"chart-line"_qs), #endif tr("Speed"), parent); speedButton->setShortcut(Qt::ALT + Qt::Key_D); diff --git a/src/gui/rss/automatedrssdownloader.cpp b/src/gui/rss/automatedrssdownloader.cpp index bffefe326..ff5f31f4e 100644 --- a/src/gui/rss/automatedrssdownloader.cpp +++ b/src/gui/rss/automatedrssdownloader.cpp @@ -664,7 +664,7 @@ void AutomatedRssDownloader::addFeedArticlesToTree(RSS::Feed *feed, const QStrin QFont f = treeFeedItem->font(0); f.setBold(true); treeFeedItem->setFont(0, f); - treeFeedItem->setData(0, Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"inode-directory"_qs)); + treeFeedItem->setData(0, Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"directory"_qs)); treeFeedItem->setData(0, Qt::UserRole, feed->url()); m_ui->treeMatchingArticles->addTopLevelItem(treeFeedItem); } diff --git a/src/gui/rss/feedlistwidget.cpp b/src/gui/rss/feedlistwidget.cpp index 19639ab72..06676be1d 100644 --- a/src/gui/rss/feedlistwidget.cpp +++ b/src/gui/rss/feedlistwidget.cpp @@ -83,7 +83,7 @@ namespace if (feed->hasError()) return UIThemeManager::instance()->getIcon(u"task-reject"_qs); - return loadIcon(feed->iconPath(), u"application-rss+xml"_qs); + return loadIcon(feed->iconPath(), u"application-rss"_qs); } } @@ -107,7 +107,7 @@ FeedListWidget::FeedListWidget(QWidget *parent) m_unreadStickyItem = new FeedListItem(this); m_unreadStickyItem->setData(0, Qt::UserRole, QVariant::fromValue(RSS::Session::instance()->rootFolder())); m_unreadStickyItem->setText(0, tr("Unread (%1)").arg(RSS::Session::instance()->rootFolder()->unreadCount())); - m_unreadStickyItem->setData(0, Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"mail-folder-inbox"_qs)); + m_unreadStickyItem->setData(0, Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"mail-inbox"_qs)); m_unreadStickyItem->setData(0, StickyItemTagRole, true); @@ -282,7 +282,7 @@ QTreeWidgetItem *FeedListWidget::createItem(RSS::Item *rssItem, QTreeWidgetItem if (auto feed = qobject_cast(rssItem)) icon = rssFeedIcon(feed); else - icon = UIThemeManager::instance()->getIcon(u"inode-directory"_qs); + icon = UIThemeManager::instance()->getIcon(u"directory"_qs); item->setData(0, Qt::DecorationRole, icon); connect(rssItem, &RSS::Item::unreadCountChanged, this, &FeedListWidget::handleItemUnreadCountChanged); diff --git a/src/gui/rss/rsswidget.cpp b/src/gui/rss/rsswidget.cpp index 7ff53c635..52d76a341 100644 --- a/src/gui/rss/rsswidget.cpp +++ b/src/gui/rss/rsswidget.cpp @@ -68,7 +68,7 @@ RSSWidget::RSSWidget(QWidget *parent) m_ui->actionMarkItemsRead->setIcon(UIThemeManager::instance()->getIcon(u"task-complete"_qs)); m_ui->actionNewFolder->setIcon(UIThemeManager::instance()->getIcon(u"folder-new"_qs)); m_ui->actionNewSubscription->setIcon(UIThemeManager::instance()->getIcon(u"list-add"_qs)); - m_ui->actionOpenNewsURL->setIcon(UIThemeManager::instance()->getIcon(u"application-x-mswinurl"_qs)); + m_ui->actionOpenNewsURL->setIcon(UIThemeManager::instance()->getIcon(u"application-url"_qs)); m_ui->actionRename->setIcon(UIThemeManager::instance()->getIcon(u"edit-rename"_qs)); m_ui->actionUpdate->setIcon(UIThemeManager::instance()->getIcon(u"view-refresh"_qs)); m_ui->actionUpdateAllFeeds->setIcon(UIThemeManager::instance()->getIcon(u"view-refresh"_qs)); diff --git a/src/gui/search/searchjobwidget.cpp b/src/gui/search/searchjobwidget.cpp index 79c9b27ab..9b907c717 100644 --- a/src/gui/search/searchjobwidget.cpp +++ b/src/gui/search/searchjobwidget.cpp @@ -390,12 +390,12 @@ void SearchJobWidget::contextMenuEvent(QContextMenuEvent *event) auto *menu = new QMenu(this); menu->setAttribute(Qt::WA_DeleteOnClose); - menu->addAction(UIThemeManager::instance()->getIcon(u"kt-set-max-download-speed"_qs) + menu->addAction(UIThemeManager::instance()->getIcon(u"download"_qs) , tr("Open download window"), this, [this]() { downloadTorrents(AddTorrentOption::ShowDialog); }); menu->addAction(UIThemeManager::instance()->getIcon(u"downloading"_qs) , tr("Download"), this, [this]() { downloadTorrents(AddTorrentOption::SkipDialog); }); menu->addSeparator(); - menu->addAction(UIThemeManager::instance()->getIcon(u"application-x-mswinurl"_qs), tr("Open description page") + menu->addAction(UIThemeManager::instance()->getIcon(u"application-url"_qs), tr("Open description page") , this, &SearchJobWidget::openTorrentPages); QMenu *copySubMenu = menu->addMenu( @@ -405,7 +405,7 @@ void SearchJobWidget::contextMenuEvent(QContextMenuEvent *event) , this, &SearchJobWidget::copyTorrentNames); copySubMenu->addAction(UIThemeManager::instance()->getIcon(u"insert-link"_qs), tr("Download link") , this, &SearchJobWidget::copyTorrentDownloadLinks); - copySubMenu->addAction(UIThemeManager::instance()->getIcon(u"application-x-mswinurl"_qs), tr("Description page URL") + copySubMenu->addAction(UIThemeManager::instance()->getIcon(u"application-url"_qs), tr("Description page URL") , this, &SearchJobWidget::copyTorrentURLs); menu->popup(event->globalPos()); diff --git a/src/gui/statusbar.cpp b/src/gui/statusbar.cpp index 4a4d3b2e1..09a6f290a 100644 --- a/src/gui/statusbar.cpp +++ b/src/gui/statusbar.cpp @@ -78,7 +78,7 @@ StatusBar::StatusBar(QWidget *parent) m_dlSpeedLbl->setMinimumWidth(200); m_upSpeedLbl = new QPushButton(this); - m_upSpeedLbl->setIcon(UIThemeManager::instance()->getIcon(u"kt-set-max-upload-speed"_qs)); + m_upSpeedLbl->setIcon(UIThemeManager::instance()->getIcon(u"upload"_qs)); connect(m_upSpeedLbl, &QAbstractButton::clicked, this, &StatusBar::capSpeed); m_upSpeedLbl->setFlat(true); m_upSpeedLbl->setFocusPolicy(Qt::NoFocus); diff --git a/src/gui/tagfilterwidget.cpp b/src/gui/tagfilterwidget.cpp index d58973ec7..0f9262600 100644 --- a/src/gui/tagfilterwidget.cpp +++ b/src/gui/tagfilterwidget.cpp @@ -120,9 +120,9 @@ void TagFilterWidget::showMenu() menu->addAction(UIThemeManager::instance()->getIcon(u"edit-clear"_qs), tr("Remove unused tags") , this, &TagFilterWidget::removeUnusedTags); menu->addSeparator(); - menu->addAction(UIThemeManager::instance()->getIcon(u"media-playback-start"_qs), tr("Resume torrents") + menu->addAction(UIThemeManager::instance()->getIcon(u"torrent-start"_qs), tr("Resume torrents") , this, &TagFilterWidget::actionResumeTorrentsTriggered); - menu->addAction(UIThemeManager::instance()->getIcon(u"media-playback-pause"_qs), tr("Pause torrents") + menu->addAction(UIThemeManager::instance()->getIcon(u"torrent-stop"_qs), tr("Pause torrents") , this, &TagFilterWidget::actionPauseTorrentsTriggered); menu->addAction(UIThemeManager::instance()->getIcon(u"list-remove"_qs), tr("Delete torrents") , this, &TagFilterWidget::actionDeleteTorrentsTriggered); diff --git a/src/gui/transferlistfilterswidget.cpp b/src/gui/transferlistfilterswidget.cpp index 5856bd0d6..977055c5c 100644 --- a/src/gui/transferlistfilterswidget.cpp +++ b/src/gui/transferlistfilterswidget.cpp @@ -179,16 +179,16 @@ StatusFilterWidget::StatusFilterWidget(QWidget *parent, TransferListWidget *tran downloading->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"downloading"_qs)); auto *seeding = new QListWidgetItem(this); seeding->setData(Qt::DisplayRole, tr("Seeding (0)")); - seeding->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"kt-set-max-upload-speed"_qs)); + seeding->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"upload"_qs)); auto *completed = new QListWidgetItem(this); completed->setData(Qt::DisplayRole, tr("Completed (0)")); completed->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"checked-completed"_qs)); auto *resumed = new QListWidgetItem(this); resumed->setData(Qt::DisplayRole, tr("Resumed (0)")); - resumed->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"media-playback-start"_qs)); + resumed->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"torrent-start"_qs)); auto *paused = new QListWidgetItem(this); paused->setData(Qt::DisplayRole, tr("Paused (0)")); - paused->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"media-playback-pause"_qs)); + paused->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"torrent-stop"_qs)); auto *active = new QListWidgetItem(this); active->setData(Qt::DisplayRole, tr("Active (0)")); active->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"filter-active"_qs)); @@ -303,9 +303,9 @@ void StatusFilterWidget::showMenu() QMenu *menu = new QMenu(this); menu->setAttribute(Qt::WA_DeleteOnClose); - menu->addAction(UIThemeManager::instance()->getIcon(u"media-playback-start"_qs), tr("Resume torrents") + menu->addAction(UIThemeManager::instance()->getIcon(u"torrent-start"_qs), tr("Resume torrents") , transferList, &TransferListWidget::startVisibleTorrents); - menu->addAction(UIThemeManager::instance()->getIcon(u"media-playback-pause"_qs), tr("Pause torrents") + menu->addAction(UIThemeManager::instance()->getIcon(u"torrent-stop"_qs), tr("Pause torrents") , transferList, &TransferListWidget::pauseVisibleTorrents); menu->addAction(UIThemeManager::instance()->getIcon(u"list-remove"_qs), tr("Delete torrents") , transferList, &TransferListWidget::deleteVisibleTorrents); @@ -708,9 +708,9 @@ void TrackerFiltersList::showMenu() QMenu *menu = new QMenu(this); menu->setAttribute(Qt::WA_DeleteOnClose); - menu->addAction(UIThemeManager::instance()->getIcon(u"media-playback-start"_qs), tr("Resume torrents") + menu->addAction(UIThemeManager::instance()->getIcon(u"torrent-start"_qs), tr("Resume torrents") , transferList, &TransferListWidget::startVisibleTorrents); - menu->addAction(UIThemeManager::instance()->getIcon(u"media-playback-pause"_qs), tr("Pause torrents") + menu->addAction(UIThemeManager::instance()->getIcon(u"torrent-stop"_qs), tr("Pause torrents") , transferList, &TransferListWidget::pauseVisibleTorrents); menu->addAction(UIThemeManager::instance()->getIcon(u"list-remove"_qs), tr("Delete torrents") , transferList, &TransferListWidget::deleteVisibleTorrents); diff --git a/src/gui/transferlistmodel.cpp b/src/gui/transferlistmodel.cpp index 4a963a32f..c71471b3d 100644 --- a/src/gui/transferlistmodel.cpp +++ b/src/gui/transferlistmodel.cpp @@ -155,11 +155,11 @@ TransferListModel::TransferListModel(QObject *parent) , m_completedIcon {UIThemeManager::instance()->getIcon(u"checked-completed"_qs)} , m_downloadingIcon {UIThemeManager::instance()->getIcon(u"downloading"_qs)} , m_errorIcon {UIThemeManager::instance()->getIcon(u"error"_qs)} - , m_pausedIcon {UIThemeManager::instance()->getIcon(u"media-playback-pause"_qs)} + , m_pausedIcon {UIThemeManager::instance()->getIcon(u"torrent-stop"_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)} - , m_uploadingIcon {UIThemeManager::instance()->getIcon(u"kt-set-max-upload-speed"_qs)} + , m_uploadingIcon {UIThemeManager::instance()->getIcon(u"upload"_qs)} { configure(); connect(Preferences::instance(), &Preferences::changed, this, &TransferListModel::configure); diff --git a/src/gui/transferlistwidget.cpp b/src/gui/transferlistwidget.cpp index 08b85039d..9cb93cbf0 100644 --- a/src/gui/transferlistwidget.cpp +++ b/src/gui/transferlistwidget.cpp @@ -909,11 +909,11 @@ void TransferListWidget::displayListMenu() // Create actions - auto *actionStart = new QAction(UIThemeManager::instance()->getIcon(u"media-playback-start"_qs), tr("&Resume", "Resume/start the torrent"), listMenu); + auto *actionStart = new QAction(UIThemeManager::instance()->getIcon(u"torrent-start"_qs), tr("&Resume", "Resume/start the torrent"), listMenu); connect(actionStart, &QAction::triggered, this, &TransferListWidget::startSelectedTorrents); - auto *actionPause = new QAction(UIThemeManager::instance()->getIcon(u"media-playback-pause"_qs), tr("&Pause", "Pause the torrent"), listMenu); + auto *actionPause = new QAction(UIThemeManager::instance()->getIcon(u"torrent-stop"_qs), tr("&Pause", "Pause the torrent"), listMenu); connect(actionPause, &QAction::triggered, this, &TransferListWidget::pauseSelectedTorrents); - auto *actionForceStart = new QAction(UIThemeManager::instance()->getIcon(u"media-seek-forward"_qs), tr("Force Resu&me", "Force Resume/start the torrent"), listMenu); + auto *actionForceStart = new QAction(UIThemeManager::instance()->getIcon(u"torrent-start-forced"_qs), tr("Force Resu&me", "Force Resume/start the torrent"), listMenu); connect(actionForceStart, &QAction::triggered, this, &TransferListWidget::forceStartSelectedTorrents); auto *actionDelete = new QAction(UIThemeManager::instance()->getIcon(u"list-remove"_qs), tr("&Delete", "Delete the torrent"), listMenu); connect(actionDelete, &QAction::triggered, this, &TransferListWidget::softDeleteSelectedTorrents); @@ -921,7 +921,7 @@ void TransferListWidget::displayListMenu() connect(actionPreviewFile, &QAction::triggered, this, &TransferListWidget::previewSelectedTorrents); auto *actionTorrentOptions = new QAction(UIThemeManager::instance()->getIcon(u"configure"_qs), tr("Torrent &options..."), listMenu); connect(actionTorrentOptions, &QAction::triggered, this, &TransferListWidget::setTorrentOptions); - auto *actionOpenDestinationFolder = new QAction(UIThemeManager::instance()->getIcon(u"inode-directory"_qs), tr("Open destination &folder"), listMenu); + auto *actionOpenDestinationFolder = new QAction(UIThemeManager::instance()->getIcon(u"directory"_qs), tr("Open destination &folder"), listMenu); connect(actionOpenDestinationFolder, &QAction::triggered, this, &TransferListWidget::openSelectedTorrentsFolder); auto *actionIncreaseQueuePos = new QAction(UIThemeManager::instance()->getIcon(u"go-up"_qs), tr("Move &up", "i.e. move up in the queue"), listMenu); connect(actionIncreaseQueuePos, &QAction::triggered, this, &TransferListWidget::increaseQueuePosSelectedTorrents); @@ -937,7 +937,7 @@ void TransferListWidget::displayListMenu() connect(actionForceRecheck, &QAction::triggered, this, &TransferListWidget::recheckSelectedTorrents); auto *actionForceReannounce = new QAction(UIThemeManager::instance()->getIcon(u"reannounce"_qs), tr("Force r&eannounce"), listMenu); connect(actionForceReannounce, &QAction::triggered, this, &TransferListWidget::reannounceSelectedTorrents); - auto *actionCopyMagnetLink = new QAction(UIThemeManager::instance()->getIcon(u"kt-magnet"_qs), tr("&Magnet link"), listMenu); + auto *actionCopyMagnetLink = new QAction(UIThemeManager::instance()->getIcon(u"torrent-magnet"_qs), tr("&Magnet link"), listMenu); connect(actionCopyMagnetLink, &QAction::triggered, this, &TransferListWidget::copySelectedMagnetURIs); auto *actionCopyID = new QAction(UIThemeManager::instance()->getIcon(u"help-about"_qs), tr("Torrent &ID"), listMenu); connect(actionCopyID, &QAction::triggered, this, &TransferListWidget::copySelectedIDs); diff --git a/src/icons/application-rss+xml.svg b/src/icons/application-rss.svg similarity index 100% rename from src/icons/application-rss+xml.svg rename to src/icons/application-rss.svg diff --git a/src/icons/application-x-mswinurl.svg b/src/icons/application-url.svg similarity index 100% rename from src/icons/application-x-mswinurl.svg rename to src/icons/application-url.svg diff --git a/src/icons/preferences-web-browser-cookies.svg b/src/icons/browser-cookies.svg similarity index 100% rename from src/icons/preferences-web-browser-cookies.svg rename to src/icons/browser-cookies.svg diff --git a/src/icons/office-chart-line.svg b/src/icons/chart-line.svg similarity index 100% rename from src/icons/office-chart-line.svg rename to src/icons/chart-line.svg diff --git a/src/icons/inode-directory.svg b/src/icons/directory.svg similarity index 100% rename from src/icons/inode-directory.svg rename to src/icons/directory.svg diff --git a/src/icons/kt-set-max-download-speed.svg b/src/icons/download.svg similarity index 100% rename from src/icons/kt-set-max-download-speed.svg rename to src/icons/download.svg diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc index 1846ad3bb..8b890eb59 100644 --- a/src/icons/icons.qrc +++ b/src/icons/icons.qrc @@ -1,18 +1,21 @@ application-exit.svg - application-rss+xml.svg - application-x-mswinurl.svg + application-rss.svg + application-url.svg + browser-cookies.svg + chart-line.svg checked-completed.svg collapse.svg configure.svg connected.svg dialog-warning.svg + directory.svg disconnected.svg downloading.svg + download.svg edit-clear.svg edit-copy.svg - edit-find-user.svg edit-find.svg edit-rename.svg error.svg @@ -93,9 +96,9 @@ flags/eg.svg flags/eh.svg flags/er.svg - flags/es.svg flags/es-ct.svg flags/es-ga.svg + flags/es.svg flags/et.svg flags/eu.svg flags/fi.svg @@ -105,10 +108,10 @@ flags/fo.svg flags/fr.svg flags/ga.svg - flags/gb.svg flags/gb-eng.svg flags/gb-nir.svg flags/gb-sct.svg + flags/gb.svg flags/gb-wls.svg flags/gd.svg flags/ge.svg @@ -298,43 +301,38 @@ hash.svg help-about.svg help-contents.svg - inode-directory.svg insert-link.svg ip-blocked.svg - kt-magnet.svg - kt-set-max-download-speed.svg - kt-set-max-upload-speed.svg list-add.svg list-remove.svg loading.svg - mail-folder-inbox.svg + mail-inbox.svg mascot.png - media-playback-pause.svg - media-playback-start.svg - media-seek-forward.svg name.svg network-connect.svg network-server.svg object-locked.svg - office-chart-line.svg + peers-add.svg + peers-remove.svg + peers.svg plugins.svg + preferences-advanced.svg + preferences-bittorrent.svg preferences-desktop.svg - preferences-other.svg - preferences-system-network.svg - preferences-web-browser-cookies.svg + preferences-webui.svg + qbittorrent_file.ico + qbittorrent.ico qbittorrent-tray-dark.svg qbittorrent-tray-light.svg qbittorrent-tray.svg - qbittorrent.ico - qbittorrent_file.ico queued.svg ratio.svg reannounce.svg security-high.svg security-low.svg set-location.svg - slow.svg slow_off.svg + slow.svg speedometer.svg splash.png stalledDL.svg @@ -344,17 +342,19 @@ task-complete.svg task-reject.svg torrent-creator.svg + torrent-magnet.svg + torrent-start-forced.svg + torrent-start.svg + torrent-stop.svg tracker-error.svg - tracker-warning.svg trackerless.svg trackers.svg - user-group-delete.svg - user-group-new.svg + tracker-warning.svg + upload.svg view-categories.svg view-preview.svg view-refresh.svg view-statistics.svg wallet-open.svg - webui.svg diff --git a/src/icons/mail-folder-inbox.svg b/src/icons/mail-inbox.svg similarity index 100% rename from src/icons/mail-folder-inbox.svg rename to src/icons/mail-inbox.svg diff --git a/src/icons/user-group-new.svg b/src/icons/peers-add.svg similarity index 100% rename from src/icons/user-group-new.svg rename to src/icons/peers-add.svg diff --git a/src/icons/user-group-delete.svg b/src/icons/peers-remove.svg similarity index 100% rename from src/icons/user-group-delete.svg rename to src/icons/peers-remove.svg diff --git a/src/icons/edit-find-user.svg b/src/icons/peers.svg similarity index 100% rename from src/icons/edit-find-user.svg rename to src/icons/peers.svg diff --git a/src/icons/preferences-other.svg b/src/icons/preferences-advanced.svg similarity index 100% rename from src/icons/preferences-other.svg rename to src/icons/preferences-advanced.svg diff --git a/src/icons/preferences-system-network.svg b/src/icons/preferences-bittorrent.svg similarity index 100% rename from src/icons/preferences-system-network.svg rename to src/icons/preferences-bittorrent.svg diff --git a/src/icons/webui.svg b/src/icons/preferences-webui.svg similarity index 100% rename from src/icons/webui.svg rename to src/icons/preferences-webui.svg diff --git a/src/icons/kt-magnet.svg b/src/icons/torrent-magnet.svg similarity index 100% rename from src/icons/kt-magnet.svg rename to src/icons/torrent-magnet.svg diff --git a/src/icons/media-seek-forward.svg b/src/icons/torrent-start-forced.svg similarity index 100% rename from src/icons/media-seek-forward.svg rename to src/icons/torrent-start-forced.svg diff --git a/src/icons/media-playback-start.svg b/src/icons/torrent-start.svg similarity index 100% rename from src/icons/media-playback-start.svg rename to src/icons/torrent-start.svg diff --git a/src/icons/media-playback-pause.svg b/src/icons/torrent-stop.svg similarity index 100% rename from src/icons/media-playback-pause.svg rename to src/icons/torrent-stop.svg diff --git a/src/icons/kt-set-max-upload-speed.svg b/src/icons/upload.svg similarity index 100% rename from src/icons/kt-set-max-upload-speed.svg rename to src/icons/upload.svg diff --git a/src/webui/www/private/index.html b/src/webui/www/private/index.html index 015b606e6..67095b6c0 100644 --- a/src/webui/www/private/index.html +++ b/src/webui/www/private/index.html @@ -56,10 +56,10 @@
  • QBT_TR(Edit)QBT_TR[CONTEXT=MainWindow]
    • QBT_TR(Rename...)QBT_TR[CONTEXT=PropertiesWidget] QBT_TR(Rename...)QBT_TR[CONTEXT=PropertiesWidget]
      • @@ -238,7 +238,7 @@ QBT_TR(Download speed icon)QBT_TR[CONTEXT=MainWindow] - QBT_TR(Upload speed icon)QBT_TR[CONTEXT=MainWindow] + QBT_TR(Upload speed icon)QBT_TR[CONTEXT=MainWindow] diff --git a/src/webui/www/private/scripts/dynamicTable.js b/src/webui/www/private/scripts/dynamicTable.js index 8801958cb..9b2b20371 100644 --- a/src/webui/www/private/scripts/dynamicTable.js +++ b/src/webui/www/private/scripts/dynamicTable.js @@ -936,25 +936,41 @@ window.qBittorrent.DynamicTable = (function() { // state_icon this.columns['state_icon'].updateTd = function(td, row) { let state = this.getRowValue(row); + let img_path; // normalize states switch (state) { case "forcedDL": case "metaDL": case "forcedMetaDL": + case "downloading": state = "downloading"; + img_path = "icons/downloading.svg"; break; case "forcedUP": + case "uploading": state = "uploading"; + img_path = "icons/upload.svg"; + break; + case "stalledUP": + state = "stalledUP"; + img_path = "icons/stalledUP.svg"; + break; + case "stalledDL": + state = "stalledDL"; + img_path = "icons/stalledDL.svg"; break; case "pausedDL": - state = "media-playback-pause"; + state = "torrent-stop"; + img_path = "icons/torrent-stop.svg"; break; case "pausedUP": state = "checked-completed"; + img_path = "icons/checked-completed.svg"; break; case "queuedDL": case "queuedUP": state = "queued"; + img_path = "icons/queued.svg"; break; case "checkingDL": case "checkingUP": @@ -962,17 +978,17 @@ window.qBittorrent.DynamicTable = (function() { case "checkingResumeData": case "moving": state = "force-recheck"; + img_path = "icons/force-recheck.svg"; break; case "unknown": case "missingFiles": state = "error"; + img_path = "icons/error.svg"; break; default: break; // do nothing } - const img_path = 'icons/' + state + '.svg'; - if (td.getChildren('img').length > 0) { const img = td.getChildren('img')[0]; if (img.src.indexOf(img_path) < 0) { @@ -1896,7 +1912,7 @@ window.qBittorrent.DynamicTable = (function() { id: fileNameId }); const dirImg = new Element('img', { - src: 'icons/inode-directory.svg', + src: 'icons/directory.svg', styles: { 'width': 15, 'padding-right': 5, @@ -2177,7 +2193,7 @@ window.qBittorrent.DynamicTable = (function() { let img_path; switch (row.full_data.status) { case 'default': - img_path = 'icons/application-rss+xml.svg'; + img_path = 'icons/application-rss.svg'; break; case 'hasError': img_path = 'icons/task-reject.svg'; @@ -2186,7 +2202,7 @@ window.qBittorrent.DynamicTable = (function() { img_path = 'images/spinner.gif'; break; case 'unread': - img_path = 'icons/mail-folder-inbox.svg'; + img_path = 'icons/mail-inbox.svg'; break; case 'isFolder': img_path = 'icons/folder-documents.svg'; diff --git a/src/webui/www/private/views/filters.html b/src/webui/www/private/views/filters.html index 31db0288e..d842d3c45 100644 --- a/src/webui/www/private/views/filters.html +++ b/src/webui/www/private/views/filters.html @@ -5,10 +5,10 @@