Merge lp:~seb128/ubuntu-system-settings/security-ui-tweaks into lp:ubuntu-system-settings

[Sebastien Bacher]

[security-privacy] small bugfixes and ui tweaks
- update some strings to match the design
- translate the list items names
- include online accounts button

[security-privacy] small bugfixes and ui tweaks
- update some strings to match the design
- translate the list items names
- include online accounts button

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1507
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2331/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3816
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/515
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3136
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3813
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3813/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22724

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2331/rebuild

review: Needs Fixing (continuous-integration)

[lp:~seb128/ubuntu-system-settings/security-ui-tweaks]

1508. By Sebastien Bacher on 2015-08-21

rename "mic" to "microphone"

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1508
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2334/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3825
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/518
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3142
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3822
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3822/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22746

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2334/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

This looks great, but while your changing these strings please also change "Other app access" to "App permissions" per the spec.

review: Needs Fixing

[lp:~seb128/ubuntu-system-settings/security-ui-tweaks]

1509. By Sebastien Bacher on 2015-08-24

rename page 'app permissions' to match the spec

1510. By Sebastien Bacher on 2015-08-24

include location permissions in the list

1511. By Sebastien Bacher on 2015-08-24

show chevrons on items with are enabled

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1511
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2337/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3830
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/521
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3147
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3827
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3827/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22772

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2337/rebuild

review: Needs Fixing (continuous-integration)

[lp:~seb128/ubuntu-system-settings/security-ui-tweaks]

1512. By Sebastien Bacher on 2015-08-24

some extra tweaks

[Ken VanDine (ken-vandine)]

Looks good and works great

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1512
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2339/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3834
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/114
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/523
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3151
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3831
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3831/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22781

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2339/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/security-privacy/AppAccess.qml'
--- plugins/security-privacy/AppAccess.qml	2015-07-13 12:09:52 +0000
+++ plugins/security-privacy/AppAccess.qml	2015-08-24 15:29:59 +0000
@@ -25,7 +25,7 @@
 
 ItemPage {
     id: root
-    title: i18n.tr("Other app access")
+    title: i18n.tr("App permissions")
 
     Flickable {
         anchors.fill: parent
@@ -43,7 +43,7 @@
             anchors.right: parent.right
 
             ListItem.Caption {
-                text: i18n.tr("Apps that you have granted and have requested access to:")
+                text: i18n.tr("Apps that you have granted access to:")
             }
 
             ListModel {
@@ -54,8 +54,13 @@
                     trustStoreService: "CameraService"
                 }
                 ListElement {
-                    name: QT_TR_NOOP("Mic")
-                    caption: QT_TR_NOOP("Apps that have requested access to your mic")
+                    name: QT_TR_NOOP("Location")
+                    caption: QT_TR_NOOP("Apps that have requested access to your location")
+                    trustStoreService: "UbuntuLocationService"
+                }
+                ListElement {
+                    name: QT_TR_NOOP("Microphone")
+                    caption: QT_TR_NOOP("Apps that have requested access to your microphone")
                     trustStoreService: "PulseAudio"
                 }
             }
@@ -64,8 +69,9 @@
                 model: appsModel
 
                 ListItem.SingleValue {
-                    text: model.name
+                    text: i18n.tr(model.name)
                     enabled: trustStoreModel.count > 0
+                    progression: enabled ? true : false
                     value: trustStoreModel.count > 0 ?
                         i18n.tr("%1/%2").arg(trustStoreModel.grantedCount).arg(trustStoreModel.count) :
                         i18n.tr("0")
@@ -81,6 +87,30 @@
                     }
                 }
             }
+
+            ListItem.Caption {
+                    text: i18n.tr("Apps may also request access to online accounts.")
+            }
+
+            ListItem.SingleControl {
+                control: Button {
+                    text: i18n.tr("Online Accounts…")
+                    width: parent.width - units.gu(4)
+                    onClicked: {
+                        var upPlugin = pluginManager.getByName("online-accounts")
+                        if (upPlugin) {
+                            var updatePage = upPlugin.pageComponent
+                            if (updatePage)
+                                pageStack.push(updatePage)
+                            else
+                                console.warn("online-accounts")
+                        } else {
+                            console.warn("online-accounts")
+                        }
+                    }
+                }
+                showDivider: false
+            }
         }
     }
 }

=== modified file 'plugins/security-privacy/PageComponent.qml'
--- plugins/security-privacy/PageComponent.qml	2015-05-21 13:32:41 +0000
+++ plugins/security-privacy/PageComponent.qml	2015-08-24 15:29:59 +0000
@@ -207,7 +207,7 @@
             ListItem.SingleValue {
                 id: locationItem
                 objectName: "locationItem"
-                text: i18n.tr("Location access")
+                text: i18n.tr("Location")
                 value: ""
                 progression: true
                 onClicked: pageStack.push(Qt.resolvedUrl("Location.qml"))
@@ -225,9 +225,9 @@
                 value: locationActionGroup.enabled.state
             }
             ListItem.SingleValue {
-                text: i18n.tr("Other app access")
+                text: i18n.tr("App permissions")
                 progression: true
-                onClicked: pageStack.push(Qt.resolvedUrl("AppAccess.qml"))
+                onClicked: pageStack.push(Qt.resolvedUrl("AppAccess.qml"), {pluginManager: pluginManager})
             }
             ListItem.SingleValue {
                 text: i18n.tr("Diagnostics")