mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-21 04:45:31 +08:00
fixed callsign and two models
This commit is contained in:
@@ -35,6 +35,7 @@ namespace BlackGui
|
|||||||
this->m_columns.clear();
|
this->m_columns.clear();
|
||||||
switch (stationMode)
|
switch (stationMode)
|
||||||
{
|
{
|
||||||
|
case NotSet:
|
||||||
case StationsOnline:
|
case StationsOnline:
|
||||||
this->m_columns.addColumn(CColumn("callsign", CAtcStation::IndexCallsignAsStringAsSet));
|
this->m_columns.addColumn(CColumn("callsign", CAtcStation::IndexCallsignAsStringAsSet));
|
||||||
this->m_columns.addColumn(CColumn("distance", CAtcStation::IndexDistance, Qt::AlignRight | Qt::AlignVCenter));
|
this->m_columns.addColumn(CColumn("distance", CAtcStation::IndexDistance, Qt::AlignRight | Qt::AlignVCenter));
|
||||||
@@ -61,6 +62,10 @@ namespace BlackGui
|
|||||||
this->setSortColumnByPropertyIndex(CAtcStation::IndexBookedFrom);
|
this->setSortColumnByPropertyIndex(CAtcStation::IndexBookedFrom);
|
||||||
this->m_sortOrder = Qt::AscendingOrder;
|
this->m_sortOrder = Qt::AscendingOrder;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
qFatal("Wrong mode");
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ namespace BlackGui
|
|||||||
this->m_columns.clear();
|
this->m_columns.clear();
|
||||||
switch (userMode)
|
switch (userMode)
|
||||||
{
|
{
|
||||||
|
case NotSet:
|
||||||
case UserDetailed:
|
case UserDetailed:
|
||||||
this->m_columns.addColumn(CColumn("", CUser::IndexCallsignIcon));
|
this->m_columns.addColumn(CColumn("", CUser::IndexCallsignIcon));
|
||||||
this->m_columns.addColumn(CColumn("realname", CUser::IndexRealName));
|
this->m_columns.addColumn(CColumn("realname", CUser::IndexRealName));
|
||||||
@@ -44,6 +45,10 @@ namespace BlackGui
|
|||||||
this->m_columns.addColumn(CColumn("realname", CUser::IndexRealName));
|
this->m_columns.addColumn(CColumn("realname", CUser::IndexRealName));
|
||||||
this->m_columns.addColumn(CColumn("callsign", CUser::IndexCallsign));
|
this->m_columns.addColumn(CColumn("callsign", CUser::IndexCallsign));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
qFatal("Wrong mode");
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -71,10 +71,8 @@ namespace BlackMisc
|
|||||||
*/
|
*/
|
||||||
bool CCallsign::equalsString(const QString &callsignString) const
|
bool CCallsign::equalsString(const QString &callsignString) const
|
||||||
{
|
{
|
||||||
if (callsignString.isEmpty()) return false;
|
CCallsign other(callsignString);
|
||||||
if (this->isEmpty()) return false;
|
return other == (*this);
|
||||||
if (callsignString == this->m_callsign || callsignString == this->m_callsignAsSet) return true;
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
Reference in New Issue
Block a user