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
=== modified file 'plugins/about/EntryComponent.qml'
--- plugins/about/EntryComponent.qml 2016-03-22 17:19:41 +0000
+++ plugins/about/EntryComponent.qml 2016-06-27 12:58:52 +0000
@@ -20,14 +20,22 @@
2020
21import QtQuick 2.421import QtQuick 2.4
22import Ubuntu.Components 1.322import Ubuntu.Components 1.3
23import Ubuntu.Components.ListItems 1.3 as ListItem
2423
25ListItem.Standard {24ListItem {
26 id: root25 id: root
2726
28 objectName: "entryComponent-about"27 objectName: "entryComponent-about"
29 iconSource: Qt.resolvedUrl(model.icon)28 height: layout.height
30 iconFrame: false29
31 text: i18n.tr(model.displayName)30 ListItemLayout {
32 progression: true31 id: layout
32 title.text: i18n.tr(model.displayName)
33 Icon {
34 SlotsLayout.position: SlotsLayout.Leading;
35 SlotsLayout.padding { top: 0; bottom: 0 }
36 source: Qt.resolvedUrl(model.icon)
37 height: units.gu(5)
38 }
39 ProgressionSlot {}
40 }
33}41}
3442
=== modified file 'plugins/flight-mode/EntryComponent.qml'
--- plugins/flight-mode/EntryComponent.qml 2015-08-10 13:31:45 +0000
+++ plugins/flight-mode/EntryComponent.qml 2016-06-27 12:58:52 +0000
@@ -20,25 +20,35 @@
2020
21import QtQuick 2.421import QtQuick 2.4
22import Ubuntu.Components 1.322import Ubuntu.Components 1.3
23import Ubuntu.Components.ListItems 1.3 as ListItem
24import Ubuntu.SystemSettings.FlightMode 1.0 as FlightMode23import Ubuntu.SystemSettings.FlightMode 1.0 as FlightMode
25import Ubuntu.Settings.Components 0.1 as USC24import Ubuntu.Settings.Components 0.1 as USC
2625
27ListItem.Standard {26ListItem {
28 id: root27 id: root
29 iconSource: model.icon28 height: layout.height
30 iconFrame: false29
31 text: i18n.tr(model.displayName)30 ListItemLayout {
32 control: Switch {31 id: layout
33 id: switchItem32 title.text: i18n.tr(model.displayName)
3433
35 USC.ServerPropertySynchroniser {34 Switch {
36 userTarget: switchItem35 id: switchItem
37 userProperty: "checked"36
38 serverTarget: helper37 SlotsLayout.position: SlotsLayout.Trailing
39 serverProperty: "inFlightMode"38 USC.ServerPropertySynchroniser {
4039 userTarget: switchItem
41 onSyncTriggered: helper.setFlightMode(value)40 userProperty: "checked"
41 serverTarget: helper
42 serverProperty: "inFlightMode"
43
44 onSyncTriggered: helper.setFlightMode(value)
45 }
46 }
47 Icon {
48 SlotsLayout.position: SlotsLayout.Leading;
49 SlotsLayout.padding { top: 0; bottom: 0 }
50 source: model.icon
51 height: units.gu(5)
42 }52 }
43 }53 }
4454
4555
=== modified file 'plugins/orientation-lock/EntryComponent.qml'
--- plugins/orientation-lock/EntryComponent.qml 2015-08-10 13:31:45 +0000
+++ plugins/orientation-lock/EntryComponent.qml 2016-06-27 12:58:52 +0000
@@ -22,26 +22,35 @@
22import QtQuick 2.422import QtQuick 2.4
23import QtQuick.Window 2.123import QtQuick.Window 2.1
24import Ubuntu.Components 1.324import Ubuntu.Components 1.3
25import Ubuntu.Components.ListItems 1.3 as ListItem25
2626
2727ListItem {
28ListItem.Standard {
29 id: root28 id: root
30 iconSource: model.icon29 height: layout.height
31 iconFrame: false30
32 text: i18n.tr(model.displayName)31 ListItemLayout {
33 control: Switch {32 id: layout
34 id: control33 title.text: i18n.tr(model.displayName)
35 objectName: "orientationLockSwitch"34 Switch {
3635 id: control
37 property bool serverChecked: systemSettings.rotationLock36 objectName: "orientationLockSwitch"
38 onServerCheckedChanged: checked = serverChecked37
39 Component.onCompleted: checked = serverChecked38 SlotsLayout.position: SlotsLayout.Trailing
40 onTriggered: systemSettings.rotationLock = checked39 property bool serverChecked: systemSettings.rotationLock
4140 onServerCheckedChanged: checked = serverChecked
42 GSettings {41 Component.onCompleted: checked = serverChecked
43 id: systemSettings42 onTriggered: systemSettings.rotationLock = checked
44 schema.id: "com.ubuntu.touch.system"43
44 GSettings {
45 id: systemSettings
46 schema.id: "com.ubuntu.touch.system"
47 }
48 }
49 Icon {
50 SlotsLayout.position: SlotsLayout.Leading;
51 SlotsLayout.padding { top: 0; bottom: 0 }
52 source: model.icon
53 height: units.gu(5)
45 }54 }
46 }55 }
47}56}
4857
=== modified file 'plugins/reset/EntryComponent.qml'
--- plugins/reset/EntryComponent.qml 2016-03-22 17:19:41 +0000
+++ plugins/reset/EntryComponent.qml 2016-06-27 12:58:52 +0000
@@ -20,13 +20,21 @@
2020
21import QtQuick 2.421import QtQuick 2.4
22import Ubuntu.Components 1.322import Ubuntu.Components 1.3
23import Ubuntu.Components.ListItems 1.3 as ListItem
2423
25ListItem.Standard {24ListItem {
26 id: root25 id: root
27 objectName: "entryComponent-reset"26 objectName: "entryComponent-reset"
28 iconSource: model.icon27 height: layout.height
29 iconFrame: false28
30 text: i18n.tr(model.displayName)29 ListItemLayout {
31 progression: true30 id: layout
31 title.text: i18n.tr(model.displayName)
32 Icon {
33 SlotsLayout.position: SlotsLayout.Leading;
34 SlotsLayout.padding { top: 0; bottom: 0 }
35 source: model.icon
36 height: units.gu(5)
37 }
38 ProgressionSlot {}
39 }
32}40}

Subscribers

People subscribed via source and target branches