squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2026-01-01 05:08:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Incorporate GuiIconProvider inside UIThemeManager

Browse Source
This commit is contained in:
Prince Gupta
2019-07-16 09:31:33 +05:30
parent 17541b0d34
commit 8267a4fef9
33 changed files with 265 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/search/searchwidget.cpp
View File

@@ -43,14 +43,14 @@
#include <QVector>
#include "base/global.h"
#include "base/search/searchpluginmanager.h"
#include "base/search/searchhandler.h"
#include "base/search/searchpluginmanager.h"
#include "base/utils/foreignapps.h"
#include "guiiconprovider.h"
#include "mainwindow.h"
#include "pluginselectdialog.h"
#include "searchjobwidget.h"
#include "ui_searchwidget.h"
#include "uithememanager.h"
#define SEARCHHISTORY_MAXSIZE 50
#define URL_COLUMN 5
@@ -104,8 +104,8 @@ SearchWidget::SearchWidget(MainWindow *mainWindow)
#ifndef Q_OS_MAC
// Icons
m_ui->searchButton->setIcon(GuiIconProvider::instance()->getIcon("edit-find"));
m_ui->pluginsButton->setIcon(GuiIconProvider::instance()->getIcon("preferences-system-network"));
m_ui->searchButton->setIcon(UIThemeManager::instance()->getIcon("edit-find"));
m_ui->pluginsButton->setIcon(UIThemeManager::instance()->getIcon("preferences-system-network"));
#else
// On macOS the icons overlap the text otherwise
QSize iconSize = m_ui->tabWidget->iconSize();
@@ -318,7 +318,7 @@ void SearchWidget::tabStatusChanged(QWidget *tab)
{
const int tabIndex = m_ui->tabWidget->indexOf(tab);
m_ui->tabWidget->setTabToolTip(tabIndex, tab->statusTip());
m_ui->tabWidget->setTabIcon(tabIndex, GuiIconProvider::instance()->getIcon(
m_ui->tabWidget->setTabIcon(tabIndex, UIThemeManager::instance()->getIcon(
statusIconName(static_cast<SearchJobWidget *>(tab)->status())));
if ((tab == m_activeSearchTab) && (m_activeSearchTab->status() != SearchJobWidget::Status::Ongoing)) {