1
=== modified file 'plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml'
2
--- plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml	2013-07-26 11:12:18 +0000
3
+++ plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml	2014-06-25 11:08:21 +0000
4
@@ -23,9 +23,10 @@
5
23
import Ubuntu.Components.ListItems 0.1 as ListItem
23
import Ubuntu.Components.ListItems 0.1 as ListItem
6
24
24
7
25
ListItem.Base {
25
ListItem.Base {
8
26
    id: listItem
9
27
10
26
    property string textEntry: "";
28
    property string textEntry: "";
13
27
    property alias checked: checkBox.checked;
29
    property bool checked: false
12
28
    onClicked: checked = !checked;
14
29
30
15
30
    Row {
31
    Row {
16
31
        anchors.top: parent.top
32
        anchors.top: parent.top
17
@@ -34,7 +35,49 @@
18
34
35
19
35
        CheckBox {
36
        CheckBox {
20
36
            id: checkBox
37
            id: checkBox
21
38
22
39
            property bool enableCheckConnection: true
23
40
24
37
            anchors.verticalCenter: parent.verticalCenter
41
            anchors.verticalCenter: parent.verticalCenter
25
42
26
43
            Component.onCompleted: {
27
44
                enableCheckConnection = false;
28
45
                checked = listItem.checked;
29
46
                enableCheckConnection = true;
30
47
            }
31
48
32
49
            // FIXME : should use Checkbox.toggled signal
33
50
            // lp:~nick-dedekind/ubuntu-ui-toolkit/checkbox.toggled
34
51
            onCheckedChanged: {
35
52
                if (!enableCheckConnection) return;
36
53
37
54
                var oldEnable = enableCheckConnection;
38
55
                enableCheckConnection = false;
39
56
40
57
                listItem.checked = checked;
41
58
                listItem.triggered(listItem.checked);
42
59
43
60
                enableCheckConnection = oldEnable;
44
61
            }
45
62
46
63
            Connections {
47
64
                target: listItem
48
65
                onCheckedChanged: {
49
66
                    if (!checkBox.enableCheckConnection) return;
50
67
51
68
                    var oldEnable = checkBox.enableCheckConnection;
52
69
                    checkBox.enableCheckConnection = false;
53
70
54
71
                    checkBox.checked = listItem.checked;
55
72
56
73
                    checkBox.enableCheckConnection = oldEnable;
57
74
                }
58
75
            }
59
76
60
77
            Connections {
61
78
                target: listItem.__mouseArea
62
79
                onClicked: checkBox.clicked();
63
80
            }
64
38
        }
81
        }
65
39
        Label {
82
        Label {
66
40
            anchors.verticalCenter: parent.verticalCenter
83
            anchors.verticalCenter: parent.verticalCenter
67
41
84
68
=== modified file 'plugins/security-privacy/diagnostics/PageComponent.qml'
69
--- plugins/security-privacy/diagnostics/PageComponent.qml	2013-07-29 15:04:03 +0000
70
+++ plugins/security-privacy/diagnostics/PageComponent.qml	2014-06-25 11:08:21 +0000
71
@@ -32,10 +32,6 @@
72
32
32
73
33
    UbuntuDiagnostics {
33
    UbuntuDiagnostics {
74
34
        id: diagnosticsWidget
34
        id: diagnosticsWidget
75
35
        function maybeUpdate() {
76
36
            reportCrashesCheck.checked = diagnosticsWidget.canReportCrashes
77
37
        }
78
38
        onReportCrashesChanged: maybeUpdate()
79
39
    }
35
    }
80
40
    Flickable {
36
    Flickable {
81
41
        id: scrollWidget
37
        id: scrollWidget
82
@@ -61,16 +57,14 @@
83
61
57
84
62
            DiagnosticsCheckEntry {
58
            DiagnosticsCheckEntry {
85
63
                id: reportCrashesCheck
59
                id: reportCrashesCheck
86
60
87
61
                property bool serverValue: diagnosticsWidget.canReportCrashes
88
62
89
64
                checked: diagnosticsWidget.canReportCrashes
63
                checked: diagnosticsWidget.canReportCrashes
90
65
                onCheckedChanged: {
91
66
                    diagnosticsWidget.canReportCrashes = checked;
92
67
                    /* Confirm the setting stuck and reflect it in the UI. */
93
68
                    if (checked != diagnosticsWidget.canReportCrashes) {
94
69
                        checked = !checked;
95
70
                    }
96
71
97
72
                }
98
73
                textEntry: i18n.tr("App crashes and errors")
64
                textEntry: i18n.tr("App crashes and errors")
99
65
100
66
                onServerValueChanged: checked = serverValue
101
67
                onTriggered: diagnosticsWidget.canReportCrashes = checked
102
74
            }
68
            }
103
75
69
104
76
            ListItem.SingleValue {
70
            ListItem.SingleValue {
105
77
71
106
=== added file 'wizard/qml/Components/CheckableSetting.qml'
107
--- wizard/qml/Components/CheckableSetting.qml	1970-01-01 00:00:00 +0000
108
+++ wizard/qml/Components/CheckableSetting.qml	2014-06-25 11:08:21 +0000
109
@@ -0,0 +1,98 @@
110
1
/*
111
2
 * Copyright (C) 2014 Canonical, Ltd.
112
3
 *
113
4
 * This program is free software; you can redistribute it and/or modify
114
5
 * it under the terms of the GNU General Public License as published by
115
6
 * the Free Software Foundation; version 3.
116
7
 *
117
8
 * This program is distributed in the hope that it will be useful,
118
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
119
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
120
11
 * GNU General Public License for more details.
121
12
 *
122
13
 * You should have received a copy of the GNU General Public License
123
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
124
15
 */
125
16
126
17
import QtQuick 2.0
127
18
import QMenuModel 0.1
128
19
import Ubuntu.Components 0.1
129
20
import Ubuntu.Components.ListItems 0.1 as ListItem
130
21
131
22
ListItem.Empty {
132
23
    id: listItem
133
24
134
25
    property alias text: label.text
135
26
    property bool checked: false
136
27
    property real leftMargin
137
28
    property real rightMargin
138
29
139
30
    implicitHeight: label.height + units.gu(2)
140
31
141
32
    Item {
142
33
        anchors.fill: parent
143
34
144
35
        CheckBox {
145
36
            id: checkBox
146
37
147
38
            property bool enableCheckConnection: true
148
39
149
40
            anchors {
150
41
                left: parent.left
151
42
                verticalCenter: parent.verticalCenter
152
43
                leftMargin: listItem.leftMargin
153
44
            }
154
45
155
46
            Component.onCompleted: {
156
47
                enableCheckConnection = false;
157
48
                checked = listItem.checked;
158
49
                enableCheckConnection = true;
159
50
            }
160
51
161
52
            // FIXME : should use Checkbox.toggled signal
162
53
            // lp:~nick-dedekind/ubuntu-ui-toolkit/checkbox.toggled
163
54
            onCheckedChanged: {
164
55
                if (!enableCheckConnection) return;
165
56
166
57
                var oldEnable = enableCheckConnection;
167
58
                enableCheckConnection = false;
168
59
169
60
                listItem.checked = checked;
170
61
                listItem.triggered(listItem.checked);
171
62
172
63
                enableCheckConnection = oldEnable;
173
64
            }
174
65
175
66
            Connections {
176
67
                target: listItem
177
68
                onCheckedChanged: {
178
69
                    if (!checkBox.enableCheckConnection) return;
179
70
180
71
                    var oldEnable = checkBox.enableCheckConnection;
181
72
                    checkBox.enableCheckConnection = false;
182
73
183
74
                    checkBox.checked = listItem.checked;
184
75
185
76
                    checkBox.enableCheckConnection = oldEnable;
186
77
                }
187
78
            }
188
79
189
80
            Connections {
190
81
                target: listItem.__mouseArea
191
82
                onClicked: checkBox.clicked();
192
83
            }
193
84
        }
194
85
195
86
        Label {
196
87
            id: label
197
88
            anchors {
198
89
                left: checkBox.right
199
90
                right: parent.right
200
91
                verticalCenter: parent.verticalCenter
201
92
                leftMargin: units.gu(2)
202
93
                rightMargin: listItem.rightMargin
203
94
            }
204
95
            wrapMode: Text.WordWrap
205
96
        }
206
97
    }
207
98
}
208
0
99
209
=== renamed file 'wizard/qml/Pages/30-location.qml' => 'wizard/qml/Pages/30-phone-settings.qml'
210
--- wizard/qml/Pages/30-location.qml	2014-03-19 17:48:48 +0000
211
+++ wizard/qml/Pages/30-phone-settings.qml	2014-06-25 11:08:21 +0000
212
@@ -15,30 +15,104 @@
213
15
 */
15
 */
214
16
16
215
17
import QtQuick 2.0
17
import QtQuick 2.0
216
18
import QMenuModel 0.1
217
18
import Ubuntu.Components 0.1
19
import Ubuntu.Components 0.1
218
20
import Ubuntu.Components.ListItems 0.1 as ListItem
219
21
import Ubuntu.SystemSettings.Diagnostics 1.0
220
19
import "../Components" as LocalComponents
22
import "../Components" as LocalComponents
221
20
23
222
21
LocalComponents.Page {
24
LocalComponents.Page {
223
25
    id: userSettingsPage
224
22
    title: i18n.tr("Phone settings")
26
    title: i18n.tr("Phone settings")
225
23
    forwardButtonSourceComponent: forwardButton
27
    forwardButtonSourceComponent: forwardButton
226
24
28
227
29
    UbuntuDiagnostics {
228
30
        id: diagnosticsWidget
229
31
    }
230
32
231
25
    Item {
33
    Item {
232
26
        id: content
34
        id: content
233
27
        anchors {
35
        anchors {
234
28
            fill: parent
36
            fill: parent
248
29
            topMargin: topMargin
37
            bottomMargin: userSettingsPage.bottomMargin
249
30
            leftMargin: leftMargin
38
        }
250
31
            rightMargin: rightMargin
39
251
32
            bottomMargin: bottomMargin
40
        QDBusActionGroup {
252
33
        }
41
            id: locationActionGroup
253
34
42
            busType: DBus.SessionBus
254
35
        Label {
43
            busName: "com.canonical.indicator.location"
255
36
            width: parent.width
44
            objectPath: "/com/canonical/indicator/location"
256
37
            wrapMode: Text.WordWrap
45
257
38
            fontSize: "large"
46
            property variant enabled: action("location-detection-enabled")
258
39
            text: i18n.tr("Your phone is setup to automatically report errors to Canonical. This can be disabled in system settings.") +
47
259
40
                  "\n\n" +
48
            Component.onCompleted: start()
260
41
                  i18n.tr("Your phone is setup to detect your location. This can be disabled in system settings.")
49
        }
261
50
262
51
        Binding {
263
52
            target: locationOn
264
53
            property: "checked"
265
54
            value: locationActionGroup.enabled.state
266
55
        }
267
56
268
57
        Column {
269
58
            anchors.fill: parent
270
59
271
60
            LocalComponents.SectionHeader {
272
61
                id: userExperienceSectionHeader
273
62
                width: parent.width
274
63
                leftMargin: userSettingsPage.leftMargin
275
64
                rightMargin: userSettingsPage.rightMargin
276
65
                text: i18n.tr("User experience")
277
66
            }
278
67
279
68
            LocalComponents.CheckableSetting {
280
69
                id: reportCrashesCheck
281
70
282
71
                property bool serverValue: diagnosticsWidget.canReportCrashes
283
72
284
73
                leftMargin: userSettingsPage.leftMargin
285
74
                rightMargin: userSettingsPage.rightMargin
286
75
                checked: diagnosticsWidget.canReportCrashes
287
76
                text: i18n.tr("Your phone is set up to automatically report errors to Canonical. This can be disabled in system settings.")
288
77
289
78
                onServerValueChanged: checked = serverValue
290
79
                onTriggered: diagnosticsWidget.canReportCrashes = checked
291
80
            }
292
81
293
82
            LocalComponents.SectionHeader {
294
83
                id: locationServicesSectionHeader
295
84
                width: parent.width
296
85
                leftMargin: userSettingsPage.leftMargin
297
86
                rightMargin: userSettingsPage.rightMargin
298
87
                text: i18n.tr("Location services")
299
88
            }
300
89
301
90
            ListItem.Empty {
302
91
                width: parent.width
303
92
304
93
                Label {
305
94
                    id: label
306
95
                    anchors {
307
96
                        verticalCenter: parent.verticalCenter
308
97
                        left: parent.left
309
98
                        right: parent.right
310
99
                        leftMargin: userSettingsPage.leftMargin
311
100
                        rightMargin: userSettingsPage.rightMargin
312
101
                    }
313
102
                    wrapMode: Text.WordWrap
314
103
                    text: i18n.tr("Your phone is set up to detect your location. This can be disabled in system settings.")
315
104
                }
316
105
            }
317
106
318
107
            /* When location services will actually work.
319
108
            LocalComponents.CheckableSetting {
320
109
                id: locationOn
321
110
                leftMargin: userSettingsPage.leftMargin
322
111
                rightMargin: userSettingsPage.rightMargin
323
112
                text: i18n.tr("Your phone is setup to detect your location. This can be disabled in system settings.")
324
113
                checked: locationActionGroup.enabled.state
325
114
                onClicked: locationActionGroup.enabled.activate()
326
115
            } */
327
42
        }
116
        }
328
43
    }
117
    }
329
44
118
Status:	Work in progress
Proposed branch:	lp:~cimi/ubuntu-system-settings/wizard.privacy
Merge into:	lp:ubuntu-system-settings
Prerequisite:	lp:~unity-team/ubuntu-system-settings/wizard.wifi
Diff against target:	328 lines (+236/-27) 4 files modified plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml (+45/-2) plugins/security-privacy/diagnostics/PageComponent.qml (+6/-12) wizard/qml/Components/CheckableSetting.qml (+98/-0) wizard/qml/Pages/30-phone-settings.qml (+87/-13)
To merge this branch:	bzr merge lp:~cimi/ubuntu-system-settings/wizard.privacy
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Sebastien Bacher (community)		2014-03-27	Needs Fixing on 2014-08-26
PS Jenkins bot	continuous-integration		Approve on 2014-06-25
Review via email: mp+213124@code.launchpad.net