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

Proposed by Albert Astals Cid
Status: Merged
Approved by: Michael Zanetti
Approved revision: 2656
Merged at revision: 2678
Proposed branch: lp:~aacid/unity8/killOurListItems
Merge into: lp:unity8
Diff against target: 105 lines (+5/-33)
4 files modified
qml/Components/ListItems/ThinDivider.qml (+0/-27)
qml/Dash/GenericScopeView.qml (+1/-2)
qml/Dash/ScopesListCategory.qml (+2/-2)
qml/Launcher/LauncherPanel.qml (+2/-2)
To merge this branch: bzr merge lp:~aacid/unity8/killOurListItems
Reviewer Review Type Date Requested Status
Michael Zanetti (community) Approve
Unity8 CI Bot continuous-integration Needs Fixing
Review via email: mp+307536@code.launchpad.net

Commit message

Kill qml/Components/ListItems

ThinDivider can be replaced either by Ubuntu.Components.ListItems.ThinDivider or by an image
Header.qml is renamed to DashSectionHeader and added to the Dash/ folder

Description of the change

 * 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?
N/A

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

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

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote :

In general I totally agree with this, but why not using the ThinDivider from the SDK?

review: Needs Information
Revision history for this message
Albert Astals Cid (aacid) wrote :

> In general I totally agree with this, but why not using the ThinDivider from
> the SDK?

It is using it for ScopesListCategory.qml

For the Launcher it looked too different (and IMHO worse) given how the Launcher uses a darker theme and was using already a different image than our "custom" ThinDivider

Revision history for this message
Michael Zanetti (mzanetti) wrote :

okay then...

* Code change looks good
* tried tryDash and tryLauncher, couldn't spot a visual difference to before
* CI instability is unrelated

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed file 'qml/Components/ListItems/ThinDivider.qml'
--- qml/Components/ListItems/ThinDivider.qml 2015-07-15 15:07:19 +0000
+++ qml/Components/ListItems/ThinDivider.qml 1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
1/*
2 * Copyright (C) 2012 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17import QtQuick 2.4
18
19Image {
20 anchors {
21 left: (parent) ? parent.left : null
22 right: (parent) ? parent.right : null
23 }
24 height: (visible) ? units.dp(2) : 0
25
26 source: "graphics/ListItemDividerHorizontal.png"
27}
280
=== removed directory 'qml/Components/ListItems/graphics'
=== removed file 'qml/Components/ListItems/graphics/ListItemDividerHorizontal@18.png'
29Binary files qml/Components/ListItems/graphics/ListItemDividerHorizontal@18.png 2016-06-03 23:00:28 +0000 and qml/Components/ListItems/graphics/ListItemDividerHorizontal@18.png 1970-01-01 00:00:00 +0000 differ1Binary files qml/Components/ListItems/graphics/ListItemDividerHorizontal@18.png 2016-06-03 23:00:28 +0000 and qml/Components/ListItems/graphics/ListItemDividerHorizontal@18.png 1970-01-01 00:00:00 +0000 differ
=== renamed file 'qml/Components/ListItems/Header.qml' => 'qml/Dash/DashSectionHeader.qml'
=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml 2016-09-22 07:37:21 +0000
+++ qml/Dash/GenericScopeView.qml 2016-10-04 09:36:46 +0000
@@ -22,7 +22,6 @@
22import Unity 0.222import Unity 0.2
23import Dash 0.123import Dash 0.1
24import "../Components"24import "../Components"
25import "../Components/ListItems" as ListItems
26import "Previews/PreviewSingleton"25import "Previews/PreviewSingleton"
2726
28FocusScope {27FocusScope {
@@ -621,7 +620,7 @@
621 }620 }
622621
623 sectionProperty: "name"622 sectionProperty: "name"
624 sectionDelegate: ListItems.Header {623 sectionDelegate: DashSectionHeader {
625 objectName: "dashSectionHeader" + (delegate ? delegate.category : "")624 objectName: "dashSectionHeader" + (delegate ? delegate.category : "")
626 property int delegateIndex: -1625 property int delegateIndex: -1
627 readonly property var delegate: categoryView.item(delegateIndex)626 readonly property var delegate: categoryView.item(delegateIndex)
628627
=== modified file 'qml/Dash/ScopesListCategory.qml'
--- qml/Dash/ScopesListCategory.qml 2016-07-27 16:23:18 +0000
+++ qml/Dash/ScopesListCategory.qml 2016-10-04 09:36:46 +0000
@@ -16,9 +16,9 @@
1616
17import QtQuick 2.417import QtQuick 2.4
18import Ubuntu.Components 1.318import Ubuntu.Components 1.3
19import Ubuntu.Components.ListItems 1.3 as ListItems
19import Dash 0.120import Dash 0.1
20import "../Components"21import "../Components"
21import "../Components/ListItems" as ListItems
2222
23Item {23Item {
24 id: root24 id: root
@@ -40,7 +40,7 @@
4040
41 implicitHeight: visible ? childrenRect.height : 041 implicitHeight: visible ? childrenRect.height : 0
4242
43 ListItems.Header {43 DashSectionHeader {
44 id: header44 id: header
45 width: root.width45 width: root.width
46 height: units.gu(5)46 height: units.gu(5)
4747
=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml 2016-08-08 10:42:40 +0000
+++ qml/Launcher/LauncherPanel.qml 2016-10-04 09:36:46 +0000
@@ -18,7 +18,6 @@
18import Ubuntu.Components 1.318import Ubuntu.Components 1.3
19import Unity.Launcher 0.119import Unity.Launcher 0.1
20import Ubuntu.Components.Popups 1.320import Ubuntu.Components.Popups 1.3
21import "../Components/ListItems"
22import "../Components"21import "../Components"
2322
24Rectangle {23Rectangle {
@@ -296,10 +295,11 @@
296 }295 }
297 }296 }
298297
299 ThinDivider {298 Image {
300 id: dropIndicator299 id: dropIndicator
301 objectName: "dropIndicator"300 objectName: "dropIndicator"
302 anchors.centerIn: parent301 anchors.centerIn: parent
302 height: visible ? units.dp(2) : 0
303 width: parent.width + mainColumn.anchors.leftMargin + mainColumn.anchors.rightMargin303 width: parent.width + mainColumn.anchors.leftMargin + mainColumn.anchors.rightMargin
304 opacity: 0304 opacity: 0
305 source: "graphics/divider-line.png"305 source: "graphics/divider-line.png"

Subscribers

People subscribed via source and target branches