Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix formatting

Browse Source
This commit is contained in:
Luis Caceres 2019-12-06 23:53:40 +00:00
parent 24a571769a
commit 8cab8fe180
2 changed files with 78 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
src/core/kglobalaccelglobalshortcutbackend.cpp
View File

@ -1,8 +1,5 @@
#include "config.h"
#include "core/closure.h"
#include "core/logging.h"
#include "globalshortcuts.h"
#include "kglobalaccelglobalshortcutbackend.h" #include "kglobalaccelglobalshortcutbackend.h"
#include "core/logging.h"
#include <QAction> #include <QAction>
#include <QGuiApplication> #include <QGuiApplication>
@ -17,57 +14,51 @@
// Most of this file is based on the KGlobalAccel sources // Most of this file is based on the KGlobalAccel sources
// (https://phabricator.kde.org/source/kglobalaccel) // (https://phabricator.kde.org/source/kglobalaccel)
namespace { namespace {
QString compDisplayName() { QString compDisplayName() {
if (!QGuiApplication::applicationDisplayName().isEmpty()) { if (!QGuiApplication::applicationDisplayName().isEmpty()) {
return QGuiApplication::applicationDisplayName(); return QGuiApplication::applicationDisplayName();
}
return QCoreApplication::applicationName();
} }
return QCoreApplication::applicationName();
}
QString compUniqueName() { QString compUniqueName() { return QCoreApplication::applicationName(); }
return QCoreApplication::applicationName();
}
const QString &id_ActionUnique(const QStringList &id) { const QString &id_ActionUnique(const QStringList &id) { return id.at(1); }
return id.at(1);
}
bool isCorrectMediaKeyShortcut(const GlobalShortcuts::Shortcut& shortcut) { bool isCorrectMediaKeyShortcut(const GlobalShortcuts::Shortcut &shortcut) {
if(shortcut.id == QStringLiteral("play_pause")) { if (shortcut.id == QStringLiteral("play_pause")) {
return shortcut.action->shortcut() == QKeySequence(Qt::Key_MediaPlay); return shortcut.action->shortcut() == QKeySequence(Qt::Key_MediaPlay);
} else if(shortcut.id == QStringLiteral("stop")) { } else if (shortcut.id == QStringLiteral("stop")) {
return shortcut.action->shortcut() == QKeySequence(Qt::Key_MediaStop); return shortcut.action->shortcut() == QKeySequence(Qt::Key_MediaStop);
} else if(shortcut.id == QStringLiteral("next_track")) { } else if (shortcut.id == QStringLiteral("next_track")) {
return shortcut.action->shortcut() == QKeySequence(Qt::Key_MediaNext); return shortcut.action->shortcut() == QKeySequence(Qt::Key_MediaNext);
} else if(shortcut.id == QStringLiteral("prev_track")) { } else if (shortcut.id == QStringLiteral("prev_track")) {
return shortcut.action->shortcut() == QKeySequence(Qt::Key_MediaPrevious); return shortcut.action->shortcut() == QKeySequence(Qt::Key_MediaPrevious);
} else { } else {
return false; return false;
}
} }
} }
} // namespace
#ifdef HAVE_DBUS #ifdef HAVE_DBUS
KGlobalAccelShortcutBackend::KGlobalAccelShortcutBackend( KGlobalAccelShortcutBackend::KGlobalAccelShortcutBackend(
GlobalShortcuts *parent) GlobalShortcuts *parent)
: GlobalShortcutBackend(parent), : GlobalShortcutBackend(parent), iface_(nullptr), component_(nullptr),
iface_(nullptr),
component_(nullptr),
nameToAction_() {} nameToAction_() {}
#else // HAVE_DBUS #else // HAVE_DBUS
KGlobalAccelShortcutBackend::KGlobalAccelShortcutBackend(GlobalShortcuts *parent) KGlobalAccelShortcutBackend::KGlobalAccelShortcutBackend(
: GlobalShortcutBackend(parent) {} GlobalShortcuts *parent)
: GlobalShortcutBackend(parent) {}
#endif // HAVE_DBUS #endif // HAVE_DBUS
bool KGlobalAccelShortcutBackend::isKGlobalAccelAvailable() { bool KGlobalAccelShortcutBackend::isKGlobalAccelAvailable() {
#ifdef HAVE_DBUS #ifdef HAVE_DBUS
return QDBusConnection::sessionBus().interface()->isServiceRegistered( return QDBusConnection::sessionBus().interface()->isServiceRegistered(
Service); Service);
#else // HAVE_DBUS #else // HAVE_DBUS
return false; return false;
#endif // HAVE_DBUS #endif // HAVE_DBUS
} }
@ -80,8 +71,9 @@ bool KGlobalAccelShortcutBackend::DoRegister() {
return false; return false;
bool complete = true; bool complete = true;
for (const GlobalShortcuts::Shortcut &shortcut : manager_->shortcuts().values()) { for (const GlobalShortcuts::Shortcut &shortcut :
if(shortcut.action->shortcut().isEmpty()) manager_->shortcuts().values()) {
if (shortcut.action->shortcut().isEmpty())
continue; continue;
if (!registerShortcut(shortcut)) if (!registerShortcut(shortcut))
@ -93,11 +85,10 @@ bool KGlobalAccelShortcutBackend::DoRegister() {
QObject::connect(component_, QObject::connect(component_,
&OrgKdeKglobalaccelComponentInterface::globalShortcutPressed, &OrgKdeKglobalaccelComponentInterface::globalShortcutPressed,
this, this, &KGlobalAccelShortcutBackend::onShortcutPressed);
&KGlobalAccelShortcutBackend::onShortcutPressed);
return complete; return complete;
#else // HAVE_DBUS #else // HAVE_DBUS
qLog(Warning) << "dbus not available"; qLog(Warning) << "dbus not available";
return false; return false;
#endif // HAVE_DBUS #endif // HAVE_DBUS
@ -133,10 +124,8 @@ bool KGlobalAccelShortcutBackend::acquireComponent() {
return false; return false;
} }
component_ = new org::kde::kglobalaccel::Component(Service, component_ = new org::kde::kglobalaccel::Component(
reply.value().path(), Service, reply.value().path(), QDBusConnection::sessionBus(), iface_);
QDBusConnection::sessionBus(),
iface_);
if (!component_->isValid()) { if (!component_->isValid()) {
qLog(Warning) << "Failed to get KGlobalAccel component:" qLog(Warning) << "Failed to get KGlobalAccel component:"
@ -154,9 +143,8 @@ bool KGlobalAccelShortcutBackend::acquireInterface() {
return true; return true;
if (isKGlobalAccelAvailable()) { if (isKGlobalAccelAvailable()) {
iface_ = new OrgKdeKGlobalAccelInterface(Service, Path, iface_ = new OrgKdeKGlobalAccelInterface(
QDBusConnection::sessionBus(), Service, Path, QDBusConnection::sessionBus(), this);
this);
} }
if (iface_ && iface_->isValid()) if (iface_ && iface_->isValid())
@ -183,8 +171,8 @@ QStringList KGlobalAccelShortcutBackend::id(const QString &name,
return ret; return ret;
} }
QList<int> KGlobalAccelShortcutBackend::intList( QList<int>
const QList<QKeySequence> &seq) { KGlobalAccelShortcutBackend::intList(const QList<QKeySequence> &seq) {
QList<int> ret; QList<int> ret;
for (const QKeySequence &sequence : seq) { for (const QKeySequence &sequence : seq) {
ret.append(sequence[0]); ret.append(sequence[0]);
@ -200,9 +188,9 @@ bool KGlobalAccelShortcutBackend::registerAction(const QString &name,
QStringList &actionId) { QStringList &actionId) {
Q_ASSERT(action); Q_ASSERT(action);
if (name.isEmpty() && (action->objectName().isEmpty() || if (name.isEmpty() &&
action->objectName().startsWith( (action->objectName().isEmpty() ||
QLatin1String("unnamed-")))) { action->objectName().startsWith(QLatin1String("unnamed-")))) {
qLog(Warning) << "Cannot register shortcut for unnamed action"; qLog(Warning) << "Cannot register shortcut for unnamed action";
return false; return false;
} }
@ -214,7 +202,8 @@ bool KGlobalAccelShortcutBackend::registerAction(const QString &name,
return true; return true;
} }
bool KGlobalAccelShortcutBackend::registerShortcut(const GlobalShortcuts::Shortcut &shortcut) { bool KGlobalAccelShortcutBackend::registerShortcut(
const GlobalShortcuts::Shortcut &shortcut) {
QStringList actionId; QStringList actionId;
if (!registerAction(shortcut.id, shortcut.action, actionId)) if (!registerAction(shortcut.id, shortcut.action, actionId))
return false; return false;
@ -222,9 +211,8 @@ bool KGlobalAccelShortcutBackend::registerShortcut(const GlobalShortcuts::Shortc
QList<QKeySequence> activeShortcut; QList<QKeySequence> activeShortcut;
activeShortcut << shortcut.action->shortcut(); activeShortcut << shortcut.action->shortcut();
const QList<int> result = iface_->setShortcut(actionId, const QList<int> result = iface_->setShortcut(
intList(activeShortcut), actionId, intList(activeShortcut), SetShortcutFlag::SetPresent);
SetShortcutFlag::SetPresent);
const QList<QKeySequence> resultSequence = shortcutList(result); const QList<QKeySequence> resultSequence = shortcutList(result);
if (resultSequence != activeShortcut) { if (resultSequence != activeShortcut) {
@ -232,7 +220,7 @@ bool KGlobalAccelShortcutBackend::registerShortcut(const GlobalShortcuts::Shortc
<< "but KGlobalAccel returned" << resultSequence; << "but KGlobalAccel returned" << resultSequence;
if (!resultSequence.isEmpty()) { if (!resultSequence.isEmpty()) {
if(!isCorrectMediaKeyShortcut(shortcut)) { if (!isCorrectMediaKeyShortcut(shortcut)) {
// there is some conflict with our preferred shortcut so we use // there is some conflict with our preferred shortcut so we use
// the new shortcut that kglobalaccel suggests // the new shortcut that kglobalaccel suggests
shortcut.action->setShortcut(resultSequence[0]); shortcut.action->setShortcut(resultSequence[0]);
@ -247,8 +235,8 @@ bool KGlobalAccelShortcutBackend::registerShortcut(const GlobalShortcuts::Shortc
return true; return true;
} }
QList<QKeySequence> KGlobalAccelShortcutBackend::shortcutList( QList<QKeySequence>
const QList<int> &seq) { KGlobalAccelShortcutBackend::shortcutList(const QList<int> &seq) {
QList<QKeySequence> ret; QList<QKeySequence> ret;
for (int i : seq) { for (int i : seq) {
ret.append(i); ret.append(i);
@ -266,8 +254,7 @@ void KGlobalAccelShortcutBackend::unregisterAction(const QString &name,
} }
void KGlobalAccelShortcutBackend::onShortcutPressed( void KGlobalAccelShortcutBackend::onShortcutPressed(
const QString &componentUnique, const QString &componentUnique, const QString &actionUnique,
const QString &actionUnique,
qlonglong timestamp) const { qlonglong timestamp) const {
QAction *action = nullptr; QAction *action = nullptr;
const QList<QAction *> candidates = nameToAction_.values(actionUnique); const QList<QAction *> candidates = nameToAction_.values(actionUnique);

64
src/core/kglobalaccelglobalshortcutbackend.h
View File

@ -1,7 +1,9 @@
#ifndef CORE_KGLOBALACCELGLOBALSHORTCUTBACKEND_H_ #ifndef CORE_KGLOBALACCELGLOBALSHORTCUTBACKEND_H_
#define CORE_KGLOBALACCELGLOBALSHORTCUTBACKEND_H_ #define CORE_KGLOBALACCELGLOBALSHORTCUTBACKEND_H_
#include "config.h"
#include "globalshortcutbackend.h" #include "globalshortcutbackend.h"
#include "globalshortcuts.h"
#include <QSet> #include <QSet>
#include <QStringList> #include <QStringList>
@ -12,60 +14,54 @@ class OrgKdeKGlobalAccelInterface;
class OrgKdeKglobalaccelComponentInterface; class OrgKdeKglobalaccelComponentInterface;
class KGlobalAccelShortcutBackend : public GlobalShortcutBackend { class KGlobalAccelShortcutBackend : public GlobalShortcutBackend {
Q_OBJECT Q_OBJECT
public: public:
explicit KGlobalAccelShortcutBackend(GlobalShortcuts *parent); explicit KGlobalAccelShortcutBackend(GlobalShortcuts *parent);
static bool isKGlobalAccelAvailable();
static bool isKGlobalAccelAvailable(); protected:
bool DoRegister() override;
protected: void DoUnregister() override;
bool DoRegister() override;
void DoUnregister() override; private:
private:
#ifdef HAVE_DBUS #ifdef HAVE_DBUS
enum SetShortcutFlag { enum SetShortcutFlag { SetPresent = 2, NoAutoloading = 4, IsDefault = 8 };
SetPresent = 2,
NoAutoloading = 4,
IsDefault = 8
};
bool acquireComponent(); bool acquireComponent();
bool acquireInterface(); bool acquireInterface();
static QStringList id(const QString &name, const QAction *action); static QStringList id(const QString &name, const QAction *action);
static QList<int> intList(const QList<QKeySequence> &seq); static QList<int> intList(const QList<QKeySequence> &seq);
bool registerAction(const QString &name, QAction *action, bool registerAction(const QString &name, QAction *action,
QStringList &actionId); QStringList &actionId);
bool registerShortcut(const GlobalShortcuts::Shortcut &shortcut); bool registerShortcut(const GlobalShortcuts::Shortcut &shortcut);
static QList<QKeySequence> shortcutList(const QList<int> &seq); static QList<QKeySequence> shortcutList(const QList<int> &seq);
void unregisterAction(const QString &name, QAction *action); void unregisterAction(const QString &name, QAction *action);
private slots: private slots:
void onShortcutPressed(const QString &componentUnique, void onShortcutPressed(const QString &componentUnique,
const QString &actionUnique, const QString &actionUnique,
qlonglong timestamp) const; qlonglong timestamp) const;
private: private:
static const char *Service; static const char *Service;
static const char *Path; static const char *Path;
OrgKdeKGlobalAccelInterface *iface_; OrgKdeKGlobalAccelInterface *iface_;
OrgKdeKglobalaccelComponentInterface *component_; OrgKdeKglobalaccelComponentInterface *component_;
QMultiHash<QString, QAction *> nameToAction_; QMultiHash<QString, QAction *> nameToAction_;
#endif // HAVE_DBUS #endif // HAVE_DBUS
}; };
#endif //CORE_KGLOBALACCELGLOBALSHORTCUTBACKEND_H_ #endif // CORE_KGLOBALACCELGLOBALSHORTCUTBACKEND_H_