refs #568, improved display / sorting for status message categories

* display technical categories when no hr categories are available
* compare function for status message
This commit is contained in:
Klaus Basan
2016-01-15 23:06:07 +01:00
parent 9de1d91bb2
commit b09dbd4828
5 changed files with 65 additions and 15 deletions

View File

@@ -623,7 +623,7 @@ namespace BlackGui
// http://www.parashift.com/c++-faq/separate-template-class-defn-from-decl.html
template class CListModelBase<BlackMisc::Aviation::CLivery, BlackMisc::Aviation::CLiveryList, true>;
template class CListModelBase<BlackMisc::CIdentifier, BlackMisc::CIdentifierList, false>;
template class CListModelBase<BlackMisc::CStatusMessage, BlackMisc::CStatusMessageList, false>;
template class CListModelBase<BlackMisc::CStatusMessage, BlackMisc::CStatusMessageList, true>;
template class CListModelBase<BlackMisc::CNameVariantPair, BlackMisc::CNameVariantPairList, false>;
template class CListModelBase<BlackMisc::CCountry, BlackMisc::CCountryList, true>;
template class CListModelBase<BlackMisc::Aviation::CAtcStation, BlackMisc::Aviation::CAtcStationList, false>;

View File

@@ -21,7 +21,7 @@ namespace BlackGui
namespace Models
{
CStatusMessageListModel::CStatusMessageListModel(QObject *parent) :
CListModelBase<BlackMisc::CStatusMessage, BlackMisc::CStatusMessageList>("ViewStatusMessageList", parent)
CListModelBase<CStatusMessage, CStatusMessageList, true>("ViewStatusMessageList", parent)
{
setMode(Detailed);
@@ -41,7 +41,7 @@ namespace BlackGui
case Detailed:
{
this->m_columns.addColumn(CColumn("time", CStatusMessage::IndexUtcTimestamp, new CDateTimeFormatter(CDateTimeFormatter::formatHms())));
this->m_columns.addColumn(CColumn::standardString("category", CStatusMessage::IndexCategoryHumanReadable));
this->m_columns.addColumn(CColumn::standardString("category", CStatusMessage::IndexCategoryHumanReadableOrTechnicalAsString));
CColumn col = CColumn("severity", CStatusMessage::IndexIcon);
col.setSortPropertyIndex(CStatusMessage::IndexSeverityAsString);
this->m_columns.addColumn(col);

View File

@@ -25,9 +25,8 @@ namespace BlackGui
/*!
* Server list model
*/
class BLACKGUI_EXPORT CStatusMessageListModel : public CListModelBase<BlackMisc::CStatusMessage, BlackMisc::CStatusMessageList>
class BLACKGUI_EXPORT CStatusMessageListModel : public CListModelBase<BlackMisc::CStatusMessage, BlackMisc::CStatusMessageList, true>
{
public:
//! Mode
enum Mode