← Back to branch summary

~ken-vandine/ubuntu-system-settings/no_s_i_d

« back to all changes in this revision

Viewing changes to plugins/security-privacy/PhoneLocking.qml

  • Committer: Bileto Bot
  • Author(s): Ken VanDine
  • Date: 2016-07-22 14:38:13 UTC
  • mfrom: (1556.3.32 slotsLayout)
  • Revision ID: ci-train-bot@canonical.com-20160722143813-ht9e4766lm0ie5fa
Ported to use Slots layout and updated visuals (LP: #1596529)

Approved by: Jonas G. Drange

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/security-privacy/PhoneLocking.qml
1
1
/*
2
2
 * This file is part of system-settings
3
3
 *
4
 
 * Copyright (C) 2013 Canonical Ltd.
 
4
 * Copyright (C) 2013-2016 Canonical Ltd.
5
5
 *
6
6
 * Contact: Iain Lane <iain.lane@canonical.com>
7
7
 *
21
21
import GSettings 1.0
22
22
import QtQuick 2.4
23
23
import SystemSettings 1.0
 
24
import SystemSettings.ListItems 1.0 as SettingsListItems
24
25
import Ubuntu.Components 1.3
25
 
import Ubuntu.Components.ListItems 1.3 as ListItem
 
26
import Ubuntu.Components.ListItems 1.3 as ListItems
26
27
import Ubuntu.SystemSettings.SecurityPrivacy 1.0
27
28
 
28
29
ItemPage {
52
53
            anchors.left: parent.left
53
54
            anchors.right: parent.right
54
55
 
55
 
            ListItem.SingleValue {
 
56
            SettingsListItems.SingleValueProgression {
56
57
                property string swipe: i18n.ctr("Unlock with swipe", "None")
57
58
                property string passcode: i18n.tr("Passcode")
58
59
                property string passphrase: i18n.tr("Passphrase")
74
75
                            return fingerprint
75
76
                    }
76
77
                }
77
 
                progression: true
78
78
                onClicked: pageStack.push(Qt.resolvedUrl("LockSecurity.qml"))
79
79
            }
80
80
 
81
 
            ListItem.SingleValue {
 
81
            SettingsListItems.SingleValueProgression {
82
82
                objectName: "lockTimeout"
83
83
                property bool lockOnSuspend: securityPrivacy.securityType !==
84
84
                                                UbuntuSecurityPrivacyPanel.Swipe
109
109
                                    i18n.tr("Never")
110
110
                    }
111
111
                }
112
 
                progression: true
113
112
                onClicked:
114
113
                    pageStack.push(
115
114
                        Qt.resolvedUrl("../battery/SleepValues.qml"),
116
115
                        { title: text, lockOnSuspend: lockOnSuspend } )
117
116
            }
118
117
 
119
 
            ListItem.Standard {
120
 
                control: CheckBox {
 
118
            SettingsListItems.Standard {
 
119
                CheckBox {
121
120
                    checked: true
122
121
                }
123
122
                text: i18n.tr("Sleep locks immediately")
128
127
                text: i18n.tr("When locked, allow:")
129
128
            }
130
129
 
131
 
            ListItem.Standard {
 
130
            SettingsListItems.Standard {
132
131
                text: i18n.tr("Launcher")
133
 
                control: CheckBox {
 
132
                CheckBox {
134
133
                    id: launcherCheck
135
134
                    enabled: securityPrivacy.securityType !== UbuntuSecurityPrivacyPanel.Swipe
136
135
 
141
140
                }
142
141
            }
143
142
 
144
 
            ListItem.Standard {
 
143
            SettingsListItems.Standard {
145
144
                text: i18n.tr("Notifications and quick settings")
146
 
                control: CheckBox {
 
145
                 CheckBox {
147
146
                    id: indicatorsCheck
148
147
                    enabled: securityPrivacy.securityType !== UbuntuSecurityPrivacyPanel.Swipe
149
148
 
154
153
                }
155
154
            }
156
155
 
157
 
            ListItem.Caption {
 
156
            ListItems.Caption {
158
157
                text: securityPrivacy.securityType === UbuntuSecurityPrivacyPanel.Swipe ?
159
158
                      i18n.tr("Turn on lock security to restrict access when the device is locked.") :
160
159
                      i18n.tr("Other apps and functions will prompt you to unlock.")