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
1=== removed file 'qml/Components/ListItems/ThinDivider.qml'
2--- qml/Components/ListItems/ThinDivider.qml 2015-07-15 15:07:19 +0000
3+++ qml/Components/ListItems/ThinDivider.qml 1970-01-01 00:00:00 +0000
4@@ -1,27 +0,0 @@
5-/*
6- * Copyright (C) 2012 Canonical, Ltd.
7- *
8- * This program is free software; you can redistribute it and/or modify
9- * it under the terms of the GNU General Public License as published by
10- * the Free Software Foundation; version 3.
11- *
12- * This program is distributed in the hope that it will be useful,
13- * but WITHOUT ANY WARRANTY; without even the implied warranty of
14- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15- * GNU General Public License for more details.
16- *
17- * You should have received a copy of the GNU General Public License
18- * along with this program. If not, see <http://www.gnu.org/licenses/>.
19- */
20-
21-import QtQuick 2.4
22-
23-Image {
24- anchors {
25- left: (parent) ? parent.left : null
26- right: (parent) ? parent.right : null
27- }
28- height: (visible) ? units.dp(2) : 0
29-
30- source: "graphics/ListItemDividerHorizontal.png"
31-}
32
33=== removed directory 'qml/Components/ListItems/graphics'
34=== removed file 'qml/Components/ListItems/graphics/ListItemDividerHorizontal@18.png'
35Binary 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
36=== renamed file 'qml/Components/ListItems/Header.qml' => 'qml/Dash/DashSectionHeader.qml'
37=== modified file 'qml/Dash/GenericScopeView.qml'
38--- qml/Dash/GenericScopeView.qml 2016-09-22 07:37:21 +0000
39+++ qml/Dash/GenericScopeView.qml 2016-10-04 09:36:46 +0000
40@@ -22,7 +22,6 @@
41 import Unity 0.2
42 import Dash 0.1
43 import "../Components"
44-import "../Components/ListItems" as ListItems
45 import "Previews/PreviewSingleton"
46
47 FocusScope {
48@@ -621,7 +620,7 @@
49 }
50
51 sectionProperty: "name"
52- sectionDelegate: ListItems.Header {
53+ sectionDelegate: DashSectionHeader {
54 objectName: "dashSectionHeader" + (delegate ? delegate.category : "")
55 property int delegateIndex: -1
56 readonly property var delegate: categoryView.item(delegateIndex)
57
58=== modified file 'qml/Dash/ScopesListCategory.qml'
59--- qml/Dash/ScopesListCategory.qml 2016-07-27 16:23:18 +0000
60+++ qml/Dash/ScopesListCategory.qml 2016-10-04 09:36:46 +0000
61@@ -16,9 +16,9 @@
62
63 import QtQuick 2.4
64 import Ubuntu.Components 1.3
65+import Ubuntu.Components.ListItems 1.3 as ListItems
66 import Dash 0.1
67 import "../Components"
68-import "../Components/ListItems" as ListItems
69
70 Item {
71 id: root
72@@ -40,7 +40,7 @@
73
74 implicitHeight: visible ? childrenRect.height : 0
75
76- ListItems.Header {
77+ DashSectionHeader {
78 id: header
79 width: root.width
80 height: units.gu(5)
81
82=== modified file 'qml/Launcher/LauncherPanel.qml'
83--- qml/Launcher/LauncherPanel.qml 2016-08-08 10:42:40 +0000
84+++ qml/Launcher/LauncherPanel.qml 2016-10-04 09:36:46 +0000
85@@ -18,7 +18,6 @@
86 import Ubuntu.Components 1.3
87 import Unity.Launcher 0.1
88 import Ubuntu.Components.Popups 1.3
89-import "../Components/ListItems"
90 import "../Components"
91
92 Rectangle {
93@@ -296,10 +295,11 @@
94 }
95 }
96
97- ThinDivider {
98+ Image {
99 id: dropIndicator
100 objectName: "dropIndicator"
101 anchors.centerIn: parent
102+ height: visible ? units.dp(2) : 0
103 width: parent.width + mainColumn.anchors.leftMargin + mainColumn.anchors.rightMargin
104 opacity: 0
105 source: "graphics/divider-line.png"

Subscribers

People subscribed via source and target branches