1
=== removed file 'qml/Components/ListItems/Highlight.qml'
2
--- qml/Components/ListItems/Highlight.qml	2013-06-05 22:03:08 +0000
3
+++ qml/Components/ListItems/Highlight.qml	1970-01-01 00:00:00 +0000
4
@@ -1,46 +0,0 @@
5
1
/*
6
2
 * Copyright (C) 2013 Canonical, Ltd.
7
3
 *
8
4
 * This program is free software; you can redistribute it and/or modify
9
5
 * it under the terms of the GNU General Public License as published by
10
6
 * the Free Software Foundation; version 3.
11
7
 *
12
8
 * This program is distributed in the hope that it will be useful,
13
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
11
 * GNU General Public License for more details.
16
12
 *
17
13
 * You should have received a copy of the GNU General Public License
18
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
19
15
 */
20
16
21
17
import QtQuick 2.0
22
18
23
19
Rectangle {
24
20
    id: highlight
25
21
26
22
    property bool pressed: false
27
23
    property real pressedOpacity: 0.3
28
24
29
25
    color: "black"
30
26
    opacity: 0
31
27
    state: pressed ? "pressed" : ""
32
28
    states: [
33
29
        State {
34
30
            name: "pressed"
35
31
            PropertyChanges { target: highlight; opacity: pressedOpacity}
36
32
        }
37
33
    ]
38
34
    transitions: [
39
35
        Transition {
40
36
            from: ""
41
37
            to: "pressed"
42
38
            NumberAnimation { target: highlight; property: "opacity"; duration: 50}
43
39
        },
44
40
        Transition {
45
41
            from: "pressed"
46
42
            to: ""
47
43
            NumberAnimation { target: highlight; property: "opacity"; duration: 100}
48
44
        }
49
45
    ]
50
46
}
51
47
0
52
=== renamed file 'qml/Components/ListItems/Base.qml' => 'qml/Dash/DashCategoryBase.qml'
53
--- qml/Components/ListItems/Base.qml	2014-10-03 11:39:18 +0000
54
+++ qml/Dash/DashCategoryBase.qml	2014-10-09 17:42:37 +0000
55
@@ -1,5 +1,5 @@
56
1
/*
1
/*
58
2
 * Copyright (C) 2012 Canonical, Ltd.
2
 * Copyright (C) 2012-2014 Canonical, Ltd.
59
3
 *
3
 *
60
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
61
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
62
@@ -18,46 +18,8 @@
63
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 0.1
64
19
19
65
20
Item {
20
Item {
106
21
    id: emptyListItem
21
    width: parent.width
107
22
    width: parent ? parent.width : units.gu(31)
22
    height: body.height
68
23
    height: body.height + bottomDividerLine.height
69
24
70
25
    /*!
71
26
      \preliminary
72
27
      Specifies whether the list item is selected.
73
28
     */
74
29
    property bool selected: false
75
30
76
31
    /*!
77
32
      \preliminary
78
33
      Set to show or hide the thin bottom divider line (drawn by the \l ThinDivider component).
79
34
      This line is shown by default except in cases where this item is the delegate of a ListView.
80
35
     */
81
36
    property bool showDivider: __showDivider()
82
37
83
38
    /*!
84
39
      \internal
85
40
      Method to automatically determine if the bottom divider line should be drawn.
86
41
      This always returns true, unless item is a delegate in a ListView. If in a ListView
87
42
      it will return false only when:
88
43
       + if this is the final item in the list, and ListView.footer is set (again as thin
89
44
         divider line won't look well with footer below it)
90
45
     */
91
46
    function __showDivider() {
92
47
        // if we're not in ListView, always show a thin dividing line at the bottom
93
48
        var model = null;
94
49
        if (typeof ListViewWithPageHeader !== 'undefined') {
95
50
            if (typeof ListViewWithPageHeader.model !== 'undefined') {
96
51
                model = ListViewWithPageHeader.model;
97
52
            }
98
53
        } else if (ListView.view !== null) {
99
54
            model = ListView.view.model;
100
55
        }
101
56
            // if we're last item in ListView don't show divider
102
57
        if (model && index === model.count - 1) return false;
103
58
104
59
        return true;
105
60
    }
108
61
23
109
62
    /* Relevant really only for ListViewWithPageHeader case: specify how many pixels we can overlap with the section header */
24
    /* Relevant really only for ListViewWithPageHeader case: specify how many pixels we can overlap with the section header */
110
63
    readonly property int allowedOverlap: units.dp(1)
25
    readonly property int allowedOverlap: units.dp(1)
111
@@ -92,25 +54,9 @@
112
92
            anchors {
54
            anchors {
113
93
                left: parent.left
55
                left: parent.left
114
94
                right: parent.right
56
                right: parent.right
116
95
                bottom: bottomDividerLine.top
57
                bottom: parent.bottom
117
96
            }
58
            }
118
97
            height: childrenRect.height
59
            height: childrenRect.height
119
98
        }
60
        }
120
99
121
100
        ThinDivider {
122
101
            id: bottomDividerLine
123
102
            anchors.bottom: parent.bottom
124
103
            visible: showDivider
125
104
        }
126
105
127
106
        Highlight {
128
107
            anchors {
129
108
                top: parent.top
130
109
                left: parent.left
131
110
                right: parent.right
132
111
                bottom: bottomDividerLine.top
133
112
            }
134
113
            pressed: emptyListItem.selected
135
114
        }
136
115
    }
61
    }
137
116
}
62
}
138
117
63
139
=== modified file 'qml/Dash/GenericScopeView.qml'
140
--- qml/Dash/GenericScopeView.qml	2014-10-06 15:54:18 +0000
141
+++ qml/Dash/GenericScopeView.qml	2014-10-09 17:42:37 +0000
142
@@ -210,10 +210,9 @@
143
210
            }
210
            }
144
211
        }
211
        }
145
212
212
147
213
        delegate: ListItems.Base {
213
        delegate: DashCategoryBase {
148
214
            id: baseItem
214
            id: baseItem
149
215
            objectName: "dashCategory" + category
215
            objectName: "dashCategory" + category
150
216
            showDivider: false
151
217
216
152
218
            property Item seeAllButton: seeAll
217
            property Item seeAllButton: seeAll
153
219
218
154
220
219
155
=== modified file 'tests/autopilot/unity8/shell/emulators/dash.py'
156
--- tests/autopilot/unity8/shell/emulators/dash.py	2014-10-06 08:02:57 +0000
157
+++ tests/autopilot/unity8/shell/emulators/dash.py	2014-10-09 17:42:37 +0000
158
@@ -206,7 +206,7 @@
159
206
    def _get_category_element(self, category):
206
    def _get_category_element(self, category):
160
207
        try:
207
        try:
161
208
            return self.wait_select_single(
208
            return self.wait_select_single(
163
209
                'Base', objectName='dashCategory{}'.format(category))
209
                'DashCategoryBase', objectName='dashCategory{}'.format(category))
164
210
        except dbus.StateNotFoundError:
210
        except dbus.StateNotFoundError:
165
211
            raise emulators.UnityEmulatorException(
211
            raise emulators.UnityEmulatorException(
166
212
                'No category found with name {}'.format(category))
212
                'No category found with name {}'.format(category))
Status:	Merged
Approved by:	Michael Zanetti on 2014-10-09
Approved revision:	1321
Merged at revision:	1357
Proposed branch:	lp:~aacid/unity8/killListItemsBase
Merge into:	lp:unity8
Prerequisite:	lp:~aacid/unity8/base_not_clickable
Diff against target:	166 lines (+6/-107) 4 files modified qml/Components/ListItems/Highlight.qml (+0/-46) qml/Dash/DashCategoryBase.qml (+4/-58) qml/Dash/GenericScopeView.qml (+1/-2) tests/autopilot/unity8/shell/emulators/dash.py (+1/-1)
To merge this branch:	bzr merge lp:~aacid/unity8/killListItemsBase
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Michael Zanetti (community)		2014-10-02	Approve on 2014-10-09
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-10-09
Review via email: mp+236836@code.launchpad.net