1
=== modified file 'src/SystemSettings/CMakeLists.txt'
2
--- src/SystemSettings/CMakeLists.txt	2014-10-31 08:45:10 +0000
3
+++ src/SystemSettings/CMakeLists.txt	2016-06-29 14:34:55 +0000
4
@@ -6,3 +6,5 @@
5
6
set(PLUG_DIR ${PLUGIN_QML_DIR}/SystemSettings)
6
set(PLUG_DIR ${PLUGIN_QML_DIR}/SystemSettings)
6
7
install(FILES qmldir DESTINATION ${PLUG_DIR})
7
install(FILES qmldir DESTINATION ${PLUG_DIR})
7
8
install(FILES ${QML_SOURCES} DESTINATION ${PLUG_DIR})
8
install(FILES ${QML_SOURCES} DESTINATION ${PLUG_DIR})
8
9
9
10
add_subdirectory(ListItems)
10
9
11
11
=== added directory 'src/SystemSettings/ListItems'
12
=== added file 'src/SystemSettings/ListItems/CMakeLists.txt'
13
--- src/SystemSettings/ListItems/CMakeLists.txt	1970-01-01 00:00:00 +0000
14
+++ src/SystemSettings/ListItems/CMakeLists.txt	2016-06-29 14:34:55 +0000
15
@@ -0,0 +1,13 @@
16
1
set(QML_SOURCES
17
2
    Icon.qml
18
3
    IconProgression.qml
19
4
    SingleControl.qml
20
5
    SingleValue.qml
21
6
    SingleValueProgression.qml
22
7
    Standard.qml
23
8
    StandardProgression.qml
24
9
)
25
10
26
11
set(PLUG_DIR ${PLUGIN_QML_DIR}/SystemSettings/ListItems)
27
12
install(FILES qmldir DESTINATION ${PLUG_DIR})
28
13
install(FILES ${QML_SOURCES} DESTINATION ${PLUG_DIR})
29
0
14
30
=== added file 'src/SystemSettings/ListItems/Icon.qml'
31
--- src/SystemSettings/ListItems/Icon.qml	1970-01-01 00:00:00 +0000
32
+++ src/SystemSettings/ListItems/Icon.qml	2016-06-29 14:34:55 +0000
33
@@ -0,0 +1,33 @@
34
1
/*
35
2
 * This file is part of system-settings
36
3
 *
37
4
 * Copyright (C) 2015 Canonical Ltd.
38
5
 *
39
6
 * This program is free software: you can redistribute it and/or modify it
40
7
 * under the terms of the GNU General Public License version 3, as published
41
8
 * by the Free Software Foundation.
42
9
 *
43
10
 * This program is distributed in the hope that it will be useful, but
44
11
 * WITHOUT ANY WARRANTY; without even the implied warranties of
45
12
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
46
13
 * PURPOSE.  See the GNU General Public License for more details.
47
14
 *
48
15
 * You should have received a copy of the GNU General Public License along
49
16
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
50
17
 */
51
18
52
19
import QtQuick 2.4
53
20
import Ubuntu.Components 1.3
54
21
55
22
Standard {
56
23
    id: base
57
24
    property alias iconName: icon.name
58
25
    property alias iconSource: icon.source
59
26
60
27
    Icon {
61
28
        id: icon
62
29
        width: height
63
30
        height: units.gu(2.5)
64
31
        SlotsLayout.position: SlotsLayout.First
65
32
    }
66
33
}
67
0
34
68
=== added file 'src/SystemSettings/ListItems/IconProgression.qml'
69
--- src/SystemSettings/ListItems/IconProgression.qml	1970-01-01 00:00:00 +0000
70
+++ src/SystemSettings/ListItems/IconProgression.qml	2016-06-29 14:34:55 +0000
71
@@ -0,0 +1,30 @@
72
1
/*
73
2
 * This file is part of system-settings
74
3
 *
75
4
 * Copyright (C) 2015 Canonical Ltd.
76
5
 *
77
6
 * This program is free software: you can redistribute it and/or modify it
78
7
 * under the terms of the GNU General Public License version 3, as published
79
8
 * by the Free Software Foundation.
80
9
 *
81
10
 * This program is distributed in the hope that it will be useful, but
82
11
 * WITHOUT ANY WARRANTY; without even the implied warranties of
83
12
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
84
13
 * PURPOSE.  See the GNU General Public License for more details.
85
14
 *
86
15
 * You should have received a copy of the GNU General Public License along
87
16
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
88
17
 */
89
18
90
19
import QtQuick 2.4
91
20
import "." as SettingsListItems
92
21
import Ubuntu.Components 1.3
93
22
94
23
SettingsListItems.Icon {
95
24
    id: base
96
25
    property alias progressionVisible: progression.visible
97
26
98
27
    ProgressionSlot {
99
28
        id: progression
100
29
    }
101
30
}
102
0
31
103
=== added file 'src/SystemSettings/ListItems/SingleControl.qml'
104
--- src/SystemSettings/ListItems/SingleControl.qml	1970-01-01 00:00:00 +0000
105
+++ src/SystemSettings/ListItems/SingleControl.qml	2016-06-29 14:34:55 +0000
106
@@ -0,0 +1,34 @@
107
1
/*
108
2
 * This file is part of system-settings
109
3
 *
110
4
 * Copyright (C) 2015 Canonical Ltd.
111
5
 *
112
6
 * This program is free software: you can redistribute it and/or modify it
113
7
 * under the terms of the GNU General Public License version 3, as published
114
8
 * by the Free Software Foundation.
115
9
 *
116
10
 * This program is distributed in the hope that it will be useful, but
117
11
 * WITHOUT ANY WARRANTY; without even the implied warranties of
118
12
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
119
13
 * PURPOSE.  See the GNU General Public License for more details.
120
14
 *
121
15
 * You should have received a copy of the GNU General Public License along
122
16
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
123
17
 */
124
18
125
19
import QtQuick 2.4
126
20
import Ubuntu.Components 1.3
127
21
128
22
ListItem {
129
23
    id: root
130
24
    default property alias slots: layoutItem.children
131
25
    property alias         layout: layoutItem
132
26
    property bool          showDivider: true
133
27
134
28
    height: layoutItem.height + (divider.visible ? divider.height : 0)
135
29
    divider.visible: showDivider
136
30
137
31
    SlotsLayout {
138
32
        id: layoutItem
139
33
    }
140
34
}
141
0
35
142
=== added file 'src/SystemSettings/ListItems/SingleValue.qml'
143
--- src/SystemSettings/ListItems/SingleValue.qml	1970-01-01 00:00:00 +0000
144
+++ src/SystemSettings/ListItems/SingleValue.qml	2016-06-29 14:34:55 +0000
145
@@ -0,0 +1,30 @@
146
1
/*
147
2
 * This file is part of system-settings
148
3
 *
149
4
 * Copyright (C) 2015 Canonical Ltd.
150
5
 *
151
6
 * This program is free software: you can redistribute it and/or modify it
152
7
 * under the terms of the GNU General Public License version 3, as published
153
8
 * by the Free Software Foundation.
154
9
 *
155
10
 * This program is distributed in the hope that it will be useful, but
156
11
 * WITHOUT ANY WARRANTY; without even the implied warranties of
157
12
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
158
13
 * PURPOSE.  See the GNU General Public License for more details.
159
14
 *
160
15
 * You should have received a copy of the GNU General Public License along
161
16
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
162
17
 */
163
18
164
19
import QtQuick 2.4
165
20
import Ubuntu.Components 1.3
166
21
167
22
Standard {
168
23
    id: base
169
24
    property alias value: value.text
170
25
171
26
    Label {
172
27
        id: value
173
28
        horizontalAlignment: Text.AlignRight
174
29
    }
175
30
}
176
0
31
177
=== added file 'src/SystemSettings/ListItems/SingleValueProgression.qml'
178
--- src/SystemSettings/ListItems/SingleValueProgression.qml	1970-01-01 00:00:00 +0000
179
+++ src/SystemSettings/ListItems/SingleValueProgression.qml	2016-06-29 14:34:55 +0000
180
@@ -0,0 +1,35 @@
181
1
/*
182
2
 * This file is part of system-settings
183
3
 *
184
4
 * Copyright (C) 2015 Canonical Ltd.
185
5
 *
186
6
 * This program is free software: you can redistribute it and/or modify it
187
7
 * under the terms of the GNU General Public License version 3, as published
188
8
 * by the Free Software Foundation.
189
9
 *
190
10
 * This program is distributed in the hope that it will be useful, but
191
11
 * WITHOUT ANY WARRANTY; without even the implied warranties of
192
12
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
193
13
 * PURPOSE.  See the GNU General Public License for more details.
194
14
 *
195
15
 * You should have received a copy of the GNU General Public License along
196
16
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
197
17
 */
198
18
199
19
import QtQuick 2.4
200
20
import Ubuntu.Components 1.3
201
21
202
22
Standard {
203
23
    id: base
204
24
    property alias value: value.text
205
25
    property alias progressionVisible: progression.visible
206
26
207
27
    Label {
208
28
        id: value
209
29
        horizontalAlignment: Text.AlignRight
210
30
    }
211
31
212
32
    ProgressionSlot {
213
33
        id: progression
214
34
    }
215
35
}
216
0
36
217
=== added file 'src/SystemSettings/ListItems/Standard.qml'
218
--- src/SystemSettings/ListItems/Standard.qml	1970-01-01 00:00:00 +0000
219
+++ src/SystemSettings/ListItems/Standard.qml	2016-06-29 14:34:55 +0000
220
@@ -0,0 +1,41 @@
221
1
/*
222
2
 * This file is part of system-settings
223
3
 *
224
4
 * Copyright (C) 2015 Canonical Ltd.
225
5
 *
226
6
 * This program is free software: you can redistribute it and/or modify it
227
7
 * under the terms of the GNU General Public License version 3, as published
228
8
 * by the Free Software Foundation.
229
9
 *
230
10
 * This program is distributed in the hope that it will be useful, but
231
11
 * WITHOUT ANY WARRANTY; without even the implied warranties of
232
12
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
233
13
 * PURPOSE.  See the GNU General Public License for more details.
234
14
 *
235
15
 * You should have received a copy of the GNU General Public License along
236
16
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
237
17
 */
238
18
239
19
import Ubuntu.Components 1.3
240
20
241
21
ListItem {
242
22
    id: root
243
23
    default property alias slots: layoutItem.children
244
24
    property alias         layout: layoutItem
245
25
    property string        text
246
26
    property bool          showDivider: true
247
27
    property bool          highlightWhenPressed: true
248
28
249
29
    height: layoutItem.height + (divider.visible ? divider.height : 0)
250
30
    divider.visible: showDivider
251
31
    divider.colorFrom: "#EEEEEE"
252
32
    divider.colorTo: "#EEEEEE"
253
33
    divider.height: units.dp(1)
254
34
    highlightColor: highlightWhenPressed ? undefined : "transparent"
255
35
256
36
    ListItemLayout {
257
37
        id: layoutItem
258
38
        title.text: root.text
259
39
        title.opacity: enabled ? 1 : 0.5
260
40
    }
261
41
}
262
0
42
263
=== added file 'src/SystemSettings/ListItems/StandardProgression.qml'
264
--- src/SystemSettings/ListItems/StandardProgression.qml	1970-01-01 00:00:00 +0000
265
+++ src/SystemSettings/ListItems/StandardProgression.qml	2016-06-29 14:34:55 +0000
266
@@ -0,0 +1,29 @@
267
1
/*
268
2
 * This file is part of system-settings
269
3
 *
270
4
 * Copyright (C) 2015 Canonical Ltd.
271
5
 *
272
6
 * This program is free software: you can redistribute it and/or modify it
273
7
 * under the terms of the GNU General Public License version 3, as published
274
8
 * by the Free Software Foundation.
275
9
 *
276
10
 * This program is distributed in the hope that it will be useful, but
277
11
 * WITHOUT ANY WARRANTY; without even the implied warranties of
278
12
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
279
13
 * PURPOSE.  See the GNU General Public License for more details.
280
14
 *
281
15
 * You should have received a copy of the GNU General Public License along
282
16
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
283
17
 */
284
18
285
19
import QtQuick 2.4
286
20
import Ubuntu.Components 1.3
287
21
288
22
Standard {
289
23
    id: base
290
24
    property alias progressionVisible: progression.visible
291
25
292
26
    ProgressionSlot {
293
27
        id: progression
294
28
    }
295
29
}
296
0
30
297
=== added file 'src/SystemSettings/ListItems/qmldir'
298
--- src/SystemSettings/ListItems/qmldir	1970-01-01 00:00:00 +0000
299
+++ src/SystemSettings/ListItems/qmldir	2016-06-29 14:34:55 +0000
300
@@ -0,0 +1,9 @@
301
1
module SystemSettings.ListItems
302
2
303
3
Icon 1.0 Icon.qml
304
4
IconProgression 1.0 IconProgression.qml
305
5
SingleControl 1.0 SingleControl.qml
306
6
SingleValue 1.0 SingleValue.qml
307
7
SingleValueProgression 1.0 SingleValueProgression.qml
308
8
Standard 1.0 Standard.qml
309
9
StandardProgression 1.0 StandardProgression.qml
310
0
10
311
=== modified file 'src/SystemSettings/SettingsItemTitle.qml'
312
--- src/SystemSettings/SettingsItemTitle.qml	2015-08-10 13:31:45 +0000
313
+++ src/SystemSettings/SettingsItemTitle.qml	2016-06-29 14:34:55 +0000
314
@@ -18,21 +18,27 @@
315
18
18
316
19
import QtQuick 2.4
19
import QtQuick 2.4
317
20
import Ubuntu.Components 1.3
20
import Ubuntu.Components 1.3
323
21
import Ubuntu.Components.ListItems 1.3 as ListItem
21
324
22
22
Item {
325
23
ListItem.Standard {
23
    property alias text: label.text
326
24
    id: itemEmpty
24
    anchors {
327
25
    property string text
25
        left: parent.left
328
26
        right: parent.right
329
27
    }
330
28
    height: units.gu(6)
331
29
332
26
    Label {
30
    Label {
333
31
        id: label
334
27
        anchors {
32
        anchors {
335
33
            top: parent.top
336
34
            topMargin: units.gu(3)
337
35
            right: parent.right
338
36
            rightMargin: units.gu(2)
339
37
            bottom: parent.bottom
340
28
            left: parent.left
38
            left: parent.left
341
29
            leftMargin: units.gu(2)
39
            leftMargin: units.gu(2)
342
30
            right: parent.right
343
31
            rightMargin: units.gu(2)
344
32
            top: parent.top
345
33
            topMargin: units.gu(3)
346
34
        }
40
        }
348
35
        text: itemEmpty.text
41
        fontSize: "small"
349
42
        opacity: 0.75
350
36
    }
43
    }
351
37
    highlightWhenPressed: false
352
38
}
44
}
Status:	Merged
Approved by:	Ken VanDine on 2016-07-13
Approved revision:	1561
Merged at revision:	1676
Proposed branch:	lp:~phablet-team/ubuntu-system-settings/settings-listitems
Merge into:	lp:ubuntu-system-settings
Diff against target:	352 lines (+273/-11) 11 files modified src/SystemSettings/CMakeLists.txt (+2/-0) src/SystemSettings/ListItems/CMakeLists.txt (+13/-0) src/SystemSettings/ListItems/Icon.qml (+33/-0) src/SystemSettings/ListItems/IconProgression.qml (+30/-0) src/SystemSettings/ListItems/SingleControl.qml (+34/-0) src/SystemSettings/ListItems/SingleValue.qml (+30/-0) src/SystemSettings/ListItems/SingleValueProgression.qml (+35/-0) src/SystemSettings/ListItems/Standard.qml (+41/-0) src/SystemSettings/ListItems/StandardProgression.qml (+29/-0) src/SystemSettings/ListItems/qmldir (+9/-0) src/SystemSettings/SettingsItemTitle.qml (+17/-11)
To merge this branch:	bzr merge lp:~phablet-team/ubuntu-system-settings/settings-listitems
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Ken VanDine		2015-11-23	Approve on 2016-07-13
system-apps-ci-bot	continuous-integration		Needs Fixing on 2016-06-29
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-12-08
Review via email: mp+278322@code.launchpad.net