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

Gerrit: Refresh when the dialog is re-opened

Browse Source 
Task-number: QTCREATORBUG-10028
Change-Id: I60d91d88df5596f7d34605ed28d0cc6ef3427a8c
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
This commit is contained in:
Orgad Shaneh
2017-06-02 09:42:09 +03:00
committed by Orgad Shaneh
parent 2bf14c7614
commit d64fa1ee48
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/git/gerrit/gerritdialog.cpp
View File

@@ -82,7 +82,7 @@ GerritDialog::GerritDialog(const QSharedPointer<GerritParameters> &p,
m_ui->filterLineEdit->setFiltering(true); m_ui->filterLineEdit->setFiltering(true);
connect(m_ui->filterLineEdit, &Utils::FancyLineEdit::filterChanged, connect(m_ui->filterLineEdit, &Utils::FancyLineEdit::filterChanged,
m_filterModel, &QSortFilterProxyModel::setFilterFixedString); m_filterModel, &QSortFilterProxyModel::setFilterFixedString);
connect(m_ui->queryLineEdit, &QLineEdit::returnPressed, this, &GerritDialog::slotRefresh); connect(m_ui->queryLineEdit, &QLineEdit::returnPressed, this, &GerritDialog::refresh);
connect(m_model, &GerritModel::stateChanged, m_ui->queryLineEdit, &Utils::FancyLineEdit::validate); connect(m_model, &GerritModel::stateChanged, m_ui->queryLineEdit, &Utils::FancyLineEdit::validate);
connect(m_ui->remoteComboBox, &QComboBox::currentTextChanged, connect(m_ui->remoteComboBox, &QComboBox::currentTextChanged,
this, &GerritDialog::remoteChanged); this, &GerritDialog::remoteChanged);
@@ -118,7 +118,7 @@ GerritDialog::GerritDialog(const QSharedPointer<GerritParameters> &p,
m_displayButton = addActionButton(tr("&Show"), [this]() { slotFetchDisplay(); }); m_displayButton = addActionButton(tr("&Show"), [this]() { slotFetchDisplay(); });
m_cherryPickButton = addActionButton(tr("Cherry &Pick"), [this]() { slotFetchCherryPick(); }); m_cherryPickButton = addActionButton(tr("Cherry &Pick"), [this]() { slotFetchCherryPick(); });
m_checkoutButton = addActionButton(tr("C&heckout"), [this]() { slotFetchCheckout(); }); m_checkoutButton = addActionButton(tr("C&heckout"), [this]() { slotFetchCheckout(); });
m_refreshButton = addActionButton(tr("&Refresh"), [this]() { slotRefresh(); }); m_refreshButton = addActionButton(tr("&Refresh"), [this]() { refresh(); });
connect(m_model, &GerritModel::refreshStateChanged, connect(m_model, &GerritModel::refreshStateChanged,
m_refreshButton, &QWidget::setDisabled); m_refreshButton, &QWidget::setDisabled);
@@ -214,7 +214,7 @@ void GerritDialog::slotFetchCheckout()
emit fetchCheckout(m_model->change(index)); emit fetchCheckout(m_model->change(index));
} }
void GerritDialog::slotRefresh() void GerritDialog::refresh()
{ {
const QString &query = m_ui->queryLineEdit->text().trimmed(); const QString &query = m_ui->queryLineEdit->text().trimmed();
updateCompletions(query); updateCompletions(query);
@@ -232,7 +232,7 @@ void GerritDialog::remoteChanged()
return; return;
} }
*m_server = server; *m_server = server;
slotRefresh(); refresh();
} }
void GerritDialog::updateRemotes(bool forceReload) void GerritDialog::updateRemotes(bool forceReload)

2
src/plugins/git/gerrit/gerritdialog.h
View File

@@ -61,6 +61,7 @@ public:
void setCurrentPath(const QString &path); void setCurrentPath(const QString &path);
void fetchStarted(const QSharedPointer<Gerrit::Internal::GerritChange> &change); void fetchStarted(const QSharedPointer<Gerrit::Internal::GerritChange> &change);
void fetchFinished(); void fetchFinished();
void refresh();
signals: signals:
void fetchDisplay(const QSharedPointer<Gerrit::Internal::GerritChange> &); void fetchDisplay(const QSharedPointer<Gerrit::Internal::GerritChange> &);
@@ -74,7 +75,6 @@ private:
void slotFetchDisplay(); void slotFetchDisplay();
void slotFetchCherryPick(); void slotFetchCherryPick();
void slotFetchCheckout(); void slotFetchCheckout();
void slotRefresh();
void remoteChanged(); void remoteChanged();
void updateRemotes(bool forceReload = false); void updateRemotes(bool forceReload = false);
void addRemote(const GerritServer &server, const QString &name); void addRemote(const GerritServer &server, const QString &name);

1
src/plugins/git/gerrit/gerritplugin.cpp
View File

@@ -377,6 +377,7 @@ void GerritPlugin::openView()
m_dialog->setWindowState(state & ~Qt::WindowMinimized); m_dialog->setWindowState(state & ~Qt::WindowMinimized);
m_dialog->show(); m_dialog->show();
m_dialog->raise(); m_dialog->raise();
m_dialog->refresh();
} }
void GerritPlugin::push() void GerritPlugin::push()