refs #139 , updated models to support new CColumn class and editable columns

This commit is contained in:
Klaus Basan
2014-02-17 02:16:40 +01:00
parent c6c2d31cac
commit 2c75fa4ab0
5 changed files with 32 additions and 32 deletions

View File

@@ -16,16 +16,16 @@ namespace BlackGui
*/
CAircraftListModel::CAircraftListModel(QObject *parent) : CListModelBase("ViewAircraftList", parent)
{
this->m_columns.addColumn(CAircraft::IndexCallsign, "callsign");
this->m_columns.addColumn(CAircraft::IndexPilotRealName, "pilotrealname");
this->m_columns.addColumn(CAircraft::IndexDistance, "distance", Qt::AlignRight | Qt::AlignVCenter);
this->m_columns.addColumn(CAircraft::IndexFrequencyCom1, "frequency", Qt::AlignRight | Qt::AlignVCenter);
this->m_columns.addColumn(CAircraftIcao::IndexAsString, "model");
this->m_columns.addColumn(CAircraft::IndexTansponderFormatted, "transponder");
this->m_columns.addColumn(CAircraftSituation::IndexPositionLatitude, "latitude", Qt::AlignRight | Qt::AlignVCenter);
this->m_columns.addColumn(CAircraftSituation::IndexPositionLongitude, "longitude", Qt::AlignRight | Qt::AlignVCenter);
this->m_columns.addColumn(CAircraftSituation::IndexAltitude, "altitude", Qt::AlignRight | Qt::AlignVCenter);
this->m_columns.addColumn(CAircraftSituation::IndexGroundspeed, "groundspeed", Qt::AlignRight | Qt::AlignVCenter);
this->m_columns.addColumn(CColumn("callsign", CAircraft::IndexCallsign));
this->m_columns.addColumn(CColumn("pilotrealname", CAircraft::IndexPilotRealName));
this->m_columns.addColumn(CColumn("distance", CAircraft::IndexDistance, Qt::AlignRight | Qt::AlignVCenter));
this->m_columns.addColumn(CColumn("frequency", CAircraft::IndexFrequencyCom1, Qt::AlignRight | Qt::AlignVCenter));
this->m_columns.addColumn(CColumn("model", CAircraftIcao::IndexAsString));
this->m_columns.addColumn(CColumn("transponder", CAircraft::IndexTansponderFormatted));
this->m_columns.addColumn(CColumn("latitude", CAircraftSituation::IndexPositionLatitude, Qt::AlignRight | Qt::AlignVCenter));
this->m_columns.addColumn(CColumn("longitude", CAircraftSituation::IndexPositionLongitude, Qt::AlignRight | Qt::AlignVCenter));
this->m_columns.addColumn(CColumn("altitude", CAircraftSituation::IndexAltitude, Qt::AlignRight | Qt::AlignVCenter));
this->m_columns.addColumn(CColumn("groundspeed", CAircraftSituation::IndexGroundspeed, Qt::AlignRight | Qt::AlignVCenter));
// default sort order
this->setSortColumnByPropertyIndex(CAircraft::IndexDistance);

View File

@@ -15,14 +15,14 @@ namespace BlackGui
*/
CAtcListModel::CAtcListModel(QObject *parent) : CListModelBase("ViewAtcList", parent)
{
this->m_columns.addColumn(CAtcStation::IndexCallsignAsStringAsSet, "callsign");
this->m_columns.addColumn(CAtcStation::IndexDistance, "distance", Qt::AlignRight | Qt::AlignVCenter);
this->m_columns.addColumn(CAtcStation::IndexFrequency, "frequency", Qt::AlignRight | Qt::AlignVCenter);
this->m_columns.addColumn(CAtcStation::IndexControllerRealName, "controllername");
this->m_columns.addColumn(CAtcStation::IndexIsOnline, "online");
this->m_columns.addColumn(CAtcStation::IndexBookedFrom, "bookedfrom");
this->m_columns.addColumn(CAtcStation::IndexBookedUntil, "bookeduntil");
this->m_columns.addColumn(CAtcStation::IndexVoiceRoomUrl, "voiceroomurl");
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("frequency", CAtcStation::IndexFrequency, Qt::AlignRight | Qt::AlignVCenter));
this->m_columns.addColumn(CColumn("controllername", CAtcStation::IndexControllerRealName));
this->m_columns.addColumn(CColumn("online", CAtcStation::IndexIsOnline));
this->m_columns.addColumn(CColumn("bookedfrom", CAtcStation::IndexBookedFrom));
this->m_columns.addColumn(CColumn("bookeduntil", CAtcStation::IndexBookedUntil));
this->m_columns.addColumn(CColumn("voiceroomurl", CAtcStation::IndexVoiceRoomUrl));
// default sort order

View File

@@ -18,12 +18,12 @@ namespace BlackGui
CServerListModel::CServerListModel(QObject *parent) :
CListModelBase("ViewServerList", parent)
{
this->m_columns.addColumn(CServer::IndexName, "name");
this->m_columns.addColumn(CServer::IndexDescription, "description");
this->m_columns.addColumn(CServer::IndexAddress, "address");
this->m_columns.addColumn(CServer::IndexPort, "port");
this->m_columns.addColumn(CServer::IndexUserRealName, "realname");
this->m_columns.addColumn(CServer::IndexUserId, "userid");
this->m_columns.addColumn(CColumn("name", CServer::IndexName));
this->m_columns.addColumn(CColumn("description", CServer::IndexDescription));
this->m_columns.addColumn(CColumn("address", CServer::IndexAddress));
this->m_columns.addColumn(CColumn("port", CServer::IndexPort));
this->m_columns.addColumn(CColumn("realname", CServer::IndexUserRealName));
this->m_columns.addColumn(CColumn("userid", CServer::IndexUserId));
// force strings for translation in resource files
(void)QT_TRANSLATE_NOOP("ViewServerList", "name");

View File

@@ -14,10 +14,10 @@ namespace BlackGui
CStatusMessageListModel::CStatusMessageListModel(QObject *parent) :
CListModelBase<BlackMisc::CStatusMessage, BlackMisc::CStatusMessageList>("ViewStatusMessageList", parent)
{
this->m_columns.addColumn(CStatusMessage::IndexTimestamp, "time");
this->m_columns.addColumn(CStatusMessage::IndexSeverity, "", Qt::AlignCenter);
this->m_columns.addColumn(CStatusMessage::IndexMessage, "message");
this->m_columns.addColumn(CStatusMessage::IndexTypeAsString, "type");
this->m_columns.addColumn(CColumn("time", CStatusMessage::IndexTimestamp));
this->m_columns.addColumn(CColumn("", CStatusMessage::IndexSeverity, Qt::AlignCenter));
this->m_columns.addColumn(CColumn("message", CStatusMessage::IndexMessage));
this->m_columns.addColumn(CColumn("type", CStatusMessage::IndexTypeAsString));
this->m_sortedColumn = CStatusMessage::IndexTimestamp;
this->m_sortOrder = Qt::DescendingOrder;

View File

@@ -13,10 +13,10 @@ namespace BlackGui
CUserListModel::CUserListModel(QObject *parent) :
CListModelBase<BlackMisc::Network::CUser, BlackMisc::Network::CUserList>("ViewUserList", parent)
{
this->m_columns.addColumn(CUser::IndexCallsignIcon, "");
this->m_columns.addColumn(CUser::IndexRealName, "realname");
this->m_columns.addColumn(CUser::IndexCallsign, "callsign");
this->m_columns.addColumn(CUser::IndexId, "userid");
this->m_columns.addColumn(CColumn("", CUser::IndexCallsignIcon));
this->m_columns.addColumn(CColumn("realname", CUser::IndexRealName));
this->m_columns.addColumn(CColumn("callsign", CUser::IndexCallsign));
this->m_columns.addColumn(CColumn("userid", CUser::IndexId));
// this->m_columns.addColumn(CUser::IndexEmail, "email");
// force strings for translation in resource files