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

refs #614, refs #638 removed redundant m_livery from CSimulatedAircraft and improved convertTOQString

Browse Source 
* removed some leftovers in simulated aircraft such as virtual functions
* use livery from model instead of keeping a redundant copy
This commit is contained in:
Klaus Basan
2016-04-09 23:09:20 +02:00
parent fdd7fa62d5
commit 368d803d42
4 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/blackmisc/aviation/livery.cpp
View File

@@ -91,11 +91,18 @@ namespace BlackMisc
QString CLivery::convertToQString(bool i18n) const
{
QString s(i18n ? QCoreApplication::translate("Aviation", "Livery") : "Livery");
s.append(m_combinedCode);
if (this->hasCombinedCode())
{
s.append(' ');
s.append(m_combinedCode);
}
s.append(' ');
s.append(this->m_airline.toQString(i18n));
s.append(' ');
if (!this->m_description.isEmpty()) { s.append(' ').append(this->m_description); }
if (this->m_colorFuselage.isValid()) { s.append(" F: ").append(this->m_colorFuselage.hex()); }
if (this->m_colorTail.isValid()) { s.append(" T: ").append(this->m_colorTail.hex()); }
if (this->isMilitary()) { s.append(" Military");}
s.append(" Mil: ").append(boolToYesNo(this->isMilitary()));
return s;
// force strings for translation in resource files