1
=== modified file 'plugins/Unity/peoplepreviewdata.cpp'
2
--- plugins/Unity/peoplepreviewdata.cpp	2013-05-08 09:51:55 +0000
3
+++ plugins/Unity/peoplepreviewdata.cpp	2013-06-03 12:49:26 +0000
4
@@ -436,3 +436,7 @@
5
436
        m_addressList.append(address);
436
        m_addressList.append(address);
6
437
    }
437
    }
7
438
}
438
}
8
439
9
440
void PeoplePreviewData::setUnityPeoplePreview(const unity::dash::Preview::Ptr& preview) {
10
441
    setUnityPreview(uri().toStdString(), preview);
11
442
}
12
439
443
13
=== modified file 'tests/qmltests/plugins/Unity/CMakeLists.txt'
14
--- tests/qmltests/plugins/Unity/CMakeLists.txt	2013-05-02 16:38:00 +0000
15
+++ tests/qmltests/plugins/Unity/CMakeLists.txt	2013-06-03 12:49:26 +0000
16
@@ -6,6 +6,7 @@
17
6
pkg_search_module(DEE dee-1.0 REQUIRED)
6
pkg_search_module(DEE dee-1.0 REQUIRED)
18
7
pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
7
pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
19
8
pkg_search_module(DEEQT libdee-qt5 REQUIRED)
8
pkg_search_module(DEEQT libdee-qt5 REQUIRED)
20
9
pkg_check_modules(UNITYCORE REQUIRED unity-core-6.0)
21
9
10
22
10
include_directories(
11
include_directories(
23
11
  ${CMAKE_SOURCE_DIR}/plugins/Unity
12
  ${CMAKE_SOURCE_DIR}/plugins/Unity
24
@@ -14,6 +15,7 @@
25
14
  ${Qt5Quick_INCLUDE_DIRS}
15
  ${Qt5Quick_INCLUDE_DIRS}
26
15
  ${DEE_INCLUDE_DIRS}
16
  ${DEE_INCLUDE_DIRS}
27
16
  ${DEEQT_INCLUDE_DIRS}
17
  ${DEEQT_INCLUDE_DIRS}
28
18
  ${UNITYCORE_INCLUDE_DIRS}
29
17
)
19
)
30
18
20
31
19
add_definitions(-DQT_NO_KEYWORDS)
21
add_definitions(-DQT_NO_KEYWORDS)
32
@@ -21,10 +23,12 @@
33
21
set(UnityQML_SOURCES
23
set(UnityQML_SOURCES
34
22
  ${CMAKE_SOURCE_DIR}/plugins/Unity/categories.cpp
24
  ${CMAKE_SOURCE_DIR}/plugins/Unity/categories.cpp
35
23
  ${CMAKE_SOURCE_DIR}/plugins/Unity/categoryfilter.cpp
25
  ${CMAKE_SOURCE_DIR}/plugins/Unity/categoryfilter.cpp
36
26
  ${CMAKE_SOURCE_DIR}/plugins/Unity/peoplepreviewdata.cpp
37
24
  ${CMAKE_SOURCE_DIR}/plugins/Utils/qsortfilterproxymodelqml.cpp
27
  ${CMAKE_SOURCE_DIR}/plugins/Utils/qsortfilterproxymodelqml.cpp
38
25
  fake_lens.cpp
28
  fake_lens.cpp
39
26
  fake_lenses.cpp
29
  fake_lenses.cpp
40
27
  fake_unity_plugin.cpp
30
  fake_unity_plugin.cpp
41
31
  fake_peoplepreviewdata.cpp
42
28
)
32
)
43
29
33
44
30
add_library(FakeUnityQml MODULE ${UnityQML_SOURCES})
34
add_library(FakeUnityQml MODULE ${UnityQML_SOURCES})
45
@@ -33,6 +37,7 @@
46
33
  ${Qt5Quick_LIBRARIES}
37
  ${Qt5Quick_LIBRARIES}
47
34
  ${DEEQT_LDFLAGS}
38
  ${DEEQT_LDFLAGS}
48
35
  ${GOBJECT_LDFLAGS}
39
  ${GOBJECT_LDFLAGS}
49
40
  ${UNITYCORE_LDFLAGS}
50
36
)
41
)
51
37
42
52
38
qt5_use_modules(FakeUnityQml Qml)
43
qt5_use_modules(FakeUnityQml Qml)
53
39
44
54
=== modified file 'tests/qmltests/plugins/Unity/fake_lens.cpp'
55
--- tests/qmltests/plugins/Unity/fake_lens.cpp	2013-05-02 23:05:09 +0000
56
+++ tests/qmltests/plugins/Unity/fake_lens.cpp	2013-06-03 12:49:26 +0000
57
@@ -87,7 +87,11 @@
58
87
}
87
}
59
88
88
60
89
Categories* Lens::categories() const {
89
Categories* Lens::categories() const {
62
90
  return m_categories;
90
    return m_categories;
63
91
}
64
92
65
93
unity::dash::Lens::Ptr Lens::unityLens() const {
66
94
    return m_unityLens;
67
91
}
95
}
68
92
96
69
93
static const gchar * categories_model_schema[] = {
97
static const gchar * categories_model_schema[] = {
70
94
98
71
=== modified file 'tests/qmltests/plugins/Unity/fake_lens.h'
72
--- tests/qmltests/plugins/Unity/fake_lens.h	2013-05-02 16:38:00 +0000
73
+++ tests/qmltests/plugins/Unity/fake_lens.h	2013-06-03 12:49:26 +0000
74
@@ -21,6 +21,9 @@
75
21
#include <QObject>
21
#include <QObject>
76
22
#include "categories.h"
22
#include "categories.h"
77
23
23
78
24
// libunity-core
79
25
#include <UnityCore/Lens.h>
80
26
81
24
class Lens : public QObject
27
class Lens : public QObject
82
25
{
28
{
83
26
    Q_OBJECT
29
    Q_OBJECT
84
@@ -41,6 +44,7 @@
85
41
44
86
42
    void setName(const QString &str);
45
    void setName(const QString &str);
87
43
    void setSearchQuery(const QString &str);
46
    void setSearchQuery(const QString &str);
88
47
    unity::dash::Lens::Ptr unityLens() const;
89
44
48
90
45
    Categories* categories() const;
49
    Categories* categories() const;
91
46
50
92
@@ -58,6 +62,7 @@
93
58
    bool m_visible;
62
    bool m_visible;
94
59
    Categories* m_categories;
63
    Categories* m_categories;
95
60
    DeeListModel* m_results;
64
    DeeListModel* m_results;
96
65
    unity::dash::Lens::Ptr m_unityLens;
97
61
};
66
};
98
62
67
99
63
#endif // FAKE_LENS_H
68
#endif // FAKE_LENS_H
100
64
69
101
=== added file 'tests/qmltests/plugins/Unity/fake_peoplepreviewdata.cpp'
102
--- tests/qmltests/plugins/Unity/fake_peoplepreviewdata.cpp	1970-01-01 00:00:00 +0000
103
+++ tests/qmltests/plugins/Unity/fake_peoplepreviewdata.cpp	2013-06-03 12:49:26 +0000
104
@@ -0,0 +1,53 @@
105
1
/* -*- tab-width: 8; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
106
2
/*
107
3
 * Copyright (C) 2012 Canonical, Ltd.
108
4
 *
109
5
 * Authors:
110
6
 *  Ying-Chun Liu (PaulLiu) <paul.liu@canonical.com>
111
7
 *
112
8
 * This program is free software; you can redistribute it and/or modify
113
9
 * it under the terms of the GNU General Public License as published by
114
10
 * the Free Software Foundation; version 3.
115
11
 *
116
12
 * This program is distributed in the hope that it will be useful,
117
13
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
118
14
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
119
15
 * GNU General Public License for more details.
120
16
 *
121
17
 * You should have received a copy of the GNU General Public License
122
18
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
123
19
 */
124
20
125
21
#include <iostream>
126
22
127
23
#include "fake_peoplepreviewdata.h"
128
24
129
25
#include <QDebug>
130
26
#include <UnityCore/PeoplePreview.h>
131
27
#include "fake_lens.h"
132
28
133
29
FakePeoplePreviewData::FakePeoplePreviewData(QObject *parent)
134
30
  :   PeoplePreviewData(parent)
135
31
{
136
32
    GVariantBuilder g_builder;
137
33
    g_variant_builder_init(&g_builder, G_VARIANT_TYPE_ARRAY);
138
34
    unity::variant::BuilderWrapper builder(&g_builder);
139
35
140
36
    builder.add("display_name", "Bob Wang");
141
37
    builder.add("avatar", "");
142
38
    builder.add("favorite", false);
143
39
    GVariantBuilder g_builder_imaccount;
144
40
    g_variant_builder_init(&g_builder_imaccount, G_VARIANT_TYPE_ARRAY);
145
41
    g_variant_builder_add(&g_builder_imaccount, "(ss)", "jabber",
146
42
                          "bob.wang@canonical.com");
147
43
    builder.add("imaccount", g_variant_new("a(ss)", &g_builder_imaccount));
148
44
149
45
    unity::glib::Variant properties(
150
46
        g_variant_new("(ssssssa(sssua{sv})a(sssv)a{sv})",
151
47
                      "preview-people","","","","","",NULL,NULL,&g_builder));
152
48
153
49
    unity::dash::Preview::Ptr myFakePeoplePreview =
154
50
        unity::dash::Preview::PreviewForVariant(properties);
155
51
156
52
    setUnityPeoplePreview(myFakePeoplePreview);
157
53
}
158
0
54
159
=== added file 'tests/qmltests/plugins/Unity/fake_peoplepreviewdata.h'
160
--- tests/qmltests/plugins/Unity/fake_peoplepreviewdata.h	1970-01-01 00:00:00 +0000
161
+++ tests/qmltests/plugins/Unity/fake_peoplepreviewdata.h	2013-06-03 12:49:26 +0000
162
@@ -0,0 +1,32 @@
163
1
/* -*- tab-width: 8; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
164
2
/*
165
3
 * Copyright (C) 2012 Canonical, Ltd.
166
4
 *
167
5
 * Authors:
168
6
 *  Ying-Chun Liu (PaulLiu) <paul.liu@canonical.com>
169
7
 *
170
8
 * This program is free software; you can redistribute it and/or modify
171
9
 * it under the terms of the GNU General Public License as published by
172
10
 * the Free Software Foundation; version 3.
173
11
 *
174
12
 * This program is distributed in the hope that it will be useful,
175
13
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
176
14
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
177
15
 * GNU General Public License for more details.
178
16
 *
179
17
 * You should have received a copy of the GNU General Public License
180
18
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
181
19
 */
182
20
183
21
#ifndef FAKE_PEOPLEPREVIEWDATA_H
184
22
#define FAKE_PEOPLEPREVIEWDATA_H
185
23
186
24
#include "peoplepreviewdata.h"
187
25
188
26
class FakePeoplePreviewData : public PeoplePreviewData
189
27
{
190
28
 public:
191
29
    FakePeoplePreviewData(QObject *parent = 0);
192
30
};
193
31
194
32
#endif
195
0
33
196
=== modified file 'tests/qmltests/plugins/Unity/fake_unity_plugin.cpp'
197
--- tests/qmltests/plugins/Unity/fake_unity_plugin.cpp	2013-05-02 23:05:09 +0000
198
+++ tests/qmltests/plugins/Unity/fake_unity_plugin.cpp	2013-06-03 12:49:26 +0000
199
@@ -23,6 +23,7 @@
200
23
#include "fake_lenses.h"
23
#include "fake_lenses.h"
201
24
#include "categories.h"
24
#include "categories.h"
202
25
#include "categoryfilter.h"
25
#include "categoryfilter.h"
203
26
#include "fake_peoplepreviewdata.h"
204
26
27
205
27
// External
28
// External
206
28
#include <glib-object.h>
29
#include <glib-object.h>
207
@@ -40,4 +41,5 @@
208
40
    qmlRegisterType<Lens>(uri, 0, 1, "Lens");
41
    qmlRegisterType<Lens>(uri, 0, 1, "Lens");
209
41
    qmlRegisterType<Categories>(uri, 0, 1, "Categories");
42
    qmlRegisterType<Categories>(uri, 0, 1, "Categories");
210
42
    qmlRegisterType<CategoryFilter>(uri, 0, 1, "CategoryFilter");
43
    qmlRegisterType<CategoryFilter>(uri, 0, 1, "CategoryFilter");
211
44
    qmlRegisterType<FakePeoplePreviewData>(uri, 0, 1, "PeoplePreviewData");
212
43
}
45
}
Status:	Rejected
Rejected by:	Albert Astals Cid on 2013-11-29
Proposed branch:	lp:~paulliu/unity/phablet-fake-peoplepreviewdata
Merge into:	lp:unity/phablet
Diff against target:	212 lines (+106/-1) 7 files modified plugins/Unity/peoplepreviewdata.cpp (+4/-0) tests/qmltests/plugins/Unity/CMakeLists.txt (+5/-0) tests/qmltests/plugins/Unity/fake_lens.cpp (+5/-1) tests/qmltests/plugins/Unity/fake_lens.h (+5/-0) tests/qmltests/plugins/Unity/fake_peoplepreviewdata.cpp (+53/-0) tests/qmltests/plugins/Unity/fake_peoplepreviewdata.h (+32/-0) tests/qmltests/plugins/Unity/fake_unity_plugin.cpp (+2/-0)
To merge this branch:	bzr merge lp:~paulliu/unity/phablet-fake-peoplepreviewdata
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)		2013-04-29	Disapprove on 2013-11-29
Michał Sawicz			Needs Information on 2013-06-06
PS Jenkins bot (community)	continuous-integration		Approve on 2013-06-03
Review via email: mp+161514@code.launchpad.net