1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2016-07-14 07:09:00 +0000
3
+++ CMakeLists.txt	2016-08-08 16:52:11 +0000
4
@@ -57,7 +57,7 @@
5
57
find_package(Qt5Concurrent 5.4 REQUIRED)
57
find_package(Qt5Concurrent 5.4 REQUIRED)
6
58
find_package(Qt5Sql 5.4 REQUIRED)
58
find_package(Qt5Sql 5.4 REQUIRED)
7
59
59
9
60
pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=19)
60
pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=20)
10
61
pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
61
pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
11
62
pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
62
pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
12
63
pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
63
pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
13
64
64
14
=== modified file 'debian/control'
15
--- debian/control	2016-08-03 15:53:00 +0000
16
+++ debian/control	2016-08-08 16:52:11 +0000
17
@@ -11,9 +11,9 @@
18
11
# to g++ so we don't try to run arm g++
11
# to g++ so we don't try to run arm g++
19
12
# on an x86 CPU for example, when cross-compiling.
12
# on an x86 CPU for example, when cross-compiling.
20
13
               g++:native,
13
               g++:native,
21
14
               libandroid-properties-dev,
22
15
               graphviz,
14
               graphviz,
23
16
               gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
15
               gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
24
16
               libandroid-properties-dev,
25
17
               libconnectivity-qt1-dev (>= 0.7.1),
17
               libconnectivity-qt1-dev (>= 0.7.1),
26
18
               libevdev-dev,
18
               libevdev-dev,
27
19
               libgeonames-dev (>= 0.2),
19
               libgeonames-dev (>= 0.2),
28
@@ -31,10 +31,12 @@
29
31
               libqt5svg5-dev,
31
               libqt5svg5-dev,
30
32
               libqt5xmlpatterns5-dev,
32
               libqt5xmlpatterns5-dev,
31
33
               libsystemsettings-dev,
33
               libsystemsettings-dev,
32
34
               libubuntu-download-manager-common-dev,
33
34
               libubuntugestures5-dev (>= 1.3.2030),
35
               libubuntugestures5-dev (>= 1.3.2030),
34
35
               libubuntugestures5-private-dev (>= 1.3.2030),
36
               libubuntugestures5-private-dev (>= 1.3.2030),
35
36
               libudev-dev,
37
               libudev-dev,
37
37
               libunity-api-dev (>= 7.116),
38
               libudm-common-dev,
38
39
               libunity-api-dev (>= 7.117),
39
38
               libusermetricsoutput1-dev,
40
               libusermetricsoutput1-dev,
40
39
# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
41
# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
41
40
               libx11-dev[!arm64 !armhf],
42
               libx11-dev[!arm64 !armhf],
42
@@ -152,7 +154,7 @@
43
152
         qtdeclarative5-ubuntu-settings-components (>= 0.7),
154
         qtdeclarative5-ubuntu-settings-components (>= 0.7),
44
153
         qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
155
         qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
45
154
         ubuntu-thumbnailer-impl-0,
156
         ubuntu-thumbnailer-impl-0,
47
155
         unity-application-impl-19,
157
         unity-application-impl-20,
48
156
         unity-notifications-impl-3,
158
         unity-notifications-impl-3,
49
157
         unity-plugin-scopes | unity-scopes-impl,
159
         unity-plugin-scopes | unity-scopes-impl,
50
158
         unity-scopes-impl-12,
160
         unity-scopes-impl-12,
51
@@ -198,7 +200,7 @@
52
198
Depends: ${misc:Depends},
200
Depends: ${misc:Depends},
53
199
         ${shlibs:Depends},
201
         ${shlibs:Depends},
54
200
Provides: unity-application-impl,
202
Provides: unity-application-impl,
56
201
          unity-application-impl-19,
203
          unity-application-impl-20,
57
202
Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
204
Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
58
203
Description: Fake environment for running Unity 8 shell
205
Description: Fake environment for running Unity 8 shell
59
204
 Provides fake implementations of some QML modules used by Unity 8 shell
206
 Provides fake implementations of some QML modules used by Unity 8 shell
60
205
207
61
=== modified file 'plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt'
62
--- plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt	2016-06-02 09:32:33 +0000
63
+++ plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt	2016-08-08 16:52:11 +0000
64
@@ -12,5 +12,7 @@
65
12
add_library(DownloadDaemonListener MODULE ${DOWNLOADDAEMONLISTENER_SOURCES})
12
add_library(DownloadDaemonListener MODULE ${DOWNLOADDAEMONLISTENER_SOURCES})
66
13
13
67
14
qt5_use_modules(DownloadDaemonListener Qml Quick DBus Core)
14
qt5_use_modules(DownloadDaemonListener Qml Quick DBus Core)
69
15
15
pkg_check_modules(DDLADAPTER REQUIRED udm-common)
70
16
add_definitions(${DDLADAPTER_CFLAGS} ${DDLADAPTER_CFLAGS_OTHER})
71
17
target_link_libraries(DownloadDaemonListener ${DDLADAPTER_LIBRARIES})
72
16
add_unity8_plugin(Ubuntu.DownloadDaemonListener 0.1 Ubuntu/DownloadDaemonListener TARGETS DownloadDaemonListener)
18
add_unity8_plugin(Ubuntu.DownloadDaemonListener 0.1 Ubuntu/DownloadDaemonListener TARGETS DownloadDaemonListener)
73
17
19
74
=== modified file 'plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.cpp'
75
--- plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.cpp	2015-08-19 13:56:21 +0000
76
+++ plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.cpp	2016-08-08 16:52:11 +0000
77
@@ -1,5 +1,5 @@
78
1
/*
1
/*
80
2
 * Copyright (C) 2013 - Canonical Ltd.
2
 * Copyright (C) 2013-2016 Canonical Ltd.
81
3
 *
3
 *
82
4
 * This program is free software: you can redistribute it and/or modify it
4
 * This program is free software: you can redistribute it and/or modify it
83
5
 * under the terms of the GNU Lesser General Public License, as
5
 * under the terms of the GNU Lesser General Public License, as
84
@@ -78,6 +78,7 @@
85
78
        connect(m_adaptor, static_cast<void (DownloadTrackerAdaptor::*)(qulonglong, qulonglong)>(&DownloadTrackerAdaptor::progress), this, &DownloadTracker::progress);
78
        connect(m_adaptor, static_cast<void (DownloadTrackerAdaptor::*)(qulonglong, qulonglong)>(&DownloadTrackerAdaptor::progress), this, &DownloadTracker::progress);
86
79
        connect(m_adaptor, &DownloadTrackerAdaptor::resumed, this, &DownloadTracker::resumed);
79
        connect(m_adaptor, &DownloadTrackerAdaptor::resumed, this, &DownloadTracker::resumed);
87
80
        connect(m_adaptor, &DownloadTrackerAdaptor::started, this, &DownloadTracker::started);
80
        connect(m_adaptor, &DownloadTrackerAdaptor::started, this, &DownloadTracker::started);
88
81
        connect(m_adaptor, &DownloadTrackerAdaptor::processing, this, &DownloadTracker::processing);
89
81
    }
82
    }
90
82
    // FIXME find a better way of determining if the service is ready
83
    // FIXME find a better way of determining if the service is ready
91
83
    Q_EMIT serviceReadyChanged(m_adaptor && m_adaptor->isValid());
84
    Q_EMIT serviceReadyChanged(m_adaptor && m_adaptor->isValid());
92
84
85
93
=== modified file 'plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.h'
94
--- plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.h	2015-11-20 15:01:39 +0000
95
+++ plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.h	2016-08-08 16:52:11 +0000
96
@@ -1,5 +1,5 @@
97
1
/*
1
/*
99
2
 * Copyright (C) 2013 - Canonical Ltd.
2
 * Copyright (C) 2013-2016 Canonical Ltd.
100
3
 *
3
 *
101
4
 * This program is free software: you can redistribute it and/or modify it
4
 * This program is free software: you can redistribute it and/or modify it
102
5
 * under the terms of the GNU Lesser General Public License, as
5
 * under the terms of the GNU Lesser General Public License, as
103
@@ -54,6 +54,7 @@
104
54
    void error(const QString &error);
54
    void error(const QString &error);
105
55
    void finished(const QString &path);
55
    void finished(const QString &path);
106
56
    void paused(bool success);
56
    void paused(bool success);
107
57
    void processing(const QString &path);
108
57
    void progress(qulonglong received, qulonglong total);
58
    void progress(qulonglong received, qulonglong total);
109
58
    void resumed(bool success);
59
    void resumed(bool success);
110
59
    void started(bool success);
60
    void started(bool success);
111
60
61
112
=== modified file 'plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.cpp'
113
--- plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.cpp	2013-07-24 14:18:23 +0000
114
+++ plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.cpp	2016-08-08 16:52:11 +0000
115
@@ -1,8 +1,8 @@
116
1
/*
1
/*
117
2
 * This file was generated by qdbusxml2cpp version 0.8
2
 * This file was generated by qdbusxml2cpp version 0.8
119
3
 * Command line was: qdbusxml2cpp -v -c DownloadTrackerAdaptor -p downloadtrackeradaptor.h:downloadtrackeradaptor.cpp -i metatypes.h com.canonical.applications.download.xml
3
 * Command line was: qdbusxml2cpp -v -c DownloadTrackerAdaptor -p downloadtrackeradaptor.h:downloadtrackeradaptor.cpp -i metatypes.h ../../../../../../ubuntu-download-manager/trunk/docs/dbus/com.canonical.applications.download.xml
120
4
 *
4
 *
122
5
 * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
5
 * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
123
6
 *
6
 *
124
7
 * This is an auto-generated file.
7
 * This is an auto-generated file.
125
8
 * This file may have been hand-edited. Look for HAND-EDIT comments
8
 * This file may have been hand-edited. Look for HAND-EDIT comments
126
9
9
127
=== modified file 'plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.h'
128
--- plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.h	2015-09-14 09:11:08 +0000
129
+++ plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.h	2016-08-08 16:52:11 +0000
130
@@ -1,15 +1,15 @@
131
1
/*
1
/*
132
2
 * This file was generated by qdbusxml2cpp version 0.8
2
 * This file was generated by qdbusxml2cpp version 0.8
134
3
 * Command line was: qdbusxml2cpp -v -c DownloadTrackerAdaptor -p downloadtrackeradaptor.h:downloadtrackeradaptor.cpp -i metatypes.h com.canonical.applications.download.xml
3
 * Command line was: qdbusxml2cpp -v -c DownloadTrackerAdaptor -p downloadtrackeradaptor.h:downloadtrackeradaptor.cpp -i metatypes.h ../../../../../../ubuntu-download-manager/trunk/docs/dbus/com.canonical.applications.download.xml
135
4
 *
4
 *
137
5
 * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
5
 * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
138
6
 *
6
 *
139
7
 * This is an auto-generated file.
7
 * This is an auto-generated file.
140
8
 * Do not edit! All changes made to it will be lost.
8
 * Do not edit! All changes made to it will be lost.
141
9
 */
9
 */
142
10
10
145
11
#ifndef DOWNLOADTRACKERADAPTOR_H_1374434371
11
#ifndef DOWNLOADTRACKERADAPTOR_H
146
12
#define DOWNLOADTRACKERADAPTOR_H_1374434371
12
#define DOWNLOADTRACKERADAPTOR_H
147
13
13
148
14
#include <QtCore/QObject>
14
#include <QtCore/QObject>
149
15
#include <QtCore/QByteArray>
15
#include <QtCore/QByteArray>
150
@@ -36,6 +36,22 @@
151
36
36
152
37
    ~DownloadTrackerAdaptor();
37
    ~DownloadTrackerAdaptor();
153
38
38
154
39
    Q_PROPERTY(QString ClickPackage READ clickPackage)
155
40
    inline QString clickPackage() const
156
41
    { return qvariant_cast< QString >(property("ClickPackage")); }
157
42
158
43
    Q_PROPERTY(QString DestinationApp READ destinationApp)
159
44
    inline QString destinationApp() const
160
45
    { return qvariant_cast< QString >(property("DestinationApp")); }
161
46
162
47
    Q_PROPERTY(bool ShowInIndicator READ showInIndicator)
163
48
    inline bool showInIndicator() const
164
49
    { return qvariant_cast< bool >(property("ShowInIndicator")); }
165
50
166
51
    Q_PROPERTY(QString Title READ title)
167
52
    inline QString title() const
168
53
    { return qvariant_cast< QString >(property("Title")); }
169
54
170
39
public Q_SLOTS: // METHODS
55
public Q_SLOTS: // METHODS
171
40
    inline QDBusPendingReply<> allowGSMDownload(bool allowed)
56
    inline QDBusPendingReply<> allowGSMDownload(bool allowed)
172
41
    {
57
    {
173
@@ -50,6 +66,24 @@
174
50
        return asyncCallWithArgumentList(QStringLiteral("cancel"), argumentList);
66
        return asyncCallWithArgumentList(QStringLiteral("cancel"), argumentList);
175
51
    }
67
    }
176
52
68
177
69
    inline QDBusPendingReply<> collected()
178
70
    {
179
71
        QList<QVariant> argumentList;
180
72
        return asyncCallWithArgumentList(QStringLiteral("collected"), argumentList);
181
73
    }
182
74
183
75
    inline QDBusPendingReply<QString> filePath()
184
76
    {
185
77
        QList<QVariant> argumentList;
186
78
        return asyncCallWithArgumentList(QStringLiteral("filePath"), argumentList);
187
79
    }
188
80
189
81
    inline QDBusPendingReply<StringMap> headers()
190
82
    {
191
83
        QList<QVariant> argumentList;
192
84
        return asyncCallWithArgumentList(QStringLiteral("headers"), argumentList);
193
85
    }
194
86
195
53
    inline QDBusPendingReply<bool> isGSMDownloadAllowed()
87
    inline QDBusPendingReply<bool> isGSMDownloadAllowed()
196
54
    {
88
    {
197
55
        QList<QVariant> argumentList;
89
        QList<QVariant> argumentList;
198
@@ -80,6 +114,27 @@
199
80
        return asyncCallWithArgumentList(QStringLiteral("resume"), argumentList);
114
        return asyncCallWithArgumentList(QStringLiteral("resume"), argumentList);
200
81
    }
115
    }
201
82
116
202
117
    inline QDBusPendingReply<> setDestinationDir(const QString &path)
203
118
    {
204
119
        QList<QVariant> argumentList;
205
120
        argumentList << QVariant::fromValue(path);
206
121
        return asyncCallWithArgumentList(QStringLiteral("setDestinationDir"), argumentList);
207
122
    }
208
123
209
124
    inline QDBusPendingReply<> setHeaders(StringMap headers)
210
125
    {
211
126
        QList<QVariant> argumentList;
212
127
        argumentList << QVariant::fromValue(headers);
213
128
        return asyncCallWithArgumentList(QStringLiteral("setHeaders"), argumentList);
214
129
    }
215
130
216
131
    inline QDBusPendingReply<> setMetadata(const QVariantMap &data)
217
132
    {
218
133
        QList<QVariant> argumentList;
219
134
        argumentList << QVariant::fromValue(data);
220
135
        return asyncCallWithArgumentList(QStringLiteral("setMetadata"), argumentList);
221
136
    }
222
137
223
83
    inline QDBusPendingReply<> setThrottle(qulonglong speed)
138
    inline QDBusPendingReply<> setThrottle(qulonglong speed)
224
84
    {
139
    {
225
85
        QList<QVariant> argumentList;
140
        QList<QVariant> argumentList;
226
@@ -93,6 +148,12 @@
227
93
        return asyncCallWithArgumentList(QStringLiteral("start"), argumentList);
148
        return asyncCallWithArgumentList(QStringLiteral("start"), argumentList);
228
94
    }
149
    }
229
95
150
230
151
    inline QDBusPendingReply<int> state()
231
152
    {
232
153
        QList<QVariant> argumentList;
233
154
        return asyncCallWithArgumentList(QStringLiteral("state"), argumentList);
234
155
    }
235
156
236
96
    inline QDBusPendingReply<qulonglong> throttle()
157
    inline QDBusPendingReply<qulonglong> throttle()
237
97
    {
158
    {
238
98
        QList<QVariant> argumentList;
159
        QList<QVariant> argumentList;
239
@@ -106,10 +167,16 @@
240
106
    }
167
    }
241
107
168
242
108
Q_SIGNALS: // SIGNALS
169
Q_SIGNALS: // SIGNALS
243
170
    void authError(AuthErrorStruct error);
244
109
    void canceled(bool success);
171
    void canceled(bool success);
245
110
    void error(const QString &error);
172
    void error(const QString &error);
246
111
    void finished(const QString &path);
173
    void finished(const QString &path);
247
174
    void hashError(HashErrorStruct error);
248
175
    void httpError(HttpErrorStruct error);
249
176
    void networkError(NetworkErrorStruct error);
250
112
    void paused(bool success);
177
    void paused(bool success);
251
178
    void processError(ProcessErrorStruct error);
252
179
    void processing(const QString &path);
253
113
    void progress(qulonglong received, qulonglong total);
180
    void progress(qulonglong received, qulonglong total);
254
114
    void resumed(bool success);
181
    void resumed(bool success);
255
115
    void started(bool success);
182
    void started(bool success);
256
116
183
257
=== modified file 'plugins/Ubuntu/DownloadDaemonListener/interface/metatypes.h'
258
--- plugins/Ubuntu/DownloadDaemonListener/interface/metatypes.h	2013-07-24 14:18:23 +0000
259
+++ plugins/Ubuntu/DownloadDaemonListener/interface/metatypes.h	2016-08-08 16:52:11 +0000
260
@@ -1,5 +1,5 @@
261
1
/*
1
/*
263
2
 * Copyright 2013 2013 Canonical Ltd.
2
 * Copyright 2013-2016 Canonical Ltd.
264
3
 *
3
 *
265
4
 * This library is free software; you can redistribute it and/or
4
 * This library is free software; you can redistribute it and/or
266
5
 * modify it under the terms of version 3 of the GNU Lesser General Public
5
 * modify it under the terms of version 3 of the GNU Lesser General Public
267
@@ -19,10 +19,7 @@
268
19
#ifndef DOWNLOADER_LIB_APP_METATYPES_H
19
#ifndef DOWNLOADER_LIB_APP_METATYPES_H
269
20
#define DOWNLOADER_LIB_APP_METATYPES_H
20
#define DOWNLOADER_LIB_APP_METATYPES_H
270
21
21
276
22
#include <QMap>
22
// Just include the system file so we're always up to date.
277
23
23
#include <ubuntu/download_manager/metatypes.h>
273
24
typedef QMap<QString, QString> StringMap;
274
25
275
26
Q_DECLARE_METATYPE(StringMap)
278
27
24
279
28
#endif // METATYPES_H
25
#endif // METATYPES_H
280
29
26
281
=== modified file 'qml/Dash/Previews/PreviewProgress.qml'
282
--- qml/Dash/Previews/PreviewProgress.qml	2015-07-15 15:07:19 +0000
283
+++ qml/Dash/Previews/PreviewProgress.qml	2016-08-08 16:52:11 +0000
284
@@ -1,5 +1,5 @@
285
1
/*
1
/*
287
2
 * Copyright (C) 2014 Canonical, Ltd.
2
 * Copyright (C) 2014-2016 Canonical, Ltd.
288
3
 *
3
 *
289
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
290
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
291
@@ -59,6 +59,10 @@
292
59
                }
59
                }
293
60
            }
60
            }
294
61
61
295
62
            onProcessing: {
296
63
                progressBar.indeterminate = true;
297
64
            }
298
65
299
62
            onFinished: {
66
            onFinished: {
300
63
                root.triggered(widgetId, "finished", widgetData)
67
                root.triggered(widgetId, "finished", widgetData)
301
64
            }
68
            }
302
65
69
303
=== modified file 'qml/Stages/TabletStage.qml'
304
--- qml/Stages/TabletStage.qml	2016-07-12 09:43:50 +0000
305
+++ qml/Stages/TabletStage.qml	2016-08-08 16:52:11 +0000
306
@@ -542,7 +542,7 @@
307
542
            if (!app) {
542
            if (!app) {
308
543
                return index;
543
                return index;
309
544
            }
544
            }
311
545
            var stage = spreadRepeater.itemAt(index) ? spreadRepeater.itemAt(index).stage : app.stage;
545
            var stage = spreadRepeater.itemAt(index) ? spreadRepeater.itemAt(index).stage : ApplicationInfoInterface.MainStage;
312
546
546
313
547
            // don't shuffle indexes greater than "actives or next"
547
            // don't shuffle indexes greater than "actives or next"
314
548
            if (index > 2) return index;
548
            if (index > 2) return index;
315
549
549
316
=== modified file 'tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cpp'
317
--- tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cpp	2013-09-25 19:58:58 +0000
318
+++ tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cpp	2016-08-08 16:52:11 +0000
319
@@ -1,5 +1,5 @@
320
1
/*
1
/*
322
2
 * Copyright (C) 2013 - Canonical Ltd.
2
 * Copyright (C) 2013-2016 Canonical Ltd.
323
3
 *
3
 *
324
4
 * This program is free software: you can redistribute it and/or modify it
4
 * This program is free software: you can redistribute it and/or modify it
325
5
 * under the terms of the GNU Lesser General Public License, as
5
 * under the terms of the GNU Lesser General Public License, as
326
@@ -67,6 +67,8 @@
327
67
            Q_EMIT finished("downloadComplete");
67
            Q_EMIT finished("downloadComplete");
328
68
        }else if(m_dbusPath == "error") {
68
        }else if(m_dbusPath == "error") {
329
69
            Q_EMIT error("DOWNLOAD ERROR");
69
            Q_EMIT error("DOWNLOAD ERROR");
330
70
        }else if(m_dbusPath == "processing") {
331
71
            Q_EMIT processing(m_dbusPath);
332
70
        }
72
        }
333
71
    }
73
    }
334
72
}
74
}
335
73
75
336
=== modified file 'tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.h'
337
--- tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.h	2013-08-13 08:50:50 +0000
338
+++ tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.h	2016-08-08 16:52:11 +0000
339
@@ -1,5 +1,5 @@
340
1
/*
1
/*
342
2
 * Copyright (C) 2013 - Canonical Ltd.
2
 * Copyright (C) 2013-2016 Canonical Ltd.
343
3
 *
3
 *
344
4
 * This program is free software: you can redistribute it and/or modify it
4
 * This program is free software: you can redistribute it and/or modify it
345
5
 * under the terms of the GNU Lesser General Public License, as
5
 * under the terms of the GNU Lesser General Public License, as
346
@@ -51,6 +51,7 @@
347
51
    void error(const QString &error);
51
    void error(const QString &error);
348
52
    void finished(const QString &path);
52
    void finished(const QString &path);
349
53
    void paused(bool success);
53
    void paused(bool success);
350
54
    void processing(const QString &path);
351
54
    void progress(qulonglong received, qulonglong total);
55
    void progress(qulonglong received, qulonglong total);
352
55
    void resumed(bool success);
56
    void resumed(bool success);
353
56
    void started(bool success);
57
    void started(bool success);
354
57
58
355
=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.cpp'
356
--- tests/mocks/Unity/Application/ApplicationInfo.cpp	2016-06-06 14:13:05 +0000
357
+++ tests/mocks/Unity/Application/ApplicationInfo.cpp	2016-08-08 16:52:11 +0000
358
@@ -175,14 +175,6 @@
359
175
    }
175
    }
360
176
}
176
}
361
177
177
362
178
void ApplicationInfo::setStage(Stage value)
363
179
{
364
180
    if (value != m_stage) {
365
181
        m_stage = value;
366
182
        Q_EMIT stageChanged(value);
367
183
    }
368
184
}
369
185
370
186
void ApplicationInfo::setState(State value)
178
void ApplicationInfo::setState(State value)
371
187
{
179
{
372
188
    if (value != m_state) {
180
    if (value != m_state) {
373
189
181
374
=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.h'
375
--- tests/mocks/Unity/Application/ApplicationInfo.h	2016-06-03 11:11:34 +0000
376
+++ tests/mocks/Unity/Application/ApplicationInfo.h	2016-08-08 16:52:11 +0000
377
@@ -67,9 +67,6 @@
378
67
67
379
68
    QUrl icon() const override { return m_icon; }
68
    QUrl icon() const override { return m_icon; }
380
69
69
381
70
    Q_INVOKABLE void setStage(Stage value) override; // invokable only for mock
382
71
    Stage stage() const override { return m_stage; }
383
72
384
73
    Q_INVOKABLE void setState(State value);
70
    Q_INVOKABLE void setState(State value);
385
74
    State state() const override { return m_state; }
71
    State state() const override { return m_state; }
386
75
72
387
@@ -137,7 +134,6 @@
388
137
    QString m_appId;
134
    QString m_appId;
389
138
    QString m_name;
135
    QString m_name;
390
139
    QUrl m_icon;
136
    QUrl m_icon;
391
140
    Stage m_stage{MainStage};
392
141
    State m_state{Stopped};
137
    State m_state{Stopped};
393
142
    bool m_fullscreen{false};
138
    bool m_fullscreen{false};
394
143
    Qt::ScreenOrientations m_supportedOrientations{Qt::PortraitOrientation |
139
    Qt::ScreenOrientations m_supportedOrientations{Qt::PortraitOrientation |
395
144
140
396
=== modified file 'tests/mocks/Unity/Application/ApplicationManager.cpp'
397
--- tests/mocks/Unity/Application/ApplicationManager.cpp	2016-06-20 11:53:35 +0000
398
+++ tests/mocks/Unity/Application/ApplicationManager.cpp	2016-08-08 16:52:11 +0000
399
@@ -102,8 +102,6 @@
400
102
        return app->comment();
102
        return app->comment();
401
103
    case RoleIcon:
103
    case RoleIcon:
402
104
        return app->icon();
104
        return app->icon();
403
105
    case RoleStage:
404
106
        return app->stage();
405
107
    case RoleState:
105
    case RoleState:
406
108
        return app->state();
106
        return app->state();
407
109
    case RoleFocused:
107
    case RoleFocused:
408
@@ -166,11 +164,6 @@
409
166
        if (!appIndex.isValid()) return;
164
        if (!appIndex.isValid()) return;
410
167
        Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << ApplicationManager::RoleState);
165
        Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << ApplicationManager::RoleState);
411
168
    });
166
    });
412
169
    connect(application, &ApplicationInfo::stageChanged, this, [application, this]() {
413
170
        QModelIndex appIndex = findIndex(application);
414
171
        if (!appIndex.isValid()) return;
415
172
        Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << ApplicationManager::RoleStage);
416
173
    });
417
174
167
418
175
    connect(application, &ApplicationInfo::closed, this, [application, this]() {
168
    connect(application, &ApplicationInfo::closed, this, [application, this]() {
419
176
        this->remove(application);
169
        this->remove(application);
420
@@ -344,7 +337,6 @@
421
344
    application->setScreenshotId("gallery");
337
    application->setScreenshotId("gallery");
422
345
    application->setIconId("gallery");
338
    application->setIconId("gallery");
423
346
    application->setShellChrome(Mir::LowChrome);
339
    application->setShellChrome(Mir::LowChrome);
424
347
    application->setStage(ApplicationInfo::MainStage);
425
348
    m_availableApplications.append(application);
340
    m_availableApplications.append(application);
426
349
341
427
350
    application = new ApplicationInfo(this);
342
    application = new ApplicationInfo(this);
428
@@ -381,7 +373,6 @@
429
381
    application->setName("GMail");
373
    application->setName("GMail");
430
382
    application->setIconId("gmail");
374
    application->setIconId("gmail");
431
383
    application->setScreenshotId("gmail-webapp.svg");
375
    application->setScreenshotId("gmail-webapp.svg");
432
384
    application->setStage(ApplicationInfo::MainStage);
433
385
    application->setSupportedOrientations(Qt::PortraitOrientation
376
    application->setSupportedOrientations(Qt::PortraitOrientation
434
386
                                        | Qt::LandscapeOrientation
377
                                        | Qt::LandscapeOrientation
435
387
                                        | Qt::InvertedPortraitOrientation
378
                                        | Qt::InvertedPortraitOrientation
436
@@ -393,7 +384,6 @@
437
393
    application->setName("Music");
384
    application->setName("Music");
438
394
    application->setIconId("soundcloud");
385
    application->setIconId("soundcloud");
439
395
    application->setScreenshotId("music");
386
    application->setScreenshotId("music");
440
396
    application->setStage(ApplicationInfo::MainStage);
441
397
    application->setSupportedOrientations(Qt::PortraitOrientation
387
    application->setSupportedOrientations(Qt::PortraitOrientation
442
398
                                        | Qt::LandscapeOrientation
388
                                        | Qt::LandscapeOrientation
443
399
                                        | Qt::InvertedPortraitOrientation
389
                                        | Qt::InvertedPortraitOrientation
444
400
390
445
=== modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
446
--- tests/plugins/Unity/Launcher/launchermodeltest.cpp	2016-07-07 16:18:59 +0000
447
+++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2016-08-08 16:52:11 +0000
448
@@ -49,8 +49,6 @@
449
49
    QString name() const override { return "mock"; }
49
    QString name() const override { return "mock"; }
450
50
    QString comment() const override { return "this is a mock"; }
50
    QString comment() const override { return "this is a mock"; }
451
51
    QUrl icon() const override { return QUrl(); }
51
    QUrl icon() const override { return QUrl(); }
452
52
    ApplicationInfoInterface::Stage stage() const override { return ApplicationInfoInterface::MainStage; }
453
53
    void setStage(ApplicationInfoInterface::Stage) override {}
454
54
    ApplicationInfoInterface::State state() const override { return ApplicationInfoInterface::Running; }
52
    ApplicationInfoInterface::State state() const override { return ApplicationInfoInterface::Running; }
455
55
    bool focused() const override { return m_focused; }
53
    bool focused() const override { return m_focused; }
456
56
    QString splashTitle() const override { return QString(); }
54
    QString splashTitle() const override { return QString(); }
457
57
55
458
=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewProgress.qml'
459
--- tests/qmltests/Dash/Previews/tst_PreviewProgress.qml	2015-07-15 15:07:19 +0000
460
+++ tests/qmltests/Dash/Previews/tst_PreviewProgress.qml	2016-08-08 16:52:11 +0000
461
@@ -1,5 +1,5 @@
462
1
/*
1
/*
464
2
 * Copyright 2014 Canonical Ltd.
2
 * Copyright 2014-2016 Canonical Ltd.
465
3
 *
3
 *
466
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
467
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
468
@@ -40,6 +40,11 @@
469
40
        "source": { "dbus-name" : "somename", "dbus-object": "error" }
40
        "source": { "dbus-name" : "somename", "dbus-object": "error" }
470
41
    }
41
    }
471
42
42
472
43
    property var progressjsonProcessing: {
473
44
        "type": "progress",
474
45
        "source": { "dbus-name" : "somename", "dbus-object": "processing" }
475
46
    }
476
47
477
43
    SignalSpy {
48
    SignalSpy {
478
44
        id: spy
49
        id: spy
479
45
        signalName: "triggered"
50
        signalName: "triggered"
480
@@ -82,6 +87,14 @@
481
82
            compare(args[0], "previewProgress");
87
            compare(args[0], "previewProgress");
482
83
            compare(args[1], "failed");
88
            compare(args[1], "failed");
483
84
            compare(args[2], progressjsonError);
89
            compare(args[2], progressjsonError);
484
90
485
91
            spy.clear();
486
92
487
93
            var progressBar = findChild(previewProgress, "progressBar");
488
94
            compare(progressBar.indeterminate, false);
489
95
            previewProgress.widgetData = progressjsonProcessing;
490
96
            progressBar = findChild(previewProgress, "progressBar");
491
97
            tryCompare(progressBar, "indeterminate", true);
492
85
        }
98
        }
493
86
    }
99
    }
494
87
}
100
}
495
88
101
496
=== modified file 'tests/qmltests/Stages/tst_TabletStage.qml'
497
--- tests/qmltests/Stages/tst_TabletStage.qml	2016-06-22 13:42:30 +0000
498
+++ tests/qmltests/Stages/tst_TabletStage.qml	2016-08-08 16:52:11 +0000
499
@@ -290,8 +290,9 @@
500
290
            var webbrowserSurfaceId = topSurfaceList.nextId;
290
            var webbrowserSurfaceId = topSurfaceList.nextId;
501
291
            webbrowserCheckBox.checked = true;
291
            webbrowserCheckBox.checked = true;
502
292
            waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
292
            waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
505
293
            var webbrowserApp = ApplicationManager.findApplication(webbrowserCheckBox.appId);
293
            var webbrowserDelegate = findChild(tabletStage, "spreadDelegate_" + webbrowserSurfaceId);
506
294
            compare(webbrowserApp.stage, ApplicationInfoInterface.MainStage);
294
            verify(webbrowserDelegate);
507
295
            compare(webbrowserDelegate.stage, ApplicationInfoInterface.MainStage);
508
295
            var webbrowserWindow = findAppWindowForSurfaceId(webbrowserSurfaceId);
296
            var webbrowserWindow = findAppWindowForSurfaceId(webbrowserSurfaceId);
509
296
            verify(webbrowserWindow);
297
            verify(webbrowserWindow);
510
297
298
511
@@ -397,8 +398,10 @@
512
397
            var webbrowserSurfaceId = topSurfaceList.nextId;
398
            var webbrowserSurfaceId = topSurfaceList.nextId;
513
398
            webbrowserCheckBox.checked = true;
399
            webbrowserCheckBox.checked = true;
514
399
            waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
400
            waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
515
401
            var webbrowserDelegate = findChild(tabletStage, "spreadDelegate_" + webbrowserSurfaceId);
516
402
            verify(webbrowserDelegate);
517
403
            compare(webbrowserDelegate.stage, ApplicationInfoInterface.MainStage);
518
400
            var webbrowserApp = ApplicationManager.findApplication(webbrowserCheckBox.appId);
404
            var webbrowserApp = ApplicationManager.findApplication(webbrowserCheckBox.appId);
519
401
            compare(webbrowserApp.stage, ApplicationInfoInterface.MainStage);
520
402
405
521
403
            var gallerySurfaceId = topSurfaceList.nextId;
406
            var gallerySurfaceId = topSurfaceList.nextId;
522
404
            galleryCheckBox.checked = true;
407
            galleryCheckBox.checked = true;
523
405
408
524
=== modified file 'tests/qmltests/tst_OrientedShell.qml'
525
--- tests/qmltests/tst_OrientedShell.qml	2016-07-29 20:25:09 +0000
526
+++ tests/qmltests/tst_OrientedShell.qml	2016-08-08 16:52:11 +0000
527
@@ -515,7 +515,6 @@
528
515
            compare(primaryDelegate.focus, true);
515
            compare(primaryDelegate.focus, true);
529
516
            compare(primaryApp.rotatesWindowContents, false);
516
            compare(primaryApp.rotatesWindowContents, false);
530
517
            compare(primaryApp.supportedOrientations, Qt.PrimaryOrientation);
517
            compare(primaryApp.supportedOrientations, Qt.PrimaryOrientation);
531
518
            compare(primaryApp.stage, ApplicationInfoInterface.MainStage);
532
519
518
533
520
            tryCompareFunction(function(){return primaryDelegate.surface != null;}, true);
519
            tryCompareFunction(function(){return primaryDelegate.surface != null;}, true);
534
521
            verify(checkAppSurfaceOrientation(primaryAppWindow, primaryApp, root.primaryOrientationAngle));
520
            verify(checkAppSurfaceOrientation(primaryAppWindow, primaryApp, root.primaryOrientationAngle));
535
@@ -559,7 +558,8 @@
536
559
            compare(ApplicationManager.focusedApplicationId, "primary-oriented-app");
558
            compare(ApplicationManager.focusedApplicationId, "primary-oriented-app");
537
560
            compare(primaryApp.rotatesWindowContents, false);
559
            compare(primaryApp.rotatesWindowContents, false);
538
561
            compare(primaryApp.supportedOrientations, Qt.PrimaryOrientation);
560
            compare(primaryApp.supportedOrientations, Qt.PrimaryOrientation);
540
562
            compare(primaryApp.stage, ApplicationInfoInterface.MainStage);
561
            var primaryDelegate = findChild(shell, "spreadDelegate_" + primarySurfaceId);
541
562
            compare(primaryDelegate.stage, ApplicationInfoInterface.MainStage);
542
563
563
543
564
            tryCompareFunction(function(){return primaryApp.surfaceList.count > 0;}, true);
564
            tryCompareFunction(function(){return primaryApp.surfaceList.count > 0;}, true);
544
565
565
545
@@ -599,7 +599,6 @@
546
599
            compare(gmailApp.rotatesWindowContents, false);
599
            compare(gmailApp.rotatesWindowContents, false);
547
600
            compare(gmailApp.supportedOrientations, Qt.PortraitOrientation | Qt.LandscapeOrientation
600
            compare(gmailApp.supportedOrientations, Qt.PortraitOrientation | Qt.LandscapeOrientation
548
601
                    | Qt.InvertedPortraitOrientation | Qt.InvertedLandscapeOrientation);
601
                    | Qt.InvertedPortraitOrientation | Qt.InvertedLandscapeOrientation);
549
602
            compare(gmailApp.stage, ApplicationInfoInterface.MainStage);
550
603
602
551
604
            // wait until it's able to rotate
603
            // wait until it's able to rotate
552
605
            tryCompare(shell, "orientationChangesEnabled", true);
604
            tryCompare(shell, "orientationChangesEnabled", true);
553
@@ -724,7 +723,6 @@
554
724
            compare(gmailApp.rotatesWindowContents, false);
723
            compare(gmailApp.rotatesWindowContents, false);
555
725
            compare(gmailApp.supportedOrientations, Qt.PortraitOrientation | Qt.LandscapeOrientation
724
            compare(gmailApp.supportedOrientations, Qt.PortraitOrientation | Qt.LandscapeOrientation
556
726
                    | Qt.InvertedPortraitOrientation | Qt.InvertedLandscapeOrientation);
725
                    | Qt.InvertedPortraitOrientation | Qt.InvertedLandscapeOrientation);
557
727
            compare(gmailApp.stage, ApplicationInfoInterface.MainStage);
558
728
726
559
729
            waitUntilAppWindowIsFullyLoaded(gmailSurfaceId);
727
            waitUntilAppWindowIsFullyLoaded(gmailSurfaceId);
560
730
728
561
@@ -736,7 +734,10 @@
562
736
            compare(musicApp.rotatesWindowContents, false);
734
            compare(musicApp.rotatesWindowContents, false);
563
737
            compare(musicApp.supportedOrientations, Qt.PortraitOrientation | Qt.LandscapeOrientation
735
            compare(musicApp.supportedOrientations, Qt.PortraitOrientation | Qt.LandscapeOrientation
564
738
                    | Qt.InvertedPortraitOrientation | Qt.InvertedLandscapeOrientation);
736
                    | Qt.InvertedPortraitOrientation | Qt.InvertedLandscapeOrientation);
566
739
            compare(musicApp.stage, ApplicationInfoInterface.MainStage);
737
            if (data.deviceName === "manta" || data.deviceName === "flo") {
567
738
                var musicDelegate = findChild(shell, "spreadDelegate_" + musicSurfaceId);
568
739
                compare(musicDelegate.stage, ApplicationInfoInterface.MainStage);
569
740
            }
570
740
741
571
741
            waitUntilAppWindowIsFullyLoaded(musicSurfaceId);
742
            waitUntilAppWindowIsFullyLoaded(musicSurfaceId);
572
742
            tryCompare(shell, "orientationChangesEnabled", true);
743
            tryCompare(shell, "orientationChangesEnabled", true);
573
@@ -889,6 +890,7 @@
574
889
            ];
890
            ];
575
890
        }
891
        }
576
891
        function test_appInSideStageDoesntRotateOnStartUp(data) {
892
        function test_appInSideStageDoesntRotateOnStartUp(data) {
577
893
            WindowStateStorage.saveStage("twitter-webapp", ApplicationInfoInterface.SideStage)
578
892
            loadShell(data.deviceName);
894
            loadShell(data.deviceName);
579
893
895
580
894
            var twitterDelegate = null;
896
            var twitterDelegate = null;
581
@@ -905,9 +907,11 @@
582
905
            signalSpy.target = null;
907
            signalSpy.target = null;
583
906
            signalSpy.signalName = "runningChanged";
908
            signalSpy.signalName = "runningChanged";
584
907
909
585
910
            var twitterSurfaceId = topLevelSurfaceList.nextId;
586
908
            var twitterApp = ApplicationManager.startApplication("twitter-webapp");
911
            var twitterApp = ApplicationManager.startApplication("twitter-webapp");
587
909
            verify(twitterApp);
912
            verify(twitterApp);
589
910
            twitterApp.stage = ApplicationInfoInterface.SideStage;
913
            var twitterDelegate = findChild(shell, "spreadDelegate_" + twitterSurfaceId);
590
914
            compare(twitterDelegate.stage, ApplicationInfoInterface.SideStage);
591
911
915
592
912
            // ensure the mock twitter-webapp is as we expect
916
            // ensure the mock twitter-webapp is as we expect
593
913
            compare(twitterApp.rotatesWindowContents, false);
917
            compare(twitterApp.rotatesWindowContents, false);
594
914
918
595
=== modified file 'tests/qmltests/tst_Shell.qml'
596
--- tests/qmltests/tst_Shell.qml	2016-08-03 15:53:36 +0000
597
+++ tests/qmltests/tst_Shell.qml	2016-08-08 16:52:11 +0000
598
@@ -2103,8 +2103,13 @@
599
2103
            waitUntilAppWindowIsFullyLoaded(app2SurfaceId);
2103
            waitUntilAppWindowIsFullyLoaded(app2SurfaceId);
600
2104
2104
601
2105
            // Sanity checking
2105
            // Sanity checking
604
2106
            compare(app1.stage, ApplicationInfoInterface.MainStage);
2106
            if (data.usageScenario === "tablet") {
605
2107
            compare(app2.stage, ApplicationInfoInterface.MainStage);
2107
                var app1Delegate = findChild(shell, "spreadDelegate_" + app1SurfaceId);
606
2108
                compare(app1Delegate.stage, ApplicationInfoInterface.MainStage);
607
2109
608
2110
                var app2Delegate = findChild(shell, "spreadDelegate_" + app2SurfaceId);
609
2111
                compare(app2Delegate.stage, ApplicationInfoInterface.MainStage);
610
2112
            }
611
2108
            verify(!app1.isTouchApp);
2113
            verify(!app1.isTouchApp);
612
2109
2114
613
2110
            var app1Surface = app1.surfaceList.get(0);
2115
            var app1Surface = app1.surfaceList.get(0);
614
@@ -2139,8 +2144,13 @@
615
2139
            waitUntilAppWindowIsFullyLoaded(app2SurfaceId);
2144
            waitUntilAppWindowIsFullyLoaded(app2SurfaceId);
616
2140
2145
617
2141
            // Sanity checking
2146
            // Sanity checking
620
2142
            compare(app1.stage, ApplicationInfoInterface.MainStage);
2147
            if (data.usageScenario === "tablet") {
621
2143
            compare(app2.stage, ApplicationInfoInterface.MainStage);
2148
                var app1Delegate = findChild(shell, "spreadDelegate_" + app1SurfaceId);
622
2149
                compare(app1Delegate.stage, ApplicationInfoInterface.MainStage);
623
2150
624
2151
                var app2Delegate = findChild(shell, "spreadDelegate_" + app2SurfaceId);
625
2152
                compare(app2Delegate.stage, ApplicationInfoInterface.MainStage);
626
2153
            }
627
2144
2154
628
2145
            var app1Surface = app1.surfaceList.get(0);
2155
            var app1Surface = app1.surfaceList.get(0);
629
2146
            verify(app1Surface);
2156
            verify(app1Surface);
Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)		2016-07-14	Approve on 2016-08-08
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-07-29
Ubuntu Unity PS integration team	packaging	2016-07-22	Pending
Review via email: mp+300123@code.launchpad.net