1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2013-06-05 22:03:08 +0000
3
+++ CMakeLists.txt	2013-06-13 14:42:44 +0000
4
@@ -144,7 +144,7 @@
5
144
    Hud
144
    Hud
6
145
    Panel
145
    Panel
7
146
    Launcher
146
    Launcher
9
147
    SideStage
147
    Stages
10
148
    Notifications
148
    Notifications
11
149
    )
149
    )
12
150
150
13
151
151
14
=== modified file 'Shell.qml'
15
--- Shell.qml	2013-06-12 08:48:37 +0000
16
+++ Shell.qml	2013-06-13 14:42:44 +0000
17
@@ -26,7 +26,7 @@
18
26
import "Components"
26
import "Components"
19
27
import "Components/Math.js" as MathLocal
27
import "Components/Math.js" as MathLocal
20
28
import "Bottombar"
28
import "Bottombar"
22
29
import "SideStage"
29
import "Stages"
23
30
30
24
31
FocusScope {
31
FocusScope {
25
32
    id: shell
32
    id: shell
26
@@ -42,71 +42,14 @@
27
42
    readonly property real panelHeight: panel.panelHeight
42
    readonly property real panelHeight: panel.panelHeight
28
43
43
29
44
    property bool dashShown: dash.shown
44
    property bool dashShown: dash.shown
41
45
    property bool stageScreenshotsReady: {
45
    readonly property bool stageScreenshotsReady: stageManager.stageScreenshotsReady
31
46
        if (sideStage.shown) {
32
47
            if (mainStage.applications.count > 0) {
33
48
                return mainStage.usingScreenshots && sideStage.usingScreenshots;
34
49
            } else {
35
50
                return sideStage.usingScreenshots;
36
51
            }
37
52
        } else {
38
53
            return mainStage.usingScreenshots;
39
54
        }
40
55
    }
42
56
46
43
57
    property ListModel searchHistory: SearchHistoryModel {}
47
    property ListModel searchHistory: SearchHistoryModel {}
44
58
48
45
59
    property var applicationManager: ApplicationManagerWrapper {}
49
    property var applicationManager: ApplicationManagerWrapper {}
46
60
50
47
61
    Component.onCompleted: {
48
62
        applicationManager.sideStageEnabled = Qt.binding(function() { return sideStage.enabled })
49
63
50
64
        // FIXME: if application focused before shell starts, shell draws on top of it only.
51
65
        // We should detect already running applications on shell start and bring them to the front.
52
66
        applicationManager.unfocusCurrentApplication();
53
67
    }
54
68
55
69
    readonly property bool fullscreenMode: {
56
70
        if (greeter.shown || lockscreen.shown) {
57
71
            return false;
58
72
        } else if (mainStage.usingScreenshots) { // Window Manager animating so want to re-evaluate fullscreen mode
59
73
            return mainStage.switchingFromFullscreenToFullscreen;
60
74
        } else if (applicationManager.mainStageFocusedApplication) {
61
75
            return applicationManager.mainStageFocusedApplication.fullscreen;
62
76
        } else {
63
77
            return false;
64
78
        }
65
79
    }
66
80
67
81
    Connections {
68
82
        target: applicationManager
69
83
        ignoreUnknownSignals: true
70
84
        onFocusRequested: {
71
85
            // TODO: this should be protected to only unlock for certain applications / certain usecases
72
86
            // potentially only in connection with a notification
73
87
            greeter.hide();
74
88
            shell.activateApplication(desktopFile);
75
89
        }
76
90
    }
77
91
78
92
    function activateApplication(desktopFile, argument) {
51
    function activateApplication(desktopFile, argument) {
96
93
        if (applicationManager) {
52
        stageManager.activateApplication(desktopFile, argument);
80
94
            // For newly started applications, as it takes them time to draw their first frame
81
95
            // we add a delay before we hide the animation screenshots to compensate.
82
96
            var addDelay = !applicationManager.getApplicationFromDesktopFile(desktopFile);
83
97
84
98
            var application;
85
99
            application = applicationManager.activateApplication(desktopFile, argument);
86
100
            if (application == null) {
87
101
                return;
88
102
            }
89
103
            if (application.stage == ApplicationInfo.MainStage || !sideStage.enabled) {
90
104
                mainStage.activateApplication(desktopFile, addDelay);
91
105
            } else {
92
106
                sideStage.activateApplication(desktopFile, addDelay);
93
107
            }
94
108
            stages.show();
95
109
        }
97
110
    }
53
    }
98
111
54
99
112
    VolumeControl {
55
    VolumeControl {
100
@@ -126,9 +69,7 @@
101
126
        id: underlay
69
        id: underlay
102
127
        anchors.fill: parent
70
        anchors.fill: parent
103
128
        visible: !(panel.indicators.fullyOpened && shell.width <= panel.indicatorsMenuWidth)
71
        visible: !(panel.indicators.fullyOpened && shell.width <= panel.indicatorsMenuWidth)
107
129
                 && (stages.fullyHidden
72
                 && stageManager.needUnderlay
105
130
                     || (stages.fullyShown && mainStage.usingScreenshots)
106
131
                     || !stages.fullyShown && (mainStage.usingScreenshots || (sideStage.shown && sideStage.usingScreenshots)))
108
132
73
109
133
        Image {
74
        Image {
110
134
            id: backgroundImage
75
            id: backgroundImage
111
@@ -148,7 +89,7 @@
112
148
            id: dash
89
            id: dash
113
149
90
114
150
            available: !greeter.shown && !lockscreen.shown
91
            available: !greeter.shown && !lockscreen.shown
116
151
            hides: [stages, launcher, panel.indicators]
92
            hides: [stageManager, launcher, panel.indicators]
117
152
            shown: disappearingAnimationProgress !== 1.0
93
            shown: disappearingAnimationProgress !== 1.0
118
153
            enabled: disappearingAnimationProgress === 0.0
94
            enabled: disappearingAnimationProgress === 0.0
119
154
            // FIXME: unfocus all applications when going back to the dash
95
            // FIXME: unfocus all applications when going back to the dash
120
@@ -165,182 +106,24 @@
121
165
106
122
166
            contentScale: 1.0 - 0.2 * disappearingAnimationProgress
107
            contentScale: 1.0 - 0.2 * disappearingAnimationProgress
123
167
            opacity: 1.0 - disappearingAnimationProgress
108
            opacity: 1.0 - disappearingAnimationProgress
126
168
            property real disappearingAnimationProgress: ((greeter.shown) ? greeterRevealer.animatedProgress : stagesRevealer.animatedProgress)
109
            property real disappearingAnimationProgress: ((greeter.shown) ? greeterRevealer.animatedProgress : stageManager.animatedProgress)
127
169
            // FIXME: only necessary because stagesRevealer.animatedProgress and
110
            // FIXME: only necessary because stageManager.animatedProgress and
128
170
            // greeterRevealer.animatedProgress are not animated
111
            // greeterRevealer.animatedProgress are not animated
129
171
            Behavior on disappearingAnimationProgress { SmoothedAnimation { velocity: 5 }}
112
            Behavior on disappearingAnimationProgress { SmoothedAnimation { velocity: 5 }}
130
172
        }
113
        }
131
173
    }
114
    }
132
174
115
302
175
116
    StageManager {
303
176
    Item {
117
        id: stageManager
304
177
118
305
178
        width: parent.width
119
        anchors.fill: parent
306
179
        height: parent.height
120
307
180
        x: launcher.progress
121
        enabled: !greeter.shown
308
181
        Behavior on x {SmoothedAnimation{velocity: 600}}
122
        hides: [launcher, panel.indicators]
309
182
123
        applicationManager: shell.applicationManager
310
183
124
        leftSwipePosition: launcher.progress
311
184
        Showable {
125
        panelHeight: panel.panelHeight
312
185
            id: stages
126
        edgeHandleSize: shell.edgeSize
144
186
145
187
            property bool fullyShown: shown && stages[stagesRevealer.boundProperty] == stagesRevealer.openedValue
146
188
                                      && parent.x == 0
147
189
            property bool fullyHidden: !shown && stages[stagesRevealer.boundProperty] == stagesRevealer.closedValue
148
190
            available: !greeter.shown
149
191
            hides: [launcher, panel.indicators]
150
192
            shown: false
151
193
            opacity: 1.0
152
194
            showAnimation: StandardAnimation { property: "x"; duration: 350; to: stagesRevealer.openedValue; easing.type: Easing.OutCubic }
153
195
            hideAnimation: StandardAnimation { property: "x"; duration: 350; to: stagesRevealer.closedValue; easing.type: Easing.OutCubic }
154
196
155
197
            width: parent.width
156
198
            height: parent.height
157
199
158
200
            // close the stages when no focused application remains
159
201
            Connections {
160
202
                target: shell.applicationManager
161
203
                onMainStageFocusedApplicationChanged: stages.closeIfNoApplications()
162
204
                onSideStageFocusedApplicationChanged: stages.closeIfNoApplications()
163
205
                ignoreUnknownSignals: true
164
206
            }
165
207
166
208
            function closeIfNoApplications() {
167
209
                if (!shell.applicationManager.mainStageFocusedApplication
168
210
                 && !shell.applicationManager.sideStageFocusedApplication
169
211
                 && shell.applicationManager.mainStageApplications.count == 0
170
212
                 && shell.applicationManager.sideStageApplications.count == 0) {
171
213
                    stages.hide();
172
214
                }
173
215
            }
174
216
175
217
            // show the stages when an application gets the focus
176
218
            Connections {
177
219
                target: shell.applicationManager
178
220
                onMainStageFocusedApplicationChanged: {
179
221
                    if (shell.applicationManager.mainStageFocusedApplication) {
180
222
                        mainStage.show();
181
223
                        stages.show();
182
224
                    }
183
225
                }
184
226
                onSideStageFocusedApplicationChanged: {
185
227
                    if (shell.applicationManager.sideStageFocusedApplication) {
186
228
                        sideStage.show();
187
229
                        stages.show();
188
230
                    }
189
231
                }
190
232
                ignoreUnknownSignals: true
191
233
            }
192
234
193
235
194
236
            Stage {
195
237
                id: mainStage
196
238
197
239
                anchors.fill: parent
198
240
                fullyShown: stages.fullyShown
199
241
                shouldUseScreenshots: !fullyShown
200
242
                rightEdgeEnabled: !sideStage.enabled
201
243
202
244
                applicationManager: shell.applicationManager
203
245
                rightEdgeDraggingAreaWidth: shell.edgeSize
204
246
                normalApplicationY: shell.panelHeight
205
247
206
248
                shown: true
207
249
                function show() {
208
250
                    stages.show();
209
251
                }
210
252
                function showWithoutAnimation() {
211
253
                    stages.showWithoutAnimation();
212
254
                }
213
255
                function hide() {
214
256
                }
215
257
216
258
                // FIXME: workaround the fact that focusing a main stage application
217
259
                // raises its surface on top of all other surfaces including the ones
218
260
                // that belong to side stage applications.
219
261
                onFocusedApplicationChanged: {
220
262
                    if (focusedApplication && sideStage.focusedApplication && sideStage.fullyShown) {
221
263
                        shell.applicationManager.focusApplication(sideStage.focusedApplication);
222
264
                    }
223
265
                }
224
266
            }
225
267
226
268
            SideStage {
227
269
                id: sideStage
228
270
229
271
                applicationManager: shell.applicationManager
230
272
                rightEdgeDraggingAreaWidth: shell.edgeSize
231
273
                normalApplicationY: shell.panelHeight
232
274
233
275
                onShownChanged: {
234
276
                    if (!shown && mainStage.applications.count == 0) {
235
277
                        stages.hide();
236
278
                    }
237
279
                }
238
280
                // FIXME: when hiding the side stage, refocus the main stage
239
281
                // application so that it goes in front of the side stage
240
282
                // application and hides it
241
283
                onFullyShownChanged: {
242
284
                    if (!fullyShown && stages.fullyShown && sideStage.focusedApplication != null) {
243
285
                        shell.applicationManager.focusApplication(mainStage.focusedApplication);
244
286
                    }
245
287
                }
246
288
247
289
                enabled: shell.width >= units.gu(60)
248
290
                visible: enabled
249
291
                fullyShown: stages.fullyShown && shown
250
292
                            && sideStage[sideStageRevealer.boundProperty] == sideStageRevealer.openedValue
251
293
                shouldUseScreenshots: !fullyShown || mainStage.usingScreenshots || sideStageRevealer.pressed
252
294
253
295
                available: !greeter.shown && !lockscreen.shown && enabled
254
296
                hides: [launcher, panel.indicators]
255
297
                shown: false
256
298
                showAnimation: StandardAnimation { property: "x"; duration: 350; to: sideStageRevealer.openedValue; easing.type: Easing.OutQuint }
257
299
                hideAnimation: StandardAnimation { property: "x"; duration: 350; to: sideStageRevealer.closedValue; easing.type: Easing.OutQuint }
258
300
259
301
                width: units.gu(40)
260
302
                height: stages.height
261
303
                handleExpanded: sideStageRevealer.pressed
262
304
            }
263
305
264
306
            Revealer {
265
307
                id: sideStageRevealer
266
308
267
309
                enabled: mainStage.applications.count > 0 && sideStage.applications.count > 0
268
310
                         && sideStage.available
269
311
                direction: Qt.RightToLeft
270
312
                openedValue: parent.width - sideStage.width
271
313
                hintDisplacement: units.gu(3)
272
314
                /* The size of the sidestage handle needs to be bigger than the
273
315
                   typical size used for edge detection otherwise it is really
274
316
                   hard to grab.
275
317
                */
276
318
                handleSize: sideStage.shown ? units.gu(4) : shell.edgeSize
277
319
                closedValue: parent.width + sideStage.handleSizeCollapsed
278
320
                target: sideStage
279
321
                x: parent.width - width
280
322
                width: sideStage.width + handleSize * 0.7
281
323
                height: sideStage.height
282
324
                orientation: Qt.Horizontal
283
325
            }
284
326
        }
285
327
    }
286
328
287
329
288
330
    Revealer {
289
331
        id: stagesRevealer
290
332
291
333
        property real animatedProgress: MathLocal.clamp((-dragPosition - launcher.progress) / closedValue, 0, 1)
292
334
        enabled: mainStage.applications.count > 0 || sideStage.applications.count > 0
293
335
        direction: Qt.RightToLeft
294
336
        openedValue: 0
295
337
        hintDisplacement: units.gu(3)
296
338
        handleSize: shell.edgeSize
297
339
        closedValue: width
298
340
        target: stages
299
341
        width: stages.width
300
342
        height: stages.height
301
343
        orientation: Qt.Horizontal
313
344
    }
127
    }
314
345
128
315
346
    Lockscreen {
129
    Lockscreen {
316
@@ -409,8 +192,8 @@
317
409
                greeter.forceActiveFocus();
192
                greeter.forceActiveFocus();
318
410
                // FIXME: *FocusedApplication are not updated when unfocused, hence the need to check whether
193
                // FIXME: *FocusedApplication are not updated when unfocused, hence the need to check whether
319
411
                // the stage was actually shown
194
                // the stage was actually shown
322
412
                if (mainStage.fullyShown) greeter.previousMainApp = applicationManager.mainStageFocusedApplication;
195
                if (stageManager.mainStageFullyShown) greeter.previousMainApp = applicationManager.mainStageFocusedApplication;
323
413
                if (sideStage.fullyShown) greeter.previousSideApp = applicationManager.sideStageFocusedApplication;
196
                if (stageManager.sideStageFullyShown) greeter.previousSideApp = applicationManager.sideStageFocusedApplication;
324
414
                applicationManager.unfocusCurrentApplication();
197
                applicationManager.unfocusCurrentApplication();
325
415
            } else {
198
            } else {
326
416
                if (greeter.previousMainApp) {
199
                if (greeter.previousMainApp) {
327
@@ -461,7 +244,7 @@
328
461
            indicators {
244
            indicators {
329
462
                hides: [launcher]
245
                hides: [launcher]
330
463
            }
246
            }
332
464
            fullscreenMode: shell.fullscreenMode
247
            fullscreenMode: stageManager.fullscreenMode
333
465
            searchVisible: !greeter.shown && !lockscreen.shown
248
            searchVisible: !greeter.shown && !lockscreen.shown
334
466
249
335
467
            InputFilterArea {
250
            InputFilterArea {
336
@@ -537,16 +320,16 @@
337
537
            onDashItemSelected: {
320
            onDashItemSelected: {
338
538
                greeter.hide()
321
                greeter.hide()
339
539
                // Animate if moving between application and dash
322
                // Animate if moving between application and dash
341
540
                if (!stages.shown) {
323
                if (!stageManager.shown) {
342
541
                    dash.setCurrentLens("home.lens", true, false)
324
                    dash.setCurrentLens("home.lens", true, false)
343
542
                } else {
325
                } else {
344
543
                    dash.setCurrentLens("home.lens", false, false)
326
                    dash.setCurrentLens("home.lens", false, false)
345
544
                }
327
                }
347
545
                stages.hide();
328
                stageManager.hide();
348
546
            }
329
            }
349
547
            onDash: {
330
            onDash: {
350
548
                dash.setCurrentLens("applications.lens", true, false)
331
                dash.setCurrentLens("applications.lens", true, false)
352
549
                stages.hide();
332
                stageManager.hide();
353
550
            }
333
            }
354
551
            onLauncherApplicationSelected:{
334
            onLauncherApplicationSelected:{
355
552
                greeter.hide()
335
                greeter.hide()
356
553
336
357
=== removed directory 'SideStage'
358
=== added directory 'Stages'
359
=== renamed file 'SideStage/SideStage.qml' => 'Stages/SideStage.qml'
360
--- SideStage/SideStage.qml	2013-06-05 22:03:08 +0000
361
+++ Stages/SideStage.qml	2013-06-13 14:42:44 +0000
362
@@ -38,7 +38,7 @@
363
38
            left: parent.left
38
            left: parent.left
364
39
            right: parent.right
39
            right: parent.right
365
40
        }
40
        }
367
41
        height: shell.panelHeight
41
        height: normalApplicationY
368
42
        color: background.color
42
        color: background.color
369
43
        z: -1
43
        z: -1
370
44
    }
44
    }
371
45
45
372
=== renamed file 'SideStage/SidestageHandle.qml' => 'Stages/SidestageHandle.qml'
373
=== renamed file 'Components/Stage.qml' => 'Stages/Stage.qml'
374
--- Components/Stage.qml	2013-06-07 18:01:50 +0000
375
+++ Stages/Stage.qml	2013-06-13 14:42:44 +0000
376
@@ -18,6 +18,7 @@
377
18
import Ubuntu.Application 0.1
18
import Ubuntu.Application 0.1
378
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 0.1
379
20
import Ubuntu.Gestures 0.1
20
import Ubuntu.Gestures 0.1
380
21
import "../Components"
381
21
22
382
22
/*
23
/*
383
23
  Responsible for application switching.
24
  Responsible for application switching.
384
@@ -179,7 +180,11 @@
385
179
            delayedHideScreenshots.stop();
180
            delayedHideScreenshots.stop();
386
180
            applicationManager.focusApplication(application);
181
            applicationManager.focusApplication(application);
387
181
        }
182
        }
389
182
        stage.focusedApplicationWhenUsingScreenshots = null;
183
390
184
        // Don't over-write this if another animation has begun, as another app will get focus then
391
185
        if (!showStartingApplicationAnimation.running && !switchToApplicationAnimation.running) {
392
186
            stage.focusedApplicationWhenUsingScreenshots = null;
393
187
        }
394
183
    }
188
    }
395
184
189
396
185
    function __focusApplicationUsingScreenshots(application) {
190
    function __focusApplicationUsingScreenshots(application) {
397
186
191
398
=== added file 'Stages/StageManager.qml'
399
--- Stages/StageManager.qml	1970-01-01 00:00:00 +0000
400
+++ Stages/StageManager.qml	2013-06-13 14:42:44 +0000
401
@@ -0,0 +1,287 @@
402
1
/*
403
2
 * Copyright (C) 2013 Canonical, Ltd.
404
3
 *
405
4
 * This program is free software; you can redistribute it and/or modify
406
5
 * it under the terms of the GNU General Public License as published by
407
6
 * the Free Software Foundation; version 3.
408
7
 *
409
8
 * This program is distributed in the hope that it will be useful,
410
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
411
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
412
11
 * GNU General Public License for more details.
413
12
 *
414
13
 * You should have received a copy of the GNU General Public License
415
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
416
15
 */
417
16
418
17
import QtQuick 2.0
419
18
import Ubuntu.Application 0.1
420
19
import "../Components"
421
20
import "../Components/Math.js" as MathLocal
422
21
423
22
Item {
424
23
    id: stageManager
425
24
426
25
    property var applicationManager
427
26
    property real leftSwipePosition: 0
428
27
    property real panelHeight: 0
429
28
    property real edgeHandleSize
430
29
    property bool enabled
431
30
    property var hides: []
432
31
    readonly property bool shown: stages.shown
433
32
    readonly property real animatedProgress: MathLocal.clamp((-stagesRevealer.dragPosition - leftSwipePosition)
434
33
                                                             / stagesRevealer.closedValue, 0, 1)
435
34
436
35
    readonly property bool stageScreenshotsReady: {
437
36
        if (sideStage.shown) {
438
37
            if (mainStage.applications.count > 0) {
439
38
                return mainStage.usingScreenshots || sideStage.usingScreenshots;
440
39
            } else {
441
40
                return sideStage.usingScreenshots;
442
41
            }
443
42
        } else {
444
43
            return mainStage.usingScreenshots;
445
44
        }
446
45
    }
447
46
448
47
    readonly property bool needUnderlay: (stages.fullyHidden
449
48
              || (stages.fullyShown && mainStage.usingScreenshots)
450
49
              || !stages.fullyShown && (mainStage.usingScreenshots || (sideStage.shown && sideStage.usingScreenshots)))
451
50
452
51
    readonly property bool fullscreenMode: {
453
52
        if (!enabled) {
454
53
            return false;
455
54
        } else if (mainStage.usingScreenshots) { // Window Manager animating so want to re-evaluate fullscreen mode
456
55
            return mainStage.switchingFromFullscreenToFullscreen;
457
56
        } else if (applicationManager.mainStageFocusedApplication) {
458
57
            return applicationManager.mainStageFocusedApplication.fullscreen;
459
58
        } else {
460
59
            return false;
461
60
        }
462
61
    }
463
62
464
63
    readonly property alias mainStageFullyShown: mainStage.fullyShown
465
64
    readonly property alias sideStageFullyShown: sideStage.fullyShown
466
65
467
66
    function hide() {
468
67
        stages.hide()
469
68
    }
470
69
471
70
    Component.onCompleted: {
472
71
        applicationManager.sideStageEnabled = Qt.binding(function() { return sideStage.enabled })
473
72
474
73
        // FIXME: if application focused before shell starts, shell draws on top of it only.
475
74
        // We should detect already running applications on shell start and bring them to the front.
476
75
        applicationManager.unfocusCurrentApplication();
477
76
    }
478
77
479
78
    Connections {
480
79
        target: applicationManager
481
80
        ignoreUnknownSignals: true
482
81
        onFocusRequested: {
483
82
            // TODO: this should be protected to only unlock for certain applications / certain usecases
484
83
            // potentially only in connection with a notification
485
84
            shell.greeter.hide();
486
85
            activateApplication(desktopFile);
487
86
        }
488
87
    }
489
88
490
89
    function activateApplication(desktopFile, argument) {
491
90
        if (applicationManager) {
492
91
            // For newly started applications, as it takes them time to draw their first frame
493
92
            // we add a delay before we hide the animation screenshots to compensate.
494
93
            var addDelay = !applicationManager.getApplicationFromDesktopFile(desktopFile);
495
94
496
95
            var application;
497
96
            application = applicationManager.activateApplication(desktopFile, argument);
498
97
            if (application == null) {
499
98
                return;
500
99
            }
501
100
            if (application.stage == ApplicationInfo.MainStage || !sideStage.enabled) {
502
101
                mainStage.activateApplication(desktopFile, addDelay);
503
102
            } else {
504
103
                sideStage.activateApplication(desktopFile, addDelay);
505
104
            }
506
105
            stages.show();
507
106
        }
508
107
    }
509
108
    Item {
510
109
        id: windowsContainer
511
110
512
111
        x: leftSwipePosition
513
112
        Behavior on x {SmoothedAnimation{velocity: 600}}
514
113
515
114
        width: parent.width
516
115
        anchors {
517
116
            top: parent.top
518
117
            bottom: parent.bottom
519
118
        }
520
119
521
120
        Showable {
522
121
            id: stages
523
122
524
123
            property bool fullyShown: shown && stages[stagesRevealer.boundProperty] == stagesRevealer.openedValue
525
124
                                      && parent.x == 0
526
125
            property bool fullyHidden: !shown && stages[stagesRevealer.boundProperty] == stagesRevealer.closedValue
527
126
            available: stageManager.enabled
528
127
            hides: stageManager.hides
529
128
            shown: false
530
129
            opacity: 1.0
531
130
            showAnimation: StandardAnimation { property: "x"; duration: 350; to: stagesRevealer.openedValue; easing.type: Easing.OutCubic }
532
131
            hideAnimation: StandardAnimation { property: "x"; duration: 350; to: stagesRevealer.closedValue; easing.type: Easing.OutCubic }
533
132
534
133
            width: parent.width
535
134
            height: parent.height
536
135
537
136
            // close the stages when no focused application remains
538
137
            Connections {
539
138
                target: applicationManager
540
139
                onMainStageFocusedApplicationChanged: stages.closeIfNoApplications()
541
140
                onSideStageFocusedApplicationChanged: stages.closeIfNoApplications()
542
141
                ignoreUnknownSignals: true
543
142
            }
544
143
            Connections {
545
144
                target: applicationManager.mainStageApplications
546
145
                onCountChanged: stages.closeIfNoApplications();
547
146
            }
548
147
            Connections {
549
148
                target: applicationManager.sideStageApplications
550
149
                onCountChanged: stages.closeIfNoApplications();
551
150
            }
552
151
553
152
            function closeIfNoApplications() {
554
153
                if (!applicationManager.mainStageFocusedApplication
555
154
                 && !applicationManager.sideStageFocusedApplication
556
155
                 && applicationManager.mainStageApplications.count == 0
557
156
                 && applicationManager.sideStageApplications.count == 0) {
558
157
                    stages.hide();
559
158
                }
560
159
            }
561
160
562
161
            // show the stages when an application gets the focus
563
162
            Connections {
564
163
                target: applicationManager
565
164
                onMainStageFocusedApplicationChanged: {
566
165
                    if (applicationManager.mainStageFocusedApplication) {
567
166
                        mainStage.show();
568
167
                        stages.show();
569
168
                    }
570
169
                }
571
170
                onSideStageFocusedApplicationChanged: {
572
171
                    if (applicationManager.sideStageFocusedApplication) {
573
172
                        sideStage.show();
574
173
                        stages.show();
575
174
                    }                }
576
175
                ignoreUnknownSignals: true
577
176
            }
578
177
579
178
            Stage {
580
179
                id: mainStage
581
180
                objectName: "mainStage"
582
181
583
182
                anchors.fill: parent
584
183
                fullyShown: stages.fullyShown
585
184
                shouldUseScreenshots: !fullyShown
586
185
                rightEdgeEnabled: !sideStage.enabled
587
186
588
187
                applicationManager: stageManager.applicationManager
589
188
                rightEdgeDraggingAreaWidth: edgeHandleSize
590
189
                normalApplicationY: panelHeight
591
190
592
191
                shown: true
593
192
                function show() {
594
193
                    stages.show();
595
194
                }
596
195
                function showWithoutAnimation() {
597
196
                    stages.showWithoutAnimation();
598
197
                }
599
198
                function hide() {
600
199
                }
601
200
602
201
                // FIXME: workaround the fact that focusing a main stage application
603
202
                // raises its surface on top of all other surfaces including the ones
604
203
                // that belong to side stage applications.
605
204
                onFocusedApplicationChanged: {
606
205
                    if (focusedApplication && sideStage.focusedApplication && sideStage.fullyShown) {
607
206
                        applicationManager.focusApplication(sideStage.focusedApplication);
608
207
                    }
609
208
                }
610
209
            }
611
210
612
211
            SideStage {
613
212
                id: sideStage
614
213
                objectName: "sideStage"
615
214
616
215
                applicationManager: stageManager.applicationManager
617
216
                rightEdgeDraggingAreaWidth: edgeHandleSize
618
217
                normalApplicationY: panelHeight
619
218
620
219
                onShownChanged: {
621
220
                    if (!shown && mainStage.applications.count == 0) {
622
221
                        stages.hide();
623
222
                    }
624
223
                }
625
224
                // FIXME: when hiding the side stage, refocus the main stage
626
225
                // application so that it goes in front of the side stage
627
226
                // application and hides it
628
227
                onFullyShownChanged: {
629
228
                    if (!fullyShown && stages.fullyShown && sideStage.focusedApplication != null) {
630
229
                        applicationManager.focusApplication(mainStage.focusedApplication);
631
230
                    }
632
231
                }
633
232
634
233
                enabled: stageManager.width >= units.gu(60)
635
234
                visible: enabled
636
235
                fullyShown: stages.fullyShown && shown
637
236
                            && sideStage[sideStageRevealer.boundProperty] == sideStageRevealer.openedValue
638
237
                shouldUseScreenshots: !fullyShown || mainStage.usingScreenshots || sideStageRevealer.pressed
639
238
640
239
                available: stageManager.enabled && enabled
641
240
                hides: stageManager.hides
642
241
                shown: false
643
242
                showAnimation: StandardAnimation { property: "x"; duration: 350; to: sideStageRevealer.openedValue; easing.type: Easing.OutQuint }
644
243
                hideAnimation: StandardAnimation { property: "x"; duration: 350; to: sideStageRevealer.closedValue; easing.type: Easing.OutQuint }
645
244
646
245
                width: units.gu(40)
647
246
                height: stages.height
648
247
                handleExpanded: sideStageRevealer.pressed
649
248
            }
650
249
651
250
            Revealer {
652
251
                id: sideStageRevealer
653
252
654
253
                enabled: mainStage.applications.count > 0 && sideStage.applications.count > 0
655
254
                         && sideStage.available
656
255
                direction: Qt.RightToLeft
657
256
                openedValue: parent.width - sideStage.width
658
257
                hintDisplacement: units.gu(3)
659
258
                /* The size of the sidestage handle needs to be bigger than the
660
259
                   typical size used for edge detection otherwise it is really
661
260
                   hard to grab.
662
261
                */
663
262
                handleSize: sideStage.shown ? units.gu(4) : edgeHandleSize
664
263
                closedValue: parent.width + sideStage.handleSizeCollapsed
665
264
                target: sideStage
666
265
                x: parent.width - width
667
266
                width: sideStage.width + handleSize * 0.7
668
267
                height: sideStage.height
669
268
                orientation: Qt.Horizontal
670
269
            }
671
270
        }
672
271
    }
673
272
674
273
    Revealer {
675
274
        id: stagesRevealer
676
275
677
276
        enabled: mainStage.applications.count > 0 || sideStage.applications.count > 0
678
277
        direction: Qt.RightToLeft
679
278
        openedValue: 0
680
279
        hintDisplacement: units.gu(3)
681
280
        handleSize: edgeHandleSize
682
281
        closedValue: width
683
282
        target: stages
684
283
        width: stages.width
685
284
        height: stages.height
686
285
        orientation: Qt.Horizontal
687
286
    }
688
287
}
689
0
288
690
=== renamed directory 'SideStage/graphics' => 'Stages/graphics'
691
=== modified file 'debian/unity8.install'
692
--- debian/unity8.install	2013-06-05 22:03:08 +0000
693
+++ debian/unity8.install	2013-06-13 14:42:44 +0000
694
@@ -11,7 +11,7 @@
695
11
/usr/share/unity8/Notifications/*
11
/usr/share/unity8/Notifications/*
696
12
/usr/share/unity8/Panel/*
12
/usr/share/unity8/Panel/*
697
13
/usr/share/unity8/Shell.qml
13
/usr/share/unity8/Shell.qml
699
14
/usr/share/unity8/SideStage/*
14
/usr/share/unity8/Stages/*
700
15
/usr/share/unity8/graphics/*
15
/usr/share/unity8/graphics/*
701
16
/usr/share/unity8/plugins/HudClient/*
16
/usr/share/unity8/plugins/HudClient/*
702
17
/usr/share/unity8/plugins/LightDM/*
17
/usr/share/unity8/plugins/LightDM/*
703
18
18
704
=== modified file 'tests/mocks/Ubuntu/Application/ApplicationListModel.cpp'
705
--- tests/mocks/Ubuntu/Application/ApplicationListModel.cpp	2013-06-05 22:03:08 +0000
706
+++ tests/mocks/Ubuntu/Application/ApplicationListModel.cpp	2013-06-13 14:42:44 +0000
707
@@ -64,8 +64,8 @@
708
64
64
709
65
void ApplicationListModel::add(ApplicationInfo* application)
65
void ApplicationListModel::add(ApplicationInfo* application)
710
66
{
66
{
713
67
    beginInsertRows(QModelIndex(), m_applications.size(), m_applications.size());
67
    beginInsertRows(QModelIndex(), 0, 0);
714
68
    m_applications.append(application);
68
    m_applications.prepend(application);
715
69
    endInsertRows();
69
    endInsertRows();
716
70
    Q_EMIT countChanged();
70
    Q_EMIT countChanged();
717
71
}
71
}
718
72
72
719
=== modified file 'tests/mocks/Ubuntu/Application/ApplicationManager.cpp'
720
--- tests/mocks/Ubuntu/Application/ApplicationManager.cpp	2013-06-05 22:03:08 +0000
721
+++ tests/mocks/Ubuntu/Application/ApplicationManager.cpp	2013-06-13 14:42:44 +0000
722
@@ -24,6 +24,21 @@
723
24
#include <QQuickItem>
24
#include <QQuickItem>
724
25
#include <QQuickView>
25
#include <QQuickView>
725
26
#include <QQmlComponent>
26
#include <QQmlComponent>
726
27
#include <QWaitCondition>
727
28
#include <QMutex>
728
29
729
30
struct Sleeper {
730
31
    QMutex mutex;
731
32
    QWaitCondition sleeper;
732
33
733
34
    Sleeper() { mutex.lock(); }
734
35
    ~Sleeper() { mutex.unlock(); }
735
36
736
37
    void sleep(unsigned long duration)
737
38
    {
738
39
        sleeper.wait(&mutex, duration);
739
40
    }
740
41
};
741
27
42
742
28
ApplicationManager::ApplicationManager(QObject *parent)
43
ApplicationManager::ApplicationManager(QObject *parent)
743
29
    : QObject(parent)
44
    : QObject(parent)
744
@@ -35,10 +50,11 @@
745
35
    , m_mainStage(0)
50
    , m_mainStage(0)
746
36
    , m_sideStageComponent(0)
51
    , m_sideStageComponent(0)
747
37
    , m_sideStage(0)
52
    , m_sideStage(0)
748
53
    , m_quickView(0)
749
38
{
54
{
750
39
    buildListOfAvailableApplications();
55
    buildListOfAvailableApplications();
753
40
    createMainStageComponent();
56
754
41
    createSideStageComponent();
57
    QGuiApplication::instance()->installEventFilter(this);
755
42
}
58
}
756
43
59
757
44
ApplicationManager::~ApplicationManager()
60
ApplicationManager::~ApplicationManager()
758
@@ -47,6 +63,19 @@
759
47
    delete m_sideStageApplications;
63
    delete m_sideStageApplications;
760
48
}
64
}
761
49
65
762
66
bool ApplicationManager::eventFilter(QObject *object, QEvent *event)
763
67
{
764
68
    // best to wait for this event before locating the view
765
69
    if (!m_quickView && (event->type() == QEvent::ApplicationActivate)) {
766
70
        m_quickView = qobject_cast<QQuickView*>(QGuiApplication::topLevelWindows()[0]);
767
71
768
72
        createMainStageComponent();
769
73
        createSideStageComponent();
770
74
    }
771
75
772
76
    return QObject::eventFilter(object, event);
773
77
}
774
78
775
50
int ApplicationManager::keyboardHeight() const
79
int ApplicationManager::keyboardHeight() const
776
51
{
80
{
777
52
    return 0;
81
    return 0;
778
@@ -92,6 +121,22 @@
779
92
    return m_sideStageFocusedApplication;
121
    return m_sideStageFocusedApplication;
780
93
}
122
}
781
94
123
782
124
void ApplicationManager::setMainStageFocusedApplication(ApplicationInfo *app)
783
125
{
784
126
    if (app != m_mainStageFocusedApplication) {
785
127
        m_mainStageFocusedApplication = app;
786
128
        Q_EMIT mainStageFocusedApplicationChanged();
787
129
    }
788
130
}
789
131
790
132
void ApplicationManager::setSideStageFocusedApplication(ApplicationInfo *app)
791
133
{
792
134
    if (app != m_sideStageFocusedApplication) {
793
135
        m_sideStageFocusedApplication = app;
794
136
        Q_EMIT sideStageFocusedApplicationChanged();
795
137
    }
796
138
}
797
139
798
95
ApplicationInfo* ApplicationManager::startProcess(QString desktopFile,
140
ApplicationInfo* ApplicationManager::startProcess(QString desktopFile,
799
96
                                              ExecFlags flags,
141
                                              ExecFlags flags,
800
97
                                              QStringList arguments)
142
                                              QStringList arguments)
801
@@ -112,9 +157,13 @@
802
112
157
803
113
    if (flags.testFlag(ApplicationManager::ForceMainStage)
158
    if (flags.testFlag(ApplicationManager::ForceMainStage)
804
114
            || application->stage() == ApplicationInfo::MainStage) {
159
            || application->stage() == ApplicationInfo::MainStage) {
806
115
        m_mainStageApplications->add(application);
160
        if (!m_mainStageApplications->contains(application)) {
807
161
            m_mainStageApplications->add(application);
808
162
        }
809
116
    } else {
163
    } else {
811
117
        m_sideStageApplications->add(application);
164
        if (!m_sideStageApplications->contains(application)) {
812
165
            m_sideStageApplications->add(application);
813
166
        }
814
118
    }
167
    }
815
119
168
816
120
    return application;
169
    return application;
817
@@ -123,18 +172,18 @@
818
123
void ApplicationManager::stopProcess(ApplicationInfo* application)
172
void ApplicationManager::stopProcess(ApplicationInfo* application)
819
124
{
173
{
820
125
    if (m_mainStageApplications->contains(application)) {
174
    if (m_mainStageApplications->contains(application)) {
821
175
        application->hideWindow();
822
126
        m_mainStageApplications->remove(application);
176
        m_mainStageApplications->remove(application);
823
127
177
824
128
        if (m_mainStageFocusedApplication == application) {
178
        if (m_mainStageFocusedApplication == application) {
827
129
            m_mainStageFocusedApplication = 0;
179
            setMainStageFocusedApplication(0);
826
130
            Q_EMIT mainStageFocusedApplicationChanged();
828
131
        }
180
        }
829
132
    } else if (m_sideStageApplications->contains(application)){
181
    } else if (m_sideStageApplications->contains(application)){
830
182
        application->hideWindow();
831
133
        m_sideStageApplications->remove(application);
183
        m_sideStageApplications->remove(application);
832
134
184
833
135
        if (m_sideStageFocusedApplication == application) {
185
        if (m_sideStageFocusedApplication == application) {
836
136
            m_sideStageFocusedApplication = 0;
186
            setSideStageFocusedApplication(0);
835
137
            Q_EMIT sideStageFocusedApplicationChanged();
837
138
        }
187
        }
838
139
    }
188
    }
839
140
}
189
}
840
@@ -146,14 +195,13 @@
841
146
        if (application->handle() == handle) {
195
        if (application->handle() == handle) {
842
147
            if (m_mainStageFocusedApplication)
196
            if (m_mainStageFocusedApplication)
843
148
                m_mainStageFocusedApplication->hideWindow();
197
                m_mainStageFocusedApplication->hideWindow();
844
149
            m_mainStageFocusedApplication = application;
845
150
            if (!m_mainStage)
198
            if (!m_mainStage)
846
151
                createMainStage();
199
                createMainStage();
847
152
            application->showWindow(m_mainStage);
200
            application->showWindow(m_mainStage);
848
153
            m_mainStage->setZ(-1000);
201
            m_mainStage->setZ(-1000);
849
154
            if (m_sideStage)
202
            if (m_sideStage)
850
155
                m_sideStage->setZ(-2000);
203
                m_sideStage->setZ(-2000);
852
156
            Q_EMIT mainStageFocusedApplicationChanged();
204
            setMainStageFocusedApplication(application);
853
157
            return;
205
            return;
854
158
        }
206
        }
855
159
    }
207
    }
856
@@ -163,14 +211,13 @@
857
163
        if (application->handle() == handle) {
211
        if (application->handle() == handle) {
858
164
            if (m_sideStageFocusedApplication)
212
            if (m_sideStageFocusedApplication)
859
165
                m_sideStageFocusedApplication->hideWindow();
213
                m_sideStageFocusedApplication->hideWindow();
860
166
            m_sideStageFocusedApplication = application;
861
167
            if (!m_sideStage)
214
            if (!m_sideStage)
862
168
                createSideStage();
215
                createSideStage();
863
169
            application->showWindow(m_sideStage);
216
            application->showWindow(m_sideStage);
864
170
            m_sideStage->setZ(-1000);
217
            m_sideStage->setZ(-1000);
865
171
            if (m_mainStage)
218
            if (m_mainStage)
866
172
                m_mainStage->setZ(-2000);
219
                m_mainStage->setZ(-2000);
868
173
            Q_EMIT sideStageFocusedApplicationChanged();
220
            setSideStageFocusedApplication(application);
869
174
            return;
221
            return;
870
175
        }
222
        }
871
176
    }
223
    }
872
@@ -181,14 +228,12 @@
873
181
    if (stageHint == SideStage) {
228
    if (stageHint == SideStage) {
874
182
        if (m_sideStageFocusedApplication) {
229
        if (m_sideStageFocusedApplication) {
875
183
            m_sideStageFocusedApplication->hideWindow();
230
            m_sideStageFocusedApplication->hideWindow();
878
184
            m_sideStageFocusedApplication = 0;
231
            setSideStageFocusedApplication(0);
877
185
            Q_EMIT sideStageFocusedApplicationChanged();
879
186
        }
232
        }
880
187
    } else {
233
    } else {
881
188
        if (m_mainStageFocusedApplication) {
234
        if (m_mainStageFocusedApplication) {
882
189
            m_mainStageFocusedApplication->hideWindow();
235
            m_mainStageFocusedApplication->hideWindow();
885
190
            m_mainStageFocusedApplication = 0;
236
            setMainStageFocusedApplication(0);
884
191
            Q_EMIT mainStageFocusedApplicationChanged();
886
192
        }
237
        }
887
193
    }
238
    }
888
194
}
239
}
889
@@ -384,11 +429,7 @@
890
384
429
891
385
void ApplicationManager::createMainStageComponent()
430
void ApplicationManager::createMainStageComponent()
892
386
{
431
{
898
387
    // The assumptions I make here really should hold.
432
    QQmlEngine *engine = m_quickView->engine();
894
388
    QQuickView *quickView =
895
389
        qobject_cast<QQuickView*>(QGuiApplication::topLevelWindows()[0]);
896
390
897
391
    QQmlEngine *engine = quickView->engine();
899
392
433
900
393
    m_mainStageComponent = new QQmlComponent(engine, this);
434
    m_mainStageComponent = new QQmlComponent(engine, this);
901
394
    QString mainStageQml =
435
    QString mainStageQml =
902
@@ -403,11 +444,12 @@
903
403
444
904
404
void ApplicationManager::createMainStage()
445
void ApplicationManager::createMainStage()
905
405
{
446
{
909
406
    // The assumptions I make here really should hold.
447
    Sleeper sleeper;
910
407
    QQuickView *quickView =
448
    while (m_quickView->status() != QQuickView::Ready) {
911
408
        qobject_cast<QQuickView*>(QGuiApplication::topLevelWindows()[0]);
449
        sleeper.sleep(500);
912
450
    }
913
409
451
915
410
    QQuickItem *shell = quickView->rootObject();
452
    QQuickItem *shell = m_quickView->rootObject();
916
411
453
917
412
    m_mainStage = qobject_cast<QQuickItem *>(m_mainStageComponent->create());
454
    m_mainStage = qobject_cast<QQuickItem *>(m_mainStageComponent->create());
918
413
    m_mainStage->setParentItem(shell);
455
    m_mainStage->setParentItem(shell);
919
@@ -415,11 +457,7 @@
920
415
457
921
416
void ApplicationManager::createSideStageComponent()
458
void ApplicationManager::createSideStageComponent()
922
417
{
459
{
928
418
    // The assumptions I make here really should hold.
460
    QQmlEngine *engine = m_quickView->engine();
924
419
    QQuickView *quickView =
925
420
        qobject_cast<QQuickView*>(QGuiApplication::topLevelWindows()[0]);
926
421
927
422
    QQmlEngine *engine = quickView->engine();
929
423
461
930
424
    m_sideStageComponent = new QQmlComponent(engine, this);
462
    m_sideStageComponent = new QQmlComponent(engine, this);
931
425
    QString sideStageQml =
463
    QString sideStageQml =
932
@@ -437,11 +475,12 @@
933
437
475
934
438
void ApplicationManager::createSideStage()
476
void ApplicationManager::createSideStage()
935
439
{
477
{
939
440
    // The assumptions I make here really should hold.
478
    Sleeper sleeper;
940
441
    QQuickView *quickView =
479
    while (m_quickView->status() != QQuickView::Ready) {
941
442
        qobject_cast<QQuickView*>(QGuiApplication::topLevelWindows()[0]);
480
        sleeper.sleep(500);
942
481
    }
943
443
482
945
444
    QQuickItem *shell = quickView->rootObject();
483
    QQuickItem *shell = m_quickView->rootObject();
946
445
484
947
446
    m_sideStage = qobject_cast<QQuickItem *>(m_sideStageComponent->create());
485
    m_sideStage = qobject_cast<QQuickItem *>(m_sideStageComponent->create());
948
447
    m_sideStage->setParentItem(shell);
486
    m_sideStage->setParentItem(shell);
949
448
487
950
=== modified file 'tests/mocks/Ubuntu/Application/ApplicationManager.h'
951
--- tests/mocks/Ubuntu/Application/ApplicationManager.h	2013-06-05 22:03:08 +0000
952
+++ tests/mocks/Ubuntu/Application/ApplicationManager.h	2013-06-13 14:42:44 +0000
953
@@ -24,6 +24,8 @@
954
24
#include "ApplicationInfo.h"
24
#include "ApplicationInfo.h"
955
25
25
956
26
class QQuickItem;
26
class QQuickItem;
957
27
class QQuickView;
958
28
class QEvent;
959
27
29
960
28
class ApplicationManager : public QObject {
30
class ApplicationManager : public QObject {
961
29
    Q_OBJECT
31
    Q_OBJECT
962
@@ -95,6 +97,12 @@
963
95
    void sideStageFocusedApplicationChanged();
97
    void sideStageFocusedApplicationChanged();
964
96
    void focusRequested(FavoriteApplication favoriteApplication);
98
    void focusRequested(FavoriteApplication favoriteApplication);
965
97
99
966
100
protected:
967
101
    bool eventFilter(QObject *, QEvent *);
968
102
969
103
    void setMainStageFocusedApplication(ApplicationInfo *);
970
104
    void setSideStageFocusedApplication(ApplicationInfo *);
971
105
972
98
 private:
106
 private:
973
99
    void showApplicationWindow(ApplicationInfo *application);
107
    void showApplicationWindow(ApplicationInfo *application);
974
100
    void buildListOfAvailableApplications();
108
    void buildListOfAvailableApplications();
975
@@ -114,6 +122,7 @@
976
114
    QQuickItem *m_mainStage;
122
    QQuickItem *m_mainStage;
977
115
    QQmlComponent *m_sideStageComponent;
123
    QQmlComponent *m_sideStageComponent;
978
116
    QQuickItem *m_sideStage;
124
    QQuickItem *m_sideStage;
979
125
    QQuickView *m_quickView;
980
117
};
126
};
981
118
127
982
119
Q_DECLARE_OPERATORS_FOR_FLAGS(ApplicationManager::ExecFlags)
128
Q_DECLARE_OPERATORS_FOR_FLAGS(ApplicationManager::ExecFlags)
983
120
129
984
=== modified file 'tests/qmltests/CMakeLists.txt'
985
--- tests/qmltests/CMakeLists.txt	2013-06-12 16:10:47 +0000
986
+++ tests/qmltests/CMakeLists.txt	2013-06-13 14:42:44 +0000
987
@@ -32,9 +32,6 @@
988
32
add_qml_test(Components ResponsiveGridView)
32
add_qml_test(Components ResponsiveGridView)
989
33
add_qml_test(Components Revealer)
33
add_qml_test(Components Revealer)
990
34
add_qml_test(Components Showable)
34
add_qml_test(Components Showable)
991
35
add_qml_test(Components Stage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS}
992
36
                                           ${CMAKE_BINARY_DIR}/tests/mocks
993
37
                                           ${CMAKE_BINARY_DIR}/plugins)
994
38
add_qml_test(Components Tile)
35
add_qml_test(Components Tile)
995
39
add_qml_test(Components PageHeader)
36
add_qml_test(Components PageHeader)
996
40
add_qml_test(Dash Dash IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
37
add_qml_test(Dash Dash IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
997
@@ -67,6 +64,7 @@
998
67
add_qml_test(Panel Panel)
64
add_qml_test(Panel Panel)
999
68
add_qml_test(Panel SearchIndicator)
65
add_qml_test(Panel SearchIndicator)
1000
69
add_qml_test(Panel/Menus IndicatorMenuWindow IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS})
66
add_qml_test(Panel/Menus IndicatorMenuWindow IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS})
1004
70
add_qml_test(SideStage SideStage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS}
67
add_qml_test(Stages Stage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks ${CMAKE_BINARY_DIR}/plugins)
1005
71
                                              ${CMAKE_BINARY_DIR}/tests/mocks
68
add_qml_test(Stages StageManager-phone IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks ${CMAKE_BINARY_DIR}/plugins)
1006
72
                                              ${CMAKE_BINARY_DIR}/plugins)
69
add_qml_test(Stages StageManager-tablet IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks ${CMAKE_BINARY_DIR}/plugins)
1007
70
add_qml_test(Stages SideStage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks ${CMAKE_BINARY_DIR}/plugins)
1008
73
71
1009
=== modified file 'tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml'
1010
--- tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml	2013-06-05 22:03:08 +0000
1011
+++ tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml	2013-06-13 14:42:44 +0000
1012
@@ -128,6 +128,7 @@
1013
128
            compare(runningApplicationsGrid.terminationModeEnabled, false)
128
            compare(runningApplicationsGrid.terminationModeEnabled, false)
1014
129
129
1015
130
            isCalendarLongPressed = false
130
            isCalendarLongPressed = false
1016
131
            waitForRendering(runningApplicationsGrid)
1017
131
            mousePress(calendarTile, calendarTile.width/2, calendarTile.height/2)
132
            mousePress(calendarTile, calendarTile.width/2, calendarTile.height/2)
1018
132
            tryCompareFunction(checkSwitchToTerminationModeAfterLongPress, true)
133
            tryCompareFunction(checkSwitchToTerminationModeAfterLongPress, true)
1019
133
134
1020
@@ -186,6 +187,7 @@
1021
186
            verify(calendarTile != undefined)
187
            verify(calendarTile != undefined)
1022
187
188
1023
188
            verify(fakeRunningAppsModel.contains(calendarApp))
189
            verify(fakeRunningAppsModel.contains(calendarApp))
1024
190
            waitForRendering(runningApplicationsGrid) //ensure populating animation has stopped
1025
189
191
1026
190
            mouseClick(calendarTile, calendarTile.width/2, calendarTile.height/2)
192
            mouseClick(calendarTile, calendarTile.width/2, calendarTile.height/2)
1027
191
193
1028
192
194
1029
=== removed directory 'tests/qmltests/SideStage'
1030
=== added directory 'tests/qmltests/Stages'
1031
=== renamed file 'tests/qmltests/SideStage/tst_SideStage.qml' => 'tests/qmltests/Stages/tst_SideStage.qml'
1032
--- tests/qmltests/SideStage/tst_SideStage.qml	2013-06-05 22:03:08 +0000
1033
+++ tests/qmltests/Stages/tst_SideStage.qml	2013-06-13 14:42:44 +0000
1034
@@ -18,7 +18,7 @@
1035
18
import QtTest 1.0
18
import QtTest 1.0
1036
19
import Unity.Test 0.1 as UT
19
import Unity.Test 0.1 as UT
1037
20
import ".."
20
import ".."
1039
21
import "../../../SideStage"
21
import "../../../Stages"
1040
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 0.1
1041
23
23
1042
24
UT.UnityTestCase {
24
UT.UnityTestCase {
1043
25
25
1044
=== renamed directory 'tests/qmltests/Components/tst_Stage' => 'tests/qmltests/Stages/tst_Stage'
1045
=== renamed file 'tests/qmltests/Components/tst_Stage.qml' => 'tests/qmltests/Stages/tst_Stage.qml'
1046
--- tests/qmltests/Components/tst_Stage.qml	2013-06-10 16:50:18 +0000
1047
+++ tests/qmltests/Stages/tst_Stage.qml	2013-06-13 14:42:44 +0000
1048
@@ -17,7 +17,7 @@
1049
17
import QtQuick 2.0
17
import QtQuick 2.0
1050
18
import QtTest 1.0
18
import QtTest 1.0
1051
19
import ".."
19
import ".."
1053
20
import "../../../Components"
20
import "../../../Stages"
1054
21
import Ubuntu.Application 0.1
21
import Ubuntu.Application 0.1
1055
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 0.1
1056
23
import Unity.Test 0.1 as UT
23
import Unity.Test 0.1 as UT
1057
24
24
1058
=== added directory 'tests/qmltests/Stages/tst_StageManager'
1059
=== added file 'tests/qmltests/Stages/tst_StageManager-phone.qml'
1060
--- tests/qmltests/Stages/tst_StageManager-phone.qml	1970-01-01 00:00:00 +0000
1061
+++ tests/qmltests/Stages/tst_StageManager-phone.qml	2013-06-13 14:42:44 +0000
1062
@@ -0,0 +1,255 @@
1063
1
/*
1064
2
 * Copyright 2013 Canonical Ltd.
1065
3
 *
1066
4
 * This program is free software; you can redistribute it and/or modify
1067
5
 * it under the terms of the GNU General Public License as published by
1068
6
 * the Free Software Foundation; version 3.
1069
7
 *
1070
8
 * This program is distributed in the hope that it will be useful,
1071
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1072
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1073
11
 * GNU General Public License for more details.
1074
12
 *
1075
13
 * You should have received a copy of the GNU General Public License
1076
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1077
15
 */
1078
16
1079
17
import QtQuick 2.0
1080
18
import Ubuntu.Application 0.1
1081
19
import "../../../Stages"
1082
20
import "../../../Components"
1083
21
import "tst_StageManager"
1084
22
1085
23
Item {
1086
24
    id: root
1087
25
    width: units.gu(40)
1088
26
    height: units.gu(72)
1089
27
1090
28
    property var applicationManager: ApplicationManagerWrapper {}
1091
29
1092
30
    Rectangle { //fake background
1093
31
        anchors.fill: parent
1094
32
        color: "black"
1095
33
        visible: stageManager.needUnderlay
1096
34
    }
1097
35
1098
36
    StageManager {
1099
37
        id: stageManager
1100
38
1101
39
        anchors.fill: parent
1102
40
1103
41
        applicationManager: root.applicationManager
1104
42
        leftSwipePosition: 0
1105
43
        panelHeight: units.gu(3) + units.dp(2)
1106
44
        edgeHandleSize: units.gu(2)
1107
45
        enabled: true
1108
46
    }
1109
47
1110
48
    ListSelector {
1111
49
        id: applications
1112
50
        anchors {
1113
51
            left: parent.left
1114
52
            right: parent.right
1115
53
            bottom: parent.bottom
1116
54
        }
1117
55
1118
56
        list: ["phone-app", "gallery-app", "camera-app"]
1119
57
        onActivated: stageManager.activateApplication(desktopFileOf(entry))
1120
58
        onDeactivated: applicationManager.stopProcess(applicationManager.getApplicationFromDesktopFile(desktopFileOf(entry)))
1121
59
    }
1122
60
1123
61
    function desktopFileOf(entry) {
1124
62
        return "/usr/share/applications/" + entry + ".desktop"
1125
63
    }
1126
64
1127
65
    StageManagerTestCase {
1128
66
        name: "StageManager - phone - 0 window case"
1129
67
        when: windowShown
1130
68
        stageManagerUnderTest: stageManager
1131
69
1132
70
        // left swipe does nothing when no applications open
1133
71
        function test_leftEdgeSwipeDisabledWithNoApplicationsOpen() {
1134
72
            rightEdgeSwipe()
1135
73
            checkStageManagerOffScreen()
1136
74
        }
1137
75
1138
76
        function test_stageManagerOffScreenByDefault() {
1139
77
            checkStageManagerOffScreen()
1140
78
        }
1141
79
    }
1142
80
1143
81
    StageManagerTestCase {
1144
82
        name: "StageManager - phone - 1 window case"
1145
83
        when: windowShown
1146
84
        stageManagerUnderTest: stageManager
1147
85
1148
86
        function init() {
1149
87
            applications.activate("phone-app")
1150
88
            waitForAnimationsToFinish()
1151
89
        }
1152
90
1153
91
        // When application started and StageManager hidden, StageManager shows immediately
1154
92
        function test_onLaunchStageManagerShown() {
1155
93
            checkStageManagerOnScreen()
1156
94
        }
1157
95
1158
96
        // Left-edge swipe the StageManager away animates the StageManager away
1159
97
        function test_leftSwipeHidesStageManager() {
1160
98
            leftEdgeSwipe()
1161
99
            checkStageManagerOffScreen()
1162
100
        }
1163
101
1164
102
        // Left-edge swipe the StageManager away unfocuses the application
1165
103
        function test_leftSwipeUnfocusesApplication() {
1166
104
            leftEdgeSwipe()
1167
105
            checkStageManagerOffScreen()
1168
106
1169
107
            skip("FIXME: mainStageFocusedApplication not updated when application unfocused, see lp:1186980")
1170
108
            tryCompare(applicationManager, "mainStageFocusedApplication", null)
1171
109
        }
1172
110
1173
111
        // Left-edge swipe StageManager away. Right-edge swipe should restore it
1174
112
        function test_rightSwipeRestoresApplication() {
1175
113
            leftEdgeSwipe()
1176
114
            checkStageManagerOffScreen()
1177
115
1178
116
            rightEdgeSwipe()
1179
117
            checkStageManagerOnScreen()
1180
118
1181
119
            waitForAnimationsToFinish()
1182
120
1183
121
            tryCompare(applicationManager.mainStageFocusedApplication, "desktopFile",
1184
122
                       desktopFileOf("phone-app"))
1185
123
        }
1186
124
1187
125
        // Activate application. Left-edge swipe stages away. Use launcher to activate application
1188
126
        // again - the StageManager should slide in and focus application
1189
127
        function test_activateApplicationWhenStageHiddenRevealsApplication() {
1190
128
            leftEdgeSwipe()
1191
129
            checkStageManagerOffScreen()
1192
130
1193
131
            applications.activate("phone-app")
1194
132
            checkStageManagerOnScreen()
1195
133
1196
134
            waitForAnimationsToFinish()
1197
135
1198
136
            tryCompare(applicationManager.mainStageFocusedApplication, "desktopFile",
1199
137
                       desktopFileOf("phone-app"))
1200
138
        }
1201
139
1202
140
        // Kill focused application. StageManager should hide
1203
141
        function test_killingApplicationShouldHideStageManager() {
1204
142
            applications.deactivate("phone-app")
1205
143
1206
144
            checkStageManagerOffScreen()
1207
145
        }
1208
146
1209
147
        // Starting a second app while StageManager on-screen does nothing to StageManager
1210
148
        function test_openingSecondAppWhileStageManagerOnScreen(){
1211
149
            applications.activate("gallery-app")
1212
150
1213
151
            checkStageManagerOnScreen()
1214
152
1215
153
            waitForAnimationsToFinish()
1216
154
1217
155
            tryCompare(applicationManager.mainStageFocusedApplication, "desktopFile",
1218
156
                       desktopFileOf("gallery-app"))
1219
157
        }
1220
158
1221
159
        // Starting a second app while StageManager off-screen shows StageManager
1222
160
        function test_openingSecondAppWhileStageManagerOffScreen(){
1223
161
            leftEdgeSwipe()
1224
162
1225
163
            applications.activate("gallery-app")
1226
164
            checkStageManagerOnScreen()
1227
165
1228
166
            waitForAnimationsToFinish()
1229
167
1230
168
            tryCompare(applicationManager.mainStageFocusedApplication, "desktopFile",
1231
169
                       desktopFileOf("gallery-app"))
1232
170
        }
1233
171
1234
172
        // Application focus change after animations complete
1235
173
        function test_onLaunchApplicationGetsFocusedOnlyAfterAnimation() {
1236
174
            applications.activate("gallery-app")
1237
175
1238
176
            verify(applicationManager.mainStageFocusedApplication.desktopFile !== desktopFileOf("gallery-app"))
1239
177
1240
178
            waitForAnimationsToFinish()
1241
179
1242
180
            compare(applicationManager.mainStageFocusedApplication.desktopFile, desktopFileOf("gallery-app"),
1243
181
                    "Focus not on newly activated application after animation")
1244
182
        }
1245
183
    }
1246
184
1247
185
    StageManagerTestCase {
1248
186
        name: "StageManager - phone - 2 window case"
1249
187
        when: windowShown
1250
188
        stageManagerUnderTest: stageManager
1251
189
1252
190
        function init() {
1253
191
            applications.activate("phone-app")
1254
192
            applications.activate("camera-app")
1255
193
            waitForAnimationsToFinish()
1256
194
        }
1257
195
1258
196
        function test_focusOrder() {
1259
197
            compare(applicationManager.mainStageFocusedApplication.desktopFile, desktopFileOf("camera-app"),
1260
198
                    "Focus not on last launched application")
1261
199
        }
1262
200
1263
201
        // Check hiding and then revealing StageManager doesn't change the focus order
1264
202
        function test_focusOrderAfterUnfocus() {
1265
203
            leftEdgeSwipe()
1266
204
1267
205
            rightEdgeSwipe()
1268
206
            waitForAnimationsToFinish()
1269
207
1270
208
            compare(applicationManager.mainStageFocusedApplication.desktopFile, desktopFileOf("camera-app"),
1271
209
                    "Focus order changed somehow by hide/reveal of StageManager")
1272
210
        }
1273
211
1274
212
        // Check that a hidden StageManager reacts correctly when background application activated
1275
213
        function test_focusOrderWhenActivating() {
1276
214
            leftEdgeSwipe()
1277
215
1278
216
            applications.activate("phone-app")
1279
217
1280
218
            waitForAnimationsToFinish()
1281
219
            checkStageManagerOnScreen()
1282
220
1283
221
            tryCompare(applicationManager.mainStageFocusedApplication, "desktopFile", desktopFileOf("phone-app"))
1284
222
1285
223
            compare(applicationManager.mainStageFocusedApplication.desktopFile, desktopFileOf("phone-app"),
1286
224
                    "Focus not on newly activated application when StageManager hidden")
1287
225
        }
1288
226
1289
227
        // If the focused application dies, the StageManager should hide
1290
228
        function test_foregroundApplicationDeathDismissesStageManager() {
1291
229
            tryCompare(applicationManager.mainStageFocusedApplication, "desktopFile", desktopFileOf("camera-app"))
1292
230
1293
231
            skip("FIXME: StageManager does not hide when foreground application dies")
1294
232
            applications.deactivate("camera-app")
1295
233
1296
234
            checkStageManagerOffScreen()
1297
235
        }
1298
236
1299
237
        // If a background application dies, the StageManager should not react
1300
238
        function test_nonForegroundApplicationDeathDoesNothing() {
1301
239
            tryCompare(applicationManager.mainStageFocusedApplication, "desktopFile", desktopFileOf("camera-app"))
1302
240
            applications.deactivate("phone-app")
1303
241
1304
242
            checkStageManagerOnScreen()
1305
243
        }
1306
244
1307
245
        function test_fullScreenMode() {
1308
246
            tryCompare(applicationManager.mainStageFocusedApplication, "desktopFile", desktopFileOf("camera-app"))
1309
247
1310
248
            tryCompare(stageManager, "fullscreenMode", true)
1311
249
1312
250
            rightEdgeSwipe()
1313
251
1314
252
            tryCompare(stageManager, "fullscreenMode", false)
1315
253
        }
1316
254
    }
1317
255
}
1318
0
256
1319
=== added file 'tests/qmltests/Stages/tst_StageManager-tablet.qml'
1320
--- tests/qmltests/Stages/tst_StageManager-tablet.qml	1970-01-01 00:00:00 +0000
1321
+++ tests/qmltests/Stages/tst_StageManager-tablet.qml	2013-06-13 14:42:44 +0000
1322
@@ -0,0 +1,394 @@
1323
1
/*
1324
2
 * Copyright 2013 Canonical Ltd.
1325
3
 *
1326
4
 * This program is free software; you can redistribute it and/or modify
1327
5
 * it under the terms of the GNU General Public License as published by
1328
6
 * the Free Software Foundation; version 3.
1329
7
 *
1330
8
 * This program is distributed in the hope that it will be useful,
1331
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1332
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1333
11
 * GNU General Public License for more details.
1334
12
 *
1335
13
 * You should have received a copy of the GNU General Public License
1336
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1337
15
 */
1338
16
1339
17
import QtQuick 2.0
1340
18
import Ubuntu.Application 0.1
1341
19
import "../../../Stages"
1342
20
import "../../../Components"
1343
21
import "tst_StageManager"
1344
22
1345
23
Item {
1346
24
    id: root
1347
25
    width: units.gu(100)
1348
26
    height: units.gu(72)
1349
27
1350
28
    property var applicationManager: ApplicationManagerWrapper {}
1351
29
1352
30
    Rectangle { //fake background
1353
31
        anchors.fill: parent
1354
32
        color: "black"
1355
33
        visible: stageManager.needUnderlay
1356
34
    }
1357
35
1358
36
    StageManager {
1359
37
        id: stageManager
1360
38
1361
39
        anchors.fill: parent
1362
40
1363
41
        applicationManager: root.applicationManager
1364
42
        leftSwipePosition: 0
1365
43
        panelHeight: units.gu(3) + units.dp(2)
1366
44
        edgeHandleSize: units.gu(2)
1367
45
        enabled: true
1368
46
    }
1369
47
1370
48
    ListSelector {
1371
49
        id: applications
1372
50
        anchors {
1373
51
            left: parent.left
1374
52
            right: parent.right
1375
53
            bottom: parent.bottom
1376
54
        }
1377
55
1378
56
        list: ["phone-app", "facebook-webapp", "gallery-app"]
1379
57
        onActivated: stageManager.activateApplication(desktopFileOf(entry))
1380
58
        onDeactivated: applicationManager.stopProcess(applicationManager.getApplicationFromDesktopFile(desktopFileOf(entry)))
1381
59
    }
1382
60
1383
61
    function desktopFileOf(entry) {
1384
62
        return "/usr/share/applications/" + entry + ".desktop"
1385
63
    }
1386
64
1387
65
    StageManagerTestCase {
1388
66
        name: "StageManager - tablet - 1 main-stage window case"
1389
67
        when: windowShown
1390
68
        stageManagerUnderTest: stageManager
1391
69
1392
70
        function init() {
1393
71
            applications.activate("gallery-app") //main-stage app
1394
72
            waitForAnimationsToFinish()
1395
73
        }
1396
74
1397
75
        // Right-edge press does not change main-stage app
1398
76
        function test_rightEdgeSwipeDoesNotChangeMainStageApp() {
1399
77
            rightEdgePress()
1400
78
            waitForRendering(stageManager)
1401
79
            compare(mainStage.oldApplicationScreenshot.visible, false) // i.e. no screenshot animation occurs
1402
80
        }
1403
81
    }
1404
82
1405
83
    StageManagerTestCase {
1406
84
        name: "StageManager - tablet - 1 side-stage window case"
1407
85
        when: windowShown
1408
86
        stageManagerUnderTest: stageManager
1409
87
1410
88
        function init() {
1411
89
            applications.activate("phone-app") // side-stage app
1412
90
            waitForAnimationsToFinish()
1413
91
        }
1414
92
1415
93
        // Check loaded as side-stage application
1416
94
        function test_sideStage() {
1417
95
            tryCompare(applicationManager.sideStageFocusedApplication, "desktopFile", desktopFileOf("phone-app"))
1418
96
            compare(applicationManager.mainStageFocusedApplication, null)
1419
97
        }
1420
98
1421
99
        // When application started and StageManager hidden, StageManager shows immediately
1422
100
        function test_onLaunchStageManagerShown() {
1423
101
            checkStageManagerOnScreen()
1424
102
        }
1425
103
1426
104
        // Check side-stage positioned correctly
1427
105
        function test_sideStagePositionedCorrectly() {
1428
106
            compare(sideStage.x, stageManager.width - units.gu(40), "Sidestage not positioned correctly")
1429
107
        }
1430
108
1431
109
        // Left-edge swipe the StageManager away animates the StageManager away
1432
110
        function test_leftSwipeHidesStageManager() {
1433
111
            leftEdgeSwipe()
1434
112
            checkStageManagerOffScreen()
1435
113
        }
1436
114
1437
115
        // Left-edge swipe the StageManager away unfocuses the application
1438
116
        function test_leftSwipeUnfocusesApplication() {
1439
117
            leftEdgeSwipe()
1440
118
            checkStageManagerOffScreen()
1441
119
1442
120
            skip("FIXME: sideStageFocusedApplication not updated when application unfocused, see lp:1186980")
1443
121
            tryCompare(applicationManager, "sideStageFocusedApplication", null)
1444
122
        }
1445
123
1446
124
        // Left-edge swipe StageManager away. Right-edge swipe should restore it
1447
125
        function test_rightSwipeRestoresApplication() {
1448
126
            leftEdgeSwipe()
1449
127
            checkStageManagerOffScreen()
1450
128
1451
129
            rightEdgeSwipe()
1452
130
            checkStageManagerOnScreen()
1453
131
1454
132
            waitForAnimationsToFinish()
1455
133
1456
134
            tryCompare(applicationManager.sideStageFocusedApplication, "desktopFile", desktopFileOf("phone-app"))
1457
135
        }
1458
136
1459
137
        // Activate application. Left-edge swipe stages away. Use launcher to activate application
1460
138
        // again - the StageManager should slide in and focus application
1461
139
        function test_activateApplicationWhenStageHiddenRevealsApplication() {
1462
140
            leftEdgeSwipe()
1463
141
            checkStageManagerOffScreen()
1464
142
1465
143
            applications.activate("phone-app")
1466
144
            checkStageManagerOnScreen()
1467
145
1468
146
            waitForAnimationsToFinish()
1469
147
1470
148
            tryCompare(applicationManager.sideStageFocusedApplication, "desktopFile", desktopFileOf("phone-app"))
1471
149
        }
1472
150
1473
151
        // Kill focused application. StageManager should hide
1474
152
        function test_killingApplicationShouldHideStageManager() {
1475
153
            applications.deactivate("phone-app")
1476
154
1477
155
            checkStageManagerOffScreen()
1478
156
        }
1479
157
1480
158
        // Starting a second side-stage app while StageManager on-screen does nothing to StageManager
1481
159
        function test_openingSecondSideStageAppWhileStageManagerOnScreen(){
1482
160
            applications.activate("facebook-webapp") //side-stage app
1483
161
            checkStageManagerOnScreen()
1484
162
1485
163
            waitForAnimationsToFinish()
1486
164
            tryCompare(applicationManager.sideStageFocusedApplication, "desktopFile", desktopFileOf("facebook-webapp"))
1487
165
        }
1488
166
1489
167
        // Starting a second side-stage app while StageManager off-screen shows StageManager
1490
168
        function test_openingSecondSideStageAppWhileStageManagerOffScreen(){
1491
169
            leftEdgeSwipe()
1492
170
1493
171
            applications.activate("facebook-webapp") //side-stage app
1494
172
            checkStageManagerOnScreen()
1495
173
1496
174
            waitForAnimationsToFinish()
1497
175
            tryCompare(applicationManager.sideStageFocusedApplication, "desktopFile", desktopFileOf("facebook-webapp"))
1498
176
        }
1499
177
1500
178
1501
179
        // Starting a main-stage app while StageManager off-screen shows StageManager
1502
180
        function test_openingMainStageAppWhileStageManagerOffScreen(){
1503
181
            leftEdgeSwipe()
1504
182
            checkStageManagerOffScreen()
1505
183
1506
184
            applications.activate("gallery-app") //main-stage app
1507
185
            checkStageManagerOnScreen()
1508
186
1509
187
            waitForAnimationsToFinish()
1510
188
            tryCompare(applicationManager.mainStageFocusedApplication, "desktopFile", desktopFileOf("gallery-app"))
1511
189
        }
1512
190
1513
191
        // Application focus change after animations complete
1514
192
        function test_onLaunchApplicationGetsFocusedOnlyAfterAnimation() {
1515
193
            applications.activate("facebook-webapp") //side-stage app
1516
194
1517
195
            verify(applicationManager.sideStageFocusedApplication.desktopFile !== desktopFileOf("facebook-webapp"))
1518
196
1519
197
            waitForAnimationsToFinish()
1520
198
            compare(applicationManager.sideStageFocusedApplication.desktopFile, desktopFileOf("facebook-webapp"),
1521
199
                    "Newly activated application does not have focus after animation")
1522
200
        }
1523
201
1524
202
        // Right-edge press changes side-stage app
1525
203
        function test_rightEdgeSwipeChangesSideStageOnly() {
1526
204
            rightEdgePress()
1527
205
            tryCompareFunction( function() {
1528
206
                return sideStage.oldApplicationScreenshot.scale < 1
1529
207
            }, true)
1530
208
        }
1531
209
1532
210
        // Right-swipe of side-stage handle does nothing
1533
211
        function test_rightSwipeOfSideStageHandleDoesNothing() {
1534
212
            sideStageHandleRightSwipe()
1535
213
1536
214
            compare(sideStage.x, stageManager.width - units.gu(40),
1537
215
                    "Side-stage was incorrectly dismissed when no main-stage application open")
1538
216
        }
1539
217
    }
1540
218
1541
219
    StageManagerTestCase {
1542
220
        name: "StageManager - tablet - 1 side-stage & 1 main-stage window case"
1543
221
        when: windowShown
1544
222
        stageManagerUnderTest: stageManager
1545
223
1546
224
        function init() {
1547
225
            applications.activate("gallery-app") //main-stage app
1548
226
            applications.activate("phone-app")   //side-stage app
1549
227
            waitForAnimationsToFinish()
1550
228
        }
1551
229
1552
230
        function test_focusOrder() {
1553
231
            compare(applicationManager.mainStageFocusedApplication.desktopFile, desktopFileOf("gallery-app"),
1554
232
                    "Main-stage application not got focus after activation")
1555
233
            compare(applicationManager.sideStageFocusedApplication.desktopFile, desktopFileOf("phone-app"),
1556
234
                    "Side-stage application not got focus after activation")
1557
235
        }
1558
236
1559
237
        // Check hiding and then revealing StageManager doesn't change the focus order
1560
238
        function test_focusOrderAfterUnfocus() {
1561
239
            leftEdgeSwipe()
1562
240
1563
241
            rightEdgeSwipe()
1564
242
            waitForAnimationsToFinish()
1565
243
1566
244
            compare(applicationManager.mainStageFocusedApplication.desktopFile, desktopFileOf("gallery-app"),
1567
245
                    "Main-stage application lost focus from StageManager hide/show")
1568
246
            compare(applicationManager.sideStageFocusedApplication.desktopFile, desktopFileOf("phone-app"),
1569
247
                    "Side-stage application lost focus from StageManager hide/show")
1570
248
        }
1571
249
1572
250
        // Check that a hidden StageManager reacts correctly when already-open side-stage application activated
1573
251
        function test_focusOrderWhenActivatingSideStage() {
1574
252
            leftEdgeSwipe()
1575
253
1576
254
            applications.activate("phone-app")   //side-stage app
1577
255
1578
256
            checkStageManagerOnScreen()
1579
257
        }
1580
258
1581
259
        // Check that a hidden StageManager reacts correctly when already-open main-stage application activated
1582
260
        function test_focusOrderWhenActivatingMainStage() {
1583
261
            leftEdgeSwipe()
1584
262
1585
263
            applications.activate("gallery-app") //main-stage app
1586
264
1587
265
            checkStageManagerOnScreen()
1588
266
        }
1589
267
1590
268
        // If the main-stage application dies, the StageManager should stay on screen
1591
269
        function test_foregroundMainStageApplicationDeathDoesNothing() {
1592
270
            applications.deactivate("gallery-app") //main-stage app
1593
271
1594
272
            checkStageManagerOnScreen()
1595
273
            compare(applicationManager.sideStageFocusedApplication.desktopFile, desktopFileOf("phone-app"),
1596
274
                    "Side-stage application lost focus after main-stage application died")
1597
275
        }
1598
276
1599
277
        // If the side-stage application dies, the StageManager should stay on screen
1600
278
        function test_foregroundSideStageApplicationDeathDoesNothing() {
1601
279
            applications.deactivate("phone-app") //side-stage app
1602
280
1603
281
            checkStageManagerOnScreen()
1604
282
            compare(applicationManager.mainStageFocusedApplication.desktopFile, desktopFileOf("gallery-app"),
1605
283
                    "Main-stage application lost focus after side-stage application died")
1606
284
        }
1607
285
1608
286
        // If the side-stage application dies, the side stage should hide
1609
287
        function test_foregroundSideStageApplicationDeathHidesSideStage() {
1610
288
            applications.deactivate("phone-app") //side-stage app
1611
289
1612
290
            tryCompareFunction( function() {
1613
291
                return sideStage.x > stageManager.width
1614
292
            }, true)
1615
293
        }
1616
294
1617
295
        // Right-edge swipe changes side-stage app
1618
296
        function test_rightEdgeSwipeChangesSideStage() {
1619
297
            tryCompare(sideStage, "x", stageManager.width - sideStage.width) //ensure side-stage open
1620
298
1621
299
            waitForAnimationsToFinish()
1622
300
            rightEdgePress()
1623
301
            waitForRendering(stageManager)
1624
302
            tryCompareFunction( function() {
1625
303
                return sideStage.oldApplicationScreenshot.scale < 1
1626
304
            }, true)
1627
305
        }
1628
306
1629
307
        // Right-edge swipe does not change main-stage app
1630
308
        function test_rightEdgeSwipeDoesNotChangeMainStage() {
1631
309
            rightEdgePress()
1632
310
            waitForRendering(stageManager)
1633
311
            compare(mainStage.oldApplicationScreenshot.scale, 1,
1634
312
                    "Right-edge swipe animating main-stage while side-stage app open")
1635
313
        }
1636
314
1637
315
        // Right-swipe of side-stage handle dismisses side-stage
1638
316
        function test_rightSwipeOfSideStageHandleHidesSideStage() {
1639
317
            sideStageHandleRightSwipe()
1640
318
            waitForAnimationsToFinish()
1641
319
1642
320
            tryCompare(sideStage, "x", stageManager.width + sideStage.handleSizeCollapsed)
1643
321
        }
1644
322
1645
323
        // Right-swipe of side-stage unfocuses side-stage app
1646
324
        function test_rightSwipeOfSideStageHandleUnfocusesSideStageApp() {
1647
325
            tryCompare(sideStage, "x", stageManager.width - sideStage.width) //ensure side-stage open
1648
326
1649
327
            sideStageHandleRightSwipe()
1650
328
            waitForAnimationsToFinish()
1651
329
1652
330
            compare(applicationManager.mainStageFocusedApplication.desktopFile, desktopFileOf("gallery-app"),
1653
331
                    "Right-edge swipe of side-stage app changed main-stage focus")
1654
332
            skip("FIXME: sideStageFocusedApplication not updated when application unfocused, see lp:1186980")
1655
333
            //tryCompare(applicationManager, "sideStageFocusedApplication", null)
1656
334
        }
1657
335
1658
336
        // Hidden side-stage can be right-edge swiped back
1659
337
        function test_rightEdgeSwipeRestoresHiddenSideStageApp() {
1660
338
            sideStageHandleRightSwipe()
1661
339
            waitForAnimationsToFinish()
1662
340
1663
341
            rightEdgeSwipe()
1664
342
            waitForAnimationsToFinish()
1665
343
1666
344
            tryCompare(sideStage, "x", stageManager.width - units.gu(40))
1667
345
        }
1668
346
1669
347
        // Hidden side-stage app when right-edge swiped has focus restored
1670
348
        function test_rightEdgeSwipeRestoresFocusToSideStageApp() {
1671
349
            sideStageHandleRightSwipe()
1672
350
            waitForAnimationsToFinish()
1673
351
1674
352
            rightEdgeSwipe()
1675
353
            waitForAnimationsToFinish()
1676
354
1677
355
            compare(applicationManager.sideStageFocusedApplication.desktopFile, desktopFileOf("phone-app"),
1678
356
                    "Side-stage app not returned focus after StageManager un-hidden")
1679
357
            compare(applicationManager.mainStageFocusedApplication.desktopFile, desktopFileOf("gallery-app"),
1680
358
                    "Main-stage app not returned focus after StageManager un-hidden")
1681
359
        }
1682
360
1683
361
        // Hide side-stage, then activate the side-stage application. It should slide back in
1684
362
        function test_activatingHiddenSideStageAppSlidesItIn() {
1685
363
            sideStageHandleRightSwipe()
1686
364
            waitForAnimationsToFinish()
1687
365
1688
366
            applications.activate("phone-app") //side-stage app
1689
367
            waitForAnimationsToFinish()
1690
368
1691
369
            tryCompare(sideStage, "x", stageManager.width - sideStage.width)
1692
370
        }
1693
371
1694
372
        // Hide side-stage, then left-swipe to hide whole StageManager. Activate side-stage app
1695
373
        // StageManager should slide in, with side-stage app fixed in place (i.e. not sliding independently)
1696
374
        function test_activatingHiddenSideStageAppWhenStageManagerHidden() {
1697
375
            sideStageHandleRightSwipe()
1698
376
            waitForAnimationsToFinish()
1699
377
1700
378
            leftEdgeSwipe(units.gu(160))
1701
379
            checkStageManagerOffScreen()
1702
380
1703
381
            applications.activate("phone-app") //side-stage app
1704
382
            tryCompare(sideStage, "x", stageManager.width - units.gu(40))
1705
383
        }
1706
384
1707
385
        // Starting a main-stage app while StageManager on-screen does nothing to StageManager
1708
386
        function test_openingSecondMainStageAppWhileStageManagerOnScreen(){
1709
387
            applications.activate("gallery-app") //main-stage app
1710
388
            checkStageManagerOnScreen()
1711
389
1712
390
            waitForAnimationsToFinish()
1713
391
            tryCompare(applicationManager.mainStageFocusedApplication, "desktopFile", desktopFileOf("gallery-app"))
1714
392
        }
1715
393
    }
1716
394
}
1717
0
395
1718
=== added file 'tests/qmltests/Stages/tst_StageManager/ListSelector.qml'
1719
--- tests/qmltests/Stages/tst_StageManager/ListSelector.qml	1970-01-01 00:00:00 +0000
1720
+++ tests/qmltests/Stages/tst_StageManager/ListSelector.qml	2013-06-13 14:42:44 +0000
1721
@@ -0,0 +1,101 @@
1722
1
/*
1723
2
 * Copyright 2013 Canonical Ltd.
1724
3
 *
1725
4
 * This program is free software; you can redistribute it and/or modify
1726
5
 * it under the terms of the GNU General Public License as published by
1727
6
 * the Free Software Foundation; version 3.
1728
7
 *
1729
8
 * This program is distributed in the hope that it will be useful,
1730
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1731
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1732
11
 * GNU General Public License for more details.
1733
12
 *
1734
13
 * You should have received a copy of the GNU General Public License
1735
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1736
15
 */
1737
16
1738
17
import QtQuick 2.0
1739
18
import Ubuntu.Application 0.1
1740
19
import Ubuntu.Components 0.1
1741
20
1742
21
Rectangle {
1743
22
    id: root
1744
23
    color: "#ccffffff"
1745
24
    height: childrenRect.height
1746
25
1747
26
    property alias list: repeater.model
1748
27
    signal activated(string entry)
1749
28
    signal deactivated(string entry)
1750
29
1751
30
    function activate(entry) {
1752
31
        lister.changeEntry(entry, true);
1753
32
    }
1754
33
1755
34
    function deactivate(entry) {
1756
35
        lister.changeEntry(entry, false);
1757
36
    }
1758
37
1759
38
    function deactivateAll() {
1760
39
        for (var i=0; i<list.length; i++) {
1761
40
            lister.changeEntry(list[i], false);
1762
41
        }
1763
42
    }
1764
43
1765
44
    Flow {
1766
45
        id: lister
1767
46
        anchors {
1768
47
            top: parent.top
1769
48
            left: parent.left
1770
49
            right: parent.right
1771
50
        }
1772
51
1773
52
        function changeEntry(entry, setting) {
1774
53
            for (var i=0; i<lister.children.length; i++) {
1775
54
                var child = lister.children[i];
1776
55
                if (child === lister) continue;
1777
56
                if (child.label == entry) {
1778
57
                    if (child.checked == setting) {
1779
58
                        if (setting) root.activated(child.label); //ensure we fire activated again
1780
59
                    } else {
1781
60
                        child.checked = setting;
1782
61
                    }
1783
62
                    break;
1784
63
                }
1785
64
            }
1786
65
        }
1787
66
        Repeater {
1788
67
            id: repeater
1789
68
            delegate: entry
1790
69
        }
1791
70
1792
71
        Component {
1793
72
            id: entry
1794
73
1795
74
            Row {
1796
75
                height: units.gu(5)
1797
76
                width: units.gu(20)
1798
77
1799
78
                property alias checked: checkbox.checked
1800
79
                property string label: modelData
1801
80
1802
81
                CheckBox {
1803
82
                    id: checkbox
1804
83
                    onCheckedChanged: {
1805
84
                        if (checked) {
1806
85
                            activated(modelData)
1807
86
                        } else {
1808
87
                            deactivated(modelData)
1809
88
                        }
1810
89
                    }
1811
90
                }
1812
91
                Button {
1813
92
                    text: parent.label
1814
93
                    width: parent.width - checkbox.width
1815
94
                    anchors.verticalCenter: checkbox.verticalCenter
1816
95
                    enabled: checkbox.checked
1817
96
                    onClicked: activated(modelData)
1818
97
                }
1819
98
            }
1820
99
        }
1821
100
    }
1822
101
}
1823
0
102
1824
=== added file 'tests/qmltests/Stages/tst_StageManager/StageManagerTestCase.qml'
1825
--- tests/qmltests/Stages/tst_StageManager/StageManagerTestCase.qml	1970-01-01 00:00:00 +0000
1826
+++ tests/qmltests/Stages/tst_StageManager/StageManagerTestCase.qml	2013-06-13 14:42:44 +0000
1827
@@ -0,0 +1,98 @@
1828
1
/*
1829
2
 * Copyright 2013 Canonical Ltd.
1830
3
 *
1831
4
 * This program is free software; you can redistribute it and/or modify
1832
5
 * it under the terms of the GNU General Public License as published by
1833
6
 * the Free Software Foundation; version 3.
1834
7
 *
1835
8
 * This program is distributed in the hope that it will be useful,
1836
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1837
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1838
11
 * GNU General Public License for more details.
1839
12
 *
1840
13
 * You should have received a copy of the GNU General Public License
1841
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1842
15
 */
1843
16
1844
17
import QtQuick 2.0
1845
18
import QtTest 1.0
1846
19
import Unity.Test 0.1 as UT
1847
20
import "../../../../Stages"
1848
21
1849
22
UT.UnityTestCase {
1850
23
    property StageManager stageManagerUnderTest
1851
24
    property point __lastMouseEvent: Qt.point(-1, -1)
1852
25
    property SideStage sideStage: null
1853
26
    property Stage mainStage: null
1854
27
1855
28
    onStageManagerUnderTestChanged: {
1856
29
        mainStage = findChild(stageManagerUnderTest, "mainStage")
1857
30
        sideStage = findChild(stageManagerUnderTest, "sideStage")
1858
31
    }
1859
32
1860
33
    function cleanup() {
1861
34
        resetMouseState()
1862
35
        applications.deactivateAll()
1863
36
        compare(applicationManager.mainStageApplications.count, 0, "Some main-stage application failed to quit")
1864
37
        compare(applicationManager.sideStageApplications.count, 0, "Some side-stage application failed to quit")
1865
38
        checkStageManagerOffScreen()
1866
39
    }
1867
40
1868
41
    function rightEdgePress() {
1869
42
        __lastMouseEvent.x = stageManagerUnderTest.width - (stageManagerUnderTest.edgeHandleSize / 2)
1870
43
        __lastMouseEvent.y = stageManagerUnderTest.height / 2
1871
44
        touchPress(stageManagerUnderTest, __lastMouseEvent.x, __lastMouseEvent.y)
1872
45
    }
1873
46
1874
47
    function rightEdgeRelease() {
1875
48
        touchRelease(stageManagerUnderTest, __lastMouseEvent.x, __lastMouseEvent.y)
1876
49
        __lastMouseEvent = Qt.point(-1, -1)
1877
50
    }
1878
51
1879
52
    function resetMouseState() {
1880
53
        if (__lastMouseEvent !== Qt.point(-1, -1)) {
1881
54
            rightEdgeRelease()
1882
55
        }
1883
56
    }
1884
57
1885
58
    function waitForAnimationsToFinish() {
1886
59
        tryCompare(stageManagerUnderTest, "stageScreenshotsReady", false)
1887
60
    }
1888
61
1889
62
    function leftEdgeSwipe(distance) {
1890
63
        if (distance == undefined) distance = stageManagerUnderTest.width  / 3 * 2
1891
64
1892
65
        var x = stageManagerUnderTest.edgeHandleSize / 2
1893
66
        var y = stageManagerUnderTest.height / 2
1894
67
        touchFlick(stageManagerUnderTest, x, y,
1895
68
                   x + distance, y)
1896
69
    }
1897
70
1898
71
    function rightEdgeSwipe(distance) {
1899
72
        if (distance == undefined) distance = stageManagerUnderTest.width  / 3 * 2
1900
73
1901
74
        var x = stageManagerUnderTest.width - (stageManagerUnderTest.edgeHandleSize / 2)
1902
75
        var y = stageManagerUnderTest.height / 2
1903
76
        touchFlick(stageManagerUnderTest, x, y,
1904
77
                   x - distance, y)
1905
78
    }
1906
79
1907
80
    function sideStageHandleRightSwipe(distance) {
1908
81
        if (distance == undefined) distance = sideStage.width / 3 * 2
1909
82
1910
83
        var x = sideStage.x - (sideStage.rightEdgeDraggingAreaWidth / 2)
1911
84
        var y = sideStage.height / 2
1912
85
        touchFlick(stageManagerUnderTest, x, y,
1913
86
                   x + distance, y)
1914
87
    }
1915
88
1916
89
    function checkStageManagerOffScreen() {
1917
90
        tryCompare(stageManagerUnderTest, "animatedProgress", 0) //0 means off-screen
1918
91
        tryCompare(stageManagerUnderTest, "shown", false)
1919
92
    }
1920
93
1921
94
    function checkStageManagerOnScreen() {
1922
95
        tryCompare(stageManagerUnderTest, "animatedProgress", 1) //1 means on-screen
1923
96
        tryCompare(stageManagerUnderTest, "shown", true)
1924
97
    }
1925
98
}
Status:	Superseded
Proposed branch:	lp:~gerboland/unity/8-refactor-wm-and-test
Merge into:	lp:unity/8.0
Diff against target:	1925 lines (+1260/-289) 17 files modified CMakeLists.txt (+1/-1) Shell.qml (+24/-241) Stages/SideStage.qml (+1/-1) Stages/Stage.qml (+6/-1) Stages/StageManager.qml (+287/-0) debian/unity8.install (+1/-1) tests/mocks/Ubuntu/Application/ApplicationListModel.cpp (+2/-2) tests/mocks/Ubuntu/Application/ApplicationManager.cpp (+73/-34) tests/mocks/Ubuntu/Application/ApplicationManager.h (+9/-0) tests/qmltests/CMakeLists.txt (+4/-6) tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml (+2/-0) tests/qmltests/Stages/tst_SideStage.qml (+1/-1) tests/qmltests/Stages/tst_Stage.qml (+1/-1) tests/qmltests/Stages/tst_StageManager-phone.qml (+255/-0) tests/qmltests/Stages/tst_StageManager-tablet.qml (+394/-0) tests/qmltests/Stages/tst_StageManager/ListSelector.qml (+101/-0) tests/qmltests/Stages/tst_StageManager/StageManagerTestCase.qml (+98/-0)
To merge this branch:	bzr merge lp:~gerboland/unity/8-refactor-wm-and-test
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Michał Sawicz			Needs Fixing on 2013-06-28
PS Jenkins bot (community)	continuous-integration	2013-06-07	Needs Fixing on 2013-06-28
Michael Zanetti (community)		2013-06-07	Needs Fixing on 2013-06-10
Review via email: mp+168051@code.launchpad.net