diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2019-01-21 15:30:03 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2019-01-21 14:00:49 +0000 |
| commit | 620086109ada596969033112a71b754c3e29c186 (patch) | |
| tree | e0f525984126596a25977b9d7f3ff4515657a7fb /src/plugins/vcsbase | |
| parent | 06da56335ad67141772e1398c4aa5956575a4ddf (diff) | |
| download | qt-creator-620086109ada596969033112a71b754c3e29c186.tar.gz | |
VCS: Make "Keep Editing" the default only when closing the editor
If the prompt is displayed on button press, the default is Commit.
Task-number: QTCREATORBUG-18799
Change-Id: I706a2700e08bb45f44019a0fe8d44365438ee9f3
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Diffstat (limited to 'src/plugins/vcsbase')
| -rw-r--r-- | src/plugins/vcsbase/vcsbasesubmiteditor.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp index 2a54f36cf6..7def2dc94f 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp @@ -592,7 +592,9 @@ VcsBaseSubmitEditor::PromptSubmitResult // On Windows there is no mnemonic for Close. Set it explicitly. mb.button(QDialogButtonBox::Close)->setText(tr("&Close")); cancelButton->setText(tr("&Keep Editing")); - cancelButton->setDefault(true); + // forcePrompt is true when the editor is closed, and false when triggered by the submit action + if (forcePrompt) + cancelButton->setDefault(true); if (QPushButton *commitButton = mb.button(QDialogButtonBox::Ok)) { commitButton->setText(withUnusedMnemonic(commitName, {cancelButton, mb.button(QDialogButtonBox::Close)})); |