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

tr()-Fixes in QNX plugin.

Browse Source 
Fix capitalization of message box titles, fix some message to
be in line with QtSupport.

Change-Id: I6ff2b930fa8e10ef164588d76ff233e1e57ae63f
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Friedemann Kleint
2013-01-29 14:59:37 +01:00
parent f556e8f5f2
commit 719d227bba
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qnx/bardescriptoreditorwidget.cpp
View File

@@ -472,7 +472,7 @@ void BarDescriptorEditorWidget::appendSplashScreenDelayed(const QString &splashS
void BarDescriptorEditorWidget::browseForSplashScreen() void BarDescriptorEditorWidget::browseForSplashScreen()
{ {
const QString fileName = QFileDialog::getOpenFileName(this, tr("Select splash screen"), QString(), tr("Images (*.jpg *.png)")); const QString fileName = QFileDialog::getOpenFileName(this, tr("Select Splash Screen"), QString(), tr("Images (*.jpg *.png)"));
if (fileName.isEmpty()) if (fileName.isEmpty())
return; return;
@@ -622,7 +622,7 @@ BarDescriptorEditor *BarDescriptorEditorWidget::createEditor()
void BarDescriptorEditorWidget::addNewAsset() void BarDescriptorEditorWidget::addNewAsset()
{ {
const QString fileName = QFileDialog::getOpenFileName(this, tr("Select file to add")); const QString fileName = QFileDialog::getOpenFileName(this, tr("Select File to Add"));
if (fileName.isEmpty()) if (fileName.isEmpty())
return; return;

10
src/plugins/qnx/blackberryconfiguration.cpp
View File

@@ -107,7 +107,7 @@ bool BlackBerryConfiguration::setConfig(const QString &ndkPath)
if (!simulatorGdbPath.toFileInfo().exists()) if (!simulatorGdbPath.toFileInfo().exists())
errorMessage += tr("- No Gdb debugger found for BB10 Simulator"); errorMessage += tr("- No Gdb debugger found for BB10 Simulator");
QMessageBox::warning(0, tr("Cannot setup BB10 Configuartion"), QMessageBox::warning(0, tr("Cannot Setup BB10 Configuration"),
errorMessage, QMessageBox::Ok); errorMessage, QMessageBox::Ok);
return false; return false;
} }
@@ -175,14 +175,14 @@ QtSupport::BaseQtVersion *BlackBerryConfiguration::createQtVersion()
QString cpuDir = m_config.qnxEnv.value(QLatin1String("CPUVARDIR")); QString cpuDir = m_config.qnxEnv.value(QLatin1String("CPUVARDIR"));
QtSupport::BaseQtVersion *version = QtSupport::QtVersionManager::instance()->qtVersionForQMakeBinary(m_config.qmakeBinaryFile); QtSupport::BaseQtVersion *version = QtSupport::QtVersionManager::instance()->qtVersionForQMakeBinary(m_config.qmakeBinaryFile);
if (version) { if (version) {
QMessageBox::warning(0, tr("Qt known"), QMessageBox::warning(0, tr("Qt Version Already Known"),
tr("This Qt version was already registered"), QMessageBox::Ok); tr("This Qt version was already registered"), QMessageBox::Ok);
return version; return version;
} }
version = new BlackBerryQtVersion(QnxUtils::cpudirToArch(cpuDir), m_config.qmakeBinaryFile, false, QString(), m_config.ndkPath); version = new BlackBerryQtVersion(QnxUtils::cpudirToArch(cpuDir), m_config.qmakeBinaryFile, false, QString(), m_config.ndkPath);
if (!version) { if (!version) {
QMessageBox::warning(0, tr("Qt not valid"), QMessageBox::warning(0, tr("Invalid Qt version"),
tr("Unable to add BlackBerry Qt version"), QMessageBox::Ok); tr("Unable to add BlackBerry Qt version"), QMessageBox::Ok);
return 0; return 0;
} }
@@ -199,7 +199,7 @@ ProjectExplorer::GccToolChain *BlackBerryConfiguration::createGccToolChain()
foreach (ProjectExplorer::ToolChain* tc, ProjectExplorer::ToolChainManager::instance()->toolChains()) { foreach (ProjectExplorer::ToolChain* tc, ProjectExplorer::ToolChainManager::instance()->toolChains()) {
if (tc->compilerCommand() == m_config.gccCompiler) { if (tc->compilerCommand() == m_config.gccCompiler) {
QMessageBox::warning(0, tr("Compiler known"), QMessageBox::warning(0, tr("Compiler Already Known"),
tr("This Compiler was already registered"), QMessageBox::Ok); tr("This Compiler was already registered"), QMessageBox::Ok);
return dynamic_cast<ProjectExplorer::GccToolChain*>(tc); return dynamic_cast<ProjectExplorer::GccToolChain*>(tc);
} }
@@ -226,7 +226,7 @@ ProjectExplorer::Kit *BlackBerryConfiguration::createKit(QnxArchitecture arch, Q
if ((arch == X86 && Qt4ProjectManager::QmakeKitInformation::mkspec(kit).toString() == QString::fromLatin1("blackberry-x86-qcc") if ((arch == X86 && Qt4ProjectManager::QmakeKitInformation::mkspec(kit).toString() == QString::fromLatin1("blackberry-x86-qcc")
&& Debugger::DebuggerKitInformation::debuggerCommand(kit) == m_config.simulatorDebuger) && Debugger::DebuggerKitInformation::debuggerCommand(kit) == m_config.simulatorDebuger)
|| (arch == ArmLeV7 && Debugger::DebuggerKitInformation::debuggerCommand(kit) == m_config.deviceDebuger)) { || (arch == ArmLeV7 && Debugger::DebuggerKitInformation::debuggerCommand(kit) == m_config.deviceDebuger)) {
QMessageBox::warning(0, tr("Kit Known"), QMessageBox::warning(0, tr("Kit Already Known"),
tr("This Kit was already registered"), QMessageBox::Ok); tr("This Kit was already registered"), QMessageBox::Ok);
return kit; return kit;
} }

2
src/plugins/qnx/qnxplugin.cpp
View File

@@ -93,7 +93,7 @@ bool QNXPlugin::initialize(const QStringList &arguments, QString *errorString)
Core::MimeGlobPattern barDescriptorGlobPattern(QRegExp(QLatin1String("*.xml"), Qt::CaseInsensitive, QRegExp::Wildcard), Core::MimeGlobPattern::MinWeight + 1); Core::MimeGlobPattern barDescriptorGlobPattern(QRegExp(QLatin1String("*.xml"), Qt::CaseInsensitive, QRegExp::Wildcard), Core::MimeGlobPattern::MinWeight + 1);
Core::MimeType barDescriptorMimeType; Core::MimeType barDescriptorMimeType;
barDescriptorMimeType.setType(QLatin1String(Constants::QNX_BAR_DESCRIPTOR_MIME_TYPE)); barDescriptorMimeType.setType(QLatin1String(Constants::QNX_BAR_DESCRIPTOR_MIME_TYPE));
barDescriptorMimeType.setComment(tr("Bar descriptor file (BlackBerry")); barDescriptorMimeType.setComment(tr("Bar descriptor file (BlackBerry)"));
barDescriptorMimeType.setGlobPatterns(QList<Core::MimeGlobPattern>() << barDescriptorGlobPattern); barDescriptorMimeType.setGlobPatterns(QList<Core::MimeGlobPattern>() << barDescriptorGlobPattern);
barDescriptorMimeType.addMagicMatcher(QSharedPointer<Core::IMagicMatcher>(new BarDescriptorMagicMatcher)); barDescriptorMimeType.addMagicMatcher(QSharedPointer<Core::IMagicMatcher>(new BarDescriptorMagicMatcher));
barDescriptorMimeType.setSubClassesOf(QStringList() << QLatin1String("application/xml")); barDescriptorMimeType.setSubClassesOf(QStringList() << QLatin1String("application/xml"));