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

Extract desktop integration stuff into separate class

Browse Source 
PR #17313.
This commit is contained in:
Vladimir Golovnev
2022-07-09 08:06:22 +03:00
committed by GitHub
parent 2ef059807a
commit 890630944d
12 changed files with 541 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,6 +52,7 @@
#include "base/search/searchhandler.h"
#include "base/search/searchpluginmanager.h"
#include "base/utils/foreignapps.h"
#include "gui/desktopintegration.h"
#include "gui/mainwindow.h"
#include "gui/uithememanager.h"
#include "pluginselectdialog.h"
@@ -83,10 +84,11 @@ namespace
}
}
SearchWidget::SearchWidget(MainWindow *mainWindow)
SearchWidget::SearchWidget(IGUIApplication *app, MainWindow *mainWindow)
: QWidget(mainWindow)
, m_ui(new Ui::SearchWidget())
, m_mainWindow(mainWindow)
, GUIApplicationComponent(app)
, m_ui {new Ui::SearchWidget()}
, m_mainWindow {mainWindow}
{
m_ui->setupUi(this);
m_ui->tabWidget->tabBar()->installEventFilter(this);
@@ -304,7 +306,7 @@ void SearchWidget::on_searchButton_clicked()
{
if (!Utils::ForeignApps::pythonInfo().isValid())
{
m_mainWindow->showNotificationBalloon(tr("Search Engine"), tr("Please install Python to use the Search Engine."));
app()->desktopIntegration()->showNotification(tr("Search Engine"), tr("Please install Python to use the Search Engine."));
return;
}
@@ -370,12 +372,12 @@ void SearchWidget::tabStatusChanged(QWidget *tab)
{
Q_ASSERT(m_activeSearchTab->status() != SearchJobWidget::Status::Ongoing);
if (m_mainWindow->isNotificationsEnabled() && (m_mainWindow->currentTabWidget() != this))
if (app()->desktopIntegration()->isNotificationsEnabled() && (m_mainWindow->currentTabWidget() != this))
{
if (m_activeSearchTab->status() == SearchJobWidget::Status::Error)
m_mainWindow->showNotificationBalloon(tr("Search Engine"), tr("Search has failed"));
app()->desktopIntegration()->showNotification(tr("Search Engine"), tr("Search has failed"));
else
m_mainWindow->showNotificationBalloon(tr("Search Engine"), tr("Search has finished"));
app()->desktopIntegration()->showNotification(tr("Search Engine"), tr("Search has finished"));
}
m_activeSearchTab = nullptr;

6
src/gui/search/searchwidget.h
View File

@@ -34,6 +34,8 @@
#include <QPointer>
#include <QWidget>
#include "gui/guiapplicationcomponent.h"
class QEvent;
class QObject;
class QTabWidget;
@@ -46,13 +48,13 @@ namespace Ui
class SearchWidget;
}
class SearchWidget : public QWidget
class SearchWidget : public QWidget, public GUIApplicationComponent
{
Q_OBJECT
Q_DISABLE_COPY_MOVE(SearchWidget)
public:
explicit SearchWidget(MainWindow *mainWindow);
explicit SearchWidget(IGUIApplication *app, MainWindow *mainWindow);
~SearchWidget() override;
void giveFocusToSearchInput();