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

Merge remote-tracking branch 'origin/3.0'

Browse Source
This commit is contained in:
Eike Ziller
2013-10-29 08:17:05 +01:00
parent cd041f3f93 b926435576
commit 242b7bd209
155 changed files with 3464 additions and 2565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,7 +101,7 @@ GerritDialog::GerritDialog(const QSharedPointer<GerritParameters> &p,
, m_filterLineEdit(new Utils::FilterLineEdit)
, m_repositoryChooser(new Utils::PathChooser)
, m_buttonBox(new QDialogButtonBox(QDialogButtonBox::Close))
, m_repositoryChooserLabel(new QLabel(tr("Apply in: "), this))
, m_repositoryChooserLabel(new QLabel(tr("Apply in:") + QLatin1Char(' '), this))
, m_fetchRunning(false)
{
setWindowTitle(tr("Gerrit %1@%2").arg(p->user, p->host));

4
src/plugins/git/gerrit/gerritpushdialog.cpp
View File

@@ -37,6 +37,7 @@
#include <QDateTime>
#include <QDir>
#include <QRegExpValidator>
namespace Gerrit {
namespace Internal {
@@ -156,6 +157,9 @@ GerritPushDialog::GerritPushDialog(const QString &workingDir, const QString &rev
connect(m_ui->branchComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(setChangeRange()));
setRemoteBranches();
m_ui->reviewersLineEdit->setText(reviewerList);
m_ui->topicLineEdit->setValidator(new QRegExpValidator(QRegExp(QLatin1String("^\\S+$")), this));
m_valid = true;
}

4
src/plugins/git/gitclient.cpp
View File

@@ -2767,7 +2767,7 @@ void GitClient::continuePreviousGitCommand(const QString &workingDirectory,
== GitClient::StatusChanged;
}
if (!hasChanges)
msgBoxText.prepend(tr("No changes found. "));
msgBoxText.prepend(tr("No changes found.") + QLatin1Char(' '));
QMessageBox msgBox(QMessageBox::Question, msgBoxTitle, msgBoxText,
QMessageBox::NoButton, Core::ICore::mainWindow());
if (hasChanges || isRebase)
@@ -2808,7 +2808,7 @@ QString GitClient::extendedShowDescription(const QString &workingDirectory, cons
if (branchCount > 20) {
const int leave = 10;
//: Displayed after the untranslated message "Branches: branch1, branch2 'and %n more'" in git show.
moreBranches = tr(" and %n more", 0, branchCount - leave);
moreBranches = QLatin1Char(' ') + tr("and %n more", 0, branchCount - leave);
branches.erase(branches.begin() + leave, branches.end());
}
if (!branches.isEmpty()) {