diff options
author | Petar Perisin <petar.perisin@gmail.com> | 2013-05-26 14:16:41 +0200 |
---|---|---|
committer | Petar Perisin <petar.perisin@gmail.com> | 2013-05-26 15:08:36 +0200 |
commit | b28ae0727491bba43a125cd6d0f24cbce9e586b4 (patch) | |
tree | ae0737ab43b78136193c7f898ef15937497724a8 /src/plugins/git/gerrit/gerritplugin.cpp | |
parent | e3a98141ea2509bbbd3cade6cfae223c813828f1 (diff) | |
download | qt-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/gerritplugin.cpp')
-rw-r--r-- | src/plugins/git/gerrit/gerritplugin.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp index e3403ca91e..511b92cdd8 100644 --- a/src/plugins/git/gerrit/gerritplugin.cpp +++ b/src/plugins/git/gerrit/gerritplugin.cpp @@ -79,7 +79,7 @@ namespace Internal { enum FetchMode { FetchDisplay, - FetchApply, + FetchCherryPick, FetchCheckout }; @@ -202,9 +202,9 @@ void FetchContext::processFinished(int exitCode, QProcess::ExitStatus es) m_state = WritePatchFileState; startWritePatchFile(); break; - case FetchApply: + case FetchCherryPick: case FetchCheckout: - if (m_fetchMode == FetchApply) { + if (m_fetchMode == FetchCherryPick) { cherryPick(); } else { Git::Internal::GitPlugin::instance()->gitClient()->synchronousCheckout( @@ -425,8 +425,8 @@ void GerritPlugin::openView() gd->setModal(false); connect(gd, SIGNAL(fetchDisplay(QSharedPointer<Gerrit::Internal::GerritChange>)), this, SLOT(fetchDisplay(QSharedPointer<Gerrit::Internal::GerritChange>))); - connect(gd, SIGNAL(fetchApply(QSharedPointer<Gerrit::Internal::GerritChange>)), - this, SLOT(fetchApply(QSharedPointer<Gerrit::Internal::GerritChange>))); + connect(gd, SIGNAL(fetchCherryPick(QSharedPointer<Gerrit::Internal::GerritChange>)), + this, SLOT(fetchCherryPick(QSharedPointer<Gerrit::Internal::GerritChange>))); connect(gd, SIGNAL(fetchCheckout(QSharedPointer<Gerrit::Internal::GerritChange>)), this, SLOT(fetchCheckout(QSharedPointer<Gerrit::Internal::GerritChange>))); connect(this, SIGNAL(fetchStarted(QSharedPointer<Gerrit::Internal::GerritChange>)), @@ -464,9 +464,9 @@ void GerritPlugin::fetchDisplay(const QSharedPointer<Gerrit::Internal::GerritCha fetch(change, FetchDisplay); } -void GerritPlugin::fetchApply(const QSharedPointer<Gerrit::Internal::GerritChange> &change) +void GerritPlugin::fetchCherryPick(const QSharedPointer<Gerrit::Internal::GerritChange> &change) { - fetch(change, FetchApply); + fetch(change, FetchCherryPick); } void GerritPlugin::fetchCheckout(const QSharedPointer<Gerrit::Internal::GerritChange> &change) |