git.iko.soy/unity8
on xenial help sign in
Use the built-in lockscreen dialog rather than a home-brewn one
9a6b0cbMichael Terry
qml/Components/FactoryResetWarningDialog.qmldeleted−51
compare with xenial
unifiedsplit
@@ -1,51 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−import QtQuick 2.0
18−import Ubuntu.Components 1.1
19−import Ubuntu.Components.Popups 1.0
20−
21−Dialog {
22− id: factoryResetDialog
23−
24− property bool alphaNumeric: false
25−
26− text: alphaNumeric ?
27− i18n.tr("Sorry, incorrect passphrase.") :
28− i18n.tr("Sorry, incorrect passcode.")
29−
30− Label {
31− text: i18n.tr("This will be your last attempt.")
32− wrapMode: Text.Wrap
33− horizontalAlignment: Text.AlignHCenter
34− }
35−
36− Label {
37− text: alphaNumeric ?
38− i18n.tr("If passphrase is entered incorrectly, your phone will conduct a factory reset and all personal data will be deleted.") :
39− i18n.tr("If passcode is entered incorrectly, your phone will conduct a factory reset and all personal data will be deleted.")
40− wrapMode: Text.Wrap
41− horizontalAlignment: Text.AlignHCenter
42− }
43−
44− Button {
45− id: button
46− objectName: "button"
47− text: i18n.tr("OK")
48− onClicked: PopupUtils.close(factoryResetDialog)
49− color: UbuntuColors.green
50− }
51−}
qml/Shell.qml+8−9
@@ -254,14 +254,6 @@ Item {
254 }
254 }
255 }
255 }
256
256
257− Component {
258− id: factoryResetWarningDialog
259− FactoryResetWarningDialog {
260− objectName: "factoryResetWarningDialog"
261− alphaNumeric: lockscreen.alphaNumeric
262− }
263− }
264−
265 Connections {
257 Connections {
266 target: LightDM.Greeter
258 target: LightDM.Greeter
267
259
@@ -310,7 +302,14 @@ Item {
310 AccountsService.failedLogins++
302 AccountsService.failedLogins++
311 if (maxFailedLogins >= 2) { // require at least a warning
303 if (maxFailedLogins >= 2) { // require at least a warning
312 if (AccountsService.failedLogins === maxFailedLogins - 1) {
304 if (AccountsService.failedLogins === maxFailedLogins - 1) {
313− PopupUtils.open(factoryResetWarningDialog)
305+ var title = lockscreen.alphaNumeric ?
306+ i18n.tr("Sorry, incorrect passphrase.") :
307+ i18n.tr("Sorry, incorrect passcode.")
308+ var text = i18n.tr("This will be your last attempt.") + " " +
309+ (lockscreen.alphaNumeric ?
310+ i18n.tr("If passphrase is entered incorrectly, your phone will conduct a factory reset and all personal data will be deleted.") :
311+ i18n.tr("If passcode is entered incorrectly, your phone will conduct a factory reset and all personal data will be deleted."))
312+ lockscreen.showInfoPopup(title, text)
314 } else if (AccountsService.failedLogins >= maxFailedLogins) {
313 } else if (AccountsService.failedLogins >= maxFailedLogins) {
315 SystemImage.factoryReset() // Ouch!
314 SystemImage.factoryReset() // Ouch!
316 }
315 }