git.iko.soy/unity8
on xenial help sign in
Switch text of emergency call button when in a call
72dca63Michael Terry
qml/Components/Lockscreen.qml+2−1
compare with xenial
unifiedsplit
@@ -17,6 +17,7 @@
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 1.0
18import Ubuntu.Components 1.0
19import Ubuntu.Components.Popups 1.0
19import Ubuntu.Components.Popups 1.0
20+import Ubuntu.Telephony 0.1 as Telephony
20
21
21Showable {
22Showable {
22 id: root
23 id: root
@@ -217,7 +218,7 @@ Showable {
217 objectName: "emergencyCallLabel"
218 objectName: "emergencyCallLabel"
218 anchors.horizontalCenter: parent.horizontalCenter
219 anchors.horizontalCenter: parent.horizontalCenter
219
220
220− text: i18n.tr("Emergency Call")
221+ text: callManager.hasCalls ? i18n.tr("Return to Call") : i18n.tr("Emergency Call")
221 color: "#f3f3e7"
222 color: "#f3f3e7"
222 }
223 }
223
224