d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-21 18:50:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

workaround broken platform dialogs on macos

Browse source 
See https://bugreports.qt.io/browse/QTBUG-102078
This commit is contained in:
Nicolas Werner 2024-03-14 01:00:31 +01:00
parent 82631619b9
commit d2009428b6
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
5 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/Root.qml
View file

@ -348,7 +348,9 @@ Pane {
buttons: Platform.MessageDialog.Ok buttons: Platform.MessageDialog.Ok
text: qsTr("Wait for the confirmation link to arrive, then continue.") 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 { Connections {
function onConfirm3pidToken() { function onConfirm3pidToken() {

4
resources/qml/dialogs/ImagePackDeleteDialog.qml
View file

@ -16,7 +16,9 @@ P.MessageDialog {
flags: Qt.Tool | Qt.WindowStaysOnTopHint | Qt.WindowCloseButtonHint | Qt.WindowTitleHint flags: Qt.Tool | Qt.WindowStaysOnTopHint | Qt.WindowCloseButtonHint | Qt.WindowTitleHint
buttons: P.MessageDialog.Yes | P.MessageDialog.No 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); console.info("deleting image pack " + imagePack.packname);
imagePack.remove() imagePack.remove()
} }

5
resources/qml/dialogs/LeaveRoomDialog.qml
View file

@ -16,7 +16,10 @@ P.MessageDialog {
text: qsTr("Are you sure you want to leave?") text: qsTr("Are you sure you want to leave?")
modality: Qt.ApplicationModal modality: Qt.ApplicationModal
buttons: P.MessageDialog.Ok | P.MessageDialog.Cancel buttons: P.MessageDialog.Ok | P.MessageDialog.Cancel
onAccepted: {
// Broken on macos, see https://bugreports.qt.io/browse/QTBUG-102078
//onAccepted: {
onOkClicked: {
if (CallManager.haveCallInvite) { if (CallManager.haveCallInvite) {
callManager.rejectInvite(); callManager.rejectInvite();

4
resources/qml/dialogs/LogoutDialog.qml
View file

@ -14,5 +14,7 @@ P.MessageDialog {
modality: Qt.WindowModal modality: Qt.WindowModal
flags: Qt.Tool | Qt.WindowStaysOnTopHint | Qt.WindowCloseButtonHint | Qt.WindowTitleHint flags: Qt.Tool | Qt.WindowStaysOnTopHint | Qt.WindowCloseButtonHint | Qt.WindowTitleHint
buttons: P.MessageDialog.Ok | P.MessageDialog.Cancel 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()
} }

7
resources/qml/dialogs/RoomSettingsDialog.qml
View file

@ -554,13 +554,16 @@ ApplicationWindow {
text: qsTr(`Encryption is currently experimental and things might break unexpectedly. <br> text: qsTr(`Encryption is currently experimental and things might break unexpectedly. <br>
Please take note that it can't be disabled afterwards.`) Please take note that it can't be disabled afterwards.`)
modality: Qt.NonModal modality: Qt.NonModal
onAccepted: { // Broken on macos, see https://bugreports.qt.io/browse/QTBUG-102078
//onAccepted: {
onOkClicked: {
if (roomSettings.isEncryptionEnabled) if (roomSettings.isEncryptionEnabled)
return ; return ;
roomSettings.enableEncryption(); roomSettings.enableEncryption();
} }
onRejected: { //onRejected: {
onCancelClicked: {
encryptionToggle.checked = false; encryptionToggle.checked = false;
} }
buttons: Platform.MessageDialog.Ok | Platform.MessageDialog.Cancel buttons: Platform.MessageDialog.Ok | Platform.MessageDialog.Cancel