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

BlackBerry: set default path for debug token request

Browse Source 
Task-number: QTCREATORBUG-9077

Change-Id: I5b969077a679cdc4da667fbbfcabd0bd6fa75fb9
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
This commit is contained in:
Rafael Roquetto
2013-04-05 09:46:47 -03:00
committed by Rafael Roquetto
parent d6c6471776
commit e077b2338e
2 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp
View File

@@ -51,7 +51,7 @@ BlackBerryDebugTokenRequestDialog::BlackBerryDebugTokenRequestDialog(
m_ui->setupUi(this);
m_ui->progressBar->hide();
m_ui->status->clear();
m_ui->debugTokenPath->setExpectedKind(Utils::PathChooser::Any);
m_ui->debugTokenPath->setExpectedKind(Utils::PathChooser::SaveFile);
m_ui->debugTokenPath->setPromptDialogTitle(tr("Request Debug Token"));
m_ui->debugTokenPath->setPromptDialogFilter(tr("BAR Files (*.bar)"));
@@ -67,8 +67,12 @@ BlackBerryDebugTokenRequestDialog::BlackBerryDebugTokenRequestDialog(
this, SLOT(requestDebugToken()));
connect(m_ui->debugTokenPath, SIGNAL(changed(QString)),
this, SLOT(validate()));
connect(m_ui->debugTokenPath, SIGNAL(beforeBrowsing()),
this, SLOT(setDefaultPath()));
connect(m_ui->debugTokenPath, SIGNAL(editingFinished()),
this, SLOT(appendExtension()));
connect(m_ui->debugTokenPath, SIGNAL(editingFinished()),
this, SLOT(expandPath()));
connect(m_ui->keystorePassword, SIGNAL(textChanged(QString)),
this, SLOT(validate()));
connect(m_ui->cskPassword, SIGNAL(textChanged(QString)),
@@ -133,16 +137,47 @@ void BlackBerryDebugTokenRequestDialog::requestDebugToken()
m_ui->keystorePassword->text(), m_ui->devicePin->text());
}
void BlackBerryDebugTokenRequestDialog::setDefaultPath()
{
const QString path = m_ui->debugTokenPath->path();
const QString defaultFileName = QLatin1String("/debugToken.bar");
if (path.isEmpty()) {
m_ui->debugTokenPath->setPath(QDir::homePath() + defaultFileName);
return;
}
const QFileInfo fileInfo(path);
if (fileInfo.isDir())
m_ui->debugTokenPath->setPath(path + defaultFileName);
}
void BlackBerryDebugTokenRequestDialog::appendExtension()
{
QString path = m_ui->debugTokenPath->path();
if (path.isEmpty())
return;
if (!path.endsWith(QLatin1String(".bar"))) {
path += QLatin1String(".bar");
m_ui->debugTokenPath->setPath(path);
}
}
void BlackBerryDebugTokenRequestDialog::expandPath()
{
const QString path = m_ui->debugTokenPath->path();
if (path.isEmpty() || path.startsWith(QLatin1String("/")))
return;
const QFileInfo fileInfo(path);
m_ui->debugTokenPath->setPath(fileInfo.absoluteFilePath());
}
void BlackBerryDebugTokenRequestDialog::checkBoxChanged(int state)
{
if (state == Qt::Checked) {

2
src/plugins/qnx/blackberrydebugtokenrequestdialog.h
View File

@@ -57,7 +57,9 @@ public:
private slots:
void validate();
void requestDebugToken();
void setDefaultPath();
void appendExtension();
void expandPath();
void checkBoxChanged(int state);
void debugTokenArrived(int status);