diff --git a/ground/src/plugins/config/airframe.ui b/ground/src/plugins/config/airframe.ui
index 96e027f6a..aabf72505 100644
--- a/ground/src/plugins/config/airframe.ui
+++ b/ground/src/plugins/config/airframe.ui
@@ -13,120 +13,238 @@
Form
-
-
-
- 10
- 10
- 491
- 321
-
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
-
-
- 380
- 280
- 93
- 27
-
-
-
- Applies and Saves all settings to SD
-
-
- Save to SD
-
-
-
-
-
- 270
- 280
- 93
- 27
-
-
-
- Send to OpenPilot but don't write in SD.
-
-
- Save to RAM
-
-
-
-
-
- 160
- 280
- 93
- 27
-
-
-
- Retrieve settings from OpenPilot
-
-
- Get Current
-
-
-
-
-
- 110
- 10
- 121
- 31
-
-
-
-
- 10
-
-
-
- Select aircraft type here
-
-
-
-
-
- 10
- 20
- 91
- 17
-
-
-
- Aircraft type:
-
-
-
-
-
- 90
- 70
- 131
- 131
-
-
-
-
+
+ -
+
+
+ QFrame::StyledPanel
+
+
+ QFrame::Raised
+
+
+
-
+
+
-
+
+
+ Aircraft type:
+
+
+
+ -
+
+
+
+ 10
+
+
+
+ Select aircraft type here
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ 0
+
+
+
+ true
+
+
+ false
+
+
+
-
+
+
+ Fixed Wing
+
+
+
+ -
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Airframe type:
+
+
+
+ -
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+ Multi rotor
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+ CCPM Heli
+
+
+
+ -
+
+
-
+
+
+ This is not implemented yet, sorry
+
+
+
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Retrieve settings from OpenPilot
+
+
+ Get Current
+
+
+
+ -
+
+
+ Send to OpenPilot but don't write in SD.
+
+
+ Save to RAM
+
+
+
+ -
+
+
+ Applies and Saves all settings to SD
+
+
+ Save to SD
+
+
+
+
+
+
+
+
+
-
-
- MixerCurveWidget
- QWidget
-
- 1
-
-
-
+
+
+ aircraftType
+ currentIndexChanged(int)
+ stackedWidget
+ setCurrentIndex(int)
+
+
+ 152
+ 38
+
+
+ 187
+ 112
+
+
+
+
diff --git a/ground/src/plugins/config/configairframewidget.cpp b/ground/src/plugins/config/configairframewidget.cpp
index 5c4ea5430..d87f3ae0a 100644
--- a/ground/src/plugins/config/configairframewidget.cpp
+++ b/ground/src/plugins/config/configairframewidget.cpp
@@ -44,10 +44,17 @@ ConfigAirframeWidget::ConfigAirframeWidget(QWidget *parent) : ConfigTaskWidget(p
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
UAVObjectManager *objManager = pm->getObject();
+ /*
UAVObject *obj = dynamic_cast(objManager->getObject(QString("SystemSettings")));
QString fieldName = QString("AirframeType");
UAVObjectField *field = obj->getField(fieldName);
m_aircraft->aircraftType->addItems(field->getOptions());
+ */
+ QStringList airframeTypes;
+ airframeTypes << "Fixed Wing" << "Multirotor" << "Helicopter";
+ m_aircraft->aircraftType->addItems(airframeTypes);
+ m_aircraft->aircraftType->setCurrentIndex(1);
+
requestAircraftUpdate();
connect(m_aircraft->saveAircraftToSD, SIGNAL(clicked()), this, SLOT(saveAircraftUpdate()));