diff options
-rw-r--r-- | libqmenumodel/src/qmenumodel.cpp | 40 | ||||
-rw-r--r-- | libqmenumodel/src/qmenumodel.h | 7 |
2 files changed, 47 insertions, 0 deletions
diff --git a/libqmenumodel/src/qmenumodel.cpp b/libqmenumodel/src/qmenumodel.cpp index ec5570f..5bf740d 100644 --- a/libqmenumodel/src/qmenumodel.cpp +++ b/libqmenumodel/src/qmenumodel.cpp @@ -42,6 +42,10 @@ QMenuModel::QMenuModel(GMenuModel *other, QObject *parent) m_signalChangedId(0) { setMenuModel(other); + + QObject::connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SIGNAL(countChanged())); + QObject::connect(this, SIGNAL(rowsRemoved(const QModelIndex &, int, int)), this, SIGNAL(countChanged())); + QObject::connect(this, SIGNAL(modelReset()), this, SIGNAL(countChanged())); } /*! \internal */ @@ -50,6 +54,42 @@ QMenuModel::~QMenuModel() clearModel(); } +/*! + \qmlmethod QDBusMenuModel::get(int) + + Returns the item at index in the model. This allows the item data to be accessed from JavaScript: + + \b Note: methods should only be called after the Component has completed. +*/ + +QVariantMap QMenuModel::get(int row) const +{ + QVariantMap result; + int rowCountValue = rowCount(); + if ((rowCountValue > 0) && (row >= 0) && (row < rowCountValue)) { + QModelIndex i = index(row); + result.insert("action", data(i, Action)); + result.insert("label", data(i, Label)); + result.insert("linkSection", data(i, LinkSection)); + result.insert("linkSubMenu", data(i, LinkSubMenu)); + result.insert("extra", data(i, Extra)); + } + + return result; +} + +/*! + \qmlmethod QDBusMenuModel::count() + + The number of data entries in the model. + + \b Note: methods should only be called after the Component has completed. +*/ +int QMenuModel::count() const +{ + return rowCount(); +} + /*! \internal */ void QMenuModel::setMenuModel(GMenuModel *other) { diff --git a/libqmenumodel/src/qmenumodel.h b/libqmenumodel/src/qmenumodel.h index 1ab1e7a..f923658 100644 --- a/libqmenumodel/src/qmenumodel.h +++ b/libqmenumodel/src/qmenumodel.h @@ -31,6 +31,7 @@ typedef struct _GObject GObject; class QMenuModel : public QAbstractListModel { Q_OBJECT + Q_PROPERTY(int count READ count NOTIFY countChanged) public: enum MenuRoles { @@ -43,12 +44,18 @@ public: ~QMenuModel(); + Q_INVOKABLE QVariantMap get(int row) const; + int count() const; + /* QAbstractItemModel */ QHash<int, QByteArray> roleNames() const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QModelIndex parent (const QModelIndex &index) const; int rowCount(const QModelIndex &parent = QModelIndex()) const; +Q_SIGNALS: + void countChanged(); + protected: QMenuModel(GMenuModel *other=0, QObject *parent=0); void setMenuModel(GMenuModel *model); |