git.iko.soy/unity8
on xenial help sign in
Some more property stuff.
commit8cafd1203cdddc5d3eed6760ba0cb4f778eea77f authorPawel Stolowski <pawel.stolowski@canonical.com> dateThu 27 Jun 2013, 11:33 (13 years ago) parentf649207
4 files changed+22−6
compare with xenial
unifiedsplit
plugins/Unity/preview.cpp+3 plugins/Unity/preview.h+1−1 plugins/Unity/previewaction.cpp+6 plugins/Unity/previewaction.h+12−5
plugins/Unity/preview.cpp+3
@@ -104,6 +104,7 @@ Preview* Preview::newFromUnityPreview(unity::dash::Preview::Ptr unityPreview)
104104 qWarning() << "Unknown preview type: " << typeid(*unityPreview).name();
105105 preview = new GenericPreview();
106106 }
107+
107108 preview->Preview::setUnityPreview(unityPreview);
108109 preview->setUnityPreview(unityPreview);
109110
@@ -113,6 +114,7 @@ Preview* Preview::newFromUnityPreview(unity::dash::Preview::Ptr unityPreview)
113114void Preview::setUnityPreview(unity::dash::Preview::Ptr unityPreview)
114115{
115116 m_unityPreview = unityPreview;
117+
116118 Q_EMIT rendererNameChanged();
117119 Q_EMIT titleChanged();
118120 Q_EMIT subtitleChanged();
@@ -128,3 +130,4 @@ void Preview::execute(const QString& actionId, const QHash<QString, QVariant>& h
128130 qWarning() << "Preview not set";
129131 }
130132}
133+
plugins/Unity/preview.h+1−1
@@ -59,7 +59,7 @@ Q_SIGNALS:
5959
6060protected:
6161 virtual void setUnityPreview(unity::dash::Preview::Ptr unityPreview);
62−
62+
6363 unity::dash::Preview::Ptr m_unityPreview;
6464};
6565
plugins/Unity/previewaction.cpp+6
@@ -27,6 +27,12 @@ PreviewAction::PreviewAction(QObject *parent)
2727void PreviewAction::setUnityAction(unity::dash::Preview::ActionPtr unityAction)
2828{
2929 m_unityAction = unityAction;
30+
31+ Q_EMIT displayNameChanged();
32+ Q_EMIT iconHintChanged();
33+ Q_EMIT extraTextChanged();
34+ Q_EMIT activationUriChanged();
35+ Q_EMIT layoutHintChanged();
3036}
3137
3238QString PreviewAction::id() const
plugins/Unity/previewaction.h+12−5
@@ -41,11 +41,11 @@ class PreviewAction : public QObject
4141 Q_OBJECT
4242
4343 Q_PROPERTY(QString id READ id)
44− Q_PROPERTY(QString displayName READ displayName)
45− Q_PROPERTY(QString iconHint READ iconHint)
46− Q_PROPERTY(QString extraText READ extraText)
47− Q_PROPERTY(QString activationUri READ activationUri)
48− Q_PROPERTY(LayoutHint layoutHint READ layoutHint)
44+ Q_PROPERTY(QString displayName READ displayName NOTIFY displayNameChanged)
45+ Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)
46+ Q_PROPERTY(QString extraText READ extraText NOTIFY extraTextChanged)
47+ Q_PROPERTY(QString activationUri READ activationUri NOTIFY activationUriChanged)
48+ Q_PROPERTY(LayoutHint layoutHint READ layoutHint NOTIFY layoutHintChanged)
4949
5050public:
5151 explicit PreviewAction(QObject *parent = 0);
@@ -58,6 +58,13 @@ public:
5858 QString activationUri() const;
5959 LayoutHint layoutHint() const;
6060
61+Q_SIGNALS:
62+ void displayNameChanged();
63+ void iconHintChanged();
64+ void extraTextChanged();
65+ void activationUriChanged();
66+ void layoutHintChanged();
67+
6168private:
6269 unity::dash::Preview::ActionPtr m_unityAction;
6370};