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

Maemo: Use device configuration wizard.

Browse Source 
Needs patch choosers instead of line edits.
This commit is contained in:
Christian Kandeler
2011-02-03 16:09:35 +01:00
parent c6431bb27e
commit c5e00691df
5 changed files with 112 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.cpp
View File

@@ -37,6 +37,7 @@
#include "ui_maemodeviceconfigurationssettingswidget.h"
#include "maemoconfigtestdialog.h"
#include "maemodeviceconfigwizard.h"
#include "maemodeviceconfigurations.h"
#include "maemokeydeployer.h"
#include "maemoremoteprocessesdialog.h"
@@ -175,21 +176,13 @@ void MaemoDeviceConfigurationsSettingsWidget::initGui()
void MaemoDeviceConfigurationsSettingsWidget::addConfig()
{
const QString prefix = tr("New Device Configuration %1", "Standard "
"Configuration name with number");
int suffix = 1;
QString newName;
bool isUnique = false;
do {
newName = prefix.arg(QString::number(suffix++));
isUnique = !m_devConfigs->hasConfig(newName);
} while (!isUnique);
m_devConfigs->addConfiguration(newName, MaemoGlobal::Maemo5,
MaemoDeviceConfig::Physical);
m_ui->removeConfigButton->setEnabled(true);
m_ui->configurationComboBox->setCurrentIndex(m_ui->configurationComboBox->count()-1);
m_ui->configurationComboBox->setFocus();
MaemoDeviceConfigWizard wizard(m_devConfigs.data(), this);
if (wizard.exec() == QDialog::Accepted) {
wizard.createDeviceConfig();
m_ui->removeConfigButton->setEnabled(true);
m_ui->configurationComboBox->setCurrentIndex(m_ui->configurationComboBox->count()-1);
testConfig();
}
}
void MaemoDeviceConfigurationsSettingsWidget::deleteConfig()
@@ -269,7 +262,7 @@ void MaemoDeviceConfigurationsSettingsWidget::deviceTypeChanged()
const MaemoDeviceConfig::DeviceType devType
= m_ui->deviceButton->isChecked()
? MaemoDeviceConfig::Physical : MaemoDeviceConfig::Simulator;
m_devConfigs->setDeviceType(currentIndex(), devType);
//m_devConfigs->setDeviceType(currentIndex(), devType);
fillInValues();
}