diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-10-11 05:44:30 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2017-10-13 13:06:14 +0000 |
| commit | 5e798b0bf4d311779774aa40fbe0884dd9ca3b51 (patch) | |
| tree | 63fd39e0c16839e7d55fc7d6e6c5b821f68e93e8 /src/plugins/git/gerrit/gerritpushdialog.cpp | |
| parent | d717ab4fdf91e643f289bb957246c579a545fd1e (diff) | |
| download | qt-creator-5e798b0bf4d311779774aa40fbe0884dd9ca3b51.tar.gz | |
Gerrit: Improve error message when Gerrit remote is missing
Task-number: QTCREATORBUG-18980
Change-Id: I99336732d59136f9aec9fc0a97fb3135e9c43f65
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/git/gerrit/gerritpushdialog.cpp')
| -rw-r--r-- | src/plugins/git/gerrit/gerritpushdialog.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/git/gerrit/gerritpushdialog.cpp b/src/plugins/git/gerrit/gerritpushdialog.cpp index d293373e0b..54c7f1f6af 100644 --- a/src/plugins/git/gerrit/gerritpushdialog.cpp +++ b/src/plugins/git/gerrit/gerritpushdialog.cpp @@ -135,8 +135,10 @@ GerritPushDialog::GerritPushDialog(const QString &workingDir, const QString &rev initRemoteBranches(); - if (m_ui->remoteComboBox->isEmpty()) + if (m_ui->remoteComboBox->isEmpty()) { + m_initErrorMessage = tr("Cannot find a Gerrit remote. Add one and try again."); return; + } m_ui->localBranchComboBox->init(workingDir); connect(m_ui->localBranchComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), @@ -158,8 +160,6 @@ GerritPushDialog::GerritPushDialog(const QString &workingDir, const QString &rev connect(m_ui->remoteComboBox, &GerritRemoteChooser::remoteChanged, this, [this] { setRemoteBranches(); }); - - m_isValid = true; } GerritPushDialog::~GerritPushDialog() @@ -209,9 +209,9 @@ void GerritPushDialog::setChangeRange() tr("Number of commits between %1 and %2: %3").arg(branch, remote, range)); } -bool GerritPushDialog::isValid() const +QString GerritPushDialog::initErrorMessage() const { - return m_isValid; + return m_initErrorMessage; } void GerritPushDialog::storeTopic() |