Merge lp:~mzanetti/unity8/move-style-to-components into lp:unity8

[Michael Zanetti]

Move style to components.

No need for this to be a plugin, and the test for it breaks the arm64 builders.

Descriptions make CI happy :)

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

FAILED: Continuous integration, rev:2657
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2322/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:2657
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2326/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:2657
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2327/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:2657
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2329/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3066
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1713
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1713
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1713
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3094
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2951
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2951/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2951
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2951/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2951
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2951/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2951
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2951/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2951
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2951/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2951
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2951/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2951
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2951/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2951
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2951/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2951
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2951/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

this won't work

review: Disapprove

[Michael Zanetti (mzanetti)]

plugins/Dash/ needs it and can't access it when it's in Components

Unmerged revisions

2657. By Michael Zanetti on 2016-10-05

move Style to components, no reason it needs to be a plugin and it breaks the arm64 builders

=== modified file 'plugins/Utils/qmldir'
--- plugins/Utils/qmldir	2015-11-24 17:44:18 +0000
+++ plugins/Utils/qmldir	2016-10-05 17:10:50 +0000
@@ -1,5 +1,4 @@
 module Utils
 plugin Utils-qml
 typeinfo Utils.qmltypes
-Style 0.1 Style.js
 singleton EdgeBarrierSettings 0.1 EdgeBarrierSettings.qml

=== modified file 'qml/Components/Background.qml'
--- qml/Components/Background.qml	2015-07-15 15:07:19 +0000
+++ qml/Components/Background.qml	2016-10-05 17:10:50 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Utils 0.1 as Utils
+import "Style.js" as Style
 
 Loader {
     id: root
@@ -27,8 +27,8 @@
         .match(/^(color|gradient):\/\/\/(?:(#(?:[0-9a-f]{3,4}){1,2}|[a-z]{3,}))(?:\/(#(?:[0-9a-f]{3,4}){1,2}|[a-z]{3,}))?\/?$/i)
     readonly property var luminance: {
         if (!parsedStyle) return 0.5;
-        if (parsedStyle[1] === "color") return Utils.Style.luminance(parsedStyle[2]);
-        else if (parsedStyle[1] === "gradient") return Utils.Style.luminance(parsedStyle[2], parsedStyle[3]);
+        if (parsedStyle[1] === "color") return Style.luminance(parsedStyle[2]);
+        else if (parsedStyle[1] === "gradient") return Style.luminance(parsedStyle[2], parsedStyle[3]);
     }
 
     // FIXME this is only here for highlight purposes (see DashNavigation.qml, too)

=== renamed file 'plugins/Utils/Style.js' => 'qml/Components/Style.js'
=== modified file 'qml/Dash/DashPageHeader.qml'
--- qml/Dash/DashPageHeader.qml	2016-08-16 14:06:26 +0000
+++ qml/Dash/DashPageHeader.qml	2016-10-05 17:10:50 +0000
@@ -20,6 +20,7 @@
 import Ubuntu.Components.ListItems 1.3
 import Utils 0.1
 import "../Components"
+import "../Components/Style.js" as Style
 
 Item {
     id: root

=== removed file 'tests/mocks/Utils/Style.js'
--- tests/mocks/Utils/Style.js	2015-03-04 13:04:58 +0000
+++ tests/mocks/Utils/Style.js	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-.pragma library
-
-/*! \brief Calculate average luminance of the passed colors
-
-    \note If not fully opaque, luminance is dependant on blending.
- */
-function luminance() {
-    var sum = 0;
-    // TODO this was originally
-    // for (var k in arguments) {
-    // but for some unkown reason was causing crashes in testDash/testDashContent
-    // investigate when we have some time
-    for (var k = 0; k < arguments.length; ++k) {
-        // only way to convert string to color
-        var c = Qt.lighter(arguments[k], 1.0);
-
-        sum += 0.2126 * c.r + 0.7152 * c.g + 0.0722 * c.b;
-    }
-
-    return sum / arguments.length;
-}

=== modified file 'tests/mocks/Utils/qmldir'
--- tests/mocks/Utils/qmldir	2015-12-03 15:40:07 +0000
+++ tests/mocks/Utils/qmldir	2016-10-05 17:10:50 +0000
@@ -1,6 +1,5 @@
 module Utils
 plugin FakeUtils-qml
 typeinfo Utils.qmltypes
-Style 0.1 Style.js
 WindowInputMonitor 0.1 WindowInputMonitor.qml
 singleton EdgeBarrierSettings 0.1 EdgeBarrierSettings.qml

=== modified file 'tests/plugins/Utils/CMakeLists.txt'
--- tests/plugins/Utils/CMakeLists.txt	2016-06-28 20:38:00 +0000
+++ tests/plugins/Utils/CMakeLists.txt	2016-10-05 17:10:50 +0000
@@ -21,9 +21,6 @@
 
 endforeach()
 
-# plain qml test
-add_unity8_qmlunittest(. UtilsStyle)
-
 # URLDispatcher test needs dbus-test-runner because it claims a dbus name
 add_executable(URLDispatcherTestExec URLDispatcherTest.cpp)
 qt5_use_modules(URLDispatcherTestExec Test Core Qml)

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2016-08-22 15:39:16 +0000
+++ tests/qmltests/CMakeLists.txt	2016-10-05 17:10:50 +0000
@@ -20,6 +20,7 @@
 add_unity8_qmltest(Components ResponsiveVerticalJournal)
 add_unity8_qmltest(Components SharingPicker)
 add_unity8_qmltest(Components Showable)
+add_unity8_qmltest(Components UtilsStyle)
 add_unity8_qmltest(Components VirtualTouchPad)
 add_unity8_qmltest(Components WallpaperResolver)
 add_unity8_qmltest(Components ZoomableImage)

=== renamed file 'tests/plugins/Utils/tst_UtilsStyle.qml' => 'tests/qmltests/Components/tst_UtilsStyle.qml'