Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: indicatortraywidget connect error pertoires slots

Browse Source 
Change-Id: I049c9f3c9f528e960d503b5e6f86a01569ca05b3
This commit is contained in:
Iceyer 2017-12-29 16:39:58 +08:00 committed by Deepin Code Review
parent 59ea6183d8
commit 83cb34e880
Notes: Deepin Code Review 2017-12-29 19:20:27 +08:00 
Verified+1: Anonymous Coward #1000004
Code-Review+2: Iceyer <me@iceyer.net>
Submitted-by: Iceyer <me@iceyer.net>
Submitted-at: Fri, 29 Dec 2017 19:20:27 +0800
Reviewed-on: https://cr.deepin.io/29865
Project: dde/dde-dock
Branch: refs/heads/master
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
plugins/system-tray/indicatortraywidget.cpp
View File

@ -27,7 +27,10 @@ public:
void initDBus(const QString &indicatorKey);
template<typename Func>
void featData(const QString &key, const QJsonObject &data, Func const &lambda)
void featData(const QString &key,
const QJsonObject &data,
const char *propertyChangedSlot,
Func const &callback)
{
Q_Q(IndicatorTrayWidget);
auto dataConfig = data.value(key).toObject();
@ -41,45 +44,46 @@ public:
if (dataConfig.contains("dbus_method")) {
QString methodName = dataConfig.value("dbus_method").toString();
qDebug() << methodName << dataConfig;
QDBusReply<QByteArray> reply = interface.call(methodName.toStdString().c_str());
lambda(reply.value());
callback(reply.value());
}
if (dataConfig.contains("dbus_properties")) {
auto propertyName = dataConfig.value("dbus_properties").toString().toStdString();
propertyInterfaceNames.insert(key, dbusInterface);
lambda(interface.property(propertyName.c_str()));
propertyNames.insert(key, QString::fromStdString(propertyName));
callback(interface.property(propertyName.c_str()));
QDBusConnection::sessionBus().connect(dbusService,
dbusPath,
"org.freedesktop.DBus.Properties",
"PropertiesChanged",
"sa{sv}as",
q,
SLOT(iconPropertyChanged(QDBusMessage)));
propertyChangedSlot);
}
}
template<typename Func>
void propertyChanged(const QString &propertyName, const QDBusMessage &msg, Func const &lambda)
void propertyChanged(const QString &key, const QDBusMessage &msg, Func const &callback)
{
QList<QVariant> arguments = msg.arguments();
if (3 != arguments.count()) {
qWarning() << "arguments count must be 3";
return;
}
QString interfaceName = msg.arguments().at(0).toString();
if (interfaceName != propertyInterfaceNames.value(propertyName)) {
if (interfaceName != propertyInterfaceNames.value(key)) {
qWarning() << "interfaceName mismatch" << interfaceName << propertyInterfaceNames.value(key) << key;
return;
}
QVariantMap changedProps = qdbus_cast<QVariantMap>(arguments.at(1).value<QDBusArgument>());
foreach (const QString &prop, changedProps.keys()) {
if (propertyName == prop) {
lambda(changedProps.value(prop));
}
if (changedProps.contains(propertyNames.value(key))) {
callback(changedProps.value(propertyNames.value(key)));
}
}
QLabel *label = Q_NULLPTR;
QMap<QString, QString> propertyNames;
QMap<QString, QString> propertyInterfaceNames;
IndicatorTrayWidget *q_ptr;
@ -185,7 +189,7 @@ void IndicatorTrayWidget::iconPropertyChanged(const QDBusMessage &msg)
void IndicatorTrayWidget::textPropertyChanged(const QDBusMessage &msg)
{
Q_D(IndicatorTrayWidget);
d->propertyChanged("icon", msg, [ = ](QVariant v) {
d->propertyChanged("text", msg, [ = ](QVariant v) {
setText(v.toString());
});
}
@ -213,12 +217,12 @@ void IndicatorTrayWidgetPrivate::initDBus(const QString &indicatorKey)
auto data = config.value("data").toObject();
if (data.contains("text")) {
featData("text", data, [ = ](QVariant v) {
featData("text", data, SLOT(textPropertyChanged(QDBusMessage)), [ = ](QVariant v) {
q->setText(v.toString());
});
}
if (data.contains("icon")) {
featData("icon", data, [ = ](QVariant v) {
featData("icon", data, SLOT(iconPropertyChanged(QDBusMessage)), [ = ](QVariant v) {
q->setPixmapData(v.toByteArray());
});
}