git.iko.soy/unity8
on xenial help sign in
s/BackgroundResolver/WallpaperResolver
33468dfDaniel d'Andrada
qml/Components/BackgroundResolver.qml → qml/Components/WallpaperResolver.qmlrenamed+2−6
compare with xenial
unifiedsplit
@@ -26,17 +26,13 @@ import Ubuntu.Components 1.3
26 - Background set in GSettings, if any
26 - Background set in GSettings, if any
27 */
27 */
28QtObject {
28QtObject {
29− /*
30− Users should set their UI width here.
29+ // Users should set their UI width here.
31− */
32 property real width
30 property real width
33
31
34 property url defaultBackground: Qt.resolvedUrl(width >= units.gu(60) ? "../graphics/tablet_background.jpg"
32 property url defaultBackground: Qt.resolvedUrl(width >= units.gu(60) ? "../graphics/tablet_background.jpg"
35 : "../graphics/phone_background.jpg")
33 : "../graphics/phone_background.jpg")
36
34
37− /*
38− That's the property users of this component are going to consume.
35+ // That's the property users of this component are going to consume.
39− */
40 readonly property url background: asImageTester.status == Image.Ready ? asImageTester.source
36 readonly property url background: asImageTester.status == Image.Ready ? asImageTester.source
41 : gsImageTester.status == Image.Ready ? gsImageTester.source : defaultBackground
37 : gsImageTester.status == Image.Ready ? gsImageTester.source : defaultBackground
42
38
qml/DisabledScreenNotice.qml+3−3
@@ -21,12 +21,12 @@ import "Components"
21Image {
21Image {
22 id: root
22 id: root
23
23
24− BackgroundResolver {
24+ WallpaperResolver {
25 width: root.width
25 width: root.width
26− id: bgResolver
26+ id: wallpaperResolver
27 }
27 }
28
28
29− source: bgResolver.background
29+ source: wallpaperResolver.background
30
30
31 UbuntuShape {
31 UbuntuShape {
32 anchors.fill: text
32 anchors.fill: text
qml/Shell.qml+5−5
@@ -108,8 +108,8 @@ Item {
108
108
109 property real edgeSize: units.gu(2)
109 property real edgeSize: units.gu(2)
110
110
111− BackgroundResolver {
111+ WallpaperResolver {
112− id: bgResolver
112+ id: wallpaperResolver
113 width: shell.width
113 width: shell.width
114 }
114 }
115
115
@@ -299,7 +299,7 @@ Item {
299 Binding {
299 Binding {
300 target: applicationsDisplayLoader.item
300 target: applicationsDisplayLoader.item
301 property: "background"
301 property: "background"
302− value: bgResolver.background
302+ value: wallpaperResolver.background
303 }
303 }
304 Binding {
304 Binding {
305 target: applicationsDisplayLoader.item
305 target: applicationsDisplayLoader.item
@@ -404,7 +404,7 @@ Item {
404 tabletMode: shell.usageScenario != "phone"
404 tabletMode: shell.usageScenario != "phone"
405 launcherOffset: launcher.progress
405 launcherOffset: launcher.progress
406 forcedUnlock: tutorial.running
406 forcedUnlock: tutorial.running
407− background: bgResolver.background
407+ background: wallpaperResolver.background
408
408
409 // avoid overlapping with Launcher's edge drag area
409 // avoid overlapping with Launcher's edge drag area
410 // FIXME: Fix TouchRegistry & friends and remove this workaround
410 // FIXME: Fix TouchRegistry & friends and remove this workaround
@@ -579,7 +579,7 @@ Item {
579 id: wizard
579 id: wizard
580 objectName: "wizard"
580 objectName: "wizard"
581 anchors.fill: parent
581 anchors.fill: parent
582− background: bgResolver.background
582+ background: wallpaperResolver.background
583
583
584 function unlockWhenDoneWithWizard() {
584 function unlockWhenDoneWithWizard() {
585 if (!active) {
585 if (!active) {