flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-14 08:45:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T343, style

Browse Source
This commit is contained in:
Klaus Basan
2018-09-09 02:36:16 +02:00
parent 9ead9fd338
commit 8c10237dce
4 changed files with 22 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/blackgui/models/userlistmodel.cpp
View File

@@ -24,9 +24,6 @@ namespace BlackGui
{ {
namespace Models namespace Models
{ {
/*
* Constructor
*/
CUserListModel::CUserListModel(UserMode userMode, QObject *parent) : CUserListModel::CUserListModel(UserMode userMode, QObject *parent) :
CListModelBase("ModelUserList", parent), m_userMode(NotSet) CListModelBase("ModelUserList", parent), m_userMode(NotSet)
{ {
@@ -40,37 +37,34 @@ namespace BlackGui
(void)QT_TRANSLATE_NOOP("ModelUserList", "email"); (void)QT_TRANSLATE_NOOP("ModelUserList", "email");
} }
/*
* Mode
*/
void CUserListModel::setUserMode(CUserListModel::UserMode userMode) void CUserListModel::setUserMode(CUserListModel::UserMode userMode)
{ {
if (this->m_userMode == userMode) return; if (m_userMode == userMode) return;
this->m_userMode = userMode; m_userMode = userMode;
this->m_columns.clear(); m_columns.clear();
switch (userMode) switch (userMode)
{ {
case NotSet: case NotSet:
case UserDetailed: case UserDetailed:
this->m_columns.addColumn(CColumn(CUser::IndexIcon)); m_columns.addColumn(CColumn(CUser::IndexIcon));
this->m_columns.addColumn(CColumn::standardString("realname", CUser::IndexRealName)); m_columns.addColumn(CColumn::standardString("realname", CUser::IndexRealName));
this->m_columns.addColumn(CColumn::standardValueObject("callsign", { CUser::IndexCallsign, CCallsign::IndexCallsignString })); m_columns.addColumn(CColumn::standardValueObject("callsign", { CUser::IndexCallsign, CCallsign::IndexCallsignString }));
this->m_columns.addColumn(CColumn::standardValueObject("hb.", "homebase", { CUser::IndexHomebase, CAirportIcaoCode::IndexString })); m_columns.addColumn(CColumn::standardValueObject("hb.", "homebase", { CUser::IndexHomebase, CAirportIcaoCode::IndexString }));
this->m_columns.addColumn(CColumn::standardString("userid", CUser::IndexId)); m_columns.addColumn(CColumn::standardString("userid", CUser::IndexId));
// default sort order // default sort order
this->setSortColumnByPropertyIndex(CUser::IndexRealName); this->setSortColumnByPropertyIndex(CUser::IndexRealName);
this->m_sortOrder = Qt::AscendingOrder; m_sortOrder = Qt::AscendingOrder;
break; break;
case UserShort: case UserShort:
this->m_columns.addColumn(CColumn(CUser::IndexIcon)); m_columns.addColumn(CColumn(CUser::IndexIcon));
this->m_columns.addColumn(CColumn::standardString("realname", CUser::IndexRealName)); m_columns.addColumn(CColumn::standardString("realname", CUser::IndexRealName));
this->m_columns.addColumn(CColumn::standardValueObject("callsign", CUser::IndexCallsign)); m_columns.addColumn(CColumn::standardValueObject("callsign", CUser::IndexCallsign));
// default sort order // default sort order
this->setSortColumnByPropertyIndex(CUser::IndexCallsign); this->setSortColumnByPropertyIndex(CUser::IndexCallsign);
this->m_sortOrder = Qt::AscendingOrder; m_sortOrder = Qt::AscendingOrder;
break; break;
default: default:
@@ -78,5 +72,5 @@ namespace BlackGui
break; break;
} }
} }
} } // ns
} } // ns

5
src/blackgui/models/userlistmodel.h
View File

@@ -14,11 +14,8 @@
#include "blackgui/blackguiexport.h" #include "blackgui/blackguiexport.h"
#include "blackgui/models/listmodelbase.h" #include "blackgui/models/listmodelbase.h"
#include "blackmisc/network/user.h"
#include "blackmisc/network/userlist.h" #include "blackmisc/network/userlist.h"
class QObject;
namespace BlackGui namespace BlackGui
{ {
namespace Models namespace Models
@@ -49,7 +46,7 @@ namespace BlackGui
void setUserMode(UserMode userMode); void setUserMode(UserMode userMode);
private: private:
UserMode m_userMode; UserMode m_userMode = NotSet;
}; };
} }
} }

8
src/blackgui/views/userview.cpp
View File

@@ -26,8 +26,8 @@ namespace BlackGui
void CUserView::setUserMode(CUserListModel::UserMode userMode) void CUserView::setUserMode(CUserListModel::UserMode userMode)
{ {
Q_ASSERT(this->m_model); Q_ASSERT(m_model);
this->m_model->setUserMode(userMode); m_model->setUserMode(userMode);
} }
} } // ns
} } // ns

7
src/blackgui/views/userview.h
View File

@@ -17,9 +17,7 @@
#include "blackgui/views/viewbase.h" #include "blackgui/views/viewbase.h"
#include "blackmisc/network/userlist.h" #include "blackmisc/network/userlist.h"
class QWidget;
namespace BlackMisc { namespace Network { class CUser; } } namespace BlackMisc { namespace Network { class CUser; } }
namespace BlackGui namespace BlackGui
{ {
namespace Views namespace Views
@@ -27,15 +25,14 @@ namespace BlackGui
//! User view //! User view
class BLACKGUI_EXPORT CUserView : public CViewBase<Models::CUserListModel, BlackMisc::Network::CUserList, BlackMisc::Network::CUser> class BLACKGUI_EXPORT CUserView : public CViewBase<Models::CUserListModel, BlackMisc::Network::CUserList, BlackMisc::Network::CUser>
{ {
public: public:
//! Constructor //! Constructor
explicit CUserView(QWidget *parent = nullptr); explicit CUserView(QWidget *parent = nullptr);
//! Set station mode //! Set user mode
void setUserMode(Models::CUserListModel::UserMode userMode); void setUserMode(Models::CUserListModel::UserMode userMode);
}; };
} }
} }
#endif // guard #endif // guard