feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

VCS: Abort commit on ESC

Browse Source 
Abort a commit when pressing ESC in the "Do you want to commit?" dialog.

Task-number: QTCREATORBUG-2616
This commit is contained in:
Tobias Hunger
2010-10-05 17:57:50 +02:00
parent 976a9a17e0
commit 80f91c99d2
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/vcsbase/vcsbasesubmiteditor.cpp
View File

@@ -482,7 +482,8 @@ VCSBaseSubmitEditor::PromptSubmitResult
const QDialogButtonBox::StandardButton danswer = const QDialogButtonBox::StandardButton danswer =
Utils::CheckableMessageBox::question(parent, title, question, Utils::CheckableMessageBox::question(parent, title, question,
tr("Prompt to submit"), promptSetting, tr("Prompt to submit"), promptSetting,
QDialogButtonBox::Yes|QDialogButtonBox::No|QDialogButtonBox::Cancel, QDialogButtonBox::Yes|QDialogButtonBox::No|
QDialogButtonBox::Cancel,
QDialogButtonBox::Yes); QDialogButtonBox::Yes);
answer = Utils::CheckableMessageBox::dialogButtonBoxToMessageBoxButton(danswer); answer = Utils::CheckableMessageBox::dialogButtonBoxToMessageBoxButton(danswer);
} else { } else {
@@ -501,14 +502,14 @@ VCSBaseSubmitEditor::PromptSubmitResult
answer = static_cast<QMessageBox::StandardButton>(msgBox.exec()); answer = static_cast<QMessageBox::StandardButton>(msgBox.exec());
} }
switch (answer) { switch (answer) {
case QMessageBox::Cancel:
return SubmitCanceled;
case QMessageBox::No: case QMessageBox::No:
return SubmitDiscarded; return SubmitDiscarded;
case QMessageBox::Yes:
return SubmitConfirmed;
default: default:
break; break;
} }
return SubmitConfirmed; return SubmitCanceled;
} }
QString VCSBaseSubmitEditor::promptForNickName() QString VCSBaseSubmitEditor::promptForNickName()