flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 20:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

View / model fixes / improvements

Browse Source 
* allow upfront checking of formatter roles
* selection mode menus adjusted (data approach no longer worked with CSlot)
* removed unused style sheet parts
* minor View/Model tweaks/formatting
This commit is contained in:
Klaus Basan
2016-06-13 23:04:44 +02:00
parent 85d8d14a48
commit 993a0ebbe9
9 changed files with 83 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/blackgui/models/listmodelbase.cpp
View File

@@ -225,6 +225,13 @@ namespace BlackGui
connect(this, &CListModelBaseNonTemplate::dataChanged, this, &CListModelBaseNonTemplate::ps_onDataChanged);
}
bool CListModelBaseNonTemplate::isHoveredRow(const QModelIndex &modelIndex) const
{
if (this->m_hoverRow < 0) { return false; }
if (!modelIndex.isValid()) { return false; }
return modelIndex.row() == this->m_hoverRow;
}
template <typename ObjectType, typename ContainerType, bool UseCompare>
CListModelBase<ObjectType, ContainerType, UseCompare>::CListModelBase(const QString &translationContext, QObject *parent)
: CListModelBaseNonTemplate(translationContext, parent)
@@ -282,12 +289,26 @@ namespace BlackGui
{
// check / init
if (!this->isValidIndex(index)) { return QVariant(); }
// Hover effect
if (role == Qt::BackgroundRole)
{
if (this->isHoveredRow(index))
{
return QBrush(Qt::red);
}
return CListModelBaseNonTemplate::data(index, role);
}
// Formatter
const CDefaultFormatter *formatter = this->m_columns.getFormatter(index);
Q_ASSERT_X(formatter, Q_FUNC_INFO, "Missing formatter");
if (!formatter) { return QVariant(); }
//! Formatted data
ObjectType obj = this->containerOrFilteredContainer()[index.row()];
// Upfront checking avoids unnecessary data fetching
if (!formatter || !formatter->supportsRole(role)) { return CListModelBaseNonTemplate::data(index, role); }
// Formatted data
const ObjectType obj = this->containerOrFilteredContainer()[index.row()];
BlackMisc::CPropertyIndex propertyIndex = this->columnToPropertyIndex(index.column());
return formatter->data(role, obj.propertyByIndex(propertyIndex)).getQVariant();
}
@@ -296,26 +317,14 @@ namespace BlackGui
bool CListModelBase<ObjectType, ContainerType, UseCompare>::setData(const QModelIndex &index, const QVariant &value, int role)
{
Qt::ItemDataRole dataRole = static_cast<Qt::ItemDataRole>(role);
if (!(dataRole == Qt::UserRole || dataRole == Qt::EditRole))
{
return false;
}
if (!(dataRole == Qt::UserRole || dataRole == Qt::EditRole)) { return false; }
// check / init
if (!this->isValidIndex(index))
{
return false;
}
if (!this->m_columns.isEditable(index))
{
return false;
}
if (!this->isValidIndex(index)) { return false; }
if (!this->m_columns.isEditable(index)) { return false; }
const CDefaultFormatter *formatter = this->m_columns.getFormatter(index);
Q_ASSERT(formatter);
if (!formatter)
{
return false;
}
if (!formatter) { return false; }
ObjectType obj = this->m_container[index.row()];
ObjectType currentObject(obj);