← Back to branch summary

~mterry/+junk/u8.2

« back to all changes in this revision

Viewing changes to qml/Components/Lockscreen.qml

  • Committer: Michael Terry
  • Date: 2014-11-17 14:56:04 UTC
  • mfrom: (1317.1.118 unity8)
  • Revision ID: michael.terry@canonical.com-20141117145604-96dn9p5nwkifq2f4
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/Components/Lockscreen.qml
17
17
import QtQuick 2.0
18
18
import Ubuntu.Components 1.0
19
19
import Ubuntu.Components.Popups 1.0
 
20
import Ubuntu.Telephony 0.1 as Telephony
20
21
 
21
22
Showable {
22
23
    id: root
56
57
 
57
58
    property url background: ""
58
59
 
 
60
    readonly property string passphrase: (pinPadLoader.item && pinPadLoader.item.passphrase) ? pinPadLoader.item.passphrase : ""
 
61
 
59
62
    signal entered(string passphrase)
60
63
    signal cancel()
61
64
    signal emergencyCall()
217
220
            objectName: "emergencyCallLabel"
218
221
            anchors.horizontalCenter: parent.horizontalCenter
219
222
 
220
 
            text: i18n.tr("Emergency Call")
 
223
            text: callManager.hasCalls ? i18n.tr("Return to Call") : i18n.tr("Emergency Call")
221
224
            color: "#f3f3e7"
222
225
        }
223
226