Vladimir Golovnev
2 years ago
committed by
GitHub
12 changed files with 541 additions and 347 deletions
@ -0,0 +1,273 @@ |
|||||||
|
/*
|
||||||
|
* Bittorrent Client using Qt and libtorrent. |
||||||
|
* Copyright (C) 2022 Vladimir Golovnev <glassez@yandex.ru> |
||||||
|
* Copyright (C) 2006 Christophe Dumez <chris@qbittorrent.org> |
||||||
|
* |
||||||
|
* This program is free software; you can redistribute it and/or |
||||||
|
* modify it under the terms of the GNU General Public License |
||||||
|
* as published by the Free Software Foundation; either version 2 |
||||||
|
* of the License, or (at your option) any later version. |
||||||
|
* |
||||||
|
* This program is distributed in the hope that it will be useful, |
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||||
|
* GNU General Public License for more details. |
||||||
|
* |
||||||
|
* You should have received a copy of the GNU General Public License |
||||||
|
* along with this program; if not, write to the Free Software |
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
||||||
|
* |
||||||
|
* In addition, as a special exception, the copyright holders give permission to |
||||||
|
* link this program with the OpenSSL project's "OpenSSL" library (or with |
||||||
|
* modified versions of it that use the same license as the "OpenSSL" library), |
||||||
|
* and distribute the linked executables. You must obey the GNU General Public |
||||||
|
* License in all respects for all of the code used other than "OpenSSL". If you |
||||||
|
* modify file(s), you may extend this exception to your version of the file(s), |
||||||
|
* but you are not obligated to do so. If you do not wish to do so, delete this |
||||||
|
* exception statement from your version. |
||||||
|
*/ |
||||||
|
|
||||||
|
#include "desktopintegration.h" |
||||||
|
|
||||||
|
#include <chrono> |
||||||
|
|
||||||
|
#include <QMenu> |
||||||
|
#include <QTimer> |
||||||
|
|
||||||
|
#ifndef Q_OS_MACOS |
||||||
|
#include <QSystemTrayIcon> |
||||||
|
#endif |
||||||
|
|
||||||
|
#include "base/logger.h" |
||||||
|
#include "base/preferences.h" |
||||||
|
#include "uithememanager.h" |
||||||
|
|
||||||
|
#ifdef Q_OS_MACOS |
||||||
|
#include "macutilities.h" |
||||||
|
#endif |
||||||
|
|
||||||
|
#ifdef QBT_USES_CUSTOMDBUSNOTIFICATIONS |
||||||
|
#include "notifications/dbusnotifier.h" |
||||||
|
#endif |
||||||
|
|
||||||
|
namespace |
||||||
|
{ |
||||||
|
#ifdef Q_OS_MACOS |
||||||
|
DesktopIntegration *desktopIntegrationInstance = nullptr; |
||||||
|
|
||||||
|
bool handleDockClicked(id self, SEL cmd, ...) |
||||||
|
{ |
||||||
|
Q_UNUSED(self); |
||||||
|
Q_UNUSED(cmd); |
||||||
|
|
||||||
|
Q_ASSERT(desktopIntegrationInstance); |
||||||
|
emit desktopIntegrationInstance->activationRequested(); |
||||||
|
|
||||||
|
return true; |
||||||
|
} |
||||||
|
#endif |
||||||
|
} |
||||||
|
|
||||||
|
using namespace std::chrono_literals; |
||||||
|
|
||||||
|
#define SETTINGS_KEY(name) u"GUI/" name |
||||||
|
#define NOTIFICATIONS_SETTINGS_KEY(name) (SETTINGS_KEY(u"Notifications/"_qs) name) |
||||||
|
|
||||||
|
DesktopIntegration::DesktopIntegration(QObject *parent) |
||||||
|
: QObject(parent) |
||||||
|
, m_storeNotificationEnabled {NOTIFICATIONS_SETTINGS_KEY(u"Enabled"_qs), true} |
||||||
|
#ifdef QBT_USES_CUSTOMDBUSNOTIFICATIONS |
||||||
|
, m_storeNotificationTimeOut {NOTIFICATIONS_SETTINGS_KEY(u"Timeout"_qs), -1} |
||||||
|
#endif |
||||||
|
{ |
||||||
|
#ifdef Q_OS_MACOS |
||||||
|
desktopIntegrationInstance = this; |
||||||
|
MacUtils::overrideDockClickHandler(handleDockClicked); |
||||||
|
#else |
||||||
|
if (Preferences::instance()->systemTrayEnabled()) |
||||||
|
createTrayIcon(20); |
||||||
|
|
||||||
|
#ifdef QBT_USES_CUSTOMDBUSNOTIFICATIONS |
||||||
|
if (isNotificationsEnabled()) |
||||||
|
{ |
||||||
|
m_notifier = new DBusNotifier(this); |
||||||
|
connect(m_notifier, &DBusNotifier::messageClicked, this, &DesktopIntegration::notificationClicked); |
||||||
|
} |
||||||
|
#endif |
||||||
|
#endif |
||||||
|
|
||||||
|
connect(Preferences::instance(), &Preferences::changed, this, &DesktopIntegration::onPreferencesChanged); |
||||||
|
} |
||||||
|
|
||||||
|
bool DesktopIntegration::isActive() const |
||||||
|
{ |
||||||
|
#ifdef Q_OS_MACOS |
||||||
|
return true; |
||||||
|
#else |
||||||
|
return (m_systrayIcon != nullptr); |
||||||
|
#endif |
||||||
|
} |
||||||
|
|
||||||
|
QString DesktopIntegration::toolTip() const |
||||||
|
{ |
||||||
|
return m_toolTip; |
||||||
|
} |
||||||
|
|
||||||
|
void DesktopIntegration::setToolTip(const QString &toolTip) |
||||||
|
{ |
||||||
|
if (m_toolTip == toolTip) |
||||||
|
return; |
||||||
|
|
||||||
|
#ifndef Q_OS_MACOS |
||||||
|
if (m_systrayIcon) |
||||||
|
m_systrayIcon->setToolTip(toolTip); |
||||||
|
#endif |
||||||
|
} |
||||||
|
|
||||||
|
QMenu *DesktopIntegration::menu() const |
||||||
|
{ |
||||||
|
return m_menu; |
||||||
|
} |
||||||
|
|
||||||
|
void DesktopIntegration::setMenu(QMenu *menu) |
||||||
|
{ |
||||||
|
if (menu == m_menu) |
||||||
|
return; |
||||||
|
|
||||||
|
m_menu = menu; |
||||||
|
|
||||||
|
#ifdef Q_OS_MACOS |
||||||
|
if (m_menu) |
||||||
|
m_menu->setAsDockMenu(); |
||||||
|
#else |
||||||
|
if (m_systrayIcon) |
||||||
|
m_systrayIcon->setContextMenu(m_menu); |
||||||
|
#endif |
||||||
|
} |
||||||
|
|
||||||
|
bool DesktopIntegration::isNotificationsEnabled() const |
||||||
|
{ |
||||||
|
return m_storeNotificationEnabled; |
||||||
|
} |
||||||
|
|
||||||
|
void DesktopIntegration::setNotificationsEnabled(const bool value) |
||||||
|
{ |
||||||
|
if (m_storeNotificationEnabled == value) |
||||||
|
return; |
||||||
|
|
||||||
|
m_storeNotificationEnabled = value; |
||||||
|
|
||||||
|
#ifdef QBT_USES_CUSTOMDBUSNOTIFICATIONS |
||||||
|
if (value) |
||||||
|
{ |
||||||
|
m_notifier = new DBusNotifier(this); |
||||||
|
connect(m_notifier, &DBusNotifier::messageClicked, this, &DesktopIntegration::notificationClicked); |
||||||
|
} |
||||||
|
else |
||||||
|
{ |
||||||
|
delete m_notifier; |
||||||
|
m_notifier = nullptr; |
||||||
|
} |
||||||
|
#endif |
||||||
|
} |
||||||
|
|
||||||
|
int DesktopIntegration::notificationTimeout() const |
||||||
|
{ |
||||||
|
#ifdef QBT_USES_CUSTOMDBUSNOTIFICATIONS |
||||||
|
return m_storeNotificationTimeOut; |
||||||
|
#else |
||||||
|
return 5000; |
||||||
|
#endif |
||||||
|
} |
||||||
|
|
||||||
|
#ifdef QBT_USES_CUSTOMDBUSNOTIFICATIONS |
||||||
|
void DesktopIntegration::setNotificationTimeout(const int value) |
||||||
|
{ |
||||||
|
m_storeNotificationTimeOut = value; |
||||||
|
} |
||||||
|
#endif |
||||||
|
|
||||||
|
void DesktopIntegration::showNotification(const QString &title, const QString &msg) const |
||||||
|
{ |
||||||
|
if (!isNotificationsEnabled()) |
||||||
|
return; |
||||||
|
|
||||||
|
#ifdef Q_OS_MACOS |
||||||
|
MacUtils::displayNotification(title, msg); |
||||||
|
#else |
||||||
|
#ifdef QBT_USES_CUSTOMDBUSNOTIFICATIONS |
||||||
|
m_notifier->showMessage(title, msg, notificationTimeout()); |
||||||
|
#else |
||||||
|
if (m_systrayIcon && QSystemTrayIcon::supportsMessages()) |
||||||
|
m_systrayIcon->showMessage(title, msg, QSystemTrayIcon::Information, notificationTimeout()); |
||||||
|
#endif |
||||||
|
#endif |
||||||
|
} |
||||||
|
|
||||||
|
void DesktopIntegration::onPreferencesChanged() |
||||||
|
{ |
||||||
|
#ifndef Q_OS_MACOS |
||||||
|
if (Preferences::instance()->systemTrayEnabled()) |
||||||
|
{ |
||||||
|
if (m_systrayIcon) |
||||||
|
{ |
||||||
|
// Reload systray icon
|
||||||
|
m_systrayIcon->setIcon(UIThemeManager::instance()->getSystrayIcon()); |
||||||
|
} |
||||||
|
else |
||||||
|
{ |
||||||
|
createTrayIcon(20); |
||||||
|
} |
||||||
|
} |
||||||
|
else |
||||||
|
{ |
||||||
|
delete m_systrayIcon; |
||||||
|
m_systrayIcon = nullptr; |
||||||
|
emit stateChanged(); |
||||||
|
} |
||||||
|
#endif |
||||||
|
} |
||||||
|
|
||||||
|
#ifndef Q_OS_MACOS |
||||||
|
void DesktopIntegration::createTrayIcon(const int retries) |
||||||
|
{ |
||||||
|
Q_ASSERT(!m_systrayIcon); |
||||||
|
|
||||||
|
if (QSystemTrayIcon::isSystemTrayAvailable()) |
||||||
|
{ |
||||||
|
m_systrayIcon = new QSystemTrayIcon(UIThemeManager::instance()->getSystrayIcon(), this); |
||||||
|
|
||||||
|
m_systrayIcon->setToolTip(m_toolTip); |
||||||
|
|
||||||
|
if (m_menu) |
||||||
|
m_systrayIcon->setContextMenu(m_menu); |
||||||
|
|
||||||
|
connect(m_systrayIcon, &QSystemTrayIcon::activated, this |
||||||
|
, [this](const QSystemTrayIcon::ActivationReason reason) |
||||||
|
{ |
||||||
|
if (reason == QSystemTrayIcon::Trigger) |
||||||
|
emit activationRequested(); |
||||||
|
}); |
||||||
|
#ifndef QBT_USES_CUSTOMDBUSNOTIFICATIONS |
||||||
|
connect(m_systrayIcon, &QSystemTrayIcon::messageClicked, this, &DesktopIntegration::notificationClicked); |
||||||
|
#endif |
||||||
|
|
||||||
|
m_systrayIcon->show(); |
||||||
|
emit stateChanged(); |
||||||
|
} |
||||||
|
else if (retries > 0) |
||||||
|
{ |
||||||
|
LogMsg(tr("System tray icon is not available, retrying..."), Log::WARNING); |
||||||
|
QTimer::singleShot(2s, this, [this, retries]() |
||||||
|
{ |
||||||
|
if (Preferences::instance()->systemTrayEnabled()) |
||||||
|
createTrayIcon(retries - 1); |
||||||
|
}); |
||||||
|
} |
||||||
|
else |
||||||
|
{ |
||||||
|
LogMsg(tr("System tray icon is still not available after retries. Disabling it."), Log::WARNING); |
||||||
|
Preferences::instance()->setSystemTrayEnabled(false); |
||||||
|
} |
||||||
|
} |
||||||
|
#endif // Q_OS_MACOS
|
||||||
@ -0,0 +1,93 @@ |
|||||||
|
/*
|
||||||
|
* Bittorrent Client using Qt and libtorrent. |
||||||
|
* Copyright (C) 2022 Vladimir Golovnev <glassez@yandex.ru> |
||||||
|
* Copyright (C) 2006 Christophe Dumez <chris@qbittorrent.org> |
||||||
|
* |
||||||
|
* This program is free software; you can redistribute it and/or |
||||||
|
* modify it under the terms of the GNU General Public License |
||||||
|
* as published by the Free Software Foundation; either version 2 |
||||||
|
* of the License, or (at your option) any later version. |
||||||
|
* |
||||||
|
* This program is distributed in the hope that it will be useful, |
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||||
|
* GNU General Public License for more details. |
||||||
|
* |
||||||
|
* You should have received a copy of the GNU General Public License |
||||||
|
* along with this program; if not, write to the Free Software |
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
||||||
|
* |
||||||
|
* In addition, as a special exception, the copyright holders give permission to |
||||||
|
* link this program with the OpenSSL project's "OpenSSL" library (or with |
||||||
|
* modified versions of it that use the same license as the "OpenSSL" library), |
||||||
|
* and distribute the linked executables. You must obey the GNU General Public |
||||||
|
* License in all respects for all of the code used other than "OpenSSL". If you |
||||||
|
* modify file(s), you may extend this exception to your version of the file(s), |
||||||
|
* but you are not obligated to do so. If you do not wish to do so, delete this |
||||||
|
* exception statement from your version. |
||||||
|
*/ |
||||||
|
|
||||||
|
#pragma once |
||||||
|
|
||||||
|
#include <QObject> |
||||||
|
|
||||||
|
#include "base/settingvalue.h" |
||||||
|
|
||||||
|
class QMenu; |
||||||
|
#ifndef Q_OS_MACOS |
||||||
|
class QSystemTrayIcon; |
||||||
|
#endif |
||||||
|
#if (defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)) && defined(QT_DBUS_LIB) |
||||||
|
#define QBT_USES_CUSTOMDBUSNOTIFICATIONS |
||||||
|
class DBusNotifier; |
||||||
|
#endif |
||||||
|
|
||||||
|
class DesktopIntegration final : public QObject |
||||||
|
{ |
||||||
|
Q_OBJECT |
||||||
|
Q_DISABLE_COPY_MOVE(DesktopIntegration) |
||||||
|
|
||||||
|
public: |
||||||
|
explicit DesktopIntegration(QObject *parent = nullptr); |
||||||
|
|
||||||
|
bool isActive() const; |
||||||
|
|
||||||
|
QString toolTip() const; |
||||||
|
void setToolTip(const QString &toolTip); |
||||||
|
|
||||||
|
QMenu *menu() const; |
||||||
|
void setMenu(QMenu *menu); |
||||||
|
|
||||||
|
bool isNotificationsEnabled() const; |
||||||
|
void setNotificationsEnabled(bool value); |
||||||
|
|
||||||
|
int notificationTimeout() const; |
||||||
|
#ifdef QBT_USES_CUSTOMDBUSNOTIFICATIONS |
||||||
|
void setNotificationTimeout(const int value); |
||||||
|
#endif |
||||||
|
|
||||||
|
void showNotification(const QString &title, const QString &msg) const; |
||||||
|
|
||||||
|
signals: |
||||||
|
void activationRequested(); |
||||||
|
void notificationClicked(); |
||||||
|
void stateChanged(); |
||||||
|
|
||||||
|
private: |
||||||
|
void onPreferencesChanged(); |
||||||
|
#ifndef Q_OS_MACOS |
||||||
|
void createTrayIcon(int retries); |
||||||
|
#endif // Q_OS_MACOS
|
||||||
|
|
||||||
|
CachedSettingValue<bool> m_storeNotificationEnabled; |
||||||
|
|
||||||
|
QMenu *m_menu = nullptr; |
||||||
|
QString m_toolTip; |
||||||
|
#ifndef Q_OS_MACOS |
||||||
|
QSystemTrayIcon *m_systrayIcon = nullptr; |
||||||
|
#endif |
||||||
|
#ifdef QBT_USES_CUSTOMDBUSNOTIFICATIONS |
||||||
|
CachedSettingValue<int> m_storeNotificationTimeOut; |
||||||
|
DBusNotifier *m_notifier = nullptr; |
||||||
|
#endif |
||||||
|
}; |
||||||
Loading…
Reference in new issue