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

[Albert Astals Cid]

Move Base.qml to DashCategoryBase

It's the only place we use it and we can simplify stuff quite a bit

 * 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

 * Did you make sure that your branch does not contain spurious tags?
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?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1318
http://jenkins.qa.ubuntu.com/job/unity8-ci/4476/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5437
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1461
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1570
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1570
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5144
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6689
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6689/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14077

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4476/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/killListItemsBase]

1319. By Albert Astals Cid on 2014-10-06

Merge

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1319
http://jenkins.qa.ubuntu.com/job/unity8-ci/4504/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5542
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1489
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1598
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1598
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5241
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6794
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6794/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14205

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4504/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1319
http://jenkins.qa.ubuntu.com/job/unity8-ci/4510/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5568
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1495
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1604
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1604
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5262
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6820
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6820/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14237

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4510/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/killListItemsBase]

1320. By Albert Astals Cid on 2014-10-07

Merge

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1320
http://jenkins.qa.ubuntu.com/job/unity8-ci/4522/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5595/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1507
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1616
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1616
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5289/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6847
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6847/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14268

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4522/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1320
http://jenkins.qa.ubuntu.com/job/unity8-ci/4534/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5651
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1519
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1630
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1628
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5332
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6903
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6903/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14318

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4534/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

there seem to be some real AP failures in the mix...

autopilot/unity8/shell/emulators/dash.py:209: 'Base', objectName='dashCategory{}'.format(category))

review: Needs Fixing

[lp:~aacid/unity8/killListItemsBase]

1321. By Albert Astals Cid on 2014-10-08

Name changed

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1321
http://jenkins.qa.ubuntu.com/job/unity8-ci/4541/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5675/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1526/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1637
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1635
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6927/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4541/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1321
http://jenkins.qa.ubuntu.com/job/unity8-ci/4557/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5715
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1543
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1653
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1651
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5379
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6967
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6967/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14379

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4557/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1321
http://jenkins.qa.ubuntu.com/job/unity8-ci/4565/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5723
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1551
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1661
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1659
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5389
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6975
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6975/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14394

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4565/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

 * 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... but this one now seems unrelated... IO-error in jenkins?

 * Did you make sure that the branch does not contain spurious tags?

yes

review: Approve

[lp:~aacid/unity8/killListItemsBase]

1322. By Albert Astals Cid on 2014-10-09

Merge

1323. By Albert Astals Cid on 2014-10-09

Merge

=== removed file 'qml/Components/ListItems/Highlight.qml'
--- qml/Components/ListItems/Highlight.qml	2013-06-05 22:03:08 +0000
+++ qml/Components/ListItems/Highlight.qml	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2013 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/>.
- */
-
-import QtQuick 2.0
-
-Rectangle {
-    id: highlight
-
-    property bool pressed: false
-    property real pressedOpacity: 0.3
-
-    color: "black"
-    opacity: 0
-    state: pressed ? "pressed" : ""
-    states: [
-        State {
-            name: "pressed"
-            PropertyChanges { target: highlight; opacity: pressedOpacity}
-        }
-    ]
-    transitions: [
-        Transition {
-            from: ""
-            to: "pressed"
-            NumberAnimation { target: highlight; property: "opacity"; duration: 50}
-        },
-        Transition {
-            from: "pressed"
-            to: ""
-            NumberAnimation { target: highlight; property: "opacity"; duration: 100}
-        }
-    ]
-}

=== renamed file 'qml/Components/ListItems/Base.qml' => 'qml/Dash/DashCategoryBase.qml'
--- qml/Components/ListItems/Base.qml	2014-10-03 11:39:18 +0000
+++ qml/Dash/DashCategoryBase.qml	2014-10-09 17:42:37 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Canonical, Ltd.
+ * Copyright (C) 2012-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
@@ -18,46 +18,8 @@
 import Ubuntu.Components 0.1
 
 Item {
-    id: emptyListItem
-    width: parent ? parent.width : units.gu(31)
-    height: body.height + bottomDividerLine.height
-
-    /*!
-      \preliminary
-      Specifies whether the list item is selected.
-     */
-    property bool selected: false
-
-    /*!
-      \preliminary
-      Set to show or hide the thin bottom divider line (drawn by the \l ThinDivider component).
-      This line is shown by default except in cases where this item is the delegate of a ListView.
-     */
-    property bool showDivider: __showDivider()
-
-    /*!
-      \internal
-      Method to automatically determine if the bottom divider line should be drawn.
-      This always returns true, unless item is a delegate in a ListView. If in a ListView
-      it will return false only when:
-       + if this is the final item in the list, and ListView.footer is set (again as thin
-         divider line won't look well with footer below it)
-     */
-    function __showDivider() {
-        // if we're not in ListView, always show a thin dividing line at the bottom
-        var model = null;
-        if (typeof ListViewWithPageHeader !== 'undefined') {
-            if (typeof ListViewWithPageHeader.model !== 'undefined') {
-                model = ListViewWithPageHeader.model;
-            }
-        } else if (ListView.view !== null) {
-            model = ListView.view.model;
-        }
-            // if we're last item in ListView don't show divider
-        if (model && index === model.count - 1) return false;
-
-        return true;
-    }
+    width: parent.width
+    height: body.height
 
     /* Relevant really only for ListViewWithPageHeader case: specify how many pixels we can overlap with the section header */
     readonly property int allowedOverlap: units.dp(1)
@@ -92,25 +54,9 @@
             anchors {
                 left: parent.left
                 right: parent.right
-                bottom: bottomDividerLine.top
+                bottom: parent.bottom
             }
             height: childrenRect.height
         }
-
-        ThinDivider {
-            id: bottomDividerLine
-            anchors.bottom: parent.bottom
-            visible: showDivider
-        }
-
-        Highlight {
-            anchors {
-                top: parent.top
-                left: parent.left
-                right: parent.right
-                bottom: bottomDividerLine.top
-            }
-            pressed: emptyListItem.selected
-        }
     }
 }

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2014-10-06 15:54:18 +0000
+++ qml/Dash/GenericScopeView.qml	2014-10-09 17:42:37 +0000
@@ -210,10 +210,9 @@
             }
         }
 
-        delegate: ListItems.Base {
+        delegate: DashCategoryBase {
             id: baseItem
             objectName: "dashCategory" + category
-            showDivider: false
 
             property Item seeAllButton: seeAll
 

=== modified file 'tests/autopilot/unity8/shell/emulators/dash.py'
--- tests/autopilot/unity8/shell/emulators/dash.py	2014-10-06 08:02:57 +0000
+++ tests/autopilot/unity8/shell/emulators/dash.py	2014-10-09 17:42:37 +0000
@@ -206,7 +206,7 @@
     def _get_category_element(self, category):
         try:
             return self.wait_select_single(
-                'Base', objectName='dashCategory{}'.format(category))
+                'DashCategoryBase', objectName='dashCategory{}'.format(category))
         except dbus.StateNotFoundError:
             raise emulators.UnityEmulatorException(
                 'No category found with name {}'.format(category))