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

Gerrit: Show only gerrit remotes in Push to Gerrit dialog

Browse Source 
Task-number: QTCREATORBUG-16367
Change-Id: I18e24dd0748bd64790bd8d2c0eeeee2cf1d3991a
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2017-06-29 22:04:58 +03:00
committed by Orgad Shaneh
parent 6c70f22ada
commit 9df86c2e67
7 changed files with 64 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/plugins/git/gerrit/gerritremotechooser.cpp
View File

@@ -51,6 +51,7 @@ GerritRemoteChooser::GerritRemoteChooser(QWidget *parent) :
m_remoteComboBox->setMinimumSize(QSize(40, 0));
horizontalLayout->addWidget(m_remoteComboBox);
horizontalLayout->setMargin(0);
m_resetRemoteButton = new QToolButton(this);
m_resetRemoteButton->setToolTip(tr("Refresh Remote Servers"));
@@ -74,6 +75,22 @@ void GerritRemoteChooser::setParameters(QSharedPointer<GerritParameters> paramet
m_parameters = parameters;
}
void GerritRemoteChooser::setFallbackEnabled(bool value)
{
m_enableFallback = value;
}
bool GerritRemoteChooser::setCurrentRemote(const QString &remoteName)
{
for (int i = 0, total = m_remoteComboBox->count(); i < total; ++i) {
if (m_remotes[i].first == remoteName) {
m_remoteComboBox->setCurrentIndex(i);
return true;
}
}
return false;
}
bool GerritRemoteChooser::updateRemotes(bool forceReload)
{
QTC_ASSERT(!m_repository.isEmpty() || !m_parameters, return false);
@@ -91,7 +108,9 @@ bool GerritRemoteChooser::updateRemotes(bool forceReload)
continue;
addRemote(server, mapIt.key());
}
addRemote(m_parameters->server, tr("Fallback"));
if (m_enableFallback)
addRemote(m_parameters->server, tr("Fallback"));
m_remoteComboBox->setEnabled(m_remoteComboBox->count() > 1);
m_updatingRemotes = false;
handleRemoteChanged();
return true;
@@ -116,6 +135,18 @@ GerritServer GerritRemoteChooser::currentServer() const
return m_remotes[index].second;
}
QString GerritRemoteChooser::currentRemoteName() const
{
const int index = m_remoteComboBox->currentIndex();
QTC_ASSERT(index >= 0 && index < int(m_remotes.size()), return QString());
return m_remotes[index].first;
}
bool GerritRemoteChooser::isEmpty() const
{
return m_remotes.empty();
}
void GerritRemoteChooser::handleRemoteChanged()
{
if (m_updatingRemotes || m_remotes.empty())