mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2025-12-31 04:38:04 -06:00
committed by
GitHub
parent
ee00a80796
commit
2310dcd136
@@ -99,6 +99,12 @@ DesktopIntegration::DesktopIntegration(QObject *parent)
|
||||
connect(Preferences::instance(), &Preferences::changed, this, &DesktopIntegration::onPreferencesChanged);
|
||||
}
|
||||
|
||||
DesktopIntegration::~DesktopIntegration()
|
||||
{
|
||||
if (m_menu)
|
||||
delete m_menu;
|
||||
}
|
||||
|
||||
bool DesktopIntegration::isActive() const
|
||||
{
|
||||
#ifdef Q_OS_MACOS
|
||||
@@ -135,12 +141,36 @@ void DesktopIntegration::setMenu(QMenu *menu)
|
||||
if (menu == m_menu)
|
||||
return;
|
||||
|
||||
#if defined Q_OS_MACOS
|
||||
if (m_menu)
|
||||
delete m_menu;
|
||||
|
||||
m_menu = menu;
|
||||
|
||||
#ifdef Q_OS_MACOS
|
||||
if (m_menu)
|
||||
m_menu->setAsDockMenu();
|
||||
#elif defined Q_OS_UNIX
|
||||
const bool systemTrayEnabled = m_systrayIcon;
|
||||
if (m_menu)
|
||||
{
|
||||
if (m_systrayIcon)
|
||||
{
|
||||
delete m_systrayIcon;
|
||||
m_systrayIcon = nullptr;
|
||||
}
|
||||
delete m_menu;
|
||||
}
|
||||
|
||||
m_menu = menu;
|
||||
|
||||
if (systemTrayEnabled && !m_systrayIcon)
|
||||
createTrayIcon();
|
||||
#else
|
||||
if (m_menu)
|
||||
delete m_menu;
|
||||
|
||||
m_menu = menu;
|
||||
|
||||
if (m_systrayIcon)
|
||||
m_systrayIcon->setContextMenu(m_menu);
|
||||
#endif
|
||||
|
||||
@@ -49,6 +49,7 @@ class DesktopIntegration final : public QObject
|
||||
|
||||
public:
|
||||
explicit DesktopIntegration(QObject *parent = nullptr);
|
||||
~DesktopIntegration() override;
|
||||
|
||||
bool isActive() const;
|
||||
|
||||
|
||||
@@ -460,7 +460,6 @@ MainWindow::MainWindow(IGUIApplication *app, WindowState initialState)
|
||||
|
||||
MainWindow::~MainWindow()
|
||||
{
|
||||
app()->desktopIntegration()->setMenu(nullptr);
|
||||
delete m_ui;
|
||||
}
|
||||
|
||||
@@ -1570,7 +1569,7 @@ void MainWindow::downloadFromURLList(const QStringList &urlList)
|
||||
|
||||
QMenu *MainWindow::createDesktopIntegrationMenu()
|
||||
{
|
||||
auto *menu = new QMenu(this);
|
||||
auto *menu = new QMenu;
|
||||
|
||||
#ifndef Q_OS_MACOS
|
||||
connect(menu, &QMenu::aboutToShow, this, [this]()
|
||||
|
||||
Reference in New Issue
Block a user