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

Qnx: Add missing titles to install wizard pages

Browse Source 
Change-Id: I9a3948926b0a88ccda181c31db609a39a0d7f2a5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
El Mehdi Fekari
2013-10-10 11:16:38 +02:00
committed by Mehdi Fekari
parent 69c4770e68
commit 7cd279002c
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qnx/blackberryinstallwizardndkpage.ui
View File

@@ -17,7 +17,7 @@
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>Select NDK Path</string> <string>Select Native SDK path:</string>
</property> </property>
</widget> </widget>
</item> </item>

9
src/plugins/qnx/blackberryinstallwizardpages.cpp
View File

@@ -94,6 +94,7 @@ BlackBerryInstallWizardOptionPage::BlackBerryInstallWizardOptionPage(BlackBerryI
, m_envFileChooser(new NdkPathChooser(NdkPathChooser::ManualMode)) , m_envFileChooser(new NdkPathChooser(NdkPathChooser::ManualMode))
, m_data(data) , m_data(data)
{ {
setTitle(tr("Options"));
connect(m_addButton, SIGNAL(toggled(bool)), this, SLOT(handleOptionChanged())); connect(m_addButton, SIGNAL(toggled(bool)), this, SLOT(handleOptionChanged()));
connect(m_envFileChooser, SIGNAL(pathChanged(QString)), this, SLOT(handlePathChanged(QString))); connect(m_envFileChooser, SIGNAL(pathChanged(QString)), this, SLOT(handlePathChanged(QString)));
} }
@@ -159,6 +160,7 @@ BlackBerryInstallWizardNdkPage::BlackBerryInstallWizardNdkPage(BlackBerryInstall
, m_validNdkPath(false) , m_validNdkPath(false)
{ {
m_ui->setupUi(this); m_ui->setupUi(this);
setTitle(tr("Native SDK"));
m_ui->verticalLayout->addWidget(m_ndkPathChooser); m_ui->verticalLayout->addWidget(m_ndkPathChooser);
connect(m_ui->ndkPathListWidget, SIGNAL(itemSelectionChanged()), this, SLOT(setNdkPath())); connect(m_ui->ndkPathListWidget, SIGNAL(itemSelectionChanged()), this, SLOT(setNdkPath()));
connect(m_ndkPathChooser, SIGNAL(pathChanged(QString)), this, SLOT(setManualNdkPath())); connect(m_ndkPathChooser, SIGNAL(pathChanged(QString)), this, SLOT(setManualNdkPath()));
@@ -242,6 +244,7 @@ BlackBerryInstallWizardTargetPage::BlackBerryInstallWizardTargetPage(BlackBerryI
, m_targetListProcess(new QProcess(this)) , m_targetListProcess(new QProcess(this))
{ {
m_ui->setupUi(this); m_ui->setupUi(this);
setTitle(tr("Target"));
connect(m_targetListProcess, SIGNAL(finished(int, QProcess::ExitStatus)), connect(m_targetListProcess, SIGNAL(finished(int, QProcess::ExitStatus)),
this, SLOT(targetsListProcessFinished())); this, SLOT(targetsListProcessFinished()));
@@ -351,6 +354,11 @@ BlackBerryInstallWizardProcessPage::BlackBerryInstallWizardProcessPage(BlackBerr
, m_targetProcess(new QProcess(this)) , m_targetProcess(new QProcess(this))
{ {
m_ui->setupUi(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)), connect(m_targetProcess, SIGNAL(finished(int, QProcess::ExitStatus)),
this, SLOT(handleProcessFinished(int, QProcess::ExitStatus))); this, SLOT(handleProcessFinished(int, QProcess::ExitStatus)));
} }
@@ -451,6 +459,7 @@ BlackBerryInstallWizardFinalPage::BlackBerryInstallWizardFinalPage(BlackBerryIns
: QWizardPage(parent) : QWizardPage(parent)
, m_data(data) , m_data(data)
{ {
setTitle(tr("Summary"));
} }
void BlackBerryInstallWizardFinalPage::initializePage() void BlackBerryInstallWizardFinalPage::initializePage()