Merge pull request #986 from tastytea/use-standard-buttons

Use standard buttons where possible

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
-        }
-
     }
 
 }