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

VCS: Add reason text when submit validation fails

Browse Source 
Change-Id: If4c8d5d1d5dc5386e49b29be59786dc53cfaaaa3
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Orgad Shaneh
2018-11-09 09:55:43 +02:00
committed by Orgad Shaneh
parent 3666e3aaeb
commit 96529a27c5
5 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/git/gitsubmiteditorwidget.cpp
View File

@@ -152,13 +152,24 @@ void GitSubmitEditorWidget::setPanelData(const GitSubmitEditorPanelData &data)
authorInformationChanged();
}
bool GitSubmitEditorWidget::canSubmit() const
bool GitSubmitEditorWidget::canSubmit(QString *whyNot) const
{
if (m_gitSubmitPanelUi.invalidAuthorLabel->isVisible()
|| m_gitSubmitPanelUi.invalidEmailLabel->isVisible()
|| m_hasUnmerged)
if (m_gitSubmitPanelUi.invalidAuthorLabel->isVisible()) {
if (whyNot)
*whyNot = tr("Invalid author");
return false;
return SubmitEditorWidget::canSubmit();
}
if (m_gitSubmitPanelUi.invalidEmailLabel->isVisible()) {
if (whyNot)
*whyNot = tr("Invalid email");
return false;
}
if (m_hasUnmerged) {
if (whyNot)
*whyNot = tr("Unresolved merge conflicts");
return false;
}
return SubmitEditorWidget::canSubmit(whyNot);
}
QString GitSubmitEditorWidget::cleanupDescription(const QString &input) const