1
=== modified file 'plugins/security-privacy/AppAccess.qml'
2
--- plugins/security-privacy/AppAccess.qml	2015-07-13 12:09:52 +0000
3
+++ plugins/security-privacy/AppAccess.qml	2015-08-24 15:29:59 +0000
4
@@ -25,7 +25,7 @@
5
25
25
6
26
ItemPage {
26
ItemPage {
7
27
    id: root
27
    id: root
9
28
    title: i18n.tr("Other app access")
28
    title: i18n.tr("App permissions")
10
29
29
11
30
    Flickable {
30
    Flickable {
12
31
        anchors.fill: parent
31
        anchors.fill: parent
13
@@ -43,7 +43,7 @@
14
43
            anchors.right: parent.right
43
            anchors.right: parent.right
15
44
44
16
45
            ListItem.Caption {
45
            ListItem.Caption {
18
46
                text: i18n.tr("Apps that you have granted and have requested access to:")
46
                text: i18n.tr("Apps that you have granted access to:")
19
47
            }
47
            }
20
48
48
21
49
            ListModel {
49
            ListModel {
22
@@ -54,8 +54,13 @@
23
54
                    trustStoreService: "CameraService"
54
                    trustStoreService: "CameraService"
24
55
                }
55
                }
25
56
                ListElement {
56
                ListElement {
28
57
                    name: QT_TR_NOOP("Mic")
57
                    name: QT_TR_NOOP("Location")
29
58
                    caption: QT_TR_NOOP("Apps that have requested access to your mic")
58
                    caption: QT_TR_NOOP("Apps that have requested access to your location")
30
59
                    trustStoreService: "UbuntuLocationService"
31
60
                }
32
61
                ListElement {
33
62
                    name: QT_TR_NOOP("Microphone")
34
63
                    caption: QT_TR_NOOP("Apps that have requested access to your microphone")
35
59
                    trustStoreService: "PulseAudio"
64
                    trustStoreService: "PulseAudio"
36
60
                }
65
                }
37
61
            }
66
            }
38
@@ -64,8 +69,9 @@
39
64
                model: appsModel
69
                model: appsModel
40
65
70
41
66
                ListItem.SingleValue {
71
                ListItem.SingleValue {
43
67
                    text: model.name
72
                    text: i18n.tr(model.name)
44
68
                    enabled: trustStoreModel.count > 0
73
                    enabled: trustStoreModel.count > 0
45
74
                    progression: enabled ? true : false
46
69
                    value: trustStoreModel.count > 0 ?
75
                    value: trustStoreModel.count > 0 ?
47
70
                        i18n.tr("%1/%2").arg(trustStoreModel.grantedCount).arg(trustStoreModel.count) :
76
                        i18n.tr("%1/%2").arg(trustStoreModel.grantedCount).arg(trustStoreModel.count) :
48
71
                        i18n.tr("0")
77
                        i18n.tr("0")
49
@@ -81,6 +87,30 @@
50
81
                    }
87
                    }
51
82
                }
88
                }
52
83
            }
89
            }
53
90
54
91
            ListItem.Caption {
55
92
                    text: i18n.tr("Apps may also request access to online accounts.")
56
93
            }
57
94
58
95
            ListItem.SingleControl {
59
96
                control: Button {
60
97
                    text: i18n.tr("Online Accounts…")
61
98
                    width: parent.width - units.gu(4)
62
99
                    onClicked: {
63
100
                        var upPlugin = pluginManager.getByName("online-accounts")
64
101
                        if (upPlugin) {
65
102
                            var updatePage = upPlugin.pageComponent
66
103
                            if (updatePage)
67
104
                                pageStack.push(updatePage)
68
105
                            else
69
106
                                console.warn("online-accounts")
70
107
                        } else {
71
108
                            console.warn("online-accounts")
72
109
                        }
73
110
                    }
74
111
                }
75
112
                showDivider: false
76
113
            }
77
84
        }
114
        }
78
85
    }
115
    }
79
86
}
116
}
80
87
117
81
=== modified file 'plugins/security-privacy/PageComponent.qml'
82
--- plugins/security-privacy/PageComponent.qml	2015-05-21 13:32:41 +0000
83
+++ plugins/security-privacy/PageComponent.qml	2015-08-24 15:29:59 +0000
84
@@ -207,7 +207,7 @@
85
207
            ListItem.SingleValue {
207
            ListItem.SingleValue {
86
208
                id: locationItem
208
                id: locationItem
87
209
                objectName: "locationItem"
209
                objectName: "locationItem"
89
210
                text: i18n.tr("Location access")
210
                text: i18n.tr("Location")
90
211
                value: ""
211
                value: ""
91
212
                progression: true
212
                progression: true
92
213
                onClicked: pageStack.push(Qt.resolvedUrl("Location.qml"))
213
                onClicked: pageStack.push(Qt.resolvedUrl("Location.qml"))
93
@@ -225,9 +225,9 @@
94
225
                value: locationActionGroup.enabled.state
225
                value: locationActionGroup.enabled.state
95
226
            }
226
            }
96
227
            ListItem.SingleValue {
227
            ListItem.SingleValue {
98
228
                text: i18n.tr("Other app access")
228
                text: i18n.tr("App permissions")
99
229
                progression: true
229
                progression: true
101
230
                onClicked: pageStack.push(Qt.resolvedUrl("AppAccess.qml"))
230
                onClicked: pageStack.push(Qt.resolvedUrl("AppAccess.qml"), {pluginManager: pluginManager})
102
231
            }
231
            }
103
232
            ListItem.SingleValue {
232
            ListItem.SingleValue {
104
233
                text: i18n.tr("Diagnostics")
233
                text: i18n.tr("Diagnostics")
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-08-24
Ken VanDine		2015-08-20	Approve on 2015-08-24
Review via email: mp+268625@code.launchpad.net