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

Merge remote-tracking branch 'origin/2.5'

Browse Source
This commit is contained in:
Eike Ziller
2012-03-05 08:59:13 +01:00
parent e6ea2db67e 117e468410
commit 09e0c4899b
16 changed files with 436 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/coreplugin/dialogs/newdialog.cpp
View File

@@ -269,18 +269,18 @@ void NewDialog::setWizards(QList<IWizard*> wizards)
QStringList availablePlatforms = IWizard::allAvailablePlatforms();
if (availablePlatforms.count() > 1) {
m_ui->comboBox->addItem(tr("All templates"), QString());
m_ui->comboBox->addItem(tr("All Templates"), QString());
foreach (const QString &platform, availablePlatforms) {
const QString displayNameForPlatform = IWizard::displayNameForPlatform(platform);
m_ui->comboBox->addItem(tr("%1 templates").arg(displayNameForPlatform), platform);
m_ui->comboBox->addItem(tr("%1 Templates").arg(displayNameForPlatform), platform);
}
} else {
if (availablePlatforms.isEmpty()) {
m_ui->comboBox->addItem(tr("All templates"), QString());
m_ui->comboBox->addItem(tr("All Templates"), QString());
} else {
const QString platform = availablePlatforms.first();
const QString displayNameForPlatform = IWizard::displayNameForPlatform(platform);
m_ui->comboBox->addItem(tr("%1 templates").arg(displayNameForPlatform), platform);
m_ui->comboBox->addItem(tr("%1 Templates").arg(displayNameForPlatform), platform);
}
m_ui->comboBox->setDisabled(true);
}