From 7be80e6fe41518329468dd696abd68b0c190de5a Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Fri, 11 Jul 2014 12:01:41 +0200 Subject: unitymenumodel: notify when the bus name changes --- libqmenumodel/src/unitymenumodel.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/libqmenumodel/src/unitymenumodel.cpp b/libqmenumodel/src/unitymenumodel.cpp index a6ae140..969436f 100644 --- a/libqmenumodel/src/unitymenumodel.cpp +++ b/libqmenumodel/src/unitymenumodel.cpp @@ -309,6 +309,7 @@ void UnityMenuModel::setBusName(const QByteArray &name) UnityMenuModelPrivate::nameAppeared, UnityMenuModelPrivate::nameVanished, priv, NULL); priv->busName = name; + Q_EMIT busNameChanged (priv->busName); } QVariantMap UnityMenuModel::actions() const -- cgit v1.2.3 From 35c2996397d99071189714d408bc9d24510bd1d1 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Fri, 11 Jul 2014 12:02:01 +0200 Subject: unitymenumodel: add nameOwner property --- libqmenumodel/src/unitymenumodel.cpp | 9 +++++++++ libqmenumodel/src/unitymenumodel.h | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/libqmenumodel/src/unitymenumodel.cpp b/libqmenumodel/src/unitymenumodel.cpp index 969436f..a75e8c8 100644 --- a/libqmenumodel/src/unitymenumodel.cpp +++ b/libqmenumodel/src/unitymenumodel.cpp @@ -170,6 +170,8 @@ void UnityMenuModelPrivate::clearName() this->updateActions(); this->updateMenuModel(); + + Q_EMIT model->nameOwnerChanged (this->nameOwner); } void UnityMenuModelPrivate::updateActions() @@ -231,6 +233,8 @@ void UnityMenuModelPrivate::nameAppeared(GDBusConnection *connection, const gcha priv->updateActions(); priv->updateMenuModel(); + + Q_EMIT priv->model->nameOwnerChanged (priv->nameOwner); } void UnityMenuModelPrivate::nameVanished(GDBusConnection *connection, const gchar *name, gpointer user_data) @@ -295,6 +299,11 @@ QByteArray UnityMenuModel::busName() const return priv->busName; } +QByteArray UnityMenuModel::nameOwner() const +{ + return priv->nameOwner; +} + void UnityMenuModel::setBusName(const QByteArray &name) { if (name == priv->busName) diff --git a/libqmenumodel/src/unitymenumodel.h b/libqmenumodel/src/unitymenumodel.h index 30bc62d..8816d22 100644 --- a/libqmenumodel/src/unitymenumodel.h +++ b/libqmenumodel/src/unitymenumodel.h @@ -28,6 +28,7 @@ class UnityMenuModel: public QAbstractListModel { Q_OBJECT Q_PROPERTY(QByteArray busName READ busName WRITE setBusName NOTIFY busNameChanged) + Q_PROPERTY(QByteArray nameOwner READ nameOwner NOTIFY nameOwnerChanged) Q_PROPERTY(QVariantMap actions READ actions WRITE setActions NOTIFY actionsChanged) Q_PROPERTY(QByteArray menuObjectPath READ menuObjectPath WRITE setMenuObjectPath NOTIFY menuObjectPathChanged) Q_PROPERTY(ActionStateParser* actionStateParser READ actionStateParser WRITE setActionStateParser NOTIFY actionStateParserChanged) @@ -39,6 +40,8 @@ public: QByteArray busName() const; void setBusName(const QByteArray &name); + QByteArray nameOwner() const; + QVariantMap actions() const; void setActions(const QVariantMap &actions); @@ -67,6 +70,7 @@ public: Q_SIGNALS: void busNameChanged(const QByteArray &name); + void nameOwnerChanged(const QByteArray &owner); void actionsChanged(const QByteArray &path); void menuObjectPathChanged(const QByteArray &path); void actionStateParserChanged(ActionStateParser* parser); -- cgit v1.2.3 From 166406a8433438623f5b2ed42830e4abd417adc8 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Tue, 15 Jul 2014 18:11:16 +0200 Subject: Update changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index f722857..1a01ccf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +qmenumodel (0.2.8-0ubuntu1) UNRELEASED; urgency=medium + + * unitymenumodel: add nameOwner property + + -- Lars Uebernickel Tue, 15 Jul 2014 18:10:54 +0200 + qmenumodel (0.2.7+14.10.20140704-0ubuntu1) utopic; urgency=low [ Charles Kerr ] -- cgit v1.2.3