git.iko.soy/unity8
on xenial help sign in
Kill Components/ListItems
4d914ccAlbert Astals Cid
qml/Components/ListItems/ThinDivider.qmldeleted−27
compare with xenial
unifiedsplit
@@ -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−
17−import QtQuick 2.4
18−
19−Image {
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−}
qml/Components/ListItems/graphics/ListItemDividerHorizontal@18.pngdeleted

Binary file not shown.

qml/Components/ListItems/Header.qml → qml/Dash/DashSectionHeader.qmlrenamed

The content is the same.

qml/Dash/GenericScopeView.qml+1−2
@@ -22,7 +22,6 @@ import Utils 0.1
22import Unity 0.2
22import Unity 0.2
23import Dash 0.1
23import Dash 0.1
24import "../Components"
24import "../Components"
25−import "../Components/ListItems" as ListItems
26import "Previews/PreviewSingleton"
25import "Previews/PreviewSingleton"
27
26
28FocusScope {
27FocusScope {
@@ -621,7 +620,7 @@ FocusScope {
621 }
620 }
622
621
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: -1
625 property int delegateIndex: -1
627 readonly property var delegate: categoryView.item(delegateIndex)
626 readonly property var delegate: categoryView.item(delegateIndex)
qml/Dash/ScopesListCategory.qml+2−2
@@ -16,9 +16,9 @@
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18import Ubuntu.Components 1.3
18import Ubuntu.Components 1.3
19+import Ubuntu.Components.ListItems 1.3 as ListItems
19import Dash 0.1
20import Dash 0.1
20import "../Components"
21import "../Components"
21−import "../Components/ListItems" as ListItems
22
22
23Item {
23Item {
24 id: root
24 id: root
@@ -40,7 +40,7 @@ Item {
40
40
41 implicitHeight: visible ? childrenRect.height : 0
41 implicitHeight: visible ? childrenRect.height : 0
42
42
43− ListItems.Header {
43+ DashSectionHeader {
44 id: header
44 id: header
45 width: root.width
45 width: root.width
46 height: units.gu(5)
46 height: units.gu(5)
qml/Launcher/LauncherPanel.qml+2−2
@@ -18,7 +18,6 @@ import QtQuick 2.4
18import Ubuntu.Components 1.3
18import Ubuntu.Components 1.3
19import Unity.Launcher 0.1
19import Unity.Launcher 0.1
20import Ubuntu.Components.Popups 1.3
20import Ubuntu.Components.Popups 1.3
21−import "../Components/ListItems"
22import "../Components"
21import "../Components"
23
22
24Rectangle {
23Rectangle {
@@ -296,10 +295,11 @@ Rectangle {
296 }
295 }
297 }
296 }
298
297
299− ThinDivider {
298+ Image {
300 id: dropIndicator
299 id: dropIndicator
301 objectName: "dropIndicator"
300 objectName: "dropIndicator"
302 anchors.centerIn: parent
301 anchors.centerIn: parent
302+ height: visible ? units.dp(2) : 0
303 width: parent.width + mainColumn.anchors.leftMargin + mainColumn.anchors.rightMargin
303 width: parent.width + mainColumn.anchors.leftMargin + mainColumn.anchors.rightMargin
304 opacity: 0
304 opacity: 0
305 source: "graphics/divider-line.png"
305 source: "graphics/divider-line.png"