From 7cd279002c6bdd1b0f20707b06c159dbf0ccdf08 Mon Sep 17 00:00:00 2001
From: El Mehdi Fekari <mfekari@rim.com>
Date: Thu, 10 Oct 2013 11:16:38 +0200
Subject: [PATCH] Qnx: Add missing titles to install wizard pages
Change-Id: I9a3948926b0a88ccda181c31db609a39a0d7f2a5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
src/plugins/qnx/blackberryinstallwizardndkpage.ui | 2 +-
src/plugins/qnx/blackberryinstallwizardpages.cpp | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qnx/blackberryinstallwizardndkpage.ui b/src/plugins/qnx/blackberryinstallwizardndkpage.ui
index 321892e5844..133d1ca012e 100644
--- a/src/plugins/qnx/blackberryinstallwizardndkpage.ui
+++ b/src/plugins/qnx/blackberryinstallwizardndkpage.ui
@@ -17,7 +17,7 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
- <string>Select NDK Path</string>
+ <string>Select Native SDK path:</string>
</property>
</widget>
</item>
diff --git a/src/plugins/qnx/blackberryinstallwizardpages.cpp b/src/plugins/qnx/blackberryinstallwizardpages.cpp
index 39033251d5a..10221f031b0 100644
--- a/src/plugins/qnx/blackberryinstallwizardpages.cpp
+++ b/src/plugins/qnx/blackberryinstallwizardpages.cpp
@@ -94,6 +94,7 @@ BlackBerryInstallWizardOptionPage::BlackBerryInstallWizardOptionPage(BlackBerryI
, m_envFileChooser(new NdkPathChooser(NdkPathChooser::ManualMode))
, m_data(data)
{
+ setTitle(tr("Options"));
connect(m_addButton, SIGNAL(toggled(bool)), this, SLOT(handleOptionChanged()));
connect(m_envFileChooser, SIGNAL(pathChanged(QString)), this, SLOT(handlePathChanged(QString)));
}
@@ -159,6 +160,7 @@ BlackBerryInstallWizardNdkPage::BlackBerryInstallWizardNdkPage(BlackBerryInstall
, m_validNdkPath(false)
{
m_ui->setupUi(this);
+ setTitle(tr("Native SDK"));
m_ui->verticalLayout->addWidget(m_ndkPathChooser);
connect(m_ui->ndkPathListWidget, SIGNAL(itemSelectionChanged()), this, SLOT(setNdkPath()));
connect(m_ndkPathChooser, SIGNAL(pathChanged(QString)), this, SLOT(setManualNdkPath()));
@@ -242,6 +244,7 @@ BlackBerryInstallWizardTargetPage::BlackBerryInstallWizardTargetPage(BlackBerryI
, m_targetListProcess(new QProcess(this))
{
m_ui->setupUi(this);
+ setTitle(tr("Target"));
connect(m_targetListProcess, SIGNAL(finished(int, QProcess::ExitStatus)),
this, SLOT(targetsListProcessFinished()));
@@ -351,6 +354,11 @@ BlackBerryInstallWizardProcessPage::BlackBerryInstallWizardProcessPage(BlackBerr
, m_targetProcess(new QProcess(this))
{
m_ui->setupUi(this);
+ if (m_data.mode == BlackBerryInstallerDataHandler::UninstallMode)
+ setTitle(tr("Uninstalling"));
+ else
+ setTitle(tr("Installing"));
+
connect(m_targetProcess, SIGNAL(finished(int, QProcess::ExitStatus)),
this, SLOT(handleProcessFinished(int, QProcess::ExitStatus)));
}
@@ -451,6 +459,7 @@ BlackBerryInstallWizardFinalPage::BlackBerryInstallWizardFinalPage(BlackBerryIns
: QWizardPage(parent)
, m_data(data)
{
+ setTitle(tr("Summary"));
}
void BlackBerryInstallWizardFinalPage::initializePage()
--
GitLab