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

refs #304, Icons, using new CIcon class

Browse Source
This commit is contained in:
Klaus Basan
2014-08-02 22:03:18 +02:00
parent 5873ec9359
commit 42f89ebeca
20 changed files with 151 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackgui/models/atcstationlistmodel.cpp
View File

@@ -44,7 +44,7 @@ namespace BlackGui
case NotSet:
case StationsOnline:
this->m_columns.addColumn(CColumn("callsign", CAtcStation::IndexCallsignAsStringAsSet));
this->m_columns.addColumn(CColumn(CAtcStation::IndexIcon, true));
this->m_columns.addColumn(CColumn(CAtcStation::IndexPixmap, true));
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));
@@ -59,7 +59,7 @@ namespace BlackGui
case StationsBooked:
this->m_columns.addColumn(CColumn("callsign", CAtcStation::IndexCallsignAsStringAsSet));
this->m_columns.addColumn(CColumn(CAtcStation::IndexIcon, true));
this->m_columns.addColumn(CColumn(CAtcStation::IndexPixmap, true));
this->m_columns.addColumn(CColumn("controllername", CAtcStation::IndexControllerRealName));
this->m_columns.addColumn(CColumn("bookedfrom", CAtcStation::IndexBookedFrom));
this->m_columns.addColumn(CColumn("bookeduntil", CAtcStation::IndexBookedUntil));

5
src/blackgui/models/clientlistmodel.cpp
View File

@@ -9,6 +9,7 @@
#include "clientlistmodel.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackmisc/icon.h"
#include <QMetaProperty>
#include <QBrush>
@@ -27,7 +28,7 @@ namespace BlackGui
this->m_columns.addColumn(CColumn("", CClient::IndexCallsignIcon));
this->m_columns.addColumn(CColumn("callsign", CClient::IndexCallsign));
this->m_columns.addColumn(CColumn("realname", CClient::IndexRealName));
this->m_columns.addColumn(CColumn("", CClient::IndexVoiceCapabilitiesIcon));
this->m_columns.addColumn(CColumn("", CClient::IndexVoiceCapabilitiesPixmap));
this->m_columns.addColumn(CColumn("capabilities", CClient::IndexCapabilitiesString));
this->m_columns.addColumn(CColumn("model", CClient::IndexQueriedModelString));
this->m_columns.addColumn(CColumn("server", CClient::IndexServer));
@@ -53,7 +54,7 @@ namespace BlackGui
if (role == Qt::DecorationRole)
{
CClient u = this->at(modelIndex);
return u.toIcon();
return QVariant(u.toPixmap());
}
}
return CListModelBase::data(modelIndex, role);

3
src/blackgui/models/statusmessagelistmodel.cpp
View File

@@ -1,4 +1,5 @@
#include "statusmessagelistmodel.h"
#include "blackmisc/icon.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include <QMetaProperty>
#include <QBrush>
@@ -43,7 +44,7 @@ namespace BlackGui
if (role == Qt::DecorationRole)
{
CStatusMessage msg = this->at(modelIndex);
return msg.toIcon();
return QVariant(msg.toPixmap());
}
else if (role == Qt::DisplayRole)
{