diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2014-02-10 22:49:55 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2014-02-11 12:06:24 +0100 |
| commit | 292e4599aae1092abc130ef4603e9fcdbfb2b0fd (patch) | |
| tree | 1b1c6835d4e60bb292f80c4f6afc777fe6b606cc /src/plugins/git/gerrit | |
| parent | 517c3577707a9add38336a8e7a3d76c7498d0b55 (diff) | |
| download | qt-creator-292e4599aae1092abc130ef4603e9fcdbfb2b0fd.tar.gz | |
Git: Rename branch -> targetBranch in Push to Gerrit
Change-Id: I725a7e9ece2bf1e8854dc077cb93a1f7cc1eb90c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/git/gerrit')
| -rw-r--r-- | src/plugins/git/gerrit/gerritpushdialog.cpp | 18 | ||||
| -rw-r--r-- | src/plugins/git/gerrit/gerritpushdialog.ui | 8 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/plugins/git/gerrit/gerritpushdialog.cpp b/src/plugins/git/gerrit/gerritpushdialog.cpp index 4243fb9374..b9223e9e78 100644 --- a/src/plugins/git/gerrit/gerritpushdialog.cpp +++ b/src/plugins/git/gerrit/gerritpushdialog.cpp @@ -156,7 +156,7 @@ GerritPushDialog::GerritPushDialog(const QString &workingDir, const QString &rev } else { connect(m_ui->remoteComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(setRemoteBranches())); } - connect(m_ui->branchComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(setChangeRange())); + connect(m_ui->targetBranchComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(setChangeRange())); setRemoteBranches(); m_ui->reviewersLineEdit->setText(reviewerList); @@ -195,7 +195,7 @@ QString GerritPushDialog::calculateChangeRange() void GerritPushDialog::setChangeRange() { - if (m_ui->branchComboBox->itemData(m_ui->branchComboBox->currentIndex()) == 1) { + if (m_ui->targetBranchComboBox->itemData(m_ui->targetBranchComboBox->currentIndex()) == 1) { setRemoteBranches(true); return; } @@ -218,8 +218,8 @@ bool GerritPushDialog::valid() const void GerritPushDialog::setRemoteBranches(bool includeOld) { - bool blocked = m_ui->branchComboBox->blockSignals(true); - m_ui->branchComboBox->clear(); + bool blocked = m_ui->targetBranchComboBox->blockSignals(true); + m_ui->targetBranchComboBox->clear(); int i = 0; bool excluded = false; @@ -230,9 +230,9 @@ void GerritPushDialog::setRemoteBranches(bool includeOld) const BranchDate &bd = it.value(); const bool isSuggested = bd.first == m_suggestedRemoteBranch; if (includeOld || bd.second.daysTo(QDate::currentDate()) <= 60 || isSuggested) { - m_ui->branchComboBox->addItem(bd.first); + m_ui->targetBranchComboBox->addItem(bd.first); if (isSuggested) - m_ui->branchComboBox->setCurrentIndex(i); + m_ui->targetBranchComboBox->setCurrentIndex(i); ++i; } else { excluded = true; @@ -240,9 +240,9 @@ void GerritPushDialog::setRemoteBranches(bool includeOld) } } if (excluded) - m_ui->branchComboBox->addItem(tr("... Include older branches ..."), 1); + m_ui->targetBranchComboBox->addItem(tr("... Include older branches ..."), 1); setChangeRange(); - m_ui->branchComboBox->blockSignals(blocked); + m_ui->targetBranchComboBox->blockSignals(blocked); } QString GerritPushDialog::selectedRemoteName() const @@ -252,7 +252,7 @@ QString GerritPushDialog::selectedRemoteName() const QString GerritPushDialog::selectedRemoteBranchName() const { - return m_ui->branchComboBox->currentText(); + return m_ui->targetBranchComboBox->currentText(); } QString GerritPushDialog::selectedPushType() const diff --git a/src/plugins/git/gerrit/gerritpushdialog.ui b/src/plugins/git/gerrit/gerritpushdialog.ui index a4caf7dc45..3682c164c4 100644 --- a/src/plugins/git/gerrit/gerritpushdialog.ui +++ b/src/plugins/git/gerrit/gerritpushdialog.ui @@ -60,17 +60,17 @@ <widget class="QComboBox" name="remoteComboBox"/> </item> <item row="2" column="0"> - <widget class="QLabel" name="branchLabel"> + <widget class="QLabel" name="targetBranchLabel"> <property name="text"> - <string>&Branch:</string> + <string>Target &branch:</string> </property> <property name="buddy"> - <cstring>branchComboBox</cstring> + <cstring>targetBranchComboBox</cstring> </property> </widget> </item> <item row="2" column="1"> - <widget class="QComboBox" name="branchComboBox"/> + <widget class="QComboBox" name="targetBranchComboBox"/> </item> <item row="3" column="0"> <widget class="QLabel" name="topicLabel"> |