From 199d770e152275d01da6134b802f2e16fa4e96af Mon Sep 17 00:00:00 2001 From: "Nowshed H. Imran" Date: Sun, 21 Nov 2021 21:59:38 +0600 Subject: [PATCH] Implement new icon/color theme Co-authored-by: xavier2k6 <42386382+xavier2k6@users.noreply.github.com> --- src/base/preferences.cpp | 2 +- src/gui/categoryfiltermodel.cpp | 2 +- src/gui/categoryfilterwidget.cpp | 8 +- src/gui/executionlogwidget.cpp | 4 +- src/gui/mainwindow.cpp | 10 ++- src/gui/optionsdialog.cpp | 10 +-- src/gui/properties/propertieswidget.cpp | 2 +- src/gui/properties/proptabbar.cpp | 4 +- src/gui/properties/trackerlistwidget.cpp | 6 +- src/gui/properties/trackersadditiondialog.cpp | 2 +- src/gui/rss/articlelistwidget.cpp | 6 +- src/gui/rss/automatedrssdownloader.cpp | 12 +-- src/gui/rss/feedlistwidget.cpp | 2 +- src/gui/rss/rsswidget.cpp | 10 +-- src/gui/search/searchjobwidget.cpp | 10 +-- src/gui/search/searchwidget.cpp | 8 +- src/gui/statusbar.cpp | 4 +- src/gui/tagfiltermodel.cpp | 2 +- src/gui/tagfilterwidget.cpp | 6 +- src/gui/torrentcontentmodel.cpp | 2 +- src/gui/transferlistfilterswidget.cpp | 32 ++++---- src/gui/transferlistmodel.cpp | 57 ++++---------- src/gui/transferlistwidget.cpp | 21 ++--- src/icons/README.md | 19 +++-- src/icons/application-exit.svg | 4 +- src/icons/application-rss+xml.svg | 4 +- src/icons/application-x-mswinurl.svg | 4 +- src/icons/checked-completed.svg | 1 + src/icons/checked.svg | 3 - src/icons/checking.svg | 3 - src/icons/collapse.svg | 4 +- src/icons/completed.svg | 3 - src/icons/configure.svg | 7 +- src/icons/connected.svg | 4 +- src/icons/dialog-cancel.svg | 3 - src/icons/dialog-information.svg | 4 - src/icons/dialog-warning.svg | 4 +- src/icons/disconnected.svg | 4 +- src/icons/document-edit-verify.svg | 5 -- src/icons/document-edit.svg | 5 -- src/icons/document-encrypt.svg | 3 - src/icons/document-import.svg | 5 -- src/icons/document-new.svg | 5 -- src/icons/document-properties.svg | 5 -- src/icons/document-save.svg | 3 - src/icons/download.svg | 3 - src/icons/downloading.svg | 4 +- src/icons/downloading_small.svg | 3 - src/icons/edit-clear-history.svg | 8 -- src/icons/edit-clear.svg | 8 +- src/icons/edit-copy.svg | 7 +- src/icons/edit-cut.svg | 6 -- src/icons/edit-delete.svg | 3 - src/icons/edit-find-user.svg | 12 +-- src/icons/edit-find.svg | 7 +- src/icons/edit-paste.svg | 6 -- src/icons/edit-rename.svg | 7 +- src/icons/error.svg | 4 +- src/icons/expand.svg | 3 - src/icons/fileicon.svg | 72 +----------------- src/icons/filter-active.svg | 1 + src/icons/filter-all.svg | 1 + src/icons/filter-inactive.svg | 1 + src/icons/filter-stalled.svg | 1 + src/icons/filteractive.svg | 3 - src/icons/filterall.svg | 3 - src/icons/filterinactive.svg | 3 - src/icons/filterstalled.svg | 3 - src/icons/firewalled.svg | 4 +- src/icons/folder-documents.svg | 7 +- src/icons/folder-download.svg | 3 - src/icons/folder-new.svg | 6 +- src/icons/folder-remote.svg | 9 +-- src/icons/force-recheck.svg | 1 + src/icons/gear.svg | 6 -- src/icons/gear32.svg | 6 -- src/icons/go-bottom.svg | 7 +- src/icons/go-down.svg | 7 +- src/icons/go-top.svg | 7 +- src/icons/go-up.svg | 7 +- src/icons/hash.svg | 1 + src/icons/help-about.svg | 5 +- src/icons/help-contents.svg | 4 +- src/icons/icons.qrc | 66 +++++----------- src/icons/inode-directory.svg | 7 +- src/icons/insert-link.svg | 6 +- src/icons/ip-blocked.svg | 1 + src/icons/kt-magnet.svg | 4 +- src/icons/kt-set-max-download-speed.svg | 5 +- src/icons/kt-set-max-upload-speed.svg | 5 +- src/icons/list-add.svg | 6 +- src/icons/list-remove.svg | 4 +- src/icons/loading.png | Bin 140 -> 0 bytes src/icons/loading.svg | 1 + src/icons/mail-folder-inbox.svg | 4 +- src/icons/mail-mark-read.svg | 4 - src/icons/media-playback-pause.svg | 4 +- src/icons/media-playback-start.svg | 4 +- src/icons/media-seek-forward.svg | 7 +- src/icons/name.svg | 1 + src/icons/network-connect.svg | 1 + src/icons/network-server.svg | 9 +-- src/icons/network-wired.svg | 3 - src/icons/object-locked.svg | 4 +- src/icons/office-chart-line.svg | 4 +- src/icons/paused.svg | 3 - src/icons/plugins.svg | 1 + src/icons/preferences-desktop.svg | 5 +- src/icons/preferences-other.svg | 4 +- src/icons/preferences-system-network.svg | 5 +- src/icons/preferences-web-browser-cookies.svg | 4 +- src/icons/qbittorrent-tray-dark.svg | 7 +- src/icons/qbittorrent-tray-light.svg | 7 +- src/icons/qbittorrent-tray-with-font.svg | 20 ----- src/icons/qbittorrent-tray.svg | 17 +---- src/icons/qbittorrent_mac.svg | 2 +- src/icons/queued.svg | 4 +- src/icons/ratio.svg | 5 +- src/icons/reannounce.svg | 1 + src/icons/resumed.svg | 3 - src/icons/rss-config.svg | 6 -- src/icons/security-high.svg | 5 +- src/icons/security-low.svg | 5 +- src/icons/seeding.svg | 3 - src/icons/services.svg | 3 - src/icons/set-location.svg | 1 + src/icons/slow.svg | 6 +- src/icons/slow_off.svg | 6 +- src/icons/speedometer.svg | 4 +- src/icons/sphere.png | Bin 250 -> 0 bytes src/icons/sphere2.png | Bin 254 -> 0 bytes src/icons/stalledDL.svg | 4 +- src/icons/stalledUP.svg | 4 +- src/icons/system-log-out.svg | 4 +- src/icons/tab-close.svg | 4 - src/icons/tags.svg | 1 + src/icons/task-attention.svg | 3 - src/icons/task-complete.svg | 4 +- src/icons/task-ongoing.svg | 3 - src/icons/task-reject.svg | 4 +- src/icons/text-plain.svg | 3 - src/icons/tools-report-bug.svg | 3 - src/icons/torrent-creator.svg | 1 + src/icons/tracker-error.svg | 1 + src/icons/tracker-warning.svg | 1 + src/icons/trackerless.svg | 1 + src/icons/trackers.svg | 1 + src/icons/unavailable.svg | 3 - src/icons/uploading.svg | 3 - src/icons/user-group-delete.svg | 8 +- src/icons/user-group-new.svg | 8 +- src/icons/view-calendar-journal.svg | 3 - src/icons/view-categories.svg | 4 +- src/icons/view-filter.svg | 3 - src/icons/view-preview.svg | 4 +- src/icons/view-refresh.svg | 4 +- src/icons/view-statistics.svg | 4 +- src/icons/wallet-open.svg | 4 +- src/icons/webui.svg | 10 +-- src/webui/www/private/index.html | 54 ++++++------- src/webui/www/private/scripts/client.js | 6 +- src/webui/www/private/scripts/contextmenu.js | 2 +- src/webui/www/private/scripts/dynamicTable.js | 10 +-- src/webui/www/private/views/filters.html | 18 ++--- src/webui/www/private/views/preferences.html | 4 +- src/webui/www/private/views/rss.html | 8 +- .../www/private/views/rssDownloader.html | 8 +- src/webui/www/private/views/search.html | 8 +- .../www/private/views/searchplugins.html | 2 +- 169 files changed, 279 insertions(+), 791 deletions(-) create mode 100644 src/icons/checked-completed.svg delete mode 100644 src/icons/checked.svg delete mode 100644 src/icons/checking.svg delete mode 100644 src/icons/completed.svg delete mode 100644 src/icons/dialog-cancel.svg delete mode 100644 src/icons/dialog-information.svg delete mode 100644 src/icons/document-edit-verify.svg delete mode 100644 src/icons/document-edit.svg delete mode 100644 src/icons/document-encrypt.svg delete mode 100644 src/icons/document-import.svg delete mode 100644 src/icons/document-new.svg delete mode 100644 src/icons/document-properties.svg delete mode 100644 src/icons/document-save.svg delete mode 100644 src/icons/download.svg delete mode 100644 src/icons/downloading_small.svg delete mode 100644 src/icons/edit-clear-history.svg delete mode 100644 src/icons/edit-cut.svg delete mode 100644 src/icons/edit-delete.svg delete mode 100644 src/icons/edit-paste.svg delete mode 100644 src/icons/expand.svg create mode 100644 src/icons/filter-active.svg create mode 100644 src/icons/filter-all.svg create mode 100644 src/icons/filter-inactive.svg create mode 100644 src/icons/filter-stalled.svg delete mode 100644 src/icons/filteractive.svg delete mode 100644 src/icons/filterall.svg delete mode 100644 src/icons/filterinactive.svg delete mode 100644 src/icons/filterstalled.svg delete mode 100644 src/icons/folder-download.svg create mode 100644 src/icons/force-recheck.svg delete mode 100644 src/icons/gear.svg delete mode 100644 src/icons/gear32.svg create mode 100644 src/icons/hash.svg create mode 100644 src/icons/ip-blocked.svg delete mode 100644 src/icons/loading.png create mode 100644 src/icons/loading.svg delete mode 100644 src/icons/mail-mark-read.svg create mode 100644 src/icons/name.svg create mode 100644 src/icons/network-connect.svg delete mode 100644 src/icons/network-wired.svg delete mode 100644 src/icons/paused.svg create mode 100644 src/icons/plugins.svg delete mode 100644 src/icons/qbittorrent-tray-with-font.svg create mode 100644 src/icons/reannounce.svg delete mode 100644 src/icons/resumed.svg delete mode 100644 src/icons/rss-config.svg delete mode 100644 src/icons/seeding.svg delete mode 100644 src/icons/services.svg create mode 100644 src/icons/set-location.svg delete mode 100644 src/icons/sphere.png delete mode 100644 src/icons/sphere2.png delete mode 100644 src/icons/tab-close.svg create mode 100644 src/icons/tags.svg delete mode 100644 src/icons/task-attention.svg delete mode 100644 src/icons/task-ongoing.svg delete mode 100644 src/icons/text-plain.svg delete mode 100644 src/icons/tools-report-bug.svg create mode 100644 src/icons/torrent-creator.svg create mode 100644 src/icons/tracker-error.svg create mode 100644 src/icons/tracker-warning.svg create mode 100644 src/icons/trackerless.svg create mode 100644 src/icons/trackers.svg delete mode 100644 src/icons/unavailable.svg delete mode 100644 src/icons/uploading.svg delete mode 100644 src/icons/view-calendar-journal.svg delete mode 100644 src/icons/view-filter.svg diff --git a/src/base/preferences.cpp b/src/base/preferences.cpp index a3d62cde1..b97590e9d 100644 --- a/src/base/preferences.cpp +++ b/src/base/preferences.cpp @@ -982,7 +982,7 @@ void Preferences::resolvePeerHostNames(const bool resolve) #if (defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)) bool Preferences::useSystemIconTheme() const { - return value(u"Preferences/Advanced/useSystemIconTheme"_qs, true); + return value(u"Preferences/Advanced/useSystemIconTheme"_qs, false); } void Preferences::useSystemIconTheme(const bool enabled) diff --git a/src/gui/categoryfiltermodel.cpp b/src/gui/categoryfiltermodel.cpp index 36ab44ccc..3c36349d3 100644 --- a/src/gui/categoryfiltermodel.cpp +++ b/src/gui/categoryfiltermodel.cpp @@ -214,7 +214,7 @@ QVariant CategoryFilterModel::data(const QModelIndex &index, int role) const if ((index.column() == 0) && (role == Qt::DecorationRole)) { - return UIThemeManager::instance()->getIcon(u"inode-directory"_qs); + return UIThemeManager::instance()->getIcon(u"view-categories"_qs); } if ((index.column() == 0) && (role == Qt::DisplayRole)) diff --git a/src/gui/categoryfilterwidget.cpp b/src/gui/categoryfilterwidget.cpp index 02302fa79..4f822a6e1 100644 --- a/src/gui/categoryfilterwidget.cpp +++ b/src/gui/categoryfilterwidget.cpp @@ -121,20 +121,20 @@ void CategoryFilterWidget::showMenu() , this, &CategoryFilterWidget::addSubcategory); } - menu->addAction(UIThemeManager::instance()->getIcon(u"document-edit"_qs), tr("Edit category...") + menu->addAction(UIThemeManager::instance()->getIcon(u"edit-rename"_qs), tr("Edit category...") , this, &CategoryFilterWidget::editCategory); - menu->addAction(UIThemeManager::instance()->getIcon(u"list-remove"_qs), tr("Remove category") + menu->addAction(UIThemeManager::instance()->getIcon(u"edit-clear"_qs), tr("Remove category") , this, &CategoryFilterWidget::removeCategory); } - menu->addAction(UIThemeManager::instance()->getIcon(u"list-remove"_qs), tr("Remove unused categories") + 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") , this, &CategoryFilterWidget::actionResumeTorrentsTriggered); menu->addAction(UIThemeManager::instance()->getIcon(u"media-playback-pause"_qs), tr("Pause torrents") , this, &CategoryFilterWidget::actionPauseTorrentsTriggered); - menu->addAction(UIThemeManager::instance()->getIcon(u"edit-delete"_qs), tr("Delete torrents") + menu->addAction(UIThemeManager::instance()->getIcon(u"list-remove"_qs), tr("Delete torrents") , this, &CategoryFilterWidget::actionDeleteTorrentsTriggered); menu->popup(QCursor::pos()); diff --git a/src/gui/executionlogwidget.cpp b/src/gui/executionlogwidget.cpp index 455beb848..5d12f3f50 100644 --- a/src/gui/executionlogwidget.cpp +++ b/src/gui/executionlogwidget.cpp @@ -69,8 +69,8 @@ ExecutionLogWidget::ExecutionLogWidget(const Log::MsgTypes types, QWidget *paren m_ui->tabBan->layout()->addWidget(peerView); #ifndef Q_OS_MACOS - m_ui->tabConsole->setTabIcon(0, UIThemeManager::instance()->getIcon(u"view-calendar-journal"_qs)); - m_ui->tabConsole->setTabIcon(1, UIThemeManager::instance()->getIcon(u"view-filter"_qs)); + m_ui->tabConsole->setTabIcon(0, UIThemeManager::instance()->getIcon(u"help-contents"_qs)); + m_ui->tabConsole->setTabIcon(1, UIThemeManager::instance()->getIcon(u"ip-blocked"_qs)); #endif } diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index a91b7eea7..ef4655155 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -171,7 +171,7 @@ MainWindow::MainWindow(QWidget *parent) m_ui->actionOpen->setIcon(UIThemeManager::instance()->getIcon(u"list-add"_qs)); m_ui->actionDownloadFromURL->setIcon(UIThemeManager::instance()->getIcon(u"insert-link"_qs)); m_ui->actionSetGlobalSpeedLimits->setIcon(UIThemeManager::instance()->getIcon(u"speedometer"_qs)); - m_ui->actionCreateTorrent->setIcon(UIThemeManager::instance()->getIcon(u"document-edit"_qs)); + m_ui->actionCreateTorrent->setIcon(UIThemeManager::instance()->getIcon(u"torrent-creator"_qs)); m_ui->actionAbout->setIcon(UIThemeManager::instance()->getIcon(u"help-about"_qs)); m_ui->actionStatistics->setIcon(UIThemeManager::instance()->getIcon(u"view-statistics"_qs)); m_ui->actionTopQueuePos->setIcon(UIThemeManager::instance()->getIcon(u"go-top"_qs)); @@ -183,13 +183,15 @@ MainWindow::MainWindow(QWidget *parent) m_ui->actionDonateMoney->setIcon(UIThemeManager::instance()->getIcon(u"wallet-open"_qs)); 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, u"preferences-system"_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->menuAutoShutdownOnDownloadsCompletion->setIcon(UIThemeManager::instance()->getIcon(u"application-exit"_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->menuLog->setIcon(UIThemeManager::instance()->getIcon(u"help-contents"_qs)); + m_ui->actionCheckForUpdates->setIcon(UIThemeManager::instance()->getIcon(u"view-refresh"_qs)); auto *lockMenu = new QMenu(this); lockMenu->addAction(tr("&Set Password"), this, &MainWindow::defineUILockPassword); @@ -2037,7 +2039,7 @@ void MainWindow::on_actionExecutionLogs_triggered(bool checked) m_tabs->addTab(m_executionLog, tr("Execution Log")); #else const int indexTab = m_tabs->addTab(m_executionLog, tr("Execution Log")); - m_tabs->setTabIcon(indexTab, UIThemeManager::instance()->getIcon(u"view-calendar-journal"_qs)); + m_tabs->setTabIcon(indexTab, UIThemeManager::instance()->getIcon(u"help-contents"_qs)); #endif } else diff --git a/src/gui/optionsdialog.cpp b/src/gui/optionsdialog.cpp index 9b79240b8..9418b6b6a 100644 --- a/src/gui/optionsdialog.cpp +++ b/src/gui/optionsdialog.cpp @@ -192,12 +192,12 @@ OptionsDialog::OptionsDialog(QWidget *parent) // 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_CONNECTION)->setIcon(UIThemeManager::instance()->getIcon(u"network-wired"_qs)); - m_ui->tabSelection->item(TAB_DOWNLOADS)->setIcon(UIThemeManager::instance()->getIcon(u"folder-download"_qs)); - m_ui->tabSelection->item(TAB_SPEED)->setIcon(UIThemeManager::instance()->getIcon(u"speedometer"_qs, u"chronometer"_qs)); - m_ui->tabSelection->item(TAB_RSS)->setIcon(UIThemeManager::instance()->getIcon(u"rss-config"_qs, u"application-rss+xml"_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_SPEED)->setIcon(UIThemeManager::instance()->getIcon(u"speedometer"_qs)); + m_ui->tabSelection->item(TAB_RSS)->setIcon(UIThemeManager::instance()->getIcon(u"application-rss+xml"_qs)); #ifndef DISABLE_WEBUI - m_ui->tabSelection->item(TAB_WEBUI)->setIcon(UIThemeManager::instance()->getIcon(u"network-server"_qs)); + m_ui->tabSelection->item(TAB_WEBUI)->setIcon(UIThemeManager::instance()->getIcon(u"webui"_qs)); #else m_ui->tabSelection->item(TAB_WEBUI)->setHidden(true); #endif diff --git a/src/gui/properties/propertieswidget.cpp b/src/gui/properties/propertieswidget.cpp index a6c21caa4..e611d2602 100644 --- a/src/gui/properties/propertieswidget.cpp +++ b/src/gui/properties/propertieswidget.cpp @@ -749,7 +749,7 @@ void PropertiesWidget::displayWebSeedListMenu() if (!rows.isEmpty()) { - menu->addAction(UIThemeManager::instance()->getIcon(u"list-remove"_qs), tr("Remove Web seed") + menu->addAction(UIThemeManager::instance()->getIcon(u"edit-clear"_qs), tr("Remove Web seed") , this, &PropertiesWidget::deleteSelectedUrlSeeds); menu->addSeparator(); menu->addAction(UIThemeManager::instance()->getIcon(u"edit-copy"_qs), tr("Copy Web seed URL") diff --git a/src/gui/properties/proptabbar.cpp b/src/gui/properties/proptabbar.cpp index 200849ac0..50456f0c1 100644 --- a/src/gui/properties/proptabbar.cpp +++ b/src/gui/properties/proptabbar.cpp @@ -46,7 +46,7 @@ PropTabBar::PropTabBar(QWidget *parent) // General tab QPushButton *mainInfosButton = new QPushButton( #ifndef Q_OS_MACOS - UIThemeManager::instance()->getIcon(u"document-properties"_qs), + UIThemeManager::instance()->getIcon(u"help-about"_qs), #endif tr("General"), parent); mainInfosButton->setShortcut(Qt::ALT + Qt::Key_G); @@ -55,7 +55,7 @@ PropTabBar::PropTabBar(QWidget *parent) // Trackers tab QPushButton *trackersButton = new QPushButton( #ifndef Q_OS_MACOS - UIThemeManager::instance()->getIcon(u"network-server"_qs), + UIThemeManager::instance()->getIcon(u"trackers"_qs), #endif tr("Trackers"), parent); trackersButton->setShortcut(Qt::ALT + Qt::Key_C); diff --git a/src/gui/properties/trackerlistwidget.cpp b/src/gui/properties/trackerlistwidget.cpp index c77fa6331..004089500 100644 --- a/src/gui/properties/trackerlistwidget.cpp +++ b/src/gui/properties/trackerlistwidget.cpp @@ -574,7 +574,7 @@ void TrackerListWidget::showTrackerListMenu() { menu->addAction(UIThemeManager::instance()->getIcon(u"edit-rename"_qs),tr("Edit tracker URL...") , this, &TrackerListWidget::editSelectedTracker); - menu->addAction(UIThemeManager::instance()->getIcon(u"list-remove"_qs), tr("Remove tracker") + menu->addAction(UIThemeManager::instance()->getIcon(u"edit-clear"_qs), tr("Remove tracker") , this, &TrackerListWidget::deleteSelectedTrackers); menu->addAction(UIThemeManager::instance()->getIcon(u"edit-copy"_qs), tr("Copy tracker URL") , this, &TrackerListWidget::copyTrackerUrl); @@ -582,10 +582,10 @@ void TrackerListWidget::showTrackerListMenu() if (!torrent->isPaused()) { - menu->addAction(UIThemeManager::instance()->getIcon(u"view-refresh"_qs), tr("Force reannounce to selected trackers") + menu->addAction(UIThemeManager::instance()->getIcon(u"reannounce"_qs), tr("Force reannounce to selected trackers") , this, &TrackerListWidget::reannounceSelected); menu->addSeparator(); - menu->addAction(UIThemeManager::instance()->getIcon(u"view-refresh"_qs), tr("Force reannounce to all trackers") + menu->addAction(UIThemeManager::instance()->getIcon(u"reannounce"_qs), tr("Force reannounce to all trackers") , this, [this]() { BitTorrent::Torrent *h = m_properties->getCurrentTorrent(); diff --git a/src/gui/properties/trackersadditiondialog.cpp b/src/gui/properties/trackersadditiondialog.cpp index 92f5b1490..4d4f64435 100644 --- a/src/gui/properties/trackersadditiondialog.cpp +++ b/src/gui/properties/trackersadditiondialog.cpp @@ -46,7 +46,7 @@ TrackersAdditionDialog::TrackersAdditionDialog(QWidget *parent, BitTorrent::Torr { m_ui->setupUi(this); // Icons - m_ui->uTorrentListButton->setIcon(UIThemeManager::instance()->getIcon(u"download"_qs)); + m_ui->uTorrentListButton->setIcon(UIThemeManager::instance()->getIcon(u"downloading"_qs)); } TrackersAdditionDialog::~TrackersAdditionDialog() diff --git a/src/gui/rss/articlelistwidget.cpp b/src/gui/rss/articlelistwidget.cpp index 031c59383..8d8d48daf 100644 --- a/src/gui/rss/articlelistwidget.cpp +++ b/src/gui/rss/articlelistwidget.cpp @@ -105,7 +105,7 @@ void ArticleListWidget::handleArticleRead(RSS::Article *rssArticle) const QColor defaultColor {palette().color(QPalette::Inactive, QPalette::WindowText)}; const QBrush foregroundBrush {UIThemeManager::instance()->getColor(u"RSS.ReadArticle"_qs, defaultColor)}; item->setData(Qt::ForegroundRole, foregroundBrush); - item->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"sphere"_qs)); + item->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"loading"_qs)); checkInvariant(); } @@ -133,14 +133,14 @@ QListWidgetItem *ArticleListWidget::createItem(RSS::Article *article) const const QColor defaultColor {palette().color(QPalette::Inactive, QPalette::WindowText)}; const QBrush foregroundBrush {UIThemeManager::instance()->getColor(u"RSS.ReadArticle"_qs, defaultColor)}; item->setData(Qt::ForegroundRole, foregroundBrush); - item->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"sphere"_qs)); + item->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"loading"_qs)); } else { const QColor defaultColor {palette().color(QPalette::Active, QPalette::Link)}; const QBrush foregroundBrush {UIThemeManager::instance()->getColor(u"RSS.UnreadArticle"_qs, defaultColor)}; item->setData(Qt::ForegroundRole, foregroundBrush); - item->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"sphere"_qs)); + item->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"loading"_qs)); } return item; diff --git a/src/gui/rss/automatedrssdownloader.cpp b/src/gui/rss/automatedrssdownloader.cpp index 2159199c5..bffefe326 100644 --- a/src/gui/rss/automatedrssdownloader.cpp +++ b/src/gui/rss/automatedrssdownloader.cpp @@ -75,7 +75,7 @@ AutomatedRssDownloader::AutomatedRssDownloader(QWidget *parent) { m_ui->setupUi(this); // Icons - m_ui->removeRuleBtn->setIcon(UIThemeManager::instance()->getIcon(u"list-remove"_qs)); + m_ui->removeRuleBtn->setIcon(UIThemeManager::instance()->getIcon(u"edit-clear"_qs)); m_ui->addRuleBtn->setIcon(UIThemeManager::instance()->getIcon(u"list-add"_qs)); m_ui->addCategoryBtn->setIcon(UIThemeManager::instance()->getIcon(u"list-add"_qs)); @@ -521,7 +521,7 @@ void AutomatedRssDownloader::displayRulesListMenu() { if (selection.count() == 1) { - menu->addAction(UIThemeManager::instance()->getIcon(u"list-remove"_qs), tr("Delete rule") + menu->addAction(UIThemeManager::instance()->getIcon(u"edit-clear"_qs), tr("Delete rule") , this, &AutomatedRssDownloader::on_removeRuleBtn_clicked); menu->addSeparator(); menu->addAction(UIThemeManager::instance()->getIcon(u"edit-rename"_qs), tr("Rename rule...") @@ -529,7 +529,7 @@ void AutomatedRssDownloader::displayRulesListMenu() } else { - menu->addAction(UIThemeManager::instance()->getIcon(u"list-remove"_qs), tr("Delete selected rules") + menu->addAction(UIThemeManager::instance()->getIcon(u"edit-clear"_qs), tr("Delete selected rules") , this, &AutomatedRssDownloader::on_removeRuleBtn_clicked); } @@ -759,7 +759,7 @@ void AutomatedRssDownloader::updateMustLineValidity() else { m_ui->lineContains->setStyleSheet(u"QLineEdit { color: #ff0000; }"_qs); - m_ui->labelMustStat->setPixmap(UIThemeManager::instance()->getIcon(u"task-attention"_qs).pixmap(16, 16)); + m_ui->labelMustStat->setPixmap(UIThemeManager::instance()->getIcon(u"dialog-warning"_qs).pixmap(16, 16)); m_ui->labelMustStat->setToolTip(error); } } @@ -806,7 +806,7 @@ void AutomatedRssDownloader::updateMustNotLineValidity() else { m_ui->lineNotContains->setStyleSheet(u"QLineEdit { color: #ff0000; }"_qs); - m_ui->labelMustNotStat->setPixmap(UIThemeManager::instance()->getIcon(u"task-attention"_qs).pixmap(16, 16)); + m_ui->labelMustNotStat->setPixmap(UIThemeManager::instance()->getIcon(u"dialog-warning"_qs).pixmap(16, 16)); m_ui->labelMustNotStat->setToolTip(error); } } @@ -824,7 +824,7 @@ void AutomatedRssDownloader::updateEpisodeFilterValidity() else { m_ui->lineEFilter->setStyleSheet(u"QLineEdit { color: #ff0000; }"_qs); - m_ui->labelEpFilterStat->setPixmap(UIThemeManager::instance()->getIcon(u"task-attention"_qs).pixmap(16, 16)); + m_ui->labelEpFilterStat->setPixmap(UIThemeManager::instance()->getIcon(u"dialog-warning"_qs).pixmap(16, 16)); } } diff --git a/src/gui/rss/feedlistwidget.cpp b/src/gui/rss/feedlistwidget.cpp index 92cacd4d1..19639ab72 100644 --- a/src/gui/rss/feedlistwidget.cpp +++ b/src/gui/rss/feedlistwidget.cpp @@ -81,7 +81,7 @@ namespace if (feed->isLoading()) return UIThemeManager::instance()->getIcon(u"loading"_qs); if (feed->hasError()) - return UIThemeManager::instance()->getIcon(u"unavailable"_qs); + return UIThemeManager::instance()->getIcon(u"task-reject"_qs); return loadIcon(feed->iconPath(), u"application-rss+xml"_qs); } diff --git a/src/gui/rss/rsswidget.cpp b/src/gui/rss/rsswidget.cpp index 13dd7880f..7ff53c635 100644 --- a/src/gui/rss/rsswidget.cpp +++ b/src/gui/rss/rsswidget.cpp @@ -63,9 +63,9 @@ RSSWidget::RSSWidget(QWidget *parent) // Icons m_ui->actionCopyFeedURL->setIcon(UIThemeManager::instance()->getIcon(u"edit-copy"_qs)); - m_ui->actionDelete->setIcon(UIThemeManager::instance()->getIcon(u"edit-delete"_qs)); - m_ui->actionDownloadTorrent->setIcon(UIThemeManager::instance()->getIcon(u"download"_qs)); - m_ui->actionMarkItemsRead->setIcon(UIThemeManager::instance()->getIcon(u"mail-mark-read"_qs)); + m_ui->actionDelete->setIcon(UIThemeManager::instance()->getIcon(u"edit-clear"_qs)); + m_ui->actionDownloadTorrent->setIcon(UIThemeManager::instance()->getIcon(u"downloading"_qs)); + 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)); @@ -74,9 +74,9 @@ RSSWidget::RSSWidget(QWidget *parent) m_ui->actionUpdateAllFeeds->setIcon(UIThemeManager::instance()->getIcon(u"view-refresh"_qs)); #ifndef Q_OS_MACOS m_ui->newFeedButton->setIcon(UIThemeManager::instance()->getIcon(u"list-add"_qs)); - m_ui->markReadButton->setIcon(UIThemeManager::instance()->getIcon(u"mail-mark-read"_qs)); + m_ui->markReadButton->setIcon(UIThemeManager::instance()->getIcon(u"task-complete"_qs)); m_ui->updateAllButton->setIcon(UIThemeManager::instance()->getIcon(u"view-refresh"_qs)); - m_ui->rssDownloaderBtn->setIcon(UIThemeManager::instance()->getIcon(u"download"_qs)); + m_ui->rssDownloaderBtn->setIcon(UIThemeManager::instance()->getIcon(u"downloading"_qs)); #endif m_articleListWidget = new ArticleListWidget(m_ui->splitterMain); diff --git a/src/gui/search/searchjobwidget.cpp b/src/gui/search/searchjobwidget.cpp index afe7623c5..45b998b1a 100644 --- a/src/gui/search/searchjobwidget.cpp +++ b/src/gui/search/searchjobwidget.cpp @@ -390,9 +390,9 @@ void SearchJobWidget::contextMenuEvent(QContextMenuEvent *event) auto *menu = new QMenu(this); menu->setAttribute(Qt::WA_DeleteOnClose); - menu->addAction(UIThemeManager::instance()->getIcon(u"download"_qs), tr("Open download window") + menu->addAction(UIThemeManager::instance()->getIcon(u"kt-set-max-download-speed"_qs), tr("Open download window") , this, [this]() { downloadTorrents(AddTorrentOption::ShowDialog); }); - menu->addAction(UIThemeManager::instance()->getIcon(u"download"_qs), tr("Download") + 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") @@ -401,11 +401,11 @@ void SearchJobWidget::contextMenuEvent(QContextMenuEvent *event) QMenu *copySubMenu = menu->addMenu( UIThemeManager::instance()->getIcon(u"edit-copy"_qs), tr("Copy")); - copySubMenu->addAction(UIThemeManager::instance()->getIcon(u"edit-copy"_qs), tr("Name") + copySubMenu->addAction(UIThemeManager::instance()->getIcon(u"name"_qs), tr("Name") , this, &SearchJobWidget::copyTorrentNames); - copySubMenu->addAction(UIThemeManager::instance()->getIcon(u"edit-copy"_qs), tr("Download link") + copySubMenu->addAction(UIThemeManager::instance()->getIcon(u"insert-link"_qs), tr("Download link") , this, &SearchJobWidget::copyTorrentDownloadLinks); - copySubMenu->addAction(UIThemeManager::instance()->getIcon(u"edit-copy"_qs), tr("Description page URL") + copySubMenu->addAction(UIThemeManager::instance()->getIcon(u"application-x-mswinurl"_qs), tr("Description page URL") , this, &SearchJobWidget::copyTorrentURLs); menu->popup(event->globalPos()); diff --git a/src/gui/search/searchwidget.cpp b/src/gui/search/searchwidget.cpp index 91d9a762c..f91d3ff79 100644 --- a/src/gui/search/searchwidget.cpp +++ b/src/gui/search/searchwidget.cpp @@ -68,15 +68,15 @@ namespace switch (st) { case SearchJobWidget::Status::Ongoing: - return u"task-ongoing"_qs; + return u"queued"_qs; case SearchJobWidget::Status::Finished: return u"task-complete"_qs; case SearchJobWidget::Status::Aborted: return u"task-reject"_qs; case SearchJobWidget::Status::Error: - return u"task-attention"_qs; + return u"dialog-warning"_qs; case SearchJobWidget::Status::NoResults: - return u"task-attention"_qs; + return u"dialog-warning"_qs; default: return {}; } @@ -111,7 +111,7 @@ SearchWidget::SearchWidget(MainWindow *mainWindow) #ifndef Q_OS_MACOS // Icons m_ui->searchButton->setIcon(UIThemeManager::instance()->getIcon(u"edit-find"_qs)); - m_ui->pluginsButton->setIcon(UIThemeManager::instance()->getIcon(u"preferences-system-network"_qs)); + m_ui->pluginsButton->setIcon(UIThemeManager::instance()->getIcon(u"plugins"_qs)); #else // On macOS the icons overlap the text otherwise QSize iconSize = m_ui->tabWidget->iconSize(); diff --git a/src/gui/statusbar.cpp b/src/gui/statusbar.cpp index bb287cce0..4a4d3b2e1 100644 --- a/src/gui/statusbar.cpp +++ b/src/gui/statusbar.cpp @@ -69,7 +69,7 @@ StatusBar::StatusBar(QWidget *parent) connect(m_connecStatusLblIcon, &QAbstractButton::clicked, this, &StatusBar::connectionButtonClicked); m_dlSpeedLbl = new QPushButton(this); - m_dlSpeedLbl->setIcon(UIThemeManager::instance()->getIcon(u"downloading_small"_qs)); + m_dlSpeedLbl->setIcon(UIThemeManager::instance()->getIcon(u"downloading"_qs)); connect(m_dlSpeedLbl, &QAbstractButton::clicked, this, &StatusBar::capSpeed); m_dlSpeedLbl->setFlat(true); m_dlSpeedLbl->setFocusPolicy(Qt::NoFocus); @@ -78,7 +78,7 @@ StatusBar::StatusBar(QWidget *parent) m_dlSpeedLbl->setMinimumWidth(200); m_upSpeedLbl = new QPushButton(this); - m_upSpeedLbl->setIcon(UIThemeManager::instance()->getIcon(u"seeding"_qs)); + m_upSpeedLbl->setIcon(UIThemeManager::instance()->getIcon(u"kt-set-max-upload-speed"_qs)); connect(m_upSpeedLbl, &QAbstractButton::clicked, this, &StatusBar::capSpeed); m_upSpeedLbl->setFlat(true); m_upSpeedLbl->setFocusPolicy(Qt::NoFocus); diff --git a/src/gui/tagfiltermodel.cpp b/src/gui/tagfiltermodel.cpp index ce56328d9..560d9c46d 100644 --- a/src/gui/tagfiltermodel.cpp +++ b/src/gui/tagfiltermodel.cpp @@ -124,7 +124,7 @@ QVariant TagFilterModel::data(const QModelIndex &index, int role) const switch (role) { case Qt::DecorationRole: - return UIThemeManager::instance()->getIcon(u"inode-directory"_qs); + return UIThemeManager::instance()->getIcon(u"tags"_qs); case Qt::DisplayRole: return u"%1 (%2)"_qs.arg(tagDisplayName(item.tag())).arg(item.torrentsCount()); case Qt::UserRole: diff --git a/src/gui/tagfilterwidget.cpp b/src/gui/tagfilterwidget.cpp index 293e88991..d58973ec7 100644 --- a/src/gui/tagfilterwidget.cpp +++ b/src/gui/tagfilterwidget.cpp @@ -113,18 +113,18 @@ void TagFilterWidget::showMenu() const auto selectedRows = selectionModel()->selectedRows(); if (!selectedRows.empty() && !TagFilterModel::isSpecialItem(selectedRows.first())) { - menu->addAction(UIThemeManager::instance()->getIcon(u"list-remove"_qs), tr("Remove tag") + menu->addAction(UIThemeManager::instance()->getIcon(u"edit-clear"_qs), tr("Remove tag") , this, &TagFilterWidget::removeTag); } - menu->addAction(UIThemeManager::instance()->getIcon(u"list-remove"_qs), tr("Remove unused tags") + 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") , this, &TagFilterWidget::actionResumeTorrentsTriggered); menu->addAction(UIThemeManager::instance()->getIcon(u"media-playback-pause"_qs), tr("Pause torrents") , this, &TagFilterWidget::actionPauseTorrentsTriggered); - menu->addAction(UIThemeManager::instance()->getIcon(u"edit-delete"_qs), tr("Delete torrents") + menu->addAction(UIThemeManager::instance()->getIcon(u"list-remove"_qs), tr("Delete torrents") , this, &TagFilterWidget::actionDeleteTorrentsTriggered); menu->popup(QCursor::pos()); diff --git a/src/gui/torrentcontentmodel.cpp b/src/gui/torrentcontentmodel.cpp index 1064029c7..629c18f6d 100644 --- a/src/gui/torrentcontentmodel.cpp +++ b/src/gui/torrentcontentmodel.cpp @@ -70,7 +70,7 @@ namespace { public: UnifiedFileIconProvider() - : m_textPlainIcon {UIThemeManager::instance()->getIcon(u"text-plain"_qs)} + : m_textPlainIcon {UIThemeManager::instance()->getIcon(u"help-about"_qs)} { } diff --git a/src/gui/transferlistfilterswidget.cpp b/src/gui/transferlistfilterswidget.cpp index a7956eca9..61ead143d 100644 --- a/src/gui/transferlistfilterswidget.cpp +++ b/src/gui/transferlistfilterswidget.cpp @@ -173,31 +173,31 @@ StatusFilterWidget::StatusFilterWidget(QWidget *parent, TransferListWidget *tran // Add status filters auto *all = new QListWidgetItem(this); all->setData(Qt::DisplayRole, tr("All (0)", "this is for the status filter")); - all->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"filterall"_qs)); + all->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"filter-all"_qs)); auto *downloading = new QListWidgetItem(this); downloading->setData(Qt::DisplayRole, tr("Downloading (0)")); 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"uploading"_qs)); + seeding->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"kt-set-max-upload-speed"_qs)); auto *completed = new QListWidgetItem(this); completed->setData(Qt::DisplayRole, tr("Completed (0)")); - completed->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"completed"_qs)); + 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"resumed"_qs)); + resumed->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(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"paused"_qs)); + paused->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(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"filteractive"_qs)); + active->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"filter-active"_qs)); auto *inactive = new QListWidgetItem(this); inactive->setData(Qt::DisplayRole, tr("Inactive (0)")); - inactive->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"filterinactive"_qs)); + inactive->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"filter-inactive"_qs)); auto *stalled = new QListWidgetItem(this); stalled->setData(Qt::DisplayRole, tr("Stalled (0)")); - stalled->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"filterstalled"_qs)); + stalled->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"filter-stalled"_qs)); auto *stalledUploading = new QListWidgetItem(this); stalledUploading->setData(Qt::DisplayRole, tr("Stalled Uploading (0)")); stalledUploading->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"stalledUP"_qs)); @@ -206,7 +206,7 @@ StatusFilterWidget::StatusFilterWidget(QWidget *parent, TransferListWidget *tran stalledDownloading->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"stalledDL"_qs)); auto *checking = new QListWidgetItem(this); checking->setData(Qt::DisplayRole, tr("Checking (0)")); - checking->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"checking"_qs)); + checking->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"force-recheck"_qs)); auto *errored = new QListWidgetItem(this); errored->setData(Qt::DisplayRole, tr("Errored (0)")); errored->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"error"_qs)); @@ -307,7 +307,7 @@ void StatusFilterWidget::showMenu() , transferList, &TransferListWidget::startVisibleTorrents); menu->addAction(UIThemeManager::instance()->getIcon(u"media-playback-pause"_qs), tr("Pause torrents") , transferList, &TransferListWidget::pauseVisibleTorrents); - menu->addAction(UIThemeManager::instance()->getIcon(u"edit-delete"_qs), tr("Delete torrents") + menu->addAction(UIThemeManager::instance()->getIcon(u"list-remove"_qs), tr("Delete torrents") , transferList, &TransferListWidget::deleteVisibleTorrents); menu->popup(QCursor::pos()); @@ -363,16 +363,16 @@ TrackerFiltersList::TrackerFiltersList(QWidget *parent, TransferListWidget *tran { auto *allTrackers = new QListWidgetItem(this); allTrackers->setData(Qt::DisplayRole, tr("All (0)", "this is for the tracker filter")); - allTrackers->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"network-server"_qs)); + allTrackers->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"trackers"_qs)); auto *noTracker = new QListWidgetItem(this); noTracker->setData(Qt::DisplayRole, tr("Trackerless (0)")); - noTracker->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"network-server"_qs)); + noTracker->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"trackerless"_qs)); auto *errorTracker = new QListWidgetItem(this); errorTracker->setData(Qt::DisplayRole, tr("Error (0)")); - errorTracker->setData(Qt::DecorationRole, style()->standardIcon(QStyle::SP_MessageBoxCritical)); + errorTracker->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"tracker-error"_qs)); auto *warningTracker = new QListWidgetItem(this); warningTracker->setData(Qt::DisplayRole, tr("Warning (0)")); - warningTracker->setData(Qt::DecorationRole, style()->standardIcon(QStyle::SP_MessageBoxWarning)); + warningTracker->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"tracker-warning"_qs)); m_trackers[NULL_HOST] = {{}, noTracker}; @@ -467,7 +467,7 @@ void TrackerFiltersList::addItem(const QString &tracker, const BitTorrent::Torre else { trackerItem = new QListWidgetItem(); - trackerItem->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"network-server"_qs)); + trackerItem->setData(Qt::DecorationRole, UIThemeManager::instance()->getIcon(u"trackers"_qs)); TrackerData trackerData {{}, trackerItem}; trackersIt = m_trackers.insert(host, trackerData); @@ -710,7 +710,7 @@ void TrackerFiltersList::showMenu() , transferList, &TransferListWidget::startVisibleTorrents); menu->addAction(UIThemeManager::instance()->getIcon(u"media-playback-pause"_qs), tr("Pause torrents") , transferList, &TransferListWidget::pauseVisibleTorrents); - menu->addAction(UIThemeManager::instance()->getIcon(u"edit-delete"_qs), tr("Delete torrents") + menu->addAction(UIThemeManager::instance()->getIcon(u"list-remove"_qs), tr("Delete torrents") , transferList, &TransferListWidget::deleteVisibleTorrents); menu->popup(QCursor::pos()); diff --git a/src/gui/transferlistmodel.cpp b/src/gui/transferlistmodel.cpp index ee0f75136..fc0fcc1b8 100644 --- a/src/gui/transferlistmodel.cpp +++ b/src/gui/transferlistmodel.cpp @@ -46,66 +46,41 @@ namespace { - bool isDarkTheme() - { - const QPalette pal = QApplication::palette(); - // QPalette::Base is used for the background of the Treeview - const QColor &color = pal.color(QPalette::Active, QPalette::Base); - return (color.lightness() < 127); - } - QColor getDefaultColorByState(const BitTorrent::TorrentState state) { - // Color names taken from http://cloford.com/resources/colours/500col.htm - const bool dark = isDarkTheme(); - switch (state) { case BitTorrent::TorrentState::Downloading: case BitTorrent::TorrentState::ForcedDownloading: case BitTorrent::TorrentState::DownloadingMetadata: case BitTorrent::TorrentState::ForcedDownloadingMetadata: - if (!dark) - return {34, 139, 34}; // Forest Green - else - return {50, 205, 50}; // Lime Green + return QColorConstants::Svg::green; case BitTorrent::TorrentState::StalledDownloading: + return QColorConstants::Svg::mediumseagreen; case BitTorrent::TorrentState::StalledUploading: - if (!dark) - return {0, 0, 0}; // Black - else - return {204, 204, 204}; // Gray 80 + return QColorConstants::Svg::cornflowerblue; case BitTorrent::TorrentState::Uploading: case BitTorrent::TorrentState::ForcedUploading: - if (!dark) - return {65, 105, 225}; // Royal Blue - else - return {99, 184, 255}; // Steel Blue 1 + return QColorConstants::Svg::royalblue; case BitTorrent::TorrentState::PausedDownloading: - return {250, 128, 114}; // Salmon + return QColorConstants::Svg::grey; case BitTorrent::TorrentState::PausedUploading: - if (!dark) - return {0, 0, 139}; // Dark Blue - else - return {79, 148, 205}; // Steel Blue 3 - case BitTorrent::TorrentState::Error: - case BitTorrent::TorrentState::MissingFiles: - return {255, 0, 0}; // red + return QColorConstants::Svg::darkslateblue; case BitTorrent::TorrentState::QueuedDownloading: case BitTorrent::TorrentState::QueuedUploading: + return QColorConstants::Svg::peru; case BitTorrent::TorrentState::CheckingDownloading: case BitTorrent::TorrentState::CheckingUploading: case BitTorrent::TorrentState::CheckingResumeData: case BitTorrent::TorrentState::Moving: - if (!dark) - return {0, 128, 128}; // Teal - else - return {0, 205, 205}; // Cyan 3 + return QColorConstants::Svg::teal; + case BitTorrent::TorrentState::Error: + case BitTorrent::TorrentState::MissingFiles: case BitTorrent::TorrentState::Unknown: - return {255, 0, 0}; // red + return QColorConstants::Svg::red; default: Q_ASSERT(false); - return {255, 0, 0}; // red + return QColorConstants::Svg::red; } } @@ -176,15 +151,15 @@ TransferListModel::TransferListModel(QObject *parent) {BitTorrent::TorrentState::Error, tr("Errored", "Torrent status, the torrent has an error")} } , m_stateThemeColors {torrentStateColorsFromUITheme()} - , m_checkingIcon {UIThemeManager::instance()->getIcon(u"checking"_qs)} - , m_completedIcon {UIThemeManager::instance()->getIcon(u"completed"_qs)} + , m_checkingIcon {UIThemeManager::instance()->getIcon(u"force-recheck"_qs)} + , 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"paused"_qs)} + , m_pausedIcon {UIThemeManager::instance()->getIcon(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)} - , m_uploadingIcon {UIThemeManager::instance()->getIcon(u"uploading"_qs)} + , m_uploadingIcon {UIThemeManager::instance()->getIcon(u"kt-set-max-upload-speed"_qs)} { configure(); connect(Preferences::instance(), &Preferences::changed, this, &TransferListModel::configure); diff --git a/src/gui/transferlistwidget.cpp b/src/gui/transferlistwidget.cpp index b8655dc9c..af40bd6b6 100644 --- a/src/gui/transferlistwidget.cpp +++ b/src/gui/transferlistwidget.cpp @@ -931,21 +931,21 @@ void TransferListWidget::displayListMenu() connect(actionTopQueuePos, &QAction::triggered, this, &TransferListWidget::topQueuePosSelectedTorrents); auto *actionBottomQueuePos = new QAction(UIThemeManager::instance()->getIcon(u"go-bottom"_qs), tr("Move to &bottom", "i.e. Move to bottom of the queue"), listMenu); connect(actionBottomQueuePos, &QAction::triggered, this, &TransferListWidget::bottomQueuePosSelectedTorrents); - auto *actionSetTorrentPath = new QAction(UIThemeManager::instance()->getIcon(u"inode-directory"_qs), tr("Set loc&ation..."), listMenu); + auto *actionSetTorrentPath = new QAction(UIThemeManager::instance()->getIcon(u"set-location"_qs), tr("Set loc&ation..."), listMenu); connect(actionSetTorrentPath, &QAction::triggered, this, &TransferListWidget::setSelectedTorrentsLocation); - auto *actionForceRecheck = new QAction(UIThemeManager::instance()->getIcon(u"document-edit-verify"_qs), tr("Force rec&heck"), listMenu); + auto *actionForceRecheck = new QAction(UIThemeManager::instance()->getIcon(u"force-recheck"_qs), tr("Force rec&heck"), listMenu); connect(actionForceRecheck, &QAction::triggered, this, &TransferListWidget::recheckSelectedTorrents); - auto *actionForceReannounce = new QAction(UIThemeManager::instance()->getIcon(u"document-edit-verify"_qs), tr("Force r&eannounce"), listMenu); + 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); connect(actionCopyMagnetLink, &QAction::triggered, this, &TransferListWidget::copySelectedMagnetURIs); - auto *actionCopyID = new QAction(UIThemeManager::instance()->getIcon(u"edit-copy"_qs), tr("Torrent &ID"), listMenu); + auto *actionCopyID = new QAction(UIThemeManager::instance()->getIcon(u"help-about"_qs), tr("Torrent &ID"), listMenu); connect(actionCopyID, &QAction::triggered, this, &TransferListWidget::copySelectedIDs); - auto *actionCopyName = new QAction(UIThemeManager::instance()->getIcon(u"edit-copy"_qs), tr("&Name"), listMenu); + auto *actionCopyName = new QAction(UIThemeManager::instance()->getIcon(u"name"_qs), tr("&Name"), listMenu); connect(actionCopyName, &QAction::triggered, this, &TransferListWidget::copySelectedNames); - auto *actionCopyHash1 = new QAction(UIThemeManager::instance()->getIcon(u"edit-copy"_qs), tr("Info &hash v1"), listMenu); + auto *actionCopyHash1 = new QAction(UIThemeManager::instance()->getIcon(u"hash"_qs), tr("Info &hash v1"), listMenu); connect(actionCopyHash1, &QAction::triggered, this, [this]() { copySelectedInfohashes(CopyInfohashPolicy::Version1); }); - auto *actionCopyHash2 = new QAction(UIThemeManager::instance()->getIcon(u"edit-copy"_qs), tr("Info h&ash v2"), listMenu); + auto *actionCopyHash2 = new QAction(UIThemeManager::instance()->getIcon(u"hash"_qs), tr("Info h&ash v2"), listMenu); connect(actionCopyHash2, &QAction::triggered, this, [this]() { copySelectedInfohashes(CopyInfohashPolicy::Version2); }); auto *actionSuperSeedingMode = new TriStateAction(tr("Super seeding mode"), listMenu); connect(actionSuperSeedingMode, &QAction::triggered, this, &TransferListWidget::setSelectedTorrentsSuperSeeding); @@ -1111,7 +1111,7 @@ void TransferListWidget::displayListMenu() for (const QString &category : asConst(categories)) { const QString escapedCategory = QString(category).replace(u'&', u"&&"_qs); // avoid '&' becomes accelerator key - QAction *categoryAction = categoryMenu->addAction(UIThemeManager::instance()->getIcon(u"inode-directory"_qs), escapedCategory + QAction *categoryAction = categoryMenu->addAction(UIThemeManager::instance()->getIcon(u"view-categories"_qs), escapedCategory , this, [this, category]() { setSelectionCategory(category); }); if (allSameCategory && (category == firstCategory)) @@ -1125,7 +1125,7 @@ void TransferListWidget::displayListMenu() QStringList tags(BitTorrent::Session::instance()->tags().values()); std::sort(tags.begin(), tags.end(), Utils::Compare::NaturalLessThan()); - QMenu *tagsMenu = listMenu->addMenu(UIThemeManager::instance()->getIcon(u"view-categories"_qs), tr("Ta&gs")); + QMenu *tagsMenu = listMenu->addMenu(UIThemeManager::instance()->getIcon(u"tags"_qs), tr("Ta&gs")); tagsMenu->addAction(UIThemeManager::instance()->getIcon(u"list-add"_qs), tr("&Add...", "Add / assign multiple tags...") , this, &TransferListWidget::askAddTagsForSelection); @@ -1210,7 +1210,8 @@ void TransferListWidget::displayListMenu() if (BitTorrent::Session::instance()->isQueueingSystemEnabled() && oneNotSeed) { listMenu->addSeparator(); - QMenu *queueMenu = listMenu->addMenu(tr("&Queue")); + QMenu *queueMenu = listMenu->addMenu( + UIThemeManager::instance()->getIcon(u"queued"_qs), tr("&Queue")); queueMenu->addAction(actionTopQueuePos); queueMenu->addAction(actionIncreaseQueuePos); queueMenu->addAction(actionDecreaseQueuePos); diff --git a/src/icons/README.md b/src/icons/README.md index e6a0d0c22..2fee51a73 100644 --- a/src/icons/README.md +++ b/src/icons/README.md @@ -1,12 +1,15 @@ # qBittorrent Icons -Initial `qbt-theme` icons created by Bert Verhelst (). +## Previous +Old icons were created by Bert Verhelst (). +Icons were based on the [Font-Awesome](https://fontawesome.com/icons) icon set. -Icons are based on the `Font-Awesome` icon-set: [link](http://fontawesome.io/icons/). +## Redesign +Redesigned icons has been created by Nowshed H. Imran (). There are some additional icons available in [flow-icon](https://github.com/nowshed-imran/flow-icon) repository that can be used in future development. +New icons are based on [la-capitaine-icon-theme](https://github.com/keeferrourke/la-capitaine-icon-theme) and [ionicons](https://github.com/ionic-team/ionicons). +`la-capitaine` project is owned by Keefer Rourke and due permission was received before modifying them. +`ionicons` project is under MIT license and thus it can be used freely. +Both of these projects can be used as reference for future icon designs. -If you need to add an icon that qBittorrent does not already use, you can take an icon from the SVG fork of `Font-Awesome`: [link](https://github.com/encharm/Font-Awesome-SVG-PNG). - - -## Optimizing SVG - -Use [svgcleaner](https://github.com/RazrFalcon/svgcleaner) +## Color Reference +Colors have been selected from Qt documented [SVG Colors](https://doc.qt.io/qt-6/qcolorconstants.html#svg-colors). It is recommended to use color Hex from the given source. diff --git a/src/icons/application-exit.svg b/src/icons/application-exit.svg index 21a4cf1b2..4bb65fd21 100644 --- a/src/icons/application-exit.svg +++ b/src/icons/application-exit.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/application-rss+xml.svg b/src/icons/application-rss+xml.svg index 34f4f42e1..045da0bea 100644 --- a/src/icons/application-rss+xml.svg +++ b/src/icons/application-rss+xml.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/application-x-mswinurl.svg b/src/icons/application-x-mswinurl.svg index bce3afa4f..51e3242f4 100644 --- a/src/icons/application-x-mswinurl.svg +++ b/src/icons/application-x-mswinurl.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/checked-completed.svg b/src/icons/checked-completed.svg new file mode 100644 index 000000000..370bfab91 --- /dev/null +++ b/src/icons/checked-completed.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/checked.svg b/src/icons/checked.svg deleted file mode 100644 index 7d3f8ea4e..000000000 --- a/src/icons/checked.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/checking.svg b/src/icons/checking.svg deleted file mode 100644 index 90fb467c5..000000000 --- a/src/icons/checking.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/collapse.svg b/src/icons/collapse.svg index 934c147bf..fc9b44d90 100644 --- a/src/icons/collapse.svg +++ b/src/icons/collapse.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/completed.svg b/src/icons/completed.svg deleted file mode 100644 index a2259d92a..000000000 --- a/src/icons/completed.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/configure.svg b/src/icons/configure.svg index 5df125ec6..5046d5f76 100644 --- a/src/icons/configure.svg +++ b/src/icons/configure.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/src/icons/connected.svg b/src/icons/connected.svg index c19ef60dc..792c81ad6 100644 --- a/src/icons/connected.svg +++ b/src/icons/connected.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/dialog-cancel.svg b/src/icons/dialog-cancel.svg deleted file mode 100644 index cde76243d..000000000 --- a/src/icons/dialog-cancel.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/dialog-information.svg b/src/icons/dialog-information.svg deleted file mode 100644 index 705368487..000000000 --- a/src/icons/dialog-information.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/dialog-warning.svg b/src/icons/dialog-warning.svg index 48b6d7915..e8feccfce 100644 --- a/src/icons/dialog-warning.svg +++ b/src/icons/dialog-warning.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/disconnected.svg b/src/icons/disconnected.svg index 12dfc13de..56f99d912 100644 --- a/src/icons/disconnected.svg +++ b/src/icons/disconnected.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/document-edit-verify.svg b/src/icons/document-edit-verify.svg deleted file mode 100644 index e8dbb6890..000000000 --- a/src/icons/document-edit-verify.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/icons/document-edit.svg b/src/icons/document-edit.svg deleted file mode 100644 index 5cee78425..000000000 --- a/src/icons/document-edit.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/icons/document-encrypt.svg b/src/icons/document-encrypt.svg deleted file mode 100644 index a5b59e080..000000000 --- a/src/icons/document-encrypt.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/document-import.svg b/src/icons/document-import.svg deleted file mode 100644 index 307022b0c..000000000 --- a/src/icons/document-import.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/icons/document-new.svg b/src/icons/document-new.svg deleted file mode 100644 index a113c9c87..000000000 --- a/src/icons/document-new.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/icons/document-properties.svg b/src/icons/document-properties.svg deleted file mode 100644 index 86b8cedb2..000000000 --- a/src/icons/document-properties.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/icons/document-save.svg b/src/icons/document-save.svg deleted file mode 100644 index 194af7b54..000000000 --- a/src/icons/document-save.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/download.svg b/src/icons/download.svg deleted file mode 100644 index f754b6f6c..000000000 --- a/src/icons/download.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/downloading.svg b/src/icons/downloading.svg index 443fd36fe..aa10da991 100644 --- a/src/icons/downloading.svg +++ b/src/icons/downloading.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/downloading_small.svg b/src/icons/downloading_small.svg deleted file mode 100644 index 96536339a..000000000 --- a/src/icons/downloading_small.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/edit-clear-history.svg b/src/icons/edit-clear-history.svg deleted file mode 100644 index 5bccb9297..000000000 --- a/src/icons/edit-clear-history.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/icons/edit-clear.svg b/src/icons/edit-clear.svg index 6db8ab03b..c6eea1325 100644 --- a/src/icons/edit-clear.svg +++ b/src/icons/edit-clear.svg @@ -1,7 +1 @@ - - - - - - - + \ No newline at end of file diff --git a/src/icons/edit-copy.svg b/src/icons/edit-copy.svg index ac47f75c9..d01bfe79f 100644 --- a/src/icons/edit-copy.svg +++ b/src/icons/edit-copy.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/src/icons/edit-cut.svg b/src/icons/edit-cut.svg deleted file mode 100644 index 4df84fedb..000000000 --- a/src/icons/edit-cut.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/icons/edit-delete.svg b/src/icons/edit-delete.svg deleted file mode 100644 index 21a4cf1b2..000000000 --- a/src/icons/edit-delete.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/edit-find-user.svg b/src/icons/edit-find-user.svg index 22fad3c4f..bb4989066 100644 --- a/src/icons/edit-find-user.svg +++ b/src/icons/edit-find-user.svg @@ -1,11 +1 @@ - - - - - - - - - - - + \ No newline at end of file diff --git a/src/icons/edit-find.svg b/src/icons/edit-find.svg index 53e1bf9c0..0857116fc 100644 --- a/src/icons/edit-find.svg +++ b/src/icons/edit-find.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/src/icons/edit-paste.svg b/src/icons/edit-paste.svg deleted file mode 100644 index 825b98100..000000000 --- a/src/icons/edit-paste.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/icons/edit-rename.svg b/src/icons/edit-rename.svg index 7d74c1a9f..13fddbeba 100644 --- a/src/icons/edit-rename.svg +++ b/src/icons/edit-rename.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/src/icons/error.svg b/src/icons/error.svg index a081885ed..bb6dd0dc6 100644 --- a/src/icons/error.svg +++ b/src/icons/error.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/expand.svg b/src/icons/expand.svg deleted file mode 100644 index e3c72835f..000000000 --- a/src/icons/expand.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/fileicon.svg b/src/icons/fileicon.svg index 640f9320d..e1cdc4f55 100644 --- a/src/icons/fileicon.svg +++ b/src/icons/fileicon.svg @@ -1,71 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/icons/filter-active.svg b/src/icons/filter-active.svg new file mode 100644 index 000000000..8b86129d7 --- /dev/null +++ b/src/icons/filter-active.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/filter-all.svg b/src/icons/filter-all.svg new file mode 100644 index 000000000..e6801e870 --- /dev/null +++ b/src/icons/filter-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/filter-inactive.svg b/src/icons/filter-inactive.svg new file mode 100644 index 000000000..385ac57a6 --- /dev/null +++ b/src/icons/filter-inactive.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/filter-stalled.svg b/src/icons/filter-stalled.svg new file mode 100644 index 000000000..b376051c5 --- /dev/null +++ b/src/icons/filter-stalled.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/filteractive.svg b/src/icons/filteractive.svg deleted file mode 100644 index 482ee1ea5..000000000 --- a/src/icons/filteractive.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/filterall.svg b/src/icons/filterall.svg deleted file mode 100644 index 400e20a40..000000000 --- a/src/icons/filterall.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/filterinactive.svg b/src/icons/filterinactive.svg deleted file mode 100644 index e93fa577c..000000000 --- a/src/icons/filterinactive.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/filterstalled.svg b/src/icons/filterstalled.svg deleted file mode 100644 index a15a2f842..000000000 --- a/src/icons/filterstalled.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/firewalled.svg b/src/icons/firewalled.svg index 4615499a7..975372c7b 100644 --- a/src/icons/firewalled.svg +++ b/src/icons/firewalled.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/folder-documents.svg b/src/icons/folder-documents.svg index 56be8501e..0b8d29c86 100644 --- a/src/icons/folder-documents.svg +++ b/src/icons/folder-documents.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/src/icons/folder-download.svg b/src/icons/folder-download.svg deleted file mode 100644 index f754b6f6c..000000000 --- a/src/icons/folder-download.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/folder-new.svg b/src/icons/folder-new.svg index 2f98ac728..c16b2843d 100644 --- a/src/icons/folder-new.svg +++ b/src/icons/folder-new.svg @@ -1,5 +1 @@ - - - - - + \ No newline at end of file diff --git a/src/icons/folder-remote.svg b/src/icons/folder-remote.svg index 971d3ca1d..89c5b73db 100644 --- a/src/icons/folder-remote.svg +++ b/src/icons/folder-remote.svg @@ -1,8 +1 @@ - - - - - - - - + \ No newline at end of file diff --git a/src/icons/force-recheck.svg b/src/icons/force-recheck.svg new file mode 100644 index 000000000..b2335bfc3 --- /dev/null +++ b/src/icons/force-recheck.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/gear.svg b/src/icons/gear.svg deleted file mode 100644 index 5df125ec6..000000000 --- a/src/icons/gear.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/icons/gear32.svg b/src/icons/gear32.svg deleted file mode 100644 index 5df125ec6..000000000 --- a/src/icons/gear32.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/icons/go-bottom.svg b/src/icons/go-bottom.svg index 95a78e6c5..765e5a848 100644 --- a/src/icons/go-bottom.svg +++ b/src/icons/go-bottom.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/src/icons/go-down.svg b/src/icons/go-down.svg index d381d5018..81e91f504 100644 --- a/src/icons/go-down.svg +++ b/src/icons/go-down.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/src/icons/go-top.svg b/src/icons/go-top.svg index a8efb2b14..3f6cf8242 100644 --- a/src/icons/go-top.svg +++ b/src/icons/go-top.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/src/icons/go-up.svg b/src/icons/go-up.svg index 5799305f1..c93b22595 100644 --- a/src/icons/go-up.svg +++ b/src/icons/go-up.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/src/icons/hash.svg b/src/icons/hash.svg new file mode 100644 index 000000000..898c70b5e --- /dev/null +++ b/src/icons/hash.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/help-about.svg b/src/icons/help-about.svg index 705368487..803725160 100644 --- a/src/icons/help-about.svg +++ b/src/icons/help-about.svg @@ -1,4 +1 @@ - - - - + \ No newline at end of file diff --git a/src/icons/help-contents.svg b/src/icons/help-contents.svg index d68890acd..519221513 100644 --- a/src/icons/help-contents.svg +++ b/src/icons/help-contents.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc index 84122a1a3..1846ad3bb 100644 --- a/src/icons/icons.qrc +++ b/src/icons/icons.qrc @@ -3,42 +3,24 @@ application-exit.svg application-rss+xml.svg application-x-mswinurl.svg - checked.svg - checking.svg + checked-completed.svg collapse.svg - completed.svg configure.svg connected.svg - dialog-cancel.svg - dialog-information.svg dialog-warning.svg disconnected.svg - document-edit-verify.svg - document-edit.svg - document-encrypt.svg - document-import.svg - document-new.svg - document-properties.svg - document-save.svg - download.svg downloading.svg - downloading_small.svg - edit-clear-history.svg edit-clear.svg edit-copy.svg - edit-cut.svg - edit-delete.svg edit-find-user.svg edit-find.svg - edit-paste.svg edit-rename.svg error.svg - expand.svg fileicon.svg - filteractive.svg - filterall.svg - filterinactive.svg - filterstalled.svg + filter-active.svg + filter-all.svg + filter-inactive.svg + filter-stalled.svg firewalled.svg flags/ac.svg flags/ad.svg @@ -306,77 +288,69 @@ flags/zm.svg flags/zw.svg folder-documents.svg - folder-download.svg folder-new.svg folder-remote.svg - gear.svg - gear32.svg + force-recheck.svg go-bottom.svg go-down.svg go-top.svg go-up.svg + 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.png + loading.svg mail-folder-inbox.svg - mail-mark-read.svg mascot.png media-playback-pause.svg media-playback-start.svg media-seek-forward.svg + name.svg + network-connect.svg network-server.svg - network-wired.svg object-locked.svg office-chart-line.svg - paused.svg + plugins.svg preferences-desktop.svg preferences-other.svg preferences-system-network.svg preferences-web-browser-cookies.svg qbittorrent-tray-dark.svg qbittorrent-tray-light.svg - qbittorrent-tray-with-font.svg qbittorrent-tray.svg qbittorrent.ico qbittorrent_file.ico queued.svg ratio.svg - resumed.svg - rss-config.svg + reannounce.svg security-high.svg security-low.svg - seeding.svg - services.svg + set-location.svg slow.svg slow_off.svg speedometer.svg - sphere.png - sphere2.png splash.png stalledDL.svg stalledUP.svg system-log-out.svg - tab-close.svg - task-attention.svg + tags.svg task-complete.svg - task-ongoing.svg task-reject.svg - text-plain.svg - tools-report-bug.svg - unavailable.svg - uploading.svg + torrent-creator.svg + tracker-error.svg + tracker-warning.svg + trackerless.svg + trackers.svg user-group-delete.svg user-group-new.svg - view-calendar-journal.svg view-categories.svg - view-filter.svg view-preview.svg view-refresh.svg view-statistics.svg diff --git a/src/icons/inode-directory.svg b/src/icons/inode-directory.svg index 56be8501e..96b88d493 100644 --- a/src/icons/inode-directory.svg +++ b/src/icons/inode-directory.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/src/icons/insert-link.svg b/src/icons/insert-link.svg index a4be2d008..13a5c1f86 100644 --- a/src/icons/insert-link.svg +++ b/src/icons/insert-link.svg @@ -1,5 +1 @@ - - - - - + \ No newline at end of file diff --git a/src/icons/ip-blocked.svg b/src/icons/ip-blocked.svg new file mode 100644 index 000000000..a79057787 --- /dev/null +++ b/src/icons/ip-blocked.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/kt-magnet.svg b/src/icons/kt-magnet.svg index 24fa133a2..7b0fa7f5f 100644 --- a/src/icons/kt-magnet.svg +++ b/src/icons/kt-magnet.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/kt-set-max-download-speed.svg b/src/icons/kt-set-max-download-speed.svg index e194a6028..28838269f 100644 --- a/src/icons/kt-set-max-download-speed.svg +++ b/src/icons/kt-set-max-download-speed.svg @@ -1,4 +1 @@ - - - - + \ No newline at end of file diff --git a/src/icons/kt-set-max-upload-speed.svg b/src/icons/kt-set-max-upload-speed.svg index f732adfa4..4a267a975 100644 --- a/src/icons/kt-set-max-upload-speed.svg +++ b/src/icons/kt-set-max-upload-speed.svg @@ -1,4 +1 @@ - - - - + \ No newline at end of file diff --git a/src/icons/list-add.svg b/src/icons/list-add.svg index a113c9c87..57fc7ae6a 100644 --- a/src/icons/list-add.svg +++ b/src/icons/list-add.svg @@ -1,5 +1 @@ - - - - - + \ No newline at end of file diff --git a/src/icons/list-remove.svg b/src/icons/list-remove.svg index a623f1cd4..a21d96522 100644 --- a/src/icons/list-remove.svg +++ b/src/icons/list-remove.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/loading.png b/src/icons/loading.png deleted file mode 100644 index e7b89fd8782c474ae9468088d81c000cb9f47eb5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc0wmQNuC@WGU{4pvkP61V7dG-TDDW^Jd~?L_ zW~bwf^HcOy3^E_Qp1ek-&cq}n<$`kL0wzBOi7P%#cLf9bSFAi4$JKl-q4w5;kYDzP o7DV5;y0wv|`IzAY+Z(sl{2%wfJpW@82hey1Pgg&ebxsLQ0Mauw1ONa4 diff --git a/src/icons/loading.svg b/src/icons/loading.svg new file mode 100644 index 000000000..0b51abc45 --- /dev/null +++ b/src/icons/loading.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/mail-folder-inbox.svg b/src/icons/mail-folder-inbox.svg index 56a121160..c8ac274fa 100644 --- a/src/icons/mail-folder-inbox.svg +++ b/src/icons/mail-folder-inbox.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/mail-mark-read.svg b/src/icons/mail-mark-read.svg deleted file mode 100644 index d0a3b8392..000000000 --- a/src/icons/mail-mark-read.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/media-playback-pause.svg b/src/icons/media-playback-pause.svg index 1b4aa5b62..48141141c 100644 --- a/src/icons/media-playback-pause.svg +++ b/src/icons/media-playback-pause.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/media-playback-start.svg b/src/icons/media-playback-start.svg index d4f369f7b..fbb6b5b2c 100644 --- a/src/icons/media-playback-start.svg +++ b/src/icons/media-playback-start.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/media-seek-forward.svg b/src/icons/media-seek-forward.svg index 7b3275e7c..86df580a5 100644 --- a/src/icons/media-seek-forward.svg +++ b/src/icons/media-seek-forward.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/src/icons/name.svg b/src/icons/name.svg new file mode 100644 index 000000000..1fe68d559 --- /dev/null +++ b/src/icons/name.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/network-connect.svg b/src/icons/network-connect.svg new file mode 100644 index 000000000..392ee8ab4 --- /dev/null +++ b/src/icons/network-connect.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/network-server.svg b/src/icons/network-server.svg index c0c462148..f302762d4 100644 --- a/src/icons/network-server.svg +++ b/src/icons/network-server.svg @@ -1,8 +1 @@ - - - - - - - - + \ No newline at end of file diff --git a/src/icons/network-wired.svg b/src/icons/network-wired.svg deleted file mode 100644 index 1f45312c7..000000000 --- a/src/icons/network-wired.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/object-locked.svg b/src/icons/object-locked.svg index a5b59e080..e12444122 100644 --- a/src/icons/object-locked.svg +++ b/src/icons/object-locked.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/office-chart-line.svg b/src/icons/office-chart-line.svg index a4e61d0f3..b3902f0a4 100644 --- a/src/icons/office-chart-line.svg +++ b/src/icons/office-chart-line.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/paused.svg b/src/icons/paused.svg deleted file mode 100644 index 482f0a0e1..000000000 --- a/src/icons/paused.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/plugins.svg b/src/icons/plugins.svg new file mode 100644 index 000000000..09a0a560e --- /dev/null +++ b/src/icons/plugins.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/preferences-desktop.svg b/src/icons/preferences-desktop.svg index 60e1a79ce..c905c01f8 100644 --- a/src/icons/preferences-desktop.svg +++ b/src/icons/preferences-desktop.svg @@ -1,4 +1 @@ - - - - + \ No newline at end of file diff --git a/src/icons/preferences-other.svg b/src/icons/preferences-other.svg index e3e33d269..8fedd2e52 100644 --- a/src/icons/preferences-other.svg +++ b/src/icons/preferences-other.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/preferences-system-network.svg b/src/icons/preferences-system-network.svg index 9e3c9e42b..18d28e841 100644 --- a/src/icons/preferences-system-network.svg +++ b/src/icons/preferences-system-network.svg @@ -1,4 +1 @@ - - - - + \ No newline at end of file diff --git a/src/icons/preferences-web-browser-cookies.svg b/src/icons/preferences-web-browser-cookies.svg index 3bfaab051..c5fdc49d6 100644 --- a/src/icons/preferences-web-browser-cookies.svg +++ b/src/icons/preferences-web-browser-cookies.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/qbittorrent-tray-dark.svg b/src/icons/qbittorrent-tray-dark.svg index e9f1c2b55..b677fe926 100644 --- a/src/icons/qbittorrent-tray-dark.svg +++ b/src/icons/qbittorrent-tray-dark.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/src/icons/qbittorrent-tray-light.svg b/src/icons/qbittorrent-tray-light.svg index ac469e1a6..44f751279 100644 --- a/src/icons/qbittorrent-tray-light.svg +++ b/src/icons/qbittorrent-tray-light.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/src/icons/qbittorrent-tray-with-font.svg b/src/icons/qbittorrent-tray-with-font.svg deleted file mode 100644 index ddfb0cfac..000000000 --- a/src/icons/qbittorrent-tray-with-font.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - qbittorrent-new-light - - - - - - - - - - - b - - - q - - - diff --git a/src/icons/qbittorrent-tray.svg b/src/icons/qbittorrent-tray.svg index 7bbcf9ba0..bb1249ea3 100644 --- a/src/icons/qbittorrent-tray.svg +++ b/src/icons/qbittorrent-tray.svg @@ -1,16 +1 @@ - - - qbittorrent-new-light - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/icons/qbittorrent_mac.svg b/src/icons/qbittorrent_mac.svg index 0027a3dfe..8d1677771 100644 --- a/src/icons/qbittorrent_mac.svg +++ b/src/icons/qbittorrent_mac.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/icons/queued.svg b/src/icons/queued.svg index 46931e2d0..51b1e1646 100644 --- a/src/icons/queued.svg +++ b/src/icons/queued.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/ratio.svg b/src/icons/ratio.svg index 2c0901ccf..77092f03a 100644 --- a/src/icons/ratio.svg +++ b/src/icons/ratio.svg @@ -1,4 +1 @@ - - - - + \ No newline at end of file diff --git a/src/icons/reannounce.svg b/src/icons/reannounce.svg new file mode 100644 index 000000000..dd82fd4ea --- /dev/null +++ b/src/icons/reannounce.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/resumed.svg b/src/icons/resumed.svg deleted file mode 100644 index bdcd854c0..000000000 --- a/src/icons/resumed.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/rss-config.svg b/src/icons/rss-config.svg deleted file mode 100644 index c798f958d..000000000 --- a/src/icons/rss-config.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/icons/security-high.svg b/src/icons/security-high.svg index 001439de9..d15750484 100644 --- a/src/icons/security-high.svg +++ b/src/icons/security-high.svg @@ -1,4 +1 @@ - - - - + \ No newline at end of file diff --git a/src/icons/security-low.svg b/src/icons/security-low.svg index 4e8fc3db6..5db436fb9 100644 --- a/src/icons/security-low.svg +++ b/src/icons/security-low.svg @@ -1,4 +1 @@ - - - - + \ No newline at end of file diff --git a/src/icons/seeding.svg b/src/icons/seeding.svg deleted file mode 100644 index 764c20a16..000000000 --- a/src/icons/seeding.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/services.svg b/src/icons/services.svg deleted file mode 100644 index 7576f1399..000000000 --- a/src/icons/services.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/set-location.svg b/src/icons/set-location.svg new file mode 100644 index 000000000..7eaa7181f --- /dev/null +++ b/src/icons/set-location.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/slow.svg b/src/icons/slow.svg index b409f3c40..f721bd639 100644 --- a/src/icons/slow.svg +++ b/src/icons/slow.svg @@ -1,5 +1 @@ - - - - - + \ No newline at end of file diff --git a/src/icons/slow_off.svg b/src/icons/slow_off.svg index 02fe917e1..ce913cd61 100644 --- a/src/icons/slow_off.svg +++ b/src/icons/slow_off.svg @@ -1,5 +1 @@ - - - - - + \ No newline at end of file diff --git a/src/icons/speedometer.svg b/src/icons/speedometer.svg index b63fdb8ef..4b56c1658 100644 --- a/src/icons/speedometer.svg +++ b/src/icons/speedometer.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/sphere.png b/src/icons/sphere.png deleted file mode 100644 index ae6588c0324934772a462de486d3788d6bc43692..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^+#ogw6OjBcojC_cv6Te*1v5NikY(Udo33pS6j|@- z;uuoFm{g&1x>24nY9TW(SE5GGWB+J x28CWV@hy#Ap6S)vDbDCHEw$svx%+=#^4EPh$D)3DMj_DY44$rjF6*2UngH{_U;Y39 diff --git a/src/icons/sphere2.png b/src/icons/sphere2.png deleted file mode 100644 index a9291d2e9f6134b4e1f89185be6be8c2890c2568..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^+#ogw6OjBcojC_cv6Te*1p{dy$Xmuf5lC(Jba4!+ zxRt!XxZ>Zd^32Pr?E6zwb;BESN?x-2*Uz-@jo$I=>D%A-;%llBADJ*~G%Zrv|E(tD z)4OY)<<`sZ< - - + \ No newline at end of file diff --git a/src/icons/stalledUP.svg b/src/icons/stalledUP.svg index fb42a7fc1..3188c6575 100644 --- a/src/icons/stalledUP.svg +++ b/src/icons/stalledUP.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/system-log-out.svg b/src/icons/system-log-out.svg index 26dba36a4..d2b457c00 100644 --- a/src/icons/system-log-out.svg +++ b/src/icons/system-log-out.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/tab-close.svg b/src/icons/tab-close.svg deleted file mode 100644 index 506e064b5..000000000 --- a/src/icons/tab-close.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/tags.svg b/src/icons/tags.svg new file mode 100644 index 000000000..8dc8ca30a --- /dev/null +++ b/src/icons/tags.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/task-attention.svg b/src/icons/task-attention.svg deleted file mode 100644 index 48b6d7915..000000000 --- a/src/icons/task-attention.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/task-complete.svg b/src/icons/task-complete.svg index ee3f55fbb..180a95546 100644 --- a/src/icons/task-complete.svg +++ b/src/icons/task-complete.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/task-ongoing.svg b/src/icons/task-ongoing.svg deleted file mode 100644 index e29d579a1..000000000 --- a/src/icons/task-ongoing.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/task-reject.svg b/src/icons/task-reject.svg index 600b6165d..bcd6364c0 100644 --- a/src/icons/task-reject.svg +++ b/src/icons/task-reject.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/text-plain.svg b/src/icons/text-plain.svg deleted file mode 100644 index 54f3560e8..000000000 --- a/src/icons/text-plain.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/tools-report-bug.svg b/src/icons/tools-report-bug.svg deleted file mode 100644 index 389ed8fae..000000000 --- a/src/icons/tools-report-bug.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/torrent-creator.svg b/src/icons/torrent-creator.svg new file mode 100644 index 000000000..324a1a492 --- /dev/null +++ b/src/icons/torrent-creator.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/tracker-error.svg b/src/icons/tracker-error.svg new file mode 100644 index 000000000..8a531c3f2 --- /dev/null +++ b/src/icons/tracker-error.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/tracker-warning.svg b/src/icons/tracker-warning.svg new file mode 100644 index 000000000..4e473d9e3 --- /dev/null +++ b/src/icons/tracker-warning.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/trackerless.svg b/src/icons/trackerless.svg new file mode 100644 index 000000000..ab9d8e751 --- /dev/null +++ b/src/icons/trackerless.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/trackers.svg b/src/icons/trackers.svg new file mode 100644 index 000000000..a53a9e411 --- /dev/null +++ b/src/icons/trackers.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/unavailable.svg b/src/icons/unavailable.svg deleted file mode 100644 index 32aca513a..000000000 --- a/src/icons/unavailable.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/uploading.svg b/src/icons/uploading.svg deleted file mode 100644 index b44d0b0e0..000000000 --- a/src/icons/uploading.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/user-group-delete.svg b/src/icons/user-group-delete.svg index a97069ec3..b49397f2e 100644 --- a/src/icons/user-group-delete.svg +++ b/src/icons/user-group-delete.svg @@ -1,7 +1 @@ - - - - - - - + \ No newline at end of file diff --git a/src/icons/user-group-new.svg b/src/icons/user-group-new.svg index 1915799f6..ceb30b241 100644 --- a/src/icons/user-group-new.svg +++ b/src/icons/user-group-new.svg @@ -1,7 +1 @@ - - - - - - - + \ No newline at end of file diff --git a/src/icons/view-calendar-journal.svg b/src/icons/view-calendar-journal.svg deleted file mode 100644 index f821dd680..000000000 --- a/src/icons/view-calendar-journal.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/view-categories.svg b/src/icons/view-categories.svg index 079e2ab62..dc8e06f69 100644 --- a/src/icons/view-categories.svg +++ b/src/icons/view-categories.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/view-filter.svg b/src/icons/view-filter.svg deleted file mode 100644 index 0dca9eb3c..000000000 --- a/src/icons/view-filter.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/view-preview.svg b/src/icons/view-preview.svg index 5885fe5d0..ffa7955e9 100644 --- a/src/icons/view-preview.svg +++ b/src/icons/view-preview.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/view-refresh.svg b/src/icons/view-refresh.svg index 5925a85fb..3b5b6a848 100644 --- a/src/icons/view-refresh.svg +++ b/src/icons/view-refresh.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/view-statistics.svg b/src/icons/view-statistics.svg index d18c0bcd9..43e0457a4 100644 --- a/src/icons/view-statistics.svg +++ b/src/icons/view-statistics.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/wallet-open.svg b/src/icons/wallet-open.svg index 1d00536a7..ecc54d082 100644 --- a/src/icons/wallet-open.svg +++ b/src/icons/wallet-open.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/src/icons/webui.svg b/src/icons/webui.svg index cae1b048e..d9619d7db 100644 --- a/src/icons/webui.svg +++ b/src/icons/webui.svg @@ -1,9 +1 @@ - - - - - - - - - + \ No newline at end of file diff --git a/src/webui/www/private/index.html b/src/webui/www/private/index.html index f6d0fe15e..015b606e6 100644 --- a/src/webui/www/private/index.html +++ b/src/webui/www/private/index.html @@ -65,18 +65,18 @@
  • QBT_TR(Move Up Queue)QBT_TR[CONTEXT=MainWindow]QBT_TR(Move Up Queue)QBT_TR[CONTEXT=MainWindow]
  • QBT_TR(Move Down Queue)QBT_TR[CONTEXT=MainWindow]QBT_TR(Move Down Queue)QBT_TR[CONTEXT=MainWindow]
  • QBT_TR(Bottom of Queue)QBT_TR[CONTEXT=MainWindow]QBT_TR(Bottom of Queue)QBT_TR[CONTEXT=MainWindow]
    • -
  • QBT_TR(Force Recheck)QBT_TR[CONTEXT=TransferListWidget]QBT_TR(Force recheck)QBT_TR[CONTEXT=TransferListWidget]
    • +
  • QBT_TR(Force Recheck)QBT_TR[CONTEXT=TransferListWidget]QBT_TR(Force recheck)QBT_TR[CONTEXT=TransferListWidget]
  • QBT_TR(View)QBT_TR[CONTEXT=MainWindow]
    • @@ -133,7 +133,7 @@
  • QBT_TR(Force Resume)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Force Resume)QBT_TR[CONTEXT=TransferListWidget]
  • QBT_TR(Delete)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Delete)QBT_TR[CONTEXT=TransferListWidget]
  • - QBT_TR(Set location...)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Set location...)QBT_TR[CONTEXT=TransferListWidget] + QBT_TR(Set location...)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Set location...)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Rename...)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Rename...)QBT_TR[CONTEXT=TransferListWidget]
  • @@ -141,20 +141,20 @@
    • - QBT_TR(Tags)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Tags)QBT_TR[CONTEXT=TransferListWidget] + QBT_TR(Tags)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Tags)QBT_TR[CONTEXT=TransferListWidget]
      • - QBT_TR(Automatic Torrent Management)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Automatic Torrent Management)QBT_TR[CONTEXT=TransferListWidget] + QBT_TR(Automatic Torrent Management)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Automatic Torrent Management)QBT_TR[CONTEXT=TransferListWidget]
      • QBT_TR(Limit download rate...)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Limit download rate...)QBT_TR[CONTEXT=TransferListWidget]
      • QBT_TR(Limit upload rate...)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Limit upload rate...)QBT_TR[CONTEXT=TransferListWidget]
      • QBT_TR(Limit share ratio...)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Limit share ratio...)QBT_TR[CONTEXT=TransferListWidget]
        • -
      • QBT_TR(Super seeding mode)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Super seeding mode)QBT_TR[CONTEXT=TransferListWidget]
        • -
      • QBT_TR(Download in sequential order)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Download in sequential order)QBT_TR[CONTEXT=TransferListWidget]
        • -
      • QBT_TR(Download first and last pieces first)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Download first and last pieces first)QBT_TR[CONTEXT=TransferListWidget]
        • -
      • QBT_TR(Force recheck)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Force recheck)QBT_TR[CONTEXT=TransferListWidget]
        • -
      • QBT_TR(Force reannounce)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Force reannounce)QBT_TR[CONTEXT=TransferListWidget]
        • +
      • QBT_TR(Super seeding mode)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Super seeding mode)QBT_TR[CONTEXT=TransferListWidget]
        • +
      • QBT_TR(Download in sequential order)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Download in sequential order)QBT_TR[CONTEXT=TransferListWidget]
        • +
      • QBT_TR(Download first and last pieces first)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Download first and last pieces first)QBT_TR[CONTEXT=TransferListWidget]
        • +
      • QBT_TR(Force recheck)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Force recheck)QBT_TR[CONTEXT=TransferListWidget]
        • +
      • QBT_TR(Force reannounce)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Force reannounce)QBT_TR[CONTEXT=TransferListWidget]
      • QBT_TR(Queue)QBT_TR[CONTEXT=TransferListWidget] @@ -234,11 +234,11 @@ QBT_TR(Connection status)QBT_TR[CONTEXT=MainWindow] - QBT_TR(Alternative speed limits)QBT_TR[CONTEXT=MainWindow] + QBT_TR(Alternative speed limits)QBT_TR[CONTEXT=MainWindow] - QBT_TR(Download speed icon)QBT_TR[CONTEXT=MainWindow] + 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/client.js b/src/webui/www/private/scripts/client.js index 3f3ddf44d..63912241d 100644 --- a/src/webui/www/private/scripts/client.js +++ b/src/webui/www/private/scripts/client.js @@ -417,7 +417,7 @@ window.addEvent('load', function() { const create_link = function(hash, text, count) { const html = '' - + '' + + '' + window.qBittorrent.Misc.escapeHtml(text) + ' (' + count + ')' + ''; const el = new Element('li', { id: hash, @@ -474,7 +474,7 @@ window.addEvent('load', function() { const createLink = function(hash, text, count) { const html = '' - + '' + + '' + window.qBittorrent.Misc.escapeHtml(text) + ' (' + count + ')' + ''; const el = new Element('li', { id: hash, @@ -528,7 +528,7 @@ window.addEvent('load', function() { const createLink = function(hash, text, count) { const html = '' - + '' + + '' + window.qBittorrent.Misc.escapeHtml(text.replace("%1", count)) + ''; const el = new Element('li', { id: hash, diff --git a/src/webui/www/private/scripts/contextmenu.js b/src/webui/www/private/scripts/contextmenu.js index 6bac90071..32d86663d 100644 --- a/src/webui/www/private/scripts/contextmenu.js +++ b/src/webui/www/private/scripts/contextmenu.js @@ -449,7 +449,7 @@ window.qBittorrent.ContextMenu = (function() { Object.each(sortedCategories, function(categoryName) { const categoryHash = genHash(categoryName); const el = new Element('li', { - html: ' ' + window.qBittorrent.Misc.escapeHtml(categoryName) + '' + html: ' ' + window.qBittorrent.Misc.escapeHtml(categoryName) + '' }); if (first) { el.addClass('separator'); diff --git a/src/webui/www/private/scripts/dynamicTable.js b/src/webui/www/private/scripts/dynamicTable.js index 0f10d4553..8801958cb 100644 --- a/src/webui/www/private/scripts/dynamicTable.js +++ b/src/webui/www/private/scripts/dynamicTable.js @@ -327,7 +327,7 @@ window.qBittorrent.DynamicTable = (function() { }); const createLi = function(columnName, text) { - const html = '' + window.qBittorrent.Misc.escapeHtml(text) + ''; + const html = '' + window.qBittorrent.Misc.escapeHtml(text) + ''; return new Element('li', { html: html }); @@ -947,10 +947,10 @@ window.qBittorrent.DynamicTable = (function() { state = "uploading"; break; case "pausedDL": - state = "paused"; + state = "media-playback-pause"; break; case "pausedUP": - state = "completed"; + state = "checked-completed"; break; case "queuedDL": case "queuedUP": @@ -961,7 +961,7 @@ window.qBittorrent.DynamicTable = (function() { case "queuedForChecking": case "checkingResumeData": case "moving": - state = "checking"; + state = "force-recheck"; break; case "unknown": case "missingFiles": @@ -2180,7 +2180,7 @@ window.qBittorrent.DynamicTable = (function() { img_path = 'icons/application-rss+xml.svg'; break; case 'hasError': - img_path = 'icons/unavailable.svg'; + img_path = 'icons/task-reject.svg'; break; case 'isLoading': img_path = 'images/spinner.gif'; diff --git a/src/webui/www/private/views/filters.html b/src/webui/www/private/views/filters.html index 8551e2fe0..31db0288e 100644 --- a/src/webui/www/private/views/filters.html +++ b/src/webui/www/private/views/filters.html @@ -3,18 +3,18 @@ QBT_TR(Status)QBT_TR[CONTEXT=TransferListFiltersWidget] diff --git a/src/webui/www/private/views/preferences.html b/src/webui/www/private/views/preferences.html index 98d71c480..98f4b9a2e 100644 --- a/src/webui/www/private/views/preferences.html +++ b/src/webui/www/private/views/preferences.html @@ -368,7 +368,7 @@ @@ -386,7 +386,7 @@
        - QBT_TR(Alternative speed limits)QBT_TR[CONTEXT=MainWindow] + QBT_TR(Alternative speed limits)QBT_TR[CONTEXT=MainWindow]   QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog]
        diff --git a/src/webui/www/private/views/rss.html b/src/webui/www/private/views/rss.html index 73b815544..b7f5b66bf 100644 --- a/src/webui/www/private/views/rss.html +++ b/src/webui/www/private/views/rss.html @@ -139,11 +139,11 @@ diff --git a/src/webui/www/private/views/rssDownloader.html b/src/webui/www/private/views/rssDownloader.html index e0f965504..a2dafa4ed 100644 --- a/src/webui/www/private/views/rssDownloader.html +++ b/src/webui/www/private/views/rssDownloader.html @@ -119,12 +119,12 @@ #newRuleButton { float: right; - background-image: url('icons/document-new.svg'); + background-image: url('icons/list-add.svg'); } #deleteRuleButton { float: right; - background-image: url('icons/list-remove.svg'); + background-image: url('icons/edit-clear.svg'); } @@ -312,8 +312,8 @@ Supports the formats: S01E01, 1x1, 2017.12.31 and 31.12.2017 (Date formats also diff --git a/src/webui/www/private/views/search.html b/src/webui/www/private/views/search.html index e1b6db077..a65a0dc67 100644 --- a/src/webui/www/private/views/search.html +++ b/src/webui/www/private/views/search.html @@ -170,14 +170,14 @@ diff --git a/src/webui/www/private/views/searchplugins.html b/src/webui/www/private/views/searchplugins.html index f49ae2415..7cdb19370 100644 --- a/src/webui/www/private/views/searchplugins.html +++ b/src/webui/www/private/views/searchplugins.html @@ -72,7 +72,7 @@
        - QBT_TR(Alternative speed limits)QBT_TR[CONTEXT=MainWindow] + QBT_TR(Alternative speed limits)QBT_TR[CONTEXT=MainWindow]   QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog]