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

refs #745, prevent problems by setting a default callsign "SWIFT" for model matcher

Browse Source
This commit is contained in:
Klaus Basan
2016-08-26 02:17:34 +02:00
committed by Mathew Sutcliffe
parent 02e8d4a4cb
commit d62c6a5567
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/blackgui/components/modelmatchercomponent.cpp
View File

@@ -159,7 +159,7 @@ namespace BlackGui
const QString combined(ui->comp_CombinedCode->getCombinedType()); const QString combined(ui->comp_CombinedCode->getCombinedType());
const QString manufacturer(ui->le_Manufacturer->text().trimmed().toUpper()); const QString manufacturer(ui->le_Manufacturer->text().trimmed().toUpper());
const QString liveryCombinedCode(ui->comp_LiverySelector->getRawCombinedCode()); const QString liveryCombinedCode(ui->comp_LiverySelector->getRawCombinedCode());
const CCallsign cs(ui->le_Callsign->text()); const CCallsign cs(ui->le_Callsign->text().isEmpty() ? "SWIFT" : ui->le_Callsign->text()); // need callsign
static const CUser pilot("123456", "swift Test", cs); static const CUser pilot("123456", "swift Test", cs);
CAircraftIcaoCode icao(aircraft, combined); CAircraftIcaoCode icao(aircraft, combined);
@@ -183,7 +183,8 @@ namespace BlackGui
const CAircraftIcaoCode icaoAircraft("B737", "L2J", "FooBar", "Dummy", "M", false, false, false, 1); const CAircraftIcaoCode icaoAircraft("B737", "L2J", "FooBar", "Dummy", "M", false, false, false, 1);
const CAirlineIcaoCode icaoAirline("Foo", "FooBar airlines", { "DE", "Germany" }, "FOO", true, true); const CAirlineIcaoCode icaoAirline("Foo", "FooBar airlines", { "DE", "Germany" }, "FOO", true, true);
const CLivery livery(CLivery::getStandardCode(icaoAirline), icaoAirline, "Standard Foo airlines", "red", "blue", false); const CLivery livery(CLivery::getStandardCode(icaoAirline), icaoAirline, "Standard Foo airlines", "red", "blue", false);
const CAircraftModel model("default model", CAircraftModel::TypeOwnSimulatorModel, "dummy model", icaoAircraft, livery); CAircraftModel model("default model", CAircraftModel::TypeOwnSimulatorModel, "dummy model", icaoAircraft, livery);
if (model.getCallsign().isEmpty()) { model.setCallsign("SWIFT"); }
return model; return model;
} }
} // ns } // ns

24
src/blackgui/components/modelmatchercomponent.ui
View File

@@ -234,7 +234,11 @@
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="4" column="1">
<widget class="QLineEdit" name="le_Manufacturer"/> <widget class="QLineEdit" name="le_Manufacturer">
<property name="placeholderText">
<string>e.g. Cessna</string>
</property>
</widget>
</item> </item>
<item row="4" column="0"> <item row="4" column="0">
<widget class="QLabel" name="lbl_Manufacturer"> <widget class="QLabel" name="lbl_Manufacturer">
@@ -265,11 +269,21 @@
</widget> </widget>
</item> </item>
<item row="4" column="3"> <item row="4" column="3">
<widget class="QLineEdit" name="le_Callsign"/> <widget class="QLineEdit" name="le_Callsign">
<property name="placeholderText">
<string>e.g. DAMBZ</string>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>BlackGui::Components::CSimulatorSelector</class>
<extends>QFrame</extends>
<header>blackgui/components/simulatorselector.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>BlackGui::Components::CDbAirlineIcaoSelectorComponent</class> <class>BlackGui::Components::CDbAirlineIcaoSelectorComponent</class>
<extends>QFrame</extends> <extends>QFrame</extends>
@@ -294,12 +308,6 @@
<header>blackgui/components/dbaircrafticaoselectorcomponent.h</header> <header>blackgui/components/dbaircrafticaoselectorcomponent.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>BlackGui::Components::CSimulatorSelector</class>
<extends>QFrame</extends>
<header>blackgui/components/simulatorselector.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>BlackGui::Views::CStatusMessageView</class> <class>BlackGui::Views::CStatusMessageView</class>
<extends>QTableView</extends> <extends>QTableView</extends>