1
=== modified file 'debian/unity8-private.install'
2
--- debian/unity8-private.install	2015-04-21 15:22:53 +0000
3
+++ debian/unity8-private.install	2015-06-30 11:41:39 +0000
4
@@ -8,6 +8,7 @@
5
8
usr/lib/*/unity8/qml/Powerd
8
usr/lib/*/unity8/qml/Powerd
6
9
usr/lib/*/unity8/qml/ScreenGrabber
9
usr/lib/*/unity8/qml/ScreenGrabber
7
10
usr/lib/*/unity8/qml/SessionBroadcast
10
usr/lib/*/unity8/qml/SessionBroadcast
8
11
usr/lib/*/unity8/qml/SessionGrabber
9
11
usr/lib/*/unity8/qml/Ubuntu
12
usr/lib/*/unity8/qml/Ubuntu
10
12
usr/lib/*/unity8/qml/Unity
13
usr/lib/*/unity8/qml/Unity
11
13
usr/lib/*/unity8/qml/Utils
14
usr/lib/*/unity8/qml/Utils
12
14
15
13
=== modified file 'plugins/CMakeLists.txt'
14
--- plugins/CMakeLists.txt	2014-12-12 10:00:31 +0000
15
+++ plugins/CMakeLists.txt	2015-06-30 11:41:39 +0000
16
@@ -18,6 +18,7 @@
17
18
add_subdirectory(Dash)
18
add_subdirectory(Dash)
18
19
add_subdirectory(Powerd)
19
add_subdirectory(Powerd)
19
20
add_subdirectory(SessionBroadcast)
20
add_subdirectory(SessionBroadcast)
20
21
add_subdirectory(SessionGrabber)
21
21
add_subdirectory(ScreenGrabber)
22
add_subdirectory(ScreenGrabber)
22
22
add_subdirectory(Ubuntu)
23
add_subdirectory(Ubuntu)
23
23
add_subdirectory(Unity)
24
add_subdirectory(Unity)
24
24
25
25
=== added directory 'plugins/SessionGrabber'
26
=== added file 'plugins/SessionGrabber/CMakeLists.txt'
27
--- plugins/SessionGrabber/CMakeLists.txt	1970-01-01 00:00:00 +0000
28
+++ plugins/SessionGrabber/CMakeLists.txt	2015-06-30 11:41:39 +0000
29
@@ -0,0 +1,8 @@
30
1
include_directories(
31
2
  ${CMAKE_CURRENT_BINARY_DIR}
32
3
)
33
4
34
5
add_library(SessionGrabber-qml MODULE sessiongrabber.cpp plugin.cpp)
35
6
qt5_use_modules(SessionGrabber-qml Qml Gui Quick Concurrent)
36
7
37
8
add_unity8_plugin(SessionGrabber 0.1 SessionGrabber TARGETS SessionGrabber-qml)
38
0
9
39
=== added file 'plugins/SessionGrabber/SessionGrabber.qmltypes'
40
--- plugins/SessionGrabber/SessionGrabber.qmltypes	1970-01-01 00:00:00 +0000
41
+++ plugins/SessionGrabber/SessionGrabber.qmltypes	2015-06-30 11:41:39 +0000
42
@@ -0,0 +1,23 @@
43
1
import QtQuick.tooling 1.1
44
2
45
3
// This file describes the plugin-supplied types contained in the library.
46
4
// It is used for QML tooling purposes only.
47
5
//
48
6
// This file was auto-generated by:
49
7
// 'qmlplugindump -notrelocatable SessionGrabber 0.1 plugins'
50
8
51
9
Module {
52
10
    Component {
53
11
        name: "SessionGrabber"
54
12
        prototype: "QObject"
55
13
        exports: ["SessionGrabber/SessionGrabber 0.1"]
56
14
        exportMetaObjectRevisions: [0]
57
15
        Property { name: "appId"; type: "string" }
58
16
        Property { name: "path"; type: "string"; isReadonly: true }
59
17
        Property { name: "target"; type: "QQuickItem"; isPointer: true }
60
18
        Signal { name: "appIdChanged" }
61
19
        Signal { name: "screenshotTaken" }
62
20
        Method { name: "take" }
63
21
        Method { name: "removeScreenshot" }
64
22
    }
65
23
}
66
0
24
67
=== added file 'plugins/SessionGrabber/plugin.cpp'
68
--- plugins/SessionGrabber/plugin.cpp	1970-01-01 00:00:00 +0000
69
+++ plugins/SessionGrabber/plugin.cpp	2015-06-30 11:41:39 +0000
70
@@ -0,0 +1,27 @@
71
1
/*
72
2
 * Copyright (C) 2015 Canonical, Ltd.
73
3
 *
74
4
 * This program is free software; you can redistribute it and/or modify
75
5
 * it under the terms of the GNU General Public License as published by
76
6
 * the Free Software Foundation; version 3.
77
7
 *
78
8
 * This program is distributed in the hope that it will be useful,
79
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
80
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
81
11
 * GNU General Public License for more details.
82
12
 *
83
13
 * You should have received a copy of the GNU General Public License
84
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
85
15
 *
86
16
 */
87
17
88
18
#include "plugin.h"
89
19
#include "sessiongrabber.h"
90
20
91
21
#include <QtQml/qqml.h>
92
22
93
23
void SessionGrabberPlugin::registerTypes(const char *uri)
94
24
{
95
25
    Q_ASSERT(uri == QLatin1String("SessionGrabber"));
96
26
    qmlRegisterType<SessionGrabber>(uri, 0, 1, "SessionGrabber");
97
27
}
98
0
28
99
=== added file 'plugins/SessionGrabber/plugin.h'
100
--- plugins/SessionGrabber/plugin.h	1970-01-01 00:00:00 +0000
101
+++ plugins/SessionGrabber/plugin.h	2015-06-30 11:41:39 +0000
102
@@ -0,0 +1,32 @@
103
1
/*
104
2
 * Copyright (C) 2015 Canonical, Ltd.
105
3
 *
106
4
 * This program is free software; you can redistribute it and/or modify
107
5
 * it under the terms of the GNU General Public License as published by
108
6
 * the Free Software Foundation; version 3.
109
7
 *
110
8
 * This program is distributed in the hope that it will be useful,
111
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
112
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
113
11
 * GNU General Public License for more details.
114
12
 *
115
13
 * You should have received a copy of the GNU General Public License
116
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
117
15
 *
118
16
 */
119
17
120
18
#ifndef SESSIONGRABBER_PLUGIN_H
121
19
#define SESSIONGRABBER_PLUGIN_H
122
20
123
21
#include <QtQml/QQmlExtensionPlugin>
124
22
125
23
class SessionGrabberPlugin : public QQmlExtensionPlugin
126
24
{
127
25
    Q_OBJECT
128
26
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
129
27
130
28
public:
131
29
    void registerTypes(const char *uri);
132
30
};
133
31
134
32
#endif
135
0
33
136
=== added file 'plugins/SessionGrabber/qmldir'
137
--- plugins/SessionGrabber/qmldir	1970-01-01 00:00:00 +0000
138
+++ plugins/SessionGrabber/qmldir	2015-06-30 11:41:39 +0000
139
@@ -0,0 +1,3 @@
140
1
module SessionGrabber
141
2
plugin SessionGrabber-qml
142
3
typeinfo SessionGrabber.qmltypes
143
0
4
144
=== added file 'plugins/SessionGrabber/sessiongrabber.cpp'
145
--- plugins/SessionGrabber/sessiongrabber.cpp	1970-01-01 00:00:00 +0000
146
+++ plugins/SessionGrabber/sessiongrabber.cpp	2015-06-30 11:41:39 +0000
147
@@ -0,0 +1,135 @@
148
1
/*
149
2
 * Copyright (C) 2015 Canonical, Ltd.
150
3
 *
151
4
 * This program is free software; you can redistribute it and/or modify
152
5
 * it under the terms of the GNU General Public License as published by
153
6
 * the Free Software Foundation; version 3.
154
7
 *
155
8
 * This program is distributed in the hope that it will be useful,
156
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
157
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
158
11
 * GNU General Public License for more details.
159
12
 *
160
13
 * You should have received a copy of the GNU General Public License
161
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
162
15
 *
163
16
 */
164
17
165
18
#include "sessiongrabber.h"
166
19
167
20
#include <QDebug>
168
21
#include <QQuickItem>
169
22
#include <QQuickItemGrabResult>
170
23
#include <QtConcurrent>
171
24
172
25
static QString cacheFolder()
173
26
{
174
27
    return QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/app_shots/";
175
28
}
176
29
177
30
static QString cachePath(const QString &appId)
178
31
{
179
32
    return cacheFolder() + appId + ".png";
180
33
}
181
34
182
35
SessionGrabber::SessionGrabber(QObject *parent)
183
36
    : QObject(parent)
184
37
    , m_target(nullptr)
185
38
    , m_watcher(nullptr)
186
39
{
187
40
}
188
41
189
42
QString SessionGrabber::appId() const
190
43
{
191
44
    return m_appId;
192
45
}
193
46
194
47
void SessionGrabber::setAppId(const QString &appId)
195
48
{
196
49
    if (appId != m_appId) {
197
50
        m_appId = appId;
198
51
        const QString path = cachePath(appId);
199
52
        if (QFile::exists(path)) {
200
53
            setPath(path);
201
54
        }
202
55
    }
203
56
}
204
57
205
58
QQuickItem *SessionGrabber::target() const
206
59
{
207
60
    return m_target;
208
61
}
209
62
210
63
void SessionGrabber::setTarget(QQuickItem *target)
211
64
{
212
65
    if (target != m_target) {
213
66
        m_target = target;
214
67
        Q_EMIT targetChanged();
215
68
    }
216
69
}
217
70
218
71
QString SessionGrabber::path() const
219
72
{
220
73
    return m_path;
221
74
}
222
75
223
76
void SessionGrabber::setPath(const QString &path)
224
77
{
225
78
    if (path != m_path) {
226
79
        m_path = path;
227
80
        Q_EMIT pathChanged();
228
81
    }
229
82
}
230
83
231
84
static QString saveScreenshot(const QString &appId, const QSharedPointer<QQuickItemGrabResult> grabResult)
232
85
{
233
86
    const QImage image = grabResult->image();
234
87
    const QString cPath = cacheFolder();
235
88
    QDir d;
236
89
    d.mkpath(cPath);
237
90
    const QString path = cachePath(appId);
238
91
    if (image.save(path)) {
239
92
        return path;
240
93
    } else {
241
94
        return QString();
242
95
    }
243
96
}
244
97
245
98
void SessionGrabber::grab()
246
99
{
247
100
    if (!m_grabResult.isNull()) {
248
101
        qWarning() << "Asked to grab a screenshot when there's one already being grabbed, ignoring";
249
102
        return;
250
103
    }
251
104
252
105
    if (m_target && !m_appId.isEmpty()) {
253
106
        // grabToImage runs in a separate thread
254
107
        m_grabResult = m_target->grabToImage();
255
108
        connect(m_grabResult.data(), &QQuickItemGrabResult::ready, this, &SessionGrabber::grabReady);
256
109
    } else {
257
110
        qWarning() << "Can't grab screnshot: appId:" << m_appId << " target:" << m_target;
258
111
    }
259
112
}
260
113
261
114
void SessionGrabber::removeScreenshot()
262
115
{
263
116
    const QString path = cachePath(m_appId);
264
117
    QFile::remove(path);
265
118
}
266
119
267
120
void SessionGrabber::grabReady()
268
121
{
269
122
    QFuture<QString> f = QtConcurrent::run(saveScreenshot, m_appId, m_grabResult);
270
123
    m_watcher = new QFutureWatcher<QString>(this);
271
124
    m_watcher->setFuture(f);
272
125
    connect(m_watcher, &QFutureWatcher<QString>::finished, this, &SessionGrabber::saveFinished);
273
126
}
274
127
275
128
void SessionGrabber::saveFinished()
276
129
{
277
130
    setPath(m_watcher->future().result());
278
131
    delete m_watcher;
279
132
    m_watcher = nullptr;
280
133
    m_grabResult.clear();
281
134
    Q_EMIT screenshotGrabbed();
282
135
}
283
0
136
284
=== added file 'plugins/SessionGrabber/sessiongrabber.h'
285
--- plugins/SessionGrabber/sessiongrabber.h	1970-01-01 00:00:00 +0000
286
+++ plugins/SessionGrabber/sessiongrabber.h	2015-06-30 11:41:39 +0000
287
@@ -0,0 +1,85 @@
288
1
/*
289
2
 * Copyright (C) 2015 Canonical, Ltd.
290
3
 *
291
4
 * This program is free software; you can redistribute it and/or modify
292
5
 * it under the terms of the GNU General Public License as published by
293
6
 * the Free Software Foundation; version 3.
294
7
 *
295
8
 * This program is distributed in the hope that it will be useful,
296
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
297
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
298
11
 * GNU General Public License for more details.
299
12
 *
300
13
 * You should have received a copy of the GNU General Public License
301
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
302
15
 *
303
16
 */
304
17
305
18
#ifndef SESSIONGRABBER_H
306
19
#define SESSIONGRABBER_H
307
20
308
21
#include <QObject>
309
22
#include <QSharedPointer>
310
23
#include <QFutureWatcher>
311
24
312
25
class QQuickItem;
313
26
class QQuickItemGrabResult;
314
27
315
28
/**
316
29
 * SessionGrabber saves to disk screenshots of the given item.
317
30
 * Images are saved into $HOME/.cache/app_shots/appId.png
318
31
 * It also handles giving back the screenshot path if it already exists (e.g. because a reboot)
319
32
 */
320
33
class SessionGrabber : public QObject
321
34
{
322
35
    Q_OBJECT
323
36
324
37
    /// appId is the key of the screenshot name.
325
38
    Q_PROPERTY(QString appId READ appId WRITE setAppId NOTIFY appIdChanged)
326
39
327
40
    /// path where the screenshot is saved, can be empty if no screenshot has been grabbed yet.
328
41
    Q_PROPERTY(QString path READ path NOTIFY pathChanged)
329
42
330
43
    /// target item for the screenshot grabbing.
331
44
    Q_PROPERTY(QQuickItem *target READ target WRITE setTarget NOTIFY targetChanged)
332
45
333
46
public:
334
47
    explicit SessionGrabber(QObject *parent = 0);
335
48
336
49
    QString appId() const;
337
50
    void setAppId(const QString &appId);
338
51
339
52
    QQuickItem *target() const;
340
53
    void setTarget(QQuickItem *target);
341
54
342
55
    QString path() const;
343
56
344
57
    /// Starts grabbing a screenshot. Emits screenshotGrabbed when ready.
345
58
    Q_INVOKABLE void grab();
346
59
347
60
    /// Removes the existing screenshot
348
61
    Q_INVOKABLE void removeScreenshot();
349
62
350
63
Q_SIGNALS:
351
64
    void appIdChanged();
352
65
    void targetChanged();
353
66
    void pathChanged();
354
67
355
68
    /// Signals screenshot grabbing has finished.
356
69
    void screenshotGrabbed();
357
70
358
71
private Q_SLOTS:
359
72
    void grabReady();
360
73
    void saveFinished();
361
74
362
75
private:
363
76
    void setPath(const QString &path);
364
77
365
78
    QString m_appId;
366
79
    QString m_path;
367
80
    QQuickItem *m_target;
368
81
    QFutureWatcher<QString> *m_watcher;
369
82
    QSharedPointer<QQuickItemGrabResult> m_grabResult;
370
83
};
371
84
372
85
#endif
373
0
86
374
=== modified file 'qml/Stages/ApplicationWindow.qml'
375
--- qml/Stages/ApplicationWindow.qml	2015-04-10 15:10:51 +0000
376
+++ qml/Stages/ApplicationWindow.qml	2015-06-30 11:41:39 +0000
377
@@ -17,6 +17,7 @@
378
17
import QtQuick 2.0
17
import QtQuick 2.0
379
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.1
380
19
import Unity.Application 0.1
19
import Unity.Application 0.1
381
20
import SessionGrabber 0.1
382
20
21
383
21
FocusScope {
22
FocusScope {
384
22
    id: root
23
    id: root
385
@@ -30,11 +31,16 @@
386
30
    property QtObject application
31
    property QtObject application
387
31
    property int surfaceOrientationAngle
32
    property int surfaceOrientationAngle
388
32
33
389
34
    function removeScreenshot() {
390
35
        sessionGrabber.removeScreenshot();
391
36
    }
392
37
393
33
    QtObject {
38
    QtObject {
394
34
        id: d
39
        id: d
395
35
40
396
36
        // helpers so that we don't have to check for the existence of an application everywhere
41
        // helpers so that we don't have to check for the existence of an application everywhere
397
37
        // (in order to avoid breaking qml binding due to a javascript exception)
42
        // (in order to avoid breaking qml binding due to a javascript exception)
398
43
        readonly property string appId: root.application ? root.application.appId : ""
399
38
        readonly property string name: root.application ? root.application.name : ""
44
        readonly property string name: root.application ? root.application.name : ""
400
39
        readonly property url icon: root.application ? root.application.icon : ""
45
        readonly property url icon: root.application ? root.application.icon : ""
401
40
        readonly property int applicationState: root.application ? root.application.state : -1
46
        readonly property int applicationState: root.application ? root.application.state : -1
402
@@ -50,11 +56,11 @@
403
50
        property bool hadSurface: sessionContainer.surfaceContainer.hadSurface
56
        property bool hadSurface: sessionContainer.surfaceContainer.hadSurface
404
51
57
405
52
        property bool needToTakeScreenshot:
58
        property bool needToTakeScreenshot:
408
53
            sessionContainer.surface && d.surfaceInitialized && screenshotImage.status === Image.Null
59
            sessionContainer.surface && d.surfaceInitialized
409
54
            && d.applicationState === ApplicationInfoInterface.Stopped
60
            && (d.applicationState === ApplicationInfoInterface.Stopped || d.applicationState === ApplicationInfoInterface.Suspended)
410
55
        onNeedToTakeScreenshotChanged: {
61
        onNeedToTakeScreenshotChanged: {
411
56
            if (needToTakeScreenshot) {
62
            if (needToTakeScreenshot) {
413
57
                screenshotImage.take();
63
                sessionGrabber.grab();
414
58
            }
64
            }
415
59
        }
65
        }
416
60
66
417
@@ -86,27 +92,9 @@
418
86
        onTriggered: { if (stateGroup.state === "surface") { d.surfaceOldEnoughToBeResized = true; } }
92
        onTriggered: { if (stateGroup.state === "surface") { d.surfaceOldEnoughToBeResized = true; } }
419
87
    }
93
    }
420
88
94
421
89
    Image {
422
90
        id: screenshotImage
423
91
        objectName: "screenshotImage"
424
92
        source: d.defaultScreenshot
425
93
        anchors.fill: parent
426
94
        antialiasing: !root.interactive
427
95
428
96
        function take() {
429
97
            // Format: "image://application/$APP_ID/$CURRENT_TIME_MS"
430
98
            // eg: "image://application/calculator-app/123456"
431
99
            var timeMs = new Date().getTime();
432
100
            source = "image://application/" + root.application.appId + "/" + timeMs;
433
101
        }
434
102
435
103
        // Save memory by using a half-resolution (thus quarter size) screenshot
436
104
        sourceSize.width: root.width / 2
437
105
        sourceSize.height: root.height / 2
438
106
    }
439
107
440
108
    Loader {
95
    Loader {
441
109
        id: splashLoader
96
        id: splashLoader
442
97
        objectName: "splashLoader"
443
110
        visible: active
98
        visible: active
444
111
        active: false
99
        active: false
445
112
        anchors.fill: parent
100
        anchors.fill: parent
446
@@ -120,10 +108,46 @@
447
120
                backgroundColor: d.splashColor
108
                backgroundColor: d.splashColor
448
121
                headerColor: d.splashColorHeader
109
                headerColor: d.splashColorHeader
449
122
                footerColor: d.splashColorFooter
110
                footerColor: d.splashColorFooter
450
111
                activeSpinner: d.applicationState === ApplicationInfoInterface.Starting ||
451
112
                               d.applicationState === ApplicationInfoInterface.Running
452
123
            }
113
            }
453
124
        }
114
        }
454
125
    }
115
    }
455
126
116
456
117
    Image {
457
118
        id: screenshotImage
458
119
        objectName: "screenshotImage"
459
120
        source: sessionGrabber.path || d.defaultScreenshot
460
121
        anchors.fill: parent
461
122
        antialiasing: !root.interactive
462
123
        cache: false
463
124
        asynchronous: true
464
125
465
126
        // Save memory by using a half-resolution (thus quarter size) screenshot
466
127
        sourceSize.width: root.width / 2
467
128
        sourceSize.height: root.height / 2
468
129
469
130
        ActivityIndicator {
470
131
            id: activityIndicator
471
132
            anchors.centerIn: parent
472
133
            visible: running
473
134
            running: stateGroup.state == "screenshot" &&
474
135
                     (d.applicationState === ApplicationInfoInterface.Starting || d.applicationState === ApplicationInfoInterface.Running)
475
136
        }
476
137
    }
477
138
478
139
    SessionGrabber {
479
140
        id: sessionGrabber
480
141
        appId: d.appId
481
142
        target: root
482
143
483
144
        onScreenshotGrabbed: {
484
145
            // Need to reset to "" and back since it may be the same path with new content
485
146
            screenshotImage.source = "";
486
147
            screenshotImage.source = sessionGrabber.path;
487
148
        }
488
149
    }
489
150
490
127
    SessionContainer {
151
    SessionContainer {
491
128
        id: sessionContainer
152
        id: sessionContainer
492
129
        // A fake application might not even have a session property.
153
        // A fake application might not even have a session property.
493
130
154
494
=== modified file 'qml/Stages/Splash.qml'
495
--- qml/Stages/Splash.qml	2014-09-16 13:48:40 +0000
496
+++ qml/Stages/Splash.qml	2015-06-30 11:41:39 +0000
497
@@ -31,6 +31,7 @@
498
31
    property url icon
31
    property url icon
499
32
    property alias title: header.title
32
    property alias title: header.title
500
33
    property alias showHeader: header.visible
33
    property alias showHeader: header.visible
501
34
    property alias activeSpinner: activityIndicator.running
502
34
35
503
35
    Ambiance.Palette {
36
    Ambiance.Palette {
504
36
        id: ambiancePalette
37
        id: ambiancePalette
505
@@ -144,6 +145,7 @@
506
144
    }
145
    }
507
145
146
508
146
    ActivityIndicator {
147
    ActivityIndicator {
509
148
        id: activityIndicator
510
147
        anchors.centerIn: header.visible ? parent : undefined
149
        anchors.centerIn: header.visible ? parent : undefined
511
148
        anchors.verticalCenterOffset: header.visible ? header.height / 2 : 0
150
        anchors.verticalCenterOffset: header.visible ? header.height / 2 : 0
512
149
151
513
150
152
514
=== modified file 'qml/Stages/SpreadDelegate.qml'
515
--- qml/Stages/SpreadDelegate.qml	2015-05-11 14:36:03 +0000
516
+++ qml/Stages/SpreadDelegate.qml	2015-06-30 11:41:39 +0000
517
@@ -397,6 +397,7 @@
518
397
                if (!running) {
397
                if (!running) {
519
398
                    dragArea.moving = false;
398
                    dragArea.moving = false;
520
399
                    if (requestClose) {
399
                    if (requestClose) {
521
400
                        appWindow.removeScreenshot();
522
400
                        root.closed();
401
                        root.closed();
523
401
                    } else {
402
                    } else {
524
402
                        dragArea.distance = 0;
403
                        dragArea.distance = 0;
525
403
404
526
=== modified file 'tests/plugins/CMakeLists.txt'
527
--- tests/plugins/CMakeLists.txt	2014-12-12 10:00:31 +0000
528
+++ tests/plugins/CMakeLists.txt	2015-06-30 11:41:39 +0000
529
@@ -2,6 +2,7 @@
530
2
add_subdirectory(Greeter)
2
add_subdirectory(Greeter)
531
3
add_subdirectory(LightDM)
3
add_subdirectory(LightDM)
532
4
add_subdirectory(Dash)
4
add_subdirectory(Dash)
533
5
add_subdirectory(SessionGrabber)
534
5
add_subdirectory(Ubuntu)
6
add_subdirectory(Ubuntu)
535
6
add_subdirectory(Unity)
7
add_subdirectory(Unity)
536
7
add_subdirectory(Utils)
8
add_subdirectory(Utils)
537
8
9
538
=== added directory 'tests/plugins/SessionGrabber'
539
=== added file 'tests/plugins/SessionGrabber/CMakeLists.txt'
540
--- tests/plugins/SessionGrabber/CMakeLists.txt	1970-01-01 00:00:00 +0000
541
+++ tests/plugins/SessionGrabber/CMakeLists.txt	2015-06-30 11:41:39 +0000
542
@@ -0,0 +1,14 @@
543
1
add_executable(SessionGrabberTestExec
544
2
    sessiongrabbertest.cpp
545
3
    ${CMAKE_SOURCE_DIR}/plugins/SessionGrabber/sessiongrabber.cpp
546
4
    )
547
5
qt5_use_modules(SessionGrabberTestExec Core Quick Test Concurrent)
548
6
549
7
add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
550
8
551
9
include_directories(
552
10
    ${CMAKE_CURRENT_BINARY_DIR}
553
11
    ${CMAKE_SOURCE_DIR}/plugins/SessionGrabber
554
12
    )
555
13
556
14
add_unity8_uitest(SessionGrabber SessionGrabberTestExec)
557
0
15
558
=== added file 'tests/plugins/SessionGrabber/sessiongrabbertest.cpp'
559
--- tests/plugins/SessionGrabber/sessiongrabbertest.cpp	1970-01-01 00:00:00 +0000
560
+++ tests/plugins/SessionGrabber/sessiongrabbertest.cpp	2015-06-30 11:41:39 +0000
561
@@ -0,0 +1,79 @@
562
1
/*
563
2
 * Copyright (C) 2015 Canonical, Ltd.
564
3
 *
565
4
 * This program is free software; you can redistribute it and/or modify
566
5
 * it under the terms of the GNU General Public License as published by
567
6
 * the Free Software Foundation; version 3.
568
7
 *
569
8
 * This program is distributed in the hope that it will be useful,
570
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
571
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
572
11
 * GNU General Public License for more details.
573
12
 *
574
13
 * You should have received a copy of the GNU General Public License
575
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
576
15
 */
577
16
578
17
#include <QtTestGui>
579
18
#include <QQuickItem>
580
19
#include <QQuickView>
581
20
#include <QSignalSpy>
582
21
583
22
#include "sessiongrabber.h"
584
23
585
24
class SessionGrabberTest : public QObject
586
25
{
587
26
    Q_OBJECT
588
27
589
28
private Q_SLOTS:
590
29
591
30
    void init()
592
31
    {
593
32
        view = new QQuickView();
594
33
        view->setSource(QUrl::fromLocalFile(CURRENT_SOURCE_DIR "/sessiongrabbertest.qml"));
595
34
        view->show();
596
35
        QTest::qWaitForWindowExposed(view);
597
36
    }
598
37
599
38
    void testSessionGrabber()
600
39
    {
601
40
        SessionGrabber s;
602
41
        s.setAppId("test-app-id");
603
42
        s.setTarget(view->rootObject());
604
43
        QSignalSpy spy(&s, &SessionGrabber::screenshotGrabbed);
605
44
606
45
        QVERIFY(!QFile::exists(s.path()));
607
46
608
47
        view->rootObject()->setProperty("color", "red");
609
48
        s.grab();
610
49
        spy.wait();
611
50
612
51
        QVERIFY(QFile::exists(s.path()));
613
52
        QImage image(s.path());
614
53
        QCOMPARE(image.pixel(0, 0), qRgb(255, 0, 0));
615
54
616
55
        view->rootObject()->setProperty("color", "blue");
617
56
        s.grab();
618
57
        spy.wait();
619
58
620
59
        QVERIFY(QFile::exists(s.path()));
621
60
        image = QImage(s.path());
622
61
        QCOMPARE(image.pixel(0, 0), qRgb(0, 0, 255));
623
62
624
63
        s.removeScreenshot();
625
64
626
65
        QVERIFY(!QFile::exists(s.path()));
627
66
    }
628
67
629
68
    void cleanup()
630
69
    {
631
70
        delete view;
632
71
    }
633
72
634
73
private:
635
74
    QQuickView *view;
636
75
};
637
76
638
77
QTEST_MAIN(SessionGrabberTest)
639
78
640
79
#include "sessiongrabbertest.moc"
641
0
80
642
=== added file 'tests/plugins/SessionGrabber/sessiongrabbertest.qml'
643
--- tests/plugins/SessionGrabber/sessiongrabbertest.qml	1970-01-01 00:00:00 +0000
644
+++ tests/plugins/SessionGrabber/sessiongrabbertest.qml	2015-06-30 11:41:39 +0000
645
@@ -0,0 +1,22 @@
646
1
/*
647
2
 * Copyright (C) 2015 Canonical, Ltd.
648
3
 *
649
4
 * This program is free software; you can redistribute it and/or modify
650
5
 * it under the terms of the GNU General Public License as published by
651
6
 * the Free Software Foundation; version 3.
652
7
 *
653
8
 * This program is distributed in the hope that it will be useful,
654
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
655
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
656
11
 * GNU General Public License for more details.
657
12
 *
658
13
 * You should have received a copy of the GNU General Public License
659
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
660
15
 */
661
16
662
17
import QtQuick 2.4
663
18
664
19
Rectangle {
665
20
    width: 100
666
21
    height: 100
667
22
}
668
0
23
669
=== modified file 'tests/qmltests/Stages/tst_ApplicationWindow.qml'
670
--- tests/qmltests/Stages/tst_ApplicationWindow.qml	2015-03-06 04:44:11 +0000
671
+++ tests/qmltests/Stages/tst_ApplicationWindow.qml	2015-06-30 11:41:39 +0000
672
@@ -35,6 +35,9 @@
673
35
        root.fakeApplication.manualSurfaceCreation = true;
35
        root.fakeApplication.manualSurfaceCreation = true;
674
36
        root.fakeApplication.setState(ApplicationInfoInterface.Starting);
36
        root.fakeApplication.setState(ApplicationInfoInterface.Starting);
675
37
    }
37
    }
676
38
    Component.onDestruction: {
677
39
        applicationWindowLoader.item.removeScreenshot();
678
40
    }
679
38
    property QtObject fakeApplication: null
41
    property QtObject fakeApplication: null
680
39
    readonly property var fakeSession: fakeApplication ? fakeApplication.session : null
42
    readonly property var fakeSession: fakeApplication ? fakeApplication.session : null
681
40
43
682
@@ -331,6 +334,40 @@
683
331
            tryCompare(screenshotImage, "status", Image.Null);
334
            tryCompare(screenshotImage, "status", Image.Null);
684
332
        }
335
        }
685
333
336
686
337
        function test_suspendrestartApp() {
687
338
            var screenshotImage = findChild(applicationWindowLoader.item, "screenshotImage");
688
339
689
340
            initSession();
690
341
            setApplicationState(appRunning);
691
342
            tryCompare(stateGroup, "state", "surface");
692
343
            waitUntilTransitionsEnd();
693
344
694
345
            setApplicationState(appSuspended);
695
346
696
347
            cleanupSession();
697
348
698
349
            tryCompare(stateGroup, "state", "screenshot");
699
350
            waitUntilTransitionsEnd();
700
351
            tryCompare(fakeApplication, "session", null);
701
352
702
353
            // and restart it
703
354
            setApplicationState(appStarting);
704
355
705
356
            waitUntilTransitionsEnd();
706
357
            verify(stateGroup.state === "screenshot");
707
358
            verify(fakeSession === null);
708
359
709
360
            setApplicationState(appRunning);
710
361
711
362
            waitUntilTransitionsEnd();
712
363
            verify(stateGroup.state === "screenshot");
713
364
714
365
            initSession();
715
366
716
367
            tryCompare(stateGroup, "state", "surface");
717
368
            tryCompare(screenshotImage, "status", Image.Null);
718
369
        }
719
370
720
334
        function test_appCrashed() {
371
        function test_appCrashed() {
721
335
            initSession();
372
            initSession();
722
336
            setApplicationState(appRunning);
373
            setApplicationState(appRunning);
723
@@ -408,5 +445,12 @@
724
408
            applicationWindowLoader.item.interactive = true;
445
            applicationWindowLoader.item.interactive = true;
725
409
            compare(fakeSession.surface.activeFocus, true);
446
            compare(fakeSession.surface.activeFocus, true);
726
410
        }
447
        }
727
448
728
449
        function test_no_spinner_if_stopped() {
729
450
            setApplicationState(appStopped);
730
451
            tryCompare(stateGroup, "state", "splashScreen");
731
452
            var splashLoader = findChild(applicationWindowLoader.item, "splashLoader");
732
453
            verify(!splashLoader.item.activeSpinner);
733
454
        }
734
411
    }
455
    }
735
412
}
456
}
Status:	Merged
Approved by:	Michael Zanetti on 2015-06-30
Approved revision:	1755
Merged at revision:	1841
Proposed branch:	lp:~aacid/unity8/suspend_screenshoting
Merge into:	lp:unity8
Diff against target:	735 lines (+524/-22) 17 files modified debian/unity8-private.install (+1/-0) plugins/CMakeLists.txt (+1/-0) plugins/SessionGrabber/CMakeLists.txt (+8/-0) plugins/SessionGrabber/SessionGrabber.qmltypes (+23/-0) plugins/SessionGrabber/plugin.cpp (+27/-0) plugins/SessionGrabber/plugin.h (+32/-0) plugins/SessionGrabber/qmldir (+3/-0) plugins/SessionGrabber/sessiongrabber.cpp (+135/-0) plugins/SessionGrabber/sessiongrabber.h (+85/-0) qml/Stages/ApplicationWindow.qml (+46/-22) qml/Stages/Splash.qml (+2/-0) qml/Stages/SpreadDelegate.qml (+1/-0) tests/plugins/CMakeLists.txt (+1/-0) tests/plugins/SessionGrabber/CMakeLists.txt (+14/-0) tests/plugins/SessionGrabber/sessiongrabbertest.cpp (+79/-0) tests/plugins/SessionGrabber/sessiongrabbertest.qml (+22/-0) tests/qmltests/Stages/tst_ApplicationWindow.qml (+44/-0)
To merge this branch:	bzr merge lp:~aacid/unity8/suspend_screenshoting
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2015-06-30
Michael Zanetti (community)			Abstain on 2015-06-30
Andrea Cimitan (community)			Abstain on 2015-04-30
Michał Sawicz		2015-04-22	Approve on 2015-04-30
Daniel d'Andrada (community)			Needs Information on 2015-04-30
Review via email: mp+257119@code.launchpad.net