summaryrefslogtreecommitdiff
path: root/src/plugins/git/gerrit/gerritdialog.cpp
diff options
context:
space:
mode:
authorPetar Perisin <petar.perisin@gmail.com>2013-05-26 14:16:41 +0200
committerPetar Perisin <petar.perisin@gmail.com>2013-05-26 15:08:36 +0200
commitb28ae0727491bba43a125cd6d0f24cbce9e586b4 (patch)
treeae0737ab43b78136193c7f898ef15937497724a8 /src/plugins/git/gerrit/gerritdialog.cpp
parente3a98141ea2509bbbd3cade6cfae223c813828f1 (diff)
downloadqt-creator-b28ae0727491bba43a125cd6d0f24cbce9e586b4.tar.gz
Gerrit Dialog - renamed "Apply" to "Cherry Pick"
Cherry pick is git command that everyone who works with git knows. First time I saw "Apply" I thought it was some git or gerrit command unknown to me. Renaming it to "Cherry Pick" makes dialog more clear, since user knows what command will execute when button is pressed. Change-Id: Ifbcad697ef5f5909a36dc008f716025d48a26ad0 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/git/gerrit/gerritdialog.cpp')
-rw-r--r--src/plugins/git/gerrit/gerritdialog.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/git/gerrit/gerritdialog.cpp b/src/plugins/git/gerrit/gerritdialog.cpp
index 7b1f55e8cf..28512fcaac 100644
--- a/src/plugins/git/gerrit/gerritdialog.cpp
+++ b/src/plugins/git/gerrit/gerritdialog.cpp
@@ -162,7 +162,7 @@ GerritDialog::GerritDialog(const QSharedPointer<GerritParameters> &p,
detailsLayout->addLayout(repoPathLayout);
m_displayButton = addActionButton(QString(), SLOT(slotFetchDisplay()));
- m_applyButton = addActionButton(QString(), SLOT(slotFetchApply()));
+ m_cherryPickButton = addActionButton(QString(), SLOT(slotFetchCherryPick()));
m_checkoutButton = addActionButton(QString(), SLOT(slotFetchCheckout()));
m_refreshButton = addActionButton(tr("Refresh"), SLOT(slotRefresh()));
@@ -203,11 +203,11 @@ void GerritDialog::displayRepositoryPath()
m_repositoryChooser->setPath(m_parameters->repositoryPath);
if (m_parameters->promptPath) {
m_displayButton->setText(tr("Diff..."));
- m_applyButton->setText(tr("Apply..."));
+ m_cherryPickButton->setText(tr("Cherry Pick..."));
m_checkoutButton->setText(tr("Checkout..."));
} else {
m_displayButton->setText(tr("Diff"));
- m_applyButton->setText(tr("Apply"));
+ m_cherryPickButton->setText(tr("Cherry Pick"));
m_checkoutButton->setText(tr("Checkout"));
}
}
@@ -262,10 +262,10 @@ void GerritDialog::slotFetchDisplay()
emit fetchDisplay(m_model->change(item->row()));
}
-void GerritDialog::slotFetchApply()
+void GerritDialog::slotFetchCherryPick()
{
if (const QStandardItem *item = currentItem())
- emit fetchApply(m_model->change(item->row()));
+ emit fetchCherryPick(m_model->change(item->row()));
}
void GerritDialog::slotFetchCheckout()
@@ -304,7 +304,7 @@ void GerritDialog::updateButtons()
{
const bool enabled = !m_fetchRunning && m_treeView->selectionModel()->currentIndex().isValid();
m_displayButton->setEnabled(enabled);
- m_applyButton->setEnabled(enabled);
+ m_cherryPickButton->setEnabled(enabled);
m_checkoutButton->setEnabled(enabled);
}
@@ -328,7 +328,7 @@ void GerritDialog::fetchStarted(const QSharedPointer<Gerrit::Internal::GerritCha
updateButtons();
const QString toolTip = tr("Fetching \"%1\"...").arg(change->title);
m_displayButton->setToolTip(toolTip);
- m_applyButton->setToolTip(toolTip);
+ m_cherryPickButton->setToolTip(toolTip);
m_checkoutButton->setToolTip(toolTip);
}
@@ -337,7 +337,7 @@ void GerritDialog::fetchFinished()
m_fetchRunning = false;
updateButtons();
m_displayButton->setToolTip(QString());
- m_applyButton->setToolTip(QString());
+ m_cherryPickButton->setToolTip(QString());
m_checkoutButton->setToolTip(QString());
}