diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2019-05-13 23:37:02 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2019-05-13 23:37:02 +0300 |
| commit | 00821627645cb826ac14884a0b262e5b92ac9c18 (patch) | |
| tree | 57aa81cfe3f2399bcfcf7c9ec5b6b69969d74fb3 | |
| parent | fd26cf5c8daff0571c5530a004d547495eba1ba9 (diff) | |
| parent | 5378134c2154dbd09140bf78c43a130f6fffe219 (diff) | |
Merge remote-tracking branch 'origin/4.9'
Change-Id: I830c83b248b541cf4bd1a20f4cb0852b1174e0df
| -rw-r--r-- | doc/config/fossil.qdocconf | 2 | ||||
| -rw-r--r-- | plugins/fossil/fossilcommitwidget.cpp | 7 | ||||
| -rw-r--r-- | plugins/fossil/fossilcommitwidget.h | 2 | ||||
| -rw-r--r-- | plugins/fossil/fossilplugin.cpp | 6 |
4 files changed, 9 insertions, 8 deletions
diff --git a/doc/config/fossil.qdocconf b/doc/config/fossil.qdocconf index 98433df..290023f 100644 --- a/doc/config/fossil.qdocconf +++ b/doc/config/fossil.qdocconf @@ -10,7 +10,7 @@ include($$QTC_DOCS_DIR/config/qt-defines.qdocconf) sources.fileextensions = "*.qdoc" -depends += qtcreator +depends += qt-creator qhp.projects = fossil qhp.fossil.file = fossil.qhp 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) { |