Skip to content
Snippets Groups Projects
Verified Commit d2009428 authored by Nicolas Werner's avatar Nicolas Werner
Browse files

workaround broken platform dialogs on macos

parent 82631619
No related branches found
No related tags found
No related merge requests found
Pipeline #5672 waiting for manual action
......@@ -348,7 +348,9 @@ Pane {
buttons: Platform.MessageDialog.Ok
text: qsTr("Wait for the confirmation link to arrive, then continue.")
onAccepted: UIA.continue3pidReceived()
// Broken on macos, see https://bugreports.qt.io/browse/QTBUG-102078
//onAccepted: UIA.continue3pidReceived()
onOkClicked: UIA.continue3pidReceived()
}
Connections {
function onConfirm3pidToken() {
......
......@@ -16,7 +16,9 @@ P.MessageDialog {
flags: Qt.Tool | Qt.WindowStaysOnTopHint | Qt.WindowCloseButtonHint | Qt.WindowTitleHint
buttons: P.MessageDialog.Yes | P.MessageDialog.No
onAccepted: {
// Broken on macos, see https://bugreports.qt.io/browse/QTBUG-102078
//onAccepted: {
onOkClicked: {
console.info("deleting image pack " + imagePack.packname);
imagePack.remove()
}
......
......@@ -16,7 +16,10 @@ P.MessageDialog {
text: qsTr("Are you sure you want to leave?")
modality: Qt.ApplicationModal
buttons: P.MessageDialog.Ok | P.MessageDialog.Cancel
onAccepted: {
// Broken on macos, see https://bugreports.qt.io/browse/QTBUG-102078
//onAccepted: {
onOkClicked: {
if (CallManager.haveCallInvite) {
callManager.rejectInvite();
......
......@@ -14,5 +14,7 @@ P.MessageDialog {
modality: Qt.WindowModal
flags: Qt.Tool | Qt.WindowStaysOnTopHint | Qt.WindowCloseButtonHint | Qt.WindowTitleHint
buttons: P.MessageDialog.Ok | P.MessageDialog.Cancel
onAccepted: Nheko.logout()
// Broken on macos, see https://bugreports.qt.io/browse/QTBUG-102078
//onAccepted: Nheko.logout()
onOkClicked: Nheko.logout()
}
......@@ -554,13 +554,16 @@ ApplicationWindow {
text: qsTr(`Encryption is currently experimental and things might break unexpectedly. <br>
Please take note that it can't be disabled afterwards.`)
modality: Qt.NonModal
onAccepted: {
// Broken on macos, see https://bugreports.qt.io/browse/QTBUG-102078
//onAccepted: {
onOkClicked: {
if (roomSettings.isEncryptionEnabled)
return ;
roomSettings.enableEncryption();
}
onRejected: {
//onRejected: {
onCancelClicked: {
encryptionToggle.checked = false;
}
buttons: Platform.MessageDialog.Ok | Platform.MessageDialog.Cancel
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment