Merge lp:~tpeeters/ubuntu-ui-toolkit/trunk-old-header into lp:ubuntu-ui-toolkit

[Tim Peeters]

Revert to use the old header in trunk.

Revert to use the old header in trunk.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1186
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2200/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2503/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/828/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/24/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/24/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2501/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/990/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2200/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tpeeters/ubuntu-ui-toolkit/trunk-old-header]

1187. By Tim Peeters on 2015-04-28

CI broke? kick it again.

[Tim Peeters (tpeeters)]

I don't know what caused this:

cd ..; tests/qmlapicheck.sh || exit 1; cd tests
Dumping QML API of C++ components
qmlplugindump: could not find a Qt installation of ''
qmlplugindump: could not find a Qt installation of ''
qmlplugindump: could not find a Qt installation of ''
qmlplugindump: could not find a Qt installation of ''
Error: qmlplugindump failed
Makefile:327: recipe for target 'check' failed
make[1]: *** [check] Error 1
make[1]: Leaving directory '/tmp/buildd/ubuntu-ui-toolkit-1.2.1485+15.04.20150421bzr1186pkg0vivid2501+autopilot0/tests'
Makefile:329: recipe for target 'sub-tests-check' failed
make: *** [sub-tests-check] Error 2

qmlplugindump runs fine locally. And if there were API issues, it would print a clear error message. I pushed an empty commit; let's see if jenkins likes it on the second try.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1187
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2201/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2510/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/831/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/25/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/25/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2508/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/993/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2201/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml	2015-04-09 09:42:36 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml	2015-04-28 21:37:37 +0000
@@ -20,7 +20,7 @@
 AbstractButton {
     id: button
 
-    property real iconWidth: units.gu(2)
+    property real iconWidth: units.gu(2.5)
     property real iconHeight: iconWidth
 
     width: visible ? units.gu(5) : 0

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2015-04-20 10:40:57 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2015-04-28 21:37:37 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2014 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
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.4
-import Ubuntu.Components 1.3
+import Ubuntu.Components 1.2
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.Components.Styles 1.2 as Style
@@ -22,9 +22,9 @@
 Style.PageHeadStyle {
     id: headerStyle
     objectName: "PageHeadStyle" // used in unit tests
-    contentHeight: units.gu(6)
+    contentHeight: units.gu(7)
     fontWeight: Font.Light
-    fontSize: "large"
+    fontSize: "x-large"
     textLeftMargin: units.gu(2)
     maximumNumberOfActions: 3
 
@@ -38,31 +38,25 @@
      */
     property color titleColor: styledItem.config.foregroundColor
 
-    // FIXME: When the three panel color properties below are removed,
-    //  update unity8/Dash/PageHeader to use the new theming (currently
-    //  in progress) to set these colors.
     /*!
-      \deprecated
       The background color of the tabs panel and the actions overflow panel.
      */
     property color panelBackgroundColor: styledItem.panelColor
 
     /*!
-       \deprecated
-       The background color of the tapped item in the panel.
-      */
-    property color panelHighlightColor: theme.palette.selected.background
+      The background color of the tapped item in the panel.
+     */
+    property color panelHighlightColor: Theme.palette.selected.background
 
     /*!
-       \deprecated
-       The foreground color (icon and text) of actions in the panel.
-      */
-    property color panelForegroundColor: theme.palette.selected.backgroundText
+      The foreground color (icon and text) of actions in the panel.
+     */
+    property color panelForegroundColor: Theme.palette.selected.backgroundText
 
     /*!
       The text color of unselected sections and the section divider.
      */
-    property color sectionColor: theme.palette.selected.backgroundText
+    property color sectionColor: Theme.palette.selected.backgroundText
 
     /*!
       The text color of the selected section.
@@ -72,14 +66,9 @@
     /*!
       The background color of the pressed section.
      */
-    property color sectionHighlightColor: theme.palette.selected.background
-
-    implicitHeight: headerStyle.contentHeight + divider.height + sectionsItem.height
-
-    /*!
-      The height of the row displaying the sections, if sections are specified.
-     */
-    property real sectionsHeight: units.gu(4)
+    property color sectionHighlightColor: Theme.palette.selected.background
+
+    implicitHeight: headerStyle.contentHeight + divider.height
 
     // FIXME: Workaround to get sectionsRepeater.count in autopilot tests,
     //  see also FIXME in AppHeader where this property is used.
@@ -94,57 +83,50 @@
     //  have a separator.
     property alias __separator_visible: divider.visible
 
-    Rectangle {
+    StyledItem {
         id: divider
         anchors {
-            left: parent.left
-            right: parent.right
             bottom: parent.bottom
-        }
-        height: units.dp(1)
-        color: styledItem.dividerColor
-    }
-
-    Item {
-        id: sectionsItem
-        anchors {
-            bottom: divider.top
             left: parent.left
             right: parent.right
         }
 
-        visible: sectionsItem.sections.model !== undefined
-        height: visible ? headerStyle.sectionsHeight : 0
+        height: sectionsRow.visible ? units.gu(3) : units.gu(2)
+
+        // separatorSource and separatorBottomSource are needed for the deprecated
+        // HeadSeparatorImageStyle.
+        property url separatorSource: headerStyle.separatorSource
+        property url separatorBottomSource: headerStyle.separatorBottomSource
+
+        // backgroundColor is used in the new HeadDividerStyle
+        property color backgroundColor: styledItem.dividerColor
+
+        style: Theme.createStyleComponent("HeadDividerStyle.qml", divider)
 
         property PageHeadSections sections: styledItem.config.sections
 
         Row {
             id: sectionsRow
-            anchors {
-                top: parent.top
-                bottom: parent.bottom
-                horizontalCenter: parent.horizontalCenter
-            }
+            anchors.centerIn: parent
             width: childrenRect.width
-            enabled: sectionsItem.sections.enabled
-            visible: sectionsItem.sections.model !== undefined
+            height: parent.height
+            enabled: divider.sections.enabled
+            visible: divider.sections.model !== undefined
             opacity: enabled ? 1.0 : 0.5
 
             Repeater {
                 id: sectionsRepeater
-                model: sectionsItem.sections.model
+                model: divider.sections.model
                 objectName: "page_head_sections_repeater"
                 AbstractButton {
                     id: sectionButton
-                    anchors {
-                        top: parent.top
-                        bottom: parent.bottom
-                    }
+                    anchors.verticalCenter: parent ? parent.verticalCenter : undefined
                     objectName: "section_button_" + index
                     enabled: sectionsRow.enabled
-                    width: label.width + units.gu(4) // FIXME: expose spacing as style property
-                    property bool selected: index === sectionsItem.sections.selectedIndex
-                    onClicked: sectionsItem.sections.selectedIndex = index;
+                    width: label.width + units.gu(4)
+                    height: sectionsRow.height + units.gu(2)
+                    property bool selected: index === divider.sections.selectedIndex
+                    onClicked: divider.sections.selectedIndex = index;
 
                     Rectangle {
                         visible: parent.pressed
@@ -152,6 +134,7 @@
                             verticalCenter: parent.verticalCenter
                             left: parent.left
                             right: parent.right
+                            rightMargin: verticalDividerLine.width
                         }
                         height: sectionsRow.height
                         color: headerStyle.sectionHighlightColor
@@ -161,24 +144,25 @@
                         id: label
                         text: modelData
                         fontSize: "small"
-                        anchors.centerIn: parent
+                        anchors.centerIn: sectionButton
                         horizontalAlignment: Text.AlignHCenter
                         color: sectionButton.selected ?
                                    headerStyle.selectedSectionColor :
                                    headerStyle.sectionColor
                     }
 
+                    // vertical divider line
                     Rectangle {
-                        id: sectionLine
+                        id: verticalDividerLine
                         anchors {
-                            bottom: parent.bottom
-                            left: parent.left
+                            verticalCenter: parent.verticalCenter
                             right: parent.right
                         }
-                        height: units.dp(2) // FIXME: Expose as style property
-                        color: sectionButton.selected ?
-                                   headerStyle.selectedSectionColor :
-                                   styledItem.dividerColor
+                        height: units.dp(10)
+                        width: units.dp(1)
+                        visible: index < sectionsRepeater.model.length - 1
+                        color: headerStyle.sectionColor
+                        opacity: 0.2
                     }
                 }
             }