Merge lp:~aacid/unity8/splash_spinner_vertical_tweak into lp:unity8

[Albert Astals Cid]

Make sure the spinner does not get too close to the title text

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
No, but should be fine as it makes the spinner position a bit less hardcoded.

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2595
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1964/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2563
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1387
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1387/console
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1387
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2591
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2471
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2471
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2471
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2465
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2465/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2465
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2465/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2465
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2465/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2465
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2465/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2465
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2465/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2465
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2465/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2465
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2465/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2465
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2465/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2465
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2465/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1964/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/splash_spinner_vertical_tweak]

2596. By Albert Astals Cid on 2016-08-23

Fix path

2597. By Albert Astals Cid on 2016-08-23

Add landscape checkbox

[Lukáš Tinkl (lukas-kde)]

Yup, works fine for me

* Did you perform an exploratory manual test run of the code change and any related functionality?

Yes

* Did CI run pass? If not, please explain why.

No, unrelated failures

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2597
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2011/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2636
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1441
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1441
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1441
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2664
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2538
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2538
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2538
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2532
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2532/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2532
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2532/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2532
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2532/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2532
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2532/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2532
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2532/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2532
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2532/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2532
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2532/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2532
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2532/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2532
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2532/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2011/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Stages/Splash.qml'
--- qml/Stages/Splash.qml	2016-05-19 15:22:34 +0000
+++ qml/Stages/Splash.qml	2016-08-23 09:06:36 +0000
@@ -119,6 +119,7 @@
     }
 
     Label {
+        id: titleLabel
         text: root.title
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.top: iconShape.bottom
@@ -137,12 +138,8 @@
 
     ActivityIndicator {
         id: spinner
-        anchors.centerIn: header.visible ? parent : undefined
-        anchors.verticalCenterOffset: header.visible ? header.height / 2 : 0
-
-        anchors.horizontalCenter: header.visible ? undefined : parent.horizontalCenter
-        anchors.bottom: header.visible ? undefined : parent.bottom
-        anchors.bottomMargin: header.visible ? 0 : units.gu(12)
+        anchors.centerIn: parent
+        anchors.verticalCenterOffset: header.visible ? header.height / 2 : Math.max(titleLabel.y / 2, units.gu(8))
     }
 
     MouseArea {

=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.cpp'
--- tests/mocks/Unity/Application/ApplicationInfo.cpp	2016-07-25 14:57:11 +0000
+++ tests/mocks/Unity/Application/ApplicationInfo.cpp	2016-08-23 09:06:36 +0000
@@ -138,7 +138,7 @@
 
 void ApplicationInfo::setIconId(const QString &iconId)
 {
-    setIcon(QString("../../tests/graphics/applicationIcons/[e-mail]")
+    setIcon(QString("../../graphics/applicationIcons/[e-mail]")
             .arg(iconId));
 }
 

=== modified file 'tests/qmltests/Stages/tst_Splash.qml'
--- tests/qmltests/Stages/tst_Splash.qml	2015-07-15 15:07:19 +0000
+++ tests/qmltests/Stages/tst_Splash.qml	2016-08-23 09:06:36 +0000
@@ -55,7 +55,7 @@
             bottom: parent.bottom
             left: parent.left
         }
-        width: units.gu(40)
+        width: landscapeCheckbox.checked ? units.gu(70) : units.gu(40)
         sourceComponent: splashComponent
     }
 
@@ -97,6 +97,20 @@
                 CheckBox {id: footerColorCheckbox; checked: false; }
                 Label { text: "custom footerColor"; anchors.verticalCenter: parent.verticalCenter }
             }
+            Row {
+                anchors { left: parent.left; right: parent.right }
+                CheckBox {
+                    id: landscapeCheckbox
+                    checked: false
+                    onCheckedChanged: {
+                    if (checked) {
+                        window.width = Math.max(window.width, units.gu(110));
+                    }
+                    window.height = checked ? units.gu(40) : units.gu(70);
+                }
+                }
+                Label { text: "Landscape"; anchors.verticalCenter: parent.verticalCenter }
+            }
         }
     }