1
=== modified file 'plugins/security-privacy/Location.qml'
2
--- plugins/security-privacy/Location.qml	2014-09-05 08:50:28 +0000
3
+++ plugins/security-privacy/Location.qml	2014-09-26 15:00:09 +0000
4
@@ -29,84 +29,95 @@
5
29
ItemPage {
29
ItemPage {
6
30
    id: dashPage
30
    id: dashPage
7
31
    title: i18n.tr("Location")
31
    title: i18n.tr("Location")
77
32
32
    flickable: scrollWidget
78
33
    Column {
33
79
34
        anchors.left: parent.left
34
    Flickable {
80
35
        anchors.right: parent.right
35
        id: scrollWidget
81
36
36
        anchors.fill: parent
82
37
        QDBusActionGroup {
37
        contentHeight: contentItem.childrenRect.height
83
38
            id: locationActionGroup
38
        boundsBehavior: (contentHeight > dashPage.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
84
39
            busType: DBus.SessionBus
39
        /* Set the direction to workaround https://bugreports.qt-project.org/browse/QTBUG-31905
85
40
            busName: "com.canonical.indicator.location"
40
           otherwise the UI might end up in a situation where scrolling doesn't work */
86
41
            objectPath: "/com/canonical/indicator/location"
41
        flickableDirection: Flickable.VerticalFlick
87
42
42
88
43
            property variant enabled: action("location-detection-enabled")
43
        Column {
89
44
44
            anchors.left: parent.left
90
45
            Component.onCompleted: start()
45
            anchors.right: parent.right
91
46
        }
46
92
47
47
            QDBusActionGroup {
93
48
        ListItem.Standard {
48
                id: locationActionGroup
94
49
            text: i18n.tr("Location detection")
49
                busType: DBus.SessionBus
95
50
            control: Switch {
50
                busName: "com.canonical.indicator.location"
96
51
                id: locationOn
51
                objectPath: "/com/canonical/indicator/location"
97
52
                onClicked: locationActionGroup.enabled.activate()
52
98
53
            }
53
                property variant enabled: action("location-detection-enabled")
99
54
            visible: locationActionGroup.enabled.state !== undefined
54
100
55
            Component.onCompleted:
55
                Component.onCompleted: start()
101
56
                clicked.connect(locationOn.clicked)
56
            }
102
57
        }
57
34
58
35
59
        Binding {
36
60
            target: locationOn
37
61
            property: "checked"
38
62
            value: locationActionGroup.enabled.state
39
63
        }
40
64
41
65
        ListItem.Caption {
42
66
            /* TODO: replace by real info from the location service */
43
67
            property int locationInfo: 0
44
68
45
69
            text: {
46
70
                if (locationInfo === 0) /* GPS only */
47
71
                    return i18n.tr("Uses GPS to detect your rough location. When off, GPS turns off to save battery.")
48
72
                else if (locationInfo === 1) /* GPS, wi-fi on */
49
73
                    return i18n.tr("Uses wi-fi and GPS to detect your rough location. Turning off location detection saves battery.")
50
74
                else if (locationInfo === 2) /* GPS, wi-fi off */
51
75
                    return i18n.tr("Uses wi-fi (currently off) and GPS to detect your rough location. Turning off location detection saves battery.")
52
76
                else if (locationInfo === 3) /* GPS, wi-fi and cellular on */
53
77
                    return i18n.tr("Uses wi-fi, cell tower locations, and GPS to detect your rough location. Turning off location detection saves battery.")
54
78
                else if (locationInfo === 4) /* GPS, wi-fi on, cellular off */
55
79
                    return i18n.tr("Uses wi-fi, cell tower locations (no current cellular connection), and GPS to detect your rough location. Turning off location detection saves battery.")
56
80
                else if (locationInfo === 5) /* GPS, wi-fi off, cellular on */
57
81
                    return i18n.tr("Uses wi-fi (currently off), cell tower locations, and GPS to detect your rough location. Turning off location detection saves battery.")
58
82
                else if (locationInfo === 6) /* GPS, wi-fi and cellular off */
59
83
                    return i18n.tr("Uses wi-fi (currently off), cell tower locations (no current cellular connection), and GPS to detect your rough location. Turning off location detection saves battery.")
60
84
            }
61
85
62
86
            visible: showAllUI /* hide until the information is real */
63
87
        }
64
88
65
89
        ListItem.Standard {
66
90
            text: i18n.tr("Allow access to location:")
67
91
            visible: locationOn.checked
68
92
        }
69
93
70
94
        TrustStoreModel {
71
95
            id: trustStoreModel
72
96
            serviceName: "UbuntuLocationService"
73
97
        }
74
98
75
99
        Repeater {
76
100
            model: trustStoreModel
103
101
            ListItem.Standard {
58
            ListItem.Standard {
106
102
                text: model.applicationName
59
                text: i18n.tr("Location detection")
105
103
                iconSource: model.iconName
107
104
                control: Switch {
60
                control: Switch {
111
105
                    checked: model.granted
61
                    id: locationOn
112
106
                    onClicked: trustStoreModel.setEnabled(index, !model.granted)
62
                    onClicked: locationActionGroup.enabled.activate()
113
107
                }
63
                }
114
64
                visible: locationActionGroup.enabled.state !== undefined
115
65
                Component.onCompleted:
116
66
                    clicked.connect(locationOn.clicked)
117
67
            }
118
68
119
69
            Binding {
120
70
                target: locationOn
121
71
                property: "checked"
122
72
                value: locationActionGroup.enabled.state
123
73
            }
124
74
125
75
            ListItem.Caption {
126
76
                /* TODO: replace by real info from the location service */
127
77
                property int locationInfo: 0
128
78
129
79
                text: {
130
80
                    if (locationInfo === 0) /* GPS only */
131
81
                        return i18n.tr("Uses GPS to detect your rough location. When off, GPS turns off to save battery.")
132
82
                    else if (locationInfo === 1) /* GPS, wi-fi on */
133
83
                        return i18n.tr("Uses wi-fi and GPS to detect your rough location. Turning off location detection saves battery.")
134
84
                    else if (locationInfo === 2) /* GPS, wi-fi off */
135
85
                        return i18n.tr("Uses wi-fi (currently off) and GPS to detect your rough location. Turning off location detection saves battery.")
136
86
                    else if (locationInfo === 3) /* GPS, wi-fi and cellular on */
137
87
                        return i18n.tr("Uses wi-fi, cell tower locations, and GPS to detect your rough location. Turning off location detection saves battery.")
138
88
                    else if (locationInfo === 4) /* GPS, wi-fi on, cellular off */
139
89
                        return i18n.tr("Uses wi-fi, cell tower locations (no current cellular connection), and GPS to detect your rough location. Turning off location detection saves battery.")
140
90
                    else if (locationInfo === 5) /* GPS, wi-fi off, cellular on */
141
91
                        return i18n.tr("Uses wi-fi (currently off), cell tower locations, and GPS to detect your rough location. Turning off location detection saves battery.")
142
92
                    else if (locationInfo === 6) /* GPS, wi-fi and cellular off */
143
93
                        return i18n.tr("Uses wi-fi (currently off), cell tower locations (no current cellular connection), and GPS to detect your rough location. Turning off location detection saves battery.")
144
94
                }
145
95
146
96
                visible: showAllUI /* hide until the information is real */
147
97
            }
148
98
149
99
            ListItem.Standard {
150
100
                text: i18n.tr("Allow access to location:")
151
108
                visible: locationOn.checked
101
                visible: locationOn.checked
152
109
            }
102
            }
153
103
154
104
            TrustStoreModel {
155
105
                id: trustStoreModel
156
106
                serviceName: "UbuntuLocationService"
157
107
            }
158
108
159
109
            Repeater {
160
110
                model: trustStoreModel
161
111
                ListItem.Standard {
162
112
                    text: model.applicationName
163
113
                    iconSource: model.iconName
164
114
                    control: Switch {
165
115
                        checked: model.granted
166
116
                        onClicked: trustStoreModel.setEnabled(index, !model.granted)
167
117
                    }
168
118
                    visible: locationOn.checked
169
119
                }
170
120
            }
171
110
        }
121
        }
172
111
122
173
112
    }
123
    }
Reviewer	Review Type	Date Requested	Status
Ken VanDine		2014-09-25	Approve on 2014-09-26
PS Jenkins bot	continuous-integration		Approve on 2014-09-26
Review via email: mp+235994@code.launchpad.net