1
=== modified file 'debian/control'
2
--- debian/control	2014-03-24 11:49:06 +0000
3
+++ debian/control	2014-03-25 15:08:15 +0000
4
@@ -17,7 +17,7 @@
5
17
               libnih-dev,
17
               libnih-dev,
6
18
               libpulse-dev,
18
               libpulse-dev,
7
19
               libqmenumodel-dev (>= 0.2.7),
19
               libqmenumodel-dev (>= 0.2.7),
9
20
               libunity-api-dev (>= 7.80.4),
20
               libunity-api-dev (>= 7.80.6),
10
21
               libunity-mir-dev,
21
               libunity-mir-dev,
11
22
               libupstart-dev,
22
               libupstart-dev,
12
23
               libusermetricsoutput1-dev,
23
               libusermetricsoutput1-dev,
13
@@ -83,6 +83,7 @@
14
83
         qtdeclarative5-ubuntu-ui-toolkit-plugin,
83
         qtdeclarative5-ubuntu-ui-toolkit-plugin,
15
84
         qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,
84
         qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,
16
85
         qtdeclarative5-xmllistmodel-plugin,
85
         qtdeclarative5-xmllistmodel-plugin,
17
86
         unity-application-impl-2,
18
86
         unity-launcher-impl-3,
87
         unity-launcher-impl-3,
19
87
         unity-notifications-impl-2,
88
         unity-notifications-impl-2,
20
88
         unity8-fake-env | qtubuntu-shell,
89
         unity8-fake-env | qtubuntu-shell,
21
@@ -147,6 +148,7 @@
22
147
         ${shlibs:Depends},
148
         ${shlibs:Depends},
23
148
Provides: unity-launcher-impl,
149
Provides: unity-launcher-impl,
24
149
          unity-launcher-impl-3,
150
          unity-launcher-impl-3,
25
151
          unity-application-impl-2,
26
150
Description: Unity 8 private libs
152
Description: Unity 8 private libs
27
151
 The Unity 8 shell is the primary user interface for Ubuntu devices.
153
 The Unity 8 shell is the primary user interface for Ubuntu devices.
28
152
 .
154
 .
29
153
155
30
=== modified file 'debian/unity8.install'
31
--- debian/unity8.install	2014-03-05 12:52:57 +0000
32
+++ debian/unity8.install	2014-03-25 15:08:15 +0000
33
@@ -10,6 +10,6 @@
34
10
usr/share/unity8/Notifications
10
usr/share/unity8/Notifications
35
11
usr/share/unity8/Panel
11
usr/share/unity8/Panel
36
12
usr/share/unity8/Shell.qml
12
usr/share/unity8/Shell.qml
38
13
usr/share/unity8/SideStage
13
usr/share/unity8/Stages
39
14
usr/share/unity8/graphics
14
usr/share/unity8/graphics
40
15
data/unity8.conf usr/share/upstart/sessions/
15
data/unity8.conf usr/share/upstart/sessions/
41
16
16
42
=== modified file 'plugins/Utils/CMakeLists.txt'
43
--- plugins/Utils/CMakeLists.txt	2014-03-17 15:50:50 +0000
44
+++ plugins/Utils/CMakeLists.txt	2014-03-25 15:08:15 +0000
45
@@ -18,6 +18,7 @@
46
18
    qsortfilterproxymodelqml.cpp
18
    qsortfilterproxymodelqml.cpp
47
19
    timeformatter.cpp
19
    timeformatter.cpp
48
20
    unitymenumodelpaths.cpp
20
    unitymenumodelpaths.cpp
49
21
    easingcurve.cpp
50
21
    plugin.cpp
22
    plugin.cpp
51
22
    )
23
    )
52
23
24
53
@@ -33,7 +34,7 @@
54
33
# files directly in targets.
34
# files directly in targets.
55
34
set_target_properties(Utils-qml PROPERTIES COMPILE_FLAGS -fvisibility=default)
35
set_target_properties(Utils-qml PROPERTIES COMPILE_FLAGS -fvisibility=default)
56
35
36
58
36
qt5_use_modules(Utils-qml Qml Quick DBus Network XmlPatterns Concurrent)
37
qt5_use_modules(Utils-qml Qml Quick DBus Network XmlPatterns Gui Concurrent)
59
37
38
60
38
# export the qmldir qmltypes and plugin files
39
# export the qmldir qmltypes and plugin files
61
39
export_qmlfiles(Utils Utils)
40
export_qmlfiles(Utils Utils)
62
40
41
63
=== added file 'plugins/Utils/easingcurve.cpp'
64
--- plugins/Utils/easingcurve.cpp	1970-01-01 00:00:00 +0000
65
+++ plugins/Utils/easingcurve.cpp	2014-03-25 15:08:15 +0000
66
@@ -0,0 +1,67 @@
67
1
/*
68
2
 * Copyright 2014 Canonical Ltd.
69
3
 *
70
4
 * This program is free software; you can redistribute it and/or modify
71
5
 * it under the terms of the GNU Lesser General Public License as published by
72
6
 * the Free Software Foundation; version 3.
73
7
 *
74
8
 * This program is distributed in the hope that it will be useful,
75
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
76
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
77
11
 * GNU Lesser General Public License for more details.
78
12
 *
79
13
 * You should have received a copy of the GNU Lesser General Public License
80
14
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
81
15
 *
82
16
 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
83
17
*/
84
18
85
19
#include "easingcurve.h"
86
20
87
21
88
22
EasingCurve::EasingCurve(QObject *parent):
89
23
    QObject(parent)
90
24
{
91
25
92
26
}
93
27
94
28
QEasingCurve::Type EasingCurve::type() const
95
29
{
96
30
    return m_easingCurve.type();
97
31
}
98
32
99
33
void EasingCurve::setType(const QEasingCurve::Type &type)
100
34
{
101
35
    m_easingCurve.setType(type);
102
36
    Q_EMIT typeChanged();
103
37
}
104
38
105
39
qreal EasingCurve::period() const
106
40
{
107
41
    return m_easingCurve.period();
108
42
}
109
43
110
44
void EasingCurve::setPeriod(qreal period)
111
45
{
112
46
    m_easingCurve.setPeriod(period);
113
47
    Q_EMIT periodChanged();
114
48
}
115
49
116
50
qreal EasingCurve::progress() const
117
51
{
118
52
    return m_progress;
119
53
}
120
54
121
55
void EasingCurve::setProgress(qreal progress)
122
56
{
123
57
    if (m_progress != progress) {
124
58
        m_progress = progress;
125
59
        m_value = m_easingCurve.valueForProgress(m_progress);
126
60
        Q_EMIT progressChanged();
127
61
    }
128
62
}
129
63
130
64
qreal EasingCurve::value() const
131
65
{
132
66
    return m_value;
133
67
}
134
0
68
135
=== added file 'plugins/Utils/easingcurve.h'
136
--- plugins/Utils/easingcurve.h	1970-01-01 00:00:00 +0000
137
+++ plugins/Utils/easingcurve.h	2014-03-25 15:08:15 +0000
138
@@ -0,0 +1,70 @@
139
1
/*
140
2
 * Copyright 2014 Canonical Ltd.
141
3
 *
142
4
 * This program is free software; you can redistribute it and/or modify
143
5
 * it under the terms of the GNU Lesser General Public License as published by
144
6
 * the Free Software Foundation; version 3.
145
7
 *
146
8
 * This program is distributed in the hope that it will be useful,
147
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
148
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
149
11
 * GNU Lesser General Public License for more details.
150
12
 *
151
13
 * You should have received a copy of the GNU Lesser General Public License
152
14
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
153
15
 *
154
16
 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
155
17
*/
156
18
157
19
#ifndef EASINGCURVE_H
158
20
#define EASINGCURVE_H
159
21
160
22
#include <QObject>
161
23
#include <QEasingCurve>
162
24
163
25
/**
164
26
 * @brief The EasingCurve class
165
27
 *
166
28
 * This class exposes the QEasingCurve C++ API to QML.
167
29
 * This is useful for user interactive animations. While the QML Animation types
168
30
 * all require a "from", "to" and "duration", this one is based on "period" and
169
31
 * "progress". So you can control the position of the aimation by changing the
170
32
 * progress, also going back and forward in the animation. Depending on the type
171
33
 * of the easing curve, value will return the transformed progress.
172
34
 */
173
35
174
36
class EasingCurve: public QObject
175
37
{
176
38
    Q_OBJECT
177
39
    Q_ENUMS(QEasingCurve::Type)
178
40
    Q_PROPERTY(QEasingCurve::Type type READ type WRITE setType NOTIFY typeChanged)
179
41
    Q_PROPERTY(qreal period READ period WRITE setPeriod NOTIFY periodChanged)
180
42
    Q_PROPERTY(qreal progress READ progress WRITE setProgress NOTIFY progressChanged)
181
43
    Q_PROPERTY(qreal value READ value NOTIFY progressChanged)
182
44
183
45
public:
184
46
    EasingCurve(QObject *parent = 0);
185
47
186
48
    QEasingCurve::Type type() const;
187
49
    void setType(const QEasingCurve::Type &type);
188
50
189
51
    qreal period() const;
190
52
    void setPeriod(qreal period);
191
53
192
54
    qreal progress() const;
193
55
    void setProgress(qreal progress);
194
56
195
57
    qreal value() const;
196
58
197
59
Q_SIGNALS:
198
60
    void typeChanged();
199
61
    void periodChanged();
200
62
    void progressChanged();
201
63
202
64
private:
203
65
    QEasingCurve m_easingCurve;
204
66
    qreal m_progress;
205
67
    qreal m_value;
206
68
};
207
69
208
70
#endif
209
0
71
210
=== modified file 'plugins/Utils/plugin.cpp'
211
--- plugins/Utils/plugin.cpp	2014-03-17 15:50:50 +0000
212
+++ plugins/Utils/plugin.cpp	2014-03-25 15:08:15 +0000
213
@@ -32,6 +32,7 @@
214
32
#include "qsortfilterproxymodelqml.h"
32
#include "qsortfilterproxymodelqml.h"
215
33
#include "timeformatter.h"
33
#include "timeformatter.h"
216
34
#include "unitymenumodelpaths.h"
34
#include "unitymenumodelpaths.h"
217
35
#include "easingcurve.h"
218
35
36
219
36
static const char* BOTTOM_BAR_VISIBILITY_COMMUNICATOR_DBUS_PATH = "/BottomBarVisibilityCommunicator";
37
static const char* BOTTOM_BAR_VISIBILITY_COMMUNICATOR_DBUS_PATH = "/BottomBarVisibilityCommunicator";
220
37
static const char* DBUS_SERVICE = "com.canonical.Shell.BottomBarVisibilityCommunicator";
38
static const char* DBUS_SERVICE = "com.canonical.Shell.BottomBarVisibilityCommunicator";
221
@@ -46,6 +47,7 @@
222
46
    qmlRegisterType<TimeFormatter>(uri, 0, 1, "TimeFormatter");
47
    qmlRegisterType<TimeFormatter>(uri, 0, 1, "TimeFormatter");
223
47
    qmlRegisterType<GDateTimeFormatter>(uri, 0, 1, "GDateTimeFormatter");
48
    qmlRegisterType<GDateTimeFormatter>(uri, 0, 1, "GDateTimeFormatter");
224
48
    qmlRegisterUncreatableType<BottomBarVisibilityCommunicatorShell>(uri, 0, 1, "BottomBarVisibilityCommunicatorShell", "Can't create BottomBarVisibilityCommunicatorShell");
49
    qmlRegisterUncreatableType<BottomBarVisibilityCommunicatorShell>(uri, 0, 1, "BottomBarVisibilityCommunicatorShell", "Can't create BottomBarVisibilityCommunicatorShell");
225
50
    qmlRegisterType<EasingCurve>(uri, 0, 1, "EasingCurve");
226
49
}
51
}
227
50
52
228
51
void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
53
void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
229
52
54
230
=== modified file 'qml/CMakeLists.txt'
231
--- qml/CMakeLists.txt	2013-12-17 16:04:47 +0000
232
+++ qml/CMakeLists.txt	2014-03-25 15:08:15 +0000
233
@@ -13,7 +13,7 @@
234
13
    Hud
13
    Hud
235
14
    Panel
14
    Panel
236
15
    Launcher
15
    Launcher
238
16
    SideStage
16
    Stages
239
17
    Notifications
17
    Notifications
240
18
    )
18
    )
241
19
19
242
20
20
243
=== removed file 'qml/Components/ApplicationManagerWrapper.qml'
244
--- qml/Components/ApplicationManagerWrapper.qml	2014-03-05 12:52:57 +0000
245
+++ qml/Components/ApplicationManagerWrapper.qml	1970-01-01 00:00:00 +0000
246
@@ -1,169 +0,0 @@
247
1
/*
248
2
 * Copyright (C) 2013 Canonical, Ltd.
249
3
 *
250
4
 * This program is free software; you can redistribute it and/or modify
251
5
 * it under the terms of the GNU General Public License as published by
252
6
 * the Free Software Foundation; version 3.
253
7
 *
254
8
 * This program is distributed in the hope that it will be useful,
255
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
256
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
257
11
 * GNU General Public License for more details.
258
12
 *
259
13
 * You should have received a copy of the GNU General Public License
260
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
261
15
 */
262
16
263
17
import QtQuick 2.0
264
18
import Unity.Application 0.1
265
19
266
20
Item {
267
21
    id: root
268
22
269
23
    property alias mainStageApplications: mainStageModel
270
24
    property alias sideStageApplications: sideStageModel
271
25
    property variant mainStageFocusedApplication: null
272
26
    property variant sideStageFocusedApplication: null
273
27
    property bool sideStageEnabled: true
274
28
    property bool keyboardVisible: ApplicationManager.keyboardVisible
275
29
    property int keyboardHeight: ApplicationManager.keyboardHeight
276
30
277
31
    property bool fake: ApplicationManager.fake ? ApplicationManager.fake : false
278
32
279
33
    signal focusRequested(string appId)
280
34
281
35
    ApplicationsModelStageFiltered {
282
36
        id: mainStageModel
283
37
        stage: ApplicationInfo.MainStage
284
38
    }
285
39
286
40
    ApplicationsModelStageFiltered {
287
41
        id: sideStageModel
288
42
        stage: ApplicationInfo.SideStage
289
43
    }
290
44
291
45
    Connections {
292
46
        target: ApplicationManager
293
47
        onFocusedApplicationIdChanged: {
294
48
            var app = ApplicationManager.findApplication(ApplicationManager.focusedApplicationId)
295
49
            if (!app) { //nothing at all focused, so clear all
296
50
                mainStageFocusedApplication = null;
297
51
                sideStageFocusedApplication = null;
298
52
            } else {
299
53
                if (app.stage == ApplicationInfo.MainStage) {
300
54
                    mainStageFocusedApplication = app;
301
55
                    // possible the side stage app being unfocused fired this signal, so check for it
302
56
                    if (sideStageFocusedApplication && !sideStageFocusedApplication.focused)
303
57
                        sideStageFocusedApplication = null;
304
58
                } else {
305
59
                    sideStageFocusedApplication = app;
306
60
                    // possible the main stage app being unfocused fired this signal, so check for it
307
61
                    if (mainStageFocusedApplication && !mainStageFocusedApplication.focused)
308
62
                        mainStageFocusedApplication = null;
309
63
                }
310
64
            }
311
65
        }
312
66
313
67
        onFocusRequested: {
314
68
            // if no side stage enabled, override application's stage parameter
315
69
            var app = ApplicationManager.findApplication(appId);
316
70
            if (app && app.stage === ApplicationInfo.SideStage && !sideStageEnabled) {
317
71
                app.stage = ApplicationInfo.MainStage;
318
72
            }
319
73
320
74
            root.focusRequested(appId);
321
75
        }
322
76
    }
323
77
324
78
    function activateApplication(desktopFile, argument) {
325
79
        var appId;
326
80
327
81
        // HACK: Applications identified sometimes with with appId, but mostly with desktopFile.
328
82
        // TODO: convert entire shell to use appId only.
329
83
        if (desktopFile.indexOf(".desktop") >= 0) {
330
84
            appId = desktopFileToAppId(desktopFile);
331
85
        } else {
332
86
            appId = desktopFile;
333
87
        }
334
88
335
89
        var application = ApplicationManager.findApplication(appId);
336
90
        if (application !== null) {
337
91
            return application;
338
92
        }
339
93
340
94
        var execFlags = sideStageEnabled ? ApplicationManager.NoFlag : ApplicationManager.ForceMainStage;
341
95
342
96
        if (argument) {
343
97
            return ApplicationManager.startApplication(appId, execFlags, [argument]);
344
98
        } else {
345
99
            return ApplicationManager.startApplication(appId, execFlags);
346
100
        }
347
101
    }
348
102
349
103
    function stopApplication(application) {
350
104
        var appId;
351
105
352
106
        // HACK: Applications identified sometimes with with appId, but mostly with desktopFile.
353
107
        // TODO: convert entire shell to use appId only.
354
108
        if (typeof application == "string") {
355
109
            appId = application;
356
110
        } else {
357
111
            appId = desktopFileToAppId(application.desktopFile);
358
112
        }
359
113
360
114
        ApplicationManager.stopApplication(appId);
361
115
    }
362
116
363
117
    function focusApplication(application) {
364
118
        if (application == null || application == undefined) {
365
119
            return;
366
120
        }
367
121
368
122
        ApplicationManager.focusApplication(application.appId);
369
123
    }
370
124
371
125
    function unfocusCurrentApplication() {
372
126
        ApplicationManager.unfocusCurrentApplication();
373
127
    }
374
128
375
129
    function moveRunningApplicationStackPosition(from, to, stage) {
376
130
        if (from == to || from < 0 || to < 0) return;
377
131
378
132
        if (stage == ApplicationInfo.SideStage) {
379
133
            sideStageModel.move(from, to);
380
134
        } else {
381
135
            mainStageModel.move(from, to);
382
136
        }
383
137
    }
384
138
385
139
    function getApplicationFromDesktopFile(desktopFile, stage) {
386
140
        var appId;
387
141
388
142
        // HACK: Applications identified sometimes with with appId, but mostly with desktopFile.
389
143
        // TODO: convert entire shell to use appId only.
390
144
        if (desktopFile.indexOf(".desktop") >= 0) {
391
145
            appId = desktopFileToAppId(desktopFile);
392
146
        } else {
393
147
            appId = desktopFile;
394
148
        }
395
149
396
150
        for (var i = 0, len = ApplicationManager.count; i < len; i++ ) {
397
151
            var app = ApplicationManager.get(i);
398
152
399
153
            // if stage not specified, return whichever app running on either stage
400
154
            if (app.appId == appId && (stage == undefined || app.stage == stage)) {
401
155
                return app;
402
156
            }
403
157
        }
404
158
    }
405
159
406
160
    function desktopFileToAppId(desktopFile) {
407
161
        var right = desktopFile.lastIndexOf(".desktop");
408
162
        var left = desktopFile.lastIndexOf("/");
409
163
        if (left == -1 || right == -1 || left == right) {
410
164
            console.log("ApplicationManagerWrapper: unable to extract appId from '" + desktopFile + "'");
411
165
            return "";
412
166
        }
413
167
        return desktopFile.substring(left+1, right);
414
168
    }
415
169
}
416
170
0
417
=== removed file 'qml/Components/ApplicationScreenshot.qml'
418
--- qml/Components/ApplicationScreenshot.qml	2014-03-05 12:52:57 +0000
419
+++ qml/Components/ApplicationScreenshot.qml	1970-01-01 00:00:00 +0000
420
@@ -1,61 +0,0 @@
421
1
/*
422
2
 * Copyright (C) 2013 Canonical, Ltd.
423
3
 *
424
4
 * This program is free software; you can redistribute it and/or modify
425
5
 * it under the terms of the GNU General Public License as published by
426
6
 * the Free Software Foundation; version 3.
427
7
 *
428
8
 * This program is distributed in the hope that it will be useful,
429
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
430
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
431
11
 * GNU General Public License for more details.
432
12
 *
433
13
 * You should have received a copy of the GNU General Public License
434
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
435
15
 */
436
16
437
17
import QtQuick 2.0
438
18
import Ubuntu.Components 0.1
439
19
import Unity.Application 0.1
440
20
441
21
Item {
442
22
    id: applicationScreenshot
443
23
444
24
    property var application: null
445
25
    property bool withBackground: false
446
26
    property bool ready: applicationImage.ready || withBackground
447
27
448
28
    function setApplication(application) {
449
29
        applicationScreenshot.application = application
450
30
    }
451
31
452
32
    function clearApplication() {
453
33
        applicationScreenshot.withBackground = false;
454
34
        applicationScreenshot.application = null
455
35
        applicationScreenshot.scheduleUpdate();
456
36
    }
457
37
458
38
    function scheduleUpdate() {
459
39
        applicationImage.scheduleUpdate()
460
40
    }
461
41
462
42
    function updateFromCache() {
463
43
        applicationImage.updateFromCache()
464
44
    }
465
45
466
46
    Rectangle {
467
47
        id: background
468
48
        anchors.fill: parent
469
49
        color: "white" // FIXME should use normal background color of Suru theme
470
50
        visible: applicationScreenshot.withBackground
471
51
    }
472
52
473
53
    ApplicationImage {
474
54
        id: applicationImage
475
55
        objectName: "screenshot image"
476
56
        width: applicationScreenshot.application ? parent.width : 0
477
57
        height: applicationScreenshot.application ? parent.height : 0
478
58
        visible: applicationScreenshot.application != null && ready
479
59
        source: ApplicationManager.findApplication((application) ? application.appId : "")
480
60
    }
481
61
}
482
62
0
483
=== removed file 'qml/Components/ApplicationsModelStageFiltered.qml'
484
--- qml/Components/ApplicationsModelStageFiltered.qml	2013-09-09 10:20:21 +0000
485
+++ qml/Components/ApplicationsModelStageFiltered.qml	1970-01-01 00:00:00 +0000
486
@@ -1,49 +0,0 @@
487
1
/*
488
2
 * Copyright (C) 2013 Canonical, Ltd.
489
3
 *
490
4
 * This program is free software; you can redistribute it and/or modify
491
5
 * it under the terms of the GNU General Public License as published by
492
6
 * the Free Software Foundation; version 3.
493
7
 *
494
8
 * This program is distributed in the hope that it will be useful,
495
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
496
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
497
11
 * GNU General Public License for more details.
498
12
 *
499
13
 * You should have received a copy of the GNU General Public License
500
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
501
15
 */
502
16
503
17
import QtQuick 2.0
504
18
import Utils 0.1
505
19
import Unity.Application 0.1
506
20
507
21
SortFilterProxyModel {
508
22
    id: root
509
23
    property int stage
510
24
511
25
    function get(index) {
512
26
        return model.get(mapRowToSource(index));
513
27
    }
514
28
515
29
    function move(from, to) {
516
30
        var realFrom = mapRowToSource(from);
517
31
        if (realFrom == -1) {
518
32
            console.log("ERROR; invalid from=" + from + " index in move operation");
519
33
            return;
520
34
        }
521
35
        var realTo = mapRowToSource(to);
522
36
        if (realTo == -1) {
523
37
            // assuming wanting to move to end of list
524
38
            realTo = model.count - 1;
525
39
        }
526
40
527
41
        if (realFrom == realTo) return;
528
42
        model.move(realFrom, realTo);
529
43
    }
530
44
531
45
    model: ApplicationManager
532
46
    dynamicSortFilter: true
533
47
    filterRole: ApplicationManager.RoleStage
534
48
    filterRegExp: RegExp(stage)
535
49
}
536
50
0
537
=== modified file 'qml/Components/ResponsiveFlowView.qml'
538
--- qml/Components/ResponsiveFlowView.qml	2013-06-05 22:03:08 +0000
539
+++ qml/Components/ResponsiveFlowView.qml	2014-03-25 15:08:15 +0000
540
@@ -27,9 +27,8 @@
541
27
    property alias verticalSpacing: flow.verticalSpacing
27
    property alias verticalSpacing: flow.verticalSpacing
542
28
    property alias horizontalSpacing: flow.horizontalSpacing
28
    property alias horizontalSpacing: flow.horizontalSpacing
543
29
    property int referenceDelegateWidth
29
    property int referenceDelegateWidth
547
30
    property alias firstModel: repeater1.model
30
    property alias model: repeater.model
548
31
    property alias secondModel: repeater2.model
31
    property alias delegate: repeater.delegate
546
32
    property alias delegate: repeater1.delegate
549
33
    readonly property int cellWidth: referenceDelegateWidth + horizontalSpacing
32
    readonly property int cellWidth: referenceDelegateWidth + horizontalSpacing
550
34
    readonly property int cellHeight: referenceDelegateWidth + verticalSpacing
33
    readonly property int cellHeight: referenceDelegateWidth + verticalSpacing
551
35
    property alias move: flow.move
34
    property alias move: flow.move
552
@@ -69,13 +68,7 @@
553
69
        property int margin: allocatableVerticalSpace - columns * horizontalSpacing
68
        property int margin: allocatableVerticalSpace - columns * horizontalSpacing
554
70
69
555
71
        Repeater {
70
        Repeater {
563
72
            id: repeater1
71
            id: repeater
557
73
            model: (root.model) ? root.model[0] : null
558
74
        }
559
75
        Repeater {
560
76
            id: repeater2
561
77
            model: (root.model) ? root.model[1] : null
562
78
            delegate: repeater1.delegate
564
79
        }
72
        }
565
80
    }
73
    }
566
81
}
74
}
567
82
75
568
=== modified file 'qml/Dash/Apps/RunningApplicationTile.qml'
569
--- qml/Dash/Apps/RunningApplicationTile.qml	2014-03-12 10:44:18 +0000
570
+++ qml/Dash/Apps/RunningApplicationTile.qml	2014-03-25 15:08:15 +0000
571
@@ -23,7 +23,6 @@
572
23
AbstractButton {
23
AbstractButton {
573
24
    id: root
24
    id: root
574
25
    property var application
25
    property var application
575
26
    property bool __sideStageEnabled: shell.applicationManager.sideStageEnabled
576
27
26
577
28
    signal requestedApplicationActivation(var application)
27
    signal requestedApplicationActivation(var application)
578
29
    signal requestedApplicationTermination(var application)
28
    signal requestedApplicationTermination(var application)
579
@@ -34,7 +33,7 @@
580
34
    // To avoid "binding loop" warning
33
    // To avoid "binding loop" warning
581
35
    height: shapedApplicationImage.height + labelContainer.height
34
    height: shapedApplicationImage.height + labelContainer.height
582
36
35
584
37
    width: shapedApplicationImage.width
36
    width: shapedApplicationImage.width <= units.gu(11) ? units.gu(11) : height
585
38
37
586
39
    property bool terminationModeEnabled: false
38
    property bool terminationModeEnabled: false
587
40
39
588
@@ -51,32 +50,23 @@
589
51
        }
50
        }
590
52
    }
51
    }
591
53
52
598
54
    function updateScreenshotFromCache() {
53
    UbuntuShape {
593
55
        applicationImage.updateFromCache();
594
56
    }
595
57
596
58
    // FIXME: should use UbuntuShape from SDK
597
59
    UbuntuShapeForItem {
599
60
        id: shapedApplicationImage
54
        id: shapedApplicationImage
603
61
        anchors {
55
        anchors { top: parent.top; horizontalCenter: parent.horizontalCenter }
604
62
            top: parent.top
56
605
63
            horizontalCenter: parent.horizontalCenter
57
        height: units.gu(17)
606
58
        width: applicationImage.width
607
59
        radius: "medium"
608
60
609
61
        image: Image {
610
62
            id: applicationImage
611
63
            source: application.screenshot
612
64
            // height : width = ss.height : ss.width
613
65
            height: shapedApplicationImage.height
614
66
            fillMode: Image.PreserveAspectCrop
615
67
            width: Math.min(height, height * sourceSize.width / sourceSize.height)
616
64
        }
68
        }
617
65
69
618
66
        // FIXME: width and height should be defined according to the
619
67
        // application window's aspect ratio.
620
68
        width: (application.stage === ApplicationInfo.MainStage && __sideStageEnabled) ?
621
69
            units.gu(22) : units.gu(11)
622
70
        height: (__sideStageEnabled) ? units.gu(22) : units.gu(19)
623
71
        radius: "medium"
624
72
        image: applicationImage
625
73
    }
626
74
627
75
    ApplicationImage {
628
76
        id: applicationImage
629
77
        source: ApplicationManager.findApplication((application) ? application.appId : "")
630
78
        width: shapedApplicationImage.width
631
79
        height: shapedApplicationImage.height
632
80
    }
70
    }
633
81
71
634
82
    UbuntuShape {
72
    UbuntuShape {
635
83
73
636
=== modified file 'qml/Dash/Apps/RunningApplicationsGrid.qml'
637
--- qml/Dash/Apps/RunningApplicationsGrid.qml	2014-02-26 11:04:54 +0000
638
+++ qml/Dash/Apps/RunningApplicationsGrid.qml	2014-03-25 15:08:15 +0000
639
@@ -18,6 +18,7 @@
640
18
import "../../Components"
18
import "../../Components"
641
19
19
642
20
import Ubuntu.Gestures 0.1
20
import Ubuntu.Gestures 0.1
643
21
import Unity.Application 0.1
644
21
22
645
22
ResponsiveFlowView {
23
ResponsiveFlowView {
646
23
    id: root
24
    id: root
647
@@ -25,13 +26,7 @@
648
25
26
649
26
    signal updateScreenshots
27
    signal updateScreenshots
650
27
    property alias enableHeightBehavior: heightBehaviour.enabled
28
    property alias enableHeightBehavior: heightBehaviour.enabled
658
28
    property bool enableHeightBehaviorOnNextCreation: firstModel.count + secondModel.count == 0
29
    property bool enableHeightBehaviorOnNextCreation: model.count === 0
652
29
653
30
    Connections {
654
31
        target: shell
655
32
        onDashShownChanged: if (shell.dashShown && shell.stageScreenshotsReady) updateScreenshots();
656
33
        onStageScreenshotsReadyChanged: if (shell.dashShown && shell.stageScreenshotsReady) updateScreenshots();
657
34
    }
659
35
30
660
36
    Behavior on height {
31
    Behavior on height {
661
37
        id: heightBehaviour
32
        id: heightBehaviour
662
@@ -40,13 +35,7 @@
663
40
    }
35
    }
664
41
36
665
42
    Connections {
37
    Connections {
673
43
        target: root.firstModel
38
        target: root.model
667
44
        onCountChanged: {
668
45
            heightBehaviour.enabled = true;
669
46
        }
670
47
    }
671
48
    Connections {
672
49
        target: root.secondModel
674
50
        onCountChanged: {
39
        onCountChanged: {
675
51
            heightBehaviour.enabled = true;
40
            heightBehaviour.enabled = true;
676
52
        }
41
        }
677
@@ -85,17 +74,13 @@
678
85
                    root.terminationModeEnabled = true
74
                    root.terminationModeEnabled = true
679
86
            }
75
            }
680
87
            onRequestedApplicationTermination: {
76
            onRequestedApplicationTermination: {
682
88
                shell.applicationManager.stopApplication(model.appId)
77
                ApplicationManager.stopApplication(model.appId)
683
89
            }
78
            }
684
90
            onRequestedApplicationActivation: {
79
            onRequestedApplicationActivation: {
686
91
                shell.activateApplication(model.appId)
80
                ApplicationManager.requestFocusApplication(model.appId)
687
92
            }
81
            }
688
93
82
689
94
            terminationModeEnabled: root.terminationModeEnabled
83
            terminationModeEnabled: root.terminationModeEnabled
690
95
691
96
            Component.onCompleted: {
692
97
                root.updateScreenshots.connect(updateScreenshotFromCache);
693
98
            }
694
99
        }
84
        }
695
100
    }
85
    }
696
101
86
697
102
87
698
=== modified file 'qml/Dash/DashApps.qml'
699
--- qml/Dash/DashApps.qml	2014-02-19 11:15:01 +0000
700
+++ qml/Dash/DashApps.qml	2014-03-25 15:08:15 +0000
701
@@ -17,6 +17,7 @@
702
17
import QtQuick 2.0
17
import QtQuick 2.0
703
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 0.1
704
19
import Utils 0.1
19
import Utils 0.1
705
20
import Unity.Application 0.1
706
20
import "../Components"
21
import "../Components"
707
21
import "../Components/ListItems"
22
import "../Components/ListItems"
708
22
import "Apps"
23
import "Apps"
709
@@ -25,17 +26,15 @@
710
25
    id: scopeView
26
    id: scopeView
711
26
    objectName: "DashApps"
27
    objectName: "DashApps"
712
27
28
716
28
    // FIXME: a way to aggregate these models would be ideal
29
    property var runningApps: ApplicationManager
714
29
    property var mainStageApplicationsModel: shell.applicationManager.mainStageApplications
715
30
    property var sideStageApplicationModel: shell.applicationManager.sideStageApplications
717
31
30
718
32
    QtObject {
31
    QtObject {
719
33
        id: countObject
32
        id: countObject
721
34
        property int count: scopeView.scope.searchQuery.length == 0 ? (mainStageApplicationsModel.count + sideStageApplicationModel.count) : 0
33
        property int count: scopeView.scope.searchQuery.length == 0 ? scopeView.runningApps.count : 0
722
35
    }
34
    }
723
36
35
724
37
    onScopeChanged: {
36
    onScopeChanged: {
725
38
        scopeView.scope.categories.addSpecialCategory("running.apps.category", "Recent", "", "{ \"template\": { \"category-layout\": \"running-apps\" } }", countObject);
37
        scopeView.scope.categories.addSpecialCategory("running.apps.category", "Recent", "", "{ \"template\": { \"category-layout\": \"running-apps\" } }", countObject);
727
39
        enableHeightBehaviorOnNextCreation = (mainStageApplicationsModel.count + sideStageApplicationModel.count == 0)
38
        enableHeightBehaviorOnNextCreation = scopeView.runningApps.count === 0
728
40
    }
39
    }
729
41
}
40
}
730
42
41
731
=== modified file 'qml/Dash/GenericScopeView.qml'
732
--- qml/Dash/GenericScopeView.qml	2014-03-17 11:44:05 +0000
733
+++ qml/Dash/GenericScopeView.qml	2014-03-25 15:08:15 +0000
734
@@ -18,6 +18,7 @@
735
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 0.1
736
19
import Utils 0.1
19
import Utils 0.1
737
20
import Unity 0.2
20
import Unity 0.2
738
21
import Unity.Application 0.1
739
21
import "../Components"
22
import "../Components"
740
22
import "../Components/ListItems" as ListItems
23
import "../Components/ListItems" as ListItems
741
23
24
742
@@ -167,8 +168,7 @@
743
167
                    if (source.toString().indexOf("Apps/RunningApplicationsGrid.qml") != -1) {
168
                    if (source.toString().indexOf("Apps/RunningApplicationsGrid.qml") != -1) {
744
168
                        // TODO: this is still a kludge :D Ideally add some kind of hook so that we
169
                        // TODO: this is still a kludge :D Ideally add some kind of hook so that we
745
169
                        // can do this from DashApps.qml or think a better way that needs no special casing
170
                        // can do this from DashApps.qml or think a better way that needs no special casing
748
170
                        item.firstModel = Qt.binding(function() { return mainStageApplicationsModel })
171
                        item.model = Qt.binding(function() { return runningApps; })
747
171
                        item.secondModel = Qt.binding(function() { return sideStageApplicationModel })
749
172
                        item.canEnableTerminationMode = Qt.binding(function() { return scopeView.isCurrent })
172
                        item.canEnableTerminationMode = Qt.binding(function() { return scopeView.isCurrent })
750
173
                    } else {
173
                    } else {
751
174
                        item.model = Qt.binding(function() { return results })
174
                        item.model = Qt.binding(function() { return results })
752
175
175
753
=== modified file 'qml/Launcher/Launcher.qml'
754
--- qml/Launcher/Launcher.qml	2013-12-11 12:57:14 +0000
755
+++ qml/Launcher/Launcher.qml	2014-03-25 15:08:15 +0000
756
@@ -29,7 +29,8 @@
757
29
    property int dragAreaWidth: units.gu(1)
29
    property int dragAreaWidth: units.gu(1)
758
30
    property int minimizeDistance: units.gu(26)
30
    property int minimizeDistance: units.gu(26)
759
31
    property real progress: dragArea.dragging && dragArea.touchX > panelWidth ?
31
    property real progress: dragArea.dragging && dragArea.touchX > panelWidth ?
761
32
                                (width * (dragArea.touchX-panelWidth) / (width - panelWidth)) : 0
32
                                (width * (dragArea.touchX-panelWidth) / (width - panelWidth)) :
762
33
                                (dragArea.dragging ? 0.001 : 0)
763
33
34
764
34
    readonly property bool shown: panel.x > -panel.width
35
    readonly property bool shown: panel.x > -panel.width
765
35
36
766
36
37
767
=== modified file 'qml/Panel/Panel.qml'
768
--- qml/Panel/Panel.qml	2014-01-14 15:35:57 +0000
769
+++ qml/Panel/Panel.qml	2014-03-25 15:08:15 +0000
770
@@ -62,7 +62,7 @@
771
62
        height: __panelMinusSeparatorLineHeight
62
        height: __panelMinusSeparatorLineHeight
772
63
        y: 0
63
        y: 0
773
64
64
775
65
        Behavior on y { StandardAnimation {} }
65
        Behavior on y { StandardAnimation { duration: UbuntuAnimation.FastDuration } }
776
66
    }
66
    }
777
67
67
778
68
    PanelSeparatorLine {
68
    PanelSeparatorLine {
779
69
69
780
=== modified file 'qml/Shell.qml'
781
--- qml/Shell.qml	2014-03-19 22:21:57 +0000
782
+++ qml/Shell.qml	2014-03-25 15:08:15 +0000
783
@@ -31,7 +31,6 @@
784
31
import "Hud"
31
import "Hud"
785
32
import "Components"
32
import "Components"
786
33
import "Bottombar"
33
import "Bottombar"
787
34
import "SideStage"
788
35
import "Notifications"
34
import "Notifications"
789
36
import Unity.Notifications 1.0 as NotificationBackend
35
import Unity.Notifications 1.0 as NotificationBackend
790
37
36
791
@@ -49,20 +48,24 @@
792
49
    readonly property real panelHeight: panel.panelHeight
48
    readonly property real panelHeight: panel.panelHeight
793
50
49
794
51
    property bool dashShown: dash.shown
50
    property bool dashShown: dash.shown
801
52
    property bool stageScreenshotsReady: {
51
802
53
        if (sideStage.shown) {
52
    property bool sideStageEnabled: shell.width >= units.gu(60)
803
54
            if (mainStage.applications.count > 0) {
53
    readonly property string focusedApplicationId: ApplicationManager.focusedApplicationId
804
55
                return mainStage.usingScreenshots && sideStage.usingScreenshots;
54
805
56
            } else {
55
    function activateApplication(appId) {
806
57
                return sideStage.usingScreenshots;
56
        if (ApplicationManager.findApplication(appId)) {
807
57
            ApplicationManager.requestFocusApplication(appId);
808
58
            stages.show();
809
59
            if (stages.locked && ApplicationManager.focusedApplicationId == appId) {
810
60
                applicationsDisplayLoader.item.select(appId);
811
58
            }
61
            }
812
59
        } else {
62
        } else {
814
60
            return mainStage.usingScreenshots;
63
            var execFlags = shell.sideStageEnabled ? ApplicationManager.NoFlag : ApplicationManager.ForceMainStage;
815
64
            ApplicationManager.startApplication(appId, execFlags);
816
65
            stages.show();
817
61
        }
66
        }
818
62
    }
67
    }
819
63
68
820
64
    property var applicationManager: ApplicationManagerWrapper {}
821
65
822
66
    Binding {
69
    Binding {
823
67
        target: LauncherModel
70
        target: LauncherModel
824
68
        property: "applicationManager"
71
        property: "applicationManager"
825
@@ -71,49 +74,6 @@
826
71
74
827
72
    Component.onCompleted: {
75
    Component.onCompleted: {
828
73
        Theme.name = "Ubuntu.Components.Themes.SuruGradient"
76
        Theme.name = "Ubuntu.Components.Themes.SuruGradient"
829
74
830
75
        applicationManager.sideStageEnabled = Qt.binding(function() { return sideStage.enabled })
831
76
832
77
        // FIXME: if application focused before shell starts, shell draws on top of it only.
833
78
        // We should detect already running applications on shell start and bring them to the front.
834
79
        applicationManager.unfocusCurrentApplication();
835
80
    }
836
81
837
82
    readonly property bool applicationFocused: !!applicationManager.mainStageFocusedApplication
838
83
                                               || !!applicationManager.sideStageFocusedApplication
839
84
    // Used for autopilot testing.
840
85
    readonly property string currentFocusedAppId: ApplicationManager.focusedApplicationId
841
86
842
87
    readonly property bool fullscreenMode: {
843
88
        if (greeter.shown || lockscreen.shown) {
844
89
            return false;
845
90
        } else if (mainStage.usingScreenshots) { // Window Manager animating so want to re-evaluate fullscreen mode
846
91
            return mainStage.switchingFromFullscreenToFullscreen;
847
92
        } else if (applicationManager.mainStageFocusedApplication) {
848
93
            return applicationManager.mainStageFocusedApplication.fullscreen;
849
94
        } else {
850
95
            return false;
851
96
        }
852
97
    }
853
98
854
99
    function activateApplication(appId, argument) {
855
100
        if (applicationManager) {
856
101
            // For newly started applications, as it takes them time to draw their first frame
857
102
            // we add a delay before we hide the animation screenshots to compensate.
858
103
            var addDelay = !applicationManager.getApplicationFromDesktopFile(appId);
859
104
860
105
            var application;
861
106
            application = applicationManager.activateApplication(appId, argument);
862
107
            if (application == null) {
863
108
                return;
864
109
            }
865
110
            if (application.stage == ApplicationInfo.MainStage || !sideStage.enabled) {
866
111
                mainStage.activateApplication(appId, addDelay);
867
112
            } else {
868
113
                sideStage.activateApplication(appId, addDelay);
869
114
            }
870
115
            stages.show();
871
116
        }
872
117
    }
77
    }
873
118
78
874
119
    GSettings {
79
    GSettings {
875
@@ -133,244 +93,219 @@
876
133
    Keys.onVolumeDownPressed: volumeControl.volumeDown()
93
    Keys.onVolumeDownPressed: volumeControl.volumeDown()
877
134
94
878
135
    Item {
95
    Item {
881
136
        id: underlay
96
        id: underlayClipper
880
137
        objectName: "underlay"
882
138
        anchors.fill: parent
97
        anchors.fill: parent
939
139
98
        anchors.rightMargin: stages.overlayWidth
940
140
        // Whether the underlay is fully covered by opaque UI elements.
99
        clip: stages.overlayMode && !stages.painting
941
141
        property bool fullyCovered: panel.indicators.fullyOpened && shell.width <= panel.indicatorsMenuWidth
100
942
142
101
        InputFilterArea {
943
143
        readonly property bool applicationRunning: ((mainStage.applications && mainStage.applications.count > 0)
102
            anchors.fill: parent
944
144
                                           || (sideStage.applications && sideStage.applications.count > 0))
103
            blockInput: parent.clip
945
145
104
        }
946
146
        // Whether the user should see the topmost application surface (if there's one at all).
105
947
147
        readonly property bool applicationSurfaceShouldBeSeen: applicationRunning && !stages.fullyHidden
106
        Item {
948
148
                                           && !mainStage.usingScreenshots // but want sideStage animating over app surface
107
            id: underlay
949
149
108
            objectName: "underlay"
950
150
109
            anchors.fill: parent
951
151
110
            anchors.rightMargin: -parent.anchors.rightMargin
952
152
        // NB! Application surfaces are stacked behing the shell one. So they can only be seen by the user
111
953
153
        // through the translucent parts of the shell surface.
112
            // Whether the underlay is fully covered by opaque UI elements.
954
154
        visible: !fullyCovered && !applicationSurfaceShouldBeSeen
113
            property bool fullyCovered: panel.indicators.fullyOpened && shell.width <= panel.indicatorsMenuWidth
955
155
114
956
156
        Rectangle {
115
            // Whether the user should see the topmost application surface (if there's one at all).
957
157
            anchors.fill: parent
116
            readonly property bool applicationSurfaceShouldBeSeen: stages.shown && !stages.painting && !stages.overlayMode
958
158
            color: "black"
117
959
159
            opacity: dash.disappearingAnimationProgress
118
            // NB! Application surfaces are stacked behind the shell one. So they can only be seen by the user
960
160
        }
119
            // through the translucent parts of the shell surface.
961
161
120
            visible: !fullyCovered && !applicationSurfaceShouldBeSeen
962
162
        Image {
121
963
163
            anchors.fill: dash
122
            CrossFadeImage {
964
164
            source: shell.width > shell.height ? "Dash/graphics/paper_landscape.png" : "Dash/graphics/paper_portrait.png"
123
                id: backgroundImage
965
165
            fillMode: Image.PreserveAspectCrop
124
                objectName: "backgroundImage"
966
166
            horizontalAlignment: Image.AlignRight
125
967
167
            verticalAlignment: Image.AlignTop
126
                anchors.fill: parent
968
168
        }
127
                source: shell.background
969
169
128
                fillMode: Image.PreserveAspectCrop
970
170
        Dash {
129
            }
971
171
            id: dash
130
972
172
            objectName: "dash"
131
            Rectangle {
973
173
132
                anchors.fill: parent
974
174
            available: !greeter.shown && !lockscreen.shown
133
                color: "black"
975
175
            hides: [stages, launcher, panel.indicators]
134
                opacity: dash.disappearingAnimationProgress
976
176
            shown: disappearingAnimationProgress !== 1.0
135
            }
977
177
            enabled: disappearingAnimationProgress === 0.0 && edgeDemo.dashEnabled
136
978
178
            // FIXME: unfocus all applications when going back to the dash
137
            Image {
979
179
            onEnabledChanged: {
138
                anchors.fill: dash
980
180
                if (enabled) {
139
                source: shell.width > shell.height ? "Dash/graphics/paper_landscape.png" : "Dash/graphics/paper_portrait.png"
981
181
                    shell.applicationManager.unfocusCurrentApplication()
140
                fillMode: Image.PreserveAspectCrop
982
182
                }
141
                horizontalAlignment: Image.AlignRight
983
183
            }
142
                verticalAlignment: Image.AlignTop
984
184
143
            }
985
185
            anchors {
144
986
186
                fill: parent
145
            Dash {
987
187
                topMargin: panel.panelHeight
146
                id: dash
988
188
            }
147
                objectName: "dash"
989
189
148
990
190
            contentScale: 1.0 - 0.2 * disappearingAnimationProgress
149
                available: !greeter.shown && !lockscreen.shown
991
191
            opacity: 1.0 - disappearingAnimationProgress
150
                hides: [stages, launcher, panel.indicators]
992
192
            property real disappearingAnimationProgress: {
151
                shown: disappearingAnimationProgress !== 1.0
993
193
                if (greeter.shown) {
152
                enabled: disappearingAnimationProgress === 0.0 && edgeDemo.dashEnabled
994
194
                    return greeter.showProgress;
153
995
154
                anchors {
996
155
                    fill: parent
997
156
                    topMargin: panel.panelHeight
998
157
                }
999
158
1000
159
                contentScale: 1.0 - 0.2 * disappearingAnimationProgress
1001
160
                opacity: 1.0 - disappearingAnimationProgress
1002
161
                property real disappearingAnimationProgress: {
1003
162
                    if (greeter.shown) {
1004
163
                        return greeter.showProgress;
1005
164
                    } else {
1006
165
                        if (stages.overlayMode) {
1007
166
                            return 0;
1008
167
                        }
1009
168
                        return stages.showProgress
1010
169
                    }
1011
170
                }
1012
171
1013
172
                // FIXME: only necessary because stages.showProgress and
1014
173
                // greeterRevealer.animatedProgress are not animated
1015
174
                Behavior on disappearingAnimationProgress { SmoothedAnimation { velocity: 5 }}
1016
175
            }
1017
176
        }
1018
177
    }
1019
178
1020
179
    EdgeDragArea {
1021
180
        id: stagesDragHandle
1022
181
        direction: Direction.Leftwards
1023
182
1024
183
        anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
1025
184
        width: shell.edgeSize
1026
185
1027
186
        property real progress: stages.width
1028
187
1029
188
        onTouchXChanged: {
1030
189
            if (status == DirectionalDragArea.Recognized) {
1031
190
                if (ApplicationManager.count == 0) {
1032
191
                    progress = Math.max(stages.width - stagesDragHandle.width + touchX, stages.width * .3)
1033
195
                } else {
192
                } else {
1035
196
                    return stagesOuterContainer.showProgress;
193
                    progress = stages.width - stagesDragHandle.width + touchX
1036
197
                }
194
                }
1037
198
            }
195
            }
1038
196
        }
1039
199
197
1043
200
            // FIXME: only necessary because stagesOuterContainer.showProgress and
198
        onDraggingChanged: {
1044
201
            // greeterRevealer.animatedProgress are not animated
199
            if (!dragging) {
1045
202
            Behavior on disappearingAnimationProgress { SmoothedAnimation { velocity: 5 }}
200
                if (ApplicationManager.count > 0 && progress < stages.width - units.gu(10)) {
1046
201
                    stages.show()
1047
202
                }
1048
203
                stagesDragHandle.progress = stages.width;
1049
204
            }
1050
203
        }
205
        }
1051
204
    }
206
    }
1052
205
207
1053
206
    Item {
208
    Item {
1056
207
        id: stagesOuterContainer
209
        id: stages
1057
208
210
        objectName: "stages"
1058
209
        width: parent.width
211
        width: parent.width
1059
210
        height: parent.height
212
        height: parent.height
1134
211
        x: launcher.progress
213
1135
212
        Behavior on x {SmoothedAnimation{velocity: 600}}
214
        x: {
1136
213
215
            if (shown) {
1137
214
        property real showProgress:
216
                if (overlayMode || locked) {
1138
215
            MathUtils.clamp(1 - (x + stages.x) / shell.width, 0, 1)
217
                    return 0;
1139
216
218
                }
1140
217
        Showable {
219
                return launcher.progress
1141
218
            id: stages
220
            } else {
1142
219
            objectName: "stages"
221
                return stagesDragHandle.progress
1143
220
222
            }
1144
221
            x: width
223
        }
1145
222
224
1146
223
            property bool fullyShown: shown && x == 0 && parent.x == 0
225
        Behavior on x { SmoothedAnimation { velocity: 600; duration: UbuntuAnimation.FastDuration } }
1147
224
            property bool fullyHidden: !shown && x == width
226
1148
225
            available: !greeter.shown
227
        property bool shown: false
1149
226
            hides: [panel.indicators]
228
1150
227
            shown: false
229
        property real showProgress: overlayMode ? 0 : MathUtils.clamp(1 - x / shell.width, 0, 1)
1151
228
            opacity: 1.0
230
1152
229
            showAnimation: StandardAnimation { property: "x"; duration: 350; to: 0; easing.type: Easing.OutCubic }
231
        property bool fullyShown: x == 0
1153
230
            hideAnimation: StandardAnimation { property: "x"; duration: 350; to: width; easing.type: Easing.OutCubic }
232
        property bool fullyHidden: x == width
1154
231
233
1155
232
            width: parent.width
234
        property bool painting: applicationsDisplayLoader.item ? applicationsDisplayLoader.item.painting : false
1156
233
            height: parent.height
235
        property bool fullscreen: applicationsDisplayLoader.item ? applicationsDisplayLoader.item.fullscreen : false
1157
234
236
        property bool overlayMode: applicationsDisplayLoader.item ? applicationsDisplayLoader.item.overlayMode : false
1158
235
            // close the stages when no focused application remains
237
        property int overlayWidth: applicationsDisplayLoader.item ? applicationsDisplayLoader.item.overlayWidth : false
1159
236
            Connections {
238
        property bool locked: applicationsDisplayLoader.item ? applicationsDisplayLoader.item.locked : false
1160
237
                target: shell.applicationManager
239
1161
238
                onMainStageFocusedApplicationChanged: stages.closeIfNoApplications()
240
        function show() {
1162
239
                onSideStageFocusedApplicationChanged: stages.closeIfNoApplications()
241
            shown = true;
1163
240
                ignoreUnknownSignals: true
242
            panel.indicators.hide();
1164
241
            }
243
            if (!ApplicationManager.focusedApplicationId && ApplicationManager.count > 0) {
1165
242
244
                ApplicationManager.focusApplication(ApplicationManager.get(0).appId);
1166
243
            function closeIfNoApplications() {
245
            }
1167
244
                if (!shell.applicationManager.mainStageFocusedApplication
246
        }
1168
245
                 && !shell.applicationManager.sideStageFocusedApplication
247
1169
246
                 && shell.applicationManager.mainStageApplications.count == 0
248
        function hide() {
1170
247
                 && shell.applicationManager.sideStageApplications.count == 0) {
249
            shown = false;
1171
248
                    stages.hide();
250
            if (ApplicationManager.focusedApplicationId) {
1172
249
                }
251
                ApplicationManager.unfocusCurrentApplication();
1173
250
            }
252
            }
1174
251
253
        }
1175
252
            // show the stages when an application gets the focus
254
1176
253
            Connections {
255
        Connections {
1177
254
                target: shell.applicationManager
256
            target: ApplicationManager
1178
255
                onMainStageFocusedApplicationChanged: {
257
1179
256
                    if (shell.applicationManager.mainStageFocusedApplication) {
258
            onFocusRequested: {
1180
257
                        mainStage.show();
259
                stages.show();
1181
258
                        stages.show();
260
            }
1182
259
                    }
261
1183
260
                }
262
            onFocusedApplicationIdChanged: {
1184
261
                onSideStageFocusedApplicationChanged: {
263
                if (ApplicationManager.focusedApplicationId.length > 0) {
1111
262
                    if (shell.applicationManager.sideStageFocusedApplication) {
1112
263
                        sideStage.show();
1113
264
                        stages.show();
1114
265
                    }
1115
266
                }
1116
267
                ignoreUnknownSignals: true
1117
268
            }
1118
269
1119
270
            Stage {
1120
271
                id: mainStage
1121
272
1122
273
                anchors.fill: parent
1123
274
                fullyShown: stages.fullyShown
1124
275
                fullyHidden: stages.fullyHidden
1125
276
                shouldUseScreenshots: !fullyShown
1126
277
                rightEdgeEnabled: !sideStage.enabled
1127
278
1128
279
                applicationManager: shell.applicationManager
1129
280
                rightEdgeDraggingAreaWidth: shell.edgeSize
1130
281
                normalApplicationY: shell.panelHeight
1131
282
1132
283
                shown: true
1133
284
                function show() {
1185
285
                    stages.show();
264
                    stages.show();
1209
286
                }
265
                } else {
1210
287
                function hide() {
266
                    if (!stages.overlayMode) {
1188
288
                }
1189
289
1190
290
                // FIXME: workaround the fact that focusing a main stage application
1191
291
                // raises its surface on top of all other surfaces including the ones
1192
292
                // that belong to side stage applications.
1193
293
                onFocusedApplicationChanged: {
1194
294
                    if (focusedApplication && sideStage.focusedApplication && sideStage.fullyShown) {
1195
295
                        shell.applicationManager.focusApplication(sideStage.focusedApplication);
1196
296
                    }
1197
297
                }
1198
298
            }
1199
299
1200
300
            SideStage {
1201
301
                id: sideStage
1202
302
1203
303
                applicationManager: shell.applicationManager
1204
304
                rightEdgeDraggingAreaWidth: shell.edgeSize
1205
305
                normalApplicationY: shell.panelHeight
1206
306
1207
307
                onShownChanged: {
1208
308
                    if (!shown && mainStage.applications.count == 0) {
1211
309
                        stages.hide();
267
                        stages.hide();
1212
310
                    }
268
                    }
1213
311
                }
269
                }
1221
312
                // FIXME: when hiding the side stage, refocus the main stage
270
1222
313
                // application so that it goes in front of the side stage
271
                // If any app is focused when greeter is open, it's due to a user action
1223
314
                // application and hides it
272
                // like a snap decision (say, an incoming call).
1224
315
                onFullyShownChanged: {
273
                // TODO: these should be protected to only unlock for certain applications / certain usecases
1225
316
                    if (!fullyShown && stages.fullyShown && sideStage.focusedApplication != null) {
274
                // potentially only in connection with a notification.
1226
317
                        shell.applicationManager.focusApplication(mainStage.focusedApplication);
275
                greeter.hide()
1227
318
                    }
276
            }
1228
277
1229
278
            onApplicationAdded: {
1230
279
                stages.show();
1231
280
            }
1232
281
1233
282
            onApplicationRemoved: {
1234
283
                if (ApplicationManager.focusedApplicationId.length == 0) {
1235
284
                    stages.hide();
1236
319
                }
285
                }
1291
320
286
            }
1292
321
                enabled: shell.width >= units.gu(100)
287
        }
1293
322
                visible: enabled
288
1294
323
                fullyShown: stages.fullyShown && shown
289
        Loader {
1295
324
                            && sideStage[sideStageRevealer.boundProperty] == sideStageRevealer.openedValue
290
            id: applicationsDisplayLoader
1296
325
                shouldUseScreenshots: !fullyShown || mainStage.usingScreenshots || sideStageRevealer.pressed
291
            anchors.fill: parent
1297
326
292
1298
327
                available: !greeter.shown && !lockscreen.shown && enabled
293
            source: shell.sideStageEnabled ? "Stages/StageWithSideStage.qml" : "Stages/PhoneStage.qml"
1299
328
                hides: [launcher, panel.indicators]
294
1300
329
                shown: false
295
            Binding {
1301
330
                showAnimation: StandardAnimation { property: "x"; duration: 350; to: sideStageRevealer.openedValue; easing.type: Easing.OutQuint }
296
                target: applicationsDisplayLoader.item
1302
331
                hideAnimation: StandardAnimation { property: "x"; duration: 350; to: sideStageRevealer.closedValue; easing.type: Easing.OutQuint }
297
                property: "moving"
1303
332
298
                value: !stages.fullyShown
1304
333
                width: units.gu(40)
299
            }
1305
334
                height: stages.height
300
            Binding {
1306
335
                handleExpanded: sideStageRevealer.pressed
301
                target: applicationsDisplayLoader.item
1307
336
            }
302
                property: "shown"
1308
337
303
                value: stages.shown
1309
338
            Revealer {
304
            }
1310
339
                id: sideStageRevealer
305
            Binding {
1311
340
306
                target: applicationsDisplayLoader.item
1312
341
                enabled: mainStage.applications.count > 0 && sideStage.applications.count > 0
307
                property: "dragAreaWidth"
1313
342
                         && sideStage.available
308
                value: shell.edgeSize
1260
343
                direction: Qt.RightToLeft
1261
344
                openedValue: parent.width - sideStage.width
1262
345
                hintDisplacement: units.gu(3)
1263
346
                /* The size of the sidestage handle needs to be bigger than the
1264
347
                   typical size used for edge detection otherwise it is really
1265
348
                   hard to grab.
1266
349
                */
1267
350
                handleSize: sideStage.shown ? units.gu(4) : shell.edgeSize
1268
351
                closedValue: parent.width + sideStage.handleSizeCollapsed
1269
352
                target: sideStage
1270
353
                x: parent.width - width
1271
354
                width: sideStage.width + handleSize * 0.7
1272
355
                height: sideStage.height
1273
356
                orientation: Qt.Horizontal
1274
357
            }
1275
358
1276
359
            DragHandle {
1277
360
                id: stagesDragHandle
1278
361
1279
362
                anchors.top: parent.top
1280
363
                anchors.bottom: parent.bottom
1281
364
                anchors.right: parent.left
1282
365
1283
366
                width: shell.edgeSize
1284
367
                direction: Direction.Leftwards
1285
368
                enabled: greeter.showProgress == 0 && edgeDemo.dashEnabled
1286
369
                property bool haveApps: mainStage.applications.count > 0 || sideStage.applications.count > 0
1287
370
1288
371
                maxTotalDragDistance: haveApps ? parent.width : parent.width * 0.7
1289
372
                // Make autocompletion impossible when !haveApps
1290
373
                edgeDragEvaluator.minDragDistance: haveApps ? maxTotalDragDistance * 0.1 : Number.MAX_VALUE
1314
374
            }
309
            }
1315
375
        }
310
        }
1316
376
    }
311
    }
1317
@@ -447,26 +382,6 @@
1318
447
382
1319
448
        dragHandleWidth: shell.edgeSize
383
        dragHandleWidth: shell.edgeSize
1320
449
384
1321
450
        property var previousMainApp: null
1322
451
        property var previousSideApp: null
1323
452
1324
453
        function removeApplicationFocus() {
1325
454
            greeter.previousMainApp = applicationManager.mainStageFocusedApplication;
1326
455
            greeter.previousSideApp = applicationManager.sideStageFocusedApplication;
1327
456
            applicationManager.unfocusCurrentApplication();
1328
457
        }
1329
458
1330
459
        function restoreApplicationFocus() {
1331
460
            if (greeter.previousMainApp) {
1332
461
                applicationManager.focusApplication(greeter.previousMainApp);
1333
462
                greeter.previousMainApp = null;
1334
463
            }
1335
464
            if (greeter.previousSideApp) {
1336
465
                applicationManager.focusApplication(greeter.previousSideApp);
1337
466
                greeter.previousSideApp = null;
1338
467
            }
1339
468
        }
1340
469
1341
470
        onShownChanged: {
385
        onShownChanged: {
1342
471
            if (shown) {
386
            if (shown) {
1343
472
                lockscreen.reset();
387
                lockscreen.reset();
1344
@@ -476,9 +391,6 @@
1345
476
                    LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
391
                    LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
1346
477
                }
392
                }
1347
478
                greeter.forceActiveFocus();
393
                greeter.forceActiveFocus();
1348
479
                removeApplicationFocus();
1349
480
            } else {
1350
481
                restoreApplicationFocus();
1351
482
            }
394
            }
1352
483
        }
395
        }
1353
484
396
1354
@@ -496,33 +408,16 @@
1355
496
            }
408
            }
1356
497
        }
409
        }
1357
498
410
1379
499
        Connections {
411
        Binding {
1380
500
            target: applicationManager
412
            target: ApplicationManager
1381
501
            ignoreUnknownSignals: true
413
            property: "suspended"
1382
502
            // If any app is focused when greeter is open, it's due to a user action
414
            value: greeter.shown && greeter.showProgress == 1
1362
503
            // like a snap decision (say, an incoming call).
1363
504
            // TODO: these should be protected to only unlock for certain applications / certain usecases
1364
505
            // potentially only in connection with a notification.
1365
506
            onMainStageFocusedApplicationChanged: {
1366
507
                if (greeter.shown && applicationManager.mainStageFocusedApplication) {
1367
508
                    greeter.previousMainApp = null // make way for new focused app
1368
509
                    greeter.previousSideApp = null
1369
510
                    greeter.hide()
1370
511
                }
1371
512
            }
1372
513
            onSideStageFocusedApplicationChanged: {
1373
514
                if (greeter.shown && applicationManager.sideStageFocusedApplication) {
1374
515
                    greeter.previousMainApp = null // make way for new focused app
1375
516
                    greeter.previousSideApp = null
1376
517
                    greeter.hide()
1377
518
                }
1378
519
            }
1383
520
        }
415
        }
1384
521
    }
416
    }
1385
522
417
1386
523
    InputFilterArea {
418
    InputFilterArea {
1387
524
        anchors.fill: parent
419
        anchors.fill: parent
1389
525
        blockInput: !applicationFocused || greeter.shown || lockscreen.shown || launcher.shown
420
        blockInput: ApplicationManager.focusedApplicationId.length === 0 || greeter.shown || lockscreen.shown || launcher.shown
1390
526
                    || panel.indicators.shown || hud.shown
421
                    || panel.indicators.shown || hud.shown
1391
527
    }
422
    }
1392
528
423
1393
@@ -571,7 +466,9 @@
1394
571
                available: edgeDemo.panelEnabled
466
                available: edgeDemo.panelEnabled
1395
572
                contentEnabled: edgeDemo.panelContentEnabled
467
                contentEnabled: edgeDemo.panelContentEnabled
1396
573
            }
468
            }
1398
574
            fullscreenMode: shell.fullscreenMode
469
            property string focusedAppId: ApplicationManager.focusedApplicationId
1399
470
            property var focusedApplication: ApplicationManager.findApplication(focusedAppId)
1400
471
            fullscreenMode: focusedApplication && stages.fullscreen && !greeter.shown && !lockscreen.shown
1401
575
            searchVisible: !greeter.shown && !lockscreen.shown && dash.shown && dash.searchable
472
            searchVisible: !greeter.shown && !lockscreen.shown && dash.shown && dash.searchable
1402
576
473
1403
577
            InputFilterArea {
474
            InputFilterArea {
1404
@@ -597,9 +494,8 @@
1405
597
            hideAnimation: StandardAnimation { property: "y"; duration: hud.showableAnimationDuration; to: hudRevealer.closedValue; easing.type: Easing.Linear }
494
            hideAnimation: StandardAnimation { property: "y"; duration: hud.showableAnimationDuration; to: hudRevealer.closedValue; easing.type: Easing.Linear }
1406
598
495
1407
599
            Connections {
496
            Connections {
1411
600
                target: shell.applicationManager
497
                target: ApplicationManager
1412
601
                onMainStageFocusedApplicationChanged: hud.hide()
498
                onFocusedApplicationIdChanged: hud.hide()
1410
602
                onSideStageFocusedApplicationChanged: hud.hide()
1413
603
            }
499
            }
1414
604
        }
500
        }
1415
605
501
1416
@@ -624,7 +520,7 @@
1417
624
            theHud: hud
520
            theHud: hud
1418
625
            anchors.fill: parent
521
            anchors.fill: parent
1419
626
            enabled: hud.available
522
            enabled: hud.available
1421
627
            applicationIsOnForeground: applicationFocused
523
            applicationIsOnForeground: ApplicationManager.focusedApplicationId
1422
628
        }
524
        }
1423
629
525
1424
630
        InputFilterArea {
526
        InputFilterArea {
1425
@@ -655,9 +551,11 @@
1426
655
                showHome()
551
                showHome()
1427
656
            }
552
            }
1428
657
            onDash: {
553
            onDash: {
1432
658
                if (stages.shown) {
554
                if (stages.shown && !stages.overlayMode) {
1433
659
                    stages.hide();
555
                    if (!stages.locked) {
1434
660
                    launcher.hide();
556
                        stages.hide();
1435
557
                        launcher.hide();
1436
558
                    }
1437
661
                }
559
                }
1438
662
            }
560
            }
1439
663
            onDashSwipeChanged: if (dashSwipe && stages.shown) dash.setCurrentScope("clickscope", false, true)
561
            onDashSwipeChanged: if (dashSwipe && stages.shown) dash.setCurrentScope("clickscope", false, true)
1440
@@ -750,14 +648,14 @@
1441
750
        anchors.bottom: parent.bottom
648
        anchors.bottom: parent.bottom
1442
751
        anchors.left: parent.left
649
        anchors.left: parent.left
1443
752
        anchors.right: parent.right
650
        anchors.right: parent.right
1445
753
        height: shell.applicationManager ? shell.applicationManager.keyboardHeight : 0
651
        height: ApplicationManager.keyboardVisible ? ApplicationManager.keyboardHeight : 0
1446
754
652
1448
755
        enabled: shell.applicationManager && shell.applicationManager.keyboardVisible
653
        enabled: ApplicationManager.keyboardVisible
1449
756
    }
654
    }
1450
757
655
1451
758
    Label {
656
    Label {
1452
759
        anchors.centerIn: parent
657
        anchors.centerIn: parent
1454
760
        visible: applicationManager.fake
658
        visible: ApplicationManager.fake ? ApplicationManager.fake : false
1455
761
        text: "EARLY ALPHA\nNOT READY FOR USE"
659
        text: "EARLY ALPHA\nNOT READY FOR USE"
1456
762
        color: "lightgrey"
660
        color: "lightgrey"
1457
763
        opacity: 0.2
661
        opacity: 0.2
1458
764
662
1459
=== removed directory 'qml/SideStage'
1460
=== removed file 'qml/SideStage/SideStage.qml'
1461
--- qml/SideStage/SideStage.qml	2014-02-03 13:31:28 +0000
1462
+++ qml/SideStage/SideStage.qml	1970-01-01 00:00:00 +0000
1463
@@ -1,73 +0,0 @@
1464
1
/*
1465
2
 * Copyright (C) 2013 Canonical, Ltd.
1466
3
 *
1467
4
 * This program is free software; you can redistribute it and/or modify
1468
5
 * it under the terms of the GNU General Public License as published by
1469
6
 * the Free Software Foundation; version 3.
1470
7
 *
1471
8
 * This program is distributed in the hope that it will be useful,
1472
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1473
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1474
11
 * GNU General Public License for more details.
1475
12
 *
1476
13
 * You should have received a copy of the GNU General Public License
1477
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1478
15
 */
1479
16
1480
17
import QtQuick 2.0
1481
18
import Unity.Application 0.1
1482
19
import Ubuntu.Components 0.1
1483
20
import "../Components"
1484
21
1485
22
Stage {
1486
23
    id: stage
1487
24
1488
25
    type: ApplicationInfo.SideStage
1489
26
    property real handleSizeCollapsed: units.gu(2.5)
1490
27
    property real handleSizeExpanded: units.gu(4)
1491
28
    property bool handleExpanded
1492
29
1493
30
    /* FIXME: workaround so that when a main stage app goes fullscreen
1494
31
       the sidestage's top is not transparent. Proper fix would be to
1495
32
       resize the side stage app.
1496
33
    */
1497
34
    Rectangle {
1498
35
        id: backgroundBeneathPanel
1499
36
        anchors {
1500
37
            top: parent.top
1501
38
            left: parent.left
1502
39
            right: parent.right
1503
40
        }
1504
41
        height: shell.panelHeight
1505
42
        color: background.color
1506
43
        z: -1
1507
44
    }
1508
45
1509
46
    Rectangle {
1510
47
        id: background
1511
48
        anchors.fill: parent
1512
49
        color: "#2c2924"
1513
50
        z: -1
1514
51
        visible: stage.usingScreenshots
1515
52
    }
1516
53
1517
54
    SidestageHandle {
1518
55
        id: handle
1519
56
        objectName: "sideStageHandle"
1520
57
1521
58
        anchors {
1522
59
            top: parent.top
1523
60
            bottom: parent.bottom
1524
61
            left: parent.left
1525
62
            leftMargin: -width
1526
63
        }
1527
64
        width: handleExpanded ? handleSizeExpanded : handleSizeCollapsed
1528
65
        Behavior on width { NumberAnimation { easing.type: Easing.OutQuart} }
1529
66
        z: -1
1530
67
    }
1531
68
1532
69
    InputFilterArea {
1533
70
        anchors.fill: handle
1534
71
        blockInput: visible
1535
72
    }
1536
73
}
1537
74
0
1538
=== removed directory 'qml/SideStage/graphics'
1539
=== added directory 'qml/Stages'
1540
=== added file 'qml/Stages/PhoneStage.qml'
1541
--- qml/Stages/PhoneStage.qml	1970-01-01 00:00:00 +0000
1542
+++ qml/Stages/PhoneStage.qml	2014-03-25 15:08:15 +0000
1543
@@ -0,0 +1,501 @@
1544
1
/*
1545
2
 * Copyright (C) 2014 Canonical, Ltd.
1546
3
 *
1547
4
 * This program is free software; you can redistribute it and/or modify
1548
5
 * it under the terms of the GNU General Public License as published by
1549
6
 * the Free Software Foundation; version 3.
1550
7
 *
1551
8
 * This program is distributed in the hope that it will be useful,
1552
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1553
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1554
11
 * GNU General Public License for more details.
1555
12
 *
1556
13
 * You should have received a copy of the GNU General Public License
1557
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1558
15
 */
1559
16
1560
17
import QtQuick 2.0
1561
18
import Ubuntu.Components 0.1
1562
19
import Ubuntu.Gestures 0.1
1563
20
import Unity.Application 0.1
1564
21
import Utils 0.1
1565
22
import "../Components"
1566
23
1567
24
Item {
1568
25
    id: root
1569
26
1570
27
    // Controls to be set from outside
1571
28
    property bool shown: false
1572
29
    property bool moving: false
1573
30
    property int dragAreaWidth
1574
31
1575
32
    // State information propagated to the outside
1576
33
    readonly property bool painting: mainScreenshotImage.visible || fadeInScreenshotImage.visible || appSplash.visible || spreadView.visible
1577
34
    property bool fullscreen: priv.focusedApplication ? priv.focusedApplication.fullscreen : false
1578
35
    property bool locked: spreadView.visible
1579
36
1580
37
    // Not used for PhoneStage, only useful for SideStage and similar
1581
38
    property bool overlayMode: false
1582
39
    property int overlayWidth: 0
1583
40
1584
41
    function select(appId) {
1585
42
        spreadView.snapTo(priv.indexOf(appId))
1586
43
    }
1587
44
1588
45
    onMovingChanged: {
1589
46
        if (moving) {
1590
47
            if (ApplicationManager.focusedApplicationId) {
1591
48
                priv.requestNewScreenshot();
1592
49
            } else {
1593
50
                mainScreenshotImage.anchors.leftMargin = 0;
1594
51
                mainScreenshotImage.source = ApplicationManager.get(0).screenshot;
1595
52
                mainScreenshotImage.visible = true;
1596
53
            }
1597
54
        } else {
1598
55
            mainScreenshotImage.visible = false;
1599
56
        }
1600
57
    }
1601
58
1602
59
    Connections {
1603
60
        target: ApplicationManager
1604
61
1605
62
        onFocusRequested: {
1606
63
            if (spreadView.visible) {
1607
64
                spreadView.snapTo(priv.indexOf(appId));
1608
65
            } else {
1609
66
                priv.switchToApp(appId);
1610
67
            }
1611
68
        }
1612
69
1613
70
        onFocusedApplicationIdChanged: {
1614
71
            if (ApplicationManager.focusedApplicationId.length > 0) {
1615
72
                if (priv.secondApplicationStarting || priv.applicationStarting) {
1616
73
                    appSplashTimer.start();
1617
74
                } else {
1618
75
                    var application = priv.focusedApplication;
1619
76
                    root.fullscreen = application.fullscreen;
1620
77
                    mainScreenshotImage.source = application.screenshot;
1621
78
                }
1622
79
            } else {
1623
80
                spreadView.selectedIndex = -1;
1624
81
                spreadView.phase = 0;
1625
82
                spreadView.contentX = -spreadView.shift;
1626
83
            }
1627
84
        }
1628
85
1629
86
        onApplicationAdded: {
1630
87
            if (!priv.focusedApplication) {
1631
88
                mainScreenshotImage.source = "";
1632
89
                mainScreenshotImage.visible = false;
1633
90
                priv.applicationStarting = true;
1634
91
            } else {
1635
92
                mainScreenshotImage.source = "";
1636
93
                priv.newFocusedAppId = appId;
1637
94
                priv.secondApplicationStarting = true;
1638
95
                priv.requestNewScreenshot();
1639
96
            }
1640
97
1641
98
            if (spreadView.visible) {
1642
99
                spreadView.snapTo(0);
1643
100
            }
1644
101
        }
1645
102
1646
103
        onApplicationRemoved: {
1647
104
            if (ApplicationManager.count == 0) {
1648
105
                mainScreenshotImage.source = ""
1649
106
                mainScreenshotImage.visible = false;
1650
107
            } else {
1651
108
                mainScreenshotImage.source = ApplicationManager.get(0).screenshot;
1652
109
            }
1653
110
        }
1654
111
    }
1655
112
1656
113
    QtObject {
1657
114
        id: priv
1658
115
1659
116
        property string focusedAppId: ApplicationManager.focusedApplicationId
1660
117
        property var focusedApplication: ApplicationManager.findApplication(focusedAppId)
1661
118
        property url focusedScreenshot: focusedApplication ? focusedApplication.screenshot : ""
1662
119
1663
120
        property bool waitingForScreenshot: false
1664
121
1665
122
        property bool applicationStarting: false
1666
123
        property bool secondApplicationStarting: false
1667
124
1668
125
        property string newFocusedAppId
1669
126
1670
127
        onFocusedScreenshotChanged: {
1671
128
            if (root.moving && priv.waitingForScreenshot) {
1672
129
                mainScreenshotImage.anchors.leftMargin = 0;
1673
130
                mainScreenshotImage.source = priv.focusedScreenshot
1674
131
                mainScreenshotImage.visible = true;
1675
132
            } else if (priv.secondApplicationStarting && priv.waitingForScreenshot) {
1676
133
                applicationSwitchingAnimation.start();
1677
134
            }
1678
135
            waitingForScreenshot = false;
1679
136
        }
1680
137
1681
138
        function requestNewScreenshot() {
1682
139
            waitingForScreenshot = true;
1683
140
            ApplicationManager.updateScreenshot(focusedAppId);
1684
141
        }
1685
142
1686
143
        function switchToApp(appId) {
1687
144
            if (priv.focusedAppId) {
1688
145
                priv.newFocusedAppId = appId;
1689
146
                root.fullscreen = ApplicationManager.findApplication(appId).fullscreen;
1690
147
                applicationSwitchingAnimation.start();
1691
148
            } else {
1692
149
                ApplicationManager.focusApplication(appId);
1693
150
            }
1694
151
        }
1695
152
1696
153
        function indexOf(appId) {
1697
154
            for (var i = 0; i < ApplicationManager.count; i++) {
1698
155
                if (ApplicationManager.get(i).appId == appId) {
1699
156
                    return i;
1700
157
                }
1701
158
            }
1702
159
            return -1;
1703
160
        }
1704
161
1705
162
    }
1706
163
1707
164
    // FIXME: the signal connections seems to get lost.
1708
165
    Connections {
1709
166
        target: priv.focusedApplication
1710
167
        onScreenshotChanged: priv.focusedScreenshot = priv.focusedApplication.screenshot
1711
168
    }
1712
169
    Binding {
1713
170
        target: root
1714
171
        property: "fullscreen"
1715
172
        value: priv.focusedApplication ? priv.focusedApplication.fullscreen : false
1716
173
    }
1717
174
1718
175
    Timer {
1719
176
        id: appSplashTimer
1720
177
        // FIXME: apart from removing this completely in the future and make the app surface paint
1721
178
        // meaningful stuff, also check for colin's stuff to land so we can shape 1.4 secs away from here
1722
179
        // https://code.launchpad.net/~cjwatson/upstart-app-launch/libclick-manifest/+merge/210520
1723
180
        // https://code.launchpad.net/~cjwatson/upstart-app-launch/libclick-pkgdir/+merge/209909
1724
181
        interval: 1700
1725
182
        repeat: false
1726
183
        onTriggered: {
1727
184
            priv.applicationStarting = false;
1728
185
            priv.secondApplicationStarting = false;
1729
186
        }
1730
187
    }
1731
188
1732
189
    SequentialAnimation {
1733
190
        id: applicationSwitchingAnimation
1734
191
        // setup
1735
192
        PropertyAction { target: mainScreenshotImage; property: "anchors.leftMargin"; value: 0 }
1736
193
        PropertyAction { target: mainScreenshotImage; property: "source"; value: priv.focusedScreenshot }
1737
194
        PropertyAction { targets: [mainScreenshotImage, fadeInScreenshotImage]; property: "visible"; value: true }
1738
195
        PropertyAction { target: fadeInScreenshotImage; property: "source"; value: {
1739
196
                var newFocusedApp = ApplicationManager.findApplication(priv.newFocusedAppId);
1740
197
                return newFocusedApp ? newFocusedApp.screenshot : "" }
1741
198
        }
1742
199
        PropertyAction { target: fadeInScreenshotImage; property: "opacity"; value: 0 }
1743
200
        PropertyAction { target: fadeInScreenshotImage; property: "scale"; value: .8 }
1744
201
1745
202
1746
203
        // The actual animation
1747
204
        ParallelAnimation {
1748
205
            UbuntuNumberAnimation { target: mainScreenshotImage; property: "anchors.leftMargin"; to: root.width; duration: UbuntuAnimation.SlowDuration }
1749
206
            UbuntuNumberAnimation { target: fadeInScreenshotImage; properties: "opacity,scale"; to: 1; duration: UbuntuAnimation.SlowDuration }
1750
207
        }
1751
208
1752
209
        // restore stuff
1753
210
        ScriptAction { script: ApplicationManager.focusApplication(priv.newFocusedAppId); }
1754
211
        PropertyAction { target: fadeInScreenshotImage; property: "visible"; value: false }
1755
212
        PropertyAction { target: mainScreenshotImage; property: "visible"; value: false }
1756
213
    }
1757
214
1758
215
    // FIXME: Drop this and make the imageprovider show a splashscreen instead
1759
216
    Rectangle {
1760
217
        id: appSplash2
1761
218
        anchors.fill: parent
1762
219
        color: "white"
1763
220
        visible: priv.secondApplicationStarting
1764
221
    }
1765
222
    Image {
1766
223
        id: fadeInScreenshotImage
1767
224
        anchors { left: parent.left; bottom: parent.bottom }
1768
225
        width: parent.width
1769
226
        scale: .7
1770
227
        visible: false
1771
228
    }
1772
229
1773
230
    Rectangle {
1774
231
        id: appSplash
1775
232
        anchors.fill: parent
1776
233
        color: "white"
1777
234
        visible: priv.applicationStarting
1778
235
    }
1779
236
    Image {
1780
237
        id: mainScreenshotImage
1781
238
        anchors { left: parent.left; bottom: parent.bottom }
1782
239
        width: parent.width
1783
240
        visible: false
1784
241
    }
1785
242
1786
243
    EdgeDragArea {
1787
244
        id: spreadDragArea
1788
245
        direction: Direction.Leftwards
1789
246
        enabled: ApplicationManager.count > 1 && spreadView.phase != 2
1790
247
1791
248
        anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
1792
249
        width: root.dragAreaWidth
1793
250
1794
251
        // Sitting at the right edge of the screen, this EdgeDragArea directly controls the spreadView when
1795
252
        // attachedToView is true. When the finger movement passes positionMarker3 we detach it from the
1796
253
        // spreadView and make the spreadView snap to positionMarker4.
1797
254
        property bool attachedToView: true
1798
255
1799
256
        property var gesturePoints: new Array()
1800
257
1801
258
        onTouchXChanged: {
1802
259
            if (!dragging && !priv.waitingForScreenshot) {
1803
260
                // Initial touch. Let's update the screenshot and reset the spreadView to the starting position.
1804
261
                priv.requestNewScreenshot();
1805
262
                spreadView.phase = 0;
1806
263
                spreadView.contentX = -spreadView.shift;
1807
264
            }
1808
265
            if (dragging && attachedToView) {
1809
266
                // Gesture recognized. Let's move the spreadView with the finger
1810
267
                spreadView.contentX = -touchX - spreadView.shift;
1811
268
            }
1812
269
            if (attachedToView && spreadView.shiftedContentX >= spreadView.width * spreadView.positionMarker3) {
1813
270
                // We passed positionMarker3. Detach from spreadView and snap it.
1814
271
                attachedToView = false;
1815
272
                spreadView.snap();
1816
273
            }
1817
274
            gesturePoints.push(touchX);
1818
275
        }
1819
276
1820
277
        onStatusChanged: {
1821
278
            if (status == DirectionalDragArea.Recognized) {
1822
279
                attachedToView = true;
1823
280
            }
1824
281
        }
1825
282
1826
283
        onDraggingChanged: {
1827
284
            if (dragging) {
1828
285
                // Gesture recognized. Start recording this gesture
1829
286
                gesturePoints = [];
1830
287
                return;
1831
288
            }
1832
289
1833
290
            // Ok. The user released. Find out if it was a one-way movement.
1834
291
            var oneWayFlick = true;
1835
292
            var smallestX = spreadDragArea.width;
1836
293
            for (var i = 0; i < gesturePoints.length; i++) {
1837
294
                if (gesturePoints[i] >= smallestX) {
1838
295
                    oneWayFlick = false;
1839
296
                    break;
1840
297
                }
1841
298
                smallestX = gesturePoints[i];
1842
299
            }
1843
300
            gesturePoints = [];
1844
301
1845
302
            if (oneWayFlick && spreadView.shiftedContentX > units.gu(2) &&
1846
303
                    spreadView.shiftedContentX < spreadView.positionMarker1 * spreadView.width) {
1847
304
                // If it was a short one-way movement, do the Alt+Tab switch
1848
305
                // no matter if we didn't cross positionMarker1 yet.
1849
306
                spreadView.snapTo(1);
1850
307
            } else if (!dragging && attachedToView) {
1851
308
                // otherwise snap to the closest snap position we can find
1852
309
                // (might be back to start, to app 1 or to spread)
1853
310
                spreadView.snap();
1854
311
            }
1855
312
        }
1856
313
    }
1857
314
1858
315
    Rectangle {
1859
316
        id: coverFlipBackground
1860
317
        anchors.fill: parent
1861
318
        color: "black"
1862
319
        visible: spreadView.visible
1863
320
    }
1864
321
1865
322
    InputFilterArea {
1866
323
        anchors.fill: root
1867
324
        blockInput: spreadView.visible
1868
325
    }
1869
326
1870
327
    Flickable {
1871
328
        id: spreadView
1872
329
        objectName: "spreadView"
1873
330
        anchors.fill: parent
1874
331
        visible: spreadDragArea.status == DirectionalDragArea.Recognized || phase > 1 || snapAnimation.running
1875
332
        contentWidth: spreadRow.width - shift
1876
333
        contentX: -shift
1877
334
1878
335
        // The flickable needs to fill the screen in order to get touch events all over.
1879
336
        // However, we don't want to the user to be able to scroll back all the way. For
1880
337
        // that, the beginning of the gesture starts with a negative value for contentX
1881
338
        // so the flickable wants to pull it into the view already. "shift" tunes the
1882
339
        // distance where to "lock" the content.
1883
340
        property real shift: width / 2
1884
341
        property real shiftedContentX: contentX + shift
1885
342
1886
343
        property int tileDistance: width / 4
1887
344
1888
345
        // Those markers mark the various positions in the spread (ratio to screen width from right to left):
1889
346
        // 0 - 1: following finger, snap back to the beginning on release
1890
347
        property real positionMarker1: 0.3
1891
348
        // 1 - 2: curved snapping movement, snap to app 1 on release
1892
349
        property real positionMarker2: 0.45
1893
350
        // 2 - 3: movement follows finger, snaps back to app 1 on release
1894
351
        property real positionMarker3: 0.6
1895
352
        // passing 3, we detach movement from the finger and snap to 4
1896
353
        property real positionMarker4: 0.9
1897
354
1898
355
        // This is where the first app snaps to when bringing it in from the right edge.
1899
356
        property real snapPosition: 0.75
1900
357
1901
358
        // Phase of the animation:
1902
359
        // 0: Starting from right edge, a new app (index 1) comes in from the right
1903
360
        // 1: The app has reached the first snap position.
1904
361
        // 2: The list is dragged further and snaps into the spread view when entering phase 2
1905
362
        property int phase: 0
1906
363
1907
364
        property int selectedIndex: -1
1908
365
1909
366
        onShiftedContentXChanged: {
1910
367
            switch (phase) {
1911
368
            case 0:
1912
369
                if (shiftedContentX > width * positionMarker2) {
1913
370
                    phase = 1;
1914
371
                }
1915
372
                break;
1916
373
            case 1:
1917
374
                if (shiftedContentX < width * positionMarker2) {
1918
375
                    phase = 0;
1919
376
                } else if (shiftedContentX >= width * positionMarker4) {
1920
377
                    phase = 2;
1921
378
                }
1922
379
                break;
1923
380
            }
1924
381
        }
1925
382
1926
383
        function snap() {
1927
384
            if (shiftedContentX < positionMarker1 * width) {
1928
385
                snapAnimation.targetContentX = -shift;
1929
386
                snapAnimation.start();
1930
387
            } else if (shiftedContentX < positionMarker2 * width) {
1931
388
                snapTo(1)
1932
389
            } else if (shiftedContentX < positionMarker3 * width) {
1933
390
                snapTo(1)
1934
391
            } else if (phase < 2){
1935
392
                // Add 1 pixel to make sure we definitely hit positionMarker4 even with rounding errors of the animation.
1936
393
                snapAnimation.targetContentX = width * positionMarker4 + 1 - shift;
1937
394
                snapAnimation.start();
1938
395
            }
1939
396
        }
1940
397
        function snapTo(index) {
1941
398
            spreadView.selectedIndex = index;
1942
399
            root.fullscreen = ApplicationManager.get(index).fullscreen;
1943
400
            snapAnimation.targetContentX = -shift;
1944
401
            snapAnimation.start();
1945
402
        }
1946
403
1947
404
        SequentialAnimation {
1948
405
            id: snapAnimation
1949
406
            property int targetContentX: -spreadView.shift
1950
407
1951
408
            UbuntuNumberAnimation {
1952
409
                target: spreadView
1953
410
                property: "contentX"
1954
411
                to: snapAnimation.targetContentX
1955
412
                duration: UbuntuAnimation.FastDuration
1956
413
            }
1957
414
1958
415
            ScriptAction {
1959
416
                script: {
1960
417
                    if (spreadView.selectedIndex >= 0) {
1961
418
                        ApplicationManager.focusApplication(ApplicationManager.get(spreadView.selectedIndex).appId);
1962
419
                        spreadView.selectedIndex = -1
1963
420
                        spreadView.phase = 0;
1964
421
                        spreadView.contentX = -spreadView.shift;
1965
422
                    }
1966
423
                }
1967
424
            }
1968
425
        }
1969
426
1970
427
        Item {
1971
428
            id: spreadRow
1972
429
            // This width controls how much the spread can be flicked left/right. It's composed of:
1973
430
            //  tileDistance * app count (with a minimum of 3 apps, in order to also allow moving 1 and 2 apps a bit)
1974
431
            //  + some constant value (still scales with the screen width) which looks good and somewhat fills the screen
1975
432
            width: Math.max(3, ApplicationManager.count) * spreadView.tileDistance + (spreadView.width - spreadView.tileDistance) * 1.5
1976
433
1977
434
            x: spreadView.contentX
1978
435
1979
436
            Repeater {
1980
437
                id: spreadRepeater
1981
438
                model: ApplicationManager
1982
439
                delegate: TransformedSpreadDelegate {
1983
440
                    id: appDelegate
1984
441
                    objectName: "appDelegate" + index
1985
442
                    startAngle: 45
1986
443
                    endAngle: 5
1987
444
                    startScale: 1.1
1988
445
                    endScale: 0.7
1989
446
                    startDistance: spreadView.tileDistance
1990
447
                    endDistance: units.gu(.5)
1991
448
                    width: spreadView.width
1992
449
                    height: spreadView.height
1993
450
                    selected: spreadView.selectedIndex == index
1994
451
                    otherSelected: spreadView.selectedIndex >= 0 && !selected
1995
452
1996
453
                    z: index
1997
454
                    x: index == 0 ? 0 : spreadView.width + (index - 1) * spreadView.tileDistance
1998
455
1999
456
                    // Each tile has a different progress value running from 0 to 1.
2000
457
                    // A progress value of 0 means the tile is at the right edge. 1 means the tile has reched the left edge.
2001
458
                    progress: {
2002
459
                        var tileProgress = (spreadView.shiftedContentX - index * spreadView.tileDistance) / spreadView.width;
2003
460
                        // Tile 1 needs to move directly from the beginning...
2004
461
                        if (index == 1 && spreadView.phase < 2) {
2005
462
                            tileProgress += spreadView.tileDistance / spreadView.width;
2006
463
                        }
2007
464
                        return tileProgress;
2008
465
                    }
2009
466
2010
467
                    // This mostly is the same as progress, just adds the snapping to phase 1 for tiles 0 and 1
2011
468
                    animatedProgress: {
2012
469
                        if (spreadView.phase == 0 && index < 2) {
2013
470
                            if (progress < spreadView.positionMarker1) {
2014
471
                                return progress;
2015
472
                            } else if (progress < spreadView.positionMarker1 + snappingCurve.period){
2016
473
                                return spreadView.positionMarker1 + snappingCurve.value * 3;
2017
474
                            } else {
2018
475
                                return spreadView.positionMarker2;
2019
476
                            }
2020
477
                        }
2021
478
                        return progress;
2022
479
                    }
2023
480
2024
481
                    EasingCurve {
2025
482
                        id: snappingCurve
2026
483
                        type: EasingCurve.OutQuad
2027
484
                        period: 0.05
2028
485
                        progress: appDelegate.progress - spreadView.positionMarker1
2029
486
                    }
2030
487
2031
488
                    onClicked: {
2032
489
                        if (spreadView.phase == 2) {
2033
490
                            if (ApplicationManager.focusedApplicationId == ApplicationManager.get(index).appId) {
2034
491
                                spreadView.snapTo(index);
2035
492
                            } else {
2036
493
                                ApplicationManager.requestFocusApplication(ApplicationManager.get(index).appId);
2037
494
                            }
2038
495
                        }
2039
496
                    }
2040
497
                }
2041
498
            }
2042
499
        }
2043
500
    }
2044
501
}
2045
0
502
2046
=== renamed file 'qml/SideStage/SidestageHandle.qml' => 'qml/Stages/SidestageHandle.qml'
2047
=== added file 'qml/Stages/SpreadDelegate.qml'
2048
--- qml/Stages/SpreadDelegate.qml	1970-01-01 00:00:00 +0000
2049
+++ qml/Stages/SpreadDelegate.qml	2014-03-25 15:08:15 +0000
2050
@@ -0,0 +1,55 @@
2051
1
/*
2052
2
 * Copyright 2014 Canonical Ltd.
2053
3
 *
2054
4
 * This program is free software; you can redistribute it and/or modify
2055
5
 * it under the terms of the GNU Lesser General Public License as published by
2056
6
 * the Free Software Foundation; version 3.
2057
7
 *
2058
8
 * This program is distributed in the hope that it will be useful,
2059
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2060
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2061
11
 * GNU Lesser General Public License for more details.
2062
12
 *
2063
13
 * You should have received a copy of the GNU Lesser General Public License
2064
14
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2065
15
 *
2066
16
 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
2067
17
*/
2068
18
2069
19
import QtQuick 2.0
2070
20
2071
21
Item {
2072
22
    id: root
2073
23
2074
24
    signal clicked()
2075
25
2076
26
    property real topMarginProgress
2077
27
2078
28
    QtObject {
2079
29
        id: priv
2080
30
        property real heightDifference: root.height - appImage.implicitHeight
2081
31
    }
2082
32
2083
33
    Image {
2084
34
        id: dropShadow
2085
35
        anchors.fill: appImage
2086
36
        anchors.margins: -units.gu(2)
2087
37
        source: "graphics/dropshadow.png"
2088
38
        opacity: .4
2089
39
    }
2090
40
    Image {
2091
41
        id: appImage
2092
42
        anchors {
2093
43
            left: parent.left;
2094
44
            bottom: parent.bottom;
2095
45
            top: parent.top;
2096
46
            topMargin: priv.heightDifference * Math.max(0, 1 - root.topMarginProgress)
2097
47
        }
2098
48
        source: model.screenshot
2099
49
        antialiasing: true
2100
50
    }
2101
51
    MouseArea {
2102
52
        anchors.fill: appImage
2103
53
        onClicked: root.clicked()
2104
54
    }
2105
55
}
2106
0
56
2107
=== added file 'qml/Stages/StageWithSideStage.qml'
2108
--- qml/Stages/StageWithSideStage.qml	1970-01-01 00:00:00 +0000
2109
+++ qml/Stages/StageWithSideStage.qml	2014-03-25 15:08:15 +0000
2110
@@ -0,0 +1,405 @@
2111
1
/*
2112
2
 * Copyright (C) 2014 Canonical, Ltd.
2113
3
 *
2114
4
 * This program is free software; you can redistribute it and/or modify
2115
5
 * it under the terms of the GNU General Public License as published by
2116
6
 * the Free Software Foundation; version 3.
2117
7
 *
2118
8
 * This program is distributed in the hope that it will be useful,
2119
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2120
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2121
11
 * GNU General Public License for more details.
2122
12
 *
2123
13
 * You should have received a copy of the GNU General Public License
2124
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2125
15
 */
2126
16
2127
17
import QtQuick 2.0
2128
18
import Ubuntu.Components 0.1
2129
19
import "../Components"
2130
20
import Unity.Application 0.1
2131
21
import Ubuntu.Gestures 0.1
2132
22
2133
23
Item {
2134
24
    id: root
2135
25
    objectName: "stages"
2136
26
    anchors.fill: parent
2137
27
2138
28
    // Controls to be set from outside
2139
29
    property bool shown: false
2140
30
    property bool moving: false
2141
31
    property int dragAreaWidth
2142
32
2143
33
    // State information propagated to the outside
2144
34
    readonly property bool painting: mainStageImage.visible || sideStageImage.visible || sideStageSnapAnimation.running
2145
35
    property bool fullscreen: priv.focusedApplication ? priv.focusedApplication.fullscreen : false
2146
36
    property bool overlayMode: (sideStageImage.shown && priv.mainStageAppId.length == 0) || priv.overlayOverride
2147
37
                               || (priv.mainStageAppId.length == 0 && sideStageSnapAnimation.running)
2148
38
2149
39
    readonly property int overlayWidth: priv.overlayOverride ? 0 : priv.sideStageWidth
2150
40
2151
41
    onShownChanged: {
2152
42
        if (!shown) {
2153
43
            priv.mainStageAppId = "";
2154
44
        }
2155
45
    }
2156
46
2157
47
    onMovingChanged: {
2158
48
        if (moving) {
2159
49
            if (!priv.mainStageAppId && !priv.sideStageAppId) {
2160
50
                // Pulling in from the right, make the last used (topmost) app visible
2161
51
                var application = ApplicationManager.get(0);
2162
52
                if (application.stage == ApplicationInfoInterface.SideStage) {
2163
53
                    sideStageImage.application = application;
2164
54
                    sideStageImage.x = root.width - sideStageImage.width
2165
55
                    sideStageImage.visible = true;
2166
56
                } else {
2167
57
                    mainStageImage.application = application;
2168
58
                    mainStageImage.visible = true;
2169
59
                }
2170
60
            } else {
2171
61
                priv.requestNewScreenshot(ApplicationInfoInterface.MainStage)
2172
62
                if (priv.focusedApplicationId == priv.sideStageAppId) {
2173
63
                    priv.requestNewScreenshot(ApplicationInfoInterface.SideStage)
2174
64
                }
2175
65
            }
2176
66
        } else {
2177
67
            mainStageImage.visible = false;
2178
68
            sideStageImage.visible = false;
2179
69
        }
2180
70
    }
2181
71
2182
72
    QtObject {
2183
73
        id: priv
2184
74
2185
75
        property int sideStageWidth: units.gu(40)
2186
76
2187
77
2188
78
        property string sideStageAppId
2189
79
        property string mainStageAppId
2190
80
2191
81
2192
82
        property var sideStageApp: ApplicationManager.findApplication(sideStageAppId)
2193
83
        property var mainStageApp: ApplicationManager.findApplication(mainStageAppId)
2194
84
2195
85
        property string sideStageScreenshot: sideStageApp ? sideStageApp.screenshot : ""
2196
86
        property string mainStageScreenshot: mainStageApp ? mainStageApp.screenshot : ""
2197
87
2198
88
        property string focusedApplicationId: ApplicationManager.focusedApplicationId
2199
89
        property var focusedApplication: ApplicationManager.findApplication(focusedApplicationId)
2200
90
        property url focusedScreenshot: focusedApplication ? focusedApplication.screenshot : ""
2201
91
2202
92
        property bool waitingForMainScreenshot: false
2203
93
        property bool waitingForSideScreenshot: false
2204
94
        property bool waitingForScreenshots: waitingForMainScreenshot || waitingForSideScreenshot
2205
95
2206
96
        property string startingAppId: ""
2207
97
2208
98
        // Keep overlayMode even if there is no focused app (to allow pulling in the sidestage from the right)
2209
99
        property bool overlayOverride: false
2210
100
2211
101
        onFocusedApplicationChanged: {
2212
102
            if (focusedApplication) {
2213
103
                if (focusedApplication.stage == ApplicationInfoInterface.MainStage) {
2214
104
                    mainStageAppId = focusedApplicationId;
2215
105
                    priv.overlayOverride = false;
2216
106
                    if (priv.startingAppId == focusedApplicationId && sideStageImage.shown) {
2217
107
                        // There was already a sidestage app on top. bring it back!
2218
108
                        ApplicationManager.focusApplication(priv.sideStageAppId)
2219
109
                        priv.startingAppId = "";
2220
110
                    }
2221
111
                } else if (focusedApplication.stage == ApplicationInfoInterface.SideStage) {
2222
112
                    sideStageAppId = focusedApplicationId;
2223
113
                    if (priv.startingAppId == focusedApplicationId && !sideStageImage.shown) {
2224
114
                        sideStageImage.snapToApp(focusedApplication);
2225
115
                        priv.startingAppId = "";
2226
116
                    }
2227
117
                }
2228
118
            }
2229
119
        }
2230
120
2231
121
        onMainStageScreenshotChanged: {
2232
122
            waitingForMainScreenshot = false;
2233
123
        }
2234
124
2235
125
        onSideStageScreenshotChanged: {
2236
126
            waitingForSideScreenshot = false;
2237
127
        }
2238
128
2239
129
        onFocusedScreenshotChanged: {
2240
130
            waitingForSideScreenshot = false;
2241
131
        }
2242
132
2243
133
        onWaitingForScreenshotsChanged: {
2244
134
            if (waitingForScreenshots) {
2245
135
                return;
2246
136
            }
2247
137
2248
138
            if (root.moving) {
2249
139
                if (mainStageAppId) {
2250
140
                    mainStageImage.application = mainStageApp
2251
141
                    mainStageImage.visible = true;
2252
142
                }
2253
143
                if (sideStageAppId && focusedApplicationId == sideStageAppId) {
2254
144
                    sideStageImage.application = sideStageApp;
2255
145
                    sideStageImage.x = root.width - sideStageImage.width
2256
146
                    sideStageImage.visible = true;
2257
147
                }
2258
148
            }
2259
149
            if (sideStageHandleMouseArea.pressed) {
2260
150
                if (sideStageAppId) {
2261
151
                    sideStageImage.application = sideStageApp;
2262
152
                    sideStageImage.x = root.width - sideStageImage.width
2263
153
                    sideStageImage.visible = true;
2264
154
                }
2265
155
                if (mainStageAppId) {
2266
156
                    mainStageImage.application = mainStageApp
2267
157
                    mainStageImage.visible = true;
2268
158
                }
2269
159
            }
2270
160
        }
2271
161
2272
162
        function requestNewScreenshot(stage) {
2273
163
            if (stage == ApplicationInfoInterface.MainStage && mainStageAppId) {
2274
164
                waitingForMainScreenshot = true;
2275
165
                ApplicationManager.updateScreenshot(mainStageAppId);
2276
166
            } else if (stage == ApplicationInfoInterface.SideStage && sideStageAppId) {
2277
167
                waitingForSideScreenshot = true;
2278
168
                ApplicationManager.updateScreenshot(sideStageAppId);
2279
169
            }
2280
170
        }
2281
171
2282
172
    }
2283
173
    // FIXME: the signal connection seems to get lost with the fake application manager.
2284
174
    Connections {
2285
175
        target: priv.sideStageApp
2286
176
        onScreenshotChanged: priv.sideStageScreenshot = priv.sideStageApp.screenshot
2287
177
    }
2288
178
    Connections {
2289
179
        target: priv.mainStageApp
2290
180
        onScreenshotChanged: priv.mainStageScreenshot = priv.mainStageApp.screenshot
2291
181
    }
2292
182
2293
183
    Connections {
2294
184
        target: ApplicationManager
2295
185
2296
186
        onApplicationAdded: {
2297
187
            priv.startingAppId = appId;
2298
188
            splashScreenTimer.start();
2299
189
            var application = ApplicationManager.findApplication(appId)
2300
190
            if (application.stage == ApplicationInfoInterface.SideStage) {
2301
191
                sideStageSplash.visible = true;
2302
192
            } else if (application.stage == ApplicationInfoInterface.MainStage) {
2303
193
                mainStageSplash.visible = true;
2304
194
            }
2305
195
        }
2306
196
2307
197
        onFocusRequested: {
2308
198
            var application = ApplicationManager.findApplication(appId)
2309
199
            if (application.stage == ApplicationInfoInterface.SideStage) {
2310
200
                if (!root.shown) {
2311
201
                    priv.mainStageAppId = "";
2312
202
                    mainStageImage.application = null
2313
203
                }
2314
204
                if (sideStageImage.shown) {
2315
205
                    sideStageImage.switchTo(application);
2316
206
                    if (priv.mainStageAppId) {
2317
207
                        mainStageImage.application = priv.mainStageApp;
2318
208
                        mainStageImage.visible = true;
2319
209
                    }
2320
210
                } else {
2321
211
                    sideStageImage.application = application;
2322
212
                    sideStageImage.snapToApp(application);
2323
213
                }
2324
214
            } else if (application.stage == ApplicationInfoInterface.MainStage) {
2325
215
                if (root.shown) {
2326
216
                    if (sideStageImage.shown) {
2327
217
                        sideStageImage.application = priv.sideStageApp;
2328
218
                        sideStageImage.visible = true;
2329
219
                    }
2330
220
                    priv.mainStageAppId = application.appId;
2331
221
                    mainStageImage.switchTo(application)
2332
222
                    ApplicationManager.focusApplication(appId)
2333
223
                    if (sideStageImage.shown) {
2334
224
                        // There was already a focused SS app. Bring it back
2335
225
                        ApplicationManager.focusApplication(priv.sideStageAppId)
2336
226
                    }
2337
227
                } else {
2338
228
                    if (sideStageImage.shown) {
2339
229
                        sideStageImage.visible = false;
2340
230
                        sideStageImage.x = root.width;
2341
231
                    }
2342
232
2343
233
                    mainStageImage.application = application;
2344
234
                    ApplicationManager.focusApplication(appId)
2345
235
                }
2346
236
            }
2347
237
        }
2348
238
2349
239
        onApplicationRemoved: {
2350
240
            if (priv.mainStageAppId == appId) {
2351
241
                priv.mainStageAppId = "";
2352
242
            }
2353
243
            if (priv.sideStageAppId == appId) {
2354
244
                priv.sideStageAppId = "";
2355
245
            }
2356
246
            if (priv.sideStageAppId.length == 0) {
2357
247
                sideStageImage.shown = false;
2358
248
                priv.overlayOverride = false;
2359
249
            }
2360
250
        }
2361
251
2362
252
    }
2363
253
2364
254
    Timer {
2365
255
        id: splashScreenTimer
2366
256
        // FIXME: apart from removing this completely in the future and make the app surface paint
2367
257
        // meaningful stuff, also check for colin's stuff to land so we can shape 1.4 secs away from here
2368
258
        // https://code.launchpad.net/~cjwatson/upstart-app-launch/libclick-manifest/+merge/210520
2369
259
        // https://code.launchpad.net/~cjwatson/upstart-app-launch/libclick-pkgdir/+merge/209909
2370
260
        interval: 1700
2371
261
        repeat: false
2372
262
        onTriggered: {
2373
263
            mainStageSplash.visible = false;
2374
264
            sideStageSplash.visible = false;
2375
265
        }
2376
266
    }
2377
267
2378
268
    SwitchingApplicationImage {
2379
269
        id: mainStageImage
2380
270
        anchors.bottom: parent.bottom
2381
271
        width: parent.width
2382
272
        visible: false
2383
273
2384
274
        onSwitched: {
2385
275
            sideStageImage.visible = false;
2386
276
        }
2387
277
    }
2388
278
2389
279
    Rectangle {
2390
280
        id: mainStageSplash
2391
281
        anchors.fill: root
2392
282
        anchors.rightMargin: root.width - sideStageImage.x
2393
283
        color: "white"
2394
284
    }
2395
285
2396
286
    SidestageHandle {
2397
287
        id: sideStageHandle
2398
288
        anchors { top: parent.top; right: sideStageImage.left; bottom: parent.bottom }
2399
289
        width: root.dragAreaWidth
2400
290
        visible: root.shown && priv.sideStageAppId && sideStageImage.x < root.width
2401
291
2402
292
    }
2403
293
    MouseArea {
2404
294
        id: sideStageHandleMouseArea
2405
295
        anchors { top: parent.top; right: parent.right; bottom: parent.bottom; rightMargin: sideStageImage.shown ? sideStageImage.width : 0}
2406
296
        width: root.dragAreaWidth
2407
297
        visible: priv.sideStageAppId
2408
298
2409
299
        property var dragPoints: new Array()
2410
300
2411
301
        onPressed: {
2412
302
            priv.requestNewScreenshot(ApplicationInfoInterface.SideStage)
2413
303
            if (priv.mainStageAppId) {
2414
304
                priv.requestNewScreenshot(ApplicationInfoInterface.MainStage)
2415
305
            }
2416
306
        }
2417
307
2418
308
        onMouseXChanged: {
2419
309
            dragPoints.push(mouseX)
2420
310
2421
311
            var dragPoint = root.width + mouseX;
2422
312
            if (sideStageImage.shown) {
2423
313
                dragPoint -= sideStageImage.width
2424
314
            }
2425
315
            sideStageImage.x = Math.max(root.width - sideStageImage.width, dragPoint)
2426
316
        }
2427
317
2428
318
        onReleased: {
2429
319
            var distance = 0;
2430
320
            var lastX = dragPoints[0];
2431
321
            var oneWayFlick = true;
2432
322
            for (var i = 0; i < dragPoints.length; ++i) {
2433
323
                if (dragPoints[i] < lastX) {
2434
324
                    oneWayFlick = false;
2435
325
                }
2436
326
                distance += dragPoints[i] - lastX;
2437
327
                lastX = dragPoints[i];
2438
328
            }
2439
329
            dragPoints = [];
2440
330
2441
331
            if (oneWayFlick || distance > sideStageImage.width / 2) {
2442
332
                sideStageImage.snapTo(root.width)
2443
333
            } else {
2444
334
                sideStageImage.snapToApp(priv.sideStageApp)
2445
335
            }
2446
336
        }
2447
337
    }
2448
338
2449
339
    SwitchingApplicationImage {
2450
340
        id: sideStageImage
2451
341
        width: priv.sideStageWidth
2452
342
        height: root.height
2453
343
        x: root.width
2454
344
        anchors.bottom: parent.bottom
2455
345
        visible: true
2456
346
        property bool shown: false
2457
347
2458
348
        onSwitched: {
2459
349
            mainStageImage.visible = false;
2460
350
            ApplicationManager.focusApplication(application.appId)
2461
351
        }
2462
352
2463
353
        function snapTo(targetX) {
2464
354
            sideStageSnapAnimation.targetX = targetX
2465
355
            sideStageImage.visible = true;
2466
356
            if (priv.mainStageAppId) {
2467
357
                mainStageImage.application = priv.mainStageApp
2468
358
                mainStageImage.visible = true;
2469
359
            }
2470
360
            sideStageSnapAnimation.start();
2471
361
        }
2472
362
2473
363
        function snapToApp(application) {
2474
364
            sideStageImage.application = application
2475
365
            sideStageSnapAnimation.snapToId = application.appId;
2476
366
            snapTo(root.width - sideStageImage.width);
2477
367
        }
2478
368
2479
369
        SequentialAnimation {
2480
370
            id: sideStageSnapAnimation
2481
371
            property int targetX: root.width
2482
372
            property string snapToId
2483
373
2484
374
            UbuntuNumberAnimation { target: sideStageImage; property: "x"; to: sideStageSnapAnimation.targetX; duration: UbuntuAnimation.SlowDuration }
2485
375
            ScriptAction {
2486
376
                script: {
2487
377
                    if (sideStageSnapAnimation.targetX == root.width) {
2488
378
                        if (priv.mainStageAppId) {
2489
379
                            ApplicationManager.focusApplication(priv.mainStageAppId)
2490
380
                        } else {
2491
381
                            priv.overlayOverride = true;
2492
382
                            ApplicationManager.unfocusCurrentApplication();
2493
383
                        }
2494
384
                        sideStageImage.shown = false;
2495
385
                    }
2496
386
                    if (sideStageSnapAnimation.snapToId) {
2497
387
                        ApplicationManager.focusApplication(sideStageSnapAnimation.snapToId)
2498
388
                        sideStageSnapAnimation.snapToId = "";
2499
389
                        sideStageImage.shown = true;
2500
390
                        priv.overlayOverride = false;
2501
391
                    }
2502
392
                    sideStageImage.visible = false;
2503
393
                    mainStageImage.visible = false;
2504
394
                }
2505
395
            }
2506
396
        }
2507
397
    }
2508
398
2509
399
    Rectangle {
2510
400
        id: sideStageSplash
2511
401
        anchors.fill: parent
2512
402
        anchors.leftMargin: sideStageImage.x
2513
403
        color: "white"
2514
404
    }
2515
405
}
2516
0
406
2517
=== added file 'qml/Stages/SwitchingApplicationImage.qml'
2518
--- qml/Stages/SwitchingApplicationImage.qml	1970-01-01 00:00:00 +0000
2519
+++ qml/Stages/SwitchingApplicationImage.qml	2014-03-25 15:08:15 +0000
2520
@@ -0,0 +1,81 @@
2521
1
/*
2522
2
 * Copyright 2014 Canonical Ltd.
2523
3
 *
2524
4
 * This program is free software; you can redistribute it and/or modify
2525
5
 * it under the terms of the GNU Lesser General Public License as published by
2526
6
 * the Free Software Foundation; version 3.
2527
7
 *
2528
8
 * This program is distributed in the hope that it will be useful,
2529
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2530
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2531
11
 * GNU Lesser General Public License for more details.
2532
12
 *
2533
13
 * You should have received a copy of the GNU Lesser General Public License
2534
14
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2535
15
 *
2536
16
 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
2537
17
*/
2538
18
2539
19
import QtQuick 2.0
2540
20
import Ubuntu.Components 0.1
2541
21
2542
22
Rectangle {
2543
23
    id: root
2544
24
    implicitHeight: image.implicitHeight
2545
25
    implicitWidth: image.implicitWidth
2546
26
    color: "black"
2547
27
2548
28
    property var application
2549
29
2550
30
    signal switched()
2551
31
2552
32
    function switchTo(application) {
2553
33
        if (root.application == application) {
2554
34
            root.switched();
2555
35
            return;
2556
36
        }
2557
37
2558
38
        priv.newApplication = application
2559
39
        root.visible = true;
2560
40
        switchToAnimation.start()
2561
41
    }
2562
42
2563
43
    QtObject {
2564
44
        id: priv
2565
45
        property var newApplication
2566
46
    }
2567
47
2568
48
    Image {
2569
49
        id: newImage
2570
50
        anchors.bottom: parent.bottom
2571
51
        width: root.width
2572
52
        source: priv.newApplication ? priv.newApplication.screenshot : ""
2573
53
    }
2574
54
2575
55
    Image {
2576
56
        id: image
2577
57
        visible: true
2578
58
        source: root.application ? root.application.screenshot : ""
2579
59
        width: root.width
2580
60
        height: sourceSize.height
2581
61
        anchors.bottom: parent.bottom
2582
62
2583
63
    }
2584
64
2585
65
    SequentialAnimation {
2586
66
        id: switchToAnimation
2587
67
        ParallelAnimation {
2588
68
            UbuntuNumberAnimation { target: image; property: "x"; from: 0; to: root.width; duration: UbuntuAnimation.SlowDuration }
2589
69
            UbuntuNumberAnimation { target: newImage; property: "scale"; from: 0.7; to: 1; duration: UbuntuAnimation.SlowDuration }
2590
70
        }
2591
71
        ScriptAction {
2592
72
            script: {
2593
73
                image.x = 0
2594
74
                root.application = priv.newApplication
2595
75
                root.visible = false;
2596
76
                priv.newApplication = null
2597
77
                root.switched();
2598
78
            }
2599
79
        }
2600
80
    }
2601
81
}
2602
0
82
2603
=== added file 'qml/Stages/TransformedSpreadDelegate.qml'
2604
--- qml/Stages/TransformedSpreadDelegate.qml	1970-01-01 00:00:00 +0000
2605
+++ qml/Stages/TransformedSpreadDelegate.qml	2014-03-25 15:08:15 +0000
2606
@@ -0,0 +1,327 @@
2607
1
/*
2608
2
 * Copyright 2014 Canonical Ltd.
2609
3
 *
2610
4
 * This program is free software; you can redistribute it and/or modify
2611
5
 * it under the terms of the GNU Lesser General Public License as published by
2612
6
 * the Free Software Foundation; version 3.
2613
7
 *
2614
8
 * This program is distributed in the hope that it will be useful,
2615
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2616
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2617
11
 * GNU Lesser General Public License for more details.
2618
12
 *
2619
13
 * You should have received a copy of the GNU Lesser General Public License
2620
14
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2621
15
 *
2622
16
 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
2623
17
*/
2624
18
2625
19
import QtQuick 2.0
2626
20
import Utils 0.1
2627
21
import Ubuntu.Components 0.1
2628
22
2629
23
SpreadDelegate {
2630
24
    id: root
2631
25
2632
26
    property bool selected: false
2633
27
    property bool otherSelected: false
2634
28
2635
29
    // The progress animates the tiles. A value > 0 makes it appear from the right edge. At 1 it reaches the end position.
2636
30
    property real progress: 0
2637
31
    // This is required to snap tile 1 during phase 1 and 2.
2638
32
    property real animatedProgress: 0
2639
33
2640
34
    property real startAngle: 0
2641
35
    property real endAngle: 0
2642
36
2643
37
    property real startScale: 1
2644
38
    property real endScale: 1
2645
39
2646
40
    // Specific to just one tile
2647
41
    property real tile1StartScale: startScale + .4
2648
42
    property real tile0SnapAngle: 10
2649
43
2650
44
    property real startDistance: units.gu(5)
2651
45
    property real endDistance: units.gu(.5)
2652
46
2653
47
    onSelectedChanged: {
2654
48
        if (selected) {
2655
49
            priv.snapshot();
2656
50
        }
2657
51
        priv.isSelected = selected;
2658
52
    }
2659
53
2660
54
    onOtherSelectedChanged: {
2661
55
        if (otherSelected) {
2662
56
            priv.snapshot();
2663
57
        }
2664
58
        priv.otherSelected = otherSelected;
2665
59
    }
2666
60
2667
61
    Connections {
2668
62
        target: spreadView
2669
63
        onPhaseChanged: {
2670
64
            if (spreadView.phase == 1) {
2671
65
                if (index == 0) {
2672
66
                    priv.phase2startTranslate = priv.easingAnimation(0, spreadView.positionMarker4, 0, -spreadView.width, spreadView.positionMarker4) + spreadView.width;
2673
67
                    priv.phase2startAngle = priv.easingAnimation(0, spreadView.positionMarker4, root.startAngle, root.endAngle, spreadView.positionMarker4);
2674
68
                    priv.phase2startScale = priv.easingAnimation(0, spreadView.positionMarker4, root.startScale, root.endScale, spreadView.positionMarker4);
2675
69
                    priv.phase2startTopMarginProgress = priv.easingAnimation(0, 1, 0, 1, spreadView.positionMarker4);
2676
70
                } else if (index == 1) {
2677
71
                    // find where the main easing for Tile 1 would be when reaching phase 2
2678
72
                    var phase2Progress = spreadView.positionMarker4 - spreadView.tileDistance / spreadView.width;
2679
73
                    priv.phase2startTranslate = priv.easingAnimation(0, phase2Progress, 0, -spreadView.width + root.endDistance, phase2Progress);
2680
74
                    priv.phase2startAngle = priv.easingAnimation(0, phase2Progress, root.startAngle, root.endAngle, phase2Progress);
2681
75
                    priv.phase2startScale = priv.easingAnimation(0, phase2Progress, root.startScale, root.endScale, phase2Progress);
2682
76
                    priv.phase2startTopMarginProgress = priv.easingAnimation(0, 1, 0, spreadView.positionMarker4, phase2Progress);
2683
77
                }
2684
78
            }
2685
79
        }
2686
80
    }
2687
81
2688
82
    QtObject {
2689
83
        id: priv
2690
84
        property bool isSelected: false
2691
85
        property bool otherSelected: false
2692
86
        property real selectedProgress
2693
87
        property real selectedXTranslate
2694
88
        property real selectedAngle
2695
89
        property real selectedScale
2696
90
        property real selectedOpacity
2697
91
        property real selectedTopMarginProgress
2698
92
2699
93
        // Those values are needed as target values for the end of phase 1.
2700
94
        // As they are static values, lets calculate them once when entering phase 1 instead of calculating them in each animation pass.
2701
95
        property real phase2startTranslate
2702
96
        property real phase2startAngle
2703
97
        property real phase2startScale
2704
98
        property real phase2startTopMarginProgress
2705
99
2706
100
        function snapshot() {
2707
101
            selectedProgress = root.progress;
2708
102
            selectedXTranslate = xTranslate;
2709
103
            selectedAngle = angle;
2710
104
            selectedScale = scale;
2711
105
            selectedOpacity = opacity;
2712
106
            selectedTopMarginProgress = topMarginProgress;
2713
107
        }
2714
108
2715
109
        // This calculates how much negative progress there can be if unwinding the spread completely
2716
110
        // the progress for each tile starts at 0 when it crosses the right edge, so the later a tile comes in,
2717
111
        // the bigger its negativeProgress can be.
2718
112
        property real negativeProgress: {
2719
113
            if (index == 1 && spreadView.phase < 2) {
2720
114
                return 0;
2721
115
            }
2722
116
            return -index * spreadView.tileDistance / spreadView.width;
2723
117
        }
2724
118
2725
119
        function linearAnimation(startProgress, endProgress, startValue, endValue, progress) {
2726
120
            // progress : progressDiff = value : valueDiff => value = progress * valueDiff / progressDiff
2727
121
            return (progress - startProgress) * (endValue - startValue) / (endProgress - startProgress) + startValue;
2728
122
        }
2729
123
2730
124
        function easingAnimation(startProgress, endProgress, startValue, endValue, progress) {
2731
125
            helperEasingCurve.progress = progress - startProgress;
2732
126
            helperEasingCurve.period = endProgress - startProgress;
2733
127
            return helperEasingCurve.value * (endValue - startValue) + startValue;
2734
128
        }
2735
129
2736
130
        property real animatedEndDistance: linearAnimation(0, 2, root.endDistance, 0, root.progress)
2737
131
2738
132
        // The following blocks handle the animation of the tile in the spread.
2739
133
        // At the beginning, each tile is attached at the right edge, outside the screen.
2740
134
        // The progress for each tile starts at 0 and it reaches its end position at a progress of 1.
2741
135
        // The first phases are handled special for the first 2 tiles. as we do the alt-tab and snapping in there
2742
136
        // Once we reached phase 3, the animation is the same for all tiles.
2743
137
        // When a tile is selected, the animation state is snapshotted, and the spreadView is unwound (progress animates
2744
138
        // back to negativeProgress). All tiles are kept in place and faded out to 0 opacity except
2745
139
        // the selected tile, which is animated from the snapshotted position to be fullscreen.
2746
140
2747
141
        property real xTranslate: {
2748
142
            if (otherSelected) {
2749
143
                if (spreadView.phase < 2 && index == 0) {
2750
144
                    return linearAnimation(selectedProgress, negativeProgress,
2751
145
                                           selectedXTranslate, selectedXTranslate - spreadView.tileDistance, root.progress);
2752
146
                }
2753
147
2754
148
                return selectedXTranslate;
2755
149
            }
2756
150
2757
151
            switch (index) {
2758
152
            case 0:
2759
153
                if (spreadView.phase == 0) {
2760
154
                    return Math.min(0, linearAnimation(0, spreadView.positionMarker2,
2761
155
                                                       0, -spreadView.width * .25, root.animatedProgress));
2762
156
                } else if (spreadView.phase == 1){
2763
157
                    return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4,
2764
158
                                           -spreadView.width * .25, priv.phase2startTranslate, root.progress);
2765
159
                } else if (!priv.isSelected){ // phase 2
2766
160
                    // Apply the same animation as with the rest but add spreadView.width to align it with the others.
2767
161
                    return -easingCurve.value * spreadView.width + spreadView.width;
2768
162
                } else if (priv.isSelected) {
2769
163
                    return linearAnimation(selectedProgress, negativeProgress, selectedXTranslate, 0, root.progress);
2770
164
                }
2771
165
2772
166
            case 1:
2773
167
                if (spreadView.phase == 0 && !priv.isSelected) {
2774
168
                    return linearAnimation(0, spreadView.positionMarker2,
2775
169
                                           0, -spreadView.width * spreadView.snapPosition, root.animatedProgress);
2776
170
                } else if (spreadView.phase == 1 && !priv.isSelected) {
2777
171
                    return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4,
2778
172
                                           -spreadView.width * spreadView.snapPosition, priv.phase2startTranslate,
2779
173
                                           root.progress);
2780
174
                }
2781
175
            }
2782
176
2783
177
            if (priv.isSelected) {
2784
178
                // Distance to left edge
2785
179
                var targetTranslate = -spreadView.width - ((index - 1) * root.startDistance);
2786
180
                return linearAnimation(selectedProgress, negativeProgress,
2787
181
                                       selectedXTranslate, targetTranslate, root.progress);
2788
182
            }
2789
183
2790
184
            // Fix it at the right edge...
2791
185
            var rightEdgeOffset =  -((index - 1) * root.startDistance);
2792
186
            // ...and use our easing to move them to the left. Stop a bit earlier for each tile
2793
187
            return -easingCurve.value * spreadView.width + (index * animatedEndDistance) + rightEdgeOffset;
2794
188
2795
189
        }
2796
190
2797
191
        property real angle: {
2798
192
            if (priv.otherSelected) {
2799
193
                return priv.selectedAngle;
2800
194
            }
2801
195
            if (priv.isSelected) {
2802
196
                return linearAnimation(selectedProgress, negativeProgress, selectedAngle, 0, root.progress);
2803
197
            }
2804
198
            switch (index) {
2805
199
            case 0:
2806
200
                if (spreadView.phase == 0) {
2807
201
                    return Math.max(0, linearAnimation(0, spreadView.positionMarker2,
2808
202
                                                       0, root.tile0SnapAngle, root.animatedProgress));
2809
203
                } else if (spreadView.phase == 1) {
2810
204
                    return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4,
2811
205
                                           root.tile0SnapAngle, phase2startAngle, root.progress);
2812
206
                }
2813
207
            case 1:
2814
208
                if (spreadView.phase == 0) {
2815
209
                    return linearAnimation(0, spreadView.positionMarker2, root.startAngle,
2816
210
                                           root.startAngle * (1-spreadView.snapPosition), root.animatedProgress);
2817
211
                } else if (spreadView.phase == 1) {
2818
212
                    return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4,
2819
213
                                           root.startAngle * (1-spreadView.snapPosition), priv.phase2startAngle,
2820
214
                                           root.progress);
2821
215
                }
2822
216
            }
2823
217
            return root.startAngle - easingCurve.value * (root.startAngle - root.endAngle);
2824
218
        }
2825
219
2826
220
        property real scale: {
2827
221
            if (priv.otherSelected) {
2828
222
                return priv.selectedScale;
2829
223
            }
2830
224
            if (priv.isSelected) {
2831
225
                return linearAnimation(selectedProgress, negativeProgress, selectedScale, 1, root.progress);
2832
226
            }
2833
227
2834
228
            switch (index) {
2835
229
            case 0:
2836
230
                if (spreadView.phase == 0) {
2837
231
                    return 1;
2838
232
                } else if (spreadView.phase == 1) {
2839
233
                    return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4,
2840
234
                                           1, phase2startScale, root.progress);
2841
235
                }
2842
236
            case 1:
2843
237
                if (spreadView.phase == 0) {
2844
238
                    var targetScale = tile1StartScale - ((tile1StartScale - 1) * spreadView.snapPosition);
2845
239
                    return linearAnimation(0, spreadView.positionMarker2,
2846
240
                                           root.tile1StartScale, targetScale, root.animatedProgress);
2847
241
                } else if (spreadView.phase == 1) {
2848
242
                    var startScale = tile1StartScale - ((tile1StartScale - 1) * spreadView.snapPosition);
2849
243
                    return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4,
2850
244
                                           startScale, priv.phase2startScale, root.progress);
2851
245
                }
2852
246
            }
2853
247
            return root.startScale - easingCurve.value * (root.startScale - root.endScale);
2854
248
        }
2855
249
2856
250
        property real opacity: {
2857
251
            if (priv.otherSelected) {
2858
252
                return linearAnimation (selectedProgress, Math.max(0, selectedProgress - .5),
2859
253
                                        selectedOpacity, 0, root.progress);
2860
254
            }
2861
255
            if (index == 0) {
2862
256
                switch (spreadView.phase) {
2863
257
                case 0:
2864
258
                    return linearAnimation(0, spreadView.positionMarker2, 1, .3, root.animatedProgress);
2865
259
                case 1:
2866
260
                    return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4,
2867
261
                                           .3, 1, root.animatedProgress);
2868
262
                }
2869
263
            }
2870
264
2871
265
            return 1;
2872
266
        }
2873
267
2874
268
        property real topMarginProgress: {
2875
269
            if (priv.isSelected) {
2876
270
                return linearAnimation(selectedProgress, negativeProgress, selectedTopMarginProgress, 0, root.progress);
2877
271
            }
2878
272
2879
273
            switch (index) {
2880
274
            case 0:
2881
275
                if (spreadView.phase == 0) {
2882
276
                    return 0;
2883
277
                } else if (spreadView.phase == 1) {
2884
278
                    return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4,
2885
279
                                           0, priv.phase2startTopMarginProgress, root.progress);
2886
280
                }
2887
281
                break;
2888
282
            case 1:
2889
283
                if (spreadView.phase == 0) {
2890
284
                    return 0;
2891
285
                } else if (spreadView.phase == 1) {
2892
286
                    return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4,
2893
287
                                           0, priv.phase2startTopMarginProgress, root.progress);
2894
288
                }
2895
289
            }
2896
290
2897
291
            return easingCurve.value;
2898
292
        }
2899
293
    }
2900
294
2901
295
    transform: [
2902
296
        Rotation {
2903
297
            origin { x: 0; y: spreadView.height / 2 }
2904
298
            axis { x: 0; y: 1; z: 0 }
2905
299
            angle: priv.angle
2906
300
        },
2907
301
        Scale {
2908
302
            origin { x: 0; y: spreadView.height / 2 }
2909
303
            xScale: priv.scale
2910
304
            yScale: xScale
2911
305
        },
2912
306
        Translate {
2913
307
            x: priv.xTranslate
2914
308
        }
2915
309
    ]
2916
310
    opacity: priv.opacity
2917
311
    topMarginProgress: priv.topMarginProgress
2918
312
2919
313
    EasingCurve {
2920
314
        id: easingCurve
2921
315
        type: EasingCurve.OutSine
2922
316
        period: 1 - spreadView.positionMarker2
2923
317
        progress: root.animatedProgress
2924
318
    }
2925
319
2926
320
    // This is used as a calculation helper to figure values for progress other than the current one
2927
321
    // Do not bind anything to this...
2928
322
    EasingCurve {
2929
323
        id: helperEasingCurve
2930
324
        type: easingCurve.type
2931
325
        period: easingCurve.period
2932
326
    }
2933
327
}
2934
0
328
2935
=== added directory 'qml/Stages/graphics'
2936
=== added file 'qml/Stages/graphics/dropshadow.png'
2937
1
Binary files qml/Stages/graphics/dropshadow.png	1970-01-01 00:00:00 +0000 and qml/Stages/graphics/dropshadow.png	2014-03-25 15:08:15 +0000 differ
329
Binary files qml/Stages/graphics/dropshadow.png	1970-01-01 00:00:00 +0000 and qml/Stages/graphics/dropshadow.png	2014-03-25 15:08:15 +0000 differ
2938
=== renamed file 'qml/SideStage/graphics/sidestage_handle@20.png' => 'qml/Stages/graphics/sidestage_handle@20.png'
2939
=== renamed file 'qml/SideStage/graphics/sidestage_handle@20.sci' => 'qml/Stages/graphics/sidestage_handle@20.sci'
2940
=== modified file 'run_on_device'
2941
--- run_on_device	2013-11-27 11:47:14 +0000
2942
+++ run_on_device	2014-03-25 15:08:15 +0000
2943
@@ -103,6 +103,7 @@
2944
103
        ARGS="$ARGS -k"
103
        ARGS="$ARGS -k"
2945
104
    fi
104
    fi
2946
105
105
2947
106
    exec_with_ssh "killall -9 dialer-app; killall -9 gallery-app; killall -9 messaging-app; killall -9 address-book-app; killall -9 webbrowser-app"
2948
106
    exec_with_ssh "stop unity8"
107
    exec_with_ssh "stop unity8"
2949
107
    exec_with_ssh "start maliit-server"
108
    exec_with_ssh "start maliit-server"
2950
108
    exec_with_ssh "cd $CODE_DIR/ && ./run $ARGS -- $RUN_OPTIONS"
109
    exec_with_ssh "cd $CODE_DIR/ && ./run $ARGS -- $RUN_OPTIONS"
2951
109
110
2952
=== modified file 'tests/autopilot/unity8/shell/emulators/dash.py'
2953
--- tests/autopilot/unity8/shell/emulators/dash.py	2014-03-17 10:42:57 +0000
2954
+++ tests/autopilot/unity8/shell/emulators/dash.py	2014-03-25 15:08:15 +0000
2955
@@ -80,10 +80,7 @@
2956
80
                'No scope found with id {0}'.format(scope_id))
80
                'No scope found with id {0}'.format(scope_id))
2957
81
81
2958
82
    def _get_scope_from_loader(self, loader):
82
    def _get_scope_from_loader(self, loader):
2963
83
        if loader.scopeId == 'clickscope':
83
        return loader.select_single(GenericScopeView)
2960
84
            return loader.select_single(DashApps)
2961
85
        else:
2962
86
            return loader.select_single(GenericScopeView)
2964
87
84
2965
88
    def _open_scope_scrolling(self, scope_loader):
85
    def _open_scope_scrolling(self, scope_loader):
2966
89
        scroll = self._get_scroll_direction(scope_loader)
86
        scroll = self._get_scroll_direction(scope_loader)
2967
@@ -164,10 +161,6 @@
2968
164
            raise emulators.UnityEmulatorException(
161
            raise emulators.UnityEmulatorException(
2969
165
                'No category found with name {}'.format(category))
162
                'No category found with name {}'.format(category))
2970
166
163
2971
167
2972
168
class DashApps(GenericScopeView):
2973
169
    """Autopilot emulator for the applications scope."""
2974
170
2975
171
    def get_applications(self, category):
164
    def get_applications(self, category):
2976
172
        """Return the list of applications on a category.
165
        """Return the list of applications on a category.
2977
173
166
2978
174
167
2979
=== modified file 'tests/autopilot/unity8/shell/emulators/main_window.py'
2980
--- tests/autopilot/unity8/shell/emulators/main_window.py	2014-03-02 04:44:30 +0000
2981
+++ tests/autopilot/unity8/shell/emulators/main_window.py	2014-03-25 15:08:15 +0000
2982
@@ -112,4 +112,4 @@
2983
112
112
2984
113
    def get_current_focused_app_id(self):
113
    def get_current_focused_app_id(self):
2985
114
        """Return the id of the focused application."""
114
        """Return the id of the focused application."""
2987
115
        return self.select_single('Shell').currentFocusedAppId
115
        return self.select_single('Shell').focusedApplicationId
2988
116
116
2989
=== modified file 'tests/autopilot/unity8/shell/tests/test_emulators.py'
2990
--- tests/autopilot/unity8/shell/tests/test_emulators.py	2014-03-17 10:42:57 +0000
2991
+++ tests/autopilot/unity8/shell/tests/test_emulators.py	2014-03-25 15:08:15 +0000
2992
@@ -128,7 +128,7 @@
2993
128
        scope_id = 'clickscope'
128
        scope_id = 'clickscope'
2994
129
        scope = self.dash.open_scope(scope_id)
129
        scope = self.dash.open_scope(scope_id)
2995
130
        self._assert_scope_is_opened(scope, scope_id)
130
        self._assert_scope_is_opened(scope, scope_id)
2997
131
        self.assertIsInstance(scope, dash_emulators.DashApps)
131
        self.assertIsInstance(scope, dash_emulators.GenericScopeView)
2998
132
132
2999
133
133
3000
134
class GenericScopeViewEmulatorTestCase(DashBaseTestCase):
134
class GenericScopeViewEmulatorTestCase(DashBaseTestCase):
3001
135
135
3002
=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.cpp'
3003
--- tests/mocks/Unity/Application/ApplicationInfo.cpp	2013-09-05 12:21:35 +0000
3004
+++ tests/mocks/Unity/Application/ApplicationInfo.cpp	2014-03-25 15:08:15 +0000
3005
@@ -20,6 +20,7 @@
3006
20
#include <QQuickItem>
20
#include <QQuickItem>
3007
21
#include <QQuickView>
21
#include <QQuickView>
3008
22
#include <QQmlComponent>
22
#include <QQmlComponent>
3009
23
#include <QTimer>
3010
23
24
3011
24
ApplicationInfo::ApplicationInfo(const QString &appId, QObject *parent)
25
ApplicationInfo::ApplicationInfo(const QString &appId, QObject *parent)
3012
25
    : ApplicationInfoInterface(appId, parent)
26
    : ApplicationInfoInterface(appId, parent)
3013
@@ -32,6 +33,7 @@
3014
32
    ,m_windowComponent(0)
33
    ,m_windowComponent(0)
3015
33
    ,m_parentItem(0)
34
    ,m_parentItem(0)
3016
34
{
35
{
3017
36
    QTimer::singleShot(300, this, SLOT(setRunning()));
3018
35
}
37
}
3019
36
38
3020
37
ApplicationInfo::ApplicationInfo(QObject *parent)
39
ApplicationInfo::ApplicationInfo(QObject *parent)
3021
@@ -44,6 +46,7 @@
3022
44
     ,m_windowComponent(0)
46
     ,m_windowComponent(0)
3023
45
     ,m_parentItem(0)
47
     ,m_parentItem(0)
3024
46
{
48
{
3025
49
    QTimer::singleShot(300, this, SLOT(setRunning()));
3026
47
}
50
}
3027
48
51
3028
49
void ApplicationInfo::onWindowComponentStatusChanged(QQmlComponent::Status status)
52
void ApplicationInfo::onWindowComponentStatusChanged(QQmlComponent::Status status)
3029
@@ -52,6 +55,12 @@
3030
52
        doCreateWindowItem();
55
        doCreateWindowItem();
3031
53
}
56
}
3032
54
57
3033
58
void ApplicationInfo::setRunning()
3034
59
{
3035
60
    m_state = Running;
3036
61
    Q_EMIT stateChanged();
3037
62
}
3038
63
3039
55
void ApplicationInfo::createWindowComponent()
64
void ApplicationInfo::createWindowComponent()
3040
56
{
65
{
3041
57
    // The assumptions I make here really should hold.
66
    // The assumptions I make here really should hold.
3042
58
67
3043
=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.h'
3044
--- tests/mocks/Unity/Application/ApplicationInfo.h	2013-10-11 11:37:04 +0000
3045
+++ tests/mocks/Unity/Application/ApplicationInfo.h	2014-03-25 15:08:15 +0000
3046
@@ -74,6 +74,7 @@
3047
74
    IMPLEMENT_PROPERTY(fullscreen, Fullscreen, bool)
74
    IMPLEMENT_PROPERTY(fullscreen, Fullscreen, bool)
3048
75
    IMPLEMENT_PROPERTY(imageQml, ImageQml, QString)
75
    IMPLEMENT_PROPERTY(imageQml, ImageQml, QString)
3049
76
    IMPLEMENT_PROPERTY(windowQml, WindowQml, QString)
76
    IMPLEMENT_PROPERTY(windowQml, WindowQml, QString)
3050
77
    IMPLEMENT_PROPERTY(screenshot, Screenshot, QUrl)
3051
77
78
3052
78
    #undef IMPLEMENT_PROPERTY
79
    #undef IMPLEMENT_PROPERTY
3053
79
80
3054
@@ -83,6 +84,7 @@
3055
83
84
3056
84
 private Q_SLOTS:
85
 private Q_SLOTS:
3057
85
    void onWindowComponentStatusChanged(QQmlComponent::Status status);
86
    void onWindowComponentStatusChanged(QQmlComponent::Status status);
3058
87
    void setRunning();
3059
86
88
3060
87
 private:
89
 private:
3061
88
    void createWindowItem();
90
    void createWindowItem();
3062
89
91
3063
=== modified file 'tests/mocks/Unity/Application/ApplicationManager.cpp'
3064
--- tests/mocks/Unity/Application/ApplicationManager.cpp	2013-12-17 16:04:47 +0000
3065
+++ tests/mocks/Unity/Application/ApplicationManager.cpp	2014-03-25 15:08:15 +0000
3066
@@ -24,13 +24,17 @@
3067
24
#include <QQuickItem>
24
#include <QQuickItem>
3068
25
#include <QQuickView>
25
#include <QQuickView>
3069
26
#include <QQmlComponent>
26
#include <QQmlComponent>
3070
27
#include <QTimer>
3071
28
#include <QDateTime>
3072
27
29
3073
28
ApplicationManager::ApplicationManager(QObject *parent)
30
ApplicationManager::ApplicationManager(QObject *parent)
3074
29
    : ApplicationManagerInterface(parent)
31
    : ApplicationManagerInterface(parent)
3075
32
    , m_suspended(false)
3076
30
    , m_mainStageComponent(0)
33
    , m_mainStageComponent(0)
3077
31
    , m_mainStage(0)
34
    , m_mainStage(0)
3078
32
    , m_sideStageComponent(0)
35
    , m_sideStageComponent(0)
3079
33
    , m_sideStage(0)
36
    , m_sideStage(0)
3080
37
    , m_rightMargin(0)
3081
34
{
38
{
3082
35
    buildListOfAvailableApplications();
39
    buildListOfAvailableApplications();
3083
36
}
40
}
3084
@@ -63,6 +67,8 @@
3085
63
        return app->state();
67
        return app->state();
3086
64
    case RoleFocused:
68
    case RoleFocused:
3087
65
        return app->focused();
69
        return app->focused();
3088
70
    case RoleScreenshot:
3089
71
        return app->screenshot();
3090
66
    default:
72
    default:
3091
67
        return QVariant();
73
        return QVariant();
3092
68
    }
74
    }
3093
@@ -84,13 +90,16 @@
3094
84
}
90
}
3095
85
91
3096
86
void ApplicationManager::add(ApplicationInfo *application) {
92
void ApplicationManager::add(ApplicationInfo *application) {
3098
87
    if (!application)
93
    if (!application) {
3099
88
        return;
94
        return;
3100
95
    }
3101
89
96
3102
90
    beginInsertRows(QModelIndex(), m_runningApplications.size(), m_runningApplications.size());
97
    beginInsertRows(QModelIndex(), m_runningApplications.size(), m_runningApplications.size());
3103
91
    m_runningApplications.append(application);
98
    m_runningApplications.append(application);
3104
92
    endInsertRows();
99
    endInsertRows();
3105
100
    Q_EMIT applicationAdded(application->appId());
3106
93
    Q_EMIT countChanged();
101
    Q_EMIT countChanged();
3107
102
    Q_EMIT focusRequested(application->appId());
3108
94
}
103
}
3109
95
104
3110
96
void ApplicationManager::remove(ApplicationInfo *application) {
105
void ApplicationManager::remove(ApplicationInfo *application) {
3111
@@ -99,6 +108,7 @@
3112
99
        beginRemoveRows(QModelIndex(), i, i);
108
        beginRemoveRows(QModelIndex(), i, i);
3113
100
        m_runningApplications.removeAt(i);
109
        m_runningApplications.removeAt(i);
3114
101
        endRemoveRows();
110
        endRemoveRows();
3115
111
        Q_EMIT applicationRemoved(application->appId());
3116
102
        Q_EMIT countChanged();
112
        Q_EMIT countChanged();
3117
103
    }
113
    }
3118
104
}
114
}
3119
@@ -171,6 +181,8 @@
3120
171
    }
181
    }
3121
172
    add(application);
182
    add(application);
3122
173
183
3123
184
    QMetaObject::invokeMethod(this, "focusApplication", Qt::QueuedConnection, Q_ARG(QString, appId));
3124
185
3125
174
    return application;
186
    return application;
3126
175
}
187
}
3127
176
188
3128
@@ -180,8 +192,32 @@
3129
180
    if (application == nullptr)
192
    if (application == nullptr)
3130
181
        return false;
193
        return false;
3131
182
194
3132
195
    if (application->appId() == focusedApplicationId()) {
3133
196
        unfocusCurrentApplication();
3134
197
    }
3135
183
    remove(application);
198
    remove(application);
3137
184
    Q_EMIT focusedApplicationIdChanged();
199
    return true;
3138
200
}
3139
201
3140
202
bool ApplicationManager::updateScreenshot(const QString &appId)
3141
203
{
3142
204
    int idx = -1;
3143
205
    ApplicationInfo *application = nullptr;
3144
206
    for (int i = 0; i < m_availableApplications.count(); ++i) {
3145
207
        application = m_availableApplications.at(i);
3146
208
        if (application->appId() == appId) {
3147
209
            idx = i;
3148
210
            break;
3149
211
        }
3150
212
    }
3151
213
3152
214
    if (idx == -1) {
3153
215
        return false;
3154
216
    }
3155
217
3156
218
    application->setScreenshot(QString("image://application/%1/%2").arg(appId).arg(QDateTime::currentMSecsSinceEpoch()));
3157
219
    QModelIndex appIndex = index(idx);
3158
220
    Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << RoleScreenshot);
3159
185
    return true;
221
    return true;
3160
186
}
222
}
3161
187
223
3162
@@ -194,6 +230,25 @@
3163
194
    return QString();
230
    return QString();
3164
195
}
231
}
3165
196
232
3166
233
bool ApplicationManager::suspended() const
3167
234
{
3168
235
    return m_suspended;
3169
236
}
3170
237
3171
238
void ApplicationManager::setSuspended(bool suspended)
3172
239
{
3173
240
    ApplicationInfo *focusedApp = findApplication(focusedApplicationId());
3174
241
    if (focusedApp) {
3175
242
        if (suspended) {
3176
243
            focusedApp->setState(ApplicationInfo::Suspended);
3177
244
        } else {
3178
245
            focusedApp->setState(ApplicationInfo::Running);
3179
246
        }
3180
247
    }
3181
248
    m_suspended = suspended;
3182
249
    Q_EMIT suspendedChanged();
3183
250
}
3184
251
3185
197
bool ApplicationManager::focusApplication(const QString &appId)
252
bool ApplicationManager::focusApplication(const QString &appId)
3186
198
{
253
{
3187
199
    ApplicationInfo *application = findApplication(appId);
254
    ApplicationInfo *application = findApplication(appId);
3188
@@ -242,6 +297,15 @@
3189
242
    return true;
297
    return true;
3190
243
}
298
}
3191
244
299
3192
300
bool ApplicationManager::requestFocusApplication(const QString &appId)
3193
301
{
3194
302
    if (appId != focusedApplicationId()) {
3195
303
        QMetaObject::invokeMethod(this, "focusRequested", Qt::QueuedConnection, Q_ARG(QString, appId));
3196
304
        return true;
3197
305
    }
3198
306
    return false;
3199
307
}
3200
308
3201
245
void ApplicationManager::unfocusCurrentApplication()
309
void ApplicationManager::unfocusCurrentApplication()
3202
246
{
310
{
3203
247
    for (ApplicationInfo *app : m_runningApplications) {
311
    for (ApplicationInfo *app : m_runningApplications) {
3204
@@ -270,10 +334,12 @@
3205
270
        "Image {\n"
334
        "Image {\n"
3206
271
        "   anchors.fill: parent\n"
335
        "   anchors.fill: parent\n"
3207
272
        "   anchors.topMargin: %1\n"
336
        "   anchors.topMargin: %1\n"
3209
273
        "   source: \"file://%2/Dash/graphics/phone/screenshots/%3.png\"\n"
337
        "   anchors.rightMargin: %2\n"
3210
338
        "   source: \"file://%3/Dash/graphics/phone/screenshots/%4.png\"\n"
3211
274
        "   smooth: true\n"
339
        "   smooth: true\n"
3212
275
        "   fillMode: Image.PreserveAspectCrop\n"
340
        "   fillMode: Image.PreserveAspectCrop\n"
3213
276
        "}").arg(topMargin)
341
        "}").arg(topMargin)
3214
342
            .arg(m_rightMargin)
3215
277
            .arg(qmlDirectory())
343
            .arg(qmlDirectory())
3216
278
            .arg(application->icon().toString());
344
            .arg(application->icon().toString());
3217
279
    application->setWindowQml(windowQml);
345
    application->setWindowQml(windowQml);
3218
@@ -299,6 +365,7 @@
3219
299
    application->setName("Phone");
365
    application->setName("Phone");
3220
300
    application->setIcon(QUrl("phone"));
366
    application->setIcon(QUrl("phone"));
3221
301
    application->setStage(ApplicationInfo::SideStage);
367
    application->setStage(ApplicationInfo::SideStage);
3222
368
    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
3223
302
    generateQmlStrings(application);
369
    generateQmlStrings(application);
3224
303
    m_availableApplications.append(application);
370
    m_availableApplications.append(application);
3225
304
371
3226
@@ -307,6 +374,7 @@
3227
307
    application->setName("Camera");
374
    application->setName("Camera");
3228
308
    application->setIcon(QUrl("camera"));
375
    application->setIcon(QUrl("camera"));
3229
309
    application->setFullscreen(true);
376
    application->setFullscreen(true);
3230
377
    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
3231
310
    generateQmlStrings(application);
378
    generateQmlStrings(application);
3232
311
    m_availableApplications.append(application);
379
    m_availableApplications.append(application);
3233
312
380
3234
@@ -314,6 +382,7 @@
3235
314
    application->setAppId("gallery-app");
382
    application->setAppId("gallery-app");
3236
315
    application->setName("Gallery");
383
    application->setName("Gallery");
3237
316
    application->setIcon(QUrl("gallery"));
384
    application->setIcon(QUrl("gallery"));
3238
385
    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
3239
317
    generateQmlStrings(application);
386
    generateQmlStrings(application);
3240
318
    m_availableApplications.append(application);
387
    m_availableApplications.append(application);
3241
319
388
3242
@@ -322,13 +391,16 @@
3243
322
    application->setName("Facebook");
391
    application->setName("Facebook");
3244
323
    application->setIcon(QUrl("facebook"));
392
    application->setIcon(QUrl("facebook"));
3245
324
    application->setStage(ApplicationInfo::SideStage);
393
    application->setStage(ApplicationInfo::SideStage);
3246
394
    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
3247
325
    generateQmlStrings(application);
395
    generateQmlStrings(application);
3248
326
    m_availableApplications.append(application);
396
    m_availableApplications.append(application);
3249
327
397
3250
328
    application = new ApplicationInfo(this);
398
    application = new ApplicationInfo(this);
3251
329
    application->setAppId("webbrowser-app");
399
    application->setAppId("webbrowser-app");
3252
400
    application->setFullscreen(true);
3253
330
    application->setName("Browser");
401
    application->setName("Browser");
3254
331
    application->setIcon(QUrl("browser"));
402
    application->setIcon(QUrl("browser"));
3255
403
    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
3256
332
    generateQmlStrings(application);
404
    generateQmlStrings(application);
3257
333
    m_availableApplications.append(application);
405
    m_availableApplications.append(application);
3258
334
406
3259
@@ -337,6 +409,7 @@
3260
337
    application->setName("Twitter");
409
    application->setName("Twitter");
3261
338
    application->setIcon(QUrl("twitter"));
410
    application->setIcon(QUrl("twitter"));
3262
339
    application->setStage(ApplicationInfo::SideStage);
411
    application->setStage(ApplicationInfo::SideStage);
3263
412
    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
3264
340
    generateQmlStrings(application);
413
    generateQmlStrings(application);
3265
341
    m_availableApplications.append(application);
414
    m_availableApplications.append(application);
3266
342
415
3267
@@ -344,6 +417,7 @@
3268
344
    application->setAppId("gmail-webapp");
417
    application->setAppId("gmail-webapp");
3269
345
    application->setName("GMail");
418
    application->setName("GMail");
3270
346
    application->setIcon(QUrl("gmail"));
419
    application->setIcon(QUrl("gmail"));
3271
420
    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
3272
347
    m_availableApplications.append(application);
421
    m_availableApplications.append(application);
3273
348
422
3274
349
    application = new ApplicationInfo(this);
423
    application = new ApplicationInfo(this);
3275
@@ -351,6 +425,7 @@
3276
351
    application->setName("Weather");
425
    application->setName("Weather");
3277
352
    application->setIcon(QUrl("weather"));
426
    application->setIcon(QUrl("weather"));
3278
353
    application->setStage(ApplicationInfo::SideStage);
427
    application->setStage(ApplicationInfo::SideStage);
3279
428
    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
3280
354
    generateQmlStrings(application);
429
    generateQmlStrings(application);
3281
355
    m_availableApplications.append(application);
430
    m_availableApplications.append(application);
3282
356
431
3283
@@ -359,6 +434,7 @@
3284
359
    application->setName("Notepad");
434
    application->setName("Notepad");
3285
360
    application->setIcon(QUrl("notepad"));
435
    application->setIcon(QUrl("notepad"));
3286
361
    application->setStage(ApplicationInfo::SideStage);
436
    application->setStage(ApplicationInfo::SideStage);
3287
437
    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
3288
362
    m_availableApplications.append(application);
438
    m_availableApplications.append(application);
3289
363
439
3290
364
    application = new ApplicationInfo(this);
440
    application = new ApplicationInfo(this);
3291
@@ -366,6 +442,7 @@
3292
366
    application->setName("Calendar");
442
    application->setName("Calendar");
3293
367
    application->setIcon(QUrl("calendar"));
443
    application->setIcon(QUrl("calendar"));
3294
368
    application->setStage(ApplicationInfo::SideStage);
444
    application->setStage(ApplicationInfo::SideStage);
3295
445
    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
3296
369
    m_availableApplications.append(application);
446
    m_availableApplications.append(application);
3297
370
447
3298
371
    application = new ApplicationInfo(this);
448
    application = new ApplicationInfo(this);
3299
@@ -373,18 +450,21 @@
3300
373
    application->setName("Media Player");
450
    application->setName("Media Player");
3301
374
    application->setIcon(QUrl("mediaplayer-app"));
451
    application->setIcon(QUrl("mediaplayer-app"));
3302
375
    application->setFullscreen(true);
452
    application->setFullscreen(true);
3303
453
    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
3304
376
    m_availableApplications.append(application);
454
    m_availableApplications.append(application);
3305
377
455
3306
378
    application = new ApplicationInfo(this);
456
    application = new ApplicationInfo(this);
3307
379
    application->setAppId("evernote");
457
    application->setAppId("evernote");
3308
380
    application->setName("Evernote");
458
    application->setName("Evernote");
3309
381
    application->setIcon(QUrl("evernote"));
459
    application->setIcon(QUrl("evernote"));
3310
460
    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
3311
382
    m_availableApplications.append(application);
461
    m_availableApplications.append(application);
3312
383
462
3313
384
    application = new ApplicationInfo(this);
463
    application = new ApplicationInfo(this);
3314
385
    application->setAppId("map");
464
    application->setAppId("map");
3315
386
    application->setName("Map");
465
    application->setName("Map");
3316
387
    application->setIcon(QUrl("map"));
466
    application->setIcon(QUrl("map"));
3317
467
    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
3318
388
    generateQmlStrings(application);
468
    generateQmlStrings(application);
3319
389
    m_availableApplications.append(application);
469
    m_availableApplications.append(application);
3320
390
470
3321
@@ -392,24 +472,28 @@
3322
392
    application->setAppId("pinterest");
472
    application->setAppId("pinterest");
3323
393
    application->setName("Pinterest");
473
    application->setName("Pinterest");
3324
394
    application->setIcon(QUrl("pinterest"));
474
    application->setIcon(QUrl("pinterest"));
3325
475
    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
3326
395
    m_availableApplications.append(application);
476
    m_availableApplications.append(application);
3327
396
477
3328
397
    application = new ApplicationInfo(this);
478
    application = new ApplicationInfo(this);
3329
398
    application->setAppId("soundcloud");
479
    application->setAppId("soundcloud");
3330
399
    application->setName("SoundCloud");
480
    application->setName("SoundCloud");
3331
400
    application->setIcon(QUrl("soundcloud"));
481
    application->setIcon(QUrl("soundcloud"));
3332
482
    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
3333
401
    m_availableApplications.append(application);
483
    m_availableApplications.append(application);
3334
402
484
3335
403
    application = new ApplicationInfo(this);
485
    application = new ApplicationInfo(this);
3336
404
    application->setAppId("wikipedia");
486
    application->setAppId("wikipedia");
3337
405
    application->setName("Wikipedia");
487
    application->setName("Wikipedia");
3338
406
    application->setIcon(QUrl("wikipedia"));
488
    application->setIcon(QUrl("wikipedia"));
3339
489
    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
3340
407
    m_availableApplications.append(application);
490
    m_availableApplications.append(application);
3341
408
491
3342
409
    application = new ApplicationInfo(this);
492
    application = new ApplicationInfo(this);
3343
410
    application->setAppId("youtube");
493
    application->setAppId("youtube");
3344
411
    application->setName("YouTube");
494
    application->setName("YouTube");
3345
412
    application->setIcon(QUrl("youtube"));
495
    application->setIcon(QUrl("youtube"));
3346
496
    application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
3347
413
    m_availableApplications.append(application);
497
    m_availableApplications.append(application);
3348
414
}
498
}
3349
415
499
3350
@@ -484,3 +568,25 @@
3351
484
    m_sideStage->setParentItem(shell);
568
    m_sideStage->setParentItem(shell);
3352
485
    m_sideStage->setFlag(QQuickItem::ItemHasContents, false);
569
    m_sideStage->setFlag(QQuickItem::ItemHasContents, false);
3353
486
}
570
}
3354
571
3355
572
QStringList ApplicationManager::availableApplications()
3356
573
{
3357
574
    QStringList appIds;
3358
575
    Q_FOREACH(ApplicationInfo *app, m_availableApplications) {
3359
576
        appIds << app->appId();
3360
577
    }
3361
578
    return appIds;
3362
579
}
3363
580
3364
581
int ApplicationManager::rightMargin() const
3365
582
{
3366
583
    return m_rightMargin;
3367
584
}
3368
585
3369
586
void ApplicationManager::setRightMargin(int rightMargin)
3370
587
{
3371
588
    m_rightMargin = rightMargin;
3372
589
    Q_FOREACH(ApplicationInfo *app, m_availableApplications) {
3373
590
        generateQmlStrings(app);
3374
591
    }
3375
592
}
3376
487
593
3377
=== modified file 'tests/mocks/Unity/Application/ApplicationManager.h'
3378
--- tests/mocks/Unity/Application/ApplicationManager.h	2013-10-11 11:37:04 +0000
3379
+++ tests/mocks/Unity/Application/ApplicationManager.h	2014-03-25 15:08:15 +0000
3380
@@ -45,6 +45,10 @@
3381
45
45
3382
46
    Q_PROPERTY(bool fake READ fake CONSTANT)
46
    Q_PROPERTY(bool fake READ fake CONSTANT)
3383
47
47
3384
48
    // Only for testing
3385
49
    // This can be used to place some controls to right, like make tryPhoneStage for example
3386
50
    Q_PROPERTY(int rightMargin READ rightMargin WRITE setRightMargin)
3387
51
3388
48
 public:
52
 public:
3389
49
    ApplicationManager(QObject *parent = NULL);
53
    ApplicationManager(QObject *parent = NULL);
3390
50
    virtual ~ApplicationManager();
54
    virtual ~ApplicationManager();
3391
@@ -87,13 +91,22 @@
3392
87
    Q_INVOKABLE void move(int from, int to);
91
    Q_INVOKABLE void move(int from, int to);
3393
88
92
3394
89
    // Application control methods
93
    // Application control methods
3395
94
    Q_INVOKABLE bool requestFocusApplication(const QString &appId) override;
3396
90
    Q_INVOKABLE bool focusApplication(const QString &appId) override;
95
    Q_INVOKABLE bool focusApplication(const QString &appId) override;
3397
91
    Q_INVOKABLE void unfocusCurrentApplication() override;
96
    Q_INVOKABLE void unfocusCurrentApplication() override;
3398
92
    Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, const QStringList &arguments = QStringList()) override;
97
    Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, const QStringList &arguments = QStringList()) override;
3399
93
    Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, ExecFlags flags, const QStringList &arguments = QStringList());
98
    Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, ExecFlags flags, const QStringList &arguments = QStringList());
3400
94
    Q_INVOKABLE bool stopApplication(const QString &appId) override;
99
    Q_INVOKABLE bool stopApplication(const QString &appId) override;
3401
100
    Q_INVOKABLE bool updateScreenshot(const QString &appId) override;
3402
95
101
3403
96
    QString focusedApplicationId() const override;
102
    QString focusedApplicationId() const override;
3404
103
    bool suspended() const;
3405
104
    void setSuspended(bool suspended);
3406
105
3407
106
    // Only for testing
3408
107
    Q_INVOKABLE QStringList availableApplications();
3409
108
    int rightMargin() const;
3410
109
    void setRightMargin(int rightMargin);
3411
97
110
3412
98
 Q_SIGNALS:
111
 Q_SIGNALS:
3413
99
    void keyboardHeightChanged();
112
    void keyboardHeightChanged();
3414
@@ -113,12 +126,15 @@
3415
113
    void createSideStage();
126
    void createSideStage();
3416
114
    int m_keyboardHeight;
127
    int m_keyboardHeight;
3417
115
    bool m_keyboardVisible;
128
    bool m_keyboardVisible;
3418
129
    bool m_suspended;
3419
116
    QList<ApplicationInfo*> m_runningApplications;
130
    QList<ApplicationInfo*> m_runningApplications;
3420
117
    QList<ApplicationInfo*> m_availableApplications;
131
    QList<ApplicationInfo*> m_availableApplications;
3421
118
    QQmlComponent *m_mainStageComponent;
132
    QQmlComponent *m_mainStageComponent;
3422
119
    QQuickItem *m_mainStage;
133
    QQuickItem *m_mainStage;
3423
120
    QQmlComponent *m_sideStageComponent;
134
    QQmlComponent *m_sideStageComponent;
3424
121
    QQuickItem *m_sideStage;
135
    QQuickItem *m_sideStage;
3425
136
3426
137
    int m_rightMargin;
3427
122
};
138
};
3428
123
139
3429
124
Q_DECLARE_OPERATORS_FOR_FLAGS(ApplicationManager::ExecFlags)
140
Q_DECLARE_OPERATORS_FOR_FLAGS(ApplicationManager::ExecFlags)
3430
125
141
3431
=== added file 'tests/mocks/Unity/Application/ApplicationScreenshotProvider.cpp'
3432
--- tests/mocks/Unity/Application/ApplicationScreenshotProvider.cpp	1970-01-01 00:00:00 +0000
3433
+++ tests/mocks/Unity/Application/ApplicationScreenshotProvider.cpp	2014-03-25 15:08:15 +0000
3434
@@ -0,0 +1,74 @@
3435
1
/*
3436
2
 * Copyright (C) 2014 Canonical, Ltd.
3437
3
 *
3438
4
 * This program is free software: you can redistribute it and/or modify it under
3439
5
 * the terms of the GNU Lesser General Public License version 3, as published by
3440
6
 * the Free Software Foundation.
3441
7
 *
3442
8
 * This program is distributed in the hope that it will be useful, but WITHOUT
3443
9
 * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
3444
10
 * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
3445
11
 * Lesser General Public License for more details.
3446
12
 *
3447
13
 * You should have received a copy of the GNU Lesser General Public License
3448
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3449
15
 */
3450
16
3451
17
#include "ApplicationScreenshotProvider.h"
3452
18
#include "ApplicationManager.h"
3453
19
#include "ApplicationInfo.h"
3454
20
3455
21
#include "paths.h"
3456
22
3457
23
#include <QDebug>
3458
24
#include <QGuiApplication>
3459
25
#include <QWindow>
3460
26
#include <QQuickWindow>
3461
27
3462
28
ApplicationScreenshotProvider::ApplicationScreenshotProvider(ApplicationManager *appManager)
3463
29
    : QQuickImageProvider(QQuickImageProvider::Image)
3464
30
    , m_appManager(appManager)
3465
31
{
3466
32
}
3467
33
3468
34
QImage ApplicationScreenshotProvider::requestImage(const QString &imageId, QSize * size,
3469
35
                                                     const QSize &requestedSize)
3470
36
{
3471
37
    // We ignore requestedSize here intentionally to avoid keeping scaled copies around
3472
38
    Q_UNUSED(requestedSize)
3473
39
3474
40
    QString appId = imageId.split('/').first();
3475
41
3476
42
    ApplicationInfo* app = static_cast<ApplicationInfo*>(m_appManager->findApplication(appId));
3477
43
    if (app == nullptr) {
3478
44
        return QImage();
3479
45
    }
3480
46
3481
47
    QString filePath = QString("%1/Dash/graphics/phone/screenshots/%2@12.png").arg(qmlDirectory()).arg(app->icon().toString());
3482
48
3483
49
    QImage image;
3484
50
    if (!image.load(filePath)) {
3485
51
        qWarning() << "failed loading app image" << filePath;
3486
52
    }
3487
53
3488
54
3489
55
    if (app->stage() == ApplicationInfo::SideStage) {
3490
56
        QByteArray gus = qgetenv("GRID_UNIT_PX");
3491
57
        image = image.scaledToWidth(gus.toInt() * 48);
3492
58
    } else {
3493
59
        // Lets scale main stage applications to be the size of the screen/window.
3494
60
        QGuiApplication *unity = qobject_cast<QGuiApplication*>(qApp);
3495
61
        Q_FOREACH (QWindow *win, unity->allWindows()) {
3496
62
            QQuickWindow *quickWin = qobject_cast<QQuickWindow*>(win);
3497
63
            if (quickWin) {
3498
64
                image = image.scaledToWidth(quickWin->width() - m_appManager->rightMargin());
3499
65
                break;
3500
66
            }
3501
67
        }
3502
68
    }
3503
69
3504
70
    size->setWidth(image.width());
3505
71
    size->setHeight(image.height());
3506
72
3507
73
    return image;
3508
74
}
3509
0
75
3510
=== added file 'tests/mocks/Unity/Application/ApplicationScreenshotProvider.h'
3511
--- tests/mocks/Unity/Application/ApplicationScreenshotProvider.h	1970-01-01 00:00:00 +0000
3512
+++ tests/mocks/Unity/Application/ApplicationScreenshotProvider.h	2014-03-25 15:08:15 +0000
3513
@@ -0,0 +1,34 @@
3514
1
/*
3515
2
 * Copyright (C) 201 Canonical, Ltd.
3516
3
 *
3517
4
 * This program is free software: you can redistribute it and/or modify it under
3518
5
 * the terms of the GNU Lesser General Public License version 3, as published by
3519
6
 * the Free Software Foundation.
3520
7
 *
3521
8
 * This program is distributed in the hope that it will be useful, but WITHOUT
3522
9
 * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
3523
10
 * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
3524
11
 * Lesser General Public License for more details.
3525
12
 *
3526
13
 * You should have received a copy of the GNU Lesser General Public License
3527
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3528
15
 */
3529
16
3530
17
#ifndef APPLICATIONSCREENSHOTPROVIDER_H
3531
18
#define APPLICATIONSCREENSHOTPROVIDER_H
3532
19
3533
20
#include <QQuickImageProvider>
3534
21
3535
22
class ApplicationManager;
3536
23
class ApplicationScreenshotProvider : public QQuickImageProvider
3537
24
{
3538
25
public:
3539
26
    explicit ApplicationScreenshotProvider(ApplicationManager *appManager);
3540
27
3541
28
    QImage requestImage(const QString &appId, QSize *size, const QSize &requestedSize) override;
3542
29
3543
30
private:
3544
31
    ApplicationManager* m_appManager;
3545
32
};
3546
33
3547
34
#endif // APPLICATIONSCREENSHOTPROVIDER_H
3548
0
35
3549
=== modified file 'tests/mocks/Unity/Application/CMakeLists.txt'
3550
--- tests/mocks/Unity/Application/CMakeLists.txt	2013-12-13 01:02:53 +0000
3551
+++ tests/mocks/Unity/Application/CMakeLists.txt	2014-03-25 15:08:15 +0000
3552
@@ -5,6 +5,7 @@
3553
5
    ApplicationInfo.cpp
5
    ApplicationInfo.cpp
3554
6
    ApplicationImage.cpp
6
    ApplicationImage.cpp
3555
7
    ApplicationManager.cpp
7
    ApplicationManager.cpp
3556
8
    ApplicationScreenshotProvider.cpp
3557
8
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
9
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
3558
9
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
10
    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
3559
10
)
11
)
3560
11
12
3561
=== modified file 'tests/mocks/Unity/Application/plugin.cpp'
3562
--- tests/mocks/Unity/Application/plugin.cpp	2013-09-11 15:33:02 +0000
3563
+++ tests/mocks/Unity/Application/plugin.cpp	2014-03-25 15:08:15 +0000
3564
@@ -18,13 +18,20 @@
3565
18
#include "ApplicationInfo.h"
18
#include "ApplicationInfo.h"
3566
19
#include "ApplicationImage.h"
19
#include "ApplicationImage.h"
3567
20
#include "ApplicationManager.h"
20
#include "ApplicationManager.h"
3568
21
#include "ApplicationScreenshotProvider.h"
3569
21
22
3570
22
#include <qqml.h>
23
#include <qqml.h>
3571
24
#include <QQmlEngine>
3572
25
3573
26
ApplicationManager *s_appManager = 0;
3574
23
27
3575
24
static QObject* applicationManagerSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {
28
static QObject* applicationManagerSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {
3579
25
  Q_UNUSED(engine);
29
    Q_UNUSED(engine);
3580
26
  Q_UNUSED(scriptEngine);
30
    Q_UNUSED(scriptEngine);
3581
27
  return new ApplicationManager();
31
    if (!s_appManager) {
3582
32
        s_appManager = new ApplicationManager();
3583
33
    }
3584
34
    return s_appManager;
3585
28
}
35
}
3586
29
36
3587
30
void FakeUnityApplicationQmlPlugin::registerTypes(const char *uri)
37
void FakeUnityApplicationQmlPlugin::registerTypes(const char *uri)
3588
@@ -37,3 +44,11 @@
3589
37
44
3590
38
    qmlRegisterType<ApplicationImage>(uri, 0, 1, "ApplicationImage");
45
    qmlRegisterType<ApplicationImage>(uri, 0, 1, "ApplicationImage");
3591
39
}
46
}
3592
47
3593
48
void FakeUnityApplicationQmlPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
3594
49
{
3595
50
    QQmlExtensionPlugin::initializeEngine(engine, uri);
3596
51
3597
52
    ApplicationManager* appManager = static_cast<ApplicationManager*>(applicationManagerSingleton(engine, NULL));
3598
53
    engine->addImageProvider(QLatin1String("application"), new ApplicationScreenshotProvider(appManager));
3599
54
}
3600
40
55
3601
=== modified file 'tests/mocks/Unity/Application/plugin.h'
3602
--- tests/mocks/Unity/Application/plugin.h	2013-09-04 13:42:27 +0000
3603
+++ tests/mocks/Unity/Application/plugin.h	2014-03-25 15:08:15 +0000
3604
@@ -25,6 +25,7 @@
3605
25
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
25
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
3606
26
public:
26
public:
3607
27
    void registerTypes(const char *uri);
27
    void registerTypes(const char *uri);
3608
28
    void initializeEngine(QQmlEngine *engine, const char *uri);
3609
28
};
29
};
3610
29
30
3611
30
#endif
31
#endif
3612
31
32
3613
=== modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
3614
--- tests/plugins/Unity/Launcher/launchermodeltest.cpp	2013-09-16 17:59:13 +0000
3615
+++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2014-03-25 15:08:15 +0000
3616
@@ -39,6 +39,7 @@
3617
39
    ApplicationInfoInterface::Stage stage() const { return ApplicationInfoInterface::MainStage; }
39
    ApplicationInfoInterface::Stage stage() const { return ApplicationInfoInterface::MainStage; }
3618
40
    ApplicationInfoInterface::State state() const { return ApplicationInfoInterface::Running; }
40
    ApplicationInfoInterface::State state() const { return ApplicationInfoInterface::Running; }
3619
41
    bool focused() const { return m_focused; }
41
    bool focused() const { return m_focused; }
3620
42
    QUrl screenshot() const { return QUrl(); }
3621
42
43
3622
43
    // Methods used for mocking (not in the interface)
44
    // Methods used for mocking (not in the interface)
3623
44
    void setFocused(bool focused) { m_focused = focused; Q_EMIT focusedChanged(focused); }
45
    void setFocused(bool focused) { m_focused = focused; Q_EMIT focusedChanged(focused); }
3624
@@ -92,6 +93,10 @@
3625
92
        m_list.takeAt(index)->deleteLater();
93
        m_list.takeAt(index)->deleteLater();
3626
93
        endRemoveRows();
94
        endRemoveRows();
3627
94
    }
95
    }
3628
96
    bool updateScreenshot(const QString &appId) { Q_UNUSED(appId); return true; }
3629
97
    bool requestFocusApplication(const QString &appId) { Q_UNUSED(appId); return true; }
3630
98
    bool suspended() const { return false; }
3631
99
    void setSuspended(bool) {}
3632
95
100
3633
96
private:
101
private:
3634
97
    QList<MockApp*> m_list;
102
    QList<MockApp*> m_list;
3635
98
103
3636
=== modified file 'tests/qmltests/CMakeLists.txt'
3637
--- tests/qmltests/CMakeLists.txt	2014-03-17 11:44:05 +0000
3638
+++ tests/qmltests/CMakeLists.txt	2014-03-25 15:08:15 +0000
3639
@@ -83,6 +83,6 @@
3640
83
                                                  ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
83
                                                  ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
3641
84
add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
84
add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
3642
85
add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
85
add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
3644
86
add_qml_test(SideStage SideStage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS}
86
add_qml_test(Stages PhoneStage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS}
3645
87
                                              ${CMAKE_BINARY_DIR}/tests/mocks
87
                                              ${CMAKE_BINARY_DIR}/tests/mocks
3646
88
                                              ${CMAKE_BINARY_DIR}/plugins)
88
                                              ${CMAKE_BINARY_DIR}/plugins)
3647
89
89
3648
=== modified file 'tests/qmltests/Components/tst_ResponsiveFlowView.qml'
3649
--- tests/qmltests/Components/tst_ResponsiveFlowView.qml	2013-12-17 16:04:47 +0000
3650
+++ tests/qmltests/Components/tst_ResponsiveFlowView.qml	2014-03-25 15:08:15 +0000
3651
@@ -82,8 +82,7 @@
3652
82
        ResponsiveFlowView {
82
        ResponsiveFlowView {
3653
83
            id: flow
83
            id: flow
3654
84
            anchors.fill: parent
84
            anchors.fill: parent
3657
85
            firstModel: fakeModel
85
            model: fakeModel
3656
86
            secondModel: fakeModel
3658
87
            minimumHorizontalSpacing:
86
            minimumHorizontalSpacing:
3659
88
                minHSpacingSelector.values[minHSpacingSelector.selectedIndex]
87
                minHSpacingSelector.values[minHSpacingSelector.selectedIndex]
3660
89
            verticalSpacing: units.gu(2)
88
            verticalSpacing: units.gu(2)
3661
90
89
3662
=== modified file 'tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml'
3663
--- tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml	2013-12-17 16:04:47 +0000
3664
+++ tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml	2014-03-25 15:08:15 +0000
3665
@@ -18,87 +18,20 @@
3666
18
import QtTest 1.0
18
import QtTest 1.0
3667
19
import "../../../../qml/Dash/Apps"
19
import "../../../../qml/Dash/Apps"
3668
20
import Unity.Test 0.1 as UT
20
import Unity.Test 0.1 as UT
3669
21
import Unity.Application 0.1
3670
21
22
3672
22
Item {
23
// Using Rectangle to have an opaque surface because AppManager paints app surfaces behind it.
3673
24
Rectangle {
3674
23
    width: units.gu(50)
25
    width: units.gu(50)
3675
24
    height: units.gu(40)
26
    height: units.gu(40)
3676
25
27
3677
26
    QtObject {
3678
27
        id: fakeApplicationManager
3679
28
3680
29
        property bool sideStageEnabled: false
3681
30
3682
31
        function stopApplication(appId) {
3683
32
            for (var i=0, len=fakeRunningAppsModel.count; i<len; i++) {
3684
33
                if (appId == fakeRunningAppsModel.get(i).appId) {
3685
34
                    fakeRunningAppsModel.remove(i)
3686
35
                }
3687
36
            }
3688
37
        }
3689
38
    }
3690
39
3691
40
    QtObject {
3692
41
        id: shell
3693
42
        property bool dashShown: true
3694
43
        property bool stageScreenshotsReady: false
3695
44
        property var applicationManager: fakeApplicationManager
3696
45
3697
46
        function activateApplication(appId) {
3698
47
        }
3699
48
    }
3700
49
3701
50
    ListModel {
3702
51
        id: fakeRunningAppsModel
3703
52
3704
53
        function contains(appId) {
3705
54
            for (var i=0, len=fakeRunningAppsModel.count; i<len; i++) {
3706
55
                if (appId == fakeRunningAppsModel.get(i).appId) {
3707
56
                    return true;
3708
57
                }
3709
58
            }
3710
59
            return false;
3711
60
        }
3712
61
3713
62
        function rePopulate() {
3714
63
            for (var i=0, len=availableAppsModel.count; i<len; i++) {
3715
64
                fakeRunningAppsModel.append(availableAppsModel.get(i));
3716
65
            }
3717
66
        }
3718
67
    }
3719
68
3720
69
    ListModel {
3721
70
        id: availableAppsModel
3722
71
        ListElement {
3723
72
            name: "Phone"
3724
73
            icon: "phone-app"
3725
74
            exec: "/usr/bin/phone-app"
3726
75
            appId: "phone"
3727
76
            imageQml: "import QtQuick 2.0\n \
3728
77
                       Rectangle { \n \
3729
78
                          anchors.fill:parent \n \
3730
79
                          color:'darkgreen' \n \
3731
80
                          Text { anchors.centerIn: parent; text: 'PHONE' } \n \
3732
81
                      }"
3733
82
        }
3734
83
3735
84
        ListElement {
3736
85
            name: "Calendar"
3737
86
            icon: "calendar-app"
3738
87
            exec: "/usr/bin/calendar-app"
3739
88
            appId: "calendar"
3740
89
            imageQml: "import QtQuick 2.0\n \
3741
90
                       Rectangle { \n \
3742
91
                           anchors.fill:parent \n \
3743
92
                           color:'darkblue' \n \
3744
93
                           Text { anchors.centerIn: parent; text: 'CALENDAR'\n \
3745
94
                                  color:'white'} \n \
3746
95
                      }"
3747
96
        }
3748
97
    }
3749
98
3750
99
    function resetRunningApplications() {
28
    function resetRunningApplications() {
3753
100
        fakeRunningAppsModel.clear()
29
        while (ApplicationManager.count > 0) {
3754
101
        fakeRunningAppsModel.rePopulate()
30
            ApplicationManager.stopApplication(ApplicationManager.get(0).appId)
3755
31
        }
3756
32
3757
33
        ApplicationManager.startApplication("phone-app");
3758
34
        ApplicationManager.startApplication("webbrowser-app");
3759
102
    }
35
    }
3760
103
36
3761
104
    Component.onCompleted: {
37
    Component.onCompleted: {
3762
@@ -109,7 +42,7 @@
3763
109
    RunningApplicationsGrid {
42
    RunningApplicationsGrid {
3764
110
        id: runningApplicationsGrid
43
        id: runningApplicationsGrid
3765
111
        anchors.fill: parent
44
        anchors.fill: parent
3767
112
        firstModel: fakeRunningAppsModel
45
        model: ApplicationManager
3768
113
    }
46
    }
3769
114
47
3770
115
    UT.UnityTestCase {
48
    UT.UnityTestCase {
3771
@@ -121,11 +54,11 @@
3772
121
            resetRunningApplications()
54
            resetRunningApplications()
3773
122
        }
55
        }
3774
123
56
3776
124
        property var calendarTile
57
        property var browserTile
3777
125
        property var phoneTile
58
        property var phoneTile
3778
126
59
3781
127
        property var isCalendarLongPressed: false
60
        property var isBrowserLongPressed: false
3782
128
        function onCalendarLongPressed() {isCalendarLongPressed = true}
61
        function onBrowserLongPressed() {isBrowserLongPressed = true}
3783
129
62
3784
130
        property var isPhoneLongPressed: false
63
        property var isPhoneLongPressed: false
3785
131
        function onPhoneLongPressed() {isPhoneLongPressed = true}
64
        function onPhoneLongPressed() {isPhoneLongPressed = true}
3786
@@ -133,25 +66,25 @@
3787
133
        // Tiles should go to termination mode when any one of them is long-pressed.
66
        // Tiles should go to termination mode when any one of them is long-pressed.
3788
134
        // Long-pressing when they're in termination mode brings them back to activation mode
67
        // Long-pressing when they're in termination mode brings them back to activation mode
3789
135
        function test_enterTerminationMode() {
68
        function test_enterTerminationMode() {
3793
136
            calendarTile = findChild(runningApplicationsGrid, "runningAppTile Calendar")
69
            browserTile = findChild(runningApplicationsGrid, "runningAppTile Browser")
3794
137
            verify(calendarTile != undefined)
70
            verify(browserTile != undefined)
3795
138
            calendarTile.onPressAndHold.connect(onCalendarLongPressed)
71
            browserTile.onPressAndHold.connect(onBrowserLongPressed)
3796
139
72
3797
140
            phoneTile = findChild(runningApplicationsGrid, "runningAppTile Phone")
73
            phoneTile = findChild(runningApplicationsGrid, "runningAppTile Phone")
3798
141
            verify(phoneTile != undefined)
74
            verify(phoneTile != undefined)
3799
142
            phoneTile.onPressAndHold.connect(onPhoneLongPressed)
75
            phoneTile.onPressAndHold.connect(onPhoneLongPressed)
3800
143
76
3802
144
            compare(calendarTile.terminationModeEnabled, false)
77
            compare(browserTile.terminationModeEnabled, false)
3803
145
            compare(phoneTile.terminationModeEnabled, false)
78
            compare(phoneTile.terminationModeEnabled, false)
3804
146
            compare(runningApplicationsGrid.terminationModeEnabled, false)
79
            compare(runningApplicationsGrid.terminationModeEnabled, false)
3805
147
80
3808
148
            isCalendarLongPressed = false
81
            isBrowserLongPressed = false
3809
149
            mousePress(calendarTile, calendarTile.width/2, calendarTile.height/2)
82
            mousePress(browserTile, browserTile.width/2, browserTile.height/2)
3810
150
            tryCompareFunction(checkSwitchToTerminationModeAfterLongPress, true)
83
            tryCompareFunction(checkSwitchToTerminationModeAfterLongPress, true)
3811
151
84
3813
152
            mouseRelease(calendarTile, calendarTile.width/2, calendarTile.height/2)
85
            mouseRelease(browserTile, browserTile.width/2, browserTile.height/2)
3814
153
86
3816
154
            compare(calendarTile.terminationModeEnabled, true)
87
            compare(browserTile.terminationModeEnabled, true)
3817
155
            compare(phoneTile.terminationModeEnabled, true)
88
            compare(phoneTile.terminationModeEnabled, true)
3818
156
            compare(runningApplicationsGrid.terminationModeEnabled, true)
89
            compare(runningApplicationsGrid.terminationModeEnabled, true)
3819
157
90
3820
@@ -161,23 +94,23 @@
3821
161
94
3822
162
            mouseRelease(phoneTile, phoneTile.width/2, phoneTile.height/2)
95
            mouseRelease(phoneTile, phoneTile.width/2, phoneTile.height/2)
3823
163
96
3825
164
            compare(calendarTile.terminationModeEnabled, false)
97
            compare(browserTile.terminationModeEnabled, false)
3826
165
            compare(phoneTile.terminationModeEnabled, false)
98
            compare(phoneTile.terminationModeEnabled, false)
3827
166
            compare(runningApplicationsGrid.terminationModeEnabled, false)
99
            compare(runningApplicationsGrid.terminationModeEnabled, false)
3828
167
100
3830
168
            calendarTile.onPressAndHold.disconnect(onCalendarLongPressed)
101
            browserTile.onPressAndHold.disconnect(onBrowserLongPressed)
3831
169
            phoneTile.onPressAndHold.disconnect(onPhoneLongPressed)
102
            phoneTile.onPressAndHold.disconnect(onPhoneLongPressed)
3832
170
        }
103
        }
3833
171
104
3834
172
        // Checks that components swicth to termination mode after (and only after) a long
105
        // Checks that components swicth to termination mode after (and only after) a long
3836
173
        // press happens on Calendar tile.
106
        // press happens on Browser tile.
3837
174
        function checkSwitchToTerminationModeAfterLongPress() {
107
        function checkSwitchToTerminationModeAfterLongPress() {
3841
175
            compare(calendarTile.terminationModeEnabled, isCalendarLongPressed)
108
            compare(browserTile.terminationModeEnabled, isBrowserLongPressed)
3842
176
            compare(phoneTile.terminationModeEnabled, isCalendarLongPressed)
109
            compare(phoneTile.terminationModeEnabled, isBrowserLongPressed)
3843
177
            compare(runningApplicationsGrid.terminationModeEnabled, isCalendarLongPressed)
110
            compare(runningApplicationsGrid.terminationModeEnabled, isBrowserLongPressed)
3844
178
111
3847
179
            return isCalendarLongPressed &&
112
            return isBrowserLongPressed &&
3848
180
                calendarTile.terminationModeEnabled &&
113
                browserTile.terminationModeEnabled &&
3849
181
                phoneTile.terminationModeEnabled &&
114
                phoneTile.terminationModeEnabled &&
3850
182
                runningApplicationsGrid.terminationModeEnabled
115
                runningApplicationsGrid.terminationModeEnabled
3851
183
        }
116
        }
3852
@@ -185,12 +118,12 @@
3853
185
        // Checks that components swicth to activation mode after (and only after) a long
118
        // Checks that components swicth to activation mode after (and only after) a long
3854
186
        // press happens on Phone tile.
119
        // press happens on Phone tile.
3855
187
        function checkSwitchToActivationModeAfterLongPress() {
120
        function checkSwitchToActivationModeAfterLongPress() {
3857
188
            compare(calendarTile.terminationModeEnabled, !isPhoneLongPressed)
121
            compare(browserTile.terminationModeEnabled, !isPhoneLongPressed)
3858
189
            compare(phoneTile.terminationModeEnabled, !isPhoneLongPressed)
122
            compare(phoneTile.terminationModeEnabled, !isPhoneLongPressed)
3859
190
            compare(runningApplicationsGrid.terminationModeEnabled, !isPhoneLongPressed)
123
            compare(runningApplicationsGrid.terminationModeEnabled, !isPhoneLongPressed)
3860
191
124
3861
192
            return isPhoneLongPressed &&
125
            return isPhoneLongPressed &&
3863
193
                !calendarTile.terminationModeEnabled &&
126
                !browserTile.terminationModeEnabled &&
3864
194
                !phoneTile.terminationModeEnabled &&
127
                !phoneTile.terminationModeEnabled &&
3865
195
                !runningApplicationsGrid.terminationModeEnabled
128
                !runningApplicationsGrid.terminationModeEnabled
3866
196
        }
129
        }
3867
@@ -200,17 +133,17 @@
3868
200
        function test_clickTileNotClose() {
133
        function test_clickTileNotClose() {
3869
201
            runningApplicationsGrid.terminationModeEnabled = true
134
            runningApplicationsGrid.terminationModeEnabled = true
3870
202
135
3882
203
            var calendarTile = findChild(runningApplicationsGrid, "runningAppTile Calendar")
136
            var browserTile = findChild(runningApplicationsGrid, "runningAppTile Browser")
3883
204
            verify(calendarTile != undefined)
137
            verify(browserTile != undefined)
3884
205
138
3885
206
            verify(fakeRunningAppsModel.contains("calendar"))
139
            verify(ApplicationManager.findApplication("webbrowser-app") !== null)
3886
207
140
3887
208
            mouseClick(calendarTile, calendarTile.width/2, calendarTile.height/2)
141
            mouseClick(browserTile, browserTile.width/2, browserTile.height/2)
3888
209
142
3889
210
            verify(fakeRunningAppsModel.contains("calendar"))
143
            verify(ApplicationManager.findApplication("webbrowser-app") !== null)
3890
211
144
3891
212
            // The tile for the Calendar app should stay there
145
            // The tile for the Browser app should stay there
3892
213
            tryCompareFunction(checkCalendarTileExists, true)
146
            tryCompareFunction(checkBrowserTileExists, true)
3893
214
        }
147
        }
3894
215
148
3895
216
        // While in termination mode, clicking on a running application tile's close icon
149
        // While in termination mode, clicking on a running application tile's close icon
3896
@@ -218,25 +151,25 @@
3897
218
        function test_clickCloseIconToTerminateApp() {
151
        function test_clickCloseIconToTerminateApp() {
3898
219
            runningApplicationsGrid.terminationModeEnabled = true
152
            runningApplicationsGrid.terminationModeEnabled = true
3899
220
153
3908
221
            var calendarTile = findChild(runningApplicationsGrid, "runningAppTile Calendar")
154
            var browserTile = findChild(runningApplicationsGrid, "runningAppTile Browser")
3909
222
            var calendarTileCloseButton = findChild(runningApplicationsGrid, "closeIcon Calendar")
155
            var browserTileCloseButton = findChild(runningApplicationsGrid, "closeIcon Browser")
3910
223
156
3911
224
            verify(calendarTile != undefined)
157
            verify(browserTile != undefined)
3912
225
            verify(calendarTileCloseButton != undefined)
158
            verify(browserTileCloseButton != undefined)
3913
226
            verify(fakeRunningAppsModel.contains("calendar"))
159
            verify(ApplicationManager.findApplication("webbrowser-app") !== 0)
3914
227
160
3915
228
            mouseClick(calendarTileCloseButton, calendarTileCloseButton.width/2, calendarTileCloseButton.height/2)
161
            mouseClick(browserTileCloseButton, browserTileCloseButton.width/2, browserTileCloseButton.height/2)
3916
229
            wait(0) // spin event loop to start any pending animation
162
            wait(0) // spin event loop to start any pending animation
3917
230
163
3919
231
            verify(!fakeRunningAppsModel.contains("calendar"))
164
            verify(ApplicationManager.findApplication("webbrowser-app") === null)
3920
232
165
3922
233
            // The tile for the Calendar app should eventually vanish since the
166
            // The tile for the Browser app should eventually vanish since the
3923
234
            // application has been terminated.
167
            // application has been terminated.
3925
235
            tryCompareFunction(checkCalendarTileExists, false)
168
            tryCompareFunction(checkBrowserTileExists, false)
3926
236
        }
169
        }
3927
237
170
3930
238
        function checkCalendarTileExists() {
171
        function checkBrowserTileExists() {
3931
239
            return findChild(runningApplicationsGrid, "runningAppTile Calendar")
172
            return findChild(runningApplicationsGrid, "runningAppTile Browser")
3932
240
                    != undefined
173
                    != undefined
3933
241
        }
174
        }
3934
242
175
3935
@@ -245,8 +178,8 @@
3936
245
        function test_clickOutsideTilesDisablesTerminationMode() {
178
        function test_clickOutsideTilesDisablesTerminationMode() {
3937
246
            runningApplicationsGrid.terminationModeEnabled = true
179
            runningApplicationsGrid.terminationModeEnabled = true
3938
247
180
3941
248
            var calendarTile = findChild(runningApplicationsGrid, "runningAppTile Calendar")
181
            var browserTile = findChild(runningApplicationsGrid, "runningAppTile Browser")
3942
249
            verify(calendarTile != undefined)
182
            verify(browserTile != undefined)
3943
250
183
3944
251
            verify(runningApplicationsGrid.terminationModeEnabled);
184
            verify(runningApplicationsGrid.terminationModeEnabled);
3945
252
185
3946
253
186
3947
=== added directory 'tests/qmltests/Stages'
3948
=== added file 'tests/qmltests/Stages/tst_PhoneStage.qml'
3949
--- tests/qmltests/Stages/tst_PhoneStage.qml	1970-01-01 00:00:00 +0000
3950
+++ tests/qmltests/Stages/tst_PhoneStage.qml	2014-03-25 15:08:15 +0000
3951
@@ -0,0 +1,288 @@
3952
1
/*
3953
2
 * Copyright 2014 Canonical Ltd.
3954
3
 *
3955
4
 * This program is free software; you can redistribute it and/or modify
3956
5
 * it under the terms of the GNU General Public License as published by
3957
6
 * the Free Software Foundation; version 3.
3958
7
 *
3959
8
 * This program is distributed in the hope that it will be useful,
3960
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3961
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3962
11
 * GNU General Public License for more details.
3963
12
 *
3964
13
 * You should have received a copy of the GNU General Public License
3965
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3966
15
 */
3967
16
3968
17
import QtQuick 2.0
3969
18
import QtTest 1.0
3970
19
import Unity.Test 0.1 as UT
3971
20
import ".."
3972
21
import "../../../qml/Stages"
3973
22
import Ubuntu.Components 0.1
3974
23
import Unity.Application 0.1
3975
24
3976
25
Item {
3977
26
    width: units.gu(70)
3978
27
    height: units.gu(70)
3979
28
3980
29
    Rectangle {
3981
30
3982
31
    }
3983
32
3984
33
    PhoneStage {
3985
34
        id: phoneStage
3986
35
        anchors { fill: parent; rightMargin: units.gu(30) }
3987
36
        shown: true
3988
37
        dragAreaWidth: units.gu(2)
3989
38
    }
3990
39
3991
40
    Binding {
3992
41
        target: ApplicationManager
3993
42
        property: "rightMargin"
3994
43
        value: phoneStage.anchors.rightMargin
3995
44
    }
3996
45
3997
46
    Rectangle {
3998
47
        anchors { fill: parent; leftMargin: phoneStage.width }
3999
48
//        color: "blue"
4000
49
4001
50
        Column {
4002
51
            anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
4003
52
            spacing: units.gu(1)
4004
53
            Button {
4005
54
                anchors { left: parent.left; right: parent.right }
4006
55
                text: "Add App"
4007
56
                onClicked: {
4008
57
                    testCase.addApps();
4009
58
                }
4010
59
            }
4011
60
            Button {
4012
61
                anchors { left: parent.left; right: parent.right }
4013
62
                text: "Add App"
4014
63
            }
4015
64
        }
4016
65
    }
4017
66
4018
67
    UT.UnityTestCase {
4019
68
        id: testCase
4020
69
        name: "PhoneStage"
4021
70
        when: windowShown
4022
71
4023
72
        function addApps(count) {
4024
73
            if (count == undefined) count = 1;
4025
74
            for (var i = 0; i < count; i++) {
4026
75
                var app = ApplicationManager.startApplication(ApplicationManager.availableApplications()[ApplicationManager.count])
4027
76
                tryCompare(app, "state", ApplicationInfoInterface.Running)
4028
77
                // Fixme: Right now there is a timeout in the PhoneStage that displays a white splash
4029
78
                // screen rectangle when an app starts. This is because we don't yet have a way of
4030
79
                // knowing when an app has finished launching. That workaround and this wait() should
4031
80
                // go away at some point and the app's state only changing to Running when ready for real.
4032
81
//                wait(1000)
4033
82
                waitForRendering(phoneStage)
4034
83
            }
4035
84
        }
4036
85
4037
86
        function goToSpread() {
4038
87
            var spreadView = findChild(phoneStage, "spreadView");
4039
88
4040
89
            var startX = phoneStage.width;
4041
90
            var startY = phoneStage.height / 2;
4042
91
            var endY = startY;
4043
92
            var endX = units.gu(2);
4044
93
4045
94
            touchFlick(phoneStage, startX, startY, endX, endY,
4046
95
                       true /* beginTouch */, true /* endTouch */, units.gu(10), 50);
4047
96
        }
4048
97
4049
98
        function test_shortFlick() {
4050
99
            addApps(2)
4051
100
            var startX = phoneStage.width - units.gu(1);
4052
101
            var startY = phoneStage.height / 2;
4053
102
            var endX = phoneStage.width / 2;
4054
103
            var endY = startY;
4055
104
4056
105
            var activeApp = ApplicationManager.get(0);
4057
106
            var inactiveApp = ApplicationManager.get(1);
4058
107
4059
108
            touchFlick(phoneStage, startX, startY, endX, endY,
4060
109
                       true /* beginTouch */, true /* endTouch */, units.gu(10), 50);
4061
110
4062
111
            tryCompare(ApplicationManager, "focusedApplicationId", inactiveApp.appId)
4063
112
4064
113
            touchFlick(phoneStage, startX, startY, endX, endY,
4065
114
                       true /* beginTouch */, true /* endTouch */, units.gu(10), 50);
4066
115
4067
116
            tryCompare(ApplicationManager, "focusedApplicationId", activeApp.appId)
4068
117
4069
118
            tryCompare(phoneStage, "painting", false);
4070
119
        }
4071
120
4072
121
        function test_enterSpread_data() {
4073
122
            return [
4074
123
                {tag: "<position1 (linear movement)", positionMarker: "positionMarker1", linear: true, offset: -1, endPhase: 0, targetPhase: 0, newFocusedIndex: 1 },
4075
124
                {tag: "<position1 (non-linear movement)", positionMarker: "positionMarker1", linear: false, offset: -1, endPhase: 0, targetPhase: 0, newFocusedIndex: 0 },
4076
125
                {tag: ">position1", positionMarker: "positionMarker1", linear: true, offset: +1, endPhase: 0, targetPhase: 0, newFocusedIndex: 1 },
4077
126
                {tag: "<position2 (linear)", positionMarker: "positionMarker2", linear: true, offset: -1, endPhase: 0, targetPhase: 0, newFocusedIndex: 1 },
4078
127
                {tag: "<position2 (non-linear)", positionMarker: "positionMarker2", linear: false, offset: -1, endPhase: 0, targetPhase: 0, newFocusedIndex: 1 },
4079
128
                {tag: ">position2", positionMarker: "positionMarker2", linear: true, offset: +1, endPhase: 1, targetPhase: 0, newFocusedIndex: 1 },
4080
129
                {tag: "<position3", positionMarker: "positionMarker3", linear: true, offset: -1, endPhase: 1, targetPhase: 0, newFocusedIndex: 1 },
4081
130
                {tag: ">position3", positionMarker: "positionMarker3", linear: true, offset: +1, endPhase: 2, targetPhase: 2, newFocusedIndex: 2 },
4082
131
            ];
4083
132
        }
4084
133
4085
134
        function test_enterSpread(data) {
4086
135
            addApps(5)
4087
136
4088
137
            var spreadView = findChild(phoneStage, "spreadView");
4089
138
4090
139
            var startX = phoneStage.width;
4091
140
            var startY = phoneStage.height / 2;
4092
141
            var endY = startY;
4093
142
            var endX = spreadView.width - (spreadView.width * spreadView[data.positionMarker]) - data.offset - phoneStage.dragAreaWidth;
4094
143
4095
144
            var oldFocusedApp = ApplicationManager.get(0);
4096
145
            var newFocusedApp = ApplicationManager.get(data.newFocusedIndex);
4097
146
4098
147
            touchFlick(phoneStage, startX, startY, endX, endY,
4099
148
                       true /* beginTouch */, false /* endTouch */, units.gu(10), 50);
4100
149
4101
150
            tryCompare(spreadView, "phase", data.endPhase)
4102
151
4103
152
            if (!data.linear) {
4104
153
                touchFlick(phoneStage, endX, endY, endX + units.gu(.5), endY,
4105
154
                           false /* beginTouch */, false /* endTouch */, units.gu(10), 50);
4106
155
                touchFlick(phoneStage, endY + units.gu(.5), endY, endX, endY,
4107
156
                           false /* beginTouch */, false /* endTouch */, units.gu(10), 50);
4108
157
            }
4109
158
4110
159
            touchRelease(phoneStage, endX, endY);
4111
160
4112
161
            tryCompare(spreadView, "phase", data.targetPhase)
4113
162
4114
163
            if (data.targetPhase == 2) {
4115
164
                var app2 = findChild(spreadView, "appDelegate2");
4116
165
                mouseClick(app2, units.gu(1), units.gu(1));
4117
166
            }
4118
167
4119
168
            tryCompare(phoneStage, "painting", false);
4120
169
            tryCompare(ApplicationManager, "focusedApplicationId", newFocusedApp.appId);
4121
170
        }
4122
171
4123
172
        function test_selectAppFromSpread_data() {
4124
173
            var appsToTest = 6;
4125
174
            var apps = new Array();
4126
175
            for (var i = 0; i < appsToTest; i++) {
4127
176
                var item = new Object();
4128
177
                item.tag = "App " + i;
4129
178
                item.index = i;
4130
179
                item.total = appsToTest;
4131
180
                apps.push(item)
4132
181
            }
4133
182
            return apps;
4134
183
        }
4135
184
4136
185
        function test_selectAppFromSpread(data) {
4137
186
            addApps(data.total)
4138
187
4139
188
            var spreadView = findChild(phoneStage, "spreadView");
4140
189
4141
190
            goToSpread();
4142
191
4143
192
            tryCompare(spreadView, "phase", 2);
4144
193
4145
194
            var tile = findChild(spreadView, "appDelegate" + data.index);
4146
195
            var appId = ApplicationManager.get(data.index).appId;
4147
196
4148
197
            if (tile.mapToItem(spreadView).x > spreadView.width) {
4149
198
                // Item is not visible... Need to flick the spread
4150
199
                var startX = phoneStage.width - units.gu(1);
4151
200
                var startY = phoneStage.height / 2;
4152
201
                var endY = startY;
4153
202
                var endX = units.gu(2);
4154
203
                touchFlick(phoneStage, startX, startY, endX, endY, true, true, units.gu(10), 50)
4155
204
                tryCompare(spreadView, "flicking", false);
4156
205
                tryCompare(spreadView, "moving", false);
4157
206
//                waitForRendering(phoneStage);
4158
207
            }
4159
208
4160
209
            console.log("clicking app", data.index, "(", appId, ")")
4161
210
            mouseClick(spreadView, tile.mapToItem(spreadView).x + units.gu(1), spreadView.height / 2)
4162
211
            tryCompare(ApplicationManager, "focusedApplicationId", appId);
4163
212
            tryCompare(spreadView, "phase", 0);
4164
213
        }
4165
214
4166
215
        function test_animateAppStartup() {
4167
216
            compare(phoneStage.painting, false);
4168
217
            addApps(2);
4169
218
            tryCompare(phoneStage, "painting", true);
4170
219
            tryCompare(phoneStage, "painting", false);
4171
220
            addApps(1);
4172
221
            tryCompare(phoneStage, "painting", true);
4173
222
            tryCompare(phoneStage, "painting", false);
4174
223
        }
4175
224
4176
225
        function test_select_data() {
4177
226
            return [
4178
227
                { tag: "0", index: 0 },
4179
228
                { tag: "2", index: 2 },
4180
229
                { tag: "4", index: 4 },
4181
230
            ]
4182
231
        }
4183
232
4184
233
        function test_select(data) {
4185
234
            addApps(5);
4186
235
4187
236
            var spreadView = findChild(phoneStage, "spreadView");
4188
237
            var selectedApp = ApplicationManager.get(data.index);
4189
238
4190
239
            goToSpread();
4191
240
4192
241
            phoneStage.select(selectedApp.appId);
4193
242
4194
243
            tryCompare(phoneStage, "painting", false);
4195
244
            compare(ApplicationManager.focusedApplicationId, selectedApp.appId);
4196
245
        }
4197
246
4198
247
        function test_fullscreenMode() {
4199
248
            var fullscreenApp = null;
4200
249
            var normalApp = null;
4201
250
4202
251
            for (var i = 0; i < 5; i++) {
4203
252
                addApps(1);
4204
253
                var newApp = ApplicationManager.get(0);
4205
254
                tryCompare(phoneStage, "fullscreen", newApp.fullscreen);
4206
255
                if (newApp.fullscreen && fullscreenApp == null) {
4207
256
                    fullscreenApp = newApp;
4208
257
                } else if (!newApp.fullscreen && normalApp == null){
4209
258
                    normalApp = newApp;
4210
259
                }
4211
260
            }
4212
261
            verify(fullscreenApp != null); // Can't continue the test without having a fullscreen app
4213
262
            verify(normalApp != null); // Can't continue the test without having a non-fullscreen app
4214
263
4215
264
            // Select a normal app
4216
265
            goToSpread();
4217
266
            phoneStage.select(normalApp.appId);
4218
267
            tryCompare(phoneStage, "fullscreen", false);
4219
268
4220
269
            // Select a fullscreen app
4221
270
            goToSpread();
4222
271
            phoneStage.select(fullscreenApp.appId);
4223
272
            tryCompare(phoneStage, "fullscreen", true);
4224
273
4225
274
            // Select a normal app
4226
275
            goToSpread();
4227
276
            phoneStage.select(normalApp.appId);
4228
277
            tryCompare(phoneStage, "fullscreen", false);
4229
278
        }
4230
279
4231
280
        function cleanup() {
4232
281
            while (ApplicationManager.count > 0) {
4233
282
                var oldCount = ApplicationManager.count;
4234
283
                ApplicationManager.stopApplication(ApplicationManager.get(0).appId)
4235
284
                tryCompare(ApplicationManager, "count", oldCount - 1)
4236
285
            }
4237
286
        }
4238
287
    }
4239
288
}
4240
0
289
4241
=== modified file 'tests/qmltests/tst_Shell.qml'
4242
--- tests/qmltests/tst_Shell.qml	2014-03-19 10:48:06 +0000
4243
+++ tests/qmltests/tst_Shell.qml	2014-03-25 15:08:15 +0000
4244
@@ -117,6 +117,7 @@
4245
117
            while (apps.count > 0) {
117
            while (apps.count > 0) {
4246
118
                ApplicationManager.stopApplication(apps.get(0).appId);
118
                ApplicationManager.stopApplication(apps.get(0).appId);
4247
119
            }
119
            }
4248
120
            compare(ApplicationManager.count, 0)
4249
120
        }
121
        }
4250
121
122
4251
122
        /*
123
        /*
4252
@@ -187,26 +188,34 @@
4253
187
            tapOnAppIconInLauncher();
188
            tapOnAppIconInLauncher();
4254
188
            waitUntilApplicationWindowIsFullyVisible();
189
            waitUntilApplicationWindowIsFullyVisible();
4255
189
190
4258
190
            var mainApp = ApplicationManager.focusedApplicationId;
191
            var mainAppId = ApplicationManager.focusedApplicationId;
4259
191
            verify(mainApp != "");
192
            verify(mainAppId != "");
4260
193
            var mainApp = ApplicationManager.findApplication(mainAppId);
4261
194
            verify(mainApp);
4262
195
            tryCompare(mainApp.state, ApplicationInfo.Running);
4263
192
196
4264
193
            // Try to suspend while proximity is engaged...
197
            // Try to suspend while proximity is engaged...
4265
194
            Powerd.displayPowerStateChange(Powerd.Off, Powerd.UseProximity);
198
            Powerd.displayPowerStateChange(Powerd.Off, Powerd.UseProximity);
4266
195
            tryCompare(greeter, "showProgress", 0);
199
            tryCompare(greeter, "showProgress", 0);
4267
196
200
4268
197
            // Now really suspend
201
            // Now really suspend
4269
202
            print("suspending")
4270
198
            Powerd.displayPowerStateChange(Powerd.Off, 0);
203
            Powerd.displayPowerStateChange(Powerd.Off, 0);
4271
204
            print("done suspending")
4272
199
            tryCompare(greeter, "showProgress", 1);
205
            tryCompare(greeter, "showProgress", 1);
4274
200
            tryCompare(ApplicationManager, "focusedApplicationId", "");
206
4275
207
            tryCompare(ApplicationManager, "suspended", true);
4276
208
            compare(mainApp.state, ApplicationInfo.Suspended);
4277
201
209
4278
202
            // And wake up
210
            // And wake up
4279
203
            Powerd.displayPowerStateChange(Powerd.On, 0);
211
            Powerd.displayPowerStateChange(Powerd.On, 0);
4280
204
            tryCompare(ApplicationManager, "focusedApplicationId", "");
4281
205
            tryCompare(greeter, "showProgress", 1);
212
            tryCompare(greeter, "showProgress", 1);
4282
206
213
4283
207
            // Swipe away greeter to focus app
214
            // Swipe away greeter to focus app
4284
208
            swipeAwayGreeter();
215
            swipeAwayGreeter();
4286
209
            tryCompare(ApplicationManager, "focusedApplicationId", mainApp);
216
            tryCompare(ApplicationManager, "suspended", false);
4287
217
            compare(mainApp.state, ApplicationInfo.Running);
4288
218
            tryCompare(ApplicationManager, "focusedApplicationId", mainAppId);
4289
210
        }
219
        }
4290
211
220
4291
212
        function swipeAwayGreeter() {
221
        function swipeAwayGreeter() {
4292
@@ -239,7 +248,7 @@
4293
239
            tryCompare(dash, "opacity", 1.0);
248
            tryCompare(dash, "opacity", 1.0);
4294
240
249
4295
241
            touchFlick(shell, touchX, touchY, shell.width * 0.1, touchY,
250
            touchFlick(shell, touchX, touchY, shell.width * 0.1, touchY,
4297
242
                       true /* beginTouch */, false /* endTouch */);
251
                       true /* beginTouch */, false /* endTouch */, units.gu(10), 50);
4298
243
252
4299
244
            // check that Dash has been scaled down and had its opacity reduced
253
            // check that Dash has been scaled down and had its opacity reduced
4300
245
            tryCompareFunction(function() { return dash.contentScale <= 0.9; }, true);
254
            tryCompareFunction(function() { return dash.contentScale <= 0.9; }, true);
4301
@@ -270,7 +279,7 @@
4302
270
            tryCompare(dash, "opacity", 1.0);
279
            tryCompare(dash, "opacity", 1.0);
4303
271
280
4304
272
            touchFlick(shell, touchX, touchY, shell.width * 0.1, touchY,
281
            touchFlick(shell, touchX, touchY, shell.width * 0.1, touchY,
4306
273
                       true /* beginTouch */, false /* endTouch */);
282
                       true /* beginTouch */, false /* endTouch */, units.gu(10), 50);
4307
274
283
4308
275
            // check that Dash has been scaled down and had its opacity reduced
284
            // check that Dash has been scaled down and had its opacity reduced
4309
276
            tryCompareFunction(function() { return dash.contentScale <= 0.9; }, true);
285
            tryCompareFunction(function() { return dash.contentScale <= 0.9; }, true);
4310
@@ -486,7 +495,6 @@
4311
486
        }
495
        }
4312
487
496
4313
488
        function test_DashShown(data) {
497
        function test_DashShown(data) {
4314
489
4315
490
            if (data.greeter) {
498
            if (data.greeter) {
4316
491
                // Swipe the greeter in
499
                // Swipe the greeter in
4317
492
                var greeter = findChild(shell, "greeter");
500
                var greeter = findChild(shell, "greeter");
Reviewer	Review Type	Date Requested	Status
Gerry Boland (community)		2014-02-04	Approve on 2014-03-27
Mirco Müller (community)			Approve on 2014-03-26
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-03-25
Albert Astals Cid (community)			Needs Fixing on 2014-03-25
Ubuntu Unity PS integration team	packaging	2014-03-04	Pending
Vesa Rautiainen		2014-02-07	Pending
Review via email: mp+204798@code.launchpad.net