ubuntu-system-settings

Merge lp:~seb128/ubuntu-system-settings/titles-uis-tweaks-rtm into lp:ubuntu-system-settings/rtm-14.09

  1. titles-uis-tweaks-rtm
  2. Merge into rtm-14.09
Proposed by Sebastien Bacher
Status: Merged
Approved by: Ken VanDine
Approved revision: 936
Merged at revision: 937
Proposed branch: lp:~seb128/ubuntu-system-settings/titles-uis-tweaks-rtm
Merge into: lp:ubuntu-system-settings/rtm-14.09
Diff against target: 340 lines (+74/-21)
15 files modified
plugins/about/PageComponent.qml (+5/-3)
plugins/battery/PageComponent.qml (+1/-1)
plugins/battery/SleepValues.qml (+6/-1)
plugins/bluetooth/PageComponent.qml (+2/-2)
plugins/notifications/PageComponent.qml (+1/-0)
plugins/security-privacy/Location.qml (+5/-4)
plugins/security-privacy/LockSecurity.qml (+1/-1)
plugins/security-privacy/PageComponent.qml (+2/-2)
plugins/security-privacy/PhoneLocking.qml (+1/-1)
plugins/sound/PageComponent.qml (+4/-4)
plugins/time-date/PageComponent.qml (+5/-2)
src/CMakeLists.txt (+1/-0)
src/SystemSettings/CMakeLists.txt (+1/-0)
src/SystemSettings/SettingsItemTitle.qml (+38/-0)
src/SystemSettings/qmldir (+1/-0)
To merge this branch: bzr merge lp:~seb128/ubuntu-system-settings/titles-uis-tweaks-rtm
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+241578@code.launchpad.net

Commit message

Tweaks to try to make the section headers and titles closer to the
design. Use a custom component, with tweaked margins and disabled
tap effects, for that.

Description of the change

Tweaks to try to make the section headers and titles closer to the
design. Use a custom component, with tweaked margins and disabled
tap effects, for that.

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks great!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/about/PageComponent.qml'
2--- plugins/about/PageComponent.qml 2014-10-07 14:07:02 +0000
3+++ plugins/about/PageComponent.qml 2014-11-12 16:08:16 +0000
4@@ -74,7 +74,7 @@
5 anchors.left: parent.left
6 anchors.right: parent.right
7
8- ListItem.Base {
9+ ListItem.Empty {
10 height: ubuntuLabel.height + deviceLabel.height + units.gu(6)
11
12 Column {
13@@ -95,6 +95,7 @@
14 text: deviceInfos.manufacturer() ? deviceInfos.manufacturer() + " " + deviceInfos.model() : backendInfos.vendorString
15 }
16 }
17+ highlightWhenPressed: false
18 }
19
20 Loader {
21@@ -147,7 +148,7 @@
22 onClicked: pageStack.push(Qt.resolvedUrl("Storage.qml"))
23 }
24
25- ListItem.Standard {
26+ SettingsItemTitle {
27 objectName: "softwareItem"
28 text: i18n.tr("Software:")
29 }
30@@ -176,9 +177,10 @@
31 onClicked:
32 pageStack.push(pluginManager.getByName("system-update").pageComponent)
33 }
34+ showDivider: false
35 }
36
37- ListItem.Standard {
38+ SettingsItemTitle {
39 objectName: "legalItem"
40 text: i18n.tr("Legal:")
41 }
42
43=== modified file 'plugins/battery/PageComponent.qml'
44--- plugins/battery/PageComponent.qml 2014-08-29 09:11:11 +0000
45+++ plugins/battery/PageComponent.qml 2014-11-12 16:08:16 +0000
46@@ -288,7 +288,7 @@
47 showDivider: false
48 }
49
50- ListItem.Standard {
51+ SettingsItemTitle {
52 text: i18n.tr("Ways to reduce battery use:")
53 }
54
55
56=== modified file 'plugins/battery/SleepValues.qml'
57--- plugins/battery/SleepValues.qml 2014-08-26 01:54:11 +0000
58+++ plugins/battery/SleepValues.qml 2014-11-12 16:08:16 +0000
59@@ -71,10 +71,14 @@
60 anchors.left: parent.left
61 anchors.right: parent.right
62
63+ SettingsItemTitle {
64+ text: lockOnSuspend ? i18n.tr("Lock the phone when it's not in use:") :
65+ i18n.tr("Put the phone to sleep when it is not in use:")
66+ }
67+
68 ListItem.ItemSelector {
69 id: sleepSelector
70 objectName: "sleepSelector"
71- text: lockOnSuspend ? i18n.tr("Lock the phone when it's not in use:") : i18n.tr("Put the phone to sleep when it is not in use:")
72 delegate: OptionSelectorDelegate {
73 text: modelData
74 }
75@@ -111,6 +115,7 @@
76 else
77 powerSettings.idleDelay = (index == 6) ? 0 : idleValues[index]
78 }
79+ highlightWhenPressed: false
80 }
81
82 ListItem.Caption {
83
84=== modified file 'plugins/bluetooth/PageComponent.qml'
85--- plugins/bluetooth/PageComponent.qml 2014-09-23 19:32:29 +0000
86+++ plugins/bluetooth/PageComponent.qml 2014-11-12 16:08:16 +0000
87@@ -246,7 +246,7 @@
88
89 // Disconnnected Headset(s)
90
91- ListItem.Standard {
92+ SettingsItemTitle {
93 id: disconnectedHeader
94 text: connectedList.visible ? i18n.tr("Connect another device:") : i18n.tr("Connect a device:")
95 enabled: bluetoothActionGroup.enabled
96@@ -288,7 +288,7 @@
97 }
98
99 // Devices that connect automatically
100- ListItem.Standard {
101+ SettingsItemTitle {
102 id: autoconnectHeader
103 text: i18n.tr("Connect automatically when detected:")
104 visible: autoconnectList.visible
105
106=== modified file 'plugins/notifications/PageComponent.qml'
107--- plugins/notifications/PageComponent.qml 2014-08-29 09:17:39 +0000
108+++ plugins/notifications/PageComponent.qml 2014-11-12 16:08:16 +0000
109@@ -46,6 +46,7 @@
110 margins: units.gu(1)
111 }
112 }
113+ highlightWhenPressed: false
114 }
115
116 ListView {
117
118=== modified file 'plugins/security-privacy/Location.qml'
119--- plugins/security-privacy/Location.qml 2014-10-21 13:17:01 +0000
120+++ plugins/security-privacy/Location.qml 2014-11-12 16:08:16 +0000
121@@ -90,6 +90,10 @@
122 anchors.left: parent.left
123 anchors.right: parent.right
124
125+ SettingsItemTitle {
126+ text: i18n.tr("Let the phone detect your location:")
127+ }
128+
129 ListItem.ItemSelector {
130 id: detection
131
132@@ -112,7 +116,6 @@
133 }
134 property bool allow: selectedIndex !== (model.count - 1)
135
136- text: i18n.tr("Let the phone detect your location:")
137 expanded: true
138 model: optionsModel
139 delegate: optionsDelegate
140@@ -220,9 +223,7 @@
141 visible: showAllUI /* hide until the information is real */
142 }
143
144- ListItem.Divider {}
145-
146- ListItem.Standard {
147+ SettingsItemTitle {
148 text: i18n.tr("Allow access to location:")
149 enabled: detection.allow
150 }
151
152=== modified file 'plugins/security-privacy/LockSecurity.qml'
153--- plugins/security-privacy/LockSecurity.qml 2014-09-22 15:21:10 +0000
154+++ plugins/security-privacy/LockSecurity.qml 2014-11-12 16:08:16 +0000
155@@ -340,7 +340,7 @@
156 anchors.left: parent.left
157 anchors.right: parent.right
158
159- ListItem.Standard {
160+ SettingsItemTitle {
161 text: i18n.tr("Unlock the phone using:")
162 }
163
164
165=== modified file 'plugins/security-privacy/PageComponent.qml'
166--- plugins/security-privacy/PageComponent.qml 2014-10-16 13:43:16 +0000
167+++ plugins/security-privacy/PageComponent.qml 2014-11-12 16:08:16 +0000
168@@ -121,7 +121,7 @@
169 anchors.left: parent.left
170 anchors.right: parent.right
171
172- ListItem.Standard {
173+ ListItem.Header {
174 id: securityTitle
175 text: i18n.tr("Security")
176 }
177@@ -181,7 +181,7 @@
178 "Encryption protects against access to phone data when the phone is connected to a PC or other device.")
179 visible: showAllUI
180 }
181- ListItem.Standard {
182+ ListItem.Header {
183 text: i18n.tr("Privacy")
184 }
185 ListItem.Standard {
186
187=== modified file 'plugins/security-privacy/PhoneLocking.qml'
188--- plugins/security-privacy/PhoneLocking.qml 2014-09-22 15:21:10 +0000
189+++ plugins/security-privacy/PhoneLocking.qml 2014-11-12 16:08:16 +0000
190@@ -102,7 +102,7 @@
191 visible: showAllUI
192 }
193
194- ListItem.Standard {
195+ SettingsItemTitle {
196 text: i18n.tr("When locked, allow:")
197 }
198
199
200=== modified file 'plugins/sound/PageComponent.qml'
201--- plugins/sound/PageComponent.qml 2014-10-17 15:02:18 +0000
202+++ plugins/sound/PageComponent.qml 2014-11-12 16:08:16 +0000
203@@ -76,7 +76,7 @@
204 text: i18n.tr("Silent Mode")
205 }
206
207- ListItem.Standard {
208+ SettingsItemTitle {
209 text: i18n.tr("Ringer:")
210 }
211
212@@ -108,7 +108,7 @@
213 onUpdated: soundActionGroup.volume.updateState(value);
214 }
215
216- ListItem.Standard {
217+ SettingsItemTitle {
218 text: i18n.tr("Phone calls:")
219 }
220
221@@ -153,7 +153,7 @@
222 text: i18n.tr("Dialpad sounds")
223 }
224
225- ListItem.Standard {
226+ SettingsItemTitle {
227 text: i18n.tr("Messages:")
228 }
229
230@@ -188,7 +188,7 @@
231 text: i18n.tr("Vibrate in Silent Mode")
232 }
233
234- ListItem.Standard {
235+ SettingsItemTitle {
236 text: i18n.tr("Other sounds:")
237 }
238
239
240=== modified file 'plugins/time-date/PageComponent.qml'
241--- plugins/time-date/PageComponent.qml 2014-01-29 13:34:37 +0000
242+++ plugins/time-date/PageComponent.qml 2014-11-12 16:08:16 +0000
243@@ -50,7 +50,7 @@
244 Column {
245 anchors.fill: parent
246
247- ListItem.Standard { text: i18n.tr ("Time zone:") }
248+ SettingsItemTitle { text: i18n.tr ("Time zone:") }
249
250 ListItem.SingleValue {
251 objectName: "timeZone"
252@@ -62,10 +62,13 @@
253 onClicked: pageStack.push(Qt.resolvedUrl("ChooseTimeZone.qml"))
254 }
255
256+ SettingsItemTitle {
257+ text: i18n.tr ("Set the time and date:")
258+ }
259+
260 ListItem.ItemSelector {
261 id: setTimeAutomatically
262 objectName: "timeItemSelector"
263- text: i18n.tr ("Set the time and date:")
264 model: [ i18n.tr("Automatically") , i18n.tr("Manually")]
265 expanded: true
266 onSelectedIndexChanged: {
267
268=== modified file 'src/CMakeLists.txt'
269--- src/CMakeLists.txt 2014-09-02 15:44:19 +0000
270+++ src/CMakeLists.txt 2014-11-12 16:08:16 +0000
271@@ -23,6 +23,7 @@
272 qml/MainWindow.qml
273 qml/UncategorizedItemsView.qml
274 SystemSettings/ItemPage.qml
275+ SystemSettings/SettingsItemTitle.qml
276 )
277
278 QT5_ADD_RESOURCES(system-settings-resources ui.qrc)
279
280=== modified file 'src/SystemSettings/CMakeLists.txt'
281--- src/SystemSettings/CMakeLists.txt 2014-08-11 16:13:17 +0000
282+++ src/SystemSettings/CMakeLists.txt 2014-11-12 16:08:16 +0000
283@@ -1,5 +1,6 @@
284 set(QML_SOURCES
285 ItemPage.qml
286+ SettingsItemTitle.qml
287 )
288
289 set(PLUG_DIR ${PLUGIN_QML_DIR}/SystemSettings)
290
291=== added file 'src/SystemSettings/SettingsItemTitle.qml'
292--- src/SystemSettings/SettingsItemTitle.qml 1970-01-01 00:00:00 +0000
293+++ src/SystemSettings/SettingsItemTitle.qml 2014-11-12 16:08:16 +0000
294@@ -0,0 +1,38 @@
295+/*
296+ * This file is part of system-settings
297+ *
298+ * Copyright (C) 2013 Canonical Ltd.
299+ *
300+ * This program is free software: you can redistribute it and/or modify it
301+ * under the terms of the GNU General Public License version 3, as published
302+ * by the Free Software Foundation.
303+ *
304+ * This program is distributed in the hope that it will be useful, but
305+ * WITHOUT ANY WARRANTY; without even the implied warranties of
306+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
307+ * PURPOSE. See the GNU General Public License for more details.
308+ *
309+ * You should have received a copy of the GNU General Public License along
310+ * with this program. If not, see <http://www.gnu.org/licenses/>.
311+ */
312+
313+import QtQuick 2.0
314+import Ubuntu.Components 0.1
315+import Ubuntu.Components.ListItems 0.1 as ListItem
316+
317+ListItem.Standard {
318+ id: itemEmpty
319+ property string text
320+ Label {
321+ anchors {
322+ left: parent.left
323+ leftMargin: units.gu(2)
324+ right: parent.right
325+ rightMargin: units.gu(2)
326+ top: parent.top
327+ topMargin: units.gu(3)
328+ }
329+ text: itemEmpty.text
330+ }
331+ highlightWhenPressed: false
332+}
333
334=== modified file 'src/SystemSettings/qmldir'
335--- src/SystemSettings/qmldir 2014-08-11 16:13:17 +0000
336+++ src/SystemSettings/qmldir 2014-11-12 16:08:16 +0000
337@@ -1,2 +1,3 @@
338 module SystemSettings
339 ItemPage 1.0 ItemPage.qml
340+SettingsItemTitle 1.0 SettingsItemTitle.qml

Subscribers

People subscribed via source and target branches