flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-24 18:04:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #586, refs #580 update form to allow to edit IATA/family

Browse Source
This commit is contained in:
Klaus Basan
2016-01-29 21:34:29 +01:00
parent d860d971eb
commit d193ca4e73
2 changed files with 150 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/blackgui/editors/aircrafticaoform.cpp
View File

@@ -47,6 +47,8 @@ namespace BlackGui
this->ui->aircraft_Selector->setAircraftIcao(icao); this->ui->aircraft_Selector->setAircraftIcao(icao);
this->ui->le_Manufacturer->setText(icao.getManufacturer()); this->ui->le_Manufacturer->setText(icao.getManufacturer());
this->ui->le_ModelDescription->setText(icao.getModelDescription()); this->ui->le_ModelDescription->setText(icao.getModelDescription());
this->ui->le_Family->setText(icao.getFamily());
this->ui->le_Iata->setText(icao.getIataCode());
this->ui->cb_Legacy->setChecked(icao.isLegacyAircraft()); this->ui->cb_Legacy->setChecked(icao.isLegacyAircraft());
this->ui->cb_Military->setChecked(icao.isMilitary()); this->ui->cb_Military->setChecked(icao.isMilitary());
@@ -80,10 +82,12 @@ namespace BlackGui
} }
} }
QString manufacturer(this->ui->le_Manufacturer->text().trimmed().toUpper()); const QString manufacturer(this->ui->le_Manufacturer->text().trimmed().toUpper());
QString modelDescription(this->ui->le_ModelDescription->text()); const QString modelDescription(this->ui->le_ModelDescription->text().trimmed());
QString wtc(ui->cb_Wtc->currentText().left(1)); const QString iata(this->ui->le_Family->text().trimmed().toUpper());
QString combined(ui->combined_TypeSelector->getCombinedType()); const QString family(this->ui->le_Iata->text().trimmed().toUpper());
const QString wtc(ui->cb_Wtc->currentText().left(1));
const QString combined(ui->combined_TypeSelector->getCombinedType());
bool ok; bool ok;
int rank = this->ui->cb_Rank->currentText().toInt(&ok); int rank = this->ui->cb_Rank->currentText().toInt(&ok);
if (!ok) { rank = 10; } if (!ok) { rank = 10; }
@@ -96,6 +100,8 @@ namespace BlackGui
icao.setCodeFlags(military, legacy, realWorld); icao.setCodeFlags(military, legacy, realWorld);
icao.setRank(rank); icao.setRank(rank);
icao.setCombinedType(combined); icao.setCombinedType(combined);
icao.setFamily(family);
icao.setIataCode(iata);
return icao; return icao;
} }
@@ -123,6 +129,8 @@ namespace BlackGui
this->ui->aircraft_Selector->setReadOnly(readOnly); this->ui->aircraft_Selector->setReadOnly(readOnly);
this->ui->le_Manufacturer->setReadOnly(readOnly); this->ui->le_Manufacturer->setReadOnly(readOnly);
this->ui->le_ModelDescription->setReadOnly(readOnly); this->ui->le_ModelDescription->setReadOnly(readOnly);
this->ui->le_Family->setReadOnly(readOnly);
this->ui->le_Iata->setReadOnly(readOnly);
this->ui->cb_Legacy->setCheckable(!readOnly); this->ui->cb_Legacy->setCheckable(!readOnly);
this->ui->cb_Military->setCheckable(!readOnly); this->ui->cb_Military->setCheckable(!readOnly);

225
src/blackgui/editors/aircrafticaoform.ui
View File

@@ -128,10 +128,26 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="0" column="2" rowspan="9">
<widget class="BlackGui::CAircraftCombinedTypeSelector" name="combined_TypeSelector"/> <widget class="BlackGui::Editors::CValidationIndicator" name="val_Indicator">
<property name="minimumSize">
<size>
<width>10</width>
<height>0</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget>
</item> </item>
<item row="5" column="1"> <item row="5" column="1">
<widget class="BlackGui::CAircraftCombinedTypeSelector" name="combined_TypeSelector"/>
</item>
<item row="6" column="1">
<widget class="QWidget" name="wi_Checkboxes" native="true"> <widget class="QWidget" name="wi_Checkboxes" native="true">
<layout class="QHBoxLayout" name="hl_CheckBoxes"> <layout class="QHBoxLayout" name="hl_CheckBoxes">
<property name="leftMargin"> <property name="leftMargin">
@@ -223,78 +239,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1">
<widget class="QLineEdit" name="le_Manufacturer">
<property name="placeholderText">
<string>e.g. Boeing, Airbus</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="lbl_ModelDescription">
<property name="text">
<string>Model:</string>
</property>
<property name="buddy">
<cstring>le_ModelDescription</cstring>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="le_ModelDescription">
<property name="placeholderText">
<string>Aircraft model</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="lbl_CombinedCode">
<property name="toolTip">
<string>Type / Engine / Engine count</string>
</property>
<property name="text">
<string>Combined type:</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="lbl_MiscFlags">
<property name="text">
<string>Misc.:</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="lbl_Timestamp">
<property name="text">
<string>Last updated:</string>
</property>
<property name="buddy">
<cstring>le_Updated</cstring>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QLineEdit" name="le_Updated">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lbl_IcaoDesignator">
<property name="text">
<string>Design./Rank:</string>
</property>
</widget>
</item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="lbl_Manufacturer"> <widget class="QLabel" name="lbl_IataFamily">
<property name="text"> <property name="text">
<string>Manufacturer:</string> <string>IATA/family:</string>
</property>
<property name="buddy">
<cstring>le_Manufacturer</cstring>
</property> </property>
</widget> </widget>
</item> </item>
@@ -314,27 +262,130 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0" colspan="2"> <item row="3" column="1">
<widget class="QLineEdit" name="le_Manufacturer">
<property name="placeholderText">
<string>e.g. Boeing, Airbus</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="lbl_ModelDescription">
<property name="text">
<string>Model:</string>
</property>
<property name="buddy">
<cstring>le_ModelDescription</cstring>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="lbl_MiscFlags">
<property name="text">
<string>Misc.:</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="lbl_CombinedCode">
<property name="toolTip">
<string>Type / Engine / Engine count</string>
</property>
<property name="text">
<string>Combined type:</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="le_ModelDescription">
<property name="placeholderText">
<string>Aircraft model</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QLineEdit" name="le_Updated">
<property name="readOnly">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>Last updated</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="lbl_Timestamp">
<property name="text">
<string>Last updated:</string>
</property>
<property name="buddy">
<cstring>le_Updated</cstring>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lbl_IcaoDesignator">
<property name="text">
<string>Design./Rank:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="lbl_Manufacturer">
<property name="text">
<string>Manufacturer:</string>
</property>
<property name="buddy">
<cstring>le_Manufacturer</cstring>
</property>
</widget>
</item>
<item row="8" column="0" colspan="2">
<widget class="BlackGui::CDropSite" name="drop_DropData"> <widget class="BlackGui::CDropSite" name="drop_DropData">
<property name="text"> <property name="text">
<string>Drop data here</string> <string>Drop data here</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2" rowspan="8"> <item row="2" column="1">
<widget class="BlackGui::Editors::CValidationIndicator" name="val_Indicator"> <widget class="QWidget" name="wi_IataFmily" native="true">
<property name="minimumSize"> <layout class="QHBoxLayout" name="hl_IataFamily">
<size> <property name="leftMargin">
<width>10</width> <number>0</number>
<height>0</height> </property>
</size> <property name="topMargin">
</property> <number>0</number>
<property name="frameShape"> </property>
<enum>QFrame::StyledPanel</enum> <property name="rightMargin">
</property> <number>0</number>
<property name="frameShadow"> </property>
<enum>QFrame::Raised</enum> <property name="bottomMargin">
</property> <number>0</number>
</property>
<item>
<widget class="QLineEdit" name="le_Iata">
<property name="layoutDirection">
<enum>Qt::RightToLeft</enum>
</property>
<property name="maxLength">
<number>10</number>
</property>
<property name="placeholderText">
<string>IATA</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="le_Family">
<property name="maxLength">
<number>10</number>
</property>
<property name="placeholderText">
<string>Family</string>
</property>
</widget>
</item>
</layout>
</widget> </widget>
</item> </item>
</layout> </layout>