1
=== modified file 'plugins/Unity/Session/CMakeLists.txt'
2
--- plugins/Unity/Session/CMakeLists.txt	2014-06-13 13:13:16 +0000
3
+++ plugins/Unity/Session/CMakeLists.txt	2014-09-12 19:54:38 +0000
4
@@ -1,10 +1,16 @@
5
1
include(FindPkgConfig)
6
2
7
3
pkg_search_module(GIO REQUIRED gio-2.0)
8
4
9
1
include_directories(
5
include_directories(
10
2
    ${CMAKE_CURRENT_SOURCE_DIR}
6
    ${CMAKE_CURRENT_SOURCE_DIR}
11
7
    ${GIO_INCLUDE_DIRS}
12
3
)
8
)
13
4
9
14
5
set(QMLSESSIONPLUGIN_SRC
10
set(QMLSESSIONPLUGIN_SRC
15
6
    plugin.cpp
11
    plugin.cpp
16
7
    dbusunitysessionservice.cpp
12
    dbusunitysessionservice.cpp
17
13
    orientationlock.cpp
18
8
    )
14
    )
19
9
15
20
10
add_library(UnitySession-qml MODULE
16
add_library(UnitySession-qml MODULE
21
@@ -12,6 +18,7 @@
22
12
    )
18
    )
23
13
19
24
14
qt5_use_modules(UnitySession-qml DBus Qml)
20
qt5_use_modules(UnitySession-qml DBus Qml)
25
21
target_link_libraries(UnitySession-qml ${GIO_LDFLAGS})
26
15
22
27
16
# export the qmldir and qmltypes files
23
# export the qmldir and qmltypes files
28
17
add_unity8_plugin(Unity.Session 0.1 Unity/Session TARGETS UnitySession-qml)
24
add_unity8_plugin(Unity.Session 0.1 Unity/Session TARGETS UnitySession-qml)
29
18
25
30
=== added file 'plugins/Unity/Session/orientationlock.cpp'
31
--- plugins/Unity/Session/orientationlock.cpp	1970-01-01 00:00:00 +0000
32
+++ plugins/Unity/Session/orientationlock.cpp	2014-09-12 19:54:38 +0000
33
@@ -0,0 +1,74 @@
34
1
/*
35
2
 * Copyright (C) 2014 Canonical, Ltd.
36
3
 *
37
4
 * This program is free software: you can redistribute it and/or modify it under
38
5
 * the terms of the GNU Lesser General Public License version 3, as published by
39
6
 * the Free Software Foundation.
40
7
 *
41
8
 * This program is distributed in the hope that it will be useful, but WITHOUT
42
9
 * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
43
10
 * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
44
11
 * Lesser General Public License for more details.
45
12
 *
46
13
 * You should have received a copy of the GNU Lesser General Public License
47
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
48
15
 */
49
16
50
17
#include "orientationlock.h"
51
18
52
19
#include <QDBusConnection>
53
20
#include <QDBusInterface>
54
21
55
22
OrientationLock::OrientationLock(QObject *parent)
56
23
    : QObject(parent)
57
24
    , m_enabled(false)
58
25
    , m_savedOrientation(Qt::PortraitOrientation)
59
26
{
60
27
    systemSettings = g_settings_new("com.ubuntu.touch.system");
61
28
    g_signal_connect(systemSettings, "changed::rotation-lock",
62
29
                     G_CALLBACK(OrientationLock::onEnabledChangedProxy), this);
63
30
    m_enabled = g_settings_get_boolean(systemSettings, "rotation-lock");
64
31
}
65
32
66
33
OrientationLock::~OrientationLock()
67
34
{
68
35
    g_signal_handlers_disconnect_by_data(systemSettings, this);
69
36
    g_object_unref(systemSettings);
70
37
}
71
38
72
39
bool OrientationLock::enabled() const
73
40
{
74
41
    return m_enabled;
75
42
}
76
43
77
44
Qt::ScreenOrientation OrientationLock::savedOrientation() const
78
45
{
79
46
    return m_savedOrientation;
80
47
}
81
48
82
49
void OrientationLock::onEnabledChangedProxy(GSettings */*settings*/, const gchar */*key*/, gpointer data)
83
50
{
84
51
    OrientationLock* _this = static_cast<OrientationLock*>(data);
85
52
    _this->onEnabledChanged();
86
53
}
87
54
88
55
void OrientationLock::onEnabledChanged()
89
56
{
90
57
    const bool enabled = g_settings_get_boolean(systemSettings, "rotation-lock");
91
58
    if (m_enabled != enabled) {
92
59
        m_enabled = enabled;
93
60
        Q_EMIT enabledChanged();
94
61
    }
95
62
}
96
63
97
64
void OrientationLock::setSavedOrientation(const Qt::ScreenOrientation orientation)
98
65
{
99
66
    if (orientation == m_savedOrientation) {
100
67
        return;
101
68
    }
102
69
103
70
    m_savedOrientation = orientation;
104
71
105
72
    //TODO - save value with dbus to persist over sessions
106
73
    Q_EMIT savedOrientationChanged();
107
74
}
108
0
75
109
=== added file 'plugins/Unity/Session/orientationlock.h'
110
--- plugins/Unity/Session/orientationlock.h	1970-01-01 00:00:00 +0000
111
+++ plugins/Unity/Session/orientationlock.h	2014-09-12 19:54:38 +0000
112
@@ -0,0 +1,62 @@
113
1
/*
114
2
 * Copyright (C) 2014 Canonical, Ltd.
115
3
 *
116
4
 * This program is free software: you can redistribute it and/or modify it under
117
5
 * the terms of the GNU Lesser General Public License version 3, as published by
118
6
 * the Free Software Foundation.
119
7
 *
120
8
 * This program is distributed in the hope that it will be useful, but WITHOUT
121
9
 * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
122
10
 * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
123
11
 * Lesser General Public License for more details.
124
12
 *
125
13
 * You should have received a copy of the GNU Lesser General Public License
126
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
127
15
 */
128
16
129
17
#ifndef ORIENTATIONLOCK_H
130
18
#define ORIENTATIONLOCK_H
131
19
132
20
#include <gio/gio.h>
133
21
#include <QtCore/QObject>
134
22
#include <QtDBus/QDBusInterface>
135
23
136
24
/**
137
25
 * @brief The OrientationLock class exports orientation lock related properties to QML
138
26
 * It has two properties:
139
27
 *    - readonly boolean with the Orientation lock property state
140
28
 *    - Qt::ScreenOrientation to save the locked orientation state across Sessions (only relevant if lock is true)
141
29
 */
142
30
class OrientationLock : public QObject
143
31
{
144
32
    Q_OBJECT
145
33
146
34
    Q_PROPERTY(bool enabled READ enabled NOTIFY enabledChanged)
147
35
    Q_PROPERTY(Qt::ScreenOrientation savedOrientation READ savedOrientation WRITE setSavedOrientation
148
36
                   NOTIFY savedOrientationChanged)
149
37
150
38
public:
151
39
    explicit OrientationLock(QObject *parent = 0);
152
40
    ~OrientationLock();
153
41
154
42
    bool enabled() const;
155
43
    Qt::ScreenOrientation savedOrientation() const;
156
44
    void setSavedOrientation(const Qt::ScreenOrientation orientation);
157
45
158
46
Q_SIGNALS:
159
47
    void enabledChanged();
160
48
    void savedOrientationChanged();
161
49
162
50
private Q_SLOTS:
163
51
    static void onEnabledChangedProxy(GSettings *settings, const gchar *key, gpointer data);
164
52
    void onEnabledChanged();
165
53
166
54
private:
167
55
    QDBusInterface *dbusInterface;
168
56
    GSettings *systemSettings;
169
57
170
58
    bool m_enabled;
171
59
    Qt::ScreenOrientation m_savedOrientation;
172
60
};
173
61
174
62
#endif // ORIENTATIONLOCK_H
175
0
63
176
=== modified file 'plugins/Unity/Session/plugin.cpp'
177
--- plugins/Unity/Session/plugin.cpp	2014-05-07 15:21:51 +0000
178
+++ plugins/Unity/Session/plugin.cpp	2014-09-12 19:54:38 +0000
179
@@ -18,23 +18,27 @@
180
18
18
181
19
#include "plugin.h"
19
#include "plugin.h"
182
20
#include "dbusunitysessionservice.h"
20
#include "dbusunitysessionservice.h"
183
21
#include "orientationlock.h"
184
21
22
185
22
#include <QAbstractItemModel>
23
#include <QAbstractItemModel>
186
23
#include <QDBusConnection>
24
#include <QDBusConnection>
187
24
#include <QtQml/qqml.h>
25
#include <QtQml/qqml.h>
188
25
26
190
26
static QObject *dbusunitysessionservice_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
27
static QObject *dbusunitysessionservice_provider(QQmlEngine */*engine*/, QJSEngine */*jsEngine*/)
191
27
{
28
{
192
28
    Q_UNUSED(engine)
193
29
    Q_UNUSED(scriptEngine)
194
30
195
31
    return new DBusUnitySessionService();
29
    return new DBusUnitySessionService();
196
32
}
30
}
197
33
31
198
32
static QObject *orientationlock_provider(QQmlEngine */*engine*/, QJSEngine */*jsEngine*/)
199
33
{
200
34
    return new OrientationLock();
201
35
}
202
36
203
34
void SessionPlugin::registerTypes(const char *uri)
37
void SessionPlugin::registerTypes(const char *uri)
204
35
{
38
{
205
36
    qmlRegisterType<QAbstractItemModel>();
39
    qmlRegisterType<QAbstractItemModel>();
206
37
40
207
38
    Q_ASSERT(uri == QLatin1String("Unity.Session"));
41
    Q_ASSERT(uri == QLatin1String("Unity.Session"));
208
39
    qmlRegisterSingletonType<DBusUnitySessionService>(uri, 0, 1, "DBusUnitySessionService", dbusunitysessionservice_provider);
42
    qmlRegisterSingletonType<DBusUnitySessionService>(uri, 0, 1, "DBusUnitySessionService", dbusunitysessionservice_provider);
209
43
    qmlRegisterSingletonType<OrientationLock>(uri, 0, 1, "OrientationLock", orientationlock_provider);
210
40
}
44
}
211
41
45
212
=== modified file 'qml/Shell.qml'
213
--- qml/Shell.qml	2014-09-08 14:15:51 +0000
214
+++ qml/Shell.qml	2014-09-12 19:54:38 +0000
215
@@ -15,6 +15,7 @@
216
15
 */
15
 */
217
16
16
218
17
import QtQuick 2.0
17
import QtQuick 2.0
219
18
import QtQuick.Window 2.0
220
18
import AccountsService 0.1
19
import AccountsService 0.1
221
19
import GSettings 1.0
20
import GSettings 1.0
222
20
import Unity.Application 0.1
21
import Unity.Application 0.1
223
@@ -61,6 +62,22 @@
224
61
    property int failedLoginsDelayAttempts: 7 // number of failed logins
62
    property int failedLoginsDelayAttempts: 7 // number of failed logins
225
62
    property int failedLoginsDelaySeconds: 5 * 60 // seconds of forced waiting
63
    property int failedLoginsDelaySeconds: 5 * 60 // seconds of forced waiting
226
63
64
227
65
    property int orientation
228
66
    readonly property int deviceOrientationAngle: Screen.angleBetween(Screen.primaryOrientation, Screen.orientation)
229
67
    onDeviceOrientationAngleChanged: {
230
68
        if (!OrientationLock.enabled) {
231
69
            orientation = Screen.orientation;
232
70
        }
233
71
    }
234
72
    readonly property bool orientationLockEnabled: OrientationLock.enabled
235
73
    onOrientationLockEnabledChanged: {
236
74
        if (orientationLockEnabled) {
237
75
            OrientationLock.savedOrientation = Screen.orientation;
238
76
        } else {
239
77
            orientation = Screen.orientation;
240
78
        }
241
79
    }
242
80
243
64
    function activateApplication(appId) {
81
    function activateApplication(appId) {
244
65
        if (ApplicationManager.findApplication(appId)) {
82
        if (ApplicationManager.findApplication(appId)) {
245
66
            ApplicationManager.requestFocusApplication(appId);
83
            ApplicationManager.requestFocusApplication(appId);
246
@@ -85,6 +102,9 @@
247
85
102
248
86
    Component.onCompleted: {
103
    Component.onCompleted: {
249
87
        Theme.name = "Ubuntu.Components.Themes.SuruGradient"
104
        Theme.name = "Ubuntu.Components.Themes.SuruGradient"
250
105
        if (orientationLockEnabled) {
251
106
            orientation = OrientationLock.savedOrientation;
252
107
        }
253
88
    }
108
    }
254
89
109
255
90
    GSettings {
110
    GSettings {
256
@@ -207,6 +227,11 @@
257
207
                property: "inverseProgress"
227
                property: "inverseProgress"
258
208
                value: launcher.progress
228
                value: launcher.progress
259
209
            }
229
            }
260
230
            Binding {
261
231
                target: applicationsDisplayLoader.item
262
232
                property: "orientation"
263
233
                value: shell.orientation
264
234
            }
265
210
        }
235
        }
266
211
    }
236
    }
267
212
237
268
213
238
269
=== modified file 'qml/Stages/ApplicationWindow.qml'
270
--- qml/Stages/ApplicationWindow.qml	2014-09-03 16:38:10 +0000
271
+++ qml/Stages/ApplicationWindow.qml	2014-09-12 19:54:38 +0000
272
@@ -27,6 +27,7 @@
273
27
27
274
28
    // to be set from outside
28
    // to be set from outside
275
29
    property QtObject application
29
    property QtObject application
276
30
    property int orientation
277
30
31
278
31
    QtObject {
32
    QtObject {
279
32
        id: d
33
        id: d
280
@@ -111,6 +112,7 @@
281
111
        id: sessionContainer
112
        id: sessionContainer
282
112
        session: application ? application.session : null
113
        session: application ? application.session : null
283
113
        anchors.fill: parent
114
        anchors.fill: parent
284
115
        orientation: root.orientation
285
114
116
286
115
        onSurfaceChanged: {
117
        onSurfaceChanged: {
287
116
            if (sessionContainer.surface) {
118
            if (sessionContainer.surface) {
288
117
119
289
=== modified file 'qml/Stages/PhoneStage.qml'
290
--- qml/Stages/PhoneStage.qml	2014-09-02 14:57:05 +0000
291
+++ qml/Stages/PhoneStage.qml	2014-09-12 19:54:38 +0000
292
@@ -18,6 +18,7 @@
293
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 0.1
294
19
import Ubuntu.Gestures 0.1
19
import Ubuntu.Gestures 0.1
295
20
import Unity.Application 0.1
20
import Unity.Application 0.1
296
21
import Unity.Session 0.1
297
21
import Utils 0.1
22
import Utils 0.1
298
22
import "../Components"
23
import "../Components"
299
23
24
300
@@ -30,6 +31,7 @@
301
30
    property bool interactive
31
    property bool interactive
302
31
    property bool spreadEnabled: true // If false, animations and right edge will be disabled
32
    property bool spreadEnabled: true // If false, animations and right edge will be disabled
303
32
    property real inverseProgress: 0 // This is the progress for left edge drags, in pixels.
33
    property real inverseProgress: 0 // This is the progress for left edge drags, in pixels.
304
34
    property int orientation: Qt.PortraitOrientation
305
33
35
306
34
    color: "black"
36
    color: "black"
307
35
37
308
@@ -372,6 +374,13 @@
309
372
                        progress: appDelegate.progress - spreadView.positionMarker1
374
                        progress: appDelegate.progress - spreadView.positionMarker1
310
373
                    }
375
                    }
311
374
376
312
377
                    Binding {
313
378
                        target: appDelegate
314
379
                        property: "orientation"
315
380
                        when: appDelegate.interactive
316
381
                        value: root.orientation
317
382
                    }
318
383
319
375
                    onClicked: {
384
                    onClicked: {
320
376
                        if (spreadView.phase == 2) {
385
                        if (spreadView.phase == 2) {
321
377
                            if (ApplicationManager.focusedApplicationId == ApplicationManager.get(index).appId) {
386
                            if (ApplicationManager.focusedApplicationId == ApplicationManager.get(index).appId) {
322
378
387
323
=== modified file 'qml/Stages/SessionContainer.qml'
324
--- qml/Stages/SessionContainer.qml	2014-09-02 15:51:04 +0000
325
+++ qml/Stages/SessionContainer.qml	2014-09-12 19:54:38 +0000
326
@@ -24,12 +24,14 @@
327
24
    readonly property var childSessions: session ? session.childSessions : null
24
    readonly property var childSessions: session ? session.childSessions : null
328
25
    readonly property alias surface: _surfaceContainer.surface
25
    readonly property alias surface: _surfaceContainer.surface
329
26
    property bool interactive: true
26
    property bool interactive: true
330
27
    property int orientation
331
27
28
332
28
    readonly property alias surfaceContainer: _surfaceContainer
29
    readonly property alias surfaceContainer: _surfaceContainer
333
29
    SurfaceContainer {
30
    SurfaceContainer {
334
30
        id: _surfaceContainer
31
        id: _surfaceContainer
335
31
        anchors.fill: parent
32
        anchors.fill: parent
336
32
        surface: session ? session.surface : null
33
        surface: session ? session.surface : null
337
34
        orientation: root.orientation
338
33
    }
35
    }
339
34
36
340
35
    Binding {
37
    Binding {
341
@@ -74,6 +76,11 @@
342
74
                target: item; when: item
76
                target: item; when: item
343
75
                property: "height"; value: root.height
77
                property: "height"; value: root.height
344
76
            }
78
            }
345
79
346
80
            Binding {
347
81
                target: item; when: item
348
82
                property: "orientation"; value: root.orientation
349
83
            }
350
77
        }
84
        }
351
78
    }
85
    }
352
79
86
353
80
87
354
=== modified file 'qml/Stages/SpreadDelegate.qml'
355
--- qml/Stages/SpreadDelegate.qml	2014-08-27 20:58:10 +0000
356
+++ qml/Stages/SpreadDelegate.qml	2014-09-12 19:54:38 +0000
357
@@ -36,6 +36,7 @@
358
36
    property alias swipeToCloseEnabled: dragArea.enabled
36
    property alias swipeToCloseEnabled: dragArea.enabled
359
37
    property bool closeable
37
    property bool closeable
360
38
    property alias application: appWindow.application
38
    property alias application: appWindow.application
361
39
    property int orientation
362
39
40
363
40
    Item {
41
    Item {
364
41
        objectName: "appWindowWithShadow"
42
        objectName: "appWindowWithShadow"
365
@@ -62,6 +63,7 @@
366
62
            }
63
            }
367
63
64
368
64
            interactive: root.interactive
65
            interactive: root.interactive
369
66
            orientation: root.orientation
370
65
        }
67
        }
371
66
    }
68
    }
372
67
69
373
68
70
374
=== modified file 'qml/Stages/SurfaceContainer.qml'
375
--- qml/Stages/SurfaceContainer.qml	2014-09-01 12:48:57 +0000
376
+++ qml/Stages/SurfaceContainer.qml	2014-09-12 19:54:38 +0000
377
@@ -22,6 +22,7 @@
378
22
    objectName: "surfaceContainer"
22
    objectName: "surfaceContainer"
379
23
    property Item surface: null
23
    property Item surface: null
380
24
    property bool hadSurface: false
24
    property bool hadSurface: false
381
25
    property int orientation
382
25
26
383
26
    onSurfaceChanged: {
27
    onSurfaceChanged: {
384
27
        if (surface) {
28
        if (surface) {
385
@@ -34,6 +35,10 @@
386
34
        target: surface
35
        target: surface
387
35
        property: "anchors.fill"; value: root
36
        property: "anchors.fill"; value: root
388
36
    }
37
    }
389
38
    Binding {
390
39
        target: surface
391
40
        property: "orientation"; value: root.orientation
392
41
    }
393
37
42
394
38
    states: [
43
    states: [
395
39
        State {
44
        State {
396
40
45
397
=== modified file 'qml/Stages/TabletStage.qml'
398
--- qml/Stages/TabletStage.qml	2014-09-02 18:10:49 +0000
399
+++ qml/Stages/TabletStage.qml	2014-09-12 19:54:38 +0000
400
@@ -34,6 +34,7 @@
401
34
    property real maximizedAppTopMargin
34
    property real maximizedAppTopMargin
402
35
    property bool interactive
35
    property bool interactive
403
36
    property real inverseProgress: 0 // This is the progress for left edge drags, in pixels.
36
    property real inverseProgress: 0 // This is the progress for left edge drags, in pixels.
404
37
    property int orientation: Qt.PortraitOrientation
405
37
38
406
38
    onInverseProgressChanged: {
39
    onInverseProgressChanged: {
407
39
        // This can't be a simple binding because that would be triggered after this handler
40
        // This can't be a simple binding because that would be triggered after this handler
408
@@ -535,6 +536,13 @@
409
535
                        return progress;
536
                        return progress;
410
536
                    }
537
                    }
411
537
538
412
539
                    Binding {
413
540
                        target: spreadTile
414
541
                        property: "orientation"
415
542
                        when: spreadTile.interactive
416
543
                        value: root.orientation
417
544
                    }
418
545
419
538
                    onClicked: {
546
                    onClicked: {
420
539
                        if (spreadView.phase == 2) {
547
                        if (spreadView.phase == 2) {
421
540
                            spreadView.snapTo(index);
548
                            spreadView.snapTo(index);
422
541
549
423
=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.cpp'
424
--- tests/mocks/Unity/Application/MirSurfaceItem.cpp	2014-08-29 14:50:49 +0000
425
+++ tests/mocks/Unity/Application/MirSurfaceItem.cpp	2014-09-12 19:54:38 +0000
426
@@ -39,6 +39,7 @@
427
39
    , m_type(type)
39
    , m_type(type)
428
40
    , m_state(state)
40
    , m_state(state)
429
41
    , m_live(true)
41
    , m_live(true)
430
42
    , m_orientation(Qt::PortraitOrientation)
431
42
    , m_qmlItem(nullptr)
43
    , m_qmlItem(nullptr)
432
43
    , m_screenshotUrl(screenshot)
44
    , m_screenshotUrl(screenshot)
433
44
{
45
{
434
@@ -108,6 +109,19 @@
435
108
    }
109
    }
436
109
}
110
}
437
110
111
438
112
void MirSurfaceItem::setOrientation(const Qt::ScreenOrientation orientation)
439
113
{
440
114
    if (m_orientation == orientation)
441
115
        return;
442
116
443
117
    m_orientation = orientation;
444
118
445
119
    QQmlProperty orientationProp(m_qmlItem, "orientation");
446
120
    orientationProp.write(QVariant::fromValue(orientation));
447
121
448
122
    Q_EMIT orientationChanged();
449
123
}
450
124
451
111
void MirSurfaceItem::setSession(Session* session)
125
void MirSurfaceItem::setSession(Session* session)
452
112
{
126
{
453
113
    m_session = session;
127
    m_session = session;
454
114
128
455
=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.h'
456
--- tests/mocks/Unity/Application/MirSurfaceItem.h	2014-09-01 12:24:06 +0000
457
+++ tests/mocks/Unity/Application/MirSurfaceItem.h	2014-09-12 19:54:38 +0000
458
@@ -34,6 +34,7 @@
459
34
    Q_PROPERTY(State state READ state NOTIFY stateChanged)
34
    Q_PROPERTY(State state READ state NOTIFY stateChanged)
460
35
    Q_PROPERTY(QString name READ name CONSTANT)
35
    Q_PROPERTY(QString name READ name CONSTANT)
461
36
    Q_PROPERTY(bool live READ live NOTIFY liveChanged)
36
    Q_PROPERTY(bool live READ live NOTIFY liveChanged)
462
37
    Q_PROPERTY(Qt::ScreenOrientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged DESIGNABLE false)
463
37
38
464
38
public:
39
public:
465
39
    enum Type {
40
    enum Type {
466
@@ -64,6 +65,9 @@
467
64
    State state() const { return m_state; }
65
    State state() const { return m_state; }
468
65
    QString name() const { return m_name; }
66
    QString name() const { return m_name; }
469
66
    bool live() const { return m_live; }
67
    bool live() const { return m_live; }
470
68
    Qt::ScreenOrientation orientation() const { return m_orientation; }
471
69
472
70
    void setOrientation(const Qt::ScreenOrientation orientation);
473
67
71
474
68
    void setSession(Session* item);
72
    void setSession(Session* item);
475
69
    void setScreenshot(const QUrl& screenshot);
73
    void setScreenshot(const QUrl& screenshot);
476
@@ -76,6 +80,7 @@
477
76
    void typeChanged(Type);
80
    void typeChanged(Type);
478
77
    void stateChanged(State);
81
    void stateChanged(State);
479
78
    void liveChanged(bool live);
82
    void liveChanged(bool live);
480
83
    void orientationChanged();
481
79
84
482
80
    void inputMethodRequested();
85
    void inputMethodRequested();
483
81
    void inputMethodDismissed();
86
    void inputMethodDismissed();
484
@@ -104,6 +109,7 @@
485
104
    const Type m_type;
109
    const Type m_type;
486
105
    State m_state;
110
    State m_state;
487
106
    bool m_live;
111
    bool m_live;
488
112
    Qt::ScreenOrientation m_orientation;
489
107
113
490
108
    QQmlComponent *m_qmlContentComponent;
114
    QQmlComponent *m_qmlContentComponent;
491
109
    QQuickItem *m_qmlItem;
115
    QQuickItem *m_qmlItem;
492
@@ -114,5 +120,6 @@
493
114
120
494
115
Q_DECLARE_METATYPE(MirSurfaceItem*)
121
Q_DECLARE_METATYPE(MirSurfaceItem*)
495
116
Q_DECLARE_METATYPE(QList<MirSurfaceItem*>)
122
Q_DECLARE_METATYPE(QList<MirSurfaceItem*>)
496
123
Q_DECLARE_METATYPE(Qt::ScreenOrientation)
497
117
124
498
118
#endif // MIRSURFACEITEM_H
125
#endif // MIRSURFACEITEM_H
499
119
126
500
=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.qml'
501
--- tests/mocks/Unity/Application/MirSurfaceItem.qml	2014-08-18 16:59:08 +0000
502
+++ tests/mocks/Unity/Application/MirSurfaceItem.qml	2014-09-12 19:54:38 +0000
503
@@ -21,12 +21,22 @@
504
21
    id: root
21
    id: root
505
22
    color: "pink"
22
    color: "pink"
506
23
23
507
24
    anchors.fill: parent
508
25
509
26
    implicitWidth: units.gu(40)
24
    implicitWidth: units.gu(40)
510
27
    implicitHeight: units.gu(70)
25
    implicitHeight: units.gu(70)
511
28
26
512
27
    rotation: {
513
28
        if (orientation == Qt.PortraitOrientation) return 0;
514
29
        else if (orientation == Qt.LandscapeOrientation) return 90;
515
30
        else if (orientation == Qt.InvertedPortraitOrientation) return 180;
516
31
        else return 270;
517
32
    }
518
33
    x: parent ? (parent.width - width) / 2 : 0
519
34
    y: parent ? (parent.height - height) / 2 : 0
520
35
    width: parent ? (rotation == 0 || rotation == 180 ? parent.width : parent.height) : implicitWidth
521
36
    height: parent ? (rotation == 0 || rotation == 180 ? parent.height : parent.width) : implicitHeight
522
37
523
29
    property alias screenshotSource: screenshotImage.source
38
    property alias screenshotSource: screenshotImage.source
524
39
    property int orientation: Qt.PortraitOrientation
525
30
40
526
31
    property bool wantInputMethod: false
41
    property bool wantInputMethod: false
527
32
42
528
33
43
529
=== modified file 'tests/qmltests/Stages/tst_ApplicationWindow.qml'
530
--- tests/qmltests/Stages/tst_ApplicationWindow.qml	2014-09-02 23:25:33 +0000
531
+++ tests/qmltests/Stages/tst_ApplicationWindow.qml	2014-09-12 19:54:38 +0000
532
@@ -50,6 +50,7 @@
533
50
        ApplicationWindow {
50
        ApplicationWindow {
534
51
            anchors.fill: parent
51
            anchors.fill: parent
535
52
            application: fakeApplication
52
            application: fakeApplication
536
53
            orientation: Qt.PortraitOrientation
537
53
        }
54
        }
538
54
    }
55
    }
539
55
    FocusScope {
56
    FocusScope {
540
@@ -147,6 +148,24 @@
541
147
                }
148
                }
542
148
            }
149
            }
543
149
150
544
151
            Button {
545
152
                anchors { left: parent.left; right: parent.right }
546
153
                text: "Rotate device \u27F3"
547
154
                onClicked: {
548
155
                    var orientation = applicationWindowLoader.item.orientation
549
156
                    if (orientation == Qt.PortraitOrientation) {
550
157
                        orientation = Qt.LandscapeOrientation;
551
158
                    } else if (orientation == Qt.LandscapeOrientation) {
552
159
                        orientation = Qt.InvertedPortraitOrientation;
553
160
                    } else if (orientation == Qt.InvertedPortraitOrientation) {
554
161
                        orientation = Qt.InvertedLandscapeOrientation;
555
162
                    } else {
556
163
                        orientation = Qt.PortraitOrientation;
557
164
                    }
558
165
                    applicationWindowLoader.item.orientation = orientation;
559
166
                }
560
167
            }
561
168
562
150
        }
169
        }
563
151
    }
170
    }
564
152
171
565
153
172
566
=== modified file 'tests/qmltests/Stages/tst_PhoneStage.qml'
567
--- tests/qmltests/Stages/tst_PhoneStage.qml	2014-08-27 21:39:17 +0000
568
+++ tests/qmltests/Stages/tst_PhoneStage.qml	2014-09-12 19:54:38 +0000
569
@@ -31,6 +31,8 @@
570
31
        anchors { fill: parent; rightMargin: units.gu(30) }
31
        anchors { fill: parent; rightMargin: units.gu(30) }
571
32
        dragAreaWidth: units.gu(2)
32
        dragAreaWidth: units.gu(2)
572
33
        maximizedAppTopMargin: units.gu(3) + units.dp(2)
33
        maximizedAppTopMargin: units.gu(3) + units.dp(2)
573
34
        interactive: true
574
35
        orientation: Qt.PortraitOrientation
575
34
    }
36
    }
576
35
37
577
36
    Binding {
38
    Binding {
578
@@ -67,6 +69,21 @@
579
67
                    ApplicationManager.get(appList.selectedAppIndex).setState(ApplicationInfoInterface.Stopped);
69
                    ApplicationManager.get(appList.selectedAppIndex).setState(ApplicationInfoInterface.Stopped);
580
68
                }
70
                }
581
69
            }
71
            }
582
72
            Button {
583
73
                anchors { left: parent.left; right: parent.right }
584
74
                text: "Rotate device \u27F3"
585
75
                onClicked: {
586
76
                    if (phoneStage.orientation == Qt.PortraitOrientation) {
587
77
                        phoneStage.orientation = Qt.LandscapeOrientation;
588
78
                    } else if (phoneStage.orientation == Qt.LandscapeOrientation) {
589
79
                        phoneStage.orientation = Qt.InvertedPortraitOrientation;
590
80
                    } else if (phoneStage.orientation == Qt.InvertedPortraitOrientation) {
591
81
                        phoneStage.orientation = Qt.InvertedLandscapeOrientation;
592
82
                    } else {
593
83
                        phoneStage.orientation = Qt.PortraitOrientation;
594
84
                    }
595
85
                }
596
86
            }
597
70
        }
87
        }
598
71
        ListView {
88
        ListView {
599
72
            id: appList
89
            id: appList
600
@@ -256,6 +273,46 @@
601
256
            compare(ApplicationManager.focusedApplicationId, selectedApp.appId);
273
            compare(ApplicationManager.focusedApplicationId, selectedApp.appId);
602
257
        }
274
        }
603
258
275
604
276
        function test_orientation_change_sent_to_focused_app() {
605
277
            phoneStage.orientation = Qt.PortraitOrientation;
606
278
            addApps(1);
607
279
608
280
            var spreadView = findChild(phoneStage, "spreadView");
609
281
            var app = findChild(spreadView, "appDelegate0");
610
282
            tryCompare(app, "orientation", Qt.PortraitOrientation);
611
283
612
284
            phoneStage.orientation = Qt.LandscapeOrientation;
613
285
            tryCompare(app, "orientation", Qt.LandscapeOrientation);
614
286
        }
615
287
616
288
        function test_orientation_change_not_sent_to_apps_while_spread_open() {
617
289
            phoneStage.orientation = Qt.PortraitOrientation;
618
290
            addApps(1);
619
291
620
292
            var spreadView = findChild(phoneStage, "spreadView");
621
293
            var app = findChild(spreadView, "appDelegate0");
622
294
            tryCompare(app, "orientation", Qt.PortraitOrientation);
623
295
624
296
            goToSpread();
625
297
            phoneStage.orientation = Qt.LandscapeOrientation;
626
298
            tryCompare(app, "orientation", Qt.PortraitOrientation);
627
299
        }
628
300
629
301
        function test_orientation_change_not_sent_to_unfocused_app_until_it_focused() {
630
302
            phoneStage.orientation = Qt.PortraitOrientation;
631
303
            addApps(1);
632
304
633
305
            var spreadView = findChild(phoneStage, "spreadView");
634
306
            var app = findChild(spreadView, "appDelegate0");
635
307
636
308
            goToSpread();
637
309
            phoneStage.orientation = Qt.LandscapeOrientation;
638
310
            tryCompare(app, "orientation", Qt.PortraitOrientation);
639
311
640
312
            phoneStage.select(app.application.appId);
641
313
            tryCompare(app, "orientation", Qt.LandscapeOrientation);
642
314
        }
643
315
644
259
        function cleanup() {
316
        function cleanup() {
645
260
            while (ApplicationManager.count > 1) {
317
            while (ApplicationManager.count > 1) {
646
261
                var oldCount = ApplicationManager.count;
318
                var oldCount = ApplicationManager.count;
647
@@ -263,6 +320,7 @@
648
263
                ApplicationManager.stopApplication(ApplicationManager.get(closingIndex).appId)
320
                ApplicationManager.stopApplication(ApplicationManager.get(closingIndex).appId)
649
264
                tryCompare(ApplicationManager, "count", oldCount - 1)
321
                tryCompare(ApplicationManager, "count", oldCount - 1)
650
265
            }
322
            }
651
323
            phoneStage.orientation = Qt.PortraitOrientation;
652
266
        }
324
        }
653
267
    }
325
    }
654
268
}
326
}
655
269
327
656
=== modified file 'tests/qmltests/Stages/tst_SessionContainer.qml'
657
--- tests/qmltests/Stages/tst_SessionContainer.qml	2014-09-02 15:51:20 +0000
658
+++ tests/qmltests/Stages/tst_SessionContainer.qml	2014-09-12 19:54:38 +0000
659
@@ -41,6 +41,7 @@
660
41
        SessionContainer {
41
        SessionContainer {
661
42
            id: sessionContainer
42
            id: sessionContainer
662
43
            anchors.fill: parent
43
            anchors.fill: parent
663
44
            orientation: Qt.PortraitOrientation
664
44
        }
45
        }
665
45
    }
46
    }
666
46
47
667
@@ -112,6 +113,24 @@
668
112
                    session: sessionContainerLoader.item ? sessionContainerLoader.item.session : null
113
                    session: sessionContainerLoader.item ? sessionContainerLoader.item.session : null
669
113
                }
114
                }
670
114
            }
115
            }
671
116
672
117
            Button {
673
118
                anchors { left: parent.left; right: parent.right }
674
119
                text: "Rotate device \u27F3"
675
120
                onClicked: {
676
121
                    var orientation = sessionContainerLoader.item.orientation
677
122
                    if (orientation == Qt.PortraitOrientation) {
678
123
                        orientation = Qt.LandscapeOrientation;
679
124
                    } else if (orientation == Qt.LandscapeOrientation) {
680
125
                        orientation = Qt.InvertedPortraitOrientation;
681
126
                    } else if (orientation == Qt.InvertedPortraitOrientation) {
682
127
                        orientation = Qt.InvertedLandscapeOrientation;
683
128
                    } else {
684
129
                        orientation = Qt.PortraitOrientation;
685
130
                    }
686
131
                    sessionContainerLoader.item.orientation = orientation;
687
132
                }
688
133
            }
689
115
        }
134
        }
690
116
    }
135
    }
691
117
136
692
@@ -263,5 +282,49 @@
693
263
            // wait for animation to end
282
            // wait for animation to end
694
264
            tryCompareFunction(function() { return isContainerAnimating(childContainer); }, false);
283
            tryCompareFunction(function() { return isContainerAnimating(childContainer); }, false);
695
265
        }
284
        }
696
285
697
286
        function test_orientationPropagatedToChildren_data() {
698
287
            return [ { tag: "count=1", count: 1 },
699
288
                     { tag: "count=4", count: 4 } ];
700
289
        }
701
290
702
291
        /* Test orientation changes are propagated to all children immediately */
703
292
        function test_orientationPropagatedToChildren(data) {
704
293
            sessionCheckbox.checked = true;
705
294
            var rootSessionContainer = sessionContainerLoader.item;
706
295
            compare(rootSessionContainer.childSessions.count(), 0);
707
296
708
297
            var i;
709
298
            var sessions = [];
710
299
            for (i = 0; i < data.count; i++) {
711
300
                var session = ApplicationTest.addChildSession(rootSessionContainer.session,
712
301
                                                              "gallery");
713
302
                session.createSurface();
714
303
                rootSessionContainer.session.addChildSession(session);
715
304
716
305
                // Check child SessionContainer has orientation matching the parent
717
306
                var delegate = findChild(rootSessionContainer, "childDelegate" + i);
718
307
                var childSessionContainer = findChild(delegate, "sessionContainer");
719
308
720
309
                tryCompare(rootSessionContainer, "orientation", childSessionContainer.orientation);
721
310
722
311
                sessions.push(session);
723
312
            }
724
313
725
314
            // Change orientation and verify all children updated
726
315
            rootSessionContainer.orientation = Qt.LandscapeOrientation;
727
316
728
317
            for (i = 0; i < data.count; i++) {
729
318
                var delegate = findChild(rootSessionContainer, "childDelegate" + i);
730
319
                var childSessionContainer = findChild(delegate, "sessionContainer");
731
320
732
321
                tryCompare(rootSessionContainer, "orientation", childSessionContainer.orientation);
733
322
            }
734
323
735
324
            // Clean up
736
325
            for (i = data.count-1; i >= 0; i--) {
737
326
                ApplicationTest.removeSession(sessions[i]);
738
327
            }
739
328
        }
740
266
    }
329
    }
741
267
}
330
}
Reviewer	Review Type	Date Requested	Status
Daniel d'Andrada (community)		2014-08-27	Approve on 2014-09-12
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-09-11
Review via email: mp+232484@code.launchpad.net