Merge lp:~mzanetti/unity8/fake-application-previews into lp:~elopio/unity8/app_preview

[Michael Zanetti]

make fake applications use the application previews

=== modified file 'tests/mocks/Unity/fake_applications_scope.cpp'
--- tests/mocks/Unity/fake_applications_scope.cpp	2013-09-30 15:47:18 +0000
+++ tests/mocks/Unity/fake_applications_scope.cpp	2014-01-15 19:29:53 +0000
@@ -30,6 +30,7 @@
     m_id = "applications.scope";
     m_name = "Applications";
     m_visible = visible;
+    m_previewRendererName = "preview-application";
     m_categories->setModel(createCategoriesModel());
 }
 

=== modified file 'tests/mocks/Unity/fake_preview.cpp'
--- tests/mocks/Unity/fake_preview.cpp	2013-10-31 15:13:50 +0000
+++ tests/mocks/Unity/fake_preview.cpp	2014-01-15 19:29:53 +0000
@@ -16,13 +16,15 @@
 
 #include "fake_preview.h"
 
-Preview::Preview(QObject *parent): QObject(parent)
+Preview::Preview(const QString &rendererName, QObject *parent):
+    QObject(parent),
+    m_rendererName(rendererName)
 {
 }
 
 QString Preview::rendererName() const
 {
-    return "generic-preview";
+    return m_rendererName;
 }
 
 QString Preview::title() const

=== modified file 'tests/mocks/Unity/fake_preview.h'
--- tests/mocks/Unity/fake_preview.h	2013-10-31 15:13:50 +0000
+++ tests/mocks/Unity/fake_preview.h	2014-01-15 19:29:53 +0000
@@ -38,7 +38,7 @@
     Q_PROPERTY(QString image READ image NOTIFY previewChanged)
 
 public:
-    explicit Preview(QObject *parent = 0);
+    explicit Preview(const QString &rendererName, QObject *parent = 0);
 
     QString rendererName() const;
     QString title() const;
@@ -55,6 +55,9 @@
 
 Q_SIGNALS:
     void previewChanged();
+
+private:
+    QString m_rendererName;
 };
 
 Q_DECLARE_METATYPE(Preview *)

=== modified file 'tests/mocks/Unity/fake_scope.cpp'
--- tests/mocks/Unity/fake_scope.cpp	2013-12-17 16:04:47 +0000
+++ tests/mocks/Unity/fake_scope.cpp	2014-01-15 19:29:53 +0000
@@ -38,6 +38,7 @@
     , m_isActive(false)
     , m_categories(new Categories(this))
     , m_results(new DeeListModel(this))
+    , m_previewRendererName("preview-generic")
 {
     DeeModel* results_model = create_results_model(20, 300);
     m_categories->setResultModel(results_model);
@@ -47,7 +48,7 @@
     m_timer.setInterval(1000);
     m_timer.setSingleShot(true);
     connect(&m_timer, &QTimer::timeout, [this]() {
-                                    Preview *p = new Preview(this);
+                                    Preview *p = new Preview(m_previewRendererName, this);
                                     Q_EMIT previewReady(p);
                                 });
 }

=== modified file 'tests/mocks/Unity/fake_scope.h'
--- tests/mocks/Unity/fake_scope.h	2013-10-31 15:13:50 +0000
+++ tests/mocks/Unity/fake_scope.h	2014-01-15 19:29:53 +0000
@@ -116,6 +116,8 @@
     bool m_searching;
     bool m_isActive;
 
+    QString m_previewRendererName;
+
     Categories* m_categories;
     DeeListModel* m_results;