← Back to branch summary

~mterry/unity8/power-button-on-lock

« back to all changes in this revision

Viewing changes to plugins/Unity/Indicators/rootactionstate.h

  • Committer: Michael Terry
  • Date: 2014-11-24 15:25:42 UTC
  • mfrom: (1368.1.82 unity8)
  • Revision ID: michael.terry@canonical.com-20141124152542-5cysva8ds3qfula6
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/Unity/Indicators/rootactionstate.h
37
37
    Q_PROPERTY(QString rightLabel READ rightLabel NOTIFY rightLabelChanged)
38
38
    Q_PROPERTY(QStringList icons READ icons NOTIFY iconsChanged)
39
39
    Q_PROPERTY(QString accessibleName READ accessibleName NOTIFY accessibleNameChanged)
40
 
    Q_PROPERTY(bool visible READ isVisible NOTIFY visibleChanged)
 
40
    Q_PROPERTY(bool indicatorVisible READ indicatorVisible NOTIFY indicatorVisibleChanged)
41
41
public:
42
42
    RootActionState(QObject *parent = 0);
43
43
    virtual ~RootActionState();
54
54
    QString rightLabel() const;
55
55
    QStringList icons() const;
56
56
    QString accessibleName() const;
57
 
    bool isVisible() const;
 
57
    bool indicatorVisible() const;
58
58
 
59
59
    // from ActionStateParser
60
 
    virtual QVariant toQVariant(GVariant* state) const;
 
60
    virtual QVariant toQVariant(GVariant* state) const override;
61
61
 
62
62
Q_SIGNALS:
63
63
    void updated();
71
71
    void rightLabelChanged();
72
72
    void iconsChanged();
73
73
    void accessibleNameChanged();
74
 
    void visibleChanged();
 
74
    void indicatorVisibleChanged();
75
75
 
76
76
private Q_SLOTS:
77
77
    void onModelRowsAdded(const QModelIndex& parent, int start, int end);