VCS: Add reason text when submit validation fails

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>

1 files changed, 16 insertions, 5 deletions

diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp
index bf2cdf745c..530a688e83 100644
--- a/src/plugins/git/gitsubmiteditorwidget.cpp
+++ b/src/plugins/git/gitsubmiteditorwidget.cpp
@@ -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