git.iko.soy/unity8
on xenial help sign in
Some more property stuff.
8cafd12Pawel Stolowski
plugins/Unity/preview.cpp+3
compare with xenial
unifiedsplit
@@ -104,6 +104,7 @@ Preview* Preview::newFromUnityPreview(unity::dash::Preview::Ptr unityPreview)
104 qWarning() << "Unknown preview type: " << typeid(*unityPreview).name();
104 qWarning() << "Unknown preview type: " << typeid(*unityPreview).name();
105 preview = new GenericPreview();
105 preview = new GenericPreview();
106 }
106 }
107+
107 preview->Preview::setUnityPreview(unityPreview);
108 preview->Preview::setUnityPreview(unityPreview);
108 preview->setUnityPreview(unityPreview);
109 preview->setUnityPreview(unityPreview);
109
110
@@ -113,6 +114,7 @@ Preview* Preview::newFromUnityPreview(unity::dash::Preview::Ptr unityPreview)
113void Preview::setUnityPreview(unity::dash::Preview::Ptr unityPreview)
114void Preview::setUnityPreview(unity::dash::Preview::Ptr unityPreview)
114{
115{
115 m_unityPreview = unityPreview;
116 m_unityPreview = unityPreview;
117+
116 Q_EMIT rendererNameChanged();
118 Q_EMIT rendererNameChanged();
117 Q_EMIT titleChanged();
119 Q_EMIT titleChanged();
118 Q_EMIT subtitleChanged();
120 Q_EMIT subtitleChanged();
@@ -128,3 +130,4 @@ void Preview::execute(const QString& actionId, const QHash<QString, QVariant>& h
128 qWarning() << "Preview not set";
130 qWarning() << "Preview not set";
129 }
131 }
130}
132}
133+
plugins/Unity/preview.h+1−1
@@ -59,7 +59,7 @@ Q_SIGNALS:
59
59
60protected:
60protected:
61 virtual void setUnityPreview(unity::dash::Preview::Ptr unityPreview);
61 virtual void setUnityPreview(unity::dash::Preview::Ptr unityPreview);
62−
62+
63 unity::dash::Preview::Ptr m_unityPreview;
63 unity::dash::Preview::Ptr m_unityPreview;
64};
64};
65
65
plugins/Unity/previewaction.cpp+6
@@ -27,6 +27,12 @@ PreviewAction::PreviewAction(QObject *parent)
27void PreviewAction::setUnityAction(unity::dash::Preview::ActionPtr unityAction)
27void PreviewAction::setUnityAction(unity::dash::Preview::ActionPtr unityAction)
28{
28{
29 m_unityAction = unityAction;
29 m_unityAction = unityAction;
30+
31+ Q_EMIT displayNameChanged();
32+ Q_EMIT iconHintChanged();
33+ Q_EMIT extraTextChanged();
34+ Q_EMIT activationUriChanged();
35+ Q_EMIT layoutHintChanged();
30}
36}
31
37
32QString PreviewAction::id() const
38QString PreviewAction::id() const
plugins/Unity/previewaction.h+12−5
@@ -41,11 +41,11 @@ class PreviewAction : public QObject
41 Q_OBJECT
41 Q_OBJECT
42
42
43 Q_PROPERTY(QString id READ id)
43 Q_PROPERTY(QString id READ id)
44− Q_PROPERTY(QString displayName READ displayName)
44+ Q_PROPERTY(QString displayName READ displayName NOTIFY displayNameChanged)
45− Q_PROPERTY(QString iconHint READ iconHint)
45+ Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)
46− Q_PROPERTY(QString extraText READ extraText)
46+ Q_PROPERTY(QString extraText READ extraText NOTIFY extraTextChanged)
47− Q_PROPERTY(QString activationUri READ activationUri)
47+ Q_PROPERTY(QString activationUri READ activationUri NOTIFY activationUriChanged)
48− Q_PROPERTY(LayoutHint layoutHint READ layoutHint)
48+ Q_PROPERTY(LayoutHint layoutHint READ layoutHint NOTIFY layoutHintChanged)
49
49
50public:
50public:
51 explicit PreviewAction(QObject *parent = 0);
51 explicit PreviewAction(QObject *parent = 0);
@@ -58,6 +58,13 @@ public:
58 QString activationUri() const;
58 QString activationUri() const;
59 LayoutHint layoutHint() const;
59 LayoutHint layoutHint() const;
60
60
61+Q_SIGNALS:
62+ void displayNameChanged();
63+ void iconHintChanged();
64+ void extraTextChanged();
65+ void activationUriChanged();
66+ void layoutHintChanged();
67+
61private:
68private:
62 unity::dash::Preview::ActionPtr m_unityAction;
69 unity::dash::Preview::ActionPtr m_unityAction;
63};
70};