Merge lp:~sil2100/ubuntu-system-settings/background_fallback_workaround into lp:ubuntu-system-settings

[Łukasz Zemczak]

Remove the included fallback images, use the ones that unity8 uses - we do it in the same way that unity8 does, but oh well, it's a workaround for now anyway

- Problem:

We have a snail and cogs as fallback images. SNAILS!

- Fix:

So, this fix is a temporary workaround for now, as the topic is still fresh. Please read up about the rationale:

Unity8 offers default fallback background images in its code. These are hardcoded and selected in the same way as I made it - a different one for tablet and phone. I decided to move the same thing here so that we have the very same visuals in settings as in the shell itself.
The thing I am recommending in the end is using the default value from GSettings. This is nice, but I think we still need to have a 'final' fallback in case someone overrides the default value to an invalid image, or the image gets broken etc. So anyway this change could get in I think.
Resetting to default value is a different game, and I have a branch for that already - using the default from GSettings. So we won't use the fallback there. In that fix/branch I will add all the default value GSettings functionality. Anyway it would make sense to have this in, no?

Since I am using absolute paths to the Unity8 graphics, I was thinking of maybe adding a dependency? But on the other hand, I guess ubuntu-system-settings makes no sense without unity8 anyway.

Please comment!

- Tests:

N/A

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:438
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/451/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/451

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-system-settings-ci/451/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks for the work, small comment:

> import "MainPage"

that feels weird ... in fact that source is not used anymore I think, and doesn't match the new design, we should probably just clean it from the vcs.

Otherwise the usual way to do that is to declare a priority in ChangeImage and have the value set in the stack.push from the main UI ... since nothing is doing the pushing here, just declare the property and use it (if you want to keep the source)

> + property string fallback: mainPage.defaultBackground

do you need the "mainPage" there? you should be able to just use "defaultBackground"

review: Needs Fixing

[lp:~sil2100/ubuntu-system-settings/background_fallback_workaround]

439. By Łukasz Zemczak on 2013-10-10

As mentioned by seb, ChangeImage is no longer used and we shouldn't care about that one. Also, unneeded mainPage prefix - QML noobishness

[Łukasz Zemczak (sil2100)]

Thanks for the review! Corrected the issues. I didn't know if there are any plans for ChangeImage so I hacked it in the fastest way possible. I guess let's get rid of it in the nearest refactoring/cleanup merge - for now I guess no need to worry about it at all.

But if needed, I can always remove it here in this merge, but I learned that it's best to do refactoring in separate merges - indeed it's easier to track later on!

[Łukasz Zemczak (sil2100)]

Learned from you Sebastien, so that it's clear ;p !

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:439
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/461/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/461

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-system-settings-ci/461/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

looks fine, thanks

review: Approve

=== modified file 'plugins/background/MainPage.qml'
--- plugins/background/MainPage.qml	2013-10-10 09:53:25 +0000
+++ plugins/background/MainPage.qml	2013-10-10 14:56:00 +0000
@@ -32,6 +32,9 @@
     id: mainPage
     title: i18n.tr("Background")
 
+    /* TODO: For now hardcoded paths, later we'll use GSettings */
+    property string defaultBackground: mainPage.width >= units.gu(60) ? "/usr/share/unity8/graphics/tablet_background.jpg" : "/usr/share/unity8/graphics/phone_background.jpg"
+
     UbuntuBackgroundPanel {
         id: backgroundPanel
 
@@ -202,7 +205,7 @@
 
     Image {
         id: testWelcomeImage
-        property string fallback: "darkeningclockwork.jpg"
+        property string fallback: defaultBackground
         visible: false
         onStatusChanged: updateImage(testWelcomeImage,
                                      welcomeImage)
@@ -210,7 +213,7 @@
 
     Image {
         id: testHomeImage
-        property string fallback: "aeg.jpg"
+        property string fallback: defaultBackground
         source: background.pictureUri
         visible: false
         onStatusChanged: updateImage(testHomeImage,

=== removed file 'plugins/background/aeg.jpg'
Binary files plugins/background/aeg.jpg	2013-06-19 17:00:05 +0000 and plugins/background/aeg.jpg	1970-01-01 00:00:00 +0000 differ
=== modified file 'plugins/background/background.pro'
--- plugins/background/background.pro	2013-09-16 18:16:51 +0000
+++ plugins/background/background.pro	2013-10-10 14:56:00 +0000
@@ -15,8 +15,6 @@
     $${QML_SOURCES}
 
 images.files = \
-    aeg.jpg \
-    darkeningclockwork.jpg \
     homeoverlay.svg \
     welcomeoverlay.svg
 images.path = $${PLUGIN_QML_DIR}/$${TARGET}

=== removed file 'plugins/background/darkeningclockwork.jpg'
Binary files plugins/background/darkeningclockwork.jpg	2013-06-19 18:37:34 +0000 and plugins/background/darkeningclockwork.jpg	1970-01-01 00:00:00 +0000 differ