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

Ref T442, style

Browse Source
This commit is contained in:
Klaus Basan
2018-12-04 14:34:45 +01:00
parent 1f60390cea
commit 34cb0abdf0
4 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/blackgui/models/aircrafticaolistmodel.cpp
View File

@@ -26,25 +26,25 @@ namespace BlackGui
CAircraftIcaoCodeListModel::CAircraftIcaoCodeListModel(QObject *parent) : CAircraftIcaoCodeListModel::CAircraftIcaoCodeListModel(QObject *parent) :
CListModelDbObjects("AircraftIcaoListModel", parent) CListModelDbObjects("AircraftIcaoListModel", parent)
{ {
this->m_columns.addColumn(CColumn::standardString("id", CAircraftIcaoCode::IndexDbIntegerKey, CDefaultFormatter::alignRightVCenter())); m_columns.addColumn(CColumn::standardString("id", CAircraftIcaoCode::IndexDbIntegerKey, CDefaultFormatter::alignRightVCenter()));
this->m_columns.addColumn(CColumn::standardString("ICAO", CAircraftIcaoCode::IndexAircraftDesignator)); m_columns.addColumn(CColumn::standardString("ICAO", CAircraftIcaoCode::IndexAircraftDesignator));
this->m_columns.addColumn(CColumn::standardString("IATA", CAircraftIcaoCode::IndexIataCode)); m_columns.addColumn(CColumn::standardString("IATA", CAircraftIcaoCode::IndexIataCode));
this->m_columns.addColumn(CColumn::standardValueObject("rank", CAircraftIcaoCode::IndexRank, CDefaultFormatter::alignRightVCenter())); m_columns.addColumn(CColumn::standardValueObject("rank", CAircraftIcaoCode::IndexRank, CDefaultFormatter::alignRightVCenter()));
this->m_columns.addColumn(CColumn::standardString("manufacturer", CAircraftIcaoCode::IndexManufacturer)); m_columns.addColumn(CColumn::standardString("manufacturer", CAircraftIcaoCode::IndexManufacturer));
this->m_columns.addColumn(CColumn::standardString("family", CAircraftIcaoCode::IndexFamily)); m_columns.addColumn(CColumn::standardString("family", CAircraftIcaoCode::IndexFamily));
this->m_columns.addColumn(CColumn::standardString("ICAO desc.", "ICAO description", CAircraftIcaoCode::IndexModelDescription)); m_columns.addColumn(CColumn::standardString("ICAO desc.", "ICAO description", CAircraftIcaoCode::IndexModelDescription));
this->m_columns.addColumn(CColumn::standardString("IATA desc.", "IATA description", CAircraftIcaoCode::IndexModelIataDescription)); m_columns.addColumn(CColumn::standardString("IATA desc.", "IATA description", CAircraftIcaoCode::IndexModelIataDescription));
this->m_columns.addColumn(CColumn::standardString("swift desc.", "swift description", CAircraftIcaoCode::IndexModelSwiftDescription)); m_columns.addColumn(CColumn::standardString("swift desc.", "swift description", CAircraftIcaoCode::IndexModelSwiftDescription));
this->m_columns.addColumn(CColumn::standardString("type", "combined type", CAircraftIcaoCode::IndexCombinedAircraftType)); m_columns.addColumn(CColumn::standardString("type", "combined type", CAircraftIcaoCode::IndexCombinedAircraftType));
this->m_columns.addColumn(CColumn::standardString("WTC", "wake turbulence category", CAircraftIcaoCode::IndexWtc)); m_columns.addColumn(CColumn::standardString("WTC", "wake turbulence category", CAircraftIcaoCode::IndexWtc));
this->m_columns.addColumn(CColumn("mil.", "military", CAircraftIcaoCode::IndexIsMilitary, new CBoolIconFormatter("military", "civil"))); m_columns.addColumn(CColumn("mil.", "military", CAircraftIcaoCode::IndexIsMilitary, new CBoolIconFormatter("military", "civil")));
this->m_columns.addColumn(CColumn("VTOL", "vertical take-off and landing", CAircraftIcaoCode::IndexIsVtol, new CBoolIconFormatter("VTOL", "non VTOL"))); this->m_columns.addColumn(CColumn("leg.", "legacy", CAircraftIcaoCode::IndexIsLegacy, new CBoolIconFormatter("legacy", "operating"))); m_columns.addColumn(CColumn("VTOL", "vertical take-off and landing", CAircraftIcaoCode::IndexIsVtol, new CBoolIconFormatter("VTOL", "non VTOL"))); m_columns.addColumn(CColumn("leg.", "legacy", CAircraftIcaoCode::IndexIsLegacy, new CBoolIconFormatter("legacy", "operating")));
this->m_columns.addColumn(CColumn("real.", "real world aircraft", CAircraftIcaoCode::IndexIsRealworld, new CBoolIconFormatter("real", "non real"))); m_columns.addColumn(CColumn("real.", "real world aircraft", CAircraftIcaoCode::IndexIsRealworld, new CBoolIconFormatter("real", "non real")));
this->m_columns.addColumn(CColumn::standardString("changed", CAircraftIcaoCode::IndexUtcTimestampFormattedYmdhms)); m_columns.addColumn(CColumn::standardString("changed", CAircraftIcaoCode::IndexUtcTimestampFormattedYmdhms));
// default sort order // default sort order
this->setSortColumnByPropertyIndex(CAircraftIcaoCode::IndexAircraftDesignator); this->setSortColumnByPropertyIndex(CAircraftIcaoCode::IndexAircraftDesignator);
this->m_sortOrder = Qt::AscendingOrder; m_sortOrder = Qt::AscendingOrder;
} }
} // ns } // ns
} // ns } // ns

16
src/blackgui/models/airportlistmodel.cpp
View File

@@ -28,17 +28,17 @@ namespace BlackGui
CAirportListModel::CAirportListModel(QObject *parent) : CAirportListModel::CAirportListModel(QObject *parent) :
CListModelBase("AirportListModel", parent) CListModelBase("AirportListModel", parent)
{ {
this->m_columns.addColumn(CColumn::standardValueObject("ICAO", CAirport::IndexIcao)); m_columns.addColumn(CColumn::standardValueObject("ICAO", CAirport::IndexIcao));
this->m_columns.addColumn(CColumn("distance", CAirport::IndexRelativeDistance, new CAirspaceDistanceFormatter())); m_columns.addColumn(CColumn("distance", CAirport::IndexRelativeDistance, new CAirspaceDistanceFormatter()));
this->m_columns.addColumn(CColumn("bearing", CAirport::IndexRelativeBearing, new CAngleDegreeFormatter())); m_columns.addColumn(CColumn("bearing", CAirport::IndexRelativeBearing, new CAngleDegreeFormatter()));
this->m_columns.addColumn(CColumn::standardString("name", CAirport::IndexDescriptiveName)); m_columns.addColumn(CColumn::standardString("name", CAirport::IndexDescriptiveName));
this->m_columns.addColumn(CColumn("elevation", CAirport::IndexElevation, new CAltitudeFormatter())); m_columns.addColumn(CColumn("elevation", CAirport::IndexElevation, new CAltitudeFormatter()));
this->m_columns.addColumn(CColumn("latitude", CAirport::IndexLatitude, new CLatLonFormatter())); m_columns.addColumn(CColumn("latitude", CAirport::IndexLatitude, new CLatLonFormatter()));
this->m_columns.addColumn(CColumn("longitude", CAirport::IndexLongitude, new CLatLonFormatter())); m_columns.addColumn(CColumn("longitude", CAirport::IndexLongitude, new CLatLonFormatter()));
// default sort order // default sort order
this->setSortColumnByPropertyIndex(CAirport::IndexRelativeDistance); this->setSortColumnByPropertyIndex(CAirport::IndexRelativeDistance);
this->m_sortOrder = Qt::AscendingOrder; m_sortOrder = Qt::AscendingOrder;
// force strings for translation in resource files // force strings for translation in resource files
(void)QT_TRANSLATE_NOOP("ModelAirportList", "ICAO"); (void)QT_TRANSLATE_NOOP("ModelAirportList", "ICAO");

30
src/blackgui/models/distributorlistmodel.cpp
View File

@@ -40,41 +40,41 @@ namespace BlackGui
void CDistributorListModel::setDistributorMode(CDistributorListModel::DistributorMode distributorMode) void CDistributorListModel::setDistributorMode(CDistributorListModel::DistributorMode distributorMode)
{ {
if (this->m_distributorMode == distributorMode) { return; } if (m_distributorMode == distributorMode) { return; }
this->m_distributorMode = distributorMode; m_distributorMode = distributorMode;
this->m_columns.clear(); m_columns.clear();
switch (distributorMode) switch (distributorMode)
{ {
case NormalWithOrder: case NormalWithOrder:
this->m_columns.addColumn(CColumn::orderColumn()); m_columns.addColumn(CColumn::orderColumn());
BLACK_FALLTHROUGH; BLACK_FALLTHROUGH;
case NotSet: case NotSet:
case Normal: case Normal:
{ {
this->m_columns.addColumn(CColumn::standardString("key", CDistributor::IndexDbStringKey)); m_columns.addColumn(CColumn::standardString("key", CDistributor::IndexDbStringKey));
this->m_columns.addColumn(CColumn::standardString("description", CDistributor::IndexDescription)); m_columns.addColumn(CColumn::standardString("description", CDistributor::IndexDescription));
this->m_columns.addColumn(CColumn::standardString("alias1", CDistributor::IndexAlias1)); m_columns.addColumn(CColumn::standardString("alias1", CDistributor::IndexAlias1));
this->m_columns.addColumn(CColumn::standardString("alias2", CDistributor::IndexAlias2)); m_columns.addColumn(CColumn::standardString("alias2", CDistributor::IndexAlias2));
this->m_columns.addColumn(CColumn::standardString("sim.", "simulator", { CDistributor::IndexSimulator, CSimulatorInfo::IndexString})); m_columns.addColumn(CColumn::standardString("sim.", "simulator", { CDistributor::IndexSimulator, CSimulatorInfo::IndexString}));
this->m_columns.addColumn(CColumn::standardString("changed", CDistributor::IndexUtcTimestampFormattedYmdhms)); m_columns.addColumn(CColumn::standardString("changed", CDistributor::IndexUtcTimestampFormattedYmdhms));
// default sort order // default sort order
this->setSortColumnByPropertyIndex(CDistributor::IndexDbStringKey); this->setSortColumnByPropertyIndex(CDistributor::IndexDbStringKey);
this->m_sortOrder = Qt::AscendingOrder; m_sortOrder = Qt::AscendingOrder;
} }
break; break;
case MinimalWithOrder: case MinimalWithOrder:
this->m_columns.addColumn(CColumn::orderColumn()); m_columns.addColumn(CColumn::orderColumn());
BLACK_FALLTHROUGH; BLACK_FALLTHROUGH;
case Minimal: case Minimal:
{ {
this->m_columns.addColumn(CColumn::standardString("key", CDistributor::IndexDbStringKey)); m_columns.addColumn(CColumn::standardString("key", CDistributor::IndexDbStringKey));
this->m_columns.addColumn(CColumn::standardString("description", CDistributor::IndexDescription)); m_columns.addColumn(CColumn::standardString("description", CDistributor::IndexDescription));
// default sort order // default sort order
this->setSortColumnByPropertyIndex(CDistributor::IndexDbStringKey); this->setSortColumnByPropertyIndex(CDistributor::IndexDbStringKey);
this->m_sortOrder = Qt::AscendingOrder; m_sortOrder = Qt::AscendingOrder;
} }
break; break;

10
src/blackgui/models/windlayerlistmodel.cpp
View File

@@ -24,14 +24,14 @@ namespace BlackGui
CWindLayerListModel::CWindLayerListModel(QObject *parent) : CWindLayerListModel::CWindLayerListModel(QObject *parent) :
CListModelBase("WindLayerListModel", parent) CListModelBase("WindLayerListModel", parent)
{ {
this->m_columns.addColumn(CColumn("level", CWindLayer::IndexLevel, new CAltitudeFormatter())); m_columns.addColumn(CColumn("level", CWindLayer::IndexLevel, new CAltitudeFormatter()));
this->m_columns.addColumn(CColumn("direction", CWindLayer::IndexDirection, new CAngleDegreeFormatter())); m_columns.addColumn(CColumn("direction", CWindLayer::IndexDirection, new CAngleDegreeFormatter()));
this->m_columns.addColumn(CColumn("speed", CWindLayer::IndexSpeed, new CSpeedKtsFormatter())); m_columns.addColumn(CColumn("speed", CWindLayer::IndexSpeed, new CSpeedKtsFormatter()));
this->m_columns.addColumn(CColumn("gust speed", CWindLayer::IndexGustSpeed, new CSpeedKtsFormatter())); m_columns.addColumn(CColumn("gust speed", CWindLayer::IndexGustSpeed, new CSpeedKtsFormatter()));
// default sort order // default sort order
this->setSortColumnByPropertyIndex(CWindLayer::IndexLevel); this->setSortColumnByPropertyIndex(CWindLayer::IndexLevel);
this->m_sortOrder = Qt::AscendingOrder; m_sortOrder = Qt::AscendingOrder;
// force strings for translation in resource files // force strings for translation in resource files
(void)QT_TRANSLATE_NOOP("ModelWindLayerList", "level"); (void)QT_TRANSLATE_NOOP("ModelWindLayerList", "level");