From d8fad00ff956f548db8c2c40d527c4ad9fbbba7f Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Thu, 7 Aug 2014 16:45:41 +0200 Subject: [PATCH] Git/Hg SubmitEditor: Fix buttons in confirmation dialog for close Don't show the "cancel" button. Task-number: QTCREATORBUG-10451 Change-Id: I904794460ef15562eb8db630d33b8a2443b036eb Reviewed-by: Tobias Hunger --- src/plugins/vcsbase/vcsbasesubmiteditor.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp index 44b29089b19..4fa75e16d40 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp @@ -579,8 +579,13 @@ VcsBaseSubmitEditor::PromptSubmitResult } } else { // Check failed. + QMessageBox::StandardButtons buttons; + if (canCommitOnFailure) + buttons = QMessageBox::Yes|QMessageBox::No|QMessageBox::Cancel; + else + buttons = QMessageBox::Yes|QMessageBox::No; QMessageBox msgBox(QMessageBox::Question, title, checkFailureQuestion, - QMessageBox::Yes|QMessageBox::No|QMessageBox::Cancel, parent); + buttons, parent); msgBox.setDefaultButton(QMessageBox::Cancel); msgBox.setInformativeText(errorMessage); msgBox.setMinimumWidth(checkDialogMinimumWidth);