Ubuntu Settings Components

Merge lp:~lukas-kde/ubuntu-settings-components/rtlFixes into lp:ubuntu-settings-components

  1. rtlFixes
  2. Merge into trunk
Proposed by Lukáš Tinkl
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 170
Merged at revision: 173
Proposed branch: lp:~lukas-kde/ubuntu-settings-components/rtlFixes
Merge into: lp:ubuntu-settings-components
Prerequisite: lp:~3v1n0/ubuntu-settings-components/new-calendar-design
Diff against target: 103 lines (+18/-3)
7 files modified
plugins/Ubuntu/Settings/Components/Calendar.qml (+1/-1)
plugins/Ubuntu/Settings/Components/MessageHeader.qml (+3/-0)
plugins/Ubuntu/Settings/Menus/BaseLayoutMenu.qml (+3/-0)
plugins/Ubuntu/Settings/Menus/GroupedMessageMenu.qml (+1/-1)
plugins/Ubuntu/Settings/Menus/ModemInfoItem.qml (+3/-0)
plugins/Ubuntu/Settings/Menus/SliderMenu.qml (+4/-1)
plugins/Ubuntu/Settings/Menus/TransferMenu.qml (+3/-0)
To merge this branch: bzr merge lp:~lukas-kde/ubuntu-settings-components/rtlFixes
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Unity8 CI Bot continuous-integration Approve
Review via email: mp+310180@code.launchpad.net

Commit message

Indicator components fixes for right-to-left languages (RTL)

Apart from the physical prereq, this branch needs:
- u8: https://code.launchpad.net/~lukas-kde/unity8/loadQtCatalog/+merge/309414 (to fix enabling RTL on startup)
- uitk: https://code.launchpad.net/~lukas-kde/ubuntu-ui-toolkit/sliderStyleRTL/+merge/309461 (to fix the progress of any slider component)

Description of the change

Indicator components fixes for right-to-left languages (RTL)

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:170
https://unity8-jenkins.ubuntu.com/job/lp-ubuntu-settings-components-ci/112/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3255
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1863
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1863
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/1863
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3283
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3137
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3137/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3137
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3137/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3137
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3137/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3137
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3137/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3137
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3137/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3137
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3137/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3137
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3137/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3137
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3137/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3137
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3137/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-ubuntu-settings-components-ci/112/rebuild

review: Approve (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Looks good, a part from that unrelated change which is quite conflicts prone :-)

review: Approve
lp:~lukas-kde/ubuntu-settings-components/rtlFixes updated
171. By Lukáš Tinkl

merge trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugins/Ubuntu/Settings/Components/Calendar.qml'
--- plugins/Ubuntu/Settings/Components/Calendar.qml 2016-11-15 18:02:22 +0000
+++ plugins/Ubuntu/Settings/Components/Calendar.qml 2016-11-22 09:56:25 +0000
@@ -310,7 +310,7 @@
310 readonly property int weekday: (index % priv.days + firstDayOfWeek) % priv.days310 readonly property int weekday: (index % priv.days + firstDayOfWeek) % priv.days
311 readonly property var dayStart: gridStart.addDays(index)311 readonly property var dayStart: gridStart.addDays(index)
312 readonly property bool isSelected: priv.userSelected && dayStart.equals(priv.selectedDay)312 readonly property bool isSelected: priv.userSelected && dayStart.equals(priv.selectedDay)
313 readonly property bool isCurrentMonth: (monthStart < dayStart || monthStart.equals(dayStart)) && dayStart < monthEnd313 readonly property bool isCurrentMonth: (monthStart < dayStart || monthStart.equals(dayStart)) && dayStart < monthEnd
314 readonly property bool isWeekend: weekday == 0 || weekday == 6314 readonly property bool isWeekend: weekday == 0 || weekday == 6
315 readonly property bool isToday: dayStart.equals(priv.today)315 readonly property bool isToday: dayStart.equals(priv.today)
316 readonly property bool hasEvent: isCurrentMonth && eventDays.indexOf(dayStart.day) != -1316 readonly property bool hasEvent: isCurrentMonth && eventDays.indexOf(dayStart.day) != -1
317317
=== modified file 'plugins/Ubuntu/Settings/Components/MessageHeader.qml'
--- plugins/Ubuntu/Settings/Components/MessageHeader.qml 2016-10-11 11:35:24 +0000
+++ plugins/Ubuntu/Settings/Components/MessageHeader.qml 2016-11-22 09:56:25 +0000
@@ -25,6 +25,9 @@
25Item {25Item {
26 id: messageHeader26 id: messageHeader
2727
28 LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
29 LayoutMirroring.childrenInherit: true
30
28 property alias avatar: avatarImage.source31 property alias avatar: avatarImage.source
29 property alias icon: iconImage.source32 property alias icon: iconImage.source
30 property alias time: timeText.text33 property alias time: timeText.text
3134
=== modified file 'plugins/Ubuntu/Settings/Menus/BaseLayoutMenu.qml'
--- plugins/Ubuntu/Settings/Menus/BaseLayoutMenu.qml 2016-10-05 13:36:10 +0000
+++ plugins/Ubuntu/Settings/Menus/BaseLayoutMenu.qml 2016-11-22 09:56:25 +0000
@@ -22,6 +22,9 @@
22BaseMenu {22BaseMenu {
23 id: menu23 id: menu
2424
25 LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
26 LayoutMirroring.childrenInherit: true
27
25 property string text28 property string text
26 property alias layout: layoutItem29 property alias layout: layoutItem
27 property alias title: layoutItem.title30 property alias title: layoutItem.title
2831
=== modified file 'plugins/Ubuntu/Settings/Menus/GroupedMessageMenu.qml'
--- plugins/Ubuntu/Settings/Menus/GroupedMessageMenu.qml 2016-10-26 19:51:29 +0000
+++ plugins/Ubuntu/Settings/Menus/GroupedMessageMenu.qml 2016-11-22 09:56:25 +0000
@@ -35,7 +35,7 @@
35 implicitHeight: label.implicitHeight + units.gu(2)35 implicitHeight: label.implicitHeight + units.gu(2)
36 implicitWidth: label.implicitWidth + units.gu(2)36 implicitWidth: label.implicitWidth + units.gu(2)
3737
38 color: theme.palette.normal.backgroundText38 color: theme.palette.normal.background
39 radius: "medium"39 radius: "medium"
4040
41 Label {41 Label {
4242
=== modified file 'plugins/Ubuntu/Settings/Menus/ModemInfoItem.qml'
--- plugins/Ubuntu/Settings/Menus/ModemInfoItem.qml 2016-10-11 11:35:24 +0000
+++ plugins/Ubuntu/Settings/Menus/ModemInfoItem.qml 2016-11-22 09:56:25 +0000
@@ -38,6 +38,9 @@
38 objectName: "menuItemInfoSlotsLayout"38 objectName: "menuItemInfoSlotsLayout"
39 style: menuStyle39 style: menuStyle
4040
41 LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
42 LayoutMirroring.childrenInherit: true
43
41 mainSlot: ColumnLayout {44 mainSlot: ColumnLayout {
42 spacing: units.gu(0.5)45 spacing: units.gu(0.5)
4346
4447
=== modified file 'plugins/Ubuntu/Settings/Menus/SliderMenu.qml'
--- plugins/Ubuntu/Settings/Menus/SliderMenu.qml 2016-10-28 10:23:02 +0000
+++ plugins/Ubuntu/Settings/Menus/SliderMenu.qml 2016-11-22 09:56:25 +0000
@@ -103,13 +103,16 @@
103 anchors.topMargin: label.visible ? menuStyle.padding.top : 0103 anchors.topMargin: label.visible ? menuStyle.padding.top : 0
104 spacing: -units.gu(1.5)104 spacing: -units.gu(1.5)
105105
106 LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
107 LayoutMirroring.childrenInherit: true
108
106 Label {109 Label {
107 id: label110 id: label
108 visible: text != ""111 visible: text != ""
109 color: menu.foregroundColor112 color: menu.foregroundColor
110 font.pixelSize: menuStyle.fontSize113 font.pixelSize: menuStyle.fontSize
111 x: Qt.application.layoutDirection == Qt.LeftToRight ?114 x: Qt.application.layoutDirection == Qt.LeftToRight ?
112 leftButton.x : rightButton.x + rightButton.width - width115 leftButton.x : rightButton.x
113 }116 }
114117
115 StyledSlotsLayout {118 StyledSlotsLayout {
116119
=== modified file 'plugins/Ubuntu/Settings/Menus/TransferMenu.qml'
--- plugins/Ubuntu/Settings/Menus/TransferMenu.qml 2016-10-11 11:35:24 +0000
+++ plugins/Ubuntu/Settings/Menus/TransferMenu.qml 2016-11-22 09:56:25 +0000
@@ -24,6 +24,9 @@
24BaseMenu {24BaseMenu {
25 id: menu25 id: menu
2626
27 LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
28 LayoutMirroring.childrenInherit: true
29
27 property alias iconSource: icon.source30 property alias iconSource: icon.source
28 property alias text: label.text31 property alias text: label.text
29 property alias stateText: stateLabel.text32 property alias stateText: stateLabel.text

Subscribers

People subscribed via source and target branches

to all changes: