Merge lp:~tpeeters/ubuntu-ui-toolkit/white into lp:ubuntu-ui-toolkit/staging

[Tim Peeters]

Make the default MainView background plain white.

[lp:~tpeeters/ubuntu-ui-toolkit/white]

1597. By Tim Peeters on 2015-08-06

clean

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1597
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2101/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/829/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/831/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/828/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2101/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tpeeters/ubuntu-ui-toolkit/white]

1598. By Tim Peeters on 2015-08-10

link bug

[Tim Peeters (tpeeters)]

Screenshots attached to the bug report.

[Jouni Helminen (jounihelminen)]

looks ok

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1598
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2106/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/834/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/836/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/833/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2106/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tpeeters/ubuntu-ui-toolkit/white]

1599. By Tim Peeters on 2015-08-11

sync staging

1600. By Tim Peeters on 2015-08-11

fix docs

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1600
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2113/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/841
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/843
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/843/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/840

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2113/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

I guess we gained some speed on MainView creation time now.

review: Approve

=== modified file 'documentation/images/surudark-theme-13.png'
Binary files documentation/images/surudark-theme-13.png	2015-04-25 07:10:57 +0000 and documentation/images/surudark-theme-13.png	2015-08-11 10:01:50 +0000 differ
=== modified file 'documentation/ubuntu-theming.qdoc'
--- documentation/ubuntu-theming.qdoc	2015-06-01 15:35:58 +0000
+++ documentation/ubuntu-theming.qdoc	2015-08-11 10:01:50 +0000
@@ -270,11 +270,11 @@
  * The extended (or even overridden) style component documents must follow the naming
  * convention, and must have the names implied by the components styled.
  *
- * SuruDark theme overrides the Ambiance theme's MainViewStyle, therefore declares the
- * MainViewStyle.qml document, with the following content:
- * \snippet Themes/SuruDark/1.3/MainViewStyle.qml 0
+ * SuruDark theme overrides the Ambiance theme's ListItemStyle, therefore declares the
+ * ListItemStyle.qml document, with the following content:
+ * \snippet Themes/SuruDark/1.3/ListItemStyle.qml 0
  *
- * The style imports the Ambiance theme module, and extends the Ambiance MainViewStyle
+ * The style imports the Ambiance theme module, and extends the Ambiance ListItemStyle
  * component. The same is done in the other style components. However, Palette defines
  * own values, and does not re-use Ambiance palette values.
  * \snippet Themes/SuruDark/1.3/Palette.qml 0

=== modified file 'src/Ubuntu/Components/1.3/MainViewBase.qml'
--- src/Ubuntu/Components/1.3/MainViewBase.qml	2015-07-22 14:35:48 +0000
+++ src/Ubuntu/Components/1.3/MainViewBase.qml	2015-08-11 10:01:50 +0000
@@ -99,6 +99,8 @@
         // theme is inherited from PageTreeNode, no need to update versioning
         styleName: "MainViewStyle"
 
+        // FIXME: Define the colors in MainViewStyle and get rid of the properties
+        //  in MainViewBase.
         property color headerColor: backgroundColor
         property color backgroundColor: theme.palette.normal.background
         property color footerColor: backgroundColor

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/MainViewStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/MainViewStyle.qml	2015-04-25 07:36:13 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/MainViewStyle.qml	2015-08-11 10:01:50 +0000
@@ -17,43 +17,51 @@
 import Ubuntu.Components 1.3
 
 Item {
-    // styling properties
     anchors.fill: parent
     z: -1
     id: mainViewStyle
 
     /*!
-      The background texture of the main view. The image will be drawn over the background color,
-      so if it has (semi-)transparent pixels, in those pixels the background color will be visible.
-     */
-    property url backgroundSource: Qt.resolvedUrl("../artwork/background_paper.png")
+      Color of the header's background.
+
+      \sa backgroundColor, footerColor
+    */
+    property color headerColor: styledItem.headerColor
+
+    /*!
+      Color of the background.
+
+      The background is usually a single color. However if \l headerColor
+      or \l footerColor are set then a gradient of colors will be drawn.
+
+      \sa footerColor, headerColor
+    */
+    property color backgroundColor: styledItem.backgroundColor
+
+    /*!
+      Color of the footer's background.
+
+      \sa backgroundColor, headerColor
+    */
+    property color footerColor: styledItem.footerColor
 
     Gradient {
         id: backgroundGradient
-        GradientStop { position: 0.0; color: styledItem.headerColor }
-        GradientStop { position: 0.83; color: styledItem.backgroundColor }
-        GradientStop { position: 1.0; color: styledItem.footerColor }
+        GradientStop { position: 0.0; color: mainViewStyle.headerColor }
+        GradientStop { position: 0.83; color: mainViewStyle.backgroundColor }
+        GradientStop { position: 1.0; color: mainViewStyle.footerColor }
     }
 
     Rectangle {
         id: backgroundColor
         anchors.fill: parent
-        color: styledItem.backgroundColor
+        color: mainViewStyle.backgroundColor
         gradient: internals.isGradient ? backgroundGradient : null
     }
 
-    Image {
-        id: backgroundTexture
-        anchors.fill: parent
-        source: mainViewStyle.backgroundSource
-        fillMode: Image.Tile
-        asynchronous: true
-        cache: false
-    }
-
     QtObject {
         id: internals
-        property bool isGradient: styledItem.backgroundColor != styledItem.headerColor ||
-                                  styledItem.backgroundColor != styledItem.footerColor
+        property bool isGradient: mainViewStyle.backgroundColor != mainViewStyle.headerColor ||
+                                  mainViewStyle.backgroundColor != mainViewStyle.footerColor
     }
 }

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml	2015-04-27 07:19:22 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml	2015-08-11 10:01:50 +0000
@@ -20,7 +20,7 @@
 
 Palette {
     normal {
-        background: "#EDEDED"
+        background: "#FFFFFF"
         backgroundText: "#81888888"
         base: Qt.rgba(0, 0, 0, 0.1)
         baseText: UbuntuColors.lightGrey

=== modified file 'src/Ubuntu/Components/Themes/SuruDark/1.3/ListItemStyle.qml'
--- src/Ubuntu/Components/Themes/SuruDark/1.3/ListItemStyle.qml	2015-07-13 22:16:37 +0000
+++ src/Ubuntu/Components/Themes/SuruDark/1.3/ListItemStyle.qml	2015-08-11 10:01:50 +0000
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
+//![0]
 import QtQuick 2.4
 import Ubuntu.Components.Themes.Ambiance 1.3 as Ambiance
 
@@ -23,3 +23,4 @@
     // 40% lighter than foreground color
     trailingForegroundColor: Qt.lighter(theme.palette.normal.foreground, 1.4)
 }
+//![0]

=== removed file 'src/Ubuntu/Components/Themes/SuruDark/1.3/MainViewStyle.qml'
--- src/Ubuntu/Components/Themes/SuruDark/1.3/MainViewStyle.qml	2015-04-24 14:12:12 +0000
+++ src/Ubuntu/Components/Themes/SuruDark/1.3/MainViewStyle.qml	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-//![0]
-import QtQuick 2.4
-import Ubuntu.Components.Themes.Ambiance 1.3
-
-MainViewStyle {
-    backgroundSource: ""
-}
-//![0]

=== modified file 'src/Ubuntu/Components/Themes/SuruDark/SuruDark.pro'
--- src/Ubuntu/Components/Themes/SuruDark/SuruDark.pro	2015-07-24 08:02:46 +0000
+++ src/Ubuntu/Components/Themes/SuruDark/SuruDark.pro	2015-08-11 10:01:50 +0000
@@ -8,7 +8,6 @@
              1.2/Palette.qml \
              1.2/TabBarStyle.qml \
              1.2/ListItemStyle.qml \
-             1.3/MainViewStyle.qml \
              1.3/OptionSelectorStyle.qml \
              1.3/Palette.qml \
              1.3/TabBarStyle.qml \