diff options
| author | tastytea <tastytea@tastytea.de> | 2022-03-11 12:53:23 +0100 |
|---|---|---|
| committer | tastytea <tastytea@tastytea.de> | 2022-03-11 13:15:26 +0100 |
| commit | a7388a70bed983865797ac22b98eb34673406c19 (patch) | |
| tree | 342d0e451d5cddfaedbb248f126def9160df419c /resources/qml | |
| parent | Merge pull request #985 from maltee1/various_bubbles_fixes (diff) | |
| download | nheko-a7388a70bed983865797ac22b98eb34673406c19.tar.xz | |
Use standard buttons where possible
Standard buttons are ordered in the right way and sometimes have an icon. Bug: https://matrix.to/#/%23nheko%3Anheko.im/%2476PZ2m6YftX8mqGIe9ettKbh_-pEYeVRQSJBfwFzWi0?via=pixie.town&via=matrix.org&via=matrix.flexinos.tech&via=half-shot.uk
Diffstat (limited to 'resources/qml')
| -rw-r--r-- | resources/qml/dialogs/ImagePackEditorDialog.qml | 19 | ||||
| -rw-r--r-- | resources/qml/dialogs/JoinRoomDialog.qml | 6 |
2 files changed, 6 insertions, 19 deletions
diff --git a/resources/qml/dialogs/ImagePackEditorDialog.qml b/resources/qml/dialogs/ImagePackEditorDialog.qml index 49c9ea07..891d9c3d 100644 --- a/resources/qml/dialogs/ImagePackEditorDialog.qml +++ b/resources/qml/dialogs/ImagePackEditorDialog.qml @@ -329,21 +329,12 @@ ApplicationWindow { footer: DialogButtonBox { id: buttons - Button { - text: qsTr("Cancel") - DialogButtonBox.buttonRole: DialogButtonBox.DestructiveRole - onClicked: win.close() + standardButtons: DialogButtonBox.Save | DialogButtonBox.Cancel + onAccepted: { + imagePack.save(); + win.close(); } - - Button { - text: qsTr("Save") - DialogButtonBox.buttonRole: DialogButtonBox.ApplyRole - onClicked: { - imagePack.save(); - win.close(); - } - } - + onRejected: win.close() } } diff --git a/resources/qml/dialogs/JoinRoomDialog.qml b/resources/qml/dialogs/JoinRoomDialog.qml index e49f538d..263481aa 100644 --- a/resources/qml/dialogs/JoinRoomDialog.qml +++ b/resources/qml/dialogs/JoinRoomDialog.qml @@ -54,6 +54,7 @@ ApplicationWindow { footer: DialogButtonBox { id: dbb + standardButtons: DialogButtonBox.Cancel onAccepted: { Nheko.joinRoom(input.text); joinRoomRoot.close(); @@ -68,11 +69,6 @@ ApplicationWindow { DialogButtonBox.buttonRole: DialogButtonBox.AcceptRole } - Button { - text: "Cancel" - DialogButtonBox.buttonRole: DialogButtonBox.RejectRole - } - } } |