mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

fixup! Add a "Start Now" action to the notification window in the Qt client (#848) (#2026) 

refactor: avoid "declaration requires an exit-time destructor" warnings
This commit is contained in:
Charles Kerr 2021-10-24 18:52:50 -05:00 committed by GitHub
parent 3a966a77d1
commit 4a1ce7d645
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
qt/Application.cc
View File

@ -81,20 +81,13 @@ bool loadTranslation(QTranslator& translator, QString const& name, QLocale const
return false;
}
#ifdef QT_DBUS_LIB
QString const DbusServiceName = QStringLiteral("org.freedesktop.Notifications");
QString const DbusInterfaceName = QStringLiteral("org.freedesktop.Notifications");
QString const DbusPath = QStringLiteral("/org/freedesktop/Notifications");
#endif
} // namespace
Application::Application(int& argc, char** argv)
: QApplication(argc, argv)
, config_name_{ QStringLiteral("transmission") }
, display_name_{ QStringLiteral("transmission-qt") }
, start_now_regex_{ QRegularExpression(QStringLiteral(R"rgx(start-now\((\d+)\))rgx")) }
{
setApplicationName(config_name_);
loadTranslations();
@ -367,9 +360,9 @@ Application::Application(int& argc, char** argv)
if (bus.isConnected())
{
bus.connect(
DbusServiceName,
DbusPath,
DbusInterfaceName,
fdo_notifications_service_name_,
fdo_notifications_path_,
fdo_notifications_interface_name_,
QLatin1String("ActionInvoked"),
this,
SLOT(onNotificationActionInvoked(quint32, QString)));
@ -618,7 +611,11 @@ bool Application::notifyApp(QString const& title, QString const& body, QStringLi
if (bus.isConnected())
{
QDBusMessage m = QDBusMessage::createMethodCall(DbusServiceName, DbusPath, DbusInterfaceName, QStringLiteral("Notify"));
QDBusMessage m = QDBusMessage::createMethodCall(
fdo_notifications_service_name_,
fdo_notifications_path_,
fdo_notifications_interface_name_,
QStringLiteral("Notify"));
QVariantList args;
args.append(QStringLiteral("Transmission")); // app_name
args.append(0U); // replaces_id
@ -648,15 +645,13 @@ bool Application::notifyApp(QString const& title, QString const& body, QStringLi
#ifdef QT_DBUS_LIB
void Application::onNotificationActionInvoked(quint32 /* notification_id */, QString action_key)
{
static QRegularExpression const StartNowRegex(QLatin1String(R"rgx(start-now\((\d+)\))rgx"));
QRegularExpressionMatch const match = StartNowRegex.match(action_key);
auto const match = start_now_regex_.match(action_key);
if (match.hasMatch())
{
int const torrent_id = match.captured(1).toInt();
session_->startTorrentsNow({ torrent_id });
}
}
#endif
FaviconCache& Application::faviconCache()

8
qt/Application.h
View File

@ -12,6 +12,7 @@
#include <unordered_set>
#include <QApplication>
#include <QRegularExpression>
#include <QTimer>
#include <QTranslator>
@ -89,6 +90,13 @@ private:
QString const display_name_ = QStringLiteral("transmission-qt");
std::unordered_set<QString> interned_strings_;
#ifdef QT_DBUS_LIB
QString const fdo_notifications_service_name_ = QStringLiteral("org.freedesktop.Notifications");
QString const fdo_notifications_path_ = QStringLiteral("/org/freedesktop/Notifications");
QString const fdo_notifications_interface_name_ = QStringLiteral("org.freedesktop.Notifications");
QRegularExpression const start_now_regex_;
#endif
};
#define trApp static_cast<Application*>(Application::instance())