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

Gerrit: Store also remote name in remote chooser

Browse Source 
Separate name/server data from the combo box.

Task-number: QTCREATORBUG-16367
Change-Id: Ie7bfbe19a07b948f5d170846909092be53e617bd
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2017-06-29 22:03:25 +03:00
committed by Orgad Shaneh
parent 5a848aa188
commit caaf370660
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,8 +35,6 @@
#include <QFileInfo> #include <QFileInfo>
#include <QHBoxLayout> #include <QHBoxLayout>
Q_DECLARE_METATYPE(Gerrit::Internal::GerritServer);
namespace Gerrit { namespace Gerrit {
namespace Internal { namespace Internal {
@@ -78,8 +76,9 @@ void GerritRemoteChooser::setParameters(QSharedPointer<GerritParameters> paramet
bool GerritRemoteChooser::updateRemotes(bool forceReload) bool GerritRemoteChooser::updateRemotes(bool forceReload)
{ {
QTC_ASSERT(!m_repository.isEmpty(), return false); QTC_ASSERT(!m_repository.isEmpty() || !m_parameters, return false);
m_remoteComboBox->clear(); m_remoteComboBox->clear();
m_remotes.clear();
m_updatingRemotes = true; m_updatingRemotes = true;
QString errorMessage; // Mute errors. We'll just fallback to the defaults QString errorMessage; // Mute errors. We'll just fallback to the defaults
QMap<QString, QString> remotesList = QMap<QString, QString> remotesList =
@@ -100,24 +99,26 @@ bool GerritRemoteChooser::updateRemotes(bool forceReload)
void GerritRemoteChooser::addRemote(const GerritServer &server, const QString &name) void GerritRemoteChooser::addRemote(const GerritServer &server, const QString &name)
{ {
for (int i = 0, total = m_remoteComboBox->count(); i < total; ++i) { for (auto remote : m_remotes) {
const GerritServer s = m_remoteComboBox->itemData(i).value<GerritServer>(); if (remote.second == server)
if (s == server)
return; return;
} }
m_remoteComboBox->addItem(server.host + QString(" (%1)").arg(name), QVariant::fromValue(server)); m_remoteComboBox->addItem(server.host + QString(" (%1)").arg(name));
m_remotes.push_back({ name, server });
if (name == "gerrit") if (name == "gerrit")
m_remoteComboBox->setCurrentIndex(m_remoteComboBox->count() - 1); m_remoteComboBox->setCurrentIndex(m_remoteComboBox->count() - 1);
} }
GerritServer GerritRemoteChooser::currentServer() const GerritServer GerritRemoteChooser::currentServer() const
{ {
return m_remoteComboBox->currentData().value<GerritServer>(); const int index = m_remoteComboBox->currentIndex();
QTC_ASSERT(index >= 0 && index < int(m_remotes.size()), return GerritServer());
return m_remotes[index].second;
} }
void GerritRemoteChooser::handleRemoteChanged() void GerritRemoteChooser::handleRemoteChanged()
{ {
if (m_updatingRemotes || m_remoteComboBox->count() == 0) if (m_updatingRemotes || m_remotes.empty())
return; return;
emit remoteChanged(); emit remoteChanged();
} }

7
src/plugins/git/gerrit/gerritremotechooser.h
View File

@@ -25,15 +25,18 @@
#pragma once #pragma once
#include "gerritserver.h"
#include <QComboBox> #include <QComboBox>
#include <QSharedPointer> #include <QSharedPointer>
#include <QToolButton> #include <QToolButton>
#include <QWidget> #include <QWidget>
#include <vector>
namespace Gerrit { namespace Gerrit {
namespace Internal { namespace Internal {
class GerritServer;
class GerritParameters; class GerritParameters;
class GerritRemoteChooser : public QWidget class GerritRemoteChooser : public QWidget
@@ -60,6 +63,8 @@ private:
QComboBox *m_remoteComboBox = nullptr; QComboBox *m_remoteComboBox = nullptr;
QToolButton *m_resetRemoteButton = nullptr; QToolButton *m_resetRemoteButton = nullptr;
bool m_updatingRemotes = false; bool m_updatingRemotes = false;
using NameAndServer = std::pair<QString, GerritServer>;
std::vector<NameAndServer> m_remotes;
}; };
} // namespace Internal } // namespace Internal