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

Gerrit Dialog - renamed "Apply" to "Cherry Pick"

Browse Source 
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>
This commit is contained in:
Petar Perisin
2013-05-26 14:16:41 +02:00
parent e3a98141ea
commit b28ae07274
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -162,7 +162,7 @@ GerritDialog::GerritDialog(const QSharedPointer<GerritParameters> &p,
detailsLayout->addLayout(repoPathLayout); detailsLayout->addLayout(repoPathLayout);
m_displayButton = addActionButton(QString(), SLOT(slotFetchDisplay())); 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_checkoutButton = addActionButton(QString(), SLOT(slotFetchCheckout()));
m_refreshButton = addActionButton(tr("Refresh"), SLOT(slotRefresh())); m_refreshButton = addActionButton(tr("Refresh"), SLOT(slotRefresh()));
@@ -203,11 +203,11 @@ void GerritDialog::displayRepositoryPath()
m_repositoryChooser->setPath(m_parameters->repositoryPath); m_repositoryChooser->setPath(m_parameters->repositoryPath);
if (m_parameters->promptPath) { if (m_parameters->promptPath) {
m_displayButton->setText(tr("Diff...")); m_displayButton->setText(tr("Diff..."));
m_applyButton->setText(tr("Apply...")); m_cherryPickButton->setText(tr("Cherry Pick..."));
m_checkoutButton->setText(tr("Checkout...")); m_checkoutButton->setText(tr("Checkout..."));
} else { } else {
m_displayButton->setText(tr("Diff")); m_displayButton->setText(tr("Diff"));
m_applyButton->setText(tr("Apply")); m_cherryPickButton->setText(tr("Cherry Pick"));
m_checkoutButton->setText(tr("Checkout")); m_checkoutButton->setText(tr("Checkout"));
} }
} }
@@ -262,10 +262,10 @@ void GerritDialog::slotFetchDisplay()
emit fetchDisplay(m_model->change(item->row())); emit fetchDisplay(m_model->change(item->row()));
} }
void GerritDialog::slotFetchApply() void GerritDialog::slotFetchCherryPick()
{ {
if (const QStandardItem *item = currentItem()) if (const QStandardItem *item = currentItem())
emit fetchApply(m_model->change(item->row())); emit fetchCherryPick(m_model->change(item->row()));
} }
void GerritDialog::slotFetchCheckout() void GerritDialog::slotFetchCheckout()
@@ -304,7 +304,7 @@ void GerritDialog::updateButtons()
{ {
const bool enabled = !m_fetchRunning && m_treeView->selectionModel()->currentIndex().isValid(); const bool enabled = !m_fetchRunning && m_treeView->selectionModel()->currentIndex().isValid();
m_displayButton->setEnabled(enabled); m_displayButton->setEnabled(enabled);
m_applyButton->setEnabled(enabled); m_cherryPickButton->setEnabled(enabled);
m_checkoutButton->setEnabled(enabled); m_checkoutButton->setEnabled(enabled);
} }
@@ -328,7 +328,7 @@ void GerritDialog::fetchStarted(const QSharedPointer<Gerrit::Internal::GerritCha
updateButtons(); updateButtons();
const QString toolTip = tr("Fetching \"%1\"...").arg(change->title); const QString toolTip = tr("Fetching \"%1\"...").arg(change->title);
m_displayButton->setToolTip(toolTip); m_displayButton->setToolTip(toolTip);
m_applyButton->setToolTip(toolTip); m_cherryPickButton->setToolTip(toolTip);
m_checkoutButton->setToolTip(toolTip); m_checkoutButton->setToolTip(toolTip);
} }
@@ -337,7 +337,7 @@ void GerritDialog::fetchFinished()
m_fetchRunning = false; m_fetchRunning = false;
updateButtons(); updateButtons();
m_displayButton->setToolTip(QString()); m_displayButton->setToolTip(QString());
m_applyButton->setToolTip(QString()); m_cherryPickButton->setToolTip(QString());
m_checkoutButton->setToolTip(QString()); m_checkoutButton->setToolTip(QString());
} }

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

@@ -83,7 +83,7 @@ public:
signals: signals:
void fetchDisplay(const QSharedPointer<Gerrit::Internal::GerritChange> &); void fetchDisplay(const QSharedPointer<Gerrit::Internal::GerritChange> &);
void fetchApply(const QSharedPointer<Gerrit::Internal::GerritChange> &); void fetchCherryPick(const QSharedPointer<Gerrit::Internal::GerritChange> &);
void fetchCheckout(const QSharedPointer<Gerrit::Internal::GerritChange> &); void fetchCheckout(const QSharedPointer<Gerrit::Internal::GerritChange> &);
public slots: public slots:
@@ -98,7 +98,7 @@ private slots:
void slotDoubleClicked(const QModelIndex &); void slotDoubleClicked(const QModelIndex &);
void slotRefreshStateChanged(bool); void slotRefreshStateChanged(bool);
void slotFetchDisplay(); void slotFetchDisplay();
void slotFetchApply(); void slotFetchCherryPick();
void slotFetchCheckout(); void slotFetchCheckout();
void slotRefresh(); void slotRefresh();
void displayRepositoryPath(); void displayRepositoryPath();
@@ -121,7 +121,7 @@ private:
Utils::PathChooser *m_repositoryChooser; Utils::PathChooser *m_repositoryChooser;
QDialogButtonBox *m_buttonBox; QDialogButtonBox *m_buttonBox;
QPushButton *m_displayButton; QPushButton *m_displayButton;
QPushButton *m_applyButton; QPushButton *m_cherryPickButton;
QPushButton *m_checkoutButton; QPushButton *m_checkoutButton;
QPushButton *m_refreshButton; QPushButton *m_refreshButton;
QLabel *m_repositoryChooserLabel; QLabel *m_repositoryChooserLabel;

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

@@ -79,7 +79,7 @@ namespace Internal {
enum FetchMode enum FetchMode
{ {
FetchDisplay, FetchDisplay,
FetchApply, FetchCherryPick,
FetchCheckout FetchCheckout
}; };
@@ -202,9 +202,9 @@ void FetchContext::processFinished(int exitCode, QProcess::ExitStatus es)
m_state = WritePatchFileState; m_state = WritePatchFileState;
startWritePatchFile(); startWritePatchFile();
break; break;
case FetchApply: case FetchCherryPick:
case FetchCheckout: case FetchCheckout:
if (m_fetchMode == FetchApply) { if (m_fetchMode == FetchCherryPick) {
cherryPick(); cherryPick();
} else { } else {
Git::Internal::GitPlugin::instance()->gitClient()->synchronousCheckout( Git::Internal::GitPlugin::instance()->gitClient()->synchronousCheckout(
@@ -425,8 +425,8 @@ void GerritPlugin::openView()
gd->setModal(false); gd->setModal(false);
connect(gd, SIGNAL(fetchDisplay(QSharedPointer<Gerrit::Internal::GerritChange>)), connect(gd, SIGNAL(fetchDisplay(QSharedPointer<Gerrit::Internal::GerritChange>)),
this, SLOT(fetchDisplay(QSharedPointer<Gerrit::Internal::GerritChange>))); this, SLOT(fetchDisplay(QSharedPointer<Gerrit::Internal::GerritChange>)));
connect(gd, SIGNAL(fetchApply(QSharedPointer<Gerrit::Internal::GerritChange>)), connect(gd, SIGNAL(fetchCherryPick(QSharedPointer<Gerrit::Internal::GerritChange>)),
this, SLOT(fetchApply(QSharedPointer<Gerrit::Internal::GerritChange>))); this, SLOT(fetchCherryPick(QSharedPointer<Gerrit::Internal::GerritChange>)));
connect(gd, SIGNAL(fetchCheckout(QSharedPointer<Gerrit::Internal::GerritChange>)), connect(gd, SIGNAL(fetchCheckout(QSharedPointer<Gerrit::Internal::GerritChange>)),
this, SLOT(fetchCheckout(QSharedPointer<Gerrit::Internal::GerritChange>))); this, SLOT(fetchCheckout(QSharedPointer<Gerrit::Internal::GerritChange>)));
connect(this, SIGNAL(fetchStarted(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); 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) void GerritPlugin::fetchCheckout(const QSharedPointer<Gerrit::Internal::GerritChange> &change)

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

@@ -70,7 +70,7 @@ public:
public slots: public slots:
void fetchDisplay(const QSharedPointer<Gerrit::Internal::GerritChange> &change); void fetchDisplay(const QSharedPointer<Gerrit::Internal::GerritChange> &change);
void fetchApply(const QSharedPointer<Gerrit::Internal::GerritChange> &change); void fetchCherryPick(const QSharedPointer<Gerrit::Internal::GerritChange> &change);
void fetchCheckout(const QSharedPointer<Gerrit::Internal::GerritChange> &change); void fetchCheckout(const QSharedPointer<Gerrit::Internal::GerritChange> &change);
void updateActions(bool hasTopLevel); void updateActions(bool hasTopLevel);