mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-19 22:35:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Dive list: mark invalid dives with a struck out font

Browse source 
Mark invalid dives in the dive list by striking them out
and rendering them with a grey color. The color-change is
not sufficient, because the default model delegate ignores
color hints if the item is selected.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-12-12 23:40:16 +01:00 • committed by Dirk Hohndel
parent 95b60d1b18
commit 65acd9976c
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
qt-models/divetripmodel.cpp
View file

@ -107,6 +107,9 @@ QVariant DiveTripModelBase::tripData(const dive_trip *trip, int column, int role
case MobileListModel::TripNotesRole: return QString(trip->notes);
}
#endif
// Set the font for all trips alike
if (role == Qt::FontRole)
return defaultModelFont();
if (role == TRIP_ROLE)
return QVariant::fromValue(const_cast<dive_trip *>(trip)); // Not nice: casting away a const
@ -187,6 +190,15 @@ static QString displayWeight(const struct dive *d, bool units)
return s + gettextFromC::tr("lbs");
}
static QFont struckOutFont()
{
QFont font;
font.setStrikeOut(true);
return font;
}
static QBrush invalidForeground(Qt::gray);
static QFont invalidFont = struckOutFont();
QVariant DiveTripModelBase::diveData(const struct dive *d, int column, int role)
{
#ifdef SUBSURFACE_MOBILE
@ -235,6 +247,10 @@ QVariant DiveTripModelBase::diveData(const struct dive *d, int column, int role)
}
#endif
switch (role) {
case Qt::FontRole:
return d->invalid ? invalidFont : defaultModelFont();
case Qt::ForegroundRole:
return d->invalid ? invalidForeground : QVariant();
case Qt::TextAlignmentRole:
return dive_table_alignment(column);
case Qt::DisplayRole:
@ -922,10 +938,6 @@ void DiveTripModelTree::divesHidden(dive_trip *trip, const QVector<dive *> &dive
QVariant DiveTripModelTree::data(const QModelIndex &index, int role) const
{
// Set the font for all items alike
if (role == Qt::FontRole)
return defaultModelFont();
dive_or_trip entry = tripOrDive(index);
if (!entry.trip && !entry.dive)
return QVariant(); // That's an invalid index!
@ -1524,10 +1536,6 @@ void DiveTripModelList::filterReset()
QVariant DiveTripModelList::data(const QModelIndex &index, int role) const
{
// Set the font for all items alike
if (role == Qt::FontRole)
return defaultModelFont();
dive *d = diveOrNull(index);
return d ? diveData(d, index.column(), role) : QVariant();
}