diff options
author | Nick Dedekind <nicholas.dedekind@gmail.com> | 2013-07-30 10:45:01 +0100 |
---|---|---|
committer | Nick Dedekind <nicholas.dedekind@gmail.com> | 2013-07-30 10:45:01 +0100 |
commit | c796dd5f1f75dd063fabf1b9ae8b24ec5714e197 (patch) | |
tree | 18961f076f2ee801513d5efdf9d78615a1b761bc /libqmenumodel/src/unitymenumodel.h | |
parent | 16b480d00dd5c1fba5252e728cfc71aaa5cc916f (diff) | |
parent | d47194b0794968fa7713a8c7c9cfec7f1e4f8a17 (diff) | |
download | qmenumodel-c796dd5f1f75dd063fabf1b9ae8b24ec5714e197.tar.gz qmenumodel-c796dd5f1f75dd063fabf1b9ae8b24ec5714e197.tar.bz2 qmenumodel-c796dd5f1f75dd063fabf1b9ae8b24ec5714e197.zip |
merged with trunk
Diffstat (limited to 'libqmenumodel/src/unitymenumodel.h')
-rw-r--r-- | libqmenumodel/src/unitymenumodel.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libqmenumodel/src/unitymenumodel.h b/libqmenumodel/src/unitymenumodel.h index 396eea3..ad409ba 100644 --- a/libqmenumodel/src/unitymenumodel.h +++ b/libqmenumodel/src/unitymenumodel.h @@ -20,6 +20,8 @@ #define UNITYMENUMODEL_H #include <QAbstractListModel> +class ActionStateParser; +class QQmlComponent; class UnityMenuModel: public QAbstractListModel { @@ -27,6 +29,7 @@ class UnityMenuModel: public QAbstractListModel Q_PROPERTY(QByteArray busName READ busName WRITE setBusName NOTIFY busNameChanged) 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) public: UnityMenuModel(QObject *parent = NULL); @@ -41,6 +44,9 @@ public: QByteArray menuObjectPath() const; void setMenuObjectPath(const QByteArray &path); + ActionStateParser* actionStateParser() const; + void setActionStateParser(ActionStateParser* actionStateParser); + int rowCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; @@ -48,7 +54,7 @@ public: QModelIndex parent(const QModelIndex &index) const; QHash<int, QByteArray> roleNames() const; - Q_INVOKABLE QObject * submenu(int position); + Q_INVOKABLE QObject * submenu(int position, QQmlComponent* actionStateParser = NULL); Q_INVOKABLE bool loadExtendedAttributes(int position, const QVariantMap &schema); Q_INVOKABLE QVariant get(int row, const QByteArray &role); @@ -56,6 +62,7 @@ Q_SIGNALS: void busNameChanged(const QByteArray &name); void actionsChanged(const QByteArray &path); void menuObjectPathChanged(const QByteArray &path); + void actionStateParserChanged(ActionStateParser* parser); public Q_SLOTS: void activate(int index); |