Merge lp:~fboucault/ubuntu-ui-toolkit/fix_startup_theme_selection into lp:ubuntu-ui-toolkit/staging

[Florian Boucault]

MainView: proceed to selecting the theme automatically at startup too.

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1808
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/85/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/196/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/85/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1808
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/83/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/197/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/83/rebuild

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

amd64 failures:

tst_theming.qml: Started with PID: 9410
tst_theming.qml: ********* Start testing of components *********
tst_theming.qml: Config: Using QtTest library 5.4.1, Qt 5.4.1 (x86_64-little_endian-lp64 shared (dynamic) release build; by GCC 4.9.2)
tst_theming.qml: PASS : components::initTestCase()
tst_theming.qml: QWARN : components::test_backgroundcolor_change(Light color) file:///tmp/buildd/ubuntu-ui-toolkit-1.3.1795+16.04.20160106/qml/Ubuntu/Components/1.3/MainViewBase.qml:118: ReferenceError: selectTheme is not defined
tst_theming.qml: QWARN : components::test_backgroundcolor_change(Light color) file:///tmp/buildd/ubuntu-ui-toolkit-1.3.1795+16.04.20160106/qml/Ubuntu/Components/1.3/MainViewBase.qml:118: ReferenceError: selectTheme is not defined
tst_theming.qml: FAIL! : components::test_backgroundcolor_change(Light color) 'wait for signal paletteChanged' returned FALSE. ()
tst_theming.qml: Loc: [/tmp/buildd/ubuntu-ui-toolkit-1.3.1795+16.04.20160106/tests/unit_x11/tst_components/tst_theming.qml(54)]
tst_theming.qml: QWARN : components::test_backgroundcolor_change(Dark color) file:///tmp/buildd/ubuntu-ui-toolkit-1.3.1795+16.04.20160106/qml/Ubuntu/Components/1.3/MainViewBase.qml:118: ReferenceError: selectTheme is not defined
tst_theming.qml: FAIL! : components::test_backgroundcolor_change(Dark color) 'wait for signal paletteChanged' returned FALSE. ()
tst_theming.qml: Loc: [/tmp/buildd/ubuntu-ui-toolkit-1.3.1795+16.04.20160106/tests/unit_x11/tst_components/tst_theming.qml(54)]
tst_theming.qml: PASS : components::cleanupTestCase()
tst_theming.qml: Totals: 2 passed, 2 failed, 0 skipped, 0 blacklisted
tst_theming.qml: ********* Finished testing of components *********
tst_theming.qml: Exited with status 512
tst_theming.qml: Shutting down
DBus daemon: Shutdown
tst_theming.qml exited with 0

[lp:~fboucault/ubuntu-ui-toolkit/fix_startup_theme_selection]

1809. By Florian Boucault on 2016-01-19

Fix reference error.

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1809
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/84/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/198/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/84/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1809
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/86/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/199/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/86/rebuild

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

Thanks for fixing.

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1809
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/109/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/257/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/109/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1809
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/114/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/259/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/114/rebuild

review: Approve (continuous-integration)

=== modified file 'src/Ubuntu/Components/1.3/MainViewBase.qml'
--- src/Ubuntu/Components/1.3/MainViewBase.qml	2015-12-22 09:26:26 +0000
+++ src/Ubuntu/Components/1.3/MainViewBase.qml	2016-01-19 19:00:47 +0000
@@ -105,17 +105,19 @@
           Qt bug: https://bugreports.qt-project.org/browse/QTBUG-11712
          */
 
+        function selectTheme() {
+            if (mainView.backgroundColor != theme.palette.normal.background) {
+                // custom color, proceed with auto-theming
+                autoTheme.themeName = (ColorUtils.luminance(backgroundColor) >= 0.85) ?
+                            "Ambiance" : "SuruDark";
+            }
+        }
+
         Connections {
             target: mainView
-
-            onBackgroundColorChanged: {
-                if (mainView.backgroundColor != theme.palette.normal.background) {
-                    // custom color, proceed with auto-theming
-                    autoTheme.themeName = (ColorUtils.luminance(backgroundColor) >= 0.85) ?
-                                "Ambiance" : "SuruDark";
-                }
-            }
+            onBackgroundColorChanged: autoTheme.selectTheme()
         }
+        Component.onCompleted: autoTheme.selectTheme()
 
         property string themeName
         onThemeNameChanged: {