aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Uebernickel <lars.uebernickel@canonical.com>2014-07-17 02:04:02 +0000
committerCI bot <ps-jenkins@lists.canonical.com>2014-07-17 02:04:02 +0000
commitf7719ce3a367360a2e01a856f6db9348d6bfed5b (patch)
tree6e9d4cf3455c0f658a3676e68f287527b8ecca8a
parent018eaeb8b2dc83867dccee516c54499594788ed8 (diff)
parent166406a8433438623f5b2ed42830e4abd417adc8 (diff)
downloadqmenumodel-f7719ce3a367360a2e01a856f6db9348d6bfed5b.tar.gz
qmenumodel-f7719ce3a367360a2e01a856f6db9348d6bfed5b.tar.bz2
qmenumodel-f7719ce3a367360a2e01a856f6db9348d6bfed5b.zip
unitymenumodel: add nameOwner property Fixes: 1308011
Approved by: Mirco Müller, PS Jenkins bot
-rw-r--r--debian/changelog6
-rw-r--r--libqmenumodel/src/unitymenumodel.cpp10
-rw-r--r--libqmenumodel/src/unitymenumodel.h4
3 files changed, 20 insertions, 0 deletions
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 <lars.uebernickel@ubuntu.com> Tue, 15 Jul 2014 18:10:54 +0200
+
qmenumodel (0.2.7+14.10.20140704-0ubuntu1) utopic; urgency=low
[ Charles Kerr ]
diff --git a/libqmenumodel/src/unitymenumodel.cpp b/libqmenumodel/src/unitymenumodel.cpp
index a6ae140..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)
@@ -309,6 +318,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
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);