Merge branch '3.1'

This commit is contained in:
Ghostkeeper 2017-11-30 16:57:01 +01:00
commit 96c38bce2b
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
38 changed files with 1791 additions and 2016 deletions

View file

@ -43,7 +43,7 @@ UM.Dialog
anchors.right: parent.right
text: catalog.i18nc("@action:button", "I understand and agree")
onClicked: {
manager.didAgree(true)
baseDialog.accepted()
}
}
@ -52,13 +52,12 @@ UM.Dialog
anchors.left: parent.left
text: catalog.i18nc("@action:button", "I don't agree")
onClicked: {
manager.didAgree(false)
baseDialog.rejected()
}
}
}
onClosing: {
manager.didAgree(false)
}
onAccepted: manager.didAgree(true)
onRejected: manager.didAgree(false)
onClosing: manager.didAgree(false)
}