← Back to branch summary

~lukas-kde/unity8/dashboard

« back to all changes in this revision

Viewing changes to qml/Greeter/NarrowView.qml

  • Committer: Lukáš Tinkl
  • Date: 2017-01-26 12:13:17 UTC
  • mfrom: (2749.1.49 unity8)
  • Revision ID: lukas.tinkl@canonical.com-20170126121317-qms39s9pikclidbe
merge trunk, fix conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/Greeter/NarrowView.qml
48
48
    signal tease()
49
49
    signal emergencyCall()
50
50
 
51
 
    function showMessage(html) {
52
 
        loginList.showMessage(html);
53
 
    }
54
 
 
55
 
    function showPrompt(text, isSecret, isDefaultPrompt) {
56
 
        loginList.showPrompt(text, isSecret, isDefaultPrompt);
57
 
    }
58
 
 
59
51
    function showLastChance() {
60
52
        /* TODO: when we finish support for resetting device after too many
61
53
                 failed logins, we should re-add this popup.
75
67
        coverPage.hide();
76
68
    }
77
69
 
78
 
    function notifyAuthenticationSucceeded(showFakePassword) {
79
 
        if (showFakePassword) {
80
 
            loginList.showFakePassword();
81
 
        }
 
70
    function showFakePassword() {
 
71
        loginList.showFakePassword();
82
72
    }
83
73
 
84
74
    function notifyAuthenticationFailed() {
89
79
        coverPage.showErrorMessage(msg);
90
80
    }
91
81
 
92
 
    function reset(forceShow) {
93
 
        loginList.reset();
94
 
        if (forceShow) {
95
 
            coverPage.show();
96
 
        }
 
82
    function forceShow() {
 
83
        coverPage.show();
97
84
    }
98
85
 
99
86
    function tryToUnlock(toTheRight) {
120
107
        objectName: "lockscreen"
121
108
        anchors.fill: parent
122
109
        shown: false
 
110
        opacity: 0
123
111
 
124
112
        showAnimation: StandardAnimation { property: "opacity"; to: 1 }
125
113
        hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
195
183
        onClicked: hide()
196
184
 
197
185
        onShowProgressChanged: {
198
 
            if (showProgress === 1) {
199
 
                loginList.reset();
200
 
            } else if (showProgress === 0) {
201
 
                loginList.tryToUnlock();
 
186
            if (showProgress === 0) {
 
187
                if (lockscreen.shown) {
 
188
                    loginList.tryToUnlock();
 
189
                } else {
 
190
                    root.responded("");
 
191
                }
202
192
            }
203
193
        }
204
194