arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-07-14 22:35:49 +00:00
Code Issues Projects Releases Wiki Activity

one more iteration to try to fix tests on travis

Browse Source
This commit is contained in:
Evgenii Alekseev
2017-02-14 03:48:11 +03:00
parent ce09ab753b
commit 38c5589c10
11 changed files with 66 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sources/awesome-widget/plugin/awkeys.cpp
View File

@ -91,6 +91,12 @@ AWKeys::~AWKeys()
}
bool AWKeys::isDBusActive() const
{
return m_dbusActive;
}
void AWKeys::initDataAggregator(const QVariantMap tooltipParams)
{
qCDebug(LOG_AW) << "Tooltip parameters" << tooltipParams;
@ -338,9 +344,13 @@ void AWKeys::createDBusInterface()
qCWarning(LOG_AW) << "Could not register DBus service, last error"
<< bus.lastError().message();
if (!bus.registerObject(QString("/%1").arg(id), new AWDBusAdaptor(this),
QDBusConnection::ExportAllContents))
QDBusConnection::ExportAllContents)) {
qCWarning(LOG_AW) << "Could not register DBus object, last error"
<< bus.lastError().message();
m_dbusActive = false;
} else {
m_dbusActive = true;
}
}

2
sources/awesome-widget/plugin/awkeys.h
View File

@ -39,6 +39,7 @@ class AWKeys : public QObject
public:
explicit AWKeys(QObject *parent = nullptr);
virtual ~AWKeys();
bool isDBusActive() const;
Q_INVOKABLE void initDataAggregator(const QVariantMap tooltipParams);
Q_INVOKABLE void initKeys(const QString currentPattern, const int interval,
const int limit, const bool optimize);
@ -86,6 +87,7 @@ private:
AWKeyOperations *m_keyOperator = nullptr;
QTimer *m_timer = nullptr;
// variables
bool m_dbusActive = false;
QVariantMap m_tooltipParams;
QStringList m_foundBars, m_foundKeys, m_foundLambdas, m_requiredKeys;
QVariantHash m_values;