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

Gerrit: Remove the "Always prompt" setting

Browse Source 
It's confusing. The user can just choose the path in the dialog rather
than in a popup

Change-Id: I91422ec9baf5508d3e3d2e552afc6b955fd84748
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2014-04-02 23:12:39 +03:00
committed by Orgad Shaneh
parent efecd15b1e
commit f7db3258b4
6 changed files with 5 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -164,9 +164,9 @@ GerritDialog::GerritDialog(const QSharedPointer<GerritParameters> &p,
repoPathLayout->addWidget(m_repositoryChooser);
detailsLayout->addLayout(repoPathLayout);
m_displayButton = addActionButton(QString(), SLOT(slotFetchDisplay()));
m_cherryPickButton = addActionButton(QString(), SLOT(slotFetchCherryPick()));
m_checkoutButton = addActionButton(QString(), SLOT(slotFetchCheckout()));
m_displayButton = addActionButton(tr("&Show"), SLOT(slotFetchDisplay()));
m_cherryPickButton = addActionButton(tr("Cherry &Pick"), SLOT(slotFetchCherryPick()));
m_checkoutButton = addActionButton(tr("&Checkout"), SLOT(slotFetchCheckout()));
m_refreshButton = addActionButton(tr("&Refresh"), SLOT(slotRefresh()));
connect(m_model, SIGNAL(refreshStateChanged(bool)),
@@ -200,19 +200,8 @@ QString GerritDialog::repositoryPath() const
void GerritDialog::displayRepositoryPath()
{
QTC_ASSERT(m_parameters, return);
m_repositoryChooser->setVisible(!m_parameters->promptPath);
m_repositoryChooserLabel->setVisible(!m_parameters->promptPath);
if (m_repositoryChooser->path().isEmpty())
m_repositoryChooser->setPath(m_parameters->repositoryPath);
if (m_parameters->promptPath) {
m_displayButton->setText(tr("&Show..."));
m_cherryPickButton->setText(tr("Cherry &Pick..."));
m_checkoutButton->setText(tr("&Checkout..."));
} else {
m_displayButton->setText(tr("&Show"));
m_cherryPickButton->setText(tr("Cherry &Pick"));
m_checkoutButton->setText(tr("&Checkout"));
}
}
void GerritDialog::showEvent(QShowEvent *event)