dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename KDE global shortcuts to KGlobalAccel

Browse Source
This commit is contained in:
Jonas Kvinge
2024-11-12 23:03:57 +01:00
parent f2845b6632
commit 7a7550388d
13 changed files with 71 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/globalshortcuts/globalshortcutsbackend-kde.cpp → src/globalshortcuts/globalshortcutsbackend-kglobalaccel.cpp
View File

@@ -33,7 +33,7 @@
#include "core/logging.h"
#include "globalshortcutsbackend-kde.h"
#include "globalshortcutsbackend-kglobalaccel.h"
#include "kglobalaccel.h"
#include "kglobalaccelcomponent.h"
@@ -41,28 +41,28 @@
using namespace Qt::Literals::StringLiterals;
namespace {
constexpr char kKdeService[] = "org.kde.kglobalaccel";
constexpr char kKdePath[] = "/kglobalaccel";
constexpr char kKGlobalAccelService[] = "org.kde.kglobalaccel";
constexpr char kKGlobalAccelPath[] = "/kglobalaccel";
}
GlobalShortcutsBackendKDE::GlobalShortcutsBackendKDE(GlobalShortcutsManager *manager, QObject *parent)
: GlobalShortcutsBackend(manager, GlobalShortcutsBackend::Type::KDE, parent),
GlobalShortcutsBackendKGlobalAccel::GlobalShortcutsBackendKGlobalAccel(GlobalShortcutsManager *manager, QObject *parent)
: GlobalShortcutsBackend(manager, GlobalShortcutsBackend::Type::KGlobalAccel, parent),
interface_(nullptr),
component_(nullptr) {}
bool GlobalShortcutsBackendKDE::IsKDEAvailable() {
bool GlobalShortcutsBackendKGlobalAccel::IsKGlobalAccelAvailable() {
return QDBusConnection::sessionBus().interface()->isServiceRegistered(QLatin1String(kKdeService));
return QDBusConnection::sessionBus().interface()->isServiceRegistered(QLatin1String(kKGlobalAccelService));
}
bool GlobalShortcutsBackendKDE::IsAvailable() const {
bool GlobalShortcutsBackendKGlobalAccel::IsAvailable() const {
return IsKDEAvailable();
return IsKGlobalAccelAvailable();
}
bool GlobalShortcutsBackendKDE::IsMediaShortcut(const GlobalShortcutsManager::Shortcut &shortcut) const {
bool GlobalShortcutsBackendKGlobalAccel::IsMediaShortcut(const GlobalShortcutsManager::Shortcut &shortcut) const {
return (shortcut.action->shortcut() == QKeySequence(Qt::Key_MediaPlay) ||
shortcut.action->shortcut() == QKeySequence(Qt::Key_MediaStop) ||
@@ -72,17 +72,17 @@ bool GlobalShortcutsBackendKDE::IsMediaShortcut(const GlobalShortcutsManager::Sh
}
bool GlobalShortcutsBackendKDE::DoRegister() {
bool GlobalShortcutsBackendKGlobalAccel::DoRegister() {
qLog(Debug) << "Registering";
if (!QDBusConnection::sessionBus().interface()->isServiceRegistered(QLatin1String(kKdeService))) {
if (!QDBusConnection::sessionBus().interface()->isServiceRegistered(QLatin1String(kKGlobalAccelService))) {
qLog(Warning) << "KGlobalAccel is not registered";
return false;
}
if (!interface_) {
interface_ = new OrgKdeKGlobalAccelInterface(QLatin1String(kKdeService), QLatin1String(kKdePath), QDBusConnection::sessionBus(), this);
interface_ = new OrgKdeKGlobalAccelInterface(QLatin1String(kKGlobalAccelService), QLatin1String(kKGlobalAccelPath), QDBusConnection::sessionBus(), this);
}
const QList<GlobalShortcutsManager::Shortcut> shortcuts = manager_->shortcuts().values();
@@ -92,13 +92,13 @@ bool GlobalShortcutsBackendKDE::DoRegister() {
QDBusPendingReply<QDBusObjectPath> reply = interface_->getComponent(QCoreApplication::applicationName());
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this);
QObject::connect(watcher, &QDBusPendingCallWatcher::finished, this, &GlobalShortcutsBackendKDE::RegisterFinished);
QObject::connect(watcher, &QDBusPendingCallWatcher::finished, this, &GlobalShortcutsBackendKGlobalAccel::RegisterFinished);
return true;
}
void GlobalShortcutsBackendKDE::RegisterFinished(QDBusPendingCallWatcher *watcher) {
void GlobalShortcutsBackendKGlobalAccel::RegisterFinished(QDBusPendingCallWatcher *watcher) {
QDBusReply<QDBusObjectPath> reply = watcher->reply();
watcher->deleteLater();
@@ -111,7 +111,7 @@ void GlobalShortcutsBackendKDE::RegisterFinished(QDBusPendingCallWatcher *watche
}
if (!component_) {
component_ = new org::kde::kglobalaccel::Component(QLatin1String(kKdeService), reply.value().path(), QDBusConnection::sessionBus(), interface_);
component_ = new org::kde::kglobalaccel::Component(QLatin1String(kKGlobalAccelService), reply.value().path(), QDBusConnection::sessionBus(), interface_);
}
if (!component_->isValid()) {
@@ -119,13 +119,13 @@ void GlobalShortcutsBackendKDE::RegisterFinished(QDBusPendingCallWatcher *watche
return;
}
QObject::connect(component_, &org::kde::kglobalaccel::Component::globalShortcutPressed, this, &GlobalShortcutsBackendKDE::GlobalShortcutPressed, Qt::UniqueConnection);
QObject::connect(component_, &org::kde::kglobalaccel::Component::globalShortcutPressed, this, &GlobalShortcutsBackendKGlobalAccel::GlobalShortcutPressed, Qt::UniqueConnection);
qLog(Debug) << "Registered.";
}
void GlobalShortcutsBackendKDE::DoUnregister() {
void GlobalShortcutsBackendKGlobalAccel::DoUnregister() {
if (!interface_ || !interface_->isValid()) return;
@@ -146,7 +146,7 @@ void GlobalShortcutsBackendKDE::DoUnregister() {
}
bool GlobalShortcutsBackendKDE::RegisterShortcut(const GlobalShortcutsManager::Shortcut &shortcut) {
bool GlobalShortcutsBackendKGlobalAccel::RegisterShortcut(const GlobalShortcutsManager::Shortcut &shortcut) {
if (!interface_ || !interface_->isValid() || shortcut.id.isEmpty() || !shortcut.action || shortcut.action->shortcut().isEmpty()) return false;
@@ -172,7 +172,7 @@ bool GlobalShortcutsBackendKDE::RegisterShortcut(const GlobalShortcutsManager::S
}
QStringList GlobalShortcutsBackendKDE::GetActionId(const QString &id, const QAction *action) {
QStringList GlobalShortcutsBackendKGlobalAccel::GetActionId(const QString &id, const QAction *action) {
QStringList ret;
ret << QCoreApplication::applicationName();
@@ -185,7 +185,7 @@ QStringList GlobalShortcutsBackendKDE::GetActionId(const QString &id, const QAct
}
QList<int> GlobalShortcutsBackendKDE::ToIntList(const QList<QKeySequence> &sequence_list) {
QList<int> GlobalShortcutsBackendKGlobalAccel::ToIntList(const QList<QKeySequence> &sequence_list) {
QList<int> ret;
ret.reserve(sequence_list.count());
@@ -197,7 +197,7 @@ QList<int> GlobalShortcutsBackendKDE::ToIntList(const QList<QKeySequence> &seque
}
QList<QKeySequence> GlobalShortcutsBackendKDE::ToKeySequenceList(const QList<int> &sequence_list) {
QList<QKeySequence> GlobalShortcutsBackendKGlobalAccel::ToKeySequenceList(const QList<int> &sequence_list) {
QList<QKeySequence> ret;
ret.reserve(sequence_list.count());
@@ -209,7 +209,7 @@ QList<QKeySequence> GlobalShortcutsBackendKDE::ToKeySequenceList(const QList<int
}
void GlobalShortcutsBackendKDE::GlobalShortcutPressed(const QString &component_unique, const QString &shortcut_unique, const qint64 timestamp) {
void GlobalShortcutsBackendKGlobalAccel::GlobalShortcutPressed(const QString &component_unique, const QString &shortcut_unique, const qint64 timestamp) {
Q_UNUSED(timestamp)

6
src/globalshortcuts/globalshortcutsbackend-kde.h → src/globalshortcuts/globalshortcutsbackend-kglobalaccel.h
View File

@@ -37,14 +37,14 @@ class QAction;
class OrgKdeKGlobalAccelInterface;
class OrgKdeKglobalaccelComponentInterface;
class GlobalShortcutsBackendKDE : public GlobalShortcutsBackend {
class GlobalShortcutsBackendKGlobalAccel : public GlobalShortcutsBackend {
Q_OBJECT
public:
explicit GlobalShortcutsBackendKDE(GlobalShortcutsManager *manager, QObject *parent = nullptr);
explicit GlobalShortcutsBackendKGlobalAccel(GlobalShortcutsManager *manager, QObject *parent = nullptr);
bool IsAvailable() const override;
static bool IsKDEAvailable();
static bool IsKGlobalAccelAvailable();
protected:
bool DoRegister() override;

4
src/globalshortcuts/globalshortcutsbackend.cpp
View File

@@ -38,8 +38,8 @@ QString GlobalShortcutsBackend::name() const {
switch (type_) {
case Type::None:
return u"None"_s;
case Type::KDE:
return u"KDE"_s;
case Type::KGlobalAccel:
return u"KGlobalAccel"_s;
case Type::X11:
return u"X11"_s;
case Type::macOS:

2
src/globalshortcuts/globalshortcutsbackend.h
View File

@@ -34,7 +34,7 @@ class GlobalShortcutsBackend : public QObject {
public:
enum class Type {
None = 0,
KDE,
KGlobalAccel,
X11,
macOS,
Win

20
src/globalshortcuts/globalshortcutsmanager.cpp
View File

@@ -36,8 +36,8 @@
#include "globalshortcutsmanager.h"
#include "globalshortcutsbackend.h"
#ifdef HAVE_KDE_GLOBALSHORTCUTS
#include "globalshortcutsbackend-kde.h"
#ifdef HAVE_KGLOBALACCEL_GLOBALSHORTCUTS
#include "globalshortcutsbackend-kglobalaccel.h"
#endif
#ifdef HAVE_X11_GLOBALSHORTCUTS
@@ -84,8 +84,8 @@ GlobalShortcutsManager::GlobalShortcutsManager(QWidget *parent) : QWidget(parent
// Create backends - these do the actual shortcut registration
#ifdef HAVE_KDE_GLOBALSHORTCUTS
backends_ << new GlobalShortcutsBackendKDE(this, this);
#ifdef HAVE_KGLOBALACCEL_GLOBALSHORTCUTS
backends_ << new GlobalShortcutsBackendKGlobalAccel(this, this);
#endif
#ifdef Q_OS_MACOS
@@ -116,9 +116,9 @@ void GlobalShortcutsManager::ReloadSettings() {
backends_enabled_ << GlobalShortcutsBackend::Type::Win;
#endif
#ifdef HAVE_KDE_GLOBALSHORTCUTS
if (settings_.value(GlobalShortcutsSettings::kUseKDE, true).toBool()) {
backends_enabled_ << GlobalShortcutsBackend::Type::KDE;
#ifdef HAVE_KGLOBALACCEL_GLOBALSHORTCUTS
if (settings_.value(GlobalShortcutsSettings::kUseKGlobalAccel, true).toBool()) {
backends_enabled_ << GlobalShortcutsBackend::Type::KGlobalAccel;
}
#endif
@@ -159,11 +159,11 @@ GlobalShortcutsManager::Shortcut GlobalShortcutsManager::AddShortcut(const QStri
}
#ifdef HAVE_KDE_GLOBALSHORTCUTS
#ifdef HAVE_KGLOBALACCEL_GLOBALSHORTCUTS
bool GlobalShortcutsManager::IsKdeAvailable() {
bool GlobalShortcutsManager::IsKGlobalAccelAvailable() {
return GlobalShortcutsBackendKDE::IsKDEAvailable();
return GlobalShortcutsBackendKGlobalAccel::IsKGlobalAccelAvailable();
}

2
src/globalshortcuts/globalshortcutsmanager.h
View File

@@ -57,7 +57,7 @@ class GlobalShortcutsManager : public QWidget {
QMap<QString, Shortcut> shortcuts() const { return shortcuts_; }
#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) && defined(HAVE_DBUS)
static bool IsKdeAvailable();
static bool IsKGlobalAccelAvailable();
#endif
#ifdef HAVE_X11_GLOBALSHORTCUTS