1
=== modified file 'debian/changelog'
2
--- debian/changelog	2016-11-16 18:54:00 +0000
3
+++ debian/changelog	2016-11-25 13:42:57 +0000
4
@@ -1,3 +1,9 @@
5
1
ubuntu-settings-components (0.12-0ubuntu1) UNRELEASED; urgency=medium
6
2
7
3
  * Add Menus.EthernetItem in support of indicator-network.
8
4
9
5
 -- Pete <pete.woods@canonical.com>  Fri, 25 Nov 2016 13:41:29 +0000
10
6
11
1
ubuntu-settings-components (0.11+17.04.20161116.1-0ubuntu1) zesty; urgency=medium
7
ubuntu-settings-components (0.11+17.04.20161116.1-0ubuntu1) zesty; urgency=medium
12
2
8
13
3
  * Menus: add Pointer and Touch styles to be used depending on the user
9
  * Menus: add Pointer and Touch styles to be used depending on the user
14
4
10
15
=== added file 'plugins/Ubuntu/Settings/Menus/EthernetItem.qml'
16
--- plugins/Ubuntu/Settings/Menus/EthernetItem.qml	1970-01-01 00:00:00 +0000
17
+++ plugins/Ubuntu/Settings/Menus/EthernetItem.qml	2016-11-25 13:42:57 +0000
18
@@ -0,0 +1,85 @@
19
1
/*
20
2
 * Copyright 2014-2016 Canonical Ltd.
21
3
 *
22
4
 * This program is free software; you can redistribute it and/or modify
23
5
 * it under the terms of the GNU Lesser General Public License as published by
24
6
 * the Free Software Foundation; version 3.
25
7
 *
26
8
 * This program is distributed in the hope that it will be useful,
27
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
28
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
29
11
 * GNU Lesser General Public License for more details.
30
12
 *
31
13
 * You should have received a copy of the GNU Lesser General Public License
32
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
33
15
 *
34
16
 * Author: Pete Woods <pete.woods@canonical.com>
35
17
 */
36
18
37
19
import QtQuick 2.4
38
20
import QtQuick.Layouts 1.1
39
21
import Ubuntu.Components 1.3
40
22
import Ubuntu.Settings.Menus.Style 0.1
41
23
42
24
BaseMenu {
43
25
    id: menu
44
26
    property alias statusIcon: statusIcon.name
45
27
    property alias statusText: labelStatus.text
46
28
    property alias name: labelName.text
47
29
    property alias checked: switcher.checked
48
30
49
31
    menuHeight: slotsLayout.height
50
32
51
33
    StyledSlotsLayout {
52
34
        id: slotsLayout
53
35
        objectName: "ethernetSlotsLayout"
54
36
        style: menuStyle
55
37
56
38
        mainSlot: ColumnLayout {
57
39
            spacing: units.gu(0.5)
58
40
59
41
            Label {
60
42
                id: labelName
61
43
                objectName: "labelName"
62
44
                elide: Text.ElideRight
63
45
                color: menu.foregroundColor
64
46
                font.bold: true
65
47
                font.pixelSize: menuStyle.fontSize
66
48
            }
67
49
68
50
            Row {
69
51
                id: statusRow
70
52
                spacing: units.gu(1)
71
53
                height: labelStatus.height
72
54
73
55
                Label {
74
56
                    id: labelStatus
75
57
                    objectName: "labelStatus"
76
58
                    elide: Text.ElideRight
77
59
                    opacity: 0.6
78
60
                    color: menu.foregroundColor
79
61
                    font.pixelSize: menuStyle.fontSize
80
62
                }
81
63
82
64
                Icon {
83
65
                    id: statusIcon
84
66
                    objectName: "statusIcon"
85
67
                    color: menuStyle.iconColor
86
68
87
69
                    height: menuStyle.iconSize
88
70
                    width: height
89
71
90
72
                    visible: name !== ""
91
73
                }
92
74
            }
93
75
        }
94
76
95
77
        Switch {
96
78
            id: switcher
97
79
            objectName: "switcher"
98
80
            onClicked: menu.triggered(checked)
99
81
100
82
            SlotsLayout.position: SlotsLayout.Trailing
101
83
        }
102
84
    }
103
85
}
104
0
86
105
=== modified file 'plugins/Ubuntu/Settings/Menus/qmldir'
106
--- plugins/Ubuntu/Settings/Menus/qmldir	2016-10-10 22:27:38 +0000
107
+++ plugins/Ubuntu/Settings/Menus/qmldir	2016-11-25 13:42:57 +0000
108
@@ -8,6 +8,7 @@
109
8
ButtonMenu 0.1 ButtonMenu.qml
8
ButtonMenu 0.1 ButtonMenu.qml
110
9
CalendarMenu 0.1 CalendarMenu.qml
9
CalendarMenu 0.1 CalendarMenu.qml
111
10
CheckableMenu 0.1 CheckableMenu.qml
10
CheckableMenu 0.1 CheckableMenu.qml
112
11
EthernetItem 0.1 EthernetItem.qml
113
11
EventMenu 0.1 EventMenu.qml
12
EventMenu 0.1 EventMenu.qml
114
12
GroupedMessageMenu 0.1 GroupedMessageMenu.qml
13
GroupedMessageMenu 0.1 GroupedMessageMenu.qml
115
13
MediaPlayerMenu 0.1 MediaPlayerMenu.qml
14
MediaPlayerMenu 0.1 MediaPlayerMenu.qml
116
14
15
117
=== modified file 'tests/qmltests/CMakeLists.txt'
118
--- tests/qmltests/CMakeLists.txt	2016-10-11 13:51:11 +0000
119
+++ tests/qmltests/CMakeLists.txt	2016-11-25 13:42:57 +0000
120
@@ -9,6 +9,7 @@
121
9
add_usc_qmltest(Menus ButtonMenu)
9
add_usc_qmltest(Menus ButtonMenu)
122
10
add_usc_qmltest(Menus CalendarMenu)
10
add_usc_qmltest(Menus CalendarMenu)
123
11
add_usc_qmltest(Menus CheckableMenu)
11
add_usc_qmltest(Menus CheckableMenu)
124
12
add_usc_qmltest(Menus EthernetItem)
125
12
add_usc_qmltest(Menus EventMenu)
13
add_usc_qmltest(Menus EventMenu)
126
13
add_usc_qmltest(Menus GroupedMessageMenu)
14
add_usc_qmltest(Menus GroupedMessageMenu)
127
14
add_usc_qmltest(Menus MediaPlayerMenu)
15
add_usc_qmltest(Menus MediaPlayerMenu)
128
15
16
129
=== added file 'tests/qmltests/Menus/tst_EthernetItem.qml'
130
--- tests/qmltests/Menus/tst_EthernetItem.qml	1970-01-01 00:00:00 +0000
131
+++ tests/qmltests/Menus/tst_EthernetItem.qml	2016-11-25 13:42:57 +0000
132
@@ -0,0 +1,132 @@
133
1
/*
134
2
 * Copyright 2016 Canonical Ltd.
135
3
 *
136
4
 * This program is free software; you can redistribute it and/or modify
137
5
 * it under the terms of the GNU Lesser General Public License as published by
138
6
 * the Free Software Foundation; version 3.
139
7
 *
140
8
 * This program is distributed in the hope that it will be useful,
141
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
142
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
143
11
 * GNU Lesser General Public License for more details.
144
12
 *
145
13
 * You should have received a copy of the GNU Lesser General Public License
146
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
147
15
 *
148
16
 * Authored by Pete Woods <pete.woods@canonical.com>
149
17
 */
150
18
151
19
import QtQuick 2.4
152
20
import QtTest 1.0
153
21
import Ubuntu.Test 0.1
154
22
import Ubuntu.Settings.Menus 0.1
155
23
156
24
Item {
157
25
    width: units.gu(42)
158
26
    height: units.gu(75)
159
27
160
28
    Column {
161
29
        anchors.fill: parent
162
30
163
31
        EthernetItem {
164
32
            id: ethernetItem
165
33
        }
166
34
167
35
        EthernetItem {
168
36
            id: checkedEthernetItem
169
37
            checked: true
170
38
        }
171
39
172
40
        EthernetItem {
173
41
            id: clickEthernetItem
174
42
        }
175
43
    }
176
44
177
45
    SignalSpy {
178
46
        id: signalSpy
179
47
    }
180
48
181
49
    UbuntuTestCase {
182
50
        name: "BaseMenu"
183
51
        when: windowShown
184
52
185
53
        function getSwitchItem(item) {
186
54
            var switchItem = findChild(item, "switcher");
187
55
            verify(switchItem !== undefined)
188
56
            return switchItem
189
57
        }
190
58
191
59
        function cleanup() {
192
60
            clickEthernetItem.checked = false
193
61
            signalSpy.clear()
194
62
        }
195
63
196
64
        function test_checked() {
197
65
            compare(getSwitchItem(ethernetItem).checked, false, "should be unchecked by default")
198
66
        }
199
67
200
68
        function test_unChecked() {
201
69
            compare(getSwitchItem(checkedEthernetItem).checked, true, "should be checked")
202
70
        }
203
71
204
72
        function checkedData() {
205
73
            return [ {tag: "unchecked", checked: false}, {tag: "checked", checked: true}]
206
74
        }
207
75
208
76
        function test_changing_data() {
209
77
            return checkedData()
210
78
        }
211
79
212
80
        function test_changing(data) {
213
81
            clickEthernetItem.checked = data.checked
214
82
            compare(getSwitchItem(clickEthernetItem).checked, data.checked, "switch should be %1".arg(data.tag))
215
83
        }
216
84
217
85
        function test_clickEvent_data() {
218
86
            return checkedData()
219
87
        }
220
88
221
89
        function test_clickEvent(data) {
222
90
            signalSpy.target = clickEthernetItem
223
91
            signalSpy.signalName = "onClicked"
224
92
            clickEthernetItem.checked = data.checked
225
93
            mouseClick(clickEthernetItem, clickEthernetItem.width/2, clickEthernetItem.height/2)
226
94
            compare(signalSpy.count, 1)
227
95
        }
228
96
229
97
        function test_onCheckedChanged_data() {
230
98
            return checkedData()
231
99
        }
232
100
233
101
        function test_onCheckedChanged(data) {
234
102
            clickEthernetItem.checked = data.checked
235
103
            signalSpy.clear()
236
104
            signalSpy.target = clickEthernetItem
237
105
            signalSpy.signalName = "onTriggered"
238
106
            mouseClick(clickEthernetItem, clickEthernetItem.width/2, clickEthernetItem.height/2)
239
107
            compare(signalSpy.count, 1)
240
108
        }
241
109
242
110
        function getChild(name) {
243
111
            var child = findChild(ethernetItem, name)
244
112
            verify(child !== undefined)
245
113
            return child
246
114
        }
247
115
248
116
        function test_nameStatusIcon_data() {
249
117
            return [{name: "Ethernet (eth0)", statusText: "Connected", statusIcon: "network-wired-connected"},
250
118
                    {name: "Ethernet", statusText: "Connecting", statusIcon: "network-wired-active"},
251
119
                    {name: "Ethernet", statusText: "Disabled", statusIcon: "network-wired-disabled"}]
252
120
        }
253
121
254
122
        function test_nameStatusIcon(data) {
255
123
            ethernetItem.name = data.name
256
124
            ethernetItem.statusText = data.statusText
257
125
            ethernetItem.statusIcon = data.statusIcon
258
126
259
127
            compare(getChild("labelName").text, data.name)
260
128
            compare(getChild("labelStatus").text, data.statusText)
261
129
            compare(getChild("statusIcon").name, data.statusIcon)
262
130
        }
263
131
    }
264
132
}
Status:	Rejected
Rejected by:	Pete Woods on 2016-11-30
Proposed branch:	lp:~pete-woods/ubuntu-settings-components/add-ethernet-item
Merge into:	lp:ubuntu-settings-components
Diff against target:	264 lines (+225/-0) 5 files modified debian/changelog (+6/-0) plugins/Ubuntu/Settings/Menus/EthernetItem.qml (+85/-0) plugins/Ubuntu/Settings/Menus/qmldir (+1/-0) tests/qmltests/CMakeLists.txt (+1/-0) tests/qmltests/Menus/tst_EthernetItem.qml (+132/-0)
To merge this branch:	bzr merge lp:~pete-woods/ubuntu-settings-components/add-ethernet-item
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Marco Trevisan (Treviño)		2016-11-28	Disapprove on 2016-12-01
Michał Sawicz		2016-11-22	Abstain on 2016-11-25
Unity8 CI Bot	continuous-integration		Approve on 2016-11-25
Review via email: mp+311503@code.launchpad.net