diff options
author | Eike Ziller <eike.ziller@qt.io> | 2019-05-13 16:05:28 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2019-05-13 14:20:19 +0000 |
commit | 5378134c2154dbd09140bf78c43a130f6fffe219 (patch) | |
tree | 57aa81cfe3f2399bcfcf7c9ec5b6b69969d74fb3 | |
parent | a2a55674e353c81c7150eaadb57a4cd554ffe354 (diff) |
Adapt to 4.94.9
Change-Id: I9c413eaf6d70eaf09640aed349c876c040ef55ba
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
-rw-r--r-- | plugins/fossil/fossilcommitwidget.cpp | 7 | ||||
-rw-r--r-- | plugins/fossil/fossilcommitwidget.h | 2 | ||||
-rw-r--r-- | plugins/fossil/fossilplugin.cpp | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/plugins/fossil/fossilcommitwidget.cpp b/plugins/fossil/fossilcommitwidget.cpp index b6fa9bd..73baf9e 100644 --- a/plugins/fossil/fossilcommitwidget.cpp +++ b/plugins/fossil/fossilcommitwidget.cpp @@ -141,12 +141,15 @@ bool FossilCommitWidget::isPrivateOptionEnabled() const return m_commitPanelUi.isPrivateCheckBox->isChecked(); } -bool FossilCommitWidget::canSubmit() const +bool FossilCommitWidget::canSubmit(QString *whyNot) const { QString message = cleanupDescription(descriptionText()).trimmed(); - if (m_commitPanelUi.invalidBranchLabel->isVisible() || message.isEmpty()) + if (m_commitPanelUi.invalidBranchLabel->isVisible() || message.isEmpty()) { + if (whyNot) + *whyNot = tr("Message check failed."); return false; + } return VcsBase::SubmitEditorWidget::canSubmit(); } diff --git a/plugins/fossil/fossilcommitwidget.h b/plugins/fossil/fossilcommitwidget.h index 19d4220..689eb45 100644 --- a/plugins/fossil/fossilcommitwidget.h +++ b/plugins/fossil/fossilcommitwidget.h @@ -59,7 +59,7 @@ public: bool isPrivateOptionEnabled() const; protected: - bool canSubmit() const; + bool canSubmit(QString *whyNot = nullptr) const; private slots: void branchChanged(); diff --git a/plugins/fossil/fossilplugin.cpp b/plugins/fossil/fossilplugin.cpp index 621e31a..bdc16fb 100644 --- a/plugins/fossil/fossilplugin.cpp +++ b/plugins/fossil/fossilplugin.cpp @@ -663,10 +663,8 @@ bool FossilPlugin::submitEditorAboutToClose() QTC_ASSERT(editorDocument, return true); bool promptOnSubmit = false; - const VcsBase::VcsBaseSubmitEditor::PromptSubmitResult response = - commitEditor->promptSubmit(tr("Close Commit Editor"), tr("Do you want to commit the changes?"), - tr("Message check failed. Do you want to proceed?"), - &promptOnSubmit, !m_submitActionTriggered); + const VcsBase::VcsBaseSubmitEditor::PromptSubmitResult response + = commitEditor->promptSubmit(this, &promptOnSubmit, !m_submitActionTriggered); m_submitActionTriggered = false; switch (response) { |