ubuntu-system-settings

Merge lp:~mardy/ubuntu-system-settings/smoothed-1596529 into lp:ubuntu-system-settings

  1. smoothed-1596529
  2. Merge into trunk
Proposed by Alberto Mardegan
Status: Merged
Merged at revision: 1678
Proposed branch: lp:~mardy/ubuntu-system-settings/smoothed-1596529
Merge into: lp:ubuntu-system-settings
Diff against target: 178 lines (+81/-46)
4 files modified
plugins/about/EntryComponent.qml (+14/-6)
plugins/flight-mode/EntryComponent.qml (+25/-15)
plugins/orientation-lock/EntryComponent.qml (+28/-19)
plugins/reset/EntryComponent.qml (+14/-6)
To merge this branch: bzr merge lp:~mardy/ubuntu-system-settings/smoothed-1596529
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
PS Jenkins bot continuous-integration Pending
Ubuntu Touch System Settings Pending
Review via email: mp+298419@code.launchpad.net

Commit message

Use new ListItem component to avoid icon pixelation

Description of the change

Use new ListItem component to avoid icon pixelation

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1671
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/24/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/739/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/739
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/686
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/686
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/686
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/678/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/678/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/678/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/678/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/678/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/678/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/678/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/678/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/678/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/24/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/about/EntryComponent.qml'
2--- plugins/about/EntryComponent.qml 2016-03-22 17:19:41 +0000
3+++ plugins/about/EntryComponent.qml 2016-06-27 12:58:52 +0000
4@@ -20,14 +20,22 @@
5
6 import QtQuick 2.4
7 import Ubuntu.Components 1.3
8-import Ubuntu.Components.ListItems 1.3 as ListItem
9
10-ListItem.Standard {
11+ListItem {
12 id: root
13
14 objectName: "entryComponent-about"
15- iconSource: Qt.resolvedUrl(model.icon)
16- iconFrame: false
17- text: i18n.tr(model.displayName)
18- progression: true
19+ height: layout.height
20+
21+ ListItemLayout {
22+ id: layout
23+ title.text: i18n.tr(model.displayName)
24+ Icon {
25+ SlotsLayout.position: SlotsLayout.Leading;
26+ SlotsLayout.padding { top: 0; bottom: 0 }
27+ source: Qt.resolvedUrl(model.icon)
28+ height: units.gu(5)
29+ }
30+ ProgressionSlot {}
31+ }
32 }
33
34=== modified file 'plugins/flight-mode/EntryComponent.qml'
35--- plugins/flight-mode/EntryComponent.qml 2015-08-10 13:31:45 +0000
36+++ plugins/flight-mode/EntryComponent.qml 2016-06-27 12:58:52 +0000
37@@ -20,25 +20,35 @@
38
39 import QtQuick 2.4
40 import Ubuntu.Components 1.3
41-import Ubuntu.Components.ListItems 1.3 as ListItem
42 import Ubuntu.SystemSettings.FlightMode 1.0 as FlightMode
43 import Ubuntu.Settings.Components 0.1 as USC
44
45-ListItem.Standard {
46+ListItem {
47 id: root
48- iconSource: model.icon
49- iconFrame: false
50- text: i18n.tr(model.displayName)
51- control: Switch {
52- id: switchItem
53-
54- USC.ServerPropertySynchroniser {
55- userTarget: switchItem
56- userProperty: "checked"
57- serverTarget: helper
58- serverProperty: "inFlightMode"
59-
60- onSyncTriggered: helper.setFlightMode(value)
61+ height: layout.height
62+
63+ ListItemLayout {
64+ id: layout
65+ title.text: i18n.tr(model.displayName)
66+
67+ Switch {
68+ id: switchItem
69+
70+ SlotsLayout.position: SlotsLayout.Trailing
71+ USC.ServerPropertySynchroniser {
72+ userTarget: switchItem
73+ userProperty: "checked"
74+ serverTarget: helper
75+ serverProperty: "inFlightMode"
76+
77+ onSyncTriggered: helper.setFlightMode(value)
78+ }
79+ }
80+ Icon {
81+ SlotsLayout.position: SlotsLayout.Leading;
82+ SlotsLayout.padding { top: 0; bottom: 0 }
83+ source: model.icon
84+ height: units.gu(5)
85 }
86 }
87
88
89=== modified file 'plugins/orientation-lock/EntryComponent.qml'
90--- plugins/orientation-lock/EntryComponent.qml 2015-08-10 13:31:45 +0000
91+++ plugins/orientation-lock/EntryComponent.qml 2016-06-27 12:58:52 +0000
92@@ -22,26 +22,35 @@
93 import QtQuick 2.4
94 import QtQuick.Window 2.1
95 import Ubuntu.Components 1.3
96-import Ubuntu.Components.ListItems 1.3 as ListItem
97-
98-
99-ListItem.Standard {
100+
101+
102+ListItem {
103 id: root
104- iconSource: model.icon
105- iconFrame: false
106- text: i18n.tr(model.displayName)
107- control: Switch {
108- id: control
109- objectName: "orientationLockSwitch"
110-
111- property bool serverChecked: systemSettings.rotationLock
112- onServerCheckedChanged: checked = serverChecked
113- Component.onCompleted: checked = serverChecked
114- onTriggered: systemSettings.rotationLock = checked
115-
116- GSettings {
117- id: systemSettings
118- schema.id: "com.ubuntu.touch.system"
119+ height: layout.height
120+
121+ ListItemLayout {
122+ id: layout
123+ title.text: i18n.tr(model.displayName)
124+ Switch {
125+ id: control
126+ objectName: "orientationLockSwitch"
127+
128+ SlotsLayout.position: SlotsLayout.Trailing
129+ property bool serverChecked: systemSettings.rotationLock
130+ onServerCheckedChanged: checked = serverChecked
131+ Component.onCompleted: checked = serverChecked
132+ onTriggered: systemSettings.rotationLock = checked
133+
134+ GSettings {
135+ id: systemSettings
136+ schema.id: "com.ubuntu.touch.system"
137+ }
138+ }
139+ Icon {
140+ SlotsLayout.position: SlotsLayout.Leading;
141+ SlotsLayout.padding { top: 0; bottom: 0 }
142+ source: model.icon
143+ height: units.gu(5)
144 }
145 }
146 }
147
148=== modified file 'plugins/reset/EntryComponent.qml'
149--- plugins/reset/EntryComponent.qml 2016-03-22 17:19:41 +0000
150+++ plugins/reset/EntryComponent.qml 2016-06-27 12:58:52 +0000
151@@ -20,13 +20,21 @@
152
153 import QtQuick 2.4
154 import Ubuntu.Components 1.3
155-import Ubuntu.Components.ListItems 1.3 as ListItem
156
157-ListItem.Standard {
158+ListItem {
159 id: root
160 objectName: "entryComponent-reset"
161- iconSource: model.icon
162- iconFrame: false
163- text: i18n.tr(model.displayName)
164- progression: true
165+ height: layout.height
166+
167+ ListItemLayout {
168+ id: layout
169+ title.text: i18n.tr(model.displayName)
170+ Icon {
171+ SlotsLayout.position: SlotsLayout.Leading;
172+ SlotsLayout.padding { top: 0; bottom: 0 }
173+ source: model.icon
174+ height: units.gu(5)
175+ }
176+ ProgressionSlot {}
177+ }
178 }

Subscribers

People subscribed via source and target branches