From 8f61d539da2dc9c0da44f5eb4408cb82e3227ea4 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Wed, 3 May 2023 13:59:29 +0200 Subject: [PATCH] replace "OK" button by "Resolve conflicts" to help users Signed-off-by: Matthieu Gallien --- src/gui/ResolveConflictsDialog.qml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/gui/ResolveConflictsDialog.qml b/src/gui/ResolveConflictsDialog.qml index e03404fd8..643b92f95 100644 --- a/src/gui/ResolveConflictsDialog.qml +++ b/src/gui/ResolveConflictsDialog.qml @@ -173,7 +173,14 @@ Window { DialogButtonBox { Layout.fillWidth: true - standardButtons: DialogButtonBox.Ok | DialogButtonBox.Cancel + Button { + text: qsTr("Resolve conflicts") + DialogButtonBox.buttonRole: DialogButtonBox.AcceptRole + } + Button { + text: qsTr("Cancel") + DialogButtonBox.buttonRole: DialogButtonBox.RejectRole + } onAccepted: function() { console.log("Ok clicked") -- 2.30.2