~ubuntu-sdk-team/qtcreator-plugin-remotelinux/trunk

« back to all changes in this revision

Viewing changes to src/qnx/blackberrydeviceconfigurationwizardpages.cpp

Committer: CI bot
Author(s): Benjamin Zeller
Date: 2014-06-16 10:28:43 UTC
mfrom: (4.2.4 remotelinux)
Revision ID: ps-jenkins@lists.canonical.com-20140616102843-8juvmjvzwlzsboyw

Migrating to Qt5.3 and QtC 3.1

files added:
src/qnx/blackberryapilevelconfiguration.cpp

src/qnx/blackberryapilevelconfiguration.h

src/qnx/blackberrycheckdevicestatusstep.cpp

src/qnx/blackberrycheckdevicestatusstep.h

src/qnx/blackberrycheckdevicestatusstepconfigwidget.cpp

src/qnx/blackberrycheckdevicestatusstepconfigwidget.h

src/qnx/blackberrycheckdevicestatusstepconfigwidget.ui

src/qnx/blackberrycheckdevicestatusstepfactory.cpp

src/qnx/blackberrycheckdevicestatusstepfactory.h

src/qnx/blackberrydebugtokenpinsdialog.cpp

src/qnx/blackberrydebugtokenpinsdialog.h

src/qnx/blackberrydebugtokenpinsdialog.ui

src/qnx/blackberrydeployqtlibrariesdialog.cpp

src/qnx/blackberrydeployqtlibrariesdialog.h

src/qnx/blackberrydeployqtlibrariesdialog.ui

src/qnx/blackberryinstallwizardoptionpage.ui

src/qnx/blackberrypotentialkit.cpp

src/qnx/blackberrypotentialkit.h

src/qnx/blackberryruntimeconfiguration.cpp

src/qnx/blackberryruntimeconfiguration.h

src/qnx/blackberrysetuppage.cpp

src/qnx/blackberrysetuppage.h

src/qnx/blackberrysetupwidget.cpp

src/qnx/blackberrysetupwidget.h

src/qnx/blackberryversionnumber.cpp

src/qnx/blackberryversionnumber.h

src/qnx/cascadesimport/srcprojectpathchooser.cpp

src/qnx/cascadesimport/srcprojectpathchooser.h

src/qnx/images/error.png

src/qnx/images/info.png

src/qnx/images/ok.png

src/qnx/images/warning.png

src/qnx/qnxattachdebugdialog.cpp

src/qnx/qnxattachdebugdialog.h

src/qnx/qnxattachdebugsupport.cpp

src/qnx/qnxattachdebugsupport.h

files removed:
src/qnx/bardescriptordocumentnodehandlers.cpp

src/qnx/bardescriptordocumentnodehandlers.h

src/qnx/blackberrycheckdevmodestep.cpp

src/qnx/blackberrycheckdevmodestep.h

src/qnx/blackberrycheckdevmodestepconfigwidget.cpp

src/qnx/blackberrycheckdevmodestepconfigwidget.h

src/qnx/blackberrycheckdevmodestepfactory.cpp

src/qnx/blackberrycheckdevmodestepfactory.h

src/qnx/blackberryconfiguration.cpp

src/qnx/blackberryconfiguration.h

src/qnx/blackberrysetupwizard.cpp

src/qnx/blackberrysetupwizard.h

src/qnx/blackberrysetupwizardcertificatepage.ui

src/qnx/blackberrysetupwizarddevicepage.ui

src/qnx/blackberrysetupwizardfinishpage.ui

src/qnx/blackberrysetupwizardkeyspage.ui

src/qnx/blackberrysetupwizardpages.h

files modified:
debian/changelog

debian/control

share/qtcreator/templates/wizards/bb-bardescriptor/bar-descriptor.xml

share/qtcreator/templates/wizards/bb-cascades-app/bar-descriptor.xml

share/qtcreator/templates/wizards/bb-cascades-app/wizard.xml

share/qtcreator/templates/wizards/bb-qt5-bardescriptor/bar-descriptor.xml

src/qnx/bardescriptordocument.cpp

src/qnx/bardescriptordocument.h

src/qnx/bardescriptoreditor.cpp

src/qnx/bardescriptoreditor.h

src/qnx/bardescriptoreditorabstractpanelwidget.cpp

src/qnx/bardescriptoreditorabstractpanelwidget.h

src/qnx/bardescriptoreditorassetswidget.cpp

src/qnx/bardescriptoreditorassetswidget.h

src/qnx/bardescriptoreditorauthorinformationwidget.cpp

src/qnx/bardescriptoreditorauthorinformationwidget.h

src/qnx/bardescriptoreditorentrypointwidget.cpp

src/qnx/bardescriptoreditorentrypointwidget.h

src/qnx/bardescriptoreditorenvironmentwidget.cpp

src/qnx/bardescriptoreditorenvironmentwidget.h

src/qnx/bardescriptoreditorfactory.cpp

src/qnx/bardescriptoreditorfactory.h

src/qnx/bardescriptoreditorgeneralwidget.cpp

src/qnx/bardescriptoreditorgeneralwidget.h

src/qnx/bardescriptoreditorpackageinformationwidget.cpp

src/qnx/bardescriptoreditorpackageinformationwidget.h

src/qnx/bardescriptoreditorpermissionswidget.cpp

src/qnx/bardescriptoreditorpermissionswidget.h

src/qnx/bardescriptoreditorwidget.cpp

src/qnx/bardescriptoreditorwidget.h

src/qnx/blackberryabstractdeploystep.h

src/qnx/blackberryapplicationrunner.cpp

src/qnx/blackberryapplicationrunner.h

src/qnx/blackberrycertificate.cpp

src/qnx/blackberryconfigurationmanager.cpp

src/qnx/blackberryconfigurationmanager.h

src/qnx/blackberrycreatecertificatedialog.cpp

src/qnx/blackberrycreatepackagestep.cpp

src/qnx/blackberrycreatepackagestep.h

src/qnx/blackberrycreatepackagestepconfigwidget.cpp

src/qnx/blackberrycreatepackagestepconfigwidget.h

src/qnx/blackberrycreatepackagestepconfigwidget.ui

src/qnx/blackberrydebugsupport.cpp

src/qnx/blackberrydebugtokenreader.cpp

src/qnx/blackberrydebugtokenreader.h

src/qnx/blackberrydebugtokenrequestdialog.cpp

src/qnx/blackberrydebugtokenrequester.cpp

src/qnx/blackberrydeployconfiguration.cpp

src/qnx/blackberrydeployconfiguration.h

src/qnx/blackberrydeployconfigurationfactory.cpp

src/qnx/blackberrydeployconfigurationfactory.h

src/qnx/blackberrydeployconfigurationwidget.cpp

src/qnx/blackberrydeployconfigurationwidget.h

src/qnx/blackberrydeployinformation.h

src/qnx/blackberrydeviceconfiguration.cpp

src/qnx/blackberrydeviceconfiguration.h

src/qnx/blackberrydeviceconfigurationwidget.cpp

src/qnx/blackberrydeviceconfigurationwidget.h

src/qnx/blackberrydeviceconfigurationwidget.ui

src/qnx/blackberrydeviceconfigurationwizardconfigpage.ui

src/qnx/blackberrydeviceconfigurationwizardpages.cpp

src/qnx/blackberrydeviceconfigurationwizardpages.h

src/qnx/blackberrydeviceconnection.cpp

src/qnx/blackberrydeviceconnectionmanager.cpp

src/qnx/blackberrydeviceinformation.cpp

src/qnx/blackberrydeviceinformation.h

src/qnx/blackberrydevicelistdetector.cpp

src/qnx/blackberryimportcertificatedialog.cpp

src/qnx/blackberryinstallwizard.cpp

src/qnx/blackberryinstallwizard.h

src/qnx/blackberryinstallwizardpages.cpp

src/qnx/blackberryinstallwizardpages.h

src/qnx/blackberryinstallwizardtargetpage.ui

src/qnx/blackberrykeyspage.cpp

src/qnx/blackberrykeyspage.h

src/qnx/blackberrykeyswidget.cpp

src/qnx/blackberrykeyswidget.h

src/qnx/blackberrykeyswidget.ui

src/qnx/blackberrylogprocessrunner.h

src/qnx/blackberryndkprocess.cpp

src/qnx/blackberryndkprocess.h

src/qnx/blackberryndksettingspage.cpp

src/qnx/blackberryndksettingspage.h

src/qnx/blackberryndksettingswidget.cpp

src/qnx/blackberryndksettingswidget.h

src/qnx/blackberryndksettingswidget.ui

src/qnx/blackberryqtversionfactory.cpp

src/qnx/blackberryrunconfiguration.h

src/qnx/blackberryrunconfigurationwidget.h

src/qnx/blackberryruncontrol.cpp

src/qnx/blackberryruncontrol.h

src/qnx/blackberryruncontrolfactory.cpp

src/qnx/blackberryruncontrolfactory.h

src/qnx/blackberrysetupwizardpages.cpp

src/qnx/blackberrysigningpasswordsdialog.h

src/qnx/blackberrysigningutils.cpp

src/qnx/blackberrysigningutils.h

src/qnx/blackberrysshkeysgenerator.h

src/qnx/cascadesimport/cascadesimport.pri

src/qnx/cascadesimport/cascadesimportwizard.cpp

src/qnx/cascadesimport/cascadesimportwizard.h

src/qnx/cascadesimport/fileconverter.h

src/qnx/cascadesimport/srcprojectwizardpage.ui

src/qnx/pathchooserdelegate.cpp

src/qnx/pathchooserdelegate.h

src/qnx/qnx.pro

src/qnx/qnx.qbs

src/qnx/qnx.qrc

src/qnx/qnx_dependencies.pri

src/qnx/qnxanalyzesupport.cpp

src/qnx/qnxanalyzesupport.h

src/qnx/qnxbaseqtconfigwidget.cpp

src/qnx/qnxbaseqtconfigwidget.h

src/qnx/qnxconstants.h

src/qnx/qnxdevicetester.h

src/qnx/qnxplugin.cpp

src/qnx/qnxplugin.h

src/qnx/qnxrunconfiguration.cpp

src/qnx/qnxruncontrolfactory.cpp

src/qnx/qnxtoolchain.cpp

src/qnx/qnxutils.cpp

src/qnx/qnxutils.h

src/qnx/slog2inforunner.cpp

src/qnx/slog2inforunner.h

src/remotelinux/abstractremotelinuxdeployservice.cpp

src/remotelinux/abstractremotelinuxdeployservice.h

src/remotelinux/abstractremotelinuxdeploystep.h

src/remotelinux/abstractuploadandinstallpackageservice.h

src/remotelinux/genericdirectuploadservice.cpp

src/remotelinux/genericdirectuploadservice.h

src/remotelinux/genericdirectuploadstep.h

src/remotelinux/genericlinuxdeviceconfigurationwidget.cpp

src/remotelinux/genericlinuxdeviceconfigurationwidget.h

src/remotelinux/genericlinuxdeviceconfigurationwidget.ui

src/remotelinux/genericlinuxdeviceconfigurationwizard.h

src/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp

src/remotelinux/linuxdeviceprocess.cpp

src/remotelinux/linuxdevicetester.h

src/remotelinux/packageuploader.cpp

src/remotelinux/packageuploader.h

src/remotelinux/publickeydeploymentdialog.h

src/remotelinux/remotelinux.qbs

src/remotelinux/remotelinux_dependencies.pri

src/remotelinux/remotelinuxanalyzesupport.cpp

src/remotelinux/remotelinuxcustomcommanddeployservice.h

src/remotelinux/remotelinuxdebugsupport.cpp

src/remotelinux/remotelinuxdeployconfigurationwidget.h

src/remotelinux/remotelinuxenvironmentreader.cpp

src/remotelinux/remotelinuxpackageinstaller.h

src/remotelinux/remotelinuxrunconfiguration.cpp

src/remotelinux/remotelinuxrunconfiguration.h

src/remotelinux/remotelinuxrunconfigurationwidget.h

src/remotelinux/sshkeydeployer.h

src/remotelinux/uploadandinstalltarpackagestep.h

src/valgrind/callgrindtextmark.h

src/valgrind/callgrindtool.cpp

src/valgrind/callgrindvisualisation.h

src/valgrind/memcheckerrorview.cpp

src/valgrind/memchecktool.cpp

src/valgrind/suppressiondialog.cpp

src/valgrind/valgrind.qbs

src/valgrind/valgrind_dependencies.pri

src/valgrind/valgrindconfigwidget.cpp

src/valgrind/valgrindconfigwidget.h

src/valgrind/valgrindconfigwidget.ui

src/valgrind/valgrindplugin.cpp

src/valgrind/valgrindprocess.cpp

src/valgrind/xmlprotocol/errorlistmodel.cpp

Show diffs side-by-side

added added

removed removed

src/qnx/blackberrydeviceconfigurationwizardpages.cpp

****************************************************************************/

#include "blackberrydeviceconfigurationwizardpages.h"

#include "blackberryconfiguration.h"

#include "blackberrydebugtokenrequestdialog.h"

#include "blackberrydebugtokenreader.h"

#include "blackberrysshkeysgenerator.h"

#include "blackberrydeviceinformation.h"

#include "ui_blackberrydeviceconfigurationwizardsetuppage.h"

#include "ui_blackberrydeviceconfigurationwizardquerypage.h"

#include "ui_blackberrydeviceconfigurationwizardconfigpage.h"

#include "blackberryconfiguration.h"

#include "blackberrydeviceconnectionmanager.h"

#include "blackberrysigningutils.h"

#include "qnxutils.h"

#include <coreplugin/icore.h>

265

checkAndGenerateSSHKeys();

266

else

267

setState(Done, tr("Cannot connect to the device. "

268

"Check if the device is in development mode and has matching host name and password."));

268

"Check that the device is in development mode and has matching host name and password."));

269

}

270

271

void BlackBerryDeviceConfigurationWizardQueryPage::checkAndGenerateSSHKeys()

353

: QWizardPage(parent)

354

, m_ui(new Ui::BlackBerryDeviceConfigurationWizardConfigPage)

355

, m_holder(holder)

356

, m_utils(BlackBerrySigningUtils::instance())

356

357

{

357

358

m_ui->setupUi(this);

358

359

setTitle(tr("Configuration"));

359

360

m_ui->debugTokenField->setExpectedKind(Utils::PathChooser::File);

361

m_ui->debugTokenField->setPromptDialogFilter(QLatin1String("*.bar"));

362

363

QString debugTokenBrowsePath = QnxUtils::dataDirPath();

364

if (!QFileInfo(debugTokenBrowsePath).exists())

365

debugTokenBrowsePath = QDir::homePath();

366

m_ui->debugTokenField->setInitialBrowsePathBackup(debugTokenBrowsePath);

361

m_ui->debugTokenCombo->addItems(m_utils.debugTokens());

367

362

368

363

connect(m_ui->configurationNameField, SIGNAL(textChanged(QString)), this, SIGNAL(completeChanged()));

369

connect(m_ui->debugTokenField, SIGNAL(changed(QString)), this, SIGNAL(completeChanged()));

364

connect(m_ui->debugTokenCombo, SIGNAL(currentTextChanged(QString)), this, SIGNAL(completeChanged()));

370

365

connect(m_ui->generateButton, SIGNAL(clicked()), this, SLOT(generateDebugToken()));

366

connect(m_ui->importButton, SIGNAL(clicked()), this, SLOT(importDebugToken()));

371

367

372

368

registerField(QLatin1String(CONFIGURATIONNAME_FIELD_ID), m_ui->configurationNameField);

373

registerField(QLatin1String(DEBUGTOKENPATH_FIELD_ID), m_ui->debugTokenField);

369

registerField(QLatin1String(DEBUGTOKENPATH_FIELD_ID), m_ui->debugTokenCombo);

374

370

}

375

371

376

372

BlackBerryDeviceConfigurationWizardConfigPage::~BlackBerryDeviceConfigurationWizardConfigPage()

385

381

m_ui->configurationNameField->setText(m_holder.deviceName);

386

382

m_ui->deviceHostNameField->setText(deviceHostName);

387

383

m_ui->deviceTypeField->setText(QLatin1String (m_holder.isSimulator ? "Simulator" : "Device"));

388

m_ui->debugTokenField->setEnabled(!m_holder.isSimulator);

384

m_ui->debugTokenCombo->setEnabled(!m_holder.isSimulator);

389

385

m_ui->generateButton->setEnabled(!m_holder.isSimulator);

390

386

}

391

387

392

388

bool BlackBerryDeviceConfigurationWizardConfigPage::isComplete() const

393

389

{

394

390

bool configurationNameComplete = !m_ui->configurationNameField->text().isEmpty();

395

Utils::FileName fileName = m_ui->debugTokenField->fileName();

391

Utils::FileName fileName = Utils::FileName::fromString(m_ui->debugTokenCombo->currentText());

396

392

bool debugTokenComplete = m_holder.isSimulator || !m_holder.isProductionDevice

397

|| (!fileName.isEmpty() && QFileInfo(fileName.toString()).exists());

393

|| (!fileName.isEmpty() && fileName.toFileInfo().exists());

398

394

399

395

return configurationNameComplete && debugTokenComplete;

400

396

}

409

405

if (result != QDialog::Accepted)

410

406

return;

411

407

412

m_ui->debugTokenField->setPath(dialog.debugToken());

408

m_utils.addDebugToken(dialog.debugToken());

409

m_ui->debugTokenCombo->addItem(dialog.debugToken());

410

const int index = m_ui->debugTokenCombo->findText(dialog.debugToken());

411

if (index != -1)

412

m_ui->debugTokenCombo->setCurrentIndex(index);

413

}

414

415

void BlackBerryDeviceConfigurationWizardConfigPage::importDebugToken()

416

{

417

const QString debugToken = QFileDialog::getOpenFileName(this, tr("Select Debug Token"),

418

QString(), tr("BAR file (*.bar)"));

419

420

if (debugToken.isEmpty())

421

return;

422

423

BlackBerryDebugTokenReader debugTokenReader(debugToken);

424

if (!debugTokenReader.isValid()) {

425

QMessageBox::warning(this, tr("Invalid Debug Token"),

426

tr("Debug token file %1 cannot be read.").arg(debugToken));

427

return;

428

}

429

430

m_utils.addDebugToken(debugToken);

431

m_ui->debugTokenCombo->addItem(debugToken);

432

const int index = m_ui->debugTokenCombo->findText(debugToken);

433

if (index != -1)

434

m_ui->debugTokenCombo->setCurrentIndex(index);

413

435

}

414

436

415

437

QString BlackBerryDeviceConfigurationWizardConfigPage::configurationName() const

419

441

420

442

QString BlackBerryDeviceConfigurationWizardConfigPage::debugToken() const

421

443

{

422

return m_ui->debugTokenField->fileName().toString();

444

return m_ui->debugTokenCombo->currentText();

423

445

}

424

446

425

447

// ----------------------------------------------------------------------------

Older »