diff options
author | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2012-11-22 16:13:02 -0300 |
---|---|---|
committer | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2012-11-22 16:13:02 -0300 |
commit | a745160b7a3460f25fa52f9902e306e071949346 (patch) | |
tree | 3f57894fdaae09304b7a759c8026947110743b33 /libqmenumodel/src/qstateaction.h | |
parent | 04391e9723278f8bb0a0985abd50aa9c3455980d (diff) | |
download | qmenumodel-a745160b7a3460f25fa52f9902e306e071949346.tar.gz qmenumodel-a745160b7a3460f25fa52f9902e306e071949346.tar.bz2 qmenumodel-a745160b7a3460f25fa52f9902e306e071949346.zip |
Removed QAction dependecy from QStateAction.
Exported activate function on QStateAction.
Diffstat (limited to 'libqmenumodel/src/qstateaction.h')
-rw-r--r-- | libqmenumodel/src/qstateaction.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libqmenumodel/src/qstateaction.h b/libqmenumodel/src/qstateaction.h index 85f207a..0fc68c2 100644 --- a/libqmenumodel/src/qstateaction.h +++ b/libqmenumodel/src/qstateaction.h @@ -20,21 +20,23 @@ #ifndef QDBUSACTION_H #define QDBUSACTION_H -#include <QAction> +#include <QObject> #include <QVariant> class QDBusActionGroup; -class QStateAction : public QAction +class QStateAction : public QObject { Q_OBJECT - Q_PROPERTY(QVariant state READ state WRITE setState NOTIFY stateChanged) + Q_PROPERTY(QString name READ name) + Q_PROPERTY(QVariant state READ state NOTIFY stateChanged) Q_PROPERTY(bool valid READ isValid NOTIFY validChanged) public: QVariant state() const; bool isValid() const; - Q_INVOKABLE void updateState(const QVariant &state); + Q_INVOKABLE void activate(const QVariant ¶meter = QVariant()); + Q_INVOKABLE void updateState(const QVariant ¶meter); Q_SIGNALS: void stateChanged(QVariant state); @@ -44,16 +46,18 @@ private Q_SLOTS: void onActionAppear(const QString &name); void onActionVanish(const QString &name); void onActionStateChanged(const QString &name, const QVariant &state); - void onTriggered(); private: QDBusActionGroup *m_group; QVariant m_state; bool m_valid; + QString m_name; QStateAction(QDBusActionGroup *group, const QString &name); + void setValid(bool valid); void setState(const QVariant &state); + QString name() const; friend class QDBusActionGroup; }; |