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

VCS: Do not prompt on close if nothing was done

Browse Source 
Fixes: QTCREATORBUG-22233
Change-Id: I1e8240131ccb9a6583a8ae76b3f5c93799f588a5
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2022-10-13 09:11:59 +03:00
committed by Orgad Shaneh
parent 048fd5955d
commit 20cd55046f
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/vcsbase/submiteditorwidget.cpp
View File

@@ -645,6 +645,11 @@ bool SubmitEditorWidget::canSubmit(QString *whyNot) const
return res; return res;
} }
bool SubmitEditorWidget::edited() const
{
return !d->m_description.trimmed().isEmpty() || checkedFilesCount() > 0;
}
void SubmitEditorWidget::setUpdateInProgress(bool value) void SubmitEditorWidget::setUpdateInProgress(bool value)
{ {
d->m_updateInProgress = value; d->m_updateInProgress = value;

1
src/plugins/vcsbase/submiteditorwidget.h
View File

@@ -67,6 +67,7 @@ public:
QList<SubmitFieldWidget *> submitFieldWidgets() const; QList<SubmitFieldWidget *> submitFieldWidgets() const;
virtual bool canSubmit(QString *whyNot = nullptr) const; virtual bool canSubmit(QString *whyNot = nullptr) const;
bool edited() const;
void setUpdateInProgress(bool value); void setUpdateInProgress(bool value);
bool updateInProgress() const; bool updateInProgress() const;

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

@@ -509,7 +509,7 @@ VcsBaseSubmitEditor::PromptSubmitResult
Core::EditorManager::activateEditor(this, Core::EditorManager::IgnoreNavigationHistory); Core::EditorManager::activateEditor(this, Core::EditorManager::IgnoreNavigationHistory);
if (!submitWidget->isEnabled()) if (!submitWidget->isEnabled() || !submitWidget->edited())
return SubmitDiscarded; return SubmitDiscarded;
QString errorMessage; QString errorMessage;