diff --git a/src/plugins/remotelinux/maemodeviceconfigwizard.cpp b/src/plugins/remotelinux/maemodeviceconfigwizard.cpp index c49bdce8f372c7026ec8574b3b894e644f3eacb7..ff28b8627addaca4683a2bf715da6da6d426eeb6 100644 --- a/src/plugins/remotelinux/maemodeviceconfigwizard.cpp +++ b/src/plugins/remotelinux/maemodeviceconfigwizard.cpp @@ -99,9 +99,13 @@ public: m_ui->setupUi(this); setTitle(tr("General Information")); setSubTitle(QLatin1String(" ")); // For Qt bug (background color) - m_ui->fremantleButton->setText(MaemoGlobal::osTypeToString(LinuxDeviceConfiguration::Maemo5OsType)); - m_ui->harmattanButton->setText(MaemoGlobal::osTypeToString(LinuxDeviceConfiguration::HarmattanOsType)); - m_ui->meegoButton->setText(MaemoGlobal::osTypeToString(LinuxDeviceConfiguration::MeeGoOsType)); + + m_ui->osTypeComboBox->addItem(MaemoGlobal::osTypeToString(LinuxDeviceConfiguration::Maemo5OsType), + LinuxDeviceConfiguration::Maemo5OsType); + m_ui->osTypeComboBox->addItem(MaemoGlobal::osTypeToString(LinuxDeviceConfiguration::HarmattanOsType), + LinuxDeviceConfiguration::HarmattanOsType); + m_ui->osTypeComboBox->addItem(MaemoGlobal::osTypeToString(LinuxDeviceConfiguration::MeeGoOsType), + LinuxDeviceConfiguration::MeeGoOsType); QButtonGroup *buttonGroup = new QButtonGroup(this); buttonGroup->setExclusive(true); @@ -110,14 +114,8 @@ public: connect(buttonGroup, SIGNAL(buttonClicked(int)), SLOT(handleDeviceTypeChanged())); - buttonGroup = new QButtonGroup(this); - buttonGroup->setExclusive(true); - buttonGroup->addButton(m_ui->fremantleButton); - buttonGroup->addButton(m_ui->harmattanButton); - buttonGroup->addButton(m_ui->meegoButton); - m_ui->nameLineEdit->setText(QLatin1String("(New Configuration)")); - m_ui->harmattanButton->setChecked(true); + m_ui->osTypeComboBox->setCurrentIndex(m_ui->osTypeComboBox->findData(LinuxDeviceConfiguration::HarmattanOsType)); m_ui->hwButton->setChecked(true); handleDeviceTypeChanged(); m_ui->hostNameLineEdit->setText(defaultHost(deviceType())); @@ -143,9 +141,7 @@ public: QString osType() const { - return m_ui->fremantleButton->isChecked() ? LinuxDeviceConfiguration::Maemo5OsType - : m_ui->harmattanButton->isChecked() ? LinuxDeviceConfiguration::HarmattanOsType - : LinuxDeviceConfiguration::MeeGoOsType; + return m_ui->osTypeComboBox->itemData(m_ui->osTypeComboBox->currentIndex()).toString(); } LinuxDeviceConfiguration::DeviceType deviceType() const diff --git a/src/plugins/remotelinux/maemodeviceconfigwizardstartpage.ui b/src/plugins/remotelinux/maemodeviceconfigwizardstartpage.ui index 3679b1a4d6c54ba5c89f13dca6bf9bd30345e205..42e5becc0342b66a28483a0ef7d1817891666a82 100644 --- a/src/plugins/remotelinux/maemodeviceconfigwizardstartpage.ui +++ b/src/plugins/remotelinux/maemodeviceconfigwizardstartpage.ui @@ -37,25 +37,7 @@ <item row="1" column="1"> <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <widget class="QRadioButton" name="fremantleButton"> - <property name="text"> - <string>Maemo 5 (Fremantle)</string> - </property> - </widget> - </item> - <item> - <widget class="QRadioButton" name="harmattanButton"> - <property name="text"> - <string>Maemo 6 (Harmattan)</string> - </property> - </widget> - </item> - <item> - <widget class="QRadioButton" name="meegoButton"> - <property name="text"> - <string>Meego</string> - </property> - </widget> + <widget class="QComboBox" name="osTypeComboBox"/> </item> <item> <spacer name="horizontalSpacer">