diff --git a/src/blackgui/models/aircraftlistmodel.cpp b/src/blackgui/models/aircraftlistmodel.cpp index 651d80878..855b74fd1 100644 --- a/src/blackgui/models/aircraftlistmodel.cpp +++ b/src/blackgui/models/aircraftlistmodel.cpp @@ -24,8 +24,8 @@ namespace BlackGui */ CAircraftListModel::CAircraftListModel(QObject *parent) : CListModelBase("ViewAircraftList", parent) { - this->m_columns.addColumn(CColumn::standardValueObject("callsign", CAircraft::IndexCallsign)); - this->m_columns.addColumn(CColumn::standardString("pilotrealname", { CAircraft::IndexPilot, CUser::IndexRealName })); + this->m_columns.addColumn(CColumn::standardValueObject("call", "callsign", CAircraft::IndexCallsign)); + this->m_columns.addColumn(CColumn::standardString("realname", "pilot's real name", { CAircraft::IndexPilot, CUser::IndexRealName })); this->m_columns.addColumn(CColumn("distance", CAircraft::IndexDistance, new CAirspaceDistanceFormatter())); this->m_columns.addColumn(CColumn("frequency", { CAircraft::IndexCom1System, CComSystem::IndexActiveFrequency }, new CComFrequencyFormatter())); this->m_columns.addColumn(CColumn::standardString("icao", { CAircraft::IndexIcao, CAircraftIcao::IndexAsString})); @@ -51,5 +51,5 @@ namespace BlackGui (void)QT_TRANSLATE_NOOP("ViewAircraftList", "groundspeed"); (void)QT_TRANSLATE_NOOP("ViewAircraftList", "icao"); } - } -} + } // namespace +} // namespace diff --git a/src/blackgui/models/atcstationlistmodel.cpp b/src/blackgui/models/atcstationlistmodel.cpp index 5e757fe98..a08dbbf3d 100644 --- a/src/blackgui/models/atcstationlistmodel.cpp +++ b/src/blackgui/models/atcstationlistmodel.cpp @@ -49,15 +49,13 @@ namespace BlackGui { case NotSet: case StationsOnline: - this->m_columns.addColumn(CColumn::standardString("callsign", { CAtcStation::IndexCallsign, CCallsign::IndexCallsignStringAsSet })); + this->m_columns.addColumn(CColumn::standardString("call", "callsign", { CAtcStation::IndexCallsign, CCallsign::IndexCallsignStringAsSet })); this->m_columns.addColumn(CColumn("type", CAtcStation::IndexIcon)); this->m_columns.addColumn(CColumn("distance", CAtcStation::IndexDistance, new CAirspaceDistanceFormatter())); this->m_columns.addColumn(CColumn("frequency", CAtcStation::IndexFrequency, new CComFrequencyFormatter())); this->m_columns.addColumn(CColumn::standardString("controllername", { CAtcStation::IndexController, CUser::IndexRealName })); - this->m_columns.addColumn(CColumn("bookedfrom", CAtcStation::IndexBookedFrom, - new CDateTimeFormatter(CDateTimeFormatter::formatHm()))); - this->m_columns.addColumn(CColumn("bookeduntil", CAtcStation::IndexBookedUntil, - new CDateTimeFormatter(CDateTimeFormatter::formatHm()))); + this->m_columns.addColumn(CColumn("from", "booked from", CAtcStation::IndexBookedFrom, new CDateTimeFormatter(CDateTimeFormatter::formatHm()))); + this->m_columns.addColumn(CColumn("until", "booked until", CAtcStation::IndexBookedUntil, new CDateTimeFormatter(CDateTimeFormatter::formatHm()))); this->m_columns.addColumn(CColumn::standardString("voiceroomurl", { CAtcStation::IndexVoiceRoom, CVoiceRoom::IndexUrl })); // default sort order @@ -66,14 +64,12 @@ namespace BlackGui break; case StationsBooked: - this->m_columns.addColumn(CColumn::standardString("callsign", { CAtcStation::IndexCallsign, CCallsign::IndexCallsignStringAsSet })); + this->m_columns.addColumn(CColumn::standardString("call", "callsign", { CAtcStation::IndexCallsign, CCallsign::IndexCallsignStringAsSet })); this->m_columns.addColumn(CColumn("type", CAtcStation::IndexIcon)); this->m_columns.addColumn(CColumn("", "on/offline", CAtcStation::IndexIsOnline, new CBoolLedFormatter("online", "offline"))); this->m_columns.addColumn(CColumn::standardString("controllername", { CAtcStation::IndexController, CUser::IndexRealName })); - this->m_columns.addColumn(CColumn("bookedfrom", CAtcStation::IndexBookedFrom, - new CDateTimeFormatter(CDateTimeFormatter::formatYmdhm()))); - this->m_columns.addColumn(CColumn("bookeduntil", CAtcStation::IndexBookedUntil, - new CDateTimeFormatter(CDateTimeFormatter::formatYmdhm()))); + this->m_columns.addColumn(CColumn("from", "booked from", CAtcStation::IndexBookedFrom, new CDateTimeFormatter(CDateTimeFormatter::formatYmdhm()))); + this->m_columns.addColumn(CColumn("until", "booked until", CAtcStation::IndexBookedUntil, new CDateTimeFormatter(CDateTimeFormatter::formatYmdhm()))); this->m_columns.addColumn(CColumn("frequency", CAtcStation::IndexFrequency, new CComFrequencyFormatter())); // default sort order diff --git a/src/blackgui/models/columns.cpp b/src/blackgui/models/columns.cpp index 297b5e232..cfa34ee06 100644 --- a/src/blackgui/models/columns.cpp +++ b/src/blackgui/models/columns.cpp @@ -60,11 +60,21 @@ namespace BlackGui return CColumn(headerName, propertyIndex, new CValueObjectFormatter(alignment)); } + CColumn CColumn::standardValueObject(const QString &headerName, const QString &toolTip, const BlackMisc::CPropertyIndex &propertyIndex, int alignment) + { + return CColumn(headerName, toolTip, propertyIndex, new CValueObjectFormatter(alignment)); + } + CColumn CColumn::standardString(const QString &headerName, const BlackMisc::CPropertyIndex &propertyIndex, int alignment) { return CColumn(headerName, propertyIndex, new CStringFormatter(alignment)); } + CColumn CColumn::standardString(const QString &headerName, const QString &toolTip, const BlackMisc::CPropertyIndex &propertyIndex, int alignment) + { + return CColumn(headerName, toolTip, propertyIndex, new CStringFormatter(alignment)); + } + // --------------- columns ---------------------------------------------- CColumns::CColumns(const QString &translationContext, QObject *parent) : diff --git a/src/blackgui/models/columns.h b/src/blackgui/models/columns.h index 0088afe20..8bb938ab3 100644 --- a/src/blackgui/models/columns.h +++ b/src/blackgui/models/columns.h @@ -73,9 +73,15 @@ namespace BlackGui //! Get a standard value object formatted column static CColumn standardValueObject(const QString &headerName, const BlackMisc::CPropertyIndex &propertyIndex, int alignment = CDefaultFormatter::alignDefault()); + //! Get a standard value object formatted column + static CColumn standardValueObject(const QString &headerName, const QString &toolTip, const BlackMisc::CPropertyIndex &propertyIndex, int alignment = CDefaultFormatter::alignDefault()); + //! Get a standard string object formatted column static CColumn standardString(const QString &headerName, const BlackMisc::CPropertyIndex &propertyIndex, int alignment = CDefaultFormatter::alignDefault()); + //! Get a standard string object formatted column + static CColumn standardString(const QString &headerName, const QString &toolTip, const BlackMisc::CPropertyIndex &propertyIndex, int alignment = CDefaultFormatter::alignDefault()); + private: QString m_translationContext; QString m_columnName;