1
=== modified file 'debian/changelog'
2
--- debian/changelog	2014-07-25 10:47:35 +0000
3
+++ debian/changelog	2014-07-29 14:07:22 +0000
4
@@ -1,3 +1,17 @@
5
1
unity8 (8.00) UNRELEASED; urgency=medium
6
2
7
3
  [ Gerry Boland ]
8
4
  [ Daniel d'Andrada ]
9
5
  * Re-architecture unity8 to use the QtMirCompositor library so that
10
6
    the Qt scenegraph renderer is used as the Mir compositor, and
11
7
    application surfaces are added to the QML scene as items.
12
8
    
13
9
  [ Michael Zanetti ]
14
10
  * Port phone right-edge spread code to use QtCompositor
15
11
  * Add right-edge spread animation for tablet
16
12
17
13
 -- Gerry Boland <gerry.boland@canonical.com>  Thu, 10 Jul 2014 10:34:18 +0100
18
14
19
1
unity8 (7.90+14.10.20140725-0ubuntu1) utopic; urgency=low
15
unity8 (7.90+14.10.20140725-0ubuntu1) utopic; urgency=low
20
2
16
21
3
  [ CI bot ]
17
  [ CI bot ]
22
4
18
23
=== modified file 'debian/control'
24
--- debian/control	2014-07-24 20:40:44 +0000
25
+++ debian/control	2014-07-29 14:07:22 +0000
26
@@ -24,7 +24,6 @@
27
24
               libqmenumodel-dev (>= 0.2.8),
24
               libqmenumodel-dev (>= 0.2.8),
28
25
               libqt5xmlpatterns5-dev,
25
               libqt5xmlpatterns5-dev,
29
26
               libunity-api-dev (>= 7.85),
26
               libunity-api-dev (>= 7.85),
30
27
               libunity-mir-dev,
31
28
               libusermetricsoutput1-dev,
27
               libusermetricsoutput1-dev,
32
29
               libxcb1-dev,
28
               libxcb1-dev,
33
30
               pkg-config,
29
               pkg-config,
34
@@ -80,10 +79,10 @@
35
80
Depends: gsettings-desktop-schemas,
79
Depends: gsettings-desktop-schemas,
36
81
         libcap2-bin,
80
         libcap2-bin,
37
82
         libglib2.0-bin,
81
         libglib2.0-bin,
38
83
         libunity-mir1 (>= 0.4),
39
84
         qmenumodel-qml (>= 0.2.8),
82
         qmenumodel-qml (>= 0.2.8),
40
85
         qml-module-qtquick-xmllistmodel,
83
         qml-module-qtquick-xmllistmodel,
41
86
         qtdeclarative5-gsettings1.0,
84
         qtdeclarative5-gsettings1.0,
42
85
         qtdeclarative5-qtmir-plugin (>= 0.4),
43
87
         qtdeclarative5-ubuntu-settings-components (>= 0.3),
86
         qtdeclarative5-ubuntu-settings-components (>= 0.3),
44
88
         qtdeclarative5-ubuntu-telephony0.1,
87
         qtdeclarative5-ubuntu-telephony0.1,
45
89
         unity-launcher-impl-3,
88
         unity-launcher-impl-3,
46
90
89
47
=== modified file 'plugins/Utils/CMakeLists.txt'
48
--- plugins/Utils/CMakeLists.txt	2014-06-23 16:20:51 +0000
49
+++ plugins/Utils/CMakeLists.txt	2014-07-29 14:07:22 +0000
50
@@ -15,6 +15,7 @@
51
15
    qsortfilterproxymodelqml.cpp
15
    qsortfilterproxymodelqml.cpp
52
16
    timeformatter.cpp
16
    timeformatter.cpp
53
17
    unitymenumodelpaths.cpp
17
    unitymenumodelpaths.cpp
54
18
    windowkeysfilter.cpp
55
18
    easingcurve.cpp
19
    easingcurve.cpp
56
19
    plugin.cpp
20
    plugin.cpp
57
20
    )
21
    )
58
21
22
59
=== modified file 'plugins/Utils/easingcurve.cpp'
60
--- plugins/Utils/easingcurve.cpp	2014-06-30 16:02:05 +0000
61
+++ plugins/Utils/easingcurve.cpp	2014-07-29 14:07:22 +0000
62
@@ -34,7 +34,11 @@
63
34
34
64
35
void EasingCurve::setType(const QEasingCurve::Type &type)
35
void EasingCurve::setType(const QEasingCurve::Type &type)
65
36
{
36
{
67
37
    m_easingCurve.setType(type);
37
    // FIXME: Working around bug https://bugreports.qt-project.org/browse/QTBUG-38686 here
68
38
    QEasingCurve newCurve;
69
39
    newCurve.setType(type);
70
40
    newCurve.setPeriod(m_easingCurve.period());
71
41
    m_easingCurve = newCurve;
72
38
    Q_EMIT typeChanged();
42
    Q_EMIT typeChanged();
73
39
}
43
}
74
40
44
75
41
45
76
=== modified file 'plugins/Utils/plugin.cpp'
77
--- plugins/Utils/plugin.cpp	2014-06-23 16:20:51 +0000
78
+++ plugins/Utils/plugin.cpp	2014-07-29 14:07:22 +0000
79
@@ -30,6 +30,7 @@
80
30
#include "qsortfilterproxymodelqml.h"
30
#include "qsortfilterproxymodelqml.h"
81
31
#include "timeformatter.h"
31
#include "timeformatter.h"
82
32
#include "unitymenumodelpaths.h"
32
#include "unitymenumodelpaths.h"
83
33
#include "windowkeysfilter.h"
84
33
#include "easingcurve.h"
34
#include "easingcurve.h"
85
34
35
86
35
void UtilsPlugin::registerTypes(const char *uri)
36
void UtilsPlugin::registerTypes(const char *uri)
87
@@ -40,6 +41,7 @@
88
40
    qmlRegisterType<QSortFilterProxyModelQML>(uri, 0, 1, "SortFilterProxyModel");
41
    qmlRegisterType<QSortFilterProxyModelQML>(uri, 0, 1, "SortFilterProxyModel");
89
41
    qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");
42
    qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");
90
42
    qmlRegisterType<TimeFormatter>(uri, 0, 1, "TimeFormatter");
43
    qmlRegisterType<TimeFormatter>(uri, 0, 1, "TimeFormatter");
91
44
    qmlRegisterType<WindowKeysFilter>(uri, 0, 1, "WindowKeysFilter");
92
43
    qmlRegisterType<GDateTimeFormatter>(uri, 0, 1, "GDateTimeFormatter");
45
    qmlRegisterType<GDateTimeFormatter>(uri, 0, 1, "GDateTimeFormatter");
93
44
    qmlRegisterType<EasingCurve>(uri, 0, 1, "EasingCurve");
46
    qmlRegisterType<EasingCurve>(uri, 0, 1, "EasingCurve");
94
45
}
47
}
95
46
48
96
=== added file 'plugins/Utils/windowkeysfilter.cpp'
97
--- plugins/Utils/windowkeysfilter.cpp	1970-01-01 00:00:00 +0000
98
+++ plugins/Utils/windowkeysfilter.cpp	2014-07-29 14:07:22 +0000
99
@@ -0,0 +1,57 @@
100
1
/*
101
2
 * Copyright (C) 2014 Canonical, Ltd.
102
3
 *
103
4
 * This program is free software; you can redistribute it and/or modify
104
5
 * it under the terms of the GNU General Public License as published by
105
6
 * the Free Software Foundation; version 3.
106
7
 *
107
8
 * This program is distributed in the hope that it will be useful,
108
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
109
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
110
11
 * GNU General Public License for more details.
111
12
 *
112
13
 * You should have received a copy of the GNU General Public License
113
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
114
15
 *
115
16
 * Author: Daniel d'Andrada <daniel.dandrada@canonical.com>
116
17
 */
117
18
118
19
#include "windowkeysfilter.h"
119
20
120
21
#include <QQuickWindow>
121
22
122
23
WindowKeysFilter::WindowKeysFilter(QQuickItem *parent)
123
24
    : QQuickItem(parent)
124
25
{
125
26
    connect(this, &QQuickItem::windowChanged,
126
27
            this, &WindowKeysFilter::setupFilterOnWindow);
127
28
}
128
29
129
30
bool WindowKeysFilter::eventFilter(QObject *watched, QEvent *event)
130
31
{
131
32
    Q_ASSERT(!m_filteredWindow.isNull());
132
33
    Q_ASSERT(watched == static_cast<QObject*>(m_filteredWindow.data()));
133
34
134
35
    if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {
135
36
        // Let QML see this event and decide if it does not want it
136
37
        event->accept();
137
38
        QCoreApplication::sendEvent(this, event);
138
39
        return event->isAccepted();
139
40
    } else {
140
41
        // Not interested
141
42
        return false;
142
43
    }
143
44
}
144
45
145
46
void WindowKeysFilter::setupFilterOnWindow(QQuickWindow *window)
146
47
{
147
48
    if (!m_filteredWindow.isNull()) {
148
49
        m_filteredWindow->removeEventFilter(this);
149
50
        m_filteredWindow.clear();
150
51
    }
151
52
152
53
    if (window) {
153
54
        window->installEventFilter(this);
154
55
        m_filteredWindow = window;
155
56
    }
156
57
}
157
0
58
158
=== added file 'plugins/Utils/windowkeysfilter.h'
159
--- plugins/Utils/windowkeysfilter.h	1970-01-01 00:00:00 +0000
160
+++ plugins/Utils/windowkeysfilter.h	2014-07-29 14:07:22 +0000
161
@@ -0,0 +1,51 @@
162
1
/*
163
2
 * Copyright (C) 2014 Canonical, Ltd.
164
3
 *
165
4
 * This program is free software; you can redistribute it and/or modify
166
5
 * it under the terms of the GNU General Public License as published by
167
6
 * the Free Software Foundation; version 3.
168
7
 *
169
8
 * This program is distributed in the hope that it will be useful,
170
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
171
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
172
11
 * GNU General Public License for more details.
173
12
 *
174
13
 * You should have received a copy of the GNU General Public License
175
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
176
15
 *
177
16
 * Author: Daniel d'Andrada <daniel.dandrada@canonical.com>
178
17
 */
179
18
180
19
#ifndef UNITY_WINDOWKEYSFILTER_H
181
20
#define UNITY_WINDOWKEYSFILTER_H
182
21
183
22
#include <QQuickItem>
184
23
#include <QPointer>
185
24
186
25
/*
187
26
   Receives all key events that arrive in the QQuickWindow where this item is placed.
188
27
189
28
   Rejected key events will be allowed to be processed normally by the QQuickWindow whereas
190
29
   accepted ones will be filtered out. Events are accepted by default, so make sure you reject
191
30
   the keys you're not interested in.
192
31
193
32
   If more than one WindowKeysFilter exist in the same QML scene (and thus in the same QQuickWindow)
194
33
   they will be called in the order of creation, which can be tricky to assess. So the best practice
195
34
   is to have at most one WindowKeysFilter per QML scene.
196
35
 */
197
36
class WindowKeysFilter : public QQuickItem
198
37
{
199
38
    Q_OBJECT
200
39
public:
201
40
    WindowKeysFilter(QQuickItem *parent = 0);
202
41
203
42
    bool eventFilter(QObject *watched, QEvent *event);
204
43
205
44
private Q_SLOTS:
206
45
    void setupFilterOnWindow(QQuickWindow *window);
207
46
208
47
private:
209
48
    QPointer<QQuickWindow> m_filteredWindow;
210
49
};
211
50
212
51
#endif // UNITY_WINDOWKEYSFILTER_H
213
0
52
214
=== added file 'qml/Components/Dialogs.qml'
215
--- qml/Components/Dialogs.qml	1970-01-01 00:00:00 +0000
216
+++ qml/Components/Dialogs.qml	2014-07-29 14:07:22 +0000
217
@@ -0,0 +1,217 @@
218
1
/*
219
2
 * Copyright (C) 2014 Canonical, Ltd.
220
3
 *
221
4
 * This program is free software; you can redistribute it and/or modify
222
5
 * it under the terms of the GNU General Public License as published by
223
6
 * the Free Software Foundation; version 3.
224
7
 *
225
8
 * This program is distributed in the hope that it will be useful,
226
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
227
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
228
11
 * GNU General Public License for more details.
229
12
 *
230
13
 * You should have received a copy of the GNU General Public License
231
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
232
15
 */
233
16
234
17
import QtQuick 2.0
235
18
236
19
import Unity.Application 0.1
237
20
import Unity.Session 0.1
238
21
import Ubuntu.Components 0.1
239
22
import Ubuntu.Components.Popups 0.1
240
23
241
24
Item {
242
25
    id: root
243
26
244
27
    function onPowerKeyPressed() {
245
28
        if (!powerKeyTimer.running) {
246
29
            powerKeyTimer.start();
247
30
        }
248
31
    }
249
32
250
33
    function onPowerKeyReleased() {
251
34
        powerKeyTimer.stop();
252
35
    }
253
36
254
37
    signal powerOffClicked();
255
38
256
39
    QtObject {
257
40
        id: d // private stuff
258
41
259
42
        property bool dialogShown: false
260
43
261
44
        function showPowerDialog() {
262
45
            if (!d.dialogShown) {
263
46
                d.dialogShown = true;
264
47
                PopupUtils.open(powerDialog, root, {"z": root.z});
265
48
            }
266
49
        }
267
50
    }
268
51
269
52
    Timer {
270
53
        id: powerKeyTimer
271
54
        interval: 2000
272
55
        repeat: false
273
56
        triggeredOnStart: false
274
57
275
58
        onTriggered: {
276
59
            d.showPowerDialog();
277
60
        }
278
61
    }
279
62
280
63
    Component {
281
64
        id: logoutDialog
282
65
        Dialog {
283
66
            id: dialogueLogout
284
67
            title: "Logout"
285
68
            text: "Are you sure that you want to logout?"
286
69
            Button {
287
70
                text: "Cancel"
288
71
                onClicked: {
289
72
                    PopupUtils.close(dialogueLogout);
290
73
                    d.dialogShown = false;
291
74
                }
292
75
            }
293
76
            Button {
294
77
                text: "Yes"
295
78
                onClicked: {
296
79
                    DBusUnitySessionService.Logout();
297
80
                    PopupUtils.close(dialogueLogout);
298
81
                    d.dialogShown = false;
299
82
                }
300
83
            }
301
84
        }
302
85
    }
303
86
304
87
    Component {
305
88
        id: shutdownDialog
306
89
        Dialog {
307
90
            id: dialogueShutdown
308
91
            title: "Shutdown"
309
92
            text: "Are you sure that you want to shutdown?"
310
93
            Button {
311
94
                text: "Cancel"
312
95
                onClicked: {
313
96
                    PopupUtils.close(dialogueShutdown);
314
97
                    d.dialogShown = false;
315
98
                }
316
99
            }
317
100
            Button {
318
101
                text: "Yes"
319
102
                onClicked: {
320
103
                    dBusUnitySessionServiceConnection.closeAllApps();
321
104
                    DBusUnitySessionService.Shutdown();
322
105
                    PopupUtils.close(dialogueShutdown);
323
106
                    d.dialogShown = false;
324
107
                }
325
108
            }
326
109
        }
327
110
    }
328
111
329
112
    Component {
330
113
        id: rebootDialog
331
114
        Dialog {
332
115
            id: dialogueReboot
333
116
            title: "Reboot"
334
117
            text: "Are you sure that you want to reboot?"
335
118
            Button {
336
119
                text: "Cancel"
337
120
                onClicked: {
338
121
                    PopupUtils.close(dialogueReboot)
339
122
                    d.dialogShown = false;
340
123
                }
341
124
            }
342
125
            Button {
343
126
                text: "Yes"
344
127
                onClicked: {
345
128
                    dBusUnitySessionServiceConnection.closeAllApps();
346
129
                    DBusUnitySessionService.Reboot();
347
130
                    PopupUtils.close(dialogueReboot);
348
131
                    d.dialogShown = false;
349
132
                }
350
133
            }
351
134
        }
352
135
    }
353
136
354
137
    Component {
355
138
        id: powerDialog
356
139
        Dialog {
357
140
            id: dialoguePower
358
141
            title: "Power"
359
142
            text: i18n.tr("Are you sure you would like to turn power off?")
360
143
            Button {
361
144
                text: i18n.tr("Power off")
362
145
                onClicked: {
363
146
                    dBusUnitySessionServiceConnection.closeAllApps();
364
147
                    PopupUtils.close(dialoguePower);
365
148
                    d.dialogShown = false;
366
149
                    root.powerOffClicked();
367
150
                }
368
151
            }
369
152
            Button {
370
153
                text: i18n.tr("Restart")
371
154
                onClicked: {
372
155
                    dBusUnitySessionServiceConnection.closeAllApps();
373
156
                    DBusUnitySessionService.Reboot();
374
157
                    PopupUtils.close(dialoguePower);
375
158
                    d.dialogShown = false;
376
159
                }
377
160
            }
378
161
            Button {
379
162
                text: i18n.tr("Cancel")
380
163
                onClicked: {
381
164
                    PopupUtils.close(dialoguePower);
382
165
                    d.dialogShown = false;
383
166
                }
384
167
            }
385
168
        }
386
169
    }
387
170
388
171
389
172
    Connections {
390
173
        id: dBusUnitySessionServiceConnection
391
174
        objectName: "dBusUnitySessionServiceConnection"
392
175
        target: DBusUnitySessionService
393
176
394
177
        function closeAllApps() {
395
178
            while (true) {
396
179
                var app = ApplicationManager.get(0);
397
180
                if (app === null) {
398
181
                    break;
399
182
                }
400
183
                ApplicationManager.stopApplication(app.appId);
401
184
            }
402
185
        }
403
186
404
187
        onLogoutRequested: {
405
188
            // Display a dialog to ask the user to confirm.
406
189
            if (!d.dialogShown) {
407
190
                d.dialogShown = true;
408
191
                PopupUtils.open(logoutDialog, root, {"z": root.z});
409
192
            }
410
193
        }
411
194
412
195
        onShutdownRequested: {
413
196
            // Display a dialog to ask the user to confirm.
414
197
            if (!d.dialogShown) {
415
198
                d.dialogShown = true;
416
199
                PopupUtils.open(shutdownDialog, root, {"z": root.z});
417
200
            }
418
201
        }
419
202
420
203
        onRebootRequested: {
421
204
            // Display a dialog to ask the user to confirm.
422
205
            if (!d.dialogShown) {
423
206
                d.dialogShown = true;
424
207
                PopupUtils.open(rebootDialog, root, {"z": root.z});
425
208
            }
426
209
        }
427
210
428
211
        onLogoutReady: {
429
212
            closeAllApps();
430
213
            Qt.quit();
431
214
        }
432
215
    }
433
216
434
217
}
435
0
218
436
=== modified file 'qml/Components/DraggingArea.qml'
437
--- qml/Components/DraggingArea.qml	2013-10-25 14:26:29 +0000
438
+++ qml/Components/DraggingArea.qml	2014-07-29 14:07:22 +0000
439
@@ -117,4 +117,8 @@
440
117
        dragging = false
117
        dragging = false
441
118
        __pressedPosition = Qt.point(mouse.x, mouse.y)
118
        __pressedPosition = Qt.point(mouse.x, mouse.y)
442
119
    }
119
    }
443
120
444
121
    onCanceled: {
445
122
        dragging = false
446
123
    }
447
120
}
124
}
448
121
125
449
=== added file 'qml/Components/InputMethod.qml'
450
--- qml/Components/InputMethod.qml	1970-01-01 00:00:00 +0000
451
+++ qml/Components/InputMethod.qml	2014-07-29 14:07:22 +0000
452
@@ -0,0 +1,79 @@
453
1
/*
454
2
 * Copyright (C) 2014 Canonical, Ltd.
455
3
 *
456
4
 * This program is free software; you can redistribute it and/or modify
457
5
 * it under the terms of the GNU General Public License as published by
458
6
 * the Free Software Foundation; version 3.
459
7
 *
460
8
 * This program is distributed in the hope that it will be useful,
461
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
462
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
463
11
 * GNU General Public License for more details.
464
12
 *
465
13
 * You should have received a copy of the GNU General Public License
466
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
467
15
 */
468
16
469
17
import QtQuick 2.0
470
18
import Unity.Application 0.1
471
19
import Ubuntu.Components 0.1
472
20
473
21
Item {
474
22
    id: root
475
23
476
24
    property var surface: null
477
25
478
26
    property int transitionDuration: UbuntuAnimation.FastDuration
479
27
480
28
    state: {
481
29
        if (surface && surface.state != MirSurfaceItem.Minimized) {
482
30
            return "shown";
483
31
        } else {
484
32
            return "hidden";
485
33
        }
486
34
    }
487
35
488
36
    states: [
489
37
        State {
490
38
            name: "shown"
491
39
            PropertyChanges {
492
40
                target: root
493
41
                visible: true
494
42
                y: 0
495
43
            }
496
44
        },
497
45
        State {
498
46
            name: "hidden"
499
47
            PropertyChanges {
500
48
                target: root
501
49
                visible: false
502
50
                // half-way down because the vkb occupies only the lower half of the surface
503
51
                // TODO: consider keyboard rotation
504
52
                y: root.parent.height / 2.0
505
53
            }
506
54
        }
507
55
    ]
508
56
509
57
    transitions: [
510
58
        Transition {
511
59
            from: "*"; to: "*"
512
60
            PropertyAction { property: "visible"; value: true }
513
61
            UbuntuNumberAnimation { property: "y"; duration: transitionDuration }
514
62
        }
515
63
    ]
516
64
517
65
    onSurfaceChanged: {
518
66
        if (surface) {
519
67
            surface.parent = root;
520
68
            surface.anchors.fill = root;
521
69
        }
522
70
    }
523
71
524
72
    Component.onDestruction: {
525
73
        if (surface) {
526
74
            surface.parent = null;
527
75
            surface.release();
528
76
            surface = null;
529
77
        }
530
78
    }
531
79
}
532
0
80
533
=== modified file 'qml/Components/PageHeader.qml'
534
--- qml/Components/PageHeader.qml	2014-07-21 09:49:41 +0000
535
+++ qml/Components/PageHeader.qml	2014-07-29 14:07:22 +0000
536
@@ -117,7 +117,7 @@
537
117
    Flickable {
117
    Flickable {
538
118
        id: headerContainer
118
        id: headerContainer
539
119
        objectName: "headerContainer"
119
        objectName: "headerContainer"
541
120
        clip: true
120
        clip: openSearchAnimation.running
542
121
        anchors { left: parent.left; top: parent.top; right: parent.right }
121
        anchors { left: parent.left; top: parent.top; right: parent.right }
543
122
        height: units.gu(6.5)
122
        height: units.gu(6.5)
544
123
        contentHeight: headersColumn.height
123
        contentHeight: headersColumn.height
545
@@ -155,6 +155,7 @@
546
155
                anchors { left: parent.left; right: parent.right }
155
                anchors { left: parent.left; right: parent.right }
547
156
                height: headerContainer.height
156
                height: headerContainer.height
548
157
                contentHeight: height
157
                contentHeight: height
549
158
                opacity: headerContainer.clip || headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
550
158
                separatorSource: ""
159
                separatorSource: ""
551
159
                // Required to keep PageHeadStyle noise down as it expects the Page's properties around.
160
                // Required to keep PageHeadStyle noise down as it expects the Page's properties around.
552
160
                property var styledItem: searchHeader
161
                property var styledItem: searchHeader
553
@@ -229,6 +230,7 @@
554
229
                anchors { left: parent.left; right: parent.right }
230
                anchors { left: parent.left; right: parent.right }
555
230
                height: headerContainer.height
231
                height: headerContainer.height
556
231
                contentHeight: height
232
                contentHeight: height
557
233
                opacity: headerContainer.clip || !headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
558
232
                separatorSource: ""
234
                separatorSource: ""
559
233
                textColor: root.scopeStyle ? root.scopeStyle.headerForeground : "grey"
235
                textColor: root.scopeStyle ? root.scopeStyle.headerForeground : "grey"
560
234
                property var styledItem: header
236
                property var styledItem: header
561
235
237
562
=== modified file 'qml/Dash/Apps/RunningApplicationTile.qml'
563
--- qml/Dash/Apps/RunningApplicationTile.qml	2014-03-25 11:34:34 +0000
564
+++ qml/Dash/Apps/RunningApplicationTile.qml	2014-07-29 14:07:22 +0000
565
@@ -29,11 +29,8 @@
566
29
    signal requestedActivationMode()
29
    signal requestedActivationMode()
567
30
    signal requestedTerminationMode()
30
    signal requestedTerminationMode()
568
31
31
574
32
    // Was: childrenRect.height
32
    width: thumbnail.width
575
33
    // To avoid "binding loop" warning
33
    height: thumbnail.height + labelContainer.height
571
34
    height: shapedApplicationImage.height + labelContainer.height
572
35
573
36
    width: shapedApplicationImage.width <= units.gu(11) ? units.gu(11) : height
576
37
34
577
38
    property bool terminationModeEnabled: false
35
    property bool terminationModeEnabled: false
578
39
36
579
@@ -50,42 +47,53 @@
580
50
        }
47
        }
581
51
    }
48
    }
582
52
49
610
53
    UbuntuShape {
50
    Item {
611
54
        id: shapedApplicationImage
51
        id: thumbnail
612
55
        anchors { top: parent.top; horizontalCenter: parent.horizontalCenter }
52
613
56
53
        width: shapedApplicationImage.width
614
57
        height: units.gu(17)
54
        height: shapedApplicationImage.height
615
58
        width: applicationImage.width
55
616
59
        radius: "medium"
56
        UbuntuShape {
617
60
57
            id: shapedApplicationImage
618
61
        image: Image {
58
            x: 0
619
62
            id: applicationImage
59
            y: 0
620
63
            source: application.screenshot
60
            height: applicationImage.height
621
64
            // height : width = ss.height : ss.width
61
            width: applicationImage.width
622
65
            height: shapedApplicationImage.height
62
            radius: "medium"
623
66
            fillMode: Image.PreserveAspectCrop
63
624
67
            width: Math.min(height, height * sourceSize.width / sourceSize.height)
64
            image: Image {
625
68
        }
65
                id: applicationImage
626
69
66
                source: application.screenshot
627
70
    }
67
                // height : width = ss.height : ss.width
628
71
68
629
72
    UbuntuShape {
69
                property bool isLandscape: sourceSize.width > sourceSize.height
630
73
        id: borderPressed
70
                property real maxDimension: units.gu(17)
631
74
71
632
75
        anchors.fill: shapedApplicationImage
72
                width: isLandscape ? Math.min(sourceSize.width, maxDimension) : height * (sourceSize.width / sourceSize.height)
633
76
        radius: "medium"
73
                height: isLandscape ? width * (sourceSize.height / sourceSize.width) : Math.min(sourceSize.height, maxDimension)
634
77
        borderSource: "radius_pressed.sci"
74
                fillMode: Image.Stretch
635
78
        opacity: root.pressed ? 1.0 : 0.0
75
            }
636
79
        Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
76
637
77
        }
638
78
639
79
        UbuntuShape {
640
80
            id: borderPressed
641
81
642
82
            anchors.fill: shapedApplicationImage
643
83
            radius: "medium"
644
84
            borderSource: "radius_pressed.sci"
645
85
            opacity: root.pressed ? 1.0 : 0.0
646
86
            Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
647
87
        }
648
80
    }
88
    }
649
81
89
650
82
    // FIXME: label code duplicated with Tile
90
    // FIXME: label code duplicated with Tile
651
83
    Item {
91
    Item {
652
84
        id: labelContainer
92
        id: labelContainer
653
85
        anchors {
93
        anchors {
657
86
            left: parent.left
94
            left: thumbnail.left
658
87
            right: parent.right
95
            right: thumbnail.right
659
88
            top: shapedApplicationImage.bottom
96
            top: thumbnail.bottom
660
89
        }
97
        }
661
90
        height: units.gu(2)
98
        height: units.gu(2)
662
91
99
663
@@ -110,9 +118,9 @@
664
110
    CloseIcon {
118
    CloseIcon {
665
111
        objectName: "closeIcon " + model.name
119
        objectName: "closeIcon " + model.name
666
112
        anchors {
120
        anchors {
668
113
            left: shapedApplicationImage.left
121
            left: thumbnail.left
669
114
            leftMargin: -units.gu(1)
122
            leftMargin: -units.gu(1)
671
115
            top: parent.top
123
            top: thumbnail.top
672
116
            topMargin: -units.gu(1)
124
            topMargin: -units.gu(1)
673
117
        }
125
        }
674
118
        height: units.gu(6)
126
        height: units.gu(6)
675
119
127
676
=== modified file 'qml/Dash/DashContent.qml'
677
--- qml/Dash/DashContent.qml	2014-07-08 19:35:59 +0000
678
+++ qml/Dash/DashContent.qml	2014-07-29 14:07:22 +0000
679
@@ -121,6 +121,10 @@
680
121
                Loader {
121
                Loader {
681
122
                    width: ListView.view.width
122
                    width: ListView.view.width
682
123
                    height: ListView.view.height
123
                    height: ListView.view.height
683
124
                    opacity: { // hide delegate if offscreen
684
125
                        var xPositionRelativetoView = ListView.view.contentX - x
685
126
                        return (xPositionRelativetoView > -width && xPositionRelativetoView < width) ? 1 : 0
686
127
                    }
687
124
                    asynchronous: true
128
                    asynchronous: true
688
125
                    // TODO This if will eventually go away since we're killing DashApps.qml
129
                    // TODO This if will eventually go away since we're killing DashApps.qml
689
126
                    // once we move app closing to the spread
130
                    // once we move app closing to the spread
690
127
131
691
=== added file 'qml/Dash/graphics/phone/screenshots/vkb_portrait.png'
692
128
Binary files qml/Dash/graphics/phone/screenshots/vkb_portrait.png	1970-01-01 00:00:00 +0000 and qml/Dash/graphics/phone/screenshots/vkb_portrait.png	2014-07-29 14:07:22 +0000 differ
132
Binary files qml/Dash/graphics/phone/screenshots/vkb_portrait.png	1970-01-01 00:00:00 +0000 and qml/Dash/graphics/phone/screenshots/vkb_portrait.png	2014-07-29 14:07:22 +0000 differ
693
=== modified file 'qml/Launcher/Launcher.qml'
694
--- qml/Launcher/Launcher.qml	2014-07-09 13:38:07 +0000
695
+++ qml/Launcher/Launcher.qml	2014-07-29 14:07:22 +0000
696
@@ -181,7 +181,7 @@
697
181
            bottom: parent.bottom
181
            bottom: parent.bottom
698
182
        }
182
        }
699
183
        x: -width
183
        x: -width
701
184
        opacity: (x == -width && dragArea.status === DirectionalDragArea.WaitingForTouch) ? 0 : 1
184
        visible: x > -width || dragArea.status === DirectionalDragArea.Undecided
702
185
        model: LauncherModel
185
        model: LauncherModel
703
186
186
704
187
        property bool animate: true
187
        property bool animate: true
705
188
188
706
=== modified file 'qml/Panel/Indicators.qml'
707
--- qml/Panel/Indicators.qml	2014-07-10 13:36:41 +0000
708
+++ qml/Panel/Indicators.qml	2014-07-29 14:07:22 +0000
709
@@ -37,6 +37,7 @@
710
37
    readonly property int lockThreshold: openedHeight / 2
37
    readonly property int lockThreshold: openedHeight / 2
711
38
    property bool fullyOpened: height == openedHeight
38
    property bool fullyOpened: height == openedHeight
712
39
    property bool partiallyOpened: height > panelHeight && !fullyOpened
39
    property bool partiallyOpened: height > panelHeight && !fullyOpened
713
40
    property bool fullyClosed: height <= panelHeight
714
40
    property bool contentEnabled: true
41
    property bool contentEnabled: true
715
41
    property bool initalizeItem: true
42
    property bool initalizeItem: true
716
42
    readonly property alias content: menuContent
43
    readonly property alias content: menuContent
717
@@ -187,6 +188,7 @@
718
187
            bottom: handle.top
188
            bottom: handle.top
719
188
        }
189
        }
720
189
        indicatorsModel: visibleIndicators.model
190
        indicatorsModel: visibleIndicators.model
721
191
        visible: indicators.partiallyOpened || indicators.fullyOpened
722
190
        clip: !indicators.fullyOpened
192
        clip: !indicators.fullyOpened
723
191
        activeHeader: indicators.state == "hint" || indicators.state == "reveal"
193
        activeHeader: indicators.state == "hint" || indicators.state == "reveal"
724
192
        enabled: contentEnabled
194
        enabled: contentEnabled
725
@@ -219,6 +221,7 @@
726
219
        }
221
        }
727
220
        height: Math.max(Math.min(handleImage.height, indicators.height - handleImage.height), 0)
222
        height: Math.max(Math.min(handleImage.height, indicators.height - handleImage.height), 0)
728
221
        clip: height < handleImage.height
223
        clip: height < handleImage.height
729
224
        visible: menuContent.visible
730
222
225
731
223
        BorderImage {
226
        BorderImage {
732
224
            id: handleImage
227
            id: handleImage
733
225
228
734
=== modified file 'qml/Shell.qml'
735
--- qml/Shell.qml	2014-07-18 15:13:35 +0000
736
+++ qml/Shell.qml	2014-07-29 14:07:22 +0000
737
@@ -19,9 +19,9 @@
738
19
import GSettings 1.0
19
import GSettings 1.0
739
20
import Unity.Application 0.1
20
import Unity.Application 0.1
740
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 0.1
741
22
import Ubuntu.Components.Popups 0.1
742
23
import Ubuntu.Gestures 0.1
22
import Ubuntu.Gestures 0.1
743
24
import Unity.Launcher 0.1
23
import Unity.Launcher 0.1
744
24
import Utils 0.1
745
25
import LightDM 0.1 as LightDM
25
import LightDM 0.1 as LightDM
746
26
import Powerd 0.1
26
import Powerd 0.1
747
27
import SessionBroadcast 0.1
27
import SessionBroadcast 0.1
748
@@ -31,10 +31,11 @@
749
31
import "Panel"
31
import "Panel"
750
32
import "Components"
32
import "Components"
751
33
import "Notifications"
33
import "Notifications"
752
34
import "Stages"
753
34
import Unity.Notifications 1.0 as NotificationBackend
35
import Unity.Notifications 1.0 as NotificationBackend
754
35
import Unity.Session 0.1
36
import Unity.Session 0.1
755
36
37
757
37
FocusScope {
38
Item {
758
38
    id: shell
39
    id: shell
759
39
40
760
40
    // this is only here to select the width / height of the window if not running fullscreen
41
    // this is only here to select the width / height of the window if not running fullscreen
761
@@ -47,7 +48,7 @@
762
47
    property url background
48
    property url background
763
48
    readonly property real panelHeight: panel.panelHeight
49
    readonly property real panelHeight: panel.panelHeight
764
49
50
766
50
    property bool dashShown: dash.shown
51
    property bool dashShown: dash.shown && dash.available && underlay.visible
767
51
52
768
52
    property bool sideStageEnabled: shell.width >= units.gu(100)
53
    property bool sideStageEnabled: shell.width >= units.gu(100)
769
53
    readonly property string focusedApplicationId: ApplicationManager.focusedApplicationId
54
    readonly property string focusedApplicationId: ApplicationManager.focusedApplicationId
770
@@ -55,14 +56,10 @@
771
55
    function activateApplication(appId) {
56
    function activateApplication(appId) {
772
56
        if (ApplicationManager.findApplication(appId)) {
57
        if (ApplicationManager.findApplication(appId)) {
773
57
            ApplicationManager.requestFocusApplication(appId);
58
            ApplicationManager.requestFocusApplication(appId);
774
58
            stages.show(true);
775
59
            if (stages.locked && ApplicationManager.focusedApplicationId == appId) {
776
60
                applicationsDisplayLoader.item.select(appId);
777
61
            }
778
62
        } else {
59
        } else {
779
63
            var execFlags = shell.sideStageEnabled ? ApplicationManager.NoFlag : ApplicationManager.ForceMainStage;
60
            var execFlags = shell.sideStageEnabled ? ApplicationManager.NoFlag : ApplicationManager.ForceMainStage;
780
64
            ApplicationManager.startApplication(appId, execFlags);
61
            ApplicationManager.startApplication(appId, execFlags);
782
65
            stages.show(false);
62
            stages.show();
783
66
        }
63
        }
784
67
    }
64
    }
785
68
65
786
@@ -89,82 +86,74 @@
787
89
        id: volumeControl
86
        id: volumeControl
788
90
    }
87
    }
789
91
88
792
92
    Keys.onVolumeUpPressed: volumeControl.volumeUp()
89
    WindowKeysFilter {
793
93
    Keys.onVolumeDownPressed: volumeControl.volumeDown()
90
        // Handle but do not filter out volume keys
794
91
        Keys.onVolumeUpPressed: { volumeControl.volumeUp(); event.accepted = false; }
795
92
        Keys.onVolumeDownPressed: { volumeControl.volumeDown(); event.accepted = false; }
796
93
797
94
        Keys.onPressed: {
798
95
            if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
799
96
                dialogs.onPowerKeyPressed();
800
97
                event.accepted = true;
801
98
            } else {
802
99
                event.accepted = false;
803
100
            }
804
101
        }
805
102
806
103
        Keys.onReleased: {
807
104
            if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
808
105
                dialogs.onPowerKeyReleased();
809
106
                event.accepted = true;
810
107
            } else {
811
108
                event.accepted = false;
812
109
            }
813
110
        }
814
111
    }
815
94
112
816
95
    Item {
113
    Item {
818
96
        id: underlayClipper
114
        id: underlay
819
115
        objectName: "underlay"
820
97
        anchors.fill: parent
116
        anchors.fill: parent
827
98
        anchors.rightMargin: stages.overlayWidth
117
828
99
        clip: stages.overlayMode && !stages.painting
118
        // Whether the underlay is fully covered by opaque UI elements.
829
100
119
        property bool fullyCovered: (panel.indicators.fullyOpened && shell.width <= panel.indicatorsMenuWidth)
830
101
        InputFilterArea {
120
                                        || stages.fullyShown || greeterWrapper.fullyShown
831
102
            anchors.fill: parent
121
        visible: !fullyCovered
832
103
            blockInput: parent.clip
122
833
123
        Image {
834
124
            anchors.fill: dash
835
125
            source: shell.width > shell.height ? "Dash/graphics/paper_landscape.png" : "Dash/graphics/paper_portrait.png"
836
126
            fillMode: Image.PreserveAspectCrop
837
127
            horizontalAlignment: Image.AlignRight
838
128
            verticalAlignment: Image.AlignTop
839
104
        }
129
        }
840
105
130
898
106
        Item {
131
        Dash {
899
107
            id: underlay
132
            id: dash
900
108
            objectName: "underlay"
133
            objectName: "dash"
901
109
            anchors.fill: parent
134
902
110
            anchors.rightMargin: -parent.anchors.rightMargin
135
            available: !LightDM.Greeter.active
903
111
136
            hides: [stages, launcher, panel.indicators]
904
112
            // Whether the underlay is fully covered by opaque UI elements.
137
            shown: disappearingAnimationProgress !== 1.0 && greeterWrapper.showProgress !== 1.0 &&
905
113
            property bool fullyCovered: panel.indicators.fullyOpened && shell.width <= panel.indicators.width
138
                   !(panel.indicators.fullyOpened && !sideStageEnabled)
906
114
139
            enabled: disappearingAnimationProgress === 0.0 && greeterWrapper.showProgress === 0.0 && edgeDemo.dashEnabled
907
115
            // Whether the user should see the topmost application surface (if there's one at all).
140
908
116
            readonly property bool applicationSurfaceShouldBeSeen: stages.shown && !stages.painting && !stages.overlayMode
141
            anchors {
909
117
142
                fill: parent
910
118
            // NB! Application surfaces are stacked behind the shell one. So they can only be seen by the user
143
                topMargin: panel.panelHeight
911
119
            // through the translucent parts of the shell surface.
144
            }
912
120
            visible: !fullyCovered && !applicationSurfaceShouldBeSeen
145
913
121
146
            contentScale: 1.0 - 0.2 * disappearingAnimationProgress
914
122
            Rectangle {
147
            opacity: 1.0 - disappearingAnimationProgress
915
123
                anchors.fill: parent
148
            property real disappearingAnimationProgress: stages.showProgress
916
124
                color: "black"
149
917
125
                opacity: dash.disappearingAnimationProgress
150
            // FIXME: only necessary because stages.showProgress is not animated
918
126
            }
151
            Behavior on disappearingAnimationProgress { SmoothedAnimation { velocity: 5 }}
862
127
863
128
            Image {
864
129
                anchors.fill: dash
865
130
                source: shell.width > shell.height ? "Dash/graphics/paper_landscape.png" : "Dash/graphics/paper_portrait.png"
866
131
                fillMode: Image.PreserveAspectCrop
867
132
                horizontalAlignment: Image.AlignRight
868
133
                verticalAlignment: Image.AlignTop
869
134
            }
870
135
871
136
            Dash {
872
137
                id: dash
873
138
                objectName: "dash"
874
139
875
140
                available: !LightDM.Greeter.active
876
141
                hides: [stages, launcher, panel.indicators]
877
142
                shown: disappearingAnimationProgress !== 1.0 && greeterWrapper.showProgress !== 1.0
878
143
                enabled: disappearingAnimationProgress === 0.0 && greeterWrapper.showProgress === 0.0 && edgeDemo.dashEnabled
879
144
880
145
                anchors {
881
146
                    fill: parent
882
147
                    topMargin: panel.panelHeight
883
148
                }
884
149
885
150
                contentScale: 1.0 - 0.2 * disappearingAnimationProgress
886
151
                opacity: 1.0 - disappearingAnimationProgress
887
152
                property real disappearingAnimationProgress: {
888
153
                    if (stages.overlayMode) {
889
154
                        return 0;
890
155
                    } else {
891
156
                        return stages.showProgress
892
157
                    }
893
158
                }
894
159
895
160
                // FIXME: only necessary because stages.showProgress is not animated
896
161
                Behavior on disappearingAnimationProgress { SmoothedAnimation { velocity: 5 }}
897
162
            }
919
163
        }
152
        }
920
164
    }
153
    }
921
165
154
922
166
    EdgeDragArea {
155
    EdgeDragArea {
924
167
        id: stagesDragHandle
156
        id: stagesDragArea
925
168
        direction: Direction.Leftwards
157
        direction: Direction.Leftwards
926
169
158
927
170
        anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
159
        anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
928
@@ -174,20 +163,20 @@
929
174
163
930
175
        onTouchXChanged: {
164
        onTouchXChanged: {
931
176
            if (status == DirectionalDragArea.Recognized) {
165
            if (status == DirectionalDragArea.Recognized) {
934
177
                if (ApplicationManager.count == 0) {
166
                if (ApplicationManager.empty) {
935
178
                    progress = Math.max(stages.width - stagesDragHandle.width + touchX, stages.width * .3)
167
                    progress = Math.max(stages.width - stagesDragArea.width + touchX, stages.width * .3);
936
179
                } else {
168
                } else {
938
180
                    progress = stages.width - stagesDragHandle.width + touchX
169
                    progress = stages.width - stagesDragArea.width + touchX;
939
181
                }
170
                }
940
182
            }
171
            }
941
183
        }
172
        }
942
184
173
943
185
        onDraggingChanged: {
174
        onDraggingChanged: {
944
186
            if (!dragging) {
175
            if (!dragging) {
947
187
                if (ApplicationManager.count > 0 && progress < stages.width - units.gu(10)) {
176
                if (!ApplicationManager.empty && progress < stages.width - units.gu(10)) {
948
188
                    stages.show(true)
177
                    stages.show();
949
189
                }
178
                }
951
190
                stagesDragHandle.progress = stages.width;
179
                stagesDragArea.progress = Qt.binding(function () { return stages.width; });
952
191
            }
180
            }
953
192
        }
181
        }
954
193
    }
182
    }
955
@@ -198,253 +187,93 @@
956
198
        width: parent.width
187
        width: parent.width
957
199
        height: parent.height
188
        height: parent.height
958
200
189
959
190
        visible: !fullyHidden && !ApplicationManager.empty
960
191
961
201
        x: {
192
        x: {
962
202
            if (shown) {
193
            if (shown) {
964
203
                if (overlayMode || locked || greeter.fakeActiveForApp !== "") {
194
                if (locked || greeter.fakeActiveForApp !== "") {
965
204
                    return 0;
195
                    return 0;
966
205
                }
196
                }
968
206
                return launcher.progress
197
                return launcher.progress;
969
207
            } else {
198
            } else {
971
208
                return stagesDragHandle.progress
199
                return stagesDragArea.progress
972
209
            }
200
            }
973
210
        }
201
        }
974
211
975
212
        Behavior on x { SmoothedAnimation { velocity: 600; duration: UbuntuAnimation.FastDuration } }
202
        Behavior on x { SmoothedAnimation { velocity: 600; duration: UbuntuAnimation.FastDuration } }
976
213
203
977
214
        property bool shown: false
204
        property bool shown: false
978
205
        onShownChanged: {
979
206
            if (shown) {
980
207
                if (ApplicationManager.count > 0) {
981
208
                    ApplicationManager.focusApplication(ApplicationManager.get(0).appId);
982
209
                }
983
210
            } else {
984
211
                if (ApplicationManager.focusedApplicationId) {
985
212
                    ApplicationManager.updateScreenshot(ApplicationManager.focusedApplicationId);
986
213
                    ApplicationManager.unfocusCurrentApplication();
987
214
                }
988
215
            }
989
216
        }
990
215
217
992
216
        property real showProgress: overlayMode ? 0 : MathUtils.clamp(1 - x / shell.width, 0, 1)
218
        // Avoid a silent "divide by zero -> NaN" situation during init as shell.width will be
993
219
        // zero. That breaks the property binding and the function won't be reevaluated once
994
220
        // shell.width is set, with the NaN result staying there for good.
995
221
        property real showProgress: shell.width ? MathUtils.clamp(1 - x / shell.width, 0, 1) : 0
996
217
222
997
218
        property bool fullyShown: x == 0
223
        property bool fullyShown: x == 0
998
219
        property bool fullyHidden: x == width
224
        property bool fullyHidden: x == width
999
220
225
1000
221
        property bool painting: applicationsDisplayLoader.item ? applicationsDisplayLoader.item.painting : false
1001
222
        property bool fullscreen: applicationsDisplayLoader.item ? applicationsDisplayLoader.item.fullscreen : false
1002
223
        property bool overlayMode: applicationsDisplayLoader.item ? applicationsDisplayLoader.item.overlayMode : false
1003
224
        property int overlayWidth: applicationsDisplayLoader.item ? applicationsDisplayLoader.item.overlayWidth : false
1004
225
        property bool locked: applicationsDisplayLoader.item ? applicationsDisplayLoader.item.locked : false
226
        property bool locked: applicationsDisplayLoader.item ? applicationsDisplayLoader.item.locked : false
1005
226
227
1007
227
        function show(focusApp) {
228
        // It might technically not be fullyShown but visually it just looks so.
1008
229
        property bool roughlyFullyShown: x >= 0 && x <= units.gu(1)
1009
230
1010
231
        function show() {
1011
228
            shown = true;
232
            shown = true;
1012
229
            panel.indicators.hide();
1013
230
            edgeDemo.stopDemo();
1014
231
            greeter.hide();
1015
232
            if (!ApplicationManager.focusedApplicationId && ApplicationManager.count > 0 && focusApp) {
1016
233
                ApplicationManager.focusApplication(ApplicationManager.get(0).appId);
1017
234
            }
1018
235
        }
233
        }
1019
236
234
1020
237
        function hide() {
235
        function hide() {
1021
238
            shown = false;
236
            shown = false;
1022
239
            if (ApplicationManager.focusedApplicationId) {
1023
240
                ApplicationManager.unfocusCurrentApplication();
1024
241
            }
1025
242
        }
237
        }
1026
243
238
1027
244
        Connections {
239
        Connections {
1028
245
            target: ApplicationManager
240
            target: ApplicationManager
1029
246
1030
247
            onFocusRequested: {
241
            onFocusRequested: {
1031
248
                if (greeter.fakeActiveForApp !== "" && greeter.fakeActiveForApp !== appId) {
242
                if (greeter.fakeActiveForApp !== "" && greeter.fakeActiveForApp !== appId) {
1032
249
                    lockscreen.show();
243
                    lockscreen.show();
1033
250
                }
244
                }
1034
251
                greeter.hide();
245
                greeter.hide();
1036
252
                stages.show(true);
246
                stages.show();
1037
253
            }
247
            }
1038
254
248
1039
255
            onFocusedApplicationIdChanged: {
249
            onFocusedApplicationIdChanged: {
1040
256
                if (greeter.fakeActiveForApp !== "" && greeter.fakeActiveForApp !== ApplicationManager.focusedApplicationId) {
250
                if (greeter.fakeActiveForApp !== "" && greeter.fakeActiveForApp !== ApplicationManager.focusedApplicationId) {
1041
257
                    lockscreen.show();
251
                    lockscreen.show();
1042
258
                }
252
                }
1050
259
                if (ApplicationManager.focusedApplicationId.length > 0) {
253
                panel.indicators.hide();
1044
260
                    stages.show(false);
1045
261
                } else {
1046
262
                    if (!stages.overlayMode) {
1047
263
                        stages.hide();
1048
264
                    }
1049
265
                }
1051
266
            }
254
            }
1052
267
255
1053
268
            onApplicationAdded: {
256
            onApplicationAdded: {
1055
269
                stages.show(false);
257
                if (greeter.shown) {
1056
258
                    greeter.hide();
1057
259
                }
1058
260
                if (!stages.shown) {
1059
261
                    stages.show();
1060
262
                }
1061
270
            }
263
            }
1062
271
264
1065
272
            onApplicationRemoved: {
265
            onEmptyChanged: {
1066
273
                if (ApplicationManager.focusedApplicationId.length == 0) {
266
                if (ApplicationManager.empty) {
1067
274
                    stages.hide();
267
                    stages.hide();
1068
275
                }
268
                }
1069
276
            }
269
            }
1070
277
        }
270
        }
1071
278
271
1072
279
        property bool dialogShown: false
1073
280
1074
281
        Component {
1075
282
            id: logoutDialog
1076
283
            Dialog {
1077
284
                id: dialogueLogout
1078
285
                title: "Logout"
1079
286
                text: "Are you sure that you want to logout?"
1080
287
                Button {
1081
288
                    text: "Cancel"
1082
289
                    onClicked: {
1083
290
                        PopupUtils.close(dialogueLogout);
1084
291
                        stages.dialogShown = false;
1085
292
                    }
1086
293
                }
1087
294
                Button {
1088
295
                    text: "Yes"
1089
296
                    onClicked: {
1090
297
                        DBusUnitySessionService.Logout();
1091
298
                        PopupUtils.close(dialogueLogout);
1092
299
                        stages.dialogShown = false;
1093
300
                    }
1094
301
                }
1095
302
            }
1096
303
        }
1097
304
1098
305
        Component {
1099
306
            id: shutdownDialog
1100
307
            Dialog {
1101
308
                id: dialogueShutdown
1102
309
                title: "Shutdown"
1103
310
                text: "Are you sure that you want to shutdown?"
1104
311
                Button {
1105
312
                    text: "Cancel"
1106
313
                    onClicked: {
1107
314
                        PopupUtils.close(dialogueShutdown);
1108
315
                        stages.dialogShown = false;
1109
316
                    }
1110
317
                }
1111
318
                Button {
1112
319
                    text: "Yes"
1113
320
                    onClicked: {
1114
321
                        dBusUnitySessionServiceConnection.closeAllApps();
1115
322
                        DBusUnitySessionService.Shutdown();
1116
323
                        PopupUtils.close(dialogueShutdown);
1117
324
                        stages.dialogShown = false;
1118
325
                    }
1119
326
                }
1120
327
            }
1121
328
        }
1122
329
1123
330
        Component {
1124
331
            id: rebootDialog
1125
332
            Dialog {
1126
333
                id: dialogueReboot
1127
334
                title: "Reboot"
1128
335
                text: "Are you sure that you want to reboot?"
1129
336
                Button {
1130
337
                    text: "Cancel"
1131
338
                    onClicked: {
1132
339
                        PopupUtils.close(dialogueReboot)
1133
340
                        stages.dialogShown = false;
1134
341
                    }
1135
342
                }
1136
343
                Button {
1137
344
                    text: "Yes"
1138
345
                    onClicked: {
1139
346
                        dBusUnitySessionServiceConnection.closeAllApps();
1140
347
                        DBusUnitySessionService.Reboot();
1141
348
                        PopupUtils.close(dialogueReboot);
1142
349
                        stages.dialogShown = false;
1143
350
                    }
1144
351
                }
1145
352
            }
1146
353
        }
1147
354
1148
355
        Component {
1149
356
            id: powerDialog
1150
357
            Dialog {
1151
358
                id: dialoguePower
1152
359
                title: "Power"
1153
360
                text: i18n.tr("Are you sure you would like to turn power off?")
1154
361
                Button {
1155
362
                    text: i18n.tr("Power off")
1156
363
                    onClicked: {
1157
364
                        dBusUnitySessionServiceConnection.closeAllApps();
1158
365
                        PopupUtils.close(dialoguePower);
1159
366
                        stages.dialogShown = false;
1160
367
                        shutdownFadeOutRectangle.enabled = true;
1161
368
                        shutdownFadeOutRectangle.visible = true;
1162
369
                        shutdownFadeOut.start();
1163
370
                    }
1164
371
                }
1165
372
                Button {
1166
373
                    text: i18n.tr("Restart")
1167
374
                    onClicked: {
1168
375
                        dBusUnitySessionServiceConnection.closeAllApps();
1169
376
                        DBusUnitySessionService.Reboot();
1170
377
                        PopupUtils.close(dialoguePower);
1171
378
                        stages.dialogShown = false;
1172
379
                    }
1173
380
                }
1174
381
                Button {
1175
382
                    text: i18n.tr("Cancel")
1176
383
                    onClicked: {
1177
384
                        PopupUtils.close(dialoguePower);
1178
385
                        stages.dialogShown = false;
1179
386
                    }
1180
387
                }
1181
388
            }
1182
389
        }
1183
390
1184
391
        function showPowerDialog() {
1185
392
            if (!stages.dialogShown) {
1186
393
                stages.dialogShown = true;
1187
394
                PopupUtils.open(powerDialog);
1188
395
            }
1189
396
        }
1190
397
1191
398
        Connections {
1192
399
            id: dBusUnitySessionServiceConnection
1193
400
            objectName: "dBusUnitySessionServiceConnection"
1194
401
            target: DBusUnitySessionService
1195
402
1196
403
            function closeAllApps() {
1197
404
                while (true) {
1198
405
                    var app = ApplicationManager.get(0);
1199
406
                    if (app === null) {
1200
407
                        break;
1201
408
                    }
1202
409
                    ApplicationManager.stopApplication(app.appId);
1203
410
                }
1204
411
            }
1205
412
1206
413
            onLogoutRequested: {
1207
414
                // Display a dialog to ask the user to confirm.
1208
415
                if (!stages.dialogShown) {
1209
416
                    stages.dialogShown = true;
1210
417
                    PopupUtils.open(logoutDialog);
1211
418
                }
1212
419
            }
1213
420
1214
421
            onShutdownRequested: {
1215
422
                // Display a dialog to ask the user to confirm.
1216
423
                if (!stages.dialogShown) {
1217
424
                    stages.dialogShown = true;
1218
425
                    PopupUtils.open(shutdownDialog);
1219
426
                }
1220
427
            }
1221
428
1222
429
            onRebootRequested: {
1223
430
                // Display a dialog to ask the user to confirm.
1224
431
                if (!stages.dialogShown) {
1225
432
                    stages.dialogShown = true;
1226
433
                    PopupUtils.open(rebootDialog);
1227
434
                }
1228
435
            }
1229
436
1230
437
            onLogoutReady: {
1231
438
                closeAllApps();
1232
439
                Qt.quit();
1233
440
            }
1234
441
        }
1235
442
1236
443
        Loader {
272
        Loader {
1237
444
            id: applicationsDisplayLoader
273
            id: applicationsDisplayLoader
1238
445
            anchors.fill: parent
274
            anchors.fill: parent
1239
446
275
1241
447
            source: shell.sideStageEnabled ? "Stages/StageWithSideStage.qml" : "Stages/PhoneStage.qml"
276
            source: shell.sideStageEnabled ? "Stages/TabletStage.qml" : "Stages/PhoneStage.qml"
1242
448
277
1243
449
            Binding {
278
            Binding {
1244
450
                target: applicationsDisplayLoader.item
279
                target: applicationsDisplayLoader.item
1245
@@ -453,27 +282,56 @@
1246
453
            }
282
            }
1247
454
            Binding {
283
            Binding {
1248
455
                target: applicationsDisplayLoader.item
284
                target: applicationsDisplayLoader.item
1249
456
                property: "moving"
1250
457
                value: !stages.fullyShown
1251
458
            }
1252
459
            Binding {
1253
460
                target: applicationsDisplayLoader.item
1254
461
                property: "shown"
1255
462
                value: stages.shown
1256
463
            }
1257
464
            Binding {
1258
465
                target: applicationsDisplayLoader.item
1259
466
                property: "dragAreaWidth"
285
                property: "dragAreaWidth"
1260
467
                value: shell.edgeSize
286
                value: shell.edgeSize
1261
468
            }
287
            }
1262
469
            Binding {
288
            Binding {
1263
470
                target: applicationsDisplayLoader.item
289
                target: applicationsDisplayLoader.item
1264
290
                property: "maximizedAppTopMargin"
1265
291
                // Not just using panel.panelHeight as that changes depending on the focused app.
1266
292
                value: panel.indicators.panelHeight
1267
293
            }
1268
294
            Binding {
1269
295
                target: applicationsDisplayLoader.item
1270
296
                property: "interactive"
1271
297
                value: stages.roughlyFullyShown && !greeter.shown && !lockscreen.shown
1272
298
                       && panel.indicators.fullyClosed
1273
299
            }
1274
300
            Binding {
1275
301
                target: applicationsDisplayLoader.item
1276
471
                property: "spreadEnabled"
302
                property: "spreadEnabled"
1277
472
                value: greeter.fakeActiveForApp === "" // to support emergency dialer hack
303
                value: greeter.fakeActiveForApp === "" // to support emergency dialer hack
1278
473
            }
304
            }
1279
474
        }
305
        }
1280
475
    }
306
    }
1281
476
307
1282
308
    InputMethod {
1283
309
        id: inputMethod
1284
310
        objectName: "inputMethod"
1285
311
        anchors { fill: parent; topMargin: panel.panelHeight }
1286
312
        z: notifications.useModal || panel.indicators.shown ? overlay.z + 1 : overlay.z - 1
1287
313
    }
1288
314
1289
315
    Connections {
1290
316
        target: SurfaceManager
1291
317
        onSurfaceCreated: {
1292
318
            if (surface.type == MirSurfaceItem.InputMethod) {
1293
319
                inputMethod.surface = surface;
1294
320
            }
1295
321
        }
1296
322
1297
323
        onSurfaceDestroyed: {
1298
324
            if (inputMethod.surface == surface) {
1299
325
                inputMethod.surface = null;
1300
326
                surface.parent = null;
1301
327
            }
1302
328
            if (!surface.parent) {
1303
329
                // there's no one displaying it. delete it right away
1304
330
                surface.release();
1305
331
            }
1306
332
        }
1307
333
    }
1308
334
1309
477
    Lockscreen {
335
    Lockscreen {
1310
478
        id: lockscreen
336
        id: lockscreen
1311
479
        objectName: "lockscreen"
337
        objectName: "lockscreen"
1312
@@ -486,7 +344,7 @@
1313
486
        showAnimation: StandardAnimation { property: "opacity"; to: 1 }
344
        showAnimation: StandardAnimation { property: "opacity"; to: 1 }
1314
487
        hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
345
        hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
1315
488
        y: panel.panelHeight
346
        y: panel.panelHeight
1317
489
        x: required ? 0 : - width
347
        visible: required
1318
490
        width: parent.width
348
        width: parent.width
1319
491
        height: parent.height - panel.panelHeight
349
        height: parent.height - panel.panelHeight
1320
492
        background: shell.background
350
        background: shell.background
1321
@@ -566,6 +424,7 @@
1322
566
            StandardAnimation {}
424
            StandardAnimation {}
1323
567
        }
425
        }
1324
568
426
1325
427
        property bool fullyShown: showProgress === 1.0
1326
569
        readonly property real showProgress: MathUtils.clamp((1 - x/width) + greeter.showProgress - 1, 0, 1)
428
        readonly property real showProgress: MathUtils.clamp((1 - x/width) + greeter.showProgress - 1, 0, 1)
1327
570
        onShowProgressChanged: if (LightDM.Greeter.promptless && showProgress === 0) greeter.login()
429
        onShowProgressChanged: if (LightDM.Greeter.promptless && showProgress === 0) greeter.login()
1328
571
430
1329
@@ -632,12 +491,6 @@
1330
632
        }
491
        }
1331
633
    }
492
    }
1332
634
493
1333
635
    InputFilterArea {
1334
636
        anchors.fill: parent
1335
637
        blockInput: ApplicationManager.focusedApplicationId.length === 0 || greeter.shown || lockscreen.shown || launcher.shown
1336
638
                    || panel.indicators.shown
1337
639
    }
1338
640
1339
641
    Connections {
494
    Connections {
1340
642
        id: powerConnection
495
        id: powerConnection
1341
643
        target: Powerd
496
        target: Powerd
1342
@@ -680,7 +533,7 @@
1343
680
            return;
533
            return;
1344
681
        }
534
        }
1345
682
535
1347
683
        if (stages.shown && !stages.overlayMode && !stages.locked) {
536
        if (!stages.locked) {
1348
684
            stages.hide();
537
            stages.hide();
1349
685
            launcher.fadeOut();
538
            launcher.fadeOut();
1350
686
        } else {
539
        } else {
1351
@@ -695,6 +548,7 @@
1352
695
548
1353
696
    Item {
549
    Item {
1354
697
        id: overlay
550
        id: overlay
1355
551
        z: 10
1356
698
552
1357
699
        anchors.fill: parent
553
        anchors.fill: parent
1358
700
554
1359
@@ -709,29 +563,13 @@
1360
709
                width: parent.width > units.gu(60) ? units.gu(40) : parent.width
563
                width: parent.width > units.gu(60) ? units.gu(40) : parent.width
1361
710
                panelHeight: units.gu(3)
564
                panelHeight: units.gu(3)
1362
711
            }
565
            }
1386
712
            property string focusedAppId: ApplicationManager.focusedApplicationId
566
1387
713
            property var focusedApplication: ApplicationManager.findApplication(focusedAppId)
567
            property bool topmostApplicationIsFullscreen:
1388
714
            fullscreenMode: (focusedApplication && stages.fullscreen && !LightDM.Greeter.active) || greeter.fakeActiveForApp !== ""
568
                ApplicationManager.focusedApplicationId &&
1389
715
569
                    ApplicationManager.findApplication(ApplicationManager.focusedApplicationId).fullscreen
1390
716
            InputFilterArea {
570
1391
717
                anchors {
571
            fullscreenMode: (stages.roughlyFullyShown && topmostApplicationIsFullscreen
1392
718
                    top: parent.top
572
                    && !LightDM.Greeter.active) || greeter.fakeActiveForApp !== ""
1370
719
                    left: parent.left
1371
720
                    right: parent.right
1372
721
                }
1373
722
                height: (panel.fullscreenMode) ? shell.edgeSize : panel.panelHeight
1374
723
                blockInput: true
1375
724
            }
1376
725
        }
1377
726
1378
727
        InputFilterArea {
1379
728
            blockInput: launcher.shown
1380
729
            anchors {
1381
730
                top: parent.top
1382
731
                bottom: parent.bottom
1383
732
                left: parent.left
1384
733
            }
1385
734
            width: launcher.width
1393
735
        }
573
        }
1394
736
574
1395
737
        Launcher {
575
        Launcher {
1396
@@ -774,11 +612,6 @@
1397
774
            MouseArea {
612
            MouseArea {
1398
775
                anchors.fill: parent
613
                anchors.fill: parent
1399
776
            }
614
            }
1400
777
1401
778
            InputFilterArea {
1402
779
                anchors.fill: parent
1403
780
                blockInput: modalNotificationBackground.visible
1404
781
            }
1405
782
        }
615
        }
1406
783
616
1407
784
        Notifications {
617
        Notifications {
1408
@@ -804,36 +637,7 @@
1409
804
                    PropertyChanges { target: notifications; width: units.gu(38) }
637
                    PropertyChanges { target: notifications; width: units.gu(38) }
1410
805
                }
638
                }
1411
806
            ]
639
            ]
1442
807
640
        }
1413
808
            InputFilterArea {
1414
809
                anchors { left: parent.left; right: parent.right }
1415
810
                height: parent.contentHeight
1416
811
                blockInput: height > 0
1417
812
            }
1418
813
        }
1419
814
    }
1420
815
1421
816
    focus: true
1422
817
    onFocusChanged: if (!focus) forceActiveFocus();
1423
818
1424
819
    InputFilterArea {
1425
820
        anchors {
1426
821
            top: parent.top
1427
822
            bottom: parent.bottom
1428
823
            left: parent.left
1429
824
        }
1430
825
        width: shell.edgeSize
1431
826
        blockInput: true
1432
827
    }
1433
828
1434
829
    InputFilterArea {
1435
830
        anchors {
1436
831
            top: parent.top
1437
832
            bottom: parent.bottom
1438
833
            right: parent.right
1439
834
        }
1440
835
        width: shell.edgeSize
1441
836
        blockInput: true
1443
837
    }
641
    }
1444
838
642
1445
839
    Binding {
643
    Binding {
1446
@@ -842,24 +646,22 @@
1447
842
        value: "unity8"
646
        value: "unity8"
1448
843
    }
647
    }
1449
844
648
1463
845
    OSKController {
649
    Dialogs {
1464
846
        anchors.topMargin: panel.panelHeight
650
        id: dialogs
1465
847
        anchors.fill: parent // as needs to know the geometry of the shell
651
        anchors.fill: parent
1466
848
    }
652
        z: overlay.z + 10
1467
849
653
        onPowerOffClicked: {
1468
850
    //FIXME: This should be handled in the input stack, keyboard shouldnt propagate
654
            shutdownFadeOutRectangle.enabled = true;
1469
851
    MouseArea {
655
            shutdownFadeOutRectangle.visible = true;
1470
852
        anchors.bottom: parent.bottom
656
            shutdownFadeOut.start();
1471
853
        anchors.left: parent.left
657
        }
1459
854
        anchors.right: parent.right
1460
855
        height: ApplicationManager.keyboardVisible ? ApplicationManager.keyboardHeight : 0
1461
856
1462
857
        enabled: ApplicationManager.keyboardVisible
1472
858
    }
658
    }
1473
859
659
1474
860
    Label {
660
    Label {
1475
661
        id: alphaDisclaimerLabel
1476
861
        anchors.centerIn: parent
662
        anchors.centerIn: parent
1477
862
        visible: ApplicationManager.fake ? ApplicationManager.fake : false
663
        visible: ApplicationManager.fake ? ApplicationManager.fake : false
1478
664
        z: dialogs.z + 10
1479
863
        text: "EARLY ALPHA\nNOT READY FOR USE"
665
        text: "EARLY ALPHA\nNOT READY FOR USE"
1480
864
        color: "lightgrey"
666
        color: "lightgrey"
1481
865
        opacity: 0.2
667
        opacity: 0.2
1482
@@ -873,6 +675,7 @@
1483
873
675
1484
874
    EdgeDemo {
676
    EdgeDemo {
1485
875
        id: edgeDemo
677
        id: edgeDemo
1486
678
        z: alphaDisclaimerLabel.z + 10
1487
876
        greeter: greeter
679
        greeter: greeter
1488
877
        launcher: launcher
680
        launcher: launcher
1489
878
        dash: dash
681
        dash: dash
1490
@@ -885,35 +688,9 @@
1491
885
        onShowHome: showHome()
688
        onShowHome: showHome()
1492
886
    }
689
    }
1493
887
690
1494
888
    Keys.onPressed: {
1495
889
        if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
1496
890
            if (!powerKeyTimer.running) {
1497
891
                powerKeyTimer.start();
1498
892
            }
1499
893
            event.accepted = true;
1500
894
        }
1501
895
    }
1502
896
1503
897
    Keys.onReleased: {
1504
898
        if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
1505
899
            powerKeyTimer.stop();
1506
900
            event.accepted = true;
1507
901
        }
1508
902
    }
1509
903
1510
904
    Timer {
1511
905
        id: powerKeyTimer
1512
906
        interval: 2000
1513
907
        repeat: false
1514
908
        triggeredOnStart: false
1515
909
1516
910
        onTriggered: {
1517
911
            stages.showPowerDialog();
1518
912
        }
1519
913
    }
1520
914
1521
915
    Rectangle {
691
    Rectangle {
1522
916
        id: shutdownFadeOutRectangle
692
        id: shutdownFadeOutRectangle
1523
693
        z: edgeDemo.z + 10
1524
917
        enabled: false
694
        enabled: false
1525
918
        visible: false
695
        visible: false
1526
919
        color: "black"
696
        color: "black"
1527
@@ -930,4 +707,5 @@
1528
930
            }
707
            }
1529
931
        }
708
        }
1530
932
    }
709
    }
1531
710
1532
933
}
711
}
1533
934
712
1534
=== added directory 'qml/Stages/Animations'
1535
=== added file 'qml/Stages/Animations/BaseSurfaceAnimation.qml'
1536
--- qml/Stages/Animations/BaseSurfaceAnimation.qml	1970-01-01 00:00:00 +0000
1537
+++ qml/Stages/Animations/BaseSurfaceAnimation.qml	2014-07-29 14:07:22 +0000
1538
@@ -0,0 +1,93 @@
1539
1
/*
1540
2
 * Copyright (C) 2014 Canonical, Ltd.
1541
3
 *
1542
4
 * This program is free software; you can redistribute it and/or modify
1543
5
 * it under the terms of the GNU General Public License as published by
1544
6
 * the Free Software Foundation; version 3.
1545
7
 *
1546
8
 * This program is distributed in the hope that it will be useful,
1547
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1548
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1549
11
 * GNU General Public License for more details.
1550
12
 *
1551
13
 * You should have received a copy of the GNU General Public License
1552
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1553
15
 */
1554
16
1555
17
import QtQuick 2.0
1556
18
1557
19
/* This is the base case for surface animations, used when adding/removing * child surfaces.
1558
20
 * The class is meant to be overridden and changes/animations provided for state changes.
1559
21
 * NB. It is important to release the surface at the end of the "out" animation.
1560
22
 *
1561
23
 * Example - Simple fade in/out
1562
24
 *
1563
25
 * BaseSurfaceAnimation {
1564
26
 *     outChanges: [ PropertyChanges { target: animation.surface; opacity: 0.0 } ]
1565
27
 *     outAnimations: [
1566
28
           SequentialAnimation {
1567
29
 *             NumberAnimation { target: animation.surface; property: "opacity"; duration: 300 }
1568
30
 *             ScriptAction { script: { if (animation.parent.removing) animation.surface.release(); } }
1569
31
 *         }
1570
32
 *     ]
1571
33
 *
1572
34
 *     inChanges: [ PropertyChanges { target: animation.surface; opacity: 1.0 } ]
1573
35
 *     inAnimations: [ NumberAnimation { target: animation.surface; property: "opacity"; duration: 300 } ]
1574
36
 * }
1575
37
 */
1576
38
Item {
1577
39
    id: base
1578
40
    property Item surface: null
1579
41
1580
42
    // changes applied when state changes to "in"
1581
43
    property list<QtObject> outChanges
1582
44
    // transition animations when changing state to "in"
1583
45
    property list<QtObject> outAnimations
1584
46
1585
47
    // changes applied when state changes to "out"
1586
48
    property list<QtObject> inChanges
1587
49
    // transition animations when changing state to "out"
1588
50
    property list<QtObject> inAnimations
1589
51
1590
52
    function start() {
1591
53
        // "prep" state forces outChanges without transition animations.
1592
54
        state = "prep"
1593
55
        state = "in";
1594
56
    }
1595
57
    function end() {
1596
58
        state = "out";
1597
59
    }
1598
60
1599
61
    states: [
1600
62
        State {
1601
63
            name: "baseAnimation"
1602
64
            PropertyChanges { target: base.surface; anchors.fill: undefined }
1603
65
        },
1604
66
1605
67
        State {
1606
68
            name: "prep"
1607
69
            extend: "baseAnimation"
1608
70
            changes: outChanges
1609
71
        },
1610
72
        State {
1611
73
            name: "out"
1612
74
            extend: "prep"
1613
75
        },
1614
76
        State {
1615
77
            name: "in"
1616
78
            extend: "baseAnimation"
1617
79
            changes: inChanges
1618
80
        }
1619
81
    ]
1620
82
1621
83
    transitions: [
1622
84
        Transition {
1623
85
            to:  "out"
1624
86
            animations: outAnimations
1625
87
        },
1626
88
        Transition {
1627
89
            to: "in"
1628
90
            animations: inAnimations
1629
91
        }
1630
92
    ]
1631
93
}
1632
0
94
1633
=== added file 'qml/Stages/Animations/DarkenAndFadeInAnimation.qml'
1634
--- qml/Stages/Animations/DarkenAndFadeInAnimation.qml	1970-01-01 00:00:00 +0000
1635
+++ qml/Stages/Animations/DarkenAndFadeInAnimation.qml	2014-07-29 14:07:22 +0000
1636
@@ -0,0 +1,48 @@
1637
1
/*
1638
2
 * Copyright (C) 2014 Canonical, Ltd.
1639
3
 *
1640
4
 * This program is free software; you can redistribute it and/or modify
1641
5
 * it under the terms of the GNU General Public License as published by
1642
6
 * the Free Software Foundation; version 3.
1643
7
 *
1644
8
 * This program is distributed in the hope that it will be useful,
1645
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1646
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1647
11
 * GNU General Public License for more details.
1648
12
 *
1649
13
 * You should have received a copy of the GNU General Public License
1650
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1651
15
 */
1652
16
1653
17
import QtQuick 2.0
1654
18
import Ubuntu.Components 1.1
1655
19
1656
20
BaseSurfaceAnimation {
1657
21
    id: animation
1658
22
1659
23
    property Rectangle darkenItem: Rectangle {
1660
24
        parent: animation.surface.parent
1661
25
        anchors.fill: parent
1662
26
        color: Qt.rgba(0,0,0,0.0)
1663
27
    }
1664
28
1665
29
    outChanges: [ PropertyChanges { target: animation.surface; opacity: 0.0 } ]
1666
30
    outAnimations: [
1667
31
        SequentialAnimation {
1668
32
            UbuntuNumberAnimation { target: animation.surface; property: "opacity"; duration: UbuntuAnimation.FastDuration }
1669
33
            ColorAnimation { target: darkenItem; duration: UbuntuAnimation.FastDuration }
1670
34
            ScriptAction { script: { if (animation.parent.removing) animation.surface.release(); } }
1671
35
        }
1672
36
    ]
1673
37
1674
38
    inChanges: [
1675
39
        PropertyChanges { target: darkenItem; color: Qt.rgba(0,0,0,0.7) },
1676
40
        PropertyChanges { target: animation.surface; opacity: 1.0 }
1677
41
    ]
1678
42
    inAnimations: [
1679
43
        SequentialAnimation {
1680
44
            ColorAnimation { target: darkenItem; duration: UbuntuAnimation.FastDuration }
1681
45
            UbuntuNumberAnimation { target: animation.surface; property: "opacity"; duration: UbuntuAnimation.FastDuration }
1682
46
        }
1683
47
    ]
1684
48
}
1685
0
49
1686
=== added file 'qml/Stages/Animations/SwipeFromBottomAnimation.qml'
1687
--- qml/Stages/Animations/SwipeFromBottomAnimation.qml	1970-01-01 00:00:00 +0000
1688
+++ qml/Stages/Animations/SwipeFromBottomAnimation.qml	2014-07-29 14:07:22 +0000
1689
@@ -0,0 +1,48 @@
1690
1
/*
1691
2
 * Copyright (C) 2014 Canonical, Ltd.
1692
3
 *
1693
4
 * This program is free software; you can redistribute it and/or modify
1694
5
 * it under the terms of the GNU General Public License as published by
1695
6
 * the Free Software Foundation; version 3.
1696
7
 *
1697
8
 * This program is distributed in the hope that it will be useful,
1698
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1699
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1700
11
 * GNU General Public License for more details.
1701
12
 *
1702
13
 * You should have received a copy of the GNU General Public License
1703
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1704
15
 */
1705
16
1706
17
import QtQuick 2.0
1707
18
1708
19
BaseSurfaceAnimation {
1709
20
    id: animation
1710
21
1711
22
    outChanges: [ AnchorChanges { target: animation.surface; anchors.top: animation.parent.bottom } ]
1712
23
    outAnimations: [
1713
24
        SequentialAnimation {
1714
25
            PropertyAction { target: animation.parent; property: "clip"; value: true }
1715
26
            AnchorAnimation { easing.type: Easing.InOutQuad; duration: 400 }
1716
27
            PropertyAction { target: animation.surface; property: "visible"; value: !animation.parent.removing }
1717
28
            PropertyAction { target: animation.parent; property: "clip"; value: false }
1718
29
            ScriptAction { script: { if (animation.parent.removing) animation.surface.release(); } }
1719
30
        }
1720
31
    ]
1721
32
1722
33
    inChanges: [
1723
34
        AnchorChanges {
1724
35
            target: animation.surface;
1725
36
            anchors.top: animation.parent.top
1726
37
            anchors.right: undefined
1727
38
            anchors.bottom: undefined
1728
39
            anchors.left: undefined
1729
40
        } ]
1730
41
    inAnimations: [
1731
42
        SequentialAnimation {
1732
43
            PropertyAction { target: animation.parent; property: "clip"; value: true }
1733
44
            AnchorAnimation { easing.type: Easing.InOutQuad; duration: 400 }
1734
45
            PropertyAction { target: animation.parent; property: "clip"; value: false }
1735
46
        }
1736
47
    ]
1737
48
}
1738
0
49
1739
=== added file 'qml/Stages/Animations/SwipeUpAnimation.qml'
1740
--- qml/Stages/Animations/SwipeUpAnimation.qml	1970-01-01 00:00:00 +0000
1741
+++ qml/Stages/Animations/SwipeUpAnimation.qml	2014-07-29 14:07:22 +0000
1742
@@ -0,0 +1,49 @@
1743
1
/*
1744
2
 * Copyright (C) 2014 Canonical, Ltd.
1745
3
 *
1746
4
 * This program is free software; you can redistribute it and/or modify
1747
5
 * it under the terms of the GNU General Public License as published by
1748
6
 * the Free Software Foundation; version 3.
1749
7
 *
1750
8
 * This program is distributed in the hope that it will be useful,
1751
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1752
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1753
11
 * GNU General Public License for more details.
1754
12
 *
1755
13
 * You should have received a copy of the GNU General Public License
1756
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1757
15
 */
1758
16
1759
17
import QtQuick 2.0
1760
18
1761
19
BaseSurfaceAnimation {
1762
20
    id: animation
1763
21
1764
22
    outAnimations: [
1765
23
        SequentialAnimation {
1766
24
            PropertyAction { target: animation.parent; property: "clip"; value: true }
1767
25
            PropertyAction { target: animation.surface; property: "visible"; value: true }
1768
26
            AnchorAnimation { easing.type: Easing.InOutQuad; duration: 400 }
1769
27
            PropertyAction { target: animation.parent; property: "clip"; value: false }
1770
28
            ScriptAction { script: { if (animation.parent.removing) animation.surface.release(); } }
1771
29
        }
1772
30
    ]
1773
31
1774
32
    inChanges: [
1775
33
        AnchorChanges {
1776
34
            target: animation.surface;
1777
35
            anchors.top: undefined
1778
36
            anchors.right: undefined
1779
37
            anchors.bottom: animation.parent.top
1780
38
            anchors.left: undefined
1781
39
        }
1782
40
    ]
1783
41
    inAnimations: [
1784
42
        SequentialAnimation {
1785
43
            PropertyAction { target: animation.parent; property: "clip"; value: true }
1786
44
            AnchorAnimation { easing.type: Easing.InOutQuad; duration: 400 }
1787
45
            PropertyAction { target: animation.surface; property: "visible"; value: false}
1788
46
            PropertyAction { target: animation.parent; property: "clip"; value: false }
1789
47
        }
1790
48
    ]
1791
49
}
1792
0
50
1793
=== modified file 'qml/Stages/PhoneStage.qml'
1794
--- qml/Stages/PhoneStage.qml	2014-06-24 23:52:12 +0000
1795
+++ qml/Stages/PhoneStage.qml	2014-07-29 14:07:22 +0000
1796
@@ -18,7 +18,6 @@
1797
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 0.1
1798
19
import Ubuntu.Gestures 0.1
19
import Ubuntu.Gestures 0.1
1799
20
import Unity.Application 0.1
20
import Unity.Application 0.1
1800
21
import LightDM 0.1 as LightDM
1801
22
import Utils 0.1
21
import Utils 0.1
1802
23
import "../Components"
22
import "../Components"
1803
24
23
1804
@@ -26,88 +25,51 @@
1805
26
    id: root
25
    id: root
1806
27
26
1807
28
    // Controls to be set from outside
27
    // Controls to be set from outside
1808
29
    property bool shown: false
1809
30
    property bool moving: false
1810
31
    property int dragAreaWidth
28
    property int dragAreaWidth
1811
29
    property real maximizedAppTopMargin
1812
30
    property bool interactive
1813
31
    property bool spreadEnabled: true // If false, animations and right edge will be disabled
1814
32
32
1815
33
    // State information propagated to the outside
33
    // State information propagated to the outside
1824
34
    readonly property bool painting: mainScreenshotImage.visible || fadeInScreenshotImage.visible || appSplash.visible || spreadView.visible
34
    readonly property bool locked: spreadView.phase == 2
1817
35
    property bool fullscreen: priv.focusedApplication ? priv.focusedApplication.fullscreen : false
1818
36
    property bool locked: spreadView.visible
1819
37
    property bool spreadEnabled: true
1820
38
1821
39
    // Not used for PhoneStage, only useful for SideStage and similar
1822
40
    property bool overlayMode: false
1823
41
    property int overlayWidth: 0
1825
42
35
1826
43
    function select(appId) {
36
    function select(appId) {
1828
44
        spreadView.snapTo(priv.indexOf(appId))
37
        spreadView.snapTo(priv.indexOf(appId));
1829
45
    }
38
    }
1830
46
39
1843
47
    onMovingChanged: {
40
    onWidthChanged: {
1844
48
        if (moving) {
41
        spreadView.selectedIndex = -1;
1845
49
            if (ApplicationManager.focusedApplicationId) {
42
        spreadView.phase = 0;
1846
50
                priv.requestNewScreenshot();
43
        spreadView.contentX = -spreadView.shift;
1835
51
            } else {
1836
52
                mainScreenshotImage.anchors.leftMargin = 0;
1837
53
                mainScreenshotImage.source = ApplicationManager.get(0).screenshot;
1838
54
                mainScreenshotImage.visible = true;
1839
55
            }
1840
56
        } else {
1841
57
            mainScreenshotImage.visible = false;
1842
58
        }
1847
59
    }
44
    }
1848
60
45
1849
61
    Connections {
46
    Connections {
1850
62
        target: ApplicationManager
47
        target: ApplicationManager
1851
63
48
1852
64
        onFocusRequested: {
49
        onFocusRequested: {
1854
65
            if (spreadView.visible) {
50
            if (spreadView.phase > 0) {
1855
66
                spreadView.snapTo(priv.indexOf(appId));
51
                spreadView.snapTo(priv.indexOf(appId));
1856
67
            } else {
52
            } else {
1857
68
                priv.switchToApp(appId);
53
                priv.switchToApp(appId);
1858
69
            }
54
            }
1859
70
        }
55
        }
1860
71
56
1861
72
        onFocusedApplicationIdChanged: {
1862
73
            if (ApplicationManager.focusedApplicationId.length > 0) {
1863
74
                if (priv.secondApplicationStarting || priv.applicationStarting) {
1864
75
                    appSplashTimer.restart();
1865
76
                } else {
1866
77
                    var application = priv.focusedApplication;
1867
78
                    root.fullscreen = application.fullscreen;
1868
79
                    mainScreenshotImage.source = application.screenshot;
1869
80
                }
1870
81
            } else {
1871
82
                spreadView.selectedIndex = -1;
1872
83
                spreadView.phase = 0;
1873
84
                spreadView.contentX = -spreadView.shift;
1874
85
            }
1875
86
        }
1876
87
1877
88
        onApplicationAdded: {
57
        onApplicationAdded: {
1882
89
            if (!priv.focusedApplication) {
58
            if (spreadView.phase == 2) {
1883
90
                mainScreenshotImage.source = "";
59
                spreadView.snapTo(ApplicationManager.count - 1);
1880
91
                mainScreenshotImage.visible = false;
1881
92
                priv.applicationStarting = true;
1884
93
            } else {
60
            } else {
1893
94
                mainScreenshotImage.source = "";
61
                spreadView.phase = 0;
1894
95
                priv.newFocusedAppId = appId;
62
                spreadView.contentX = -spreadView.shift;
1895
96
                priv.secondApplicationStarting = true;
63
                priv.switchToApp(appId);
1888
97
                priv.requestNewScreenshot();
1889
98
            }
1890
99
1891
100
            if (spreadView.visible) {
1892
101
                spreadView.snapTo(0);
1896
102
            }
64
            }
1897
103
        }
65
        }
1898
104
66
1899
105
        onApplicationRemoved: {
67
        onApplicationRemoved: {
1905
106
            if (ApplicationManager.count == 0) {
68
            // Unless we're closing the app ourselves in the spread,
1906
107
                mainScreenshotImage.source = ""
69
            // lets make sure the spread doesn't mess up by the changing app list.
1907
108
                mainScreenshotImage.visible = false;
70
            if (spreadView.closingIndex == -1) {
1908
109
            } else {
71
                spreadView.phase = 0;
1909
110
                mainScreenshotImage.source = ApplicationManager.get(0).screenshot;
72
                spreadView.contentX = -spreadView.shift;
1910
111
            }
73
            }
1911
112
        }
74
        }
1912
113
    }
75
    }
1913
@@ -117,46 +79,11 @@
1914
117
79
1915
118
        property string focusedAppId: ApplicationManager.focusedApplicationId
80
        property string focusedAppId: ApplicationManager.focusedApplicationId
1916
119
        property var focusedApplication: ApplicationManager.findApplication(focusedAppId)
81
        property var focusedApplication: ApplicationManager.findApplication(focusedAppId)
1917
120
        property url focusedScreenshot: focusedApplication ? focusedApplication.screenshot : ""
1918
121
1919
122
        property bool waitingForScreenshot: false
1920
123
1921
124
        property bool applicationStarting: false
1922
125
        property bool secondApplicationStarting: false
1923
126
1924
127
        property string newFocusedAppId
1925
128
1926
129
        onFocusedScreenshotChanged: {
1927
130
            if (root.moving && priv.waitingForScreenshot) {
1928
131
                mainScreenshotImage.anchors.leftMargin = 0;
1929
132
                mainScreenshotImage.source = priv.focusedScreenshot
1930
133
                mainScreenshotImage.visible = true;
1931
134
            } else if (priv.secondApplicationStarting && priv.waitingForScreenshot) {
1932
135
                applicationSwitchingAnimation.start();
1933
136
                if (LightDM.Greeter.active && !LightDM.Greeter.promptless) {
1934
137
                    // When greeter is up, no fancy animations, since user may
1935
138
                    // glimpse an app they shouldn't
1936
139
                    applicationSwitchingAnimation.complete();
1937
140
                }
1938
141
            }
1939
142
            waitingForScreenshot = false;
1940
143
        }
1941
144
1942
145
        function requestNewScreenshot() {
1943
146
            waitingForScreenshot = true;
1944
147
            ApplicationManager.updateScreenshot(focusedAppId);
1945
148
        }
1946
149
82
1947
150
        function switchToApp(appId) {
83
        function switchToApp(appId) {
1948
151
            if (priv.focusedAppId) {
84
            if (priv.focusedAppId) {
1957
152
                priv.newFocusedAppId = appId;
85
                spreadView.focusChanging = true;
1958
153
                root.fullscreen = ApplicationManager.findApplication(appId).fullscreen;
86
                ApplicationManager.focusApplication(appId);
1951
154
                applicationSwitchingAnimation.start();
1952
155
                if (LightDM.Greeter.active && !LightDM.Greeter.promptless) {
1953
156
                    // When greeter is up, no fancy animations, since user may
1954
157
                    // glimpse an app they shouldn't
1955
158
                    applicationSwitchingAnimation.complete();
1956
159
                }
1959
160
            } else {
87
            } else {
1960
161
                ApplicationManager.focusApplication(appId);
88
                ApplicationManager.focusApplication(appId);
1961
162
            }
89
            }
1962
@@ -173,158 +100,6 @@
1963
173
100
1964
174
    }
101
    }
1965
175
102
1966
176
    // FIXME: the signal connections seems to get lost.
1967
177
    Connections {
1968
178
        target: priv.focusedApplication
1969
179
        onScreenshotChanged: priv.focusedScreenshot = priv.focusedApplication.screenshot
1970
180
    }
1971
181
    Binding {
1972
182
        target: root
1973
183
        property: "fullscreen"
1974
184
        value: priv.focusedApplication ? priv.focusedApplication.fullscreen : false
1975
185
    }
1976
186
1977
187
    Timer {
1978
188
        id: appSplashTimer
1979
189
        // FIXME: We really need to show something meaningful in the app surface instead of guessing
1980
190
        // when it might be ready
1981
191
        interval: 500
1982
192
        repeat: false
1983
193
        onTriggered: {
1984
194
            priv.applicationStarting = false;
1985
195
            priv.secondApplicationStarting = false;
1986
196
        }
1987
197
    }
1988
198
1989
199
    SequentialAnimation {
1990
200
        id: applicationSwitchingAnimation
1991
201
        // setup
1992
202
        PropertyAction { target: mainScreenshotImage; property: "anchors.leftMargin"; value: 0 }
1993
203
        PropertyAction { target: mainScreenshotImage; property: "source"; value: priv.focusedScreenshot }
1994
204
        PropertyAction { targets: [mainScreenshotImage, fadeInScreenshotImage]; property: "visible"; value: true }
1995
205
        PropertyAction { target: fadeInScreenshotImage; property: "source"; value: {
1996
206
                var newFocusedApp = ApplicationManager.findApplication(priv.newFocusedAppId);
1997
207
                return newFocusedApp ? newFocusedApp.screenshot : "" }
1998
208
        }
1999
209
        PropertyAction { target: fadeInScreenshotImage; property: "opacity"; value: 0 }
2000
210
        PropertyAction { target: fadeInScreenshotImage; property: "scale"; value: .8 }
2001
211
2002
212
2003
213
        // The actual animation
2004
214
        ParallelAnimation {
2005
215
            UbuntuNumberAnimation { target: mainScreenshotImage; property: "anchors.leftMargin"; to: root.width; duration: UbuntuAnimation.SlowDuration }
2006
216
            UbuntuNumberAnimation { target: fadeInScreenshotImage; properties: "opacity,scale"; to: 1; duration: UbuntuAnimation.SlowDuration }
2007
217
        }
2008
218
2009
219
        // restore stuff
2010
220
        ScriptAction { script: ApplicationManager.focusApplication(priv.newFocusedAppId); }
2011
221
        PropertyAction { target: fadeInScreenshotImage; property: "visible"; value: false }
2012
222
        PropertyAction { target: mainScreenshotImage; property: "visible"; value: false }
2013
223
    }
2014
224
2015
225
    // FIXME: Drop this and make the imageprovider show a splashscreen instead
2016
226
    Rectangle {
2017
227
        id: appSplash2
2018
228
        anchors.fill: parent
2019
229
        color: "black"
2020
230
        visible: priv.secondApplicationStarting
2021
231
    }
2022
232
    Image {
2023
233
        id: fadeInScreenshotImage
2024
234
        anchors { left: parent.left; bottom: parent.bottom }
2025
235
        width: parent.width
2026
236
        scale: .7
2027
237
        visible: false
2028
238
    }
2029
239
2030
240
    Rectangle {
2031
241
        id: appSplash
2032
242
        anchors.fill: parent
2033
243
        color: "black"
2034
244
        visible: priv.applicationStarting
2035
245
2036
246
        WaitingDots {
2037
247
        }
2038
248
    }
2039
249
    Image {
2040
250
        id: mainScreenshotImage
2041
251
        anchors { left: parent.left; bottom: parent.bottom }
2042
252
        width: parent.width
2043
253
        visible: false
2044
254
    }
2045
255
2046
256
    EdgeDragArea {
2047
257
        id: spreadDragArea
2048
258
        direction: Direction.Leftwards
2049
259
        enabled: ApplicationManager.count > 1 && spreadView.phase != 2 && root.spreadEnabled
2050
260
2051
261
        anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
2052
262
        width: root.dragAreaWidth
2053
263
2054
264
        // Sitting at the right edge of the screen, this EdgeDragArea directly controls the spreadView when
2055
265
        // attachedToView is true. When the finger movement passes positionMarker3 we detach it from the
2056
266
        // spreadView and make the spreadView snap to positionMarker4.
2057
267
        property bool attachedToView: true
2058
268
2059
269
        property var gesturePoints: new Array()
2060
270
2061
271
        onTouchXChanged: {
2062
272
            if (!dragging && !priv.waitingForScreenshot) {
2063
273
                // Initial touch. Let's update the screenshot and reset the spreadView to the starting position.
2064
274
                priv.requestNewScreenshot();
2065
275
                spreadView.phase = 0;
2066
276
                spreadView.contentX = -spreadView.shift;
2067
277
            }
2068
278
            if (dragging && attachedToView) {
2069
279
                // Gesture recognized. Let's move the spreadView with the finger
2070
280
                spreadView.contentX = -touchX - spreadView.shift;
2071
281
            }
2072
282
            if (attachedToView && spreadView.shiftedContentX >= spreadView.width * spreadView.positionMarker3) {
2073
283
                // We passed positionMarker3. Detach from spreadView and snap it.
2074
284
                attachedToView = false;
2075
285
                spreadView.snap();
2076
286
            }
2077
287
            gesturePoints.push(touchX);
2078
288
        }
2079
289
2080
290
        onStatusChanged: {
2081
291
            if (status == DirectionalDragArea.Recognized) {
2082
292
                attachedToView = true;
2083
293
            }
2084
294
        }
2085
295
2086
296
        onDraggingChanged: {
2087
297
            if (dragging) {
2088
298
                // Gesture recognized. Start recording this gesture
2089
299
                gesturePoints = [];
2090
300
                return;
2091
301
            }
2092
302
2093
303
            // Ok. The user released. Find out if it was a one-way movement.
2094
304
            var oneWayFlick = true;
2095
305
            var smallestX = spreadDragArea.width;
2096
306
            for (var i = 0; i < gesturePoints.length; i++) {
2097
307
                if (gesturePoints[i] >= smallestX) {
2098
308
                    oneWayFlick = false;
2099
309
                    break;
2100
310
                }
2101
311
                smallestX = gesturePoints[i];
2102
312
            }
2103
313
            gesturePoints = [];
2104
314
2105
315
            if (oneWayFlick && spreadView.shiftedContentX > units.gu(2) &&
2106
316
                    spreadView.shiftedContentX < spreadView.positionMarker1 * spreadView.width) {
2107
317
                // If it was a short one-way movement, do the Alt+Tab switch
2108
318
                // no matter if we didn't cross positionMarker1 yet.
2109
319
                spreadView.snapTo(1);
2110
320
            } else if (!dragging && attachedToView) {
2111
321
                // otherwise snap to the closest snap position we can find
2112
322
                // (might be back to start, to app 1 or to spread)
2113
323
                spreadView.snap();
2114
324
            }
2115
325
        }
2116
326
    }
2117
327
2118
328
    Rectangle {
103
    Rectangle {
2119
329
        id: coverFlipBackground
104
        id: coverFlipBackground
2120
330
        anchors.fill: parent
105
        anchors.fill: parent
2121
@@ -332,16 +107,12 @@
2122
332
        visible: spreadView.visible
107
        visible: spreadView.visible
2123
333
    }
108
    }
2124
334
109
2125
335
    InputFilterArea {
2126
336
        anchors.fill: root
2127
337
        blockInput: spreadView.visible
2128
338
    }
2129
339
110
2130
340
    Flickable {
111
    Flickable {
2131
341
        id: spreadView
112
        id: spreadView
2132
342
        objectName: "spreadView"
113
        objectName: "spreadView"
2133
343
        anchors.fill: parent
114
        anchors.fill: parent
2135
344
        visible: spreadDragArea.status == DirectionalDragArea.Recognized || phase > 1 || snapAnimation.running
115
        interactive: (spreadDragArea.status == DirectionalDragArea.Recognized || phase > 1) && draggedIndex == -1
2136
345
        contentWidth: spreadRow.width - shift
116
        contentWidth: spreadRow.width - shift
2137
346
        contentX: -shift
117
        contentX: -shift
2138
347
118
2139
@@ -350,8 +121,8 @@
2140
350
        // that, the beginning of the gesture starts with a negative value for contentX
121
        // that, the beginning of the gesture starts with a negative value for contentX
2141
351
        // so the flickable wants to pull it into the view already. "shift" tunes the
122
        // so the flickable wants to pull it into the view already. "shift" tunes the
2142
352
        // distance where to "lock" the content.
123
        // distance where to "lock" the content.
2145
353
        property real shift: width / 2
124
        readonly property real shift: width / 2
2146
354
        property real shiftedContentX: contentX + shift
125
        readonly property real shiftedContentX: contentX + shift
2147
355
126
2148
356
        property int tileDistance: width / 4
127
        property int tileDistance: width / 4
2149
357
128
2150
@@ -375,6 +146,10 @@
2151
375
        property int phase: 0
146
        property int phase: 0
2152
376
147
2153
377
        property int selectedIndex: -1
148
        property int selectedIndex: -1
2154
149
        property int draggedIndex: -1
2155
150
        property int closingIndex: -1
2156
151
2157
152
        property bool focusChanging: false
2158
378
153
2159
379
        onShiftedContentXChanged: {
154
        onShiftedContentXChanged: {
2160
380
            switch (phase) {
155
            switch (phase) {
2161
@@ -398,9 +173,9 @@
2162
398
                snapAnimation.targetContentX = -shift;
173
                snapAnimation.targetContentX = -shift;
2163
399
                snapAnimation.start();
174
                snapAnimation.start();
2164
400
            } else if (shiftedContentX < positionMarker2 * width) {
175
            } else if (shiftedContentX < positionMarker2 * width) {
2166
401
                snapTo(1)
176
                snapTo(1);
2167
402
            } else if (shiftedContentX < positionMarker3 * width) {
177
            } else if (shiftedContentX < positionMarker3 * width) {
2169
403
                snapTo(1)
178
                snapTo(1);
2170
404
            } else if (phase < 2){
179
            } else if (phase < 2){
2171
405
                // Add 1 pixel to make sure we definitely hit positionMarker4 even with rounding errors of the animation.
180
                // Add 1 pixel to make sure we definitely hit positionMarker4 even with rounding errors of the animation.
2172
406
                snapAnimation.targetContentX = width * positionMarker4 + 1 - shift;
181
                snapAnimation.targetContentX = width * positionMarker4 + 1 - shift;
2173
@@ -408,9 +183,18 @@
2174
408
            }
183
            }
2175
409
        }
184
        }
2176
410
        function snapTo(index) {
185
        function snapTo(index) {
2177
186
            if (ApplicationManager.count <= index) {
2178
187
                // In case we're trying to snap to some non existing app, lets snap back to the first one
2179
188
                index = 0;
2180
189
            }
2181
411
            spreadView.selectedIndex = index;
190
            spreadView.selectedIndex = index;
2184
412
            root.fullscreen = ApplicationManager.get(index).fullscreen;
191
            // If we're not in full spread mode yet, always unwind to start pos
2185
413
            snapAnimation.targetContentX = -shift;
192
            // otherwise unwind up to progress 0 of the selected index
2186
193
            if (spreadView.phase < 2) {
2187
194
                snapAnimation.targetContentX = -shift;
2188
195
            } else {
2189
196
                snapAnimation.targetContentX = -shift + index * spreadView.tileDistance;
2190
197
            }
2191
414
            snapAnimation.start();
198
            snapAnimation.start();
2192
415
        }
199
        }
2193
416
200
2194
@@ -429,7 +213,8 @@
2195
429
                script: {
213
                script: {
2196
430
                    if (spreadView.selectedIndex >= 0) {
214
                    if (spreadView.selectedIndex >= 0) {
2197
431
                        ApplicationManager.focusApplication(ApplicationManager.get(spreadView.selectedIndex).appId);
215
                        ApplicationManager.focusApplication(ApplicationManager.get(spreadView.selectedIndex).appId);
2199
432
                        spreadView.selectedIndex = -1
216
2200
217
                        spreadView.selectedIndex = -1;
2201
433
                        spreadView.phase = 0;
218
                        spreadView.phase = 0;
2202
434
                        spreadView.contentX = -spreadView.shift;
219
                        spreadView.contentX = -spreadView.shift;
2203
435
                    }
220
                    }
2204
@@ -443,6 +228,15 @@
2205
443
            //  tileDistance * app count (with a minimum of 3 apps, in order to also allow moving 1 and 2 apps a bit)
228
            //  tileDistance * app count (with a minimum of 3 apps, in order to also allow moving 1 and 2 apps a bit)
2206
444
            //  + some constant value (still scales with the screen width) which looks good and somewhat fills the screen
229
            //  + some constant value (still scales with the screen width) which looks good and somewhat fills the screen
2207
445
            width: Math.max(3, ApplicationManager.count) * spreadView.tileDistance + (spreadView.width - spreadView.tileDistance) * 1.5
230
            width: Math.max(3, ApplicationManager.count) * spreadView.tileDistance + (spreadView.width - spreadView.tileDistance) * 1.5
2208
231
            Behavior on width {
2209
232
                enabled: spreadView.closingIndex >= 0
2210
233
                UbuntuNumberAnimation {}
2211
234
            }
2212
235
            onWidthChanged: {
2213
236
                if (spreadView.closingIndex >= 0) {
2214
237
                    spreadView.contentX = Math.min(spreadView.contentX, width - spreadView.width - spreadView.shift);
2215
238
                }
2216
239
            }
2217
446
240
2218
447
            x: spreadView.contentX
241
            x: spreadView.contentX
2219
448
242
2220
@@ -462,18 +256,55 @@
2221
462
                    height: spreadView.height
256
                    height: spreadView.height
2222
463
                    selected: spreadView.selectedIndex == index
257
                    selected: spreadView.selectedIndex == index
2223
464
                    otherSelected: spreadView.selectedIndex >= 0 && !selected
258
                    otherSelected: spreadView.selectedIndex >= 0 && !selected
2224
259
                    interactive: !spreadView.interactive && spreadView.phase === 0
2225
260
                            && spreadView.shiftedContentX === 0 && root.interactive && index === 0
2226
261
                    swipeToCloseEnabled: spreadView.interactive
2227
262
                    maximizedAppTopMargin: root.maximizedAppTopMargin
2228
263
                    dropShadow: spreadView.shiftedContentX > 0 || spreadDragArea.status == DirectionalDragArea.Undecided
2229
465
264
2231
466
                    z: index
265
                    z: behavioredIndex
2232
467
                    x: index == 0 ? 0 : spreadView.width + (index - 1) * spreadView.tileDistance
266
                    x: index == 0 ? 0 : spreadView.width + (index - 1) * spreadView.tileDistance
2233
267
                    property real behavioredIndex: index
2234
268
                    Behavior on behavioredIndex {
2235
269
                        enabled: spreadView.closingIndex >= 0
2236
270
                        UbuntuNumberAnimation {
2237
271
                            onRunningChanged: {
2238
272
                                if (!running) {
2239
273
                                    spreadView.closingIndex = -1;
2240
274
                                }
2241
275
                            }
2242
276
                        }
2243
277
                    }
2244
278
2245
279
                    Behavior on x {
2246
280
                        enabled: spreadView.focusChanging && index == 0 && root.spreadEnabled
2247
281
                        UbuntuNumberAnimation {
2248
282
                            duration: UbuntuAnimation.FastDuration
2249
283
                            onRunningChanged: {
2250
284
                                if (!running) {
2251
285
                                    spreadView.focusChanging = false;
2252
286
                                }
2253
287
                            }
2254
288
                        }
2255
289
                    }
2256
468
290
2257
469
                    // Each tile has a different progress value running from 0 to 1.
291
                    // Each tile has a different progress value running from 0 to 1.
2259
470
                    // A progress value of 0 means the tile is at the right edge. 1 means the tile has reched the left edge.
292
                    // 0: means the tile is at the right edge.
2260
293
                    // 1: means the tile has finished the main animation towards the left edge.
2261
294
                    // >1: after the main animation has finished, tiles will continue to move very slowly to the left
2262
471
                    progress: {
295
                    progress: {
2264
472
                        var tileProgress = (spreadView.shiftedContentX - index * spreadView.tileDistance) / spreadView.width;
296
                        var tileProgress = (spreadView.shiftedContentX - behavioredIndex * spreadView.tileDistance) / spreadView.width;
2265
473
                        // Tile 1 needs to move directly from the beginning...
297
                        // Tile 1 needs to move directly from the beginning...
2267
474
                        if (index == 1 && spreadView.phase < 2) {
298
                        if (behavioredIndex == 1 && spreadView.phase < 2) {
2268
475
                            tileProgress += spreadView.tileDistance / spreadView.width;
299
                            tileProgress += spreadView.tileDistance / spreadView.width;
2269
476
                        }
300
                        }
2270
301
                        // Limiting progress to ~0 and 1.7 to avoid binding calculations when tiles are not
2271
302
                        // visible.
2272
303
                        // < 0 :  The tile is outside the screen on the right
2273
304
                        // > 1.7: The tile is *very* close to the left edge and covered by other tiles now.
2274
305
                        // Using 0.0001 to differentiate when a tile should still be visible (==0)
2275
306
                        // or we can hide it (< 0)
2276
307
                        tileProgress = Math.max(-0.0001, Math.min(1.7, tileProgress));
2277
477
                        return tileProgress;
308
                        return tileProgress;
2278
478
                    }
309
                    }
2279
479
310
2280
@@ -493,7 +324,7 @@
2281
493
324
2282
494
                    EasingCurve {
325
                    EasingCurve {
2283
495
                        id: snappingCurve
326
                        id: snappingCurve
2285
496
                        type: EasingCurve.OutQuad
327
                        type: EasingCurve.Linear
2286
497
                        period: 0.05
328
                        period: 0.05
2287
498
                        progress: appDelegate.progress - spreadView.positionMarker1
329
                        progress: appDelegate.progress - spreadView.positionMarker1
2288
499
                    }
330
                    }
2289
@@ -507,7 +338,84 @@
2290
507
                            }
338
                            }
2291
508
                        }
339
                        }
2292
509
                    }
340
                    }
2294
510
                }
341
2295
342
                    onClosed: {
2296
343
                        spreadView.draggedIndex = -1;
2297
344
                        spreadView.closingIndex = index;
2298
345
                        ApplicationManager.stopApplication(ApplicationManager.get(index).appId);
2299
346
                    }
2300
347
                }
2301
348
            }
2302
349
        }
2303
350
    }
2304
351
2305
352
    EdgeDragArea {
2306
353
        id: spreadDragArea
2307
354
        direction: Direction.Leftwards
2308
355
        enabled: spreadView.phase != 2 && root.spreadEnabled
2309
356
2310
357
        anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
2311
358
        width: root.dragAreaWidth
2312
359
2313
360
        // Sitting at the right edge of the screen, this EdgeDragArea directly controls the spreadView when
2314
361
        // attachedToView is true. When the finger movement passes positionMarker3 we detach it from the
2315
362
        // spreadView and make the spreadView snap to positionMarker4.
2316
363
        property bool attachedToView: true
2317
364
2318
365
        property var gesturePoints: new Array()
2319
366
2320
367
        onTouchXChanged: {
2321
368
            if (!dragging) {
2322
369
                // Initial touch. Let's reset the spreadView to the starting position.
2323
370
                spreadView.phase = 0;
2324
371
                spreadView.contentX = -spreadView.shift;
2325
372
            }
2326
373
            if (dragging && attachedToView) {
2327
374
                // Gesture recognized. Let's move the spreadView with the finger
2328
375
                spreadView.contentX = -touchX + spreadDragArea.width - spreadView.shift;
2329
376
            }
2330
377
            if (attachedToView && spreadView.shiftedContentX >= spreadView.width * spreadView.positionMarker3) {
2331
378
                // We passed positionMarker3. Detach from spreadView and snap it.
2332
379
                attachedToView = false;
2333
380
                spreadView.snap();
2334
381
            }
2335
382
            gesturePoints.push(touchX);
2336
383
        }
2337
384
2338
385
        onStatusChanged: {
2339
386
            if (status == DirectionalDragArea.Recognized) {
2340
387
                attachedToView = true;
2341
388
            }
2342
389
        }
2343
390
2344
391
        onDraggingChanged: {
2345
392
            if (dragging) {
2346
393
                // Gesture recognized. Start recording this gesture
2347
394
                gesturePoints = [];
2348
395
                return;
2349
396
            }
2350
397
2351
398
            // Ok. The user released. Find out if it was a one-way movement.
2352
399
            var oneWayFlick = true;
2353
400
            var smallestX = spreadDragArea.width;
2354
401
            for (var i = 0; i < gesturePoints.length; i++) {
2355
402
                if (gesturePoints[i] >= smallestX) {
2356
403
                    oneWayFlick = false;
2357
404
                    break;
2358
405
                }
2359
406
                smallestX = gesturePoints[i];
2360
407
            }
2361
408
            gesturePoints = [];
2362
409
2363
410
            if (oneWayFlick && spreadView.shiftedContentX > units.gu(2) &&
2364
411
                    spreadView.shiftedContentX < spreadView.positionMarker1 * spreadView.width) {
2365
412
                // If it was a short one-way movement, do the Alt+Tab switch
2366
413
                // no matter if we didn't cross positionMarker1 yet.
2367
414
                spreadView.snapTo(1);
2368
415
            } else if (!dragging && attachedToView) {
2369
416
                // otherwise snap to the closest snap position we can find
2370
417
                // (might be back to start, to app 1 or to spread)
2371
418
                spreadView.snap();
2372
511
            }
419
            }
2373
512
        }
420
        }
2374
513
    }
421
    }
2375
514
422
2376
=== removed file 'qml/Stages/SidestageHandle.qml'
2377
--- qml/Stages/SidestageHandle.qml	2014-03-04 11:49:28 +0000
2378
+++ qml/Stages/SidestageHandle.qml	1970-01-01 00:00:00 +0000
2379
@@ -1,22 +0,0 @@
2380
1
/*
2381
2
 * Copyright (C) 2013 Canonical, Ltd.
2382
3
 *
2383
4
 * This program is free software; you can redistribute it and/or modify
2384
5
 * it under the terms of the GNU General Public License as published by
2385
6
 * the Free Software Foundation; version 3.
2386
7
 *
2387
8
 * This program is distributed in the hope that it will be useful,
2388
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2389
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2390
11
 * GNU General Public License for more details.
2391
12
 *
2392
13
 * You should have received a copy of the GNU General Public License
2393
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2394
15
 */
2395
16
2396
17
import QtQuick 2.0
2397
18
import Ubuntu.Components 0.1
2398
19
2399
20
BorderImage {
2400
21
    source: "graphics/sidestage_handle.sci"
2401
22
}
2402
23
0
2403
=== added file 'qml/Stages/Splash.qml'
2404
--- qml/Stages/Splash.qml	1970-01-01 00:00:00 +0000
2405
+++ qml/Stages/Splash.qml	2014-07-29 14:07:22 +0000
2406
@@ -0,0 +1,68 @@
2407
1
/*
2408
2
 * Copyright 2014 Canonical Ltd.
2409
3
 *
2410
4
 * This program is free software; you can redistribute it and/or modify
2411
5
 * it under the terms of the GNU Lesser General Public License as published by
2412
6
 * the Free Software Foundation; version 3.
2413
7
 *
2414
8
 * This program is distributed in the hope that it will be useful,
2415
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2416
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2417
11
 * GNU Lesser General Public License for more details.
2418
12
 *
2419
13
 * You should have received a copy of the GNU Lesser General Public License
2420
14
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2421
15
*/
2422
16
2423
17
import QtQuick 2.0
2424
18
import Ubuntu.Components 0.1
2425
19
import "../Components"
2426
20
2427
21
Rectangle {
2428
22
    id: root
2429
23
    color: "black"
2430
24
2431
25
    property string name: ""
2432
26
    property url image: ""
2433
27
2434
28
    UbuntuShape {
2435
29
        id: iconShape
2436
30
        anchors.horizontalCenter: parent.horizontalCenter
2437
31
        anchors.verticalCenter: parent.verticalCenter
2438
32
        anchors.verticalCenterOffset: -units.gu(4)
2439
33
        width: units.gu(8)
2440
34
        height: units.gu(7.5)
2441
35
2442
36
        radius: "medium"
2443
37
        borderSource: "none"
2444
38
2445
39
        image: Image {
2446
40
            id: iconImage
2447
41
            sourceSize.width: iconShape.width
2448
42
            sourceSize.height: iconShape.height
2449
43
            source: root.image
2450
44
            fillMode: Image.PreserveAspectCrop
2451
45
        }
2452
46
    }
2453
47
2454
48
    Label {
2455
49
        text: root.name
2456
50
        anchors.horizontalCenter: parent.horizontalCenter
2457
51
        anchors.top: iconShape.bottom
2458
52
        anchors.topMargin: units.gu(2)
2459
53
        fontSize: "large"
2460
54
    }
2461
55
2462
56
    WaitingDots {
2463
57
        visible: parent.visible
2464
58
        anchors.horizontalCenter: parent.horizontalCenter
2465
59
        anchors.bottom: parent.bottom
2466
60
        anchors.bottomMargin: units.gu(12)
2467
61
    }
2468
62
2469
63
    MouseArea {
2470
64
        anchors.fill: parent
2471
65
        enabled: parent.visible
2472
66
        // absorb all mouse events
2473
67
    }
2474
68
}
2475
0
69
2476
=== modified file 'qml/Stages/SpreadDelegate.qml'
2477
--- qml/Stages/SpreadDelegate.qml	2014-03-19 17:29:36 +0000
2478
+++ qml/Stages/SpreadDelegate.qml	2014-07-29 14:07:22 +0000
2479
@@ -17,39 +17,203 @@
2480
17
*/
17
*/
2481
18
18
2482
19
import QtQuick 2.0
19
import QtQuick 2.0
2483
20
import Unity.Application 0.1
2484
21
import Ubuntu.Components 1.1
2485
22
import "../Components"
2486
20
23
2487
21
Item {
24
Item {
2488
22
    id: root
25
    id: root
2489
23
26
2490
27
    // to be set from outside
2491
28
    property bool interactive: true
2492
29
    property bool dropShadow: true
2493
30
    property real maximizedAppTopMargin
2494
31
    property alias swipeToCloseEnabled: dragArea.enabled
2495
32
2496
33
    readonly property bool isFullscreen: surface !== null && surfaceContainer.surface.anchors.topMargin == 0
2497
34
2498
24
    signal clicked()
35
    signal clicked()
2528
25
36
    signal closed()
2529
26
    property real topMarginProgress
37
2530
27
38
    SurfaceContainer {
2531
28
    QtObject {
39
        id: surfaceContainer
2532
29
        id: priv
40
        anchors.fill: parent
2533
30
        property real heightDifference: root.height - appImage.implicitHeight
41
        surface: model.surface
2534
31
    }
42
        property bool appHasCreatedASurface: false
2535
32
43
2536
33
    Image {
44
        onSurfaceChanged: {
2537
34
        id: dropShadow
45
            if (surface) {
2538
35
        anchors.fill: appImage
46
                if (!appHasCreatedASurface) {
2539
36
        anchors.margins: -units.gu(2)
47
                    surface.visible = false; // hide until splash screen removed
2540
37
        source: "graphics/dropshadow.png"
48
                    appHasCreatedASurface = true;
2541
38
        opacity: .4
49
                }
2542
39
    }
50
            }
2543
40
    Image {
51
        }
2544
41
        id: appImage
52
2545
42
        anchors {
53
        function revealSurface() {
2546
43
            left: parent.left;
54
            surface.visible = true;
2547
44
            bottom: parent.bottom;
55
            splashLoader.source = "";
2548
45
            top: parent.top;
56
        }
2549
46
            topMargin: priv.heightDifference * Math.max(0, 1 - root.topMarginProgress)
57
2550
47
        }
58
        Binding {
2551
48
        source: model.screenshot
59
            target: surfaceContainer.surface
2552
49
        antialiasing: true
60
            property: "anchors.topMargin"
2553
50
    }
61
            value: {
2554
51
    MouseArea {
62
                return surfaceContainer.surface.state === MirSurfaceItem.Fullscreen ? 0 : maximizedAppTopMargin;
2555
52
        anchors.fill: appImage
63
            }
2556
53
        onClicked: root.clicked()
64
        }
2557
65
2558
66
        Binding {
2559
67
            target: surface
2560
68
            property: "enabled"
2561
69
            value: root.interactive
2562
70
        }
2563
71
        Binding {
2564
72
            target: surface
2565
73
            property: "focus"
2566
74
            value: root.interactive
2567
75
        }
2568
76
2569
77
        Timer { //FIXME - need to delay removing splash screen to allow surface resize to complete
2570
78
            id: surfaceRevealDelay
2571
79
            interval: 100
2572
80
            onTriggered: surfaceContainer.revealSurface()
2573
81
        }
2574
82
2575
83
        Connections {
2576
84
            target: surface
2577
85
            // FIXME: I would rather not need to do this, but currently it doesn't get
2578
86
            // active focus without it and I don't know why.
2579
87
            onFocusChanged: forceSurfaceActiveFocusIfReady();
2580
88
            onParentChanged: forceSurfaceActiveFocusIfReady();
2581
89
            onEnabledChanged: forceSurfaceActiveFocusIfReady();
2582
90
            function forceSurfaceActiveFocusIfReady() {
2583
91
                if (surface.focus && surface.parent === surfaceContainer && surface.enabled) {
2584
92
                    surface.forceActiveFocus();
2585
93
                }
2586
94
            }
2587
95
        }
2588
96
2589
97
        BorderImage {
2590
98
            id: dropShadowImage
2591
99
            anchors {
2592
100
                fill: parent
2593
101
                leftMargin: -units.gu(2)
2594
102
                rightMargin: -units.gu(2)
2595
103
                bottomMargin: -units.gu(2)
2596
104
                topMargin: -units.gu(2) + (root.isFullscreen ? 0 : maximizedAppTopMargin)
2597
105
            }
2598
106
            source: "graphics/dropshadow.png"
2599
107
            border { left: 50; right: 50; top: 50; bottom: 50 }
2600
108
            opacity: root.dropShadow ? .4 : 0
2601
109
            Behavior on opacity { UbuntuNumberAnimation {} }
2602
110
        }
2603
111
2604
112
        transform: Translate {
2605
113
            y: dragArea.distance
2606
114
        }
2607
115
    }
2608
116
2609
117
2610
118
    StateGroup {
2611
119
        id: appSurfaceState
2612
120
        states: [
2613
121
            State {
2614
122
                name: "noSurfaceYet"
2615
123
                when: !surfaceContainer.appHasCreatedASurface
2616
124
                StateChangeScript {
2617
125
                    script: { splashLoader.setSource("Splash.qml", { "name": model.name, "image": model.icon }); }
2618
126
                }
2619
127
            },
2620
128
            State {
2621
129
                name: "hasSurface"
2622
130
                when: surfaceContainer.appHasCreatedASurface && (surfaceContainer.surface !== null)
2623
131
                StateChangeScript { script: { surfaceRevealDelay.start(); } }
2624
132
            },
2625
133
            State {
2626
134
                name: "surfaceLostButAppStillAlive"
2627
135
                when: surfaceContainer.appHasCreatedASurface && (surfaceContainer.surface === null)
2628
136
                // TODO - use app snapshot
2629
137
            }
2630
138
        ]
2631
139
        state: "noSurfaceYet"
2632
140
    }
2633
141
2634
142
    Loader {
2635
143
        id: splashLoader
2636
144
        anchors.fill: surfaceContainer
2637
145
    }
2638
146
2639
147
    DraggingArea {
2640
148
        id: dragArea
2641
149
        anchors.fill: parent
2642
150
2643
151
        property bool moving: false
2644
152
        property real distance: 0
2645
153
2646
154
        onMovingChanged: {
2647
155
            spreadView.draggedIndex = moving ? index : -1
2648
156
        }
2649
157
2650
158
        onDragValueChanged: {
2651
159
            if (!dragging) {
2652
160
                return;
2653
161
            }
2654
162
            moving = moving || Math.abs(dragValue) > units.gu(1)
2655
163
            if (moving) {
2656
164
                distance = dragValue;
2657
165
            }
2658
166
        }
2659
167
2660
168
        onClicked: {
2661
169
            if (!moving) {
2662
170
                root.clicked();
2663
171
            }
2664
172
        }
2665
173
2666
174
        onDragEnd: {
2667
175
            // velocity and distance values specified by design prototype
2668
176
            if ((dragVelocity < -units.gu(40) && distance < -units.gu(8)) || distance < -root.height / 2) {
2669
177
                animation.animate("up")
2670
178
            } else if ((dragVelocity > units.gu(40) && distance > units.gu(8)) || distance > root.height / 2) {
2671
179
                animation.animate("down")
2672
180
            } else {
2673
181
                animation.animate("center")
2674
182
            }
2675
183
        }
2676
184
2677
185
        UbuntuNumberAnimation {
2678
186
            id: animation
2679
187
            target: dragArea
2680
188
            property: "distance"
2681
189
            property bool requestClose: false
2682
190
2683
191
            function animate(direction) {
2684
192
                animation.from = dragArea.distance;
2685
193
                switch (direction) {
2686
194
                case "up":
2687
195
                    animation.to = -root.height * 1.5;
2688
196
                    requestClose = true;
2689
197
                    break;
2690
198
                case "down":
2691
199
                    animation.to = root.height * 1.5;
2692
200
                    requestClose = true;
2693
201
                    break;
2694
202
                default:
2695
203
                    animation.to = 0
2696
204
                }
2697
205
                animation.start();
2698
206
            }
2699
207
2700
208
            onRunningChanged: {
2701
209
                if (!running) {
2702
210
                    dragArea.moving = false;
2703
211
                    dragArea.distance = 0;
2704
212
                    if (requestClose) {
2705
213
                        root.closed();
2706
214
                    }
2707
215
                }
2708
216
            }
2709
217
        }
2710
54
    }
218
    }
2711
55
}
219
}
2712
56
220
2713
=== removed file 'qml/Stages/StageWithSideStage.qml'
2714
--- qml/Stages/StageWithSideStage.qml	2014-05-26 14:12:20 +0000
2715
+++ qml/Stages/StageWithSideStage.qml	1970-01-01 00:00:00 +0000
2716
@@ -1,413 +0,0 @@
2717
1
/*
2718
2
 * Copyright (C) 2014 Canonical, Ltd.
2719
3
 *
2720
4
 * This program is free software; you can redistribute it and/or modify
2721
5
 * it under the terms of the GNU General Public License as published by
2722
6
 * the Free Software Foundation; version 3.
2723
7
 *
2724
8
 * This program is distributed in the hope that it will be useful,
2725
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2726
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2727
11
 * GNU General Public License for more details.
2728
12
 *
2729
13
 * You should have received a copy of the GNU General Public License
2730
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2731
15
 */
2732
16
2733
17
import QtQuick 2.0
2734
18
import Ubuntu.Components 0.1
2735
19
import "../Components"
2736
20
import Unity.Application 0.1
2737
21
import Ubuntu.Gestures 0.1
2738
22
2739
23
Item {
2740
24
    id: root
2741
25
    objectName: "stages"
2742
26
    anchors.fill: parent
2743
27
2744
28
    // Controls to be set from outside
2745
29
    property bool shown: false
2746
30
    property bool moving: false
2747
31
    property int dragAreaWidth
2748
32
2749
33
    // State information propagated to the outside
2750
34
    readonly property bool painting: mainStageImage.visible || sideStageImage.visible || sideStageSnapAnimation.running
2751
35
    property bool fullscreen: priv.focusedApplication ? priv.focusedApplication.fullscreen : false
2752
36
    property bool overlayMode: (sideStageImage.shown && priv.mainStageAppId.length == 0) || priv.overlayOverride
2753
37
                               || (priv.mainStageAppId.length == 0 && sideStageSnapAnimation.running)
2754
38
2755
39
    readonly property int overlayWidth: priv.overlayOverride ? 0 : priv.sideStageWidth
2756
40
2757
41
    onShownChanged: {
2758
42
        if (!shown) {
2759
43
            priv.mainStageAppId = "";
2760
44
        }
2761
45
    }
2762
46
2763
47
    onMovingChanged: {
2764
48
        if (moving) {
2765
49
            if (!priv.mainStageAppId && !priv.sideStageAppId) {
2766
50
                // Pulling in from the right, make the last used (topmost) app visible
2767
51
                var application = ApplicationManager.get(0);
2768
52
                if (application.stage == ApplicationInfoInterface.SideStage) {
2769
53
                    sideStageImage.application = application;
2770
54
                    sideStageImage.x = root.width - sideStageImage.width
2771
55
                    sideStageImage.visible = true;
2772
56
                } else {
2773
57
                    mainStageImage.application = application;
2774
58
                    mainStageImage.visible = true;
2775
59
                }
2776
60
            } else {
2777
61
                priv.requestNewScreenshot(ApplicationInfoInterface.MainStage)
2778
62
                if (priv.focusedApplicationId == priv.sideStageAppId) {
2779
63
                    priv.requestNewScreenshot(ApplicationInfoInterface.SideStage)
2780
64
                }
2781
65
            }
2782
66
        } else {
2783
67
            mainStageImage.visible = false;
2784
68
            sideStageImage.visible = false;
2785
69
        }
2786
70
    }
2787
71
2788
72
    QtObject {
2789
73
        id: priv
2790
74
2791
75
        property int sideStageWidth: units.gu(40)
2792
76
2793
77
2794
78
        property string sideStageAppId
2795
79
        property string mainStageAppId
2796
80
2797
81
2798
82
        property var sideStageApp: ApplicationManager.findApplication(sideStageAppId)
2799
83
        property var mainStageApp: ApplicationManager.findApplication(mainStageAppId)
2800
84
2801
85
        property string sideStageScreenshot: sideStageApp ? sideStageApp.screenshot : ""
2802
86
        property string mainStageScreenshot: mainStageApp ? mainStageApp.screenshot : ""
2803
87
2804
88
        property string focusedApplicationId: ApplicationManager.focusedApplicationId
2805
89
        property var focusedApplication: ApplicationManager.findApplication(focusedApplicationId)
2806
90
        property url focusedScreenshot: focusedApplication ? focusedApplication.screenshot : ""
2807
91
2808
92
        property bool waitingForMainScreenshot: false
2809
93
        property bool waitingForSideScreenshot: false
2810
94
        property bool waitingForScreenshots: waitingForMainScreenshot || waitingForSideScreenshot
2811
95
2812
96
        property string startingAppId: ""
2813
97
2814
98
        // Keep overlayMode even if there is no focused app (to allow pulling in the sidestage from the right)
2815
99
        property bool overlayOverride: false
2816
100
2817
101
        onFocusedApplicationChanged: {
2818
102
            if (focusedApplication) {
2819
103
                if (focusedApplication.stage == ApplicationInfoInterface.MainStage) {
2820
104
                    mainStageAppId = focusedApplicationId;
2821
105
                    priv.overlayOverride = false;
2822
106
                    if (priv.startingAppId == focusedApplicationId && sideStageImage.shown) {
2823
107
                        // There was already a sidestage app on top. bring it back!
2824
108
                        ApplicationManager.focusApplication(priv.sideStageAppId)
2825
109
                        priv.startingAppId = "";
2826
110
                    }
2827
111
                } else if (focusedApplication.stage == ApplicationInfoInterface.SideStage) {
2828
112
                    sideStageAppId = focusedApplicationId;
2829
113
                    if (priv.startingAppId == focusedApplicationId && !sideStageImage.shown) {
2830
114
                        sideStageImage.snapToApp(focusedApplication);
2831
115
                        priv.startingAppId = "";
2832
116
                    }
2833
117
                }
2834
118
            } else if (root.overlayMode){
2835
119
                sideStageImage.snapTo(root.width)
2836
120
            }
2837
121
        }
2838
122
2839
123
        onMainStageScreenshotChanged: {
2840
124
            waitingForMainScreenshot = false;
2841
125
        }
2842
126
2843
127
        onSideStageScreenshotChanged: {
2844
128
            waitingForSideScreenshot = false;
2845
129
        }
2846
130
2847
131
        onFocusedScreenshotChanged: {
2848
132
            waitingForSideScreenshot = false;
2849
133
        }
2850
134
2851
135
        onWaitingForScreenshotsChanged: {
2852
136
            if (waitingForScreenshots) {
2853
137
                return;
2854
138
            }
2855
139
2856
140
            if (root.moving) {
2857
141
                if (mainStageAppId) {
2858
142
                    mainStageImage.application = mainStageApp
2859
143
                    mainStageImage.visible = true;
2860
144
                }
2861
145
                if (sideStageAppId && focusedApplicationId == sideStageAppId) {
2862
146
                    sideStageImage.application = sideStageApp;
2863
147
                    sideStageImage.x = root.width - sideStageImage.width
2864
148
                    sideStageImage.visible = true;
2865
149
                }
2866
150
            }
2867
151
            if (sideStageHandleMouseArea.pressed) {
2868
152
                if (sideStageAppId) {
2869
153
                    sideStageImage.application = sideStageApp;
2870
154
                    sideStageImage.x = root.width - sideStageImage.width
2871
155
                    sideStageImage.visible = true;
2872
156
                }
2873
157
                if (mainStageAppId) {
2874
158
                    mainStageImage.application = mainStageApp
2875
159
                    mainStageImage.visible = true;
2876
160
                }
2877
161
            }
2878
162
        }
2879
163
2880
164
        function requestNewScreenshot(stage) {
2881
165
            if (stage == ApplicationInfoInterface.MainStage && mainStageAppId) {
2882
166
                waitingForMainScreenshot = true;
2883
167
                ApplicationManager.updateScreenshot(mainStageAppId);
2884
168
            } else if (stage == ApplicationInfoInterface.SideStage && sideStageAppId) {
2885
169
                waitingForSideScreenshot = true;
2886
170
                ApplicationManager.updateScreenshot(sideStageAppId);
2887
171
            }
2888
172
        }
2889
173
2890
174
    }
2891
175
    // FIXME: the signal connection seems to get lost with the fake application manager.
2892
176
    Connections {
2893
177
        target: priv.sideStageApp
2894
178
        onScreenshotChanged: priv.sideStageScreenshot = priv.sideStageApp.screenshot
2895
179
    }
2896
180
    Connections {
2897
181
        target: priv.mainStageApp
2898
182
        onScreenshotChanged: priv.mainStageScreenshot = priv.mainStageApp.screenshot
2899
183
    }
2900
184
2901
185
    Connections {
2902
186
        target: ApplicationManager
2903
187
2904
188
        onApplicationAdded: {
2905
189
            priv.startingAppId = appId;
2906
190
            splashScreenTimer.start();
2907
191
            var application = ApplicationManager.findApplication(appId)
2908
192
            if (application.stage == ApplicationInfoInterface.SideStage) {
2909
193
                sideStageSplash.visible = true;
2910
194
            } else if (application.stage == ApplicationInfoInterface.MainStage) {
2911
195
                mainStageSplash.visible = true;
2912
196
            }
2913
197
        }
2914
198
2915
199
        onFocusRequested: {
2916
200
            var application = ApplicationManager.findApplication(appId)
2917
201
            if (application.stage == ApplicationInfoInterface.SideStage) {
2918
202
                if (!root.shown) {
2919
203
                    priv.mainStageAppId = "";
2920
204
                    mainStageImage.application = null
2921
205
                }
2922
206
                if (sideStageImage.shown) {
2923
207
                    sideStageImage.switchTo(application);
2924
208
                    if (priv.mainStageAppId) {
2925
209
                        mainStageImage.application = priv.mainStageApp;
2926
210
                        mainStageImage.visible = true;
2927
211
                    }
2928
212
                } else {
2929
213
                    sideStageImage.application = application;
2930
214
                    sideStageImage.snapToApp(application);
2931
215
                }
2932
216
            } else if (application.stage == ApplicationInfoInterface.MainStage) {
2933
217
                if (root.shown) {
2934
218
                    if (sideStageImage.shown) {
2935
219
                        sideStageImage.application = priv.sideStageApp;
2936
220
                        sideStageImage.visible = true;
2937
221
                    }
2938
222
                    priv.mainStageAppId = application.appId;
2939
223
                    mainStageImage.switchTo(application)
2940
224
                    ApplicationManager.focusApplication(appId)
2941
225
                    if (sideStageImage.shown) {
2942
226
                        // There was already a focused SS app. Bring it back
2943
227
                        ApplicationManager.focusApplication(priv.sideStageAppId)
2944
228
                    }
2945
229
                } else {
2946
230
                    if (sideStageImage.shown) {
2947
231
                        sideStageImage.visible = false;
2948
232
                        sideStageImage.x = root.width;
2949
233
                    }
2950
234
2951
235
                    mainStageImage.application = application;
2952
236
                    ApplicationManager.focusApplication(appId)
2953
237
                }
2954
238
            }
2955
239
        }
2956
240
2957
241
        onApplicationRemoved: {
2958
242
            if (priv.mainStageAppId == appId) {
2959
243
                priv.mainStageAppId = "";
2960
244
            }
2961
245
            if (priv.sideStageAppId == appId) {
2962
246
                priv.sideStageAppId = "";
2963
247
            }
2964
248
            if (priv.sideStageAppId.length == 0) {
2965
249
                sideStageImage.shown = false;
2966
250
                priv.overlayOverride = false;
2967
251
            }
2968
252
        }
2969
253
2970
254
    }
2971
255
2972
256
    Timer {
2973
257
        id: splashScreenTimer
2974
258
        // FIXME: apart from removing this completely in the future and make the app surface paint
2975
259
        // meaningful stuff, also check for colin's stuff to land so we can shape 1.4 secs away from here
2976
260
        // https://code.launchpad.net/~cjwatson/upstart-app-launch/libclick-manifest/+merge/210520
2977
261
        // https://code.launchpad.net/~cjwatson/upstart-app-launch/libclick-pkgdir/+merge/209909
2978
262
        interval: 1700
2979
263
        repeat: false
2980
264
        onTriggered: {
2981
265
            mainStageSplash.visible = false;
2982
266
            sideStageSplash.visible = false;
2983
267
        }
2984
268
    }
2985
269
2986
270
    SwitchingApplicationImage {
2987
271
        id: mainStageImage
2988
272
        anchors.bottom: parent.bottom
2989
273
        width: parent.width
2990
274
        visible: false
2991
275
2992
276
        onSwitched: {
2993
277
            sideStageImage.visible = false;
2994
278
        }
2995
279
    }
2996
280
2997
281
    Rectangle {
2998
282
        id: mainStageSplash
2999
283
        anchors.fill: root
3000
284
        anchors.rightMargin: root.width - sideStageImage.x
3001
285
        color: "black"
3002
286
3003
287
        WaitingDots {
3004
288
        }
3005
289
    }
3006
290
3007
291
    SidestageHandle {
3008
292
        id: sideStageHandle
3009
293
        anchors { top: parent.top; right: sideStageImage.left; bottom: parent.bottom }
3010
294
        width: root.dragAreaWidth
3011
295
        visible: root.shown && priv.sideStageAppId && sideStageImage.x < root.width
3012
296
3013
297
    }
3014
298
    MouseArea {
3015
299
        id: sideStageHandleMouseArea
3016
300
        anchors { top: parent.top; right: parent.right; bottom: parent.bottom; rightMargin: sideStageImage.shown ? sideStageImage.width : 0}
3017
301
        width: root.dragAreaWidth
3018
302
        visible: priv.sideStageAppId
3019
303
3020
304
        property var dragPoints: new Array()
3021
305
3022
306
        onPressed: {
3023
307
            priv.requestNewScreenshot(ApplicationInfoInterface.SideStage)
3024
308
            if (priv.mainStageAppId) {
3025
309
                priv.requestNewScreenshot(ApplicationInfoInterface.MainStage)
3026
310
            }
3027
311
        }
3028
312
3029
313
        onMouseXChanged: {
3030
314
            dragPoints.push(mouseX)
3031
315
3032
316
            var dragPoint = root.width + mouseX;
3033
317
            if (sideStageImage.shown) {
3034
318
                dragPoint -= sideStageImage.width
3035
319
            }
3036
320
            sideStageImage.x = Math.max(root.width - sideStageImage.width, dragPoint)
3037
321
        }
3038
322
3039
323
        onReleased: {
3040
324
            var distance = 0;
3041
325
            var lastX = dragPoints[0];
3042
326
            var oneWayFlick = true;
3043
327
            for (var i = 0; i < dragPoints.length; ++i) {
3044
328
                if (dragPoints[i] < lastX) {
3045
329
                    oneWayFlick = false;
3046
330
                }
3047
331
                distance += dragPoints[i] - lastX;
3048
332
                lastX = dragPoints[i];
3049
333
            }
3050
334
            dragPoints = [];
3051
335
3052
336
            if (oneWayFlick || distance > sideStageImage.width / 2) {
3053
337
                sideStageImage.snapTo(root.width)
3054
338
            } else {
3055
339
                sideStageImage.snapToApp(priv.sideStageApp)
3056
340
            }
3057
341
        }
3058
342
    }
3059
343
3060
344
    SwitchingApplicationImage {
3061
345
        id: sideStageImage
3062
346
        width: priv.sideStageWidth
3063
347
        height: root.height
3064
348
        x: root.width
3065
349
        anchors.bottom: parent.bottom
3066
350
        visible: true
3067
351
        property bool shown: false
3068
352
3069
353
        onSwitched: {
3070
354
            mainStageImage.visible = false;
3071
355
            ApplicationManager.focusApplication(application.appId)
3072
356
        }
3073
357
3074
358
        function snapTo(targetX) {
3075
359
            sideStageSnapAnimation.targetX = targetX
3076
360
            sideStageImage.visible = true;
3077
361
            if (priv.mainStageAppId) {
3078
362
                mainStageImage.application = priv.mainStageApp
3079
363
                mainStageImage.visible = true;
3080
364
            }
3081
365
            sideStageSnapAnimation.start();
3082
366
        }
3083
367
3084
368
        function snapToApp(application) {
3085
369
            sideStageImage.application = application
3086
370
            sideStageSnapAnimation.snapToId = application.appId;
3087
371
            snapTo(root.width - sideStageImage.width);
3088
372
        }
3089
373
3090
374
        SequentialAnimation {
3091
375
            id: sideStageSnapAnimation
3092
376
            property int targetX: root.width
3093
377
            property string snapToId
3094
378
3095
379
            UbuntuNumberAnimation { target: sideStageImage; property: "x"; to: sideStageSnapAnimation.targetX; duration: UbuntuAnimation.SlowDuration }
3096
380
            ScriptAction {
3097
381
                script: {
3098
382
                    if (sideStageSnapAnimation.targetX == root.width) {
3099
383
                        if (priv.mainStageAppId) {
3100
384
                            ApplicationManager.focusApplication(priv.mainStageAppId)
3101
385
                        } else {
3102
386
                            priv.overlayOverride = true;
3103
387
                            ApplicationManager.unfocusCurrentApplication();
3104
388
                        }
3105
389
                        sideStageImage.shown = false;
3106
390
                    }
3107
391
                    if (sideStageSnapAnimation.snapToId) {
3108
392
                        ApplicationManager.focusApplication(sideStageSnapAnimation.snapToId)
3109
393
                        sideStageSnapAnimation.snapToId = "";
3110
394
                        sideStageImage.shown = true;
3111
395
                        priv.overlayOverride = false;
3112
396
                    }
3113
397
                    sideStageImage.visible = false;
3114
398
                    mainStageImage.visible = false;
3115
399
                }
3116
400
            }
3117
401
        }
3118
402
    }
3119
403
3120
404
    Rectangle {
3121
405
        id: sideStageSplash
3122
406
        anchors.fill: parent
3123
407
        anchors.leftMargin: sideStageImage.x
3124
408
        color: "black"
3125
409
3126
410
        WaitingDots {
3127
411
        }
3128
412
    }
3129
413
}
3130
414
0
3131
=== added file 'qml/Stages/SurfaceContainer.qml'
3132
--- qml/Stages/SurfaceContainer.qml	1970-01-01 00:00:00 +0000
3133
+++ qml/Stages/SurfaceContainer.qml	2014-07-29 14:07:22 +0000
3134
@@ -0,0 +1,123 @@
3135
1
/*
3136
2
 * Copyright 2014 Canonical Ltd.
3137
3
 *
3138
4
 * This program is free software; you can redistribute it and/or modify
3139
5
 * it under the terms of the GNU Lesser General Public License as published by
3140
6
 * the Free Software Foundation; version 3.
3141
7
 *
3142
8
 * This program is distributed in the hope that it will be useful,
3143
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3144
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3145
11
 * GNU Lesser General Public License for more details.
3146
12
 *
3147
13
 * You should have received a copy of the GNU Lesser General Public License
3148
14
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3149
15
*/
3150
16
3151
17
import QtQuick 2.0
3152
18
import "Animations"
3153
19
3154
20
Item {
3155
21
    id: container
3156
22
    property Item surface: null
3157
23
    property bool removing: false
3158
24
3159
25
    onSurfaceChanged: {
3160
26
        if (surface) {
3161
27
            surface.parent = container;
3162
28
            surface.z = 1;
3163
29
            state = "initial"
3164
30
        }
3165
31
    }
3166
32
3167
33
    Connections {
3168
34
        target: surface
3169
35
        onRemoved: {
3170
36
            container.removing = true;
3171
37
3172
38
            var childSurfaces = surface.childSurfaces;
3173
39
            for (var i=0; i<childSurfaces.length; i++) {
3174
40
                childSurfaces[i].removed();
3175
41
            }
3176
42
3177
43
            //if we don't have children, nothing will tell us to animate out, so do it.
3178
44
            if (childSurfaces.length === 0) {
3179
45
                animateOut();
3180
46
            }
3181
47
            // tell our parent to animate out.
3182
48
            if (surface.parentSurface) {
3183
49
                surface.parentSurface.parent.animateOut();
3184
50
            }
3185
51
        }
3186
52
    }
3187
53
3188
54
    Repeater {
3189
55
        model: container.surface ? container.surface.childSurfaces : 0
3190
56
3191
57
        delegate: Loader {
3192
58
            z: 2
3193
59
            anchors {
3194
60
                fill: container
3195
61
                topMargin: container.surface.anchors.topMargin
3196
62
                rightMargin: container.surface.anchors.rightMargin
3197
63
                bottomMargin: container.surface.anchors.bottomMargin
3198
64
                leftMargin: container.surface.anchors.leftMargin
3199
65
            }
3200
66
3201
67
            // Only way to do recursive qml items.
3202
68
            source: Qt.resolvedUrl("SurfaceContainer.qml")
3203
69
            onLoaded: {
3204
70
                item.surface = modelData;
3205
71
                item.animateIn(swipeFromBottom);
3206
72
                container.animateIn(swipeUp);
3207
73
            }
3208
74
        }
3209
75
    }
3210
76
3211
77
    function animateIn(component) {
3212
78
        var animation = component.createObject(container, { "surface": container.surface });
3213
79
        animation.start();
3214
80
3215
81
        var tmp = d.animations;
3216
82
        tmp.push(animation);
3217
83
        d.animations = tmp;
3218
84
    }
3219
85
3220
86
    function animateOut() {
3221
87
        if (d.animations.length > 0) {
3222
88
            var tmp = d.animations;
3223
89
            var popped = tmp.pop();
3224
90
            popped.end();
3225
91
            d.animations = tmp;
3226
92
        } else {
3227
93
            container.state = "initial";
3228
94
        }
3229
95
    }
3230
96
3231
97
    QtObject {
3232
98
        id: d
3233
99
        property var animations: []
3234
100
        property var currentAnimation: animations.length > 0 ? animations[animations.length-1] : undefined
3235
101
    }
3236
102
3237
103
    Component {
3238
104
        id: swipeFromBottom
3239
105
        SwipeFromBottomAnimation {}
3240
106
    }
3241
107
    Component {
3242
108
        id: swipeUp
3243
109
        SwipeUpAnimation {}
3244
110
    }
3245
111
    Component {
3246
112
        id: darkenFade
3247
113
        DarkenAndFadeInAnimation {}
3248
114
    }
3249
115
3250
116
    states: [
3251
117
        State {
3252
118
            name: "initial"
3253
119
            PropertyChanges { target: surface; anchors.fill: container }
3254
120
        }
3255
121
        // TODO: more animations!
3256
122
    ]
3257
123
}
3258
0
124
3259
=== removed file 'qml/Stages/SwitchingApplicationImage.qml'
3260
--- qml/Stages/SwitchingApplicationImage.qml	2014-03-19 18:09:27 +0000
3261
+++ qml/Stages/SwitchingApplicationImage.qml	1970-01-01 00:00:00 +0000
3262
@@ -1,81 +0,0 @@
3263
1
/*
3264
2
 * Copyright 2014 Canonical Ltd.
3265
3
 *
3266
4
 * This program is free software; you can redistribute it and/or modify
3267
5
 * it under the terms of the GNU Lesser General Public License as published by
3268
6
 * the Free Software Foundation; version 3.
3269
7
 *
3270
8
 * This program is distributed in the hope that it will be useful,
3271
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3272
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3273
11
 * GNU Lesser General Public License for more details.
3274
12
 *
3275
13
 * You should have received a copy of the GNU Lesser General Public License
3276
14
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3277
15
 *
3278
16
 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
3279
17
*/
3280
18
3281
19
import QtQuick 2.0
3282
20
import Ubuntu.Components 0.1
3283
21
3284
22
Rectangle {
3285
23
    id: root
3286
24
    implicitHeight: image.implicitHeight
3287
25
    implicitWidth: image.implicitWidth
3288
26
    color: "black"
3289
27
3290
28
    property var application
3291
29
3292
30
    signal switched()
3293
31
3294
32
    function switchTo(application) {
3295
33
        if (root.application == application) {
3296
34
            root.switched();
3297
35
            return;
3298
36
        }
3299
37
3300
38
        priv.newApplication = application
3301
39
        root.visible = true;
3302
40
        switchToAnimation.start()
3303
41
    }
3304
42
3305
43
    QtObject {
3306
44
        id: priv
3307
45
        property var newApplication
3308
46
    }
3309
47
3310
48
    Image {
3311
49
        id: newImage
3312
50
        anchors.bottom: parent.bottom
3313
51
        width: root.width
3314
52
        source: priv.newApplication ? priv.newApplication.screenshot : ""
3315
53
    }
3316
54
3317
55
    Image {
3318
56
        id: image
3319
57
        visible: true
3320
58
        source: root.application ? root.application.screenshot : ""
3321
59
        width: root.width
3322
60
        height: sourceSize.height
3323
61
        anchors.bottom: parent.bottom
3324
62
3325
63
    }
3326
64
3327
65
    SequentialAnimation {
3328
66
        id: switchToAnimation
3329
67
        ParallelAnimation {
3330
68
            UbuntuNumberAnimation { target: image; property: "x"; from: 0; to: root.width; duration: UbuntuAnimation.SlowDuration }
3331
69
            UbuntuNumberAnimation { target: newImage; property: "scale"; from: 0.7; to: 1; duration: UbuntuAnimation.SlowDuration }
3332
70
        }
3333
71
        ScriptAction {
3334
72
            script: {
3335
73
                image.x = 0
3336
74
                root.application = priv.newApplication
3337
75
                root.visible = false;
3338
76
                priv.newApplication = null
3339
77
                root.switched();
3340
78
            }
3341
79
        }
3342
80
    }
3343
81
}
3344
82
0
3345
=== added file 'qml/Stages/TabletStage.qml'
3346
--- qml/Stages/TabletStage.qml	1970-01-01 00:00:00 +0000
3347
+++ qml/Stages/TabletStage.qml	2014-07-29 14:07:22 +0000
3348
@@ -0,0 +1,568 @@
3349
1
/*
3350
2
 * Copyright (C) 2014 Canonical, Ltd.
3351
3
 *
3352
4
 * This program is free software; you can redistribute it and/or modify
3353
5
 * it under the terms of the GNU General Public License as published by
3354
6
 * the Free Software Foundation; version 3.
3355
7
 *
3356
8
 * This program is distributed in the hope that it will be useful,
3357
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3358
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3359
11
 * GNU General Public License for more details.
3360
12
 *
3361
13
 * You should have received a copy of the GNU General Public License
3362
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3363
15
 */
3364
16
3365
17
import QtQuick 2.0
3366
18
import Ubuntu.Components 0.1
3367
19
import Ubuntu.Gestures 0.1
3368
20
import Unity.Application 0.1
3369
21
import Utils 0.1
3370
22
import "../Components"
3371
23
3372
24
Item {
3373
25
    id: root
3374
26
    objectName: "stages"
3375
27
    anchors.fill: parent
3376
28
3377
29
    // Controls to be set from outside
3378
30
    property bool shown: false
3379
31
    property bool moving: false
3380
32
    property int dragAreaWidth
3381
33
    property real maximizedAppTopMargin
3382
34
    property bool interactive
3383
35
3384
36
    // State information propagated to the outside
3385
37
    readonly property bool locked: spreadView.phase == 2
3386
38
3387
39
    QtObject {
3388
40
        id: priv
3389
41
3390
42
        property string focusedAppId: ApplicationManager.focusedApplicationId
3391
43
        property string oldFocusedAppId: ""
3392
44
3393
45
        property string mainStageAppId
3394
46
        property string sideStageAppId
3395
47
3396
48
        // For convenience, keep properties of the first two apps in the model
3397
49
        property string appId0
3398
50
        property string appId1
3399
51
3400
52
        onFocusedAppIdChanged: {
3401
53
            if (priv.focusedAppId.length > 0) {
3402
54
                var focusedApp = ApplicationManager.findApplication(focusedAppId);
3403
55
                if (focusedApp.stage == ApplicationInfoInterface.SideStage) {
3404
56
                    priv.sideStageAppId = focusedAppId;
3405
57
                } else {
3406
58
                    priv.mainStageAppId = focusedAppId;
3407
59
                }
3408
60
            }
3409
61
3410
62
            appId0 = ApplicationManager.count >= 1 ? ApplicationManager.get(0).appId : "";
3411
63
            appId1 = ApplicationManager.count > 1 ? ApplicationManager.get(1).appId : "";
3412
64
        }
3413
65
3414
66
        function indexOf(appId) {
3415
67
            for (var i = 0; i < ApplicationManager.count; i++) {
3416
68
                if (ApplicationManager.get(i).appId == appId) {
3417
69
                    return i;
3418
70
                }
3419
71
            }
3420
72
            return -1;
3421
73
        }
3422
74
3423
75
        function evaluateOneWayFlick(gesturePoints) {
3424
76
            // Need to have at least 3 points to recognize it as a flick
3425
77
            if (gesturePoints.length < 3) {
3426
78
                return false;
3427
79
            }
3428
80
            // Need to have a movement of at least 2 grid units to recognize it as a flick
3429
81
            if (Math.abs(gesturePoints[gesturePoints.length - 1] - gesturePoints[0]) < units.gu(2)) {
3430
82
                return false;
3431
83
            }
3432
84
3433
85
            var oneWayFlick = true;
3434
86
            var smallestX = gesturePoints[0];
3435
87
            var leftWards = gesturePoints[1] < gesturePoints[0];
3436
88
            for (var i = 1; i < gesturePoints.length; i++) {
3437
89
                if ((leftWards && gesturePoints[i] >= smallestX)
3438
90
                        || (!leftWards && gesturePoints[i] <= smallestX)) {
3439
91
                    oneWayFlick = false;
3440
92
                    break;
3441
93
                }
3442
94
                smallestX = gesturePoints[i];
3443
95
            }
3444
96
            return oneWayFlick;
3445
97
        }
3446
98
    }
3447
99
3448
100
    Connections {
3449
101
        target: ApplicationManager
3450
102
        onFocusRequested: {
3451
103
            if (spreadView.interactive) {
3452
104
                spreadView.snapTo(priv.indexOf(appId));
3453
105
            } else {
3454
106
                ApplicationManager.focusApplication(appId);
3455
107
            }
3456
108
        }
3457
109
3458
110
        onApplicationRemoved: {
3459
111
            if (priv.mainStageAppId == appId) {
3460
112
                priv.mainStageAppId = "";
3461
113
            }
3462
114
            if (priv.sideStageAppId == appId) {
3463
115
                priv.sideStageAppId = "";
3464
116
            }
3465
117
            if (ApplicationManager.count == 0) {
3466
118
                spreadView.phase = 0;
3467
119
                spreadView.contentX = 0;
3468
120
            }
3469
121
        }
3470
122
    }
3471
123
3472
124
    Flickable {
3473
125
        id: spreadView
3474
126
        anchors.fill: parent
3475
127
        contentWidth: spreadRow.width
3476
128
        interactive: (spreadDragArea.status == DirectionalDragArea.Recognized || phase > 1) && draggedIndex == -1
3477
129
3478
130
        property int tileDistance: units.gu(20)
3479
131
        property int sideStageWidth: units.gu(40)
3480
132
        property bool sideStageVisible: priv.sideStageAppId
3481
133
3482
134
        // Phase of the animation:
3483
135
        // 0: Starting from right edge, a new app (index 1) comes in from the right
3484
136
        // 1: The app has reached the first snap position.
3485
137
        // 2: The list is dragged further and snaps into the spread view when entering phase 2
3486
138
        property int phase
3487
139
3488
140
        readonly property int phase0Width: sideStageWidth
3489
141
        readonly property int phase1Width: sideStageWidth
3490
142
3491
143
        // Those markers mark the various positions in the spread (ratio to screen width from right to left):
3492
144
        // 0 - 1: following finger, snap back to the beginning on release
3493
145
        readonly property real positionMarker1: 0.2
3494
146
        // 1 - 2: curved snapping movement, snap to nextInStack on release
3495
147
        readonly property real positionMarker2: sideStageWidth / spreadView.width
3496
148
        // 2 - 3: movement follows finger, snaps to phase 2 (full spread) on release
3497
149
        readonly property real positionMarker3: 0.6
3498
150
        // passing 3, we detach movement from the finger and snap to phase 2 (full spread)
3499
151
        readonly property real positionMarker4: 0.8
3500
152
3501
153
        readonly property int startSnapPosition: phase0Width * 0.5
3502
154
        readonly property int endSnapPosition: phase0Width * 0.75
3503
155
        readonly property real snapPosition: 0.75
3504
156
3505
157
        property int selectedIndex: -1
3506
158
        property int draggedIndex: -1
3507
159
        property int closingIndex: -1
3508
160
3509
161
        property bool sideStageDragging: sideStageDragHandle.dragging
3510
162
        property real sideStageDragProgress: sideStageDragHandle.progress
3511
163
3512
164
        onSideStageDragProgressChanged: {
3513
165
            if (sideStageDragProgress == 1) {
3514
166
                ApplicationManager.focusApplication(priv.mainStageAppId);
3515
167
                priv.sideStageAppId = "";
3516
168
            }
3517
169
        }
3518
170
3519
171
        property int nextInStack: {
3520
172
            switch (state) {
3521
173
            case "main":
3522
174
                if (ApplicationManager.count > 1) {
3523
175
                    return 1;
3524
176
                }
3525
177
                return -1;
3526
178
            case "mainAndOverlay":
3527
179
                if (ApplicationManager.count <= 2) {
3528
180
                    return -1;
3529
181
                }
3530
182
                if (priv.appId0 == priv.mainStageAppId || priv.appId0 == priv.sideStageAppId) {
3531
183
                    if (priv.appId1 == priv.mainStageAppId || priv.appId1 == priv.sideStageAppId) {
3532
184
                        return 2;
3533
185
                    }
3534
186
                    return 1;
3535
187
                }
3536
188
                return 0;
3537
189
            case "overlay":
3538
190
                return 1;
3539
191
            }
3540
192
            print("Unhandled nextInStack case! This shouldn't happen any more when the Dash is an app!");
3541
193
            return -1;
3542
194
        }
3543
195
        property int nextZInStack: indexToZIndex(nextInStack)
3544
196
3545
197
        states: [
3546
198
            State {
3547
199
                name: "empty"
3548
200
            },
3549
201
            State {
3550
202
                name: "main"
3551
203
            },
3552
204
            State { // Side Stage only in overlay mode
3553
205
                name: "overlay"
3554
206
            },
3555
207
            State { // Main Stage and Side Stage in overlay mode
3556
208
                name: "mainAndOverlay"
3557
209
            },
3558
210
            State { // Main Stage and Side Stage in split mode
3559
211
                name: "mainAndSplit"
3560
212
            }
3561
213
        ]
3562
214
        state: {
3563
215
            if (priv.mainStageAppId && !priv.sideStageAppId) {
3564
216
                return "main";
3565
217
            }
3566
218
            if (!priv.mainStageAppId && priv.sideStageAppId) {
3567
219
                return "overlay";
3568
220
            }
3569
221
            if (priv.mainStageAppId && priv.sideStageAppId) {
3570
222
                return "mainAndOverlay";
3571
223
            }
3572
224
            return "empty";
3573
225
        }
3574
226
3575
227
        onContentXChanged: {
3576
228
            if (spreadView.phase == 0 && spreadView.contentX > spreadView.width * spreadView.positionMarker2) {
3577
229
                spreadView.phase = 1;
3578
230
            } else if (spreadView.phase == 1 && spreadView.contentX > spreadView.width * spreadView.positionMarker4) {
3579
231
                spreadView.phase = 2;
3580
232
            } else if (spreadView.phase == 1 && spreadView.contentX < spreadView.width * spreadView.positionMarker2) {
3581
233
                spreadView.phase = 0;
3582
234
            }
3583
235
        }
3584
236
3585
237
        function snap() {
3586
238
            if (contentX < phase0Width) {
3587
239
                snapAnimation.targetContentX = 0;
3588
240
                snapAnimation.start();
3589
241
            } else if (contentX < phase1Width) {
3590
242
                snapTo(1);
3591
243
            } else {
3592
244
                // Add 1 pixel to make sure we definitely hit positionMarker4 even with rounding errors of the animation.
3593
245
                snapAnimation.targetContentX = spreadView.width * spreadView.positionMarker4 + 1;
3594
246
                snapAnimation.start();
3595
247
            }
3596
248
        }
3597
249
        function snapTo(index) {
3598
250
            spreadView.selectedIndex = index;
3599
251
            snapAnimation.targetContentX = 0;
3600
252
            snapAnimation.start();
3601
253
        }
3602
254
3603
255
        // We need to shuffle z ordering a bit in order to keep side stage apps above main stage apps.
3604
256
        // We don't want to really reorder them in the model because that allows us to keep track
3605
257
        // of the last focused order.
3606
258
        function indexToZIndex(index) {
3607
259
            var app = ApplicationManager.get(index);
3608
260
            if (!app) {
3609
261
                return index;
3610
262
            }
3611
263
3612
264
            var isActive = app.appId == priv.mainStageAppId || app.appId == priv.sideStageAppId;
3613
265
            if (isActive && app.stage == ApplicationInfoInterface.MainStage) {
3614
266
                // if this app is active, and its the MainStage, always put it to index 0
3615
267
                return 0;
3616
268
            }
3617
269
            if (isActive && app.stage == ApplicationInfoInterface.SideStage) {
3618
270
                if (!priv.mainStageAppId) {
3619
271
                    // Only have SS apps running. Put the active one at 0
3620
272
                    return 0;
3621
273
                }
3622
274
3623
275
                // Precondition now: There's an active MS app and this is SS app:
3624
276
                if (spreadView.nextInStack >= 0 && ApplicationManager.get(spreadView.nextInStack).stage == ApplicationInfoInterface.MainStage) {
3625
277
                    // If the next app coming from the right is a MS app, we need to elevate this SS ap above it.
3626
278
                    // Put it to at least level 2, or higher if there's more apps coming in before this one.
3627
279
                    return Math.max(index, 2);
3628
280
                } else {
3629
281
                    // if this is no next app to come in from the right, place this one at index 1, just on top the active MS app.
3630
282
                    return 1;
3631
283
                }
3632
284
            }
3633
285
            if (index <= 2 && app.stage == ApplicationInfoInterface.MainStage && priv.sideStageAppId) {
3634
286
                // Ok, this is an inactive MS app. If there's an active SS app around, we need to place this one
3635
287
                // in between the active MS app and the active SS app, so that it comes in from there when dragging from the right.
3636
288
                // If there's now active SS app, just leave it where it is.
3637
289
                return priv.indexOf(priv.sideStageAppId) < index ? index - 1 : index;
3638
290
            }
3639
291
            if (index == spreadView.nextInStack && app.stage == ApplicationInfoInterface.SideStage) {
3640
292
                // This is a SS app and the next one to come in from the right:
3641
293
                if (priv.sideStageAppId && priv.mainStageAppId) {
3642
294
                    // If there's both, an active MS and an active SS app, put this one right on top of that
3643
295
                    return 2;
3644
296
                }
3645
297
                // Or if there's only one other active app, put it on top of that.
3646
298
                // The case that there isn't any other active app is already handled above.
3647
299
                return 1;
3648
300
            }
3649
301
            if (index == 2 && spreadView.nextInStack == 1 && priv.sideStageAppId) {
3650
302
                // If its index 2 but not the next one to come in, it means
3651
303
                // we've pulled another one down to index 2. Move this one up to 2 instead.
3652
304
                return 3;
3653
305
            }
3654
306
            // don't touch all others... (mostly index > 3 + simple cases where the above doesn't shuffle much)
3655
307
            return index;
3656
308
        }
3657
309
3658
310
        SequentialAnimation {
3659
311
            id: snapAnimation
3660
312
            property int targetContentX: 0
3661
313
3662
314
            UbuntuNumberAnimation {
3663
315
                target: spreadView
3664
316
                property: "contentX"
3665
317
                to: snapAnimation.targetContentX
3666
318
                duration: UbuntuAnimation.FastDuration
3667
319
            }
3668
320
3669
321
            ScriptAction {
3670
322
                script: {
3671
323
                    if (spreadView.selectedIndex >= 0) {
3672
324
                        var newIndex = spreadView.selectedIndex;
3673
325
                        spreadView.selectedIndex = -1;
3674
326
                        ApplicationManager.focusApplication(ApplicationManager.get(newIndex).appId);
3675
327
                        spreadView.phase = 0;
3676
328
                        spreadView.contentX = 0;
3677
329
                    }
3678
330
                }
3679
331
            }
3680
332
        }
3681
333
3682
334
        Rectangle {
3683
335
            id: spreadRow
3684
336
            color: "black"
3685
337
            x: spreadView.contentX
3686
338
            height: root.height
3687
339
            width: spreadView.width + Math.max(spreadView.width, ApplicationManager.count * spreadView.tileDistance)
3688
340
3689
341
            Rectangle {
3690
342
                id: sideStageBackground
3691
343
                color: "black"
3692
344
                anchors.fill: parent
3693
345
                anchors.leftMargin: spreadView.width - (1 - sideStageDragHandle.progress) * spreadView.sideStageWidth
3694
346
                z: spreadView.indexToZIndex(priv.indexOf(priv.sideStageAppId))
3695
347
                opacity: spreadView.phase == 0 ? 1 : 0
3696
348
                Behavior on opacity { UbuntuNumberAnimation {} }
3697
349
            }
3698
350
3699
351
            Item {
3700
352
                id: sideStageDragHandle
3701
353
                anchors { top: parent.top; bottom: parent.bottom; left: parent.left; leftMargin: spreadView.width - spreadView.sideStageWidth - width }
3702
354
                width: units.gu(2)
3703
355
                z: sideStageBackground.z
3704
356
                opacity: spreadView.phase <= 0 && spreadView.sideStageVisible ? 1 : 0
3705
357
                property real progress: 0
3706
358
                property bool dragging: false
3707
359
3708
360
                Behavior on opacity { UbuntuNumberAnimation {} }
3709
361
3710
362
                Connections {
3711
363
                    target: spreadView
3712
364
                    onSideStageVisibleChanged: {
3713
365
                        if (spreadView.sideStageVisible) {
3714
366
                            sideStageDragHandle.progress = 0;
3715
367
                        }
3716
368
                    }
3717
369
                }
3718
370
3719
371
                Image {
3720
372
                    anchors.centerIn: parent
3721
373
                    anchors.horizontalCenterOffset: parent.progress * spreadView.sideStageWidth - (width - parent.width) / 2
3722
374
                    width: sideStageDragHandleMouseArea.pressed ? parent.width * 2 : parent.width
3723
375
                    height: parent.height
3724
376
                    source: "graphics/sidestage_handle@20.png"
3725
377
                    Behavior on width { UbuntuNumberAnimation {} }
3726
378
                }
3727
379
3728
380
                MouseArea {
3729
381
                    id: sideStageDragHandleMouseArea
3730
382
                    anchors.fill: parent
3731
383
                    enabled: spreadView.contentX == 0
3732
384
                    property int startX
3733
385
                    property var gesturePoints: new Array()
3734
386
3735
387
                    onPressed: {
3736
388
                        gesturePoints = [];
3737
389
                        startX = mouseX;
3738
390
                        sideStageDragHandle.progress = 0;
3739
391
                        sideStageDragHandle.dragging = true;
3740
392
                    }
3741
393
                    onMouseXChanged: {
3742
394
                        if (priv.mainStageAppId) {
3743
395
                            sideStageDragHandle.progress = Math.max(0, (-startX + mouseX) / spreadView.sideStageWidth);
3744
396
                        }
3745
397
                        gesturePoints.push(mouseX);
3746
398
                    }
3747
399
                    onReleased: {
3748
400
                        if (priv.mainStageAppId) {
3749
401
                            var oneWayFlick = priv.evaluateOneWayFlick(gesturePoints);
3750
402
                            sideStageDragSnapAnimation.to = sideStageDragHandle.progress > 0.5 || oneWayFlick ? 1 : 0;
3751
403
                            sideStageDragSnapAnimation.start();
3752
404
                        } else {
3753
405
                            sideStageDragHandle.dragging = false;
3754
406
                        }
3755
407
                    }
3756
408
                }
3757
409
                UbuntuNumberAnimation {
3758
410
                    id: sideStageDragSnapAnimation
3759
411
                    target: sideStageDragHandle
3760
412
                    property: "progress"
3761
413
3762
414
                    onRunningChanged: {
3763
415
                        if (!running) {
3764
416
                            sideStageDragHandle.dragging = false;;
3765
417
                        }
3766
418
                    }
3767
419
                }
3768
420
            }
3769
421
3770
422
            Repeater {
3771
423
                id: spreadRepeater
3772
424
                model: ApplicationManager
3773
425
3774
426
                delegate: TransformedTabletSpreadDelegate {
3775
427
                    id: spreadTile
3776
428
                    height: spreadView.height
3777
429
                    width: model.stage == ApplicationInfoInterface.MainStage ? spreadView.width : spreadView.sideStageWidth
3778
430
                    x: spreadView.width
3779
431
                    z: spreadView.indexToZIndex(index)
3780
432
                    active: model.appId == priv.mainStageAppId || model.appId == priv.sideStageAppId
3781
433
                    zIndex: z
3782
434
                    selected: spreadView.selectedIndex == index
3783
435
                    otherSelected: spreadView.selectedIndex >= 0 && !selected
3784
436
                    isInSideStage: priv.sideStageAppId == model.appId
3785
437
                    interactive: !spreadView.interactive && spreadView.phase === 0 && root.interactive
3786
438
                    swipeToCloseEnabled: spreadView.interactive
3787
439
                    maximizedAppTopMargin: root.maximizedAppTopMargin
3788
440
                    dropShadow: spreadView.contentX > 0 || spreadDragArea.status == DirectionalDragArea.Undecided
3789
441
3790
442
                    property real behavioredZIndex: zIndex
3791
443
                    Behavior on behavioredZIndex {
3792
444
                        enabled: spreadView.closingIndex >= 0
3793
445
                        UbuntuNumberAnimation {}
3794
446
                    }
3795
447
3796
448
                    // This is required because none of the bindings are triggered in some cases:
3797
449
                    // When an app is closed, it might happen that ApplicationManager.get(nextInStack)
3798
450
                    // returns a different app even though the nextInStackIndex and all the related
3799
451
                    // bindings (index, mainStageApp, sideStageApp, etc) don't change. Let's force a
3800
452
                    // binding update in that case.
3801
453
                    Connections {
3802
454
                        target: ApplicationManager
3803
455
                        onApplicationRemoved: spreadTile.z = Qt.binding(function() {
3804
456
                            return spreadView.indexToZIndex(index);
3805
457
                        })
3806
458
                    }
3807
459
3808
460
                    progress: {
3809
461
                        var tileProgress = (spreadView.contentX - behavioredZIndex * spreadView.tileDistance) / spreadView.width;
3810
462
                        // Some tiles (nextInStack, active) need to move directly from the beginning, normalize progress to immediately start at 0
3811
463
                        if ((index == spreadView.nextInStack && spreadView.phase < 2) || (active && spreadView.phase < 1)) {
3812
464
                            tileProgress += behavioredZIndex * spreadView.tileDistance / spreadView.width;
3813
465
                        }
3814
466
                        return tileProgress;
3815
467
                    }
3816
468
3817
469
                    animatedProgress: {
3818
470
                        if (spreadView.phase == 0 && (spreadTile.active || spreadView.nextInStack == index)) {
3819
471
                            if (progress < spreadView.positionMarker1) {
3820
472
                                return progress;
3821
473
                            } else if (progress < spreadView.positionMarker1 + snappingCurve.period) {
3822
474
                                return spreadView.positionMarker1 + snappingCurve.value * 3;
3823
475
                            } else {
3824
476
                                return spreadView.positionMarker2;
3825
477
                            }
3826
478
                        }
3827
479
                        return progress;
3828
480
                    }
3829
481
3830
482
                    onClicked: {
3831
483
                        if (spreadView.phase == 2) {
3832
484
                            if (ApplicationManager.focusedApplicationId == ApplicationManager.get(index).appId) {
3833
485
                                spreadView.snapTo(index);
3834
486
                            } else {
3835
487
                                ApplicationManager.requestFocusApplication(ApplicationManager.get(index).appId);
3836
488
                            }
3837
489
                        }
3838
490
                    }
3839
491
3840
492
                    onClosed: {
3841
493
                        spreadView.draggedIndex = -1;
3842
494
                        spreadView.closingIndex = index;
3843
495
                        ApplicationManager.stopApplication(ApplicationManager.get(index).appId);
3844
496
                    }
3845
497
3846
498
                    EasingCurve {
3847
499
                        id: snappingCurve
3848
500
                        type: EasingCurve.Linear
3849
501
                        period: (spreadView.positionMarker2 - spreadView.positionMarker1) / 3
3850
502
                        progress: spreadTile.progress - spreadView.positionMarker1
3851
503
                    }
3852
504
                }
3853
505
            }
3854
506
        }
3855
507
    }
3856
508
3857
509
    EdgeDragArea {
3858
510
        id: spreadDragArea
3859
511
        anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
3860
512
        width: root.dragAreaWidth
3861
513
        direction: Direction.Leftwards
3862
514
3863
515
        property bool attachedToView: false
3864
516
        property var gesturePoints: new Array()
3865
517
3866
518
        onTouchXChanged: {
3867
519
            if (!dragging) {
3868
520
                spreadView.phase = 0;
3869
521
                spreadView.contentX = 0;
3870
522
            }
3871
523
3872
524
            if (attachedToView) {
3873
525
                spreadView.contentX = -touchX + spreadDragArea.width;
3874
526
                if (spreadView.contentX > spreadView.phase0Width + spreadView.phase1Width / 2) {
3875
527
                    attachedToView = false;
3876
528
                    spreadView.snap();
3877
529
                }
3878
530
            }
3879
531
            gesturePoints.push(touchX);
3880
532
        }
3881
533
3882
534
        onStatusChanged: {
3883
535
            if (status == DirectionalDragArea.Recognized) {
3884
536
                attachedToView = true;
3885
537
            }
3886
538
        }
3887
539
3888
540
        onDraggingChanged: {
3889
541
            if (dragging) {
3890
542
                // Gesture recognized. Start recording this gesture
3891
543
                gesturePoints = [];
3892
544
                return;
3893
545
            }
3894
546
3895
547
            // Ok. The user released. Find out if it was a one-way movement.
3896
548
            var oneWayFlick = priv.evaluateOneWayFlick(gesturePoints);
3897
549
            gesturePoints = [];
3898
550
3899
551
            if (oneWayFlick && spreadView.contentX < spreadView.positionMarker1 * spreadView.width) {
3900
552
                // If it was a short one-way movement, do the Alt+Tab switch
3901
553
                // no matter if we didn't cross positionMarker1 yet.
3902
554
                spreadView.snapTo(spreadView.nextInStack);
3903
555
            } else if (!dragging && attachedToView) {
3904
556
                if (spreadView.contentX < spreadView.width * spreadView.positionMarker1) {
3905
557
                    spreadView.snap();
3906
558
                } else if (spreadView.contentX < spreadView.width * spreadView.positionMarker2) {
3907
559
                    spreadView.snapTo(spreadView.nextInStack);
3908
560
                } else {
3909
561
                    // otherwise snap to the closest snap position we can find
3910
562
                    // (might be back to start, to app 1 or to spread)
3911
563
                    spreadView.snap();
3912
564
                }
3913
565
            }
3914
566
        }
3915
567
    }
3916
568
}
3917
0
569
3918
=== modified file 'qml/Stages/TransformedSpreadDelegate.qml'
3919
--- qml/Stages/TransformedSpreadDelegate.qml	2014-03-19 19:10:30 +0000
3920
+++ qml/Stages/TransformedSpreadDelegate.qml	2014-07-29 14:07:22 +0000
3921
@@ -23,7 +23,9 @@
3922
23
SpreadDelegate {
23
SpreadDelegate {
3923
24
    id: root
24
    id: root
3924
25
25
3925
26
    // Set this to true when this tile is selected in the spread. The animation will change to bring the tile to front.
3926
26
    property bool selected: false
27
    property bool selected: false
3927
28
    // Set this to true when another tile in the spread is selected. The animation will change to fade this tile out.
3928
27
    property bool otherSelected: false
29
    property bool otherSelected: false
3929
28
30
3930
29
    // The progress animates the tiles. A value > 0 makes it appear from the right edge. At 1 it reaches the end position.
31
    // The progress animates the tiles. A value > 0 makes it appear from the right edge. At 1 it reaches the end position.
3931
@@ -44,6 +46,9 @@
3932
44
    property real startDistance: units.gu(5)
46
    property real startDistance: units.gu(5)
3933
45
    property real endDistance: units.gu(.5)
47
    property real endDistance: units.gu(.5)
3934
46
48
3935
49
    // Hiding tiles when their progress is negative or reached the maximum
3936
50
    visible: progress >= 0 && progress < 1.7
3937
51
3938
47
    onSelectedChanged: {
52
    onSelectedChanged: {
3939
48
        if (selected) {
53
        if (selected) {
3940
49
            priv.snapshot();
54
            priv.snapshot();
3941
@@ -106,16 +111,6 @@
3942
106
            selectedTopMarginProgress = topMarginProgress;
111
            selectedTopMarginProgress = topMarginProgress;
3943
107
        }
112
        }
3944
108
113
3945
109
        // This calculates how much negative progress there can be if unwinding the spread completely
3946
110
        // the progress for each tile starts at 0 when it crosses the right edge, so the later a tile comes in,
3947
111
        // the bigger its negativeProgress can be.
3948
112
        property real negativeProgress: {
3949
113
            if (index == 1 && spreadView.phase < 2) {
3950
114
                return 0;
3951
115
            }
3952
116
            return -index * spreadView.tileDistance / spreadView.width;
3953
117
        }
3954
118
3955
119
        function linearAnimation(startProgress, endProgress, startValue, endValue, progress) {
114
        function linearAnimation(startProgress, endProgress, startValue, endValue, progress) {
3956
120
            // progress : progressDiff = value : valueDiff => value = progress * valueDiff / progressDiff
115
            // progress : progressDiff = value : valueDiff => value = progress * valueDiff / progressDiff
3957
121
            return (progress - startProgress) * (endValue - startValue) / (endProgress - startProgress) + startValue;
116
            return (progress - startProgress) * (endValue - startValue) / (endProgress - startProgress) + startValue;
3958
@@ -127,22 +122,20 @@
3959
127
            return helperEasingCurve.value * (endValue - startValue) + startValue;
122
            return helperEasingCurve.value * (endValue - startValue) + startValue;
3960
128
        }
123
        }
3961
129
124
3962
130
        property real animatedEndDistance: linearAnimation(0, 2, root.endDistance, 0, root.progress)
3963
131
3964
132
        // The following blocks handle the animation of the tile in the spread.
125
        // The following blocks handle the animation of the tile in the spread.
3965
133
        // At the beginning, each tile is attached at the right edge, outside the screen.
126
        // At the beginning, each tile is attached at the right edge, outside the screen.
3966
134
        // The progress for each tile starts at 0 and it reaches its end position at a progress of 1.
127
        // The progress for each tile starts at 0 and it reaches its end position at a progress of 1.
3971
135
        // The first phases are handled special for the first 2 tiles. as we do the alt-tab and snapping in there
128
        // The first phases are handled special for the first 2 tiles. as we do the alt-tab and snapping
3972
136
        // Once we reached phase 3, the animation is the same for all tiles.
129
        // in there. Once we reached phase 3, the animation is the same for all tiles.
3973
137
        // When a tile is selected, the animation state is snapshotted, and the spreadView is unwound (progress animates
130
        // When a tile is selected, the animation state is snapshotted, and the spreadView is unwound.
3974
138
        // back to negativeProgress). All tiles are kept in place and faded out to 0 opacity except
131
        // All tiles are kept in place and faded out to 0 opacity except
3975
139
        // the selected tile, which is animated from the snapshotted position to be fullscreen.
132
        // the selected tile, which is animated from the snapshotted position to be fullscreen.
3976
140
133
3978
141
        property real xTranslate: {
134
        readonly property real xTranslate: {
3979
142
            if (otherSelected) {
135
            if (otherSelected) {
3980
143
                if (spreadView.phase < 2 && index == 0) {
136
                if (spreadView.phase < 2 && index == 0) {
3983
144
                    return linearAnimation(selectedProgress, negativeProgress,
137
                    return linearAnimation(selectedProgress, 0, selectedXTranslate,
3984
145
                                           selectedXTranslate, selectedXTranslate - spreadView.tileDistance, root.progress);
138
                                           selectedXTranslate - spreadView.tileDistance, root.progress);
3985
146
                }
139
                }
3986
147
140
3987
148
                return selectedXTranslate;
141
                return selectedXTranslate;
3988
@@ -160,7 +153,7 @@
3989
160
                    // Apply the same animation as with the rest but add spreadView.width to align it with the others.
153
                    // Apply the same animation as with the rest but add spreadView.width to align it with the others.
3990
161
                    return -easingCurve.value * spreadView.width + spreadView.width;
154
                    return -easingCurve.value * spreadView.width + spreadView.width;
3991
162
                } else if (priv.isSelected) {
155
                } else if (priv.isSelected) {
3993
163
                    return linearAnimation(selectedProgress, negativeProgress, selectedXTranslate, 0, root.progress);
156
                    return linearAnimation(selectedProgress, 0, selectedXTranslate, 0, root.progress);
3994
164
                }
157
                }
3995
165
158
3996
166
            case 1:
159
            case 1:
3997
@@ -177,23 +170,28 @@
3998
177
            if (priv.isSelected) {
170
            if (priv.isSelected) {
3999
178
                // Distance to left edge
171
                // Distance to left edge
4000
179
                var targetTranslate = -spreadView.width - ((index - 1) * root.startDistance);
172
                var targetTranslate = -spreadView.width - ((index - 1) * root.startDistance);
4002
180
                return linearAnimation(selectedProgress, negativeProgress,
173
                return linearAnimation(selectedProgress, 0,
4003
181
                                       selectedXTranslate, targetTranslate, root.progress);
174
                                       selectedXTranslate, targetTranslate, root.progress);
4004
182
            }
175
            }
4005
183
176
4006
184
            // Fix it at the right edge...
177
            // Fix it at the right edge...
4007
185
            var rightEdgeOffset =  -((index - 1) * root.startDistance);
178
            var rightEdgeOffset =  -((index - 1) * root.startDistance);
4008
186
            // ...and use our easing to move them to the left. Stop a bit earlier for each tile
179
            // ...and use our easing to move them to the left. Stop a bit earlier for each tile
4009
180
            var animatedEndDistance = linearAnimation(0, 2, root.endDistance, 0, root.progress);
4010
187
            return -easingCurve.value * spreadView.width + (index * animatedEndDistance) + rightEdgeOffset;
181
            return -easingCurve.value * spreadView.width + (index * animatedEndDistance) + rightEdgeOffset;
4011
188
182
4012
189
        }
183
        }
4013
190
184
4015
191
        property real angle: {
185
        readonly property real angle: {
4016
186
            if (spreadView.focusChanging) {
4017
187
                return 0;
4018
188
            }
4019
189
4020
192
            if (priv.otherSelected) {
190
            if (priv.otherSelected) {
4021
193
                return priv.selectedAngle;
191
                return priv.selectedAngle;
4022
194
            }
192
            }
4023
195
            if (priv.isSelected) {
193
            if (priv.isSelected) {
4025
196
                return linearAnimation(selectedProgress, negativeProgress, selectedAngle, 0, root.progress);
194
                return linearAnimation(selectedProgress, 0, selectedAngle, 0, root.progress);
4026
197
            }
195
            }
4027
198
            switch (index) {
196
            switch (index) {
4028
199
            case 0:
197
            case 0:
4029
@@ -217,12 +215,15 @@
4030
217
            return root.startAngle - easingCurve.value * (root.startAngle - root.endAngle);
215
            return root.startAngle - easingCurve.value * (root.startAngle - root.endAngle);
4031
218
        }
216
        }
4032
219
217
4034
220
        property real scale: {
218
        readonly property real scale: {
4035
219
            if (spreadView.focusChanging) {
4036
220
                return 1;
4037
221
            }
4038
221
            if (priv.otherSelected) {
222
            if (priv.otherSelected) {
4039
222
                return priv.selectedScale;
223
                return priv.selectedScale;
4040
223
            }
224
            }
4041
224
            if (priv.isSelected) {
225
            if (priv.isSelected) {
4043
225
                return linearAnimation(selectedProgress, negativeProgress, selectedScale, 1, root.progress);
226
                return linearAnimation(selectedProgress, 0, selectedScale, 1, root.progress);
4044
226
            }
227
            }
4045
227
228
4046
228
            switch (index) {
229
            switch (index) {
4047
@@ -247,7 +248,7 @@
4048
247
            return root.startScale - easingCurve.value * (root.startScale - root.endScale);
248
            return root.startScale - easingCurve.value * (root.startScale - root.endScale);
4049
248
        }
249
        }
4050
249
250
4052
250
        property real opacity: {
251
        readonly property real opacity: {
4053
251
            if (priv.otherSelected) {
252
            if (priv.otherSelected) {
4054
252
                return linearAnimation (selectedProgress, Math.max(0, selectedProgress - .5),
253
                return linearAnimation (selectedProgress, Math.max(0, selectedProgress - .5),
4055
253
                                        selectedOpacity, 0, root.progress);
254
                                        selectedOpacity, 0, root.progress);
4056
@@ -265,9 +266,9 @@
4057
265
            return 1;
266
            return 1;
4058
266
        }
267
        }
4059
267
268
4061
268
        property real topMarginProgress: {
269
        readonly property real topMarginProgress: {
4062
269
            if (priv.isSelected) {
270
            if (priv.isSelected) {
4064
270
                return linearAnimation(selectedProgress, negativeProgress, selectedTopMarginProgress, 0, root.progress);
271
                return linearAnimation(selectedProgress, 0, selectedTopMarginProgress, 0, root.progress);
4065
271
            }
272
            }
4066
272
273
4067
273
            switch (index) {
274
            switch (index) {
4068
@@ -290,6 +291,7 @@
4069
290
291
4070
291
            return easingCurve.value;
292
            return easingCurve.value;
4071
292
        }
293
        }
4072
294
4073
293
    }
295
    }
4074
294
296
4075
295
    transform: [
297
    transform: [
4076
@@ -303,18 +305,22 @@
4077
303
            xScale: priv.scale
305
            xScale: priv.scale
4078
304
            yScale: xScale
306
            yScale: xScale
4079
305
        },
307
        },
4080
308
        Scale {
4081
309
            origin { x: 0; y: (spreadView.height * priv.scale) + maximizedAppTopMargin * 3 }
4082
310
            xScale: 1
4083
311
            yScale: isFullscreen ? 1 - priv.topMarginProgress * maximizedAppTopMargin / spreadView.height : 1
4084
312
        },
4085
306
        Translate {
313
        Translate {
4086
307
            x: priv.xTranslate
314
            x: priv.xTranslate
4087
308
        }
315
        }
4088
309
    ]
316
    ]
4089
310
    opacity: priv.opacity
317
    opacity: priv.opacity
4090
311
    topMarginProgress: priv.topMarginProgress
4091
312
318
4092
313
    EasingCurve {
319
    EasingCurve {
4093
314
        id: easingCurve
320
        id: easingCurve
4094
315
        type: EasingCurve.OutSine
321
        type: EasingCurve.OutSine
4095
316
        period: 1 - spreadView.positionMarker2
322
        period: 1 - spreadView.positionMarker2
4097
317
        progress: root.animatedProgress
323
        progress: root.progress
4098
318
    }
324
    }
4099
319
325
4100
320
    // This is used as a calculation helper to figure values for progress other than the current one
326
    // This is used as a calculation helper to figure values for progress other than the current one
4101
321
327
4102
=== added file 'qml/Stages/TransformedTabletSpreadDelegate.qml'
4103
--- qml/Stages/TransformedTabletSpreadDelegate.qml	1970-01-01 00:00:00 +0000
4104
+++ qml/Stages/TransformedTabletSpreadDelegate.qml	2014-07-29 14:07:22 +0000
4105
@@ -0,0 +1,369 @@
4106
1
/*
4107
2
 * Copyright 2014 Canonical Ltd.
4108
3
 *
4109
4
 * This program is free software; you can redistribute it and/or modify
4110
5
 * it under the terms of the GNU Lesser General Public License as published by
4111
6
 * the Free Software Foundation; version 3.
4112
7
 *
4113
8
 * This program is distributed in the hope that it will be useful,
4114
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4115
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4116
11
 * GNU Lesser General Public License for more details.
4117
12
 *
4118
13
 * You should have received a copy of the GNU Lesser General Public License
4119
14
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4120
15
 *
4121
16
 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
4122
17
*/
4123
18
4124
19
import QtQuick 2.0
4125
20
import Utils 0.1
4126
21
import Ubuntu.Components 0.1
4127
22
import Unity.Application 0.1
4128
23
4129
24
SpreadDelegate {
4130
25
    id: root
4131
26
4132
27
    // Set this to true when this tile is selected in the spread. The animation will change to bring the tile to front.
4133
28
    property bool selected: false
4134
29
    // Set this to true when another tile in the spread is selected. The animation will change to fade this tile out.
4135
30
    property bool otherSelected: false
4136
31
    // Set this to true when this tile a currently active on either the MS or the SS.
4137
32
    property bool active: false
4138
33
4139
34
    property int zIndex
4140
35
    property real progress: 0
4141
36
    property real animatedProgress: 0
4142
37
4143
38
    property real startDistance: units.gu(5)
4144
39
    property real endDistance: units.gu(.5)
4145
40
4146
41
    property real startScale: 1.1
4147
42
    property real endScale: 0.7
4148
43
    property real dragStartScale: startScale + .2
4149
44
4150
45
    property real startAngle: 15
4151
46
    property real endAngle: 5
4152
47
4153
48
    property bool isInSideStage: false
4154
49
4155
50
    onSelectedChanged: {
4156
51
        if (selected) {
4157
52
            priv.snapshot();
4158
53
        }
4159
54
        priv.isSelected = selected;
4160
55
    }
4161
56
4162
57
    onOtherSelectedChanged: {
4163
58
        if (otherSelected) {
4164
59
            priv.snapshot();
4165
60
        }
4166
61
        priv.otherSelected = otherSelected;
4167
62
    }
4168
63
4169
64
    Connections {
4170
65
        target: spreadView
4171
66
4172
67
        onPhaseChanged: {
4173
68
            if (spreadView.phase == 1) {
4174
69
                var phase2Progress = spreadView.positionMarker4 - (root.zIndex * spreadView.tileDistance / spreadView.width);
4175
70
                priv.phase2StartTranslate = priv.easingAnimation(0, 1, 0, -spreadView.width + (root.zIndex * root.endDistance), phase2Progress);
4176
71
                priv.phase2StartScale = priv.easingAnimation(0, 1, root.startScale, root.endScale, phase2Progress);
4177
72
                priv.phase2StartAngle = priv.easingAnimation(0, 1, root.startAngle, root.endAngle, phase2Progress);
4178
73
                priv.phase2StartTopMarginProgress = priv.easingAnimation(0, 1, 0, 1, phase2Progress);
4179
74
            }
4180
75
        }
4181
76
    }
4182
77
4183
78
    // Required to be an item because we're using states on it.
4184
79
    Item {
4185
80
        id: priv
4186
81
4187
82
        // true if this is the next tile on the stack that comes in when dragging from the right
4188
83
        property bool nextInStack: spreadView.nextZInStack == zIndex
4189
84
        // true if the next tile in the stack is the nextInStack one. This one will be moved a bit to the left
4190
85
        property bool movedActive: spreadView.nextZInStack == zIndex + 1
4191
86
        property real animatedEndDistance: linearAnimation(0, 2, root.endDistance, 0, root.progress)
4192
87
4193
88
        property real phase2StartTranslate
4194
89
        property real phase2StartScale
4195
90
        property real phase2StartAngle
4196
91
        property real phase2StartTopMarginProgress
4197
92
4198
93
        property bool isSelected: false
4199
94
        property bool otherSelected: false
4200
95
        property real selectedProgress
4201
96
        property real selectedXTranslate
4202
97
        property real selectedAngle
4203
98
        property real selectedScale
4204
99
        property real selectedOpacity
4205
100
        property real selectedTopMarginProgress
4206
101
4207
102
        function snapshot() {
4208
103
            selectedProgress = root.progress;
4209
104
            selectedXTranslate = xTranslate;
4210
105
            selectedAngle = angle;
4211
106
            selectedScale = priv.scale;
4212
107
            selectedOpacity = priv.opacityTransform;
4213
108
            selectedTopMarginProgress = topMarginProgress;
4214
109
        }
4215
110
4216
111
        // This calculates how much negative progress there can be if unwinding the spread completely
4217
112
        // the progress for each tile starts at 0 when it crosses the right edge, so the later a tile comes in,
4218
113
        // the bigger its negativeProgress can be.
4219
114
        property real negativeProgress: {
4220
115
            if (nextInStack && spreadView.phase < 2) {
4221
116
                return 0;
4222
117
            }
4223
118
            return -root.zIndex * spreadView.tileDistance / spreadView.width;
4224
119
        }
4225
120
4226
121
        function linearAnimation(startProgress, endProgress, startValue, endValue, progress) {
4227
122
            // progress : progressDiff = value : valueDiff => value = progress * valueDiff / progressDiff
4228
123
            return (progress - startProgress) * (endValue - startValue) / (endProgress - startProgress) + startValue;
4229
124
        }
4230
125
4231
126
        function easingAnimation(startProgress, endProgress, startValue, endValue, progress) {
4232
127
            helperEasingCurve.progress = progress - startProgress;
4233
128
            helperEasingCurve.period = endProgress - startProgress;
4234
129
            return helperEasingCurve.value * (endValue - startValue) + startValue;
4235
130
        }
4236
131
4237
132
        property real xTranslate: {
4238
133
            var newTranslate = 0;
4239
134
4240
135
            if (otherSelected) {
4241
136
                return priv.selectedXTranslate;
4242
137
            }
4243
138
4244
139
            if (isSelected) {
4245
140
                if (model.stage == ApplicationInfoInterface.MainStage) {
4246
141
                    return linearAnimation(selectedProgress, negativeProgress, selectedXTranslate, -spreadView.width, root.progress);
4247
142
                } else {
4248
143
                    return linearAnimation(selectedProgress, negativeProgress, selectedXTranslate, -spreadView.sideStageWidth, root.progress);
4249
144
                }
4250
145
            }
4251
146
4252
147
            // The tile should move a bit to the left if a new one comes on top of it, but not for the Side Stage and not
4253
148
            // when we're only dragging the side stage in on top of a main stage app
4254
149
            var shouldMoveAway = spreadView.nextInStack >= 0 && priv.movedActive && model.stage === ApplicationInfoInterface.MainStage &&
4255
150
                    ApplicationManager.get(spreadView.nextInStack).stage === ApplicationInfoInterface.MainStage;
4256
151
4257
152
            if (active) {
4258
153
                newTranslate -= root.width
4259
154
                // Only do the hide animation for active apps in the mainstage, and not if we only drag the ss in
4260
155
                if (spreadView.phase == 0 && shouldMoveAway) {
4261
156
                    newTranslate += linearAnimation(0, spreadView.positionMarker2, 0, -units.gu(4), root.animatedProgress);
4262
157
                }
4263
158
            }
4264
159
            if (nextInStack && spreadView.phase == 0) {
4265
160
                if (model.stage == ApplicationInfoInterface.MainStage) {
4266
161
                    if (spreadView.sideStageVisible && root.progress > 0) {
4267
162
                        // Move it so it appears from behind the side stage immediately
4268
163
                        newTranslate += -spreadView.sideStageWidth;
4269
164
                    }
4270
165
                }
4271
166
4272
167
                if (model.stage == ApplicationInfoInterface.SideStage && !spreadView.sideStageVisible) {
4273
168
                    // This is when we only drag the side stage in, without rotation or snapping
4274
169
                    newTranslate = linearAnimation(0, spreadView.positionMarker2, 0, -spreadView.sideStageWidth, root.progress);
4275
170
                } else {
4276
171
                    newTranslate += linearAnimation(0, spreadView.positionMarker2, 0, -spreadView.sideStageWidth * spreadView.snapPosition, root.animatedProgress);
4277
172
                }
4278
173
            }
4279
174
4280
175
            if (spreadView.phase == 1) {
4281
176
                if (nextInStack) {
4282
177
                    if (model.stage == ApplicationInfoInterface.MainStage) {
4283
178
                        var startValue = -spreadView.sideStageWidth * spreadView.snapPosition + (spreadView.sideStageVisible ? -spreadView.sideStageWidth : 0);
4284
179
                        newTranslate += linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4, startValue, priv.phase2StartTranslate, root.animatedProgress);
4285
180
                    } else {
4286
181
                        var endValue = -spreadView.width + spreadView.width * root.zIndex / 6;
4287
182
                        if (!spreadView.sideStageVisible) {
4288
183
                            newTranslate += linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4, -spreadView.sideStageWidth, priv.phase2StartTranslate, root.progress);
4289
184
                        } else {
4290
185
                            newTranslate += linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4, -spreadView.sideStageWidth * spreadView.snapPosition, priv.phase2StartTranslate, root.animatedProgress);
4291
186
                        }
4292
187
                    }
4293
188
                } else if (root.active) {
4294
189
                    var startProgress = spreadView.positionMarker2 - (zIndex * spreadView.positionMarker2 / 2);
4295
190
                    var endProgress = spreadView.positionMarker4 - (zIndex * spreadView.tileDistance / spreadView.width);
4296
191
                    var startTranslate = -root.width + (shouldMoveAway ? -units.gu(4) : 0);
4297
192
                    newTranslate = linearAnimation(startProgress, endProgress, startTranslate, priv.phase2StartTranslate, root.progress);
4298
193
                } else {
4299
194
                    var startProgress = spreadView.positionMarker2 - (zIndex * spreadView.positionMarker2 / 2);
4300
195
                    var endProgress = spreadView.positionMarker4 - (zIndex * spreadView.tileDistance / spreadView.width);
4301
196
                    newTranslate = linearAnimation(startProgress, endProgress, 0, priv.phase2StartTranslate, root.progress);
4302
197
                }
4303
198
            }
4304
199
4305
200
            if (spreadView.phase == 2) {
4306
201
                newTranslate = -easingCurve.value * (spreadView.width - root.zIndex * animatedEndDistance);
4307
202
            }
4308
203
4309
204
            return newTranslate;
4310
205
        }
4311
206
4312
207
        property real scale: {
4313
208
            if (otherSelected) {
4314
209
                return selectedScale;
4315
210
            }
4316
211
4317
212
            if (isSelected) {
4318
213
                return linearAnimation(selectedProgress, negativeProgress, selectedScale, 1, root.progress);
4319
214
            }
4320
215
4321
216
            if (spreadView.phase == 0) {
4322
217
                if (nextInStack) {
4323
218
                    if (model.stage == ApplicationInfoInterface.SideStage && !spreadView.sideStageVisible) {
4324
219
                        return 1;
4325
220
                    } else {
4326
221
                        var targetScale = root.dragStartScale - ((root.dragStartScale - 1) * spreadView.snapPosition);
4327
222
                        return linearAnimation(0, spreadView.positionMarker2, root.dragStartScale, targetScale, root.animatedProgress);
4328
223
                    }
4329
224
                } else if (active) {
4330
225
                    return 1;
4331
226
                } else {
4332
227
                    return linearAnimation(0, spreadView.positionMarker2, root.startScale, root.endScale, root.progress);
4333
228
                }
4334
229
            }
4335
230
4336
231
            if (spreadView.phase == 1) {
4337
232
                if (nextInStack) {
4338
233
                    var startScale = 1;
4339
234
                    if (model.stage !== ApplicationInfoInterface.SideStage || spreadView.sideStageVisible) {
4340
235
                        startScale = root.dragStartScale - ((root.dragStartScale - 1) * spreadView.snapPosition);
4341
236
                    }
4342
237
                    return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4, startScale, priv.phase2StartScale, root.animatedProgress);
4343
238
                }
4344
239
                var startProgress = spreadView.positionMarker2 - (zIndex * spreadView.positionMarker2 / 2);
4345
240
                var endProgress = spreadView.positionMarker4 - (zIndex * spreadView.tileDistance / spreadView.width);
4346
241
                return linearAnimation(startProgress, endProgress, 1, priv.phase2StartScale, root.animatedProgress);
4347
242
            }
4348
243
4349
244
            if (spreadView.phase == 2) {
4350
245
                return root.startScale - easingCurve.value * (root.startScale - root.endScale);
4351
246
            }
4352
247
4353
248
            return 1;
4354
249
        }
4355
250
4356
251
        property real angle: {
4357
252
            if (otherSelected) {
4358
253
                return selectedAngle;
4359
254
            }
4360
255
            if (isSelected) {
4361
256
                return linearAnimation(selectedProgress, negativeProgress, selectedAngle, 0, root.progress);
4362
257
            }
4363
258
4364
259
            // The tile should rotate a bit when another one comes on top, but not when only dragging the side stage in
4365
260
            var shouldMoveAway = spreadView.nextInStack >= 0 && movedActive &&
4366
261
                    (ApplicationManager.get(spreadView.nextInStack).stage === ApplicationInfoInterface.MainStage ||
4367
262
                     model.stage == ApplicationInfoInterface.SideStage);
4368
263
4369
264
            if (spreadView.phase == 0) {
4370
265
                if (nextInStack) {
4371
266
                    if (model.stage == ApplicationInfoInterface.SideStage && !spreadView.sideStageVisible) {
4372
267
                        return 0;
4373
268
                    } else {
4374
269
                        return linearAnimation(0, spreadView.positionMarker2, root.startAngle, root.startAngle * (1-spreadView.snapPosition), root.animatedProgress);
4375
270
                    }
4376
271
                }
4377
272
                if (shouldMoveAway) {
4378
273
                    return linearAnimation(0, spreadView.positionMarker2, 0, root.startAngle * (1-spreadView.snapPosition), root.animatedProgress);
4379
274
                }
4380
275
            }
4381
276
            if (spreadView.phase == 1) {
4382
277
                if (nextInStack) {
4383
278
                    if (model.stage == ApplicationInfoInterface.SideStage && !spreadView.sideStageVisible) {
4384
279
                        return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4, 0, priv.phase2StartAngle, root.animatedProgress);
4385
280
                    } else {
4386
281
                        return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4, root.startAngle * (1-spreadView.snapPosition), priv.phase2StartAngle, root.animatedProgress);
4387
282
                    }
4388
283
                }
4389
284
                var startProgress = spreadView.positionMarker2 - (zIndex * spreadView.positionMarker2 / 2);
4390
285
                var endProgress = spreadView.positionMarker4 - (zIndex * spreadView.tileDistance / spreadView.width);
4391
286
                var startAngle = shouldMoveAway ? root.startAngle * (1-spreadView.snapPosition) : 0;
4392
287
                return linearAnimation(startProgress, endProgress, startAngle, priv.phase2StartAngle, root.progress);
4393
288
            }
4394
289
            if (spreadView.phase == 2) {
4395
290
                return root.startAngle - easingCurve.value * (root.startAngle - root.endAngle);
4396
291
            }
4397
292
4398
293
            return 0;
4399
294
        }
4400
295
4401
296
        property real opacityTransform: {
4402
297
            if (otherSelected && spreadView.phase == 2) {
4403
298
                return linearAnimation(selectedProgress, negativeProgress, selectedOpacity, 0, root.progress);
4404
299
            }
4405
300
4406
301
            return 1;
4407
302
        }
4408
303
4409
304
        property real topMarginProgress: {
4410
305
            if (priv.isSelected) {
4411
306
                return linearAnimation(selectedProgress, negativeProgress, selectedTopMarginProgress, 0, root.progress);
4412
307
            }
4413
308
            switch (spreadView.phase) {
4414
309
            case 0:
4415
310
                return 0;
4416
311
            case 1:
4417
312
                return linearAnimation(spreadView.positionMarker2, spreadView.positionMarker4,
4418
313
                                       0, priv.phase2StartTopMarginProgress, root.progress);
4419
314
            }
4420
315
            return 1;
4421
316
        }
4422
317
4423
318
        states: [
4424
319
            State {
4425
320
                name: "sideStageDragging"; when: spreadView.sideStageDragging && root.isInSideStage
4426
321
                PropertyChanges { target: priv; xTranslate: -spreadView.sideStageWidth + spreadView.sideStageWidth * spreadView.sideStageDragProgress }
4427
322
            }
4428
323
        ]
4429
324
    }
4430
325
4431
326
    transform: [
4432
327
        Rotation {
4433
328
            origin { x: 0; y: spreadView.height / 2 }
4434
329
            axis { x: 0; y: 1; z: 0 }
4435
330
            angle: priv.angle
4436
331
        },
4437
332
        Scale {
4438
333
            origin { x: 0; y: spreadView.height / 2 }
4439
334
            xScale: priv.scale
4440
335
            yScale: xScale
4441
336
        },
4442
337
        Scale {
4443
338
            origin { x: 0; y: (spreadView.height * priv.scale) + maximizedAppTopMargin * 3 }
4444
339
            xScale: 1
4445
340
            yScale: isFullscreen ? 1 - priv.topMarginProgress * maximizedAppTopMargin / spreadView.height : 1
4446
341
        },
4447
342
        Translate {
4448
343
            x: priv.xTranslate
4449
344
        }
4450
345
    ]
4451
346
    opacity: priv.opacityTransform
4452
347
4453
348
    UbuntuNumberAnimation {
4454
349
        id: fadeBackInAnimation
4455
350
        target: root
4456
351
        property: "opacity"
4457
352
        duration: UbuntuAnimation.SlowDuration
4458
353
        from: 0
4459
354
        to: 1
4460
355
    }
4461
356
4462
357
    EasingCurve {
4463
358
        id: easingCurve
4464
359
        type: EasingCurve.OutSine
4465
360
        period: 1
4466
361
        progress: root.progress
4467
362
    }
4468
363
4469
364
    EasingCurve {
4470
365
        id: helperEasingCurve
4471
366
        type: easingCurve.type
4472
367
        period: easingCurve.period
4473
368
    }
4474
369
}
4475
0
370
4476
=== modified file 'src/CMakeLists.txt'
4477
--- src/CMakeLists.txt	2014-06-30 12:46:04 +0000
4478
+++ src/CMakeLists.txt	2014-07-29 14:07:22 +0000
4479
@@ -1,8 +1,5 @@
4480
1
pkg_check_modules(UNITY-MIR REQUIRED unity-mir)
4481
2
4482
3
include_directories(
1
include_directories(
4483
4
    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
2
    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
4484
5
    ${UNITY-MIR_INCLUDE_DIRS}
4485
6
)
3
)
4486
7
4
4487
8
file(GLOB_RECURSE QML_FILES
5
file(GLOB_RECURSE QML_FILES
4488
9
6
4489
=== modified file 'src/main.cpp'
4490
--- src/main.cpp	2014-07-22 12:46:06 +0000
4491
+++ src/main.cpp	2014-07-29 14:07:22 +0000
4492
@@ -1,5 +1,5 @@
4493
1
/*
1
/*
4495
2
 * Copyright (C) 2012 Canonical, Ltd.
2
 * Copyright (C) 2012-2014 Canonical, Ltd.
4496
3
 *
3
 *
4497
4
 * Authors:
4
 * Authors:
4498
5
 *  Gerry Boland <gerry.boland@canonical.com>
5
 *  Gerry Boland <gerry.boland@canonical.com>
4499
@@ -23,12 +23,9 @@
4500
23
#include <QtGui/QGuiApplication>
23
#include <QtGui/QGuiApplication>
4501
24
#include <QtQml/QQmlEngine>
24
#include <QtQml/QQmlEngine>
4502
25
#include <QtQml/QQmlContext>
25
#include <QtQml/QQmlContext>
4503
26
#include <qpa/qplatformnativeinterface.h>
4504
27
#include <QLibrary>
26
#include <QLibrary>
4505
28
#include <QDebug>
27
#include <QDebug>
4506
29
#include <libintl.h>
28
#include <libintl.h>
4507
30
#include <dlfcn.h>
4508
31
#include <csignal>
4509
32
29
4510
33
// local
30
// local
4511
34
#include <paths.h>
31
#include <paths.h>
4512
@@ -36,11 +33,13 @@
4513
36
#include "ApplicationArguments.h"
33
#include "ApplicationArguments.h"
4514
37
#include "CachingNetworkManagerFactory.h"
34
#include "CachingNetworkManagerFactory.h"
4515
38
35
4519
39
#include <unity-mir/qmirserver.h>
36
int main(int argc, const char *argv[])
4517
40
4518
41
int startShell(int argc, const char** argv, void* server)
4520
42
{
37
{
4522
43
    const bool isUbuntuMirServer = qgetenv("QT_QPA_PLATFORM") == "ubuntumirserver";
38
    bool isMirServer = false;
4523
39
    if (qgetenv("QT_QPA_PLATFORM") == "ubuntumirclient") {
4524
40
        setenv("QT_QPA_PLATFORM", "mirserver", 1 /* overwrite */);
4525
41
        isMirServer = true;
4526
42
    }
4527
44
43
4528
45
    QGuiApplication::setApplicationName("unity8");
44
    QGuiApplication::setApplicationName("unity8");
4529
46
    QGuiApplication *application;
45
    QGuiApplication *application;
4530
@@ -70,21 +69,7 @@
4531
70
Load the testability driver");
69
Load the testability driver");
4532
71
    parser.addOption(testabilityOption);
70
    parser.addOption(testabilityOption);
4533
72
71
4549
73
    if (isUbuntuMirServer) {
72
    application = new QGuiApplication(argc, (char**)argv);
4535
74
        QLibrary unityMir("unity-mir", 1);
4536
75
        unityMir.load();
4537
76
4538
77
        typedef QGuiApplication* (*createServerApplication_t)(int&, const char **, void*);
4539
78
        createServerApplication_t createQMirServerApplication = (createServerApplication_t) unityMir.resolve("createQMirServerApplication");
4540
79
        if (!createQMirServerApplication) {
4541
80
            qDebug() << "unable to resolve symbol: createQMirServerApplication";
4542
81
            return 4;
4543
82
        }
4544
83
4545
84
        application = createQMirServerApplication(argc, argv, server);
4546
85
    } else {
4547
86
        application = new QGuiApplication(argc, (char**)argv);
4548
87
    }
4550
88
73
4551
89
    // Treat args with single dashes the same as arguments with two dashes
74
    // Treat args with single dashes the same as arguments with two dashes
4552
90
    // Ex: -fullscreen == --fullscreen
75
    // Ex: -fullscreen == --fullscreen
4553
@@ -100,8 +85,8 @@
4554
100
    if (parser.isSet(windowGeometryOption) &&
85
    if (parser.isSet(windowGeometryOption) &&
4555
101
        parser.value(windowGeometryOption).split('x').size() == 2)
86
        parser.value(windowGeometryOption).split('x').size() == 2)
4556
102
    {
87
    {
4559
103
      QStringList geom = parser.value(windowGeometryOption).split('x');
88
        QStringList geom = parser.value(windowGeometryOption).split('x');
4560
104
      qmlArgs.setSize(geom.at(0).toInt(), geom.at(1).toInt());
89
        qmlArgs.setSize(geom.at(0).toInt(), geom.at(1).toInt());
4561
105
    }
90
    }
4562
106
91
4563
107
    // The testability driver is only loaded by QApplication but not by QGuiApplication.
92
    // The testability driver is only loaded by QApplication but not by QGuiApplication.
4564
@@ -125,7 +110,8 @@
4565
125
110
4566
126
    QQuickView* view = new QQuickView();
111
    QQuickView* view = new QQuickView();
4567
127
    view->setResizeMode(QQuickView::SizeRootObjectToView);
112
    view->setResizeMode(QQuickView::SizeRootObjectToView);
4569
128
    view->setTitle("Qml Phone Shell");
113
    view->setColor("black");
4570
114
    view->setTitle("Unity8 Shell");
4571
129
    view->engine()->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory()));
115
    view->engine()->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory()));
4572
130
    view->rootContext()->setContextProperty("applicationArguments", &qmlArgs);
116
    view->rootContext()->setContextProperty("applicationArguments", &qmlArgs);
4573
131
    view->rootContext()->setContextProperty("indicatorProfile", indicatorProfile);
117
    view->rootContext()->setContextProperty("indicatorProfile", indicatorProfile);
4574
@@ -141,18 +127,9 @@
4575
141
        application->installNativeEventFilter(mouseTouchAdaptor);
127
        application->installNativeEventFilter(mouseTouchAdaptor);
4576
142
    }
128
    }
4577
143
129
4578
144
    QPlatformNativeInterface* nativeInterface = QGuiApplication::platformNativeInterface();
4579
145
    /* Shell is declared as a system session so that it always receives all
4580
146
       input events.
4581
147
       FIXME: use the enum value corresponding to SYSTEM_SESSION_TYPE (= 1)
4582
148
       when it becomes available.
4583
149
    */
4584
150
    nativeInterface->setProperty("ubuntuSessionType", 1);
4585
151
    view->setProperty("role", 2); // INDICATOR_ACTOR_ROLE
4586
152
4587
153
    QUrl source(::qmlDirectory()+"Shell.qml");
130
    QUrl source(::qmlDirectory()+"Shell.qml");
4588
154
    prependImportPaths(view->engine(), ::overrideImportPaths());
131
    prependImportPaths(view->engine(), ::overrideImportPaths());
4590
155
    if (!isUbuntuMirServer) {
132
    if (!isMirServer) {
4591
156
        prependImportPaths(view->engine(), ::nonMirImportPaths());
133
        prependImportPaths(view->engine(), ::nonMirImportPaths());
4592
157
    }
134
    }
4593
158
    appendImportPaths(view->engine(), ::fallbackImportPaths());
135
    appendImportPaths(view->engine(), ::fallbackImportPaths());
4594
@@ -161,10 +138,9 @@
4595
161
    view->engine()->setNetworkAccessManagerFactory(managerFactory);
138
    view->engine()->setNetworkAccessManagerFactory(managerFactory);
4596
162
139
4597
163
    view->setSource(source);
140
    view->setSource(source);
4598
164
    view->setColor("transparent");
4599
165
    QObject::connect(view->engine(), SIGNAL(quit()), application, SLOT(quit()));
141
    QObject::connect(view->engine(), SIGNAL(quit()), application, SLOT(quit()));
4600
166
142
4602
167
    if (qgetenv("QT_QPA_PLATFORM") == "ubuntu" || isUbuntuMirServer || parser.isSet(fullscreenOption)) {
143
    if (isMirServer || parser.isSet(fullscreenOption)) {
4603
168
        view->showFullScreen();
144
        view->showFullScreen();
4604
169
    } else {
145
    } else {
4605
170
        view->show();
146
        view->show();
4606
@@ -178,54 +154,3 @@
4607
178
154
4608
179
    return result;
155
    return result;
4609
180
}
156
}
4610
181
4611
182
int main(int argc, const char *argv[])
4612
183
{
4613
184
    /* Workaround Qt platform integration plugin not advertising itself
4614
185
       as having the following capabilities:
4615
186
        - QPlatformIntegration::ThreadedOpenGL
4616
187
        - QPlatformIntegration::BufferQueueingOpenGL
4617
188
    */
4618
189
    setenv("QML_FORCE_THREADED_RENDERER", "1", 1);
4619
190
    setenv("QML_FIXED_ANIMATION_STEP", "1", 1);
4620
191
4621
192
    // For ubuntumirserver/ubuntumirclient
4622
193
    if (qgetenv("QT_QPA_PLATFORM").startsWith("ubuntumir")) {
4623
194
        setenv("QT_QPA_PLATFORM", "ubuntumirserver", 1);
4624
195
4625
196
        // If we use unity-mir directly, we automatically link to the Mir-server
4626
197
        // platform-api bindings, which result in unexpected behaviour when
4627
198
        // running the non-Mir scenario.
4628
199
        QLibrary unityMir("unity-mir", 1);
4629
200
        unityMir.load();
4630
201
        if (!unityMir.isLoaded()) {
4631
202
            qDebug() << "Library unity-mir not found/loaded";
4632
203
            return 1;
4633
204
        }
4634
205
4635
206
        typedef QMirServer* (*createServer_t)(int, const char **);
4636
207
        createServer_t createQMirServer = (createServer_t) unityMir.resolve("createQMirServer");
4637
208
        if (!createQMirServer) {
4638
209
            qDebug() << "unable to resolve symbol: createQMirServer";
4639
210
            return 2;
4640
211
        }
4641
212
4642
213
        QMirServer* mirServer = createQMirServer(argc, argv);
4643
214
4644
215
        typedef int (*runWithClient_t)(QMirServer*, std::function<int(int, const char**, void*)>);
4645
216
        runWithClient_t runWithClient = (runWithClient_t) unityMir.resolve("runQMirServerWithClient");
4646
217
        if (!runWithClient) {
4647
218
            qDebug() << "unable to resolve symbol: runWithClient";
4648
219
            return 3;
4649
220
        }
4650
221
4651
222
        return runWithClient(mirServer, startShell);
4652
223
    } else {
4653
224
        if (!qgetenv("UNITY_MIR_EMITS_SIGSTOP").isEmpty()) {
4654
225
            // Emit SIGSTOP as expected by upstart, under Mir it's unity-mir that will raise it.
4655
226
            // see http://upstart.ubuntu.com/cookbook/#expect-stop
4656
227
            raise(SIGSTOP);
4657
228
        }
4658
229
        return startShell(argc, argv, nullptr);
4659
230
    }
4660
231
}
4661
232
157
4662
=== modified file 'tests/mocks/Unity/Application/Application.qmltypes'
4663
--- tests/mocks/Unity/Application/Application.qmltypes	2014-06-26 08:26:58 +0000
4664
+++ tests/mocks/Unity/Application/Application.qmltypes	2014-07-29 14:07:22 +0000
4665
@@ -102,8 +102,6 @@
4666
102
                "ForceMainStage": 1
102
                "ForceMainStage": 1
4667
103
            }
103
            }
4668
104
        }
104
        }
4669
105
        Property { name: "keyboardHeight"; type: "int"; isReadonly: true }
4670
106
        Property { name: "keyboardVisible"; type: "bool"; isReadonly: true }
4671
107
        Property { name: "sideStageWidth"; type: "int"; isReadonly: true }
105
        Property { name: "sideStageWidth"; type: "int"; isReadonly: true }
4672
108
        Property { name: "stageHint"; type: "StageHint"; isReadonly: true }
106
        Property { name: "stageHint"; type: "StageHint"; isReadonly: true }
4673
109
        Property { name: "formFactorHint"; type: "FormFactorHint"; isReadonly: true }
107
        Property { name: "formFactorHint"; type: "FormFactorHint"; isReadonly: true }
4674
110
108
4675
=== added file 'tests/mocks/Unity/Application/ApplicationDBusAdaptor.cpp'
4676
--- tests/mocks/Unity/Application/ApplicationDBusAdaptor.cpp	1970-01-01 00:00:00 +0000
4677
+++ tests/mocks/Unity/Application/ApplicationDBusAdaptor.cpp	2014-07-29 14:07:22 +0000
4678
@@ -0,0 +1,75 @@
4679
1
/*
4680
2
 * Copyright (C) 2014 Canonical, Ltd.
4681
3
 *
4682
4
 * This program is free software; you can redistribute it and/or modify
4683
5
 * it under the terms of the GNU General Public License as published by
4684
6
 * the Free Software Foundation; version 3.
4685
7
 *
4686
8
 * This program is distributed in the hope that it will be useful,
4687
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4688
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4689
11
 * GNU General Public License for more details.
4690
12
 *
4691
13
 * You should have received a copy of the GNU General Public License
4692
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4693
15
 */
4694
16
4695
17
#include "ApplicationInfo.h"
4696
18
#include "ApplicationDBusAdaptor.h"
4697
19
#include "ApplicationManager.h"
4698
20
#include "SurfaceManager.h"
4699
21
#include "MirSurfaceItem.h"
4700
22
4701
23
quint32 nextId = 0;
4702
24
4703
25
ApplicationDBusAdaptor::ApplicationDBusAdaptor(ApplicationManager* applicationManager)
4704
26
    : QDBusAbstractAdaptor(applicationManager)
4705
27
    , m_applicationManager(applicationManager)
4706
28
{
4707
29
}
4708
30
4709
31
MirSurfaceItem* topSurface(MirSurfaceItem* surface)
4710
32
{
4711
33
    if (!surface)
4712
34
        return nullptr;
4713
35
4714
36
    MirSurfaceItem* child = NULL;
4715
37
    Q_FOREACH (MirSurfaceItem *childSurface, surface->childSurfaceList()) {
4716
38
        child = topSurface(childSurface);
4717
39
        if (child) {
4718
40
            break;
4719
41
        }
4720
42
    }
4721
43
    return child ? child : surface;
4722
44
}
4723
45
4724
46
quint32 ApplicationDBusAdaptor::addChildSurface(const QString &appId, const QString &surfaceImage)
4725
47
{
4726
48
    qDebug() << "ApplicationDBusAdaptor::addChildSurface - " << appId;
4727
49
4728
50
    ApplicationInfo* application = m_applicationManager->findApplication(appId);
4729
51
    if (!application) {
4730
52
        qDebug() << "ApplicationDBusAdaptor::addChildSurface - No application found for " << appId;
4731
53
        return 0;
4732
54
    }
4733
55
    quint32 surfaceId = ++nextId;
4734
56
    MirSurfaceItem* surface = new MirSurfaceItem(QString("ChildSurface%1").arg(surfaceId),
4735
57
                                                 MirSurfaceItem::Normal,
4736
58
                                                 MirSurfaceItem::Maximized,
4737
59
                                                 QUrl(surfaceImage));
4738
60
    m_childItems[surfaceId] = surface;
4739
61
    surface->setParentSurface(topSurface(application->surface()));
4740
62
    return surfaceId;
4741
63
}
4742
64
4743
65
void ApplicationDBusAdaptor::removeChildSurface(int surfaceId)
4744
66
{
4745
67
    qDebug() << "ApplicationDBusAdaptor::removeChildSurface - " << surfaceId;
4746
68
4747
69
    if (!m_childItems.contains(surfaceId)) {
4748
70
        qDebug() << "ApplicationDBusAdaptor::removeChildSurface - No added surface for " << surfaceId;
4749
71
        return;
4750
72
    }
4751
73
    MirSurfaceItem* surface = m_childItems.take(surfaceId);
4752
74
    Q_EMIT surface->removed();
4753
75
}
4754
0
76
4755
=== added file 'tests/mocks/Unity/Application/ApplicationDBusAdaptor.h'
4756
--- tests/mocks/Unity/Application/ApplicationDBusAdaptor.h	1970-01-01 00:00:00 +0000
4757
+++ tests/mocks/Unity/Application/ApplicationDBusAdaptor.h	2014-07-29 14:07:22 +0000
4758
@@ -0,0 +1,43 @@
4759
1
/*
4760
2
 * Copyright (C) 2014 Canonical, Ltd.
4761
3
 *
4762
4
 * This program is free software; you can redistribute it and/or modify
4763
5
 * it under the terms of the GNU General Public License as published by
4764
6
 * the Free Software Foundation; version 3.
4765
7
 *
4766
8
 * This program is distributed in the hope that it will be useful,
4767
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4768
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4769
11
 * GNU General Public License for more details.
4770
12
 *
4771
13
 * You should have received a copy of the GNU General Public License
4772
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4773
15
 */
4774
16
4775
17
#ifndef APPLICATIONDBUSADAPTOR_H
4776
18
#define APPLICATIONDBUSADAPTOR_H
4777
19
4778
20
#include <QtDBus/QtDBus>
4779
21
4780
22
class ApplicationManager;
4781
23
class SurfaceManager;
4782
24
class MirSurfaceItem;
4783
25
4784
26
class ApplicationDBusAdaptor : public QDBusAbstractAdaptor
4785
27
{
4786
28
    Q_OBJECT
4787
29
    Q_CLASSINFO("D-Bus Interface", "com.canonical.Unity8.Mocks.Application")
4788
30
public:
4789
31
    ApplicationDBusAdaptor(ApplicationManager* applicationManager);
4790
32
4791
33
public Q_SLOTS:
4792
34
    quint32 addChildSurface(const QString& appId, const QString& surfaceImage);
4793
35
    void removeChildSurface(int surfaceId);
4794
36
4795
37
private:
4796
38
    ApplicationManager* m_applicationManager;
4797
39
4798
40
    QHash<quint32, MirSurfaceItem*> m_childItems;
4799
41
};
4800
42
4801
43
#endif // APPLICATIONDBUSADAPTOR_H
4802
0
44
4803
=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.cpp'
4804
--- tests/mocks/Unity/Application/ApplicationInfo.cpp	2014-03-20 10:02:52 +0000
4805
+++ tests/mocks/Unity/Application/ApplicationInfo.cpp	2014-07-29 14:07:22 +0000
4806
@@ -1,5 +1,5 @@
4807
1
/*
1
/*
4809
2
 * Copyright (C) 2013 Canonical, Ltd.
2
 * Copyright (C) 2013-2014 Canonical, Ltd.
4810
3
 *
3
 *
4811
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
4812
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
4813
@@ -15,6 +15,8 @@
4814
15
 */
15
 */
4815
16
16
4816
17
#include "ApplicationInfo.h"
17
#include "ApplicationInfo.h"
4817
18
#include "MirSurfaceItem.h"
4818
19
#include "SurfaceManager.h"
4819
18
20
4820
19
#include <QGuiApplication>
21
#include <QGuiApplication>
4821
20
#include <QQuickItem>
22
#include <QQuickItem>
4822
@@ -24,29 +26,39 @@
4823
24
26
4824
25
ApplicationInfo::ApplicationInfo(const QString &appId, QObject *parent)
27
ApplicationInfo::ApplicationInfo(const QString &appId, QObject *parent)
4825
26
    : ApplicationInfoInterface(appId, parent)
28
    : ApplicationInfoInterface(appId, parent)
4834
27
    ,m_appId(appId)
29
    , m_appId(appId)
4835
28
    ,m_stage(MainStage)
30
    , m_stage(MainStage)
4836
29
    ,m_state(Starting)
31
    , m_state(Starting)
4837
30
    ,m_focused(false)
32
    , m_focused(false)
4838
31
    ,m_fullscreen(false)
33
    , m_fullscreen(false)
4839
32
    ,m_windowItem(0)
34
    , m_windowItem(0)
4840
33
    ,m_windowComponent(0)
35
    , m_windowComponent(0)
4841
34
    ,m_parentItem(0)
36
    , m_parentItem(0)
4842
37
    , m_surface(0)
4843
35
{
38
{
4845
36
    QTimer::singleShot(300, this, SLOT(setRunning()));
39
    connect(this, &ApplicationInfo::stateChanged, this, &ApplicationInfo::onStateChanged);
4846
37
}
40
}
4847
38
41
4848
39
ApplicationInfo::ApplicationInfo(QObject *parent)
42
ApplicationInfo::ApplicationInfo(QObject *parent)
4849
40
    : ApplicationInfoInterface(QString(), parent)
43
    : ApplicationInfoInterface(QString(), parent)
4859
41
     ,m_stage(MainStage)
44
    , m_stage(MainStage)
4860
42
     ,m_state(Starting)
45
    , m_state(Starting)
4861
43
     ,m_focused(false)
46
    , m_focused(false)
4862
44
     ,m_fullscreen(false)
47
    , m_fullscreen(false)
4863
45
     ,m_windowItem(0)
48
    , m_windowItem(0)
4864
46
     ,m_windowComponent(0)
49
    , m_windowComponent(0)
4865
47
     ,m_parentItem(0)
50
    , m_parentItem(0)
4866
48
{
51
    , m_surface(0)
4867
49
    QTimer::singleShot(300, this, SLOT(setRunning()));
52
{
4868
53
    connect(this, &ApplicationInfo::stateChanged, this, &ApplicationInfo::onStateChanged);
4869
54
}
4870
55
4871
56
ApplicationInfo::~ApplicationInfo()
4872
57
{
4873
58
    if (m_surface) {
4874
59
        Q_EMIT SurfaceManager::singleton()->surfaceDestroyed(m_surface);
4875
60
        m_surface->deleteLater();
4876
61
    }
4877
50
}
62
}
4878
51
63
4879
52
void ApplicationInfo::onWindowComponentStatusChanged(QQmlComponent::Status status)
64
void ApplicationInfo::onWindowComponentStatusChanged(QQmlComponent::Status status)
4880
@@ -55,10 +67,46 @@
4881
55
        doCreateWindowItem();
67
        doCreateWindowItem();
4882
56
}
68
}
4883
57
69
4888
58
void ApplicationInfo::setRunning()
70
void ApplicationInfo::onStateChanged(State state)
4889
59
{
71
{
4890
60
    m_state = Running;
72
    if (state == ApplicationInfo::Running) {
4891
61
    Q_EMIT stateChanged();
73
        QTimer::singleShot(1000, this, SLOT(createSurface()));
4892
74
    } else if (state == ApplicationInfo::Stopped) {
4893
75
        setSurface(nullptr);
4894
76
    }
4895
77
}
4896
78
4897
79
void ApplicationInfo::createSurface()
4898
80
{
4899
81
    if (m_surface || state() == ApplicationInfo::Stopped) return;
4900
82
4901
83
    setSurface(new MirSurfaceItem(name(),
4902
84
                                   MirSurfaceItem::Normal,
4903
85
                                   fullscreen() ? MirSurfaceItem::Fullscreen : MirSurfaceItem::Maximized,
4904
86
                                   screenshot()));
4905
87
}
4906
88
4907
89
void ApplicationInfo::setSurface(MirSurfaceItem* surface)
4908
90
{
4909
91
    if (m_surface == surface)
4910
92
        return;
4911
93
4912
94
    if (m_surface) {
4913
95
        m_surface->setApplication(nullptr);
4914
96
        m_surface->setParent(nullptr);
4915
97
        SurfaceManager::singleton()->unregisterSurface(m_surface);
4916
98
    }
4917
99
4918
100
    m_surface = surface;
4919
101
4920
102
    if (m_surface) {
4921
103
        m_surface->setApplication(this);
4922
104
        m_surface->setParent(this);
4923
105
        SurfaceManager::singleton()->registerSurface(m_surface);
4924
106
    }
4925
107
4926
108
    Q_EMIT surfaceChanged(m_surface);
4927
109
    SurfaceManager::singleton()->registerSurface(m_surface);
4928
62
}
110
}
4929
63
111
4930
64
void ApplicationInfo::createWindowComponent()
112
void ApplicationInfo::createWindowComponent()
4931
65
113
4932
=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.h'
4933
--- tests/mocks/Unity/Application/ApplicationInfo.h	2014-03-20 10:02:52 +0000
4934
+++ tests/mocks/Unity/Application/ApplicationInfo.h	2014-07-29 14:07:22 +0000
4935
@@ -1,5 +1,5 @@
4936
1
/*
1
/*
4938
2
 * Copyright (C) 2013 Canonical, Ltd.
2
 * Copyright (C) 2013-2014 Canonical, Ltd.
4939
3
 *
3
 *
4940
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
4941
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
4942
@@ -21,6 +21,7 @@
4943
21
#include <QQmlComponent>
21
#include <QQmlComponent>
4944
22
22
4945
23
class QQuickItem;
23
class QQuickItem;
4946
24
class MirSurfaceItem;
4947
24
25
4948
25
// unity-api
26
// unity-api
4949
26
#include <unity/shell/application/ApplicationInfoInterface.h>
27
#include <unity/shell/application/ApplicationInfoInterface.h>
4950
@@ -36,6 +37,7 @@
4951
36
37
4952
37
    Q_PROPERTY(bool fullscreen READ fullscreen WRITE setFullscreen NOTIFY fullscreenChanged)
38
    Q_PROPERTY(bool fullscreen READ fullscreen WRITE setFullscreen NOTIFY fullscreenChanged)
4953
38
    Q_PROPERTY(Stage stage READ stage WRITE setStage NOTIFY stageChanged)
39
    Q_PROPERTY(Stage stage READ stage WRITE setStage NOTIFY stageChanged)
4954
40
    Q_PROPERTY(MirSurfaceItem* surface READ surface NOTIFY surfaceChanged)
4955
39
41
4956
40
    // Only exists in this fake implementation
42
    // Only exists in this fake implementation
4957
41
43
4958
@@ -45,9 +47,10 @@
4959
45
    // QML component used to represent the application window
47
    // QML component used to represent the application window
4960
46
    Q_PROPERTY(QString windowQml READ windowQml WRITE setWindowQml NOTIFY windowQmlChanged)
48
    Q_PROPERTY(QString windowQml READ windowQml WRITE setWindowQml NOTIFY windowQmlChanged)
4961
47
49
4963
48
 public:
50
public:
4964
49
    ApplicationInfo(QObject *parent = NULL);
51
    ApplicationInfo(QObject *parent = NULL);
4965
50
    ApplicationInfo(const QString &appId, QObject *parent = NULL);
52
    ApplicationInfo(const QString &appId, QObject *parent = NULL);
4966
53
    ~ApplicationInfo();
4967
51
54
4968
52
    #define IMPLEMENT_PROPERTY(name, Name, type) \
55
    #define IMPLEMENT_PROPERTY(name, Name, type) \
4969
53
    public: \
56
    public: \
4970
@@ -56,11 +59,11 @@
4971
56
    { \
59
    { \
4972
57
        if (m_##name != value) { \
60
        if (m_##name != value) { \
4973
58
            m_##name = value; \
61
            m_##name = value; \
4975
59
            Q_EMIT name##Changed(); \
62
            Q_EMIT name##Changed(value); \
4976
60
        } \
63
        } \
4977
61
    } \
64
    } \
4978
62
    Q_SIGNALS: \
65
    Q_SIGNALS: \
4980
63
    void name##Changed(); \
66
    void name##Changed(const type&); \
4981
64
    private: \
67
    private: \
4982
65
    type m_##name;
68
    type m_##name;
4983
66
69
4984
@@ -78,21 +81,31 @@
4985
78
81
4986
79
    #undef IMPLEMENT_PROPERTY
82
    #undef IMPLEMENT_PROPERTY
4987
80
83
4989
81
 public:
84
public:
4990
85
    void setSurface(MirSurfaceItem* surface);
4991
86
    MirSurfaceItem* surface() const { return m_surface; }
4992
87
4993
88
Q_SIGNALS:
4994
89
    void surfaceChanged(MirSurfaceItem*);
4995
90
4996
91
public:
4997
82
    void showWindow(QQuickItem *parent);
92
    void showWindow(QQuickItem *parent);
4998
83
    void hideWindow();
93
    void hideWindow();
4999
84
94
5000
85
 private Q_SLOTS:
Reviewer	Review Type	Date Requested	Status
Gerry Boland (community)		2014-07-18	Approve on 2014-07-29
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-07-25
Michael Zanetti (community)	c++ code review		Approve on 2014-07-18
Michael Terry	debian-packaging	2014-07-02	Approve on 2014-07-15
Vesa Rautiainen (community)	design	2014-07-08	Approve on 2014-07-08
Review via email: mp+225378@code.launchpad.net