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

QNX: Set Author and Author ID from debug token in bar descriptor editor

Browse Source 
This adds dependencies on private Qt headers for the QNX plugin, as
we need the QZipReader to read the .bar file.

Change-Id: Id70def551776a9d5ac43203cf807d2a0ca65e22f
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Nätterlund
2013-01-17 14:16:59 +01:00
committed by Tobias Hunger
parent 6821e50620
commit d4a09cce3c
7 changed files with 240 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,13 +35,18 @@
#include "qnxconstants.h"
#include "bardescriptoreditor.h"
#include "bardescriptorpermissionsmodel.h"
#include "blackberrydeviceconfiguration.h"
#include "blackberrydebugtokenreader.h"
#include <projectexplorer/devicesupport/devicemanager.h>
#include <qtsupport/qtversionmanager.h>
#include <texteditor/plaintexteditor.h>
#include <utils/qtcassert.h>
#include <QFileDialog>
#include <QInputDialog>
#include <QItemSelection>
#include <QMessageBox>
#include <QStandardItemModel>
#include <QStringListModel>
@@ -103,6 +108,8 @@ BarDescriptorEditorWidget::~BarDescriptorEditorWidget()
void BarDescriptorEditorWidget::initGeneralPage()
{
m_ui->setFromDebugToken->setVisible(BlackBerryDebugTokenReader::isSupported());
QRegExp versionNumberRegExp(QLatin1String("(\\d{1,3}\\.)?(\\d{1,3}\\.)?(\\d{1,3})"));
QRegExpValidator *versionNumberValidator = new QRegExpValidator(versionNumberRegExp, this);
m_ui->packageVersion->setValidator(versionNumberValidator);
@@ -113,6 +120,7 @@ void BarDescriptorEditorWidget::initGeneralPage()
connect(m_ui->author, SIGNAL(textChanged(QString)), this, SLOT(setDirty()));
connect(m_ui->authorId, SIGNAL(textChanged(QString)), this, SLOT(setDirty()));
connect(m_ui->setFromDebugToken, SIGNAL(clicked()), this, SLOT(setAuthorFromDebugToken()));
}
void BarDescriptorEditorWidget::clearGeneralPage()
@@ -691,3 +699,35 @@ void BarDescriptorEditorWidget::addImageAsAsset(const QString &path)
asset.entry = false;
addAssetInternal(asset);
}
void BarDescriptorEditorWidget::setAuthorFromDebugToken()
{
// To select debug token, make it fancier once the debug token management is done in
// Qt Creator
QStringList debugTokens;
ProjectExplorer::DeviceManager *deviceManager = ProjectExplorer::DeviceManager::instance();
for (int i = 0; i < deviceManager->deviceCount(); ++i) {
ProjectExplorer::IDevice::ConstPtr device = deviceManager->deviceAt(i);
if (device->type() == Core::Id(Constants::QNX_BB_OS_TYPE)) {
BlackBerryDeviceConfiguration::ConstPtr bbDevice = device.dynamicCast<const BlackBerryDeviceConfiguration>();
QTC_ASSERT(bbDevice, continue);
debugTokens << bbDevice->debugToken();
}
}
debugTokens.removeDuplicates();
bool ok;
QString debugToken = QInputDialog::getItem(this, tr("Select Debug Token"), tr("Debug token:"), debugTokens, 0, false, &ok);
if (!ok || debugToken.isEmpty())
return;
BlackBerryDebugTokenReader debugTokenReader(debugToken);
if (!debugTokenReader.isValid()) {
QMessageBox::warning(this, tr("Error Reading Debug Token"), tr("There was a problem reading debug token"));
return;
}
m_ui->author->setText(debugTokenReader.author());
m_ui->authorId->setText(debugTokenReader.authorId());
}