git.iko.soy/unity8
on xenial help sign in
Minor fixes.
commit0bfbf81f8406ce31cf21dd51b9236c60c888844d authorPawel Stolowski <pawel.stolowski@canonical.com> dateThu 27 Jun 2013, 14:34 (13 years ago) parentb44b2f0
7 files changed+33−8
compare with xenial
unifiedsplit
plugins/Unity/applicationpreview.cpp+2−1 plugins/Unity/moviepreview.cpp+6−1 plugins/Unity/moviepreview.h+8−3 plugins/Unity/musicpreview.cpp+10−1 plugins/Unity/musicpreview.h+3 plugins/Unity/preview.cpp+2−1 plugins/Unity/previewaction.cpp+2−1
plugins/Unity/applicationpreview.cpp+2−1
@@ -23,7 +23,8 @@
2323#include <QDebug>
2424
2525ApplicationPreview::ApplicationPreview(QObject *parent):
26− Preview(parent)
26+ Preview(parent),
27+ m_unityAppPreview(nullptr)
2728{
2829}
2930
plugins/Unity/moviepreview.cpp+6−1
@@ -24,7 +24,8 @@
2424#include <QDebug>
2525
2626MoviePreview::MoviePreview(QObject *parent):
27− Preview(parent)
27+ Preview(parent),
28+ m_unityMoviePreview(nullptr)
2829{
2930}
3031
@@ -61,4 +62,8 @@ unsigned int MoviePreview::numRatings() const
6162void MoviePreview::setUnityPreview(unity::dash::Preview::Ptr unityPreview)
6263{
6364 m_unityMoviePreview = std::dynamic_pointer_cast<unity::dash::MoviePreview>(unityPreview);
65+
66+ Q_EMIT yearChanged();
67+ Q_EMIT ratingChanged();
68+ Q_EMIT numRatingsChanged();
6469}
plugins/Unity/moviepreview.h+8−3
@@ -34,9 +34,9 @@ class MoviePreview: public Preview
3434{
3535 Q_OBJECT
3636
37− Q_PROPERTY(QString year READ year)
38− Q_PROPERTY(float rating READ rating)
39− Q_PROPERTY(unsigned int numRatings READ numRatings)
37+ Q_PROPERTY(QString year READ year NOTIFY yearChanged)
38+ Q_PROPERTY(float rating READ rating NOTIFY ratingChanged)
39+ Q_PROPERTY(unsigned int numRatings READ numRatings NOTIFY numRatingsChanged)
4040
4141public:
4242 explicit MoviePreview(QObject *parent = 0);
@@ -45,6 +45,11 @@ public:
4545 float rating() const;
4646 unsigned int numRatings() const;
4747
48+Q_SIGNALS:
49+ void yearChanged();
50+ void ratingChanged();
51+ void numRatingsChanged();
52+
4853protected:
4954 void setUnityPreview(unity::dash::Preview::Ptr unityPreview) override;
5055
plugins/Unity/musicpreview.cpp+10−1
@@ -21,7 +21,8 @@
2121#include <QDebug>
2222
2323MusicPreview::MusicPreview(QObject *parent):
24− Preview(parent)
24+ Preview(parent),
25+ m_unityMusicPreview(nullptr)
2526{
2627 m_tracks = new DeeListModel(this);
2728}
@@ -30,6 +31,9 @@ void MusicPreview::setUnityPreview(unity::dash::Preview::Ptr unityPreview)
3031{
3132 m_unityMusicPreview = std::dynamic_pointer_cast<unity::dash::MusicPreview>(unityPreview);
3233 m_tracks->setModel(m_unityMusicPreview->GetTracksModel()->model());
34+ m_unityMusicPreview->GetTracksModel()->model.changed.connect(sigc::mem_fun(this, &MusicPreview::onTracksModelChanged));
35+
36+ Q_EMIT tracksChanged();
3337}
3438
3539DeeListModel* MusicPreview::tracks() const
@@ -39,3 +43,8 @@ DeeListModel* MusicPreview::tracks() const
3943 }
4044 return m_tracks;
4145}
46+
47+void MusicPreview::onTracksModelChanged(unity::glib::Object<DeeModel> /* model */)
48+{
49+ m_tracks->setModel(m_unityMusicPreview->GetTracksModel()->model());
50+}
plugins/Unity/musicpreview.h+3
@@ -51,6 +51,9 @@ Q_SIGNALS:
5151protected:
5252 void setUnityPreview(unity::dash::Preview::Ptr unityPreview) override;
5353
54+private Q_SLOTS:
55+ void onTracksModelChanged(unity::glib::Object<DeeModel> model);
56+
5457private:
5558 unity::dash::MusicPreview::Ptr m_unityMusicPreview;
5659 DeeListModel *m_tracks;
plugins/Unity/preview.cpp+2−1
@@ -36,7 +36,8 @@
3636#include <UnityCore/MusicPreview.h>
3737
3838Preview::Preview(QObject *parent):
39− QObject(parent)
39+ QObject(parent),
40+ m_unityPreview(nullptr)
4041{
4142}
4243
plugins/Unity/previewaction.cpp+2−1
@@ -20,7 +20,8 @@
2020#include "previewaction.h"
2121
2222PreviewAction::PreviewAction(QObject *parent)
23− : QObject(parent)
23+ : QObject(parent),
24+ m_unityAction(nullptr)
2425{
2526}
2627