Added tooltips for some columns

* tooltips in views
* new helper method with tooltip
This commit is contained in:
Klaus Basan
2014-09-25 23:39:50 +02:00
parent ae0ef4283c
commit f10e625b7f
4 changed files with 26 additions and 14 deletions

View File

@@ -24,8 +24,8 @@ namespace BlackGui
*/ */
CAircraftListModel::CAircraftListModel(QObject *parent) : CListModelBase("ViewAircraftList", parent) CAircraftListModel::CAircraftListModel(QObject *parent) : CListModelBase("ViewAircraftList", parent)
{ {
this->m_columns.addColumn(CColumn::standardValueObject("callsign", CAircraft::IndexCallsign)); this->m_columns.addColumn(CColumn::standardValueObject("call", "callsign", CAircraft::IndexCallsign));
this->m_columns.addColumn(CColumn::standardString("pilotrealname", { CAircraft::IndexPilot, CUser::IndexRealName })); 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("distance", CAircraft::IndexDistance, new CAirspaceDistanceFormatter()));
this->m_columns.addColumn(CColumn("frequency", { CAircraft::IndexCom1System, CComSystem::IndexActiveFrequency }, new CComFrequencyFormatter())); this->m_columns.addColumn(CColumn("frequency", { CAircraft::IndexCom1System, CComSystem::IndexActiveFrequency }, new CComFrequencyFormatter()));
this->m_columns.addColumn(CColumn::standardString("icao", { CAircraft::IndexIcao, CAircraftIcao::IndexAsString})); 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", "groundspeed");
(void)QT_TRANSLATE_NOOP("ViewAircraftList", "icao"); (void)QT_TRANSLATE_NOOP("ViewAircraftList", "icao");
} }
} } // namespace
} } // namespace

View File

@@ -49,15 +49,13 @@ namespace BlackGui
{ {
case NotSet: case NotSet:
case StationsOnline: 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("type", CAtcStation::IndexIcon));
this->m_columns.addColumn(CColumn("distance", CAtcStation::IndexDistance, new CAirspaceDistanceFormatter())); 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("frequency", CAtcStation::IndexFrequency, new CComFrequencyFormatter()));
this->m_columns.addColumn(CColumn::standardString("controllername", { CAtcStation::IndexController, CUser::IndexRealName })); this->m_columns.addColumn(CColumn::standardString("controllername", { CAtcStation::IndexController, CUser::IndexRealName }));
this->m_columns.addColumn(CColumn("bookedfrom", CAtcStation::IndexBookedFrom, this->m_columns.addColumn(CColumn("from", "booked from", CAtcStation::IndexBookedFrom, new CDateTimeFormatter(CDateTimeFormatter::formatHm())));
new CDateTimeFormatter(CDateTimeFormatter::formatHm()))); this->m_columns.addColumn(CColumn("until", "booked until", CAtcStation::IndexBookedUntil, new CDateTimeFormatter(CDateTimeFormatter::formatHm())));
this->m_columns.addColumn(CColumn("bookeduntil", CAtcStation::IndexBookedUntil,
new CDateTimeFormatter(CDateTimeFormatter::formatHm())));
this->m_columns.addColumn(CColumn::standardString("voiceroomurl", { CAtcStation::IndexVoiceRoom, CVoiceRoom::IndexUrl })); this->m_columns.addColumn(CColumn::standardString("voiceroomurl", { CAtcStation::IndexVoiceRoom, CVoiceRoom::IndexUrl }));
// default sort order // default sort order
@@ -66,14 +64,12 @@ namespace BlackGui
break; break;
case StationsBooked: 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("type", CAtcStation::IndexIcon));
this->m_columns.addColumn(CColumn("", "on/offline", CAtcStation::IndexIsOnline, new CBoolLedFormatter("online", "offline"))); 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::standardString("controllername", { CAtcStation::IndexController, CUser::IndexRealName }));
this->m_columns.addColumn(CColumn("bookedfrom", CAtcStation::IndexBookedFrom, this->m_columns.addColumn(CColumn("from", "booked from", CAtcStation::IndexBookedFrom, new CDateTimeFormatter(CDateTimeFormatter::formatYmdhm())));
new CDateTimeFormatter(CDateTimeFormatter::formatYmdhm()))); this->m_columns.addColumn(CColumn("until", "booked until", CAtcStation::IndexBookedUntil, new CDateTimeFormatter(CDateTimeFormatter::formatYmdhm())));
this->m_columns.addColumn(CColumn("bookeduntil", CAtcStation::IndexBookedUntil,
new CDateTimeFormatter(CDateTimeFormatter::formatYmdhm())));
this->m_columns.addColumn(CColumn("frequency", CAtcStation::IndexFrequency, new CComFrequencyFormatter())); this->m_columns.addColumn(CColumn("frequency", CAtcStation::IndexFrequency, new CComFrequencyFormatter()));
// default sort order // default sort order

View File

@@ -60,11 +60,21 @@ namespace BlackGui
return CColumn(headerName, propertyIndex, new CValueObjectFormatter(alignment)); 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) CColumn CColumn::standardString(const QString &headerName, const BlackMisc::CPropertyIndex &propertyIndex, int alignment)
{ {
return CColumn(headerName, propertyIndex, new CStringFormatter(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 ---------------------------------------------- // --------------- columns ----------------------------------------------
CColumns::CColumns(const QString &translationContext, QObject *parent) : CColumns::CColumns(const QString &translationContext, QObject *parent) :

View File

@@ -73,9 +73,15 @@ namespace BlackGui
//! Get a standard value object formatted column //! Get a standard value object formatted column
static CColumn standardValueObject(const QString &headerName, const BlackMisc::CPropertyIndex &propertyIndex, int alignment = CDefaultFormatter::alignDefault()); 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 //! Get a standard string object formatted column
static CColumn standardString(const QString &headerName, const BlackMisc::CPropertyIndex &propertyIndex, int alignment = CDefaultFormatter::alignDefault()); 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: private:
QString m_translationContext; QString m_translationContext;
QString m_columnName; QString m_columnName;