1
=== modified file 'components.api'
2
--- components.api	2017-02-21 14:57:05 +0000
3
+++ components.api	2017-02-27 15:48:33 +0000
4
@@ -1635,6 +1635,7 @@
5
1635
Ubuntu.Components.UCApplication 1.0 0.1: QtObject
1635
Ubuntu.Components.UCApplication 1.0 0.1: QtObject
6
1636
    property string applicationName
1636
    property string applicationName
7
1637
    property QtObject inputMethod
1637
    property QtObject inputMethod
8
1638
    property Qt.LayoutDirection layoutDirection
9
1638
Ubuntu.Components.UCFontUtils 1.0 0.1: QtObject
1639
Ubuntu.Components.UCFontUtils 1.0 0.1: QtObject
10
1639
    function double sizeToPixels(string size)
1640
    function double sizeToPixels(string size)
11
1640
    function double modularScale(string size)
1641
    function double modularScale(string size)
12
1641
1642
13
=== modified file 'examples/ubuntu-ui-toolkit-gallery/MainPage.qml'
14
--- examples/ubuntu-ui-toolkit-gallery/MainPage.qml	2016-06-17 13:42:23 +0000
15
+++ examples/ubuntu-ui-toolkit-gallery/MainPage.qml	2017-02-27 15:48:33 +0000
16
@@ -30,14 +30,14 @@
17
30
            Action {
30
            Action {
18
31
                text: i18n.tr('Right to Left')
31
                text: i18n.tr('Right to Left')
19
32
                iconName: 'flash-on'
32
                iconName: 'flash-on'
22
33
                visible: !gallery.rtl
33
                visible: UbuntuApplication.layoutDirection == Qt.LeftToRight
23
34
                onTriggered: gallery.rtl = !gallery.rtl
34
                onTriggered: UbuntuApplication.layoutDirection = Qt.RightToLeft
24
35
            },
35
            },
25
36
            Action {
36
            Action {
26
37
                text: i18n.tr('Left to Right')
37
                text: i18n.tr('Left to Right')
27
38
                iconName: 'flash-off'
38
                iconName: 'flash-off'
30
39
                visible: gallery.rtl
39
                visible: UbuntuApplication.layoutDirection == Qt.RightToLeft
31
40
                onTriggered: gallery.rtl = !gallery.rtl
40
                onTriggered: UbuntuApplication.layoutDirection = Qt.LeftToRight
32
41
            },
41
            },
33
42
            Action {
42
            Action {
34
43
                text: i18n.tr('Use dark theme')
43
                text: i18n.tr('Use dark theme')
35
44
44
36
=== modified file 'examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml'
37
--- examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml	2016-01-18 12:50:44 +0000
38
+++ examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml	2017-02-27 15:48:33 +0000
39
@@ -29,9 +29,8 @@
40
29
    width: units.gu(120)
29
    width: units.gu(120)
41
30
    height: units.gu(75)
30
    height: units.gu(75)
42
31
31
44
32
    LayoutMirroring.enabled: rtl
32
    LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
45
33
    LayoutMirroring.childrenInherit: true
33
    LayoutMirroring.childrenInherit: true
46
34
    property bool rtl: Qt.application.layoutDirection == Qt.RightToLeft
47
35
34
48
36
    AdaptivePageLayout {
35
    AdaptivePageLayout {
49
37
        id: layout
36
        id: layout
50
38
37
51
=== modified file 'src/UbuntuToolkit/ucapplication.cpp'
52
--- src/UbuntuToolkit/ucapplication.cpp	2017-02-09 11:00:07 +0000
53
+++ src/UbuntuToolkit/ucapplication.cpp	2017-02-27 15:48:33 +0000
54
@@ -42,6 +42,10 @@
55
42
    // Make sure we receive application name changes from C++ modules
42
    // Make sure we receive application name changes from C++ modules
56
43
    connect(QCoreApplication::instance(), &QCoreApplication::applicationNameChanged,
43
    connect(QCoreApplication::instance(), &QCoreApplication::applicationNameChanged,
57
44
            this, &UCApplication::applicationNameChanged);
44
            this, &UCApplication::applicationNameChanged);
58
45
    // Changes to the default layout direction (RTL, LTR)
59
46
    QGuiApplication* application = qobject_cast<QGuiApplication*>(QCoreApplication::instance());
60
47
    connect(application, &QGuiApplication::layoutDirectionChanged,
61
48
            this, &UCApplication::layoutDirectionChanged);
62
45
}
49
}
63
46
50
64
47
UCApplication::~UCApplication()
51
UCApplication::~UCApplication()
65
@@ -91,4 +95,18 @@
66
91
    m_inputMethod = inputMethod;
95
    m_inputMethod = inputMethod;
67
92
}
96
}
68
93
97
69
98
/*!
70
99
 * \internal
71
100
 * The (default) layout direction. Can be overridden for testing,
72
101
 * unlike Qt.application.layoutDirection.
73
102
 */
74
103
Qt::LayoutDirection UCApplication::layoutDirection() {
75
104
    return QGuiApplication::layoutDirection();
76
105
}
77
106
78
107
void UCApplication::setLayoutDirection(Qt::LayoutDirection layoutDirection) {
79
108
    return QGuiApplication::setLayoutDirection(layoutDirection);
80
109
}
81
110
82
111
83
94
UT_NAMESPACE_END
112
UT_NAMESPACE_END
84
95
113
85
=== modified file 'src/UbuntuToolkit/ucapplication_p.h'
86
--- src/UbuntuToolkit/ucapplication_p.h	2016-09-09 17:49:07 +0000
87
+++ src/UbuntuToolkit/ucapplication_p.h	2017-02-27 15:48:33 +0000
88
@@ -33,6 +33,7 @@
89
33
    Q_OBJECT
33
    Q_OBJECT
90
34
    Q_PROPERTY(QString applicationName READ applicationName WRITE setApplicationName NOTIFY applicationNameChanged)
34
    Q_PROPERTY(QString applicationName READ applicationName WRITE setApplicationName NOTIFY applicationNameChanged)
91
35
    Q_PROPERTY(QObject* inputMethod READ inputMethod WRITE setInputMethod NOTIFY inputMethodChanged)
35
    Q_PROPERTY(QObject* inputMethod READ inputMethod WRITE setInputMethod NOTIFY inputMethodChanged)
92
36
    Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection NOTIFY layoutDirectionChanged)
93
36
37
94
37
private:
38
private:
95
38
    Q_DISABLE_COPY(UCApplication)
39
    Q_DISABLE_COPY(UCApplication)
96
@@ -53,11 +54,13 @@
97
53
    // getter
54
    // getter
98
54
    QString applicationName();
55
    QString applicationName();
99
55
    QObject* inputMethod();
56
    QObject* inputMethod();
100
57
    Qt::LayoutDirection layoutDirection();
101
56
58
102
57
    // setter
59
    // setter
103
58
    void setContext(QQmlContext* context);
60
    void setContext(QQmlContext* context);
104
59
    void setApplicationName(const QString& applicationName);
61
    void setApplicationName(const QString& applicationName);
105
60
    void setInputMethod(QObject* inputMethod);
62
    void setInputMethod(QObject* inputMethod);
106
63
    void setLayoutDirection(Qt::LayoutDirection layoutDirection);
107
61
64
108
62
private:
65
private:
109
63
    QQmlContext* m_context;
66
    QQmlContext* m_context;
110
@@ -67,6 +70,7 @@
111
67
Q_SIGNALS:
70
Q_SIGNALS:
112
68
    void applicationNameChanged();
71
    void applicationNameChanged();
113
69
    void inputMethodChanged();
72
    void inputMethodChanged();
114
73
    void layoutDirectionChanged();
115
70
};
74
};
116
71
75
117
72
UT_NAMESPACE_END
76
UT_NAMESPACE_END
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2017-03-13
Zsombor Egri		2017-02-27	Approve on 2017-03-13
Adnane Belmadiaf (community)			Approve on 2017-03-02
Review via email: mp+318359@code.launchpad.net