Fix binding loop and null error
This commit is contained in:
parent
24a6d3f910
commit
89656d4211
2 changed files with 4 additions and 4 deletions
|
|
@ -68,7 +68,7 @@ Control.Popup {
|
||||||
}
|
}
|
||||||
contentItem: NumericPad{
|
contentItem: NumericPad{
|
||||||
id: numPad
|
id: numPad
|
||||||
currentCall: currentCall
|
currentCall: mainItem.currentCall
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
anchors.topMargin: 41 * DefaultStyle.dp
|
anchors.topMargin: 41 * DefaultStyle.dp
|
||||||
anchors.bottomMargin: 18 * DefaultStyle.dp
|
anchors.bottomMargin: 18 * DefaultStyle.dp
|
||||||
|
|
|
||||||
|
|
@ -398,7 +398,7 @@ AbstractMainPage {
|
||||||
background: Item{}
|
background: Item{}
|
||||||
onClicked: mainItem.editContact(mainItem.selectedContact)
|
onClicked: mainItem.editContact(mainItem.selectedContact)
|
||||||
icon.source: AppIcons.pencil
|
icon.source: AppIcons.pencil
|
||||||
visible: !mainItem.selectedContact.core.readOnly
|
visible: !mainItem.selectedContact?.core.readOnly
|
||||||
}
|
}
|
||||||
detailContent: ColumnLayout {
|
detailContent: ColumnLayout {
|
||||||
Layout.fillWidth: false
|
Layout.fillWidth: false
|
||||||
|
|
@ -695,7 +695,7 @@ AbstractMainPage {
|
||||||
iconSource: AppIcons.pencil
|
iconSource: AppIcons.pencil
|
||||||
text: qsTr("Edit")
|
text: qsTr("Edit")
|
||||||
onClicked: mainItem.editContact(mainItem.selectedContact)
|
onClicked: mainItem.editContact(mainItem.selectedContact)
|
||||||
visible: !mainItem.selectedContact.core.readOnly
|
visible: !mainItem.selectedContact?.core.readOnly
|
||||||
}
|
}
|
||||||
Rectangle {
|
Rectangle {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
@ -790,7 +790,7 @@ AbstractMainPage {
|
||||||
iconSource: AppIcons.trashCan
|
iconSource: AppIcons.trashCan
|
||||||
color: DefaultStyle.danger_500main
|
color: DefaultStyle.danger_500main
|
||||||
text: qsTr("Delete this contact")
|
text: qsTr("Delete this contact")
|
||||||
visible: !mainItem.selectedContact.core.readOnly
|
visible: !mainItem.selectedContact?.core.readOnly
|
||||||
onClicked: {
|
onClicked: {
|
||||||
mainItem.deleteContact(contact)
|
mainItem.deleteContact(contact)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue