Merge lp:~seb128/ubuntu-system-settings/security-dash-option into lp:ubuntu-system-settings

[Sebastien Bacher]

[security-privacy] remove obsolete dash search option

[security-privacy] remove obsolete dash search option

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1418
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2116/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2918
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/386
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2500
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2916
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2916/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20692

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

review: Approve (continuous-integration)

[Matthew Paul Thomas (mpt)]

LGTM

review: Approve (design)

[Jonas G. Drange (jonas-drange)]

Nice, thanks.

review: Approve

=== modified file 'plugins/security-privacy/CMakeLists.txt'
--- plugins/security-privacy/CMakeLists.txt	2015-01-26 13:35:57 +0000
+++ plugins/security-privacy/CMakeLists.txt	2015-05-21 13:38:07 +0000
@@ -21,7 +21,6 @@
 set(QML_SOURCES
     AppAccess.qml
     AppAccessControl.qml
-    Dash.qml
     here-terms.qml
     Location.qml
     LockSecurity.qml

=== removed file 'plugins/security-privacy/Dash.qml'
--- plugins/security-privacy/Dash.qml	2014-02-13 14:37:42 +0000
+++ plugins/security-privacy/Dash.qml	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- * Sebastien Bacher <[e-mail]>
- *
- */
-
-import GSettings 1.0
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
-import SystemSettings 1.0
-
-ItemPage {
-    id: dashPage
-    title: i18n.tr("Dash search")
-
-    GSettings {
-        id: unitySettings
-        schema.id: "com.canonical.Unity.Lenses"
-        onChanged: {
-            if (key == "remoteContentSearch")
-                if (value == 'all')
-                    selectorId.selectedIndex = 1
-                else
-                    selectorId.selectedIndex = 0
-        }
-    }
-
-    ListItem.ItemSelector {
-        id: selectorId
-        text: i18n.tr("Return results from:")
-        model: [i18n.tr("Phone only"), i18n.tr("Phone and Internet")]
-        selectedIndex: (unitySettings.remoteContentSearch === 'all') ? 1 : 0
-        expanded: true
-        onSelectedIndexChanged:
-            unitySettings.remoteContentSearch = (selectorId.selectedIndex == 0) ? "none" : "all"
-    }
-}

=== modified file 'plugins/security-privacy/PageComponent.qml'
--- plugins/security-privacy/PageComponent.qml	2015-01-26 15:04:02 +0000
+++ plugins/security-privacy/PageComponent.qml	2015-05-21 13:38:07 +0000
@@ -194,15 +194,6 @@
                 visible: showAllUI
             }
 
-            ListItem.SingleValue {
-                id: dashSearchId
-                text: i18n.tr("Dash search")
-                value: (unitySettings.remoteContentSearch === 'all') ?
-                           i18n.tr("Phone and Internet") :
-                           i18n.tr("Phone only")
-                progression: true
-                onClicked: pageStack.push(Qt.resolvedUrl("Dash.qml"))
-            }
             QDBusActionGroup {
                 id: locationActionGroup
                 busType: DBus.SessionBus