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

Maemo: GUI fix in device configuration wizard.

Browse Source 
The list of possible devices is much better represented as a combo box.

Change-Id: Ia68472ec5082b0d40b584bf48c245a823dce04f3
Reviewed-on: http://codereview.qt.nokia.com/580
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Christian Kandeler
2011-06-22 08:11:21 +02:00
parent 0c1d3e98ef
commit d319b10df5
2 changed files with 10 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/remotelinux/maemodeviceconfigwizard.cpp
View File

@@ -99,9 +99,13 @@ public:
m_ui->setupUi(this); m_ui->setupUi(this);
setTitle(tr("General Information")); setTitle(tr("General Information"));
setSubTitle(QLatin1String(" ")); // For Qt bug (background color) 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->osTypeComboBox->addItem(MaemoGlobal::osTypeToString(LinuxDeviceConfiguration::Maemo5OsType),
m_ui->meegoButton->setText(MaemoGlobal::osTypeToString(LinuxDeviceConfiguration::MeeGoOsType)); 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); QButtonGroup *buttonGroup = new QButtonGroup(this);
buttonGroup->setExclusive(true); buttonGroup->setExclusive(true);
@@ -110,14 +114,8 @@ public:
connect(buttonGroup, SIGNAL(buttonClicked(int)), connect(buttonGroup, SIGNAL(buttonClicked(int)),
SLOT(handleDeviceTypeChanged())); 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->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); m_ui->hwButton->setChecked(true);
handleDeviceTypeChanged(); handleDeviceTypeChanged();
m_ui->hostNameLineEdit->setText(defaultHost(deviceType())); m_ui->hostNameLineEdit->setText(defaultHost(deviceType()));
@@ -143,9 +141,7 @@ public:
QString osType() const QString osType() const
{ {
return m_ui->fremantleButton->isChecked() ? LinuxDeviceConfiguration::Maemo5OsType return m_ui->osTypeComboBox->itemData(m_ui->osTypeComboBox->currentIndex()).toString();
: m_ui->harmattanButton->isChecked() ? LinuxDeviceConfiguration::HarmattanOsType
: LinuxDeviceConfiguration::MeeGoOsType;
} }
LinuxDeviceConfiguration::DeviceType deviceType() const LinuxDeviceConfiguration::DeviceType deviceType() const

20
src/plugins/remotelinux/maemodeviceconfigwizardstartpage.ui
View File

@@ -37,25 +37,7 @@
<item row="1" column="1"> <item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QRadioButton" name="fremantleButton"> <widget class="QComboBox" name="osTypeComboBox"/>
<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>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">