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

Display day number in trips longer than 1 day

Browse source 
Signed-off-by: Giorgio Marzano <marzano.giorgio@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Giorgio Marzano 2015-10-06 21:08:27 +02:00 • committed by Dirk Hohndel
parent 5d1703cf2c
commit 45b1d0d73d
3 changed files with 35 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
qt-models/divetripmodel.cpp
View file

@ -43,6 +43,7 @@ static QVariant dive_table_alignment(int column)
QVariant TripItem::data(int column, int role) const
{
QVariant ret;
bool oneDayTrip=true;
if (role == DiveTripModel::TRIP_ROLE)
return QVariant::fromValue<void *>(trip);
@ -59,14 +60,15 @@ QVariant TripItem::data(int column, int role) const
while (d) {
if (!d->hidden_by_filter)
countShown++;
oneDayTrip &= is_same_day (trip->when, d->when);
d = d->next;
}
if (countShown < trip->nrdives)
shownText = tr("(%1 shown)").arg(countShown);
if (trip->location && *trip->location)
ret = QString(trip->location) + ", " + get_trip_date_string(trip->when, trip->nrdives) + " " + shownText;
ret = QString(trip->location) + ", " + get_trip_date_string(trip->when, trip->nrdives, oneDayTrip) + " "+ shownText;
else
ret = get_trip_date_string(trip->when, trip->nrdives) + shownText;
ret = get_trip_date_string(trip->when, trip->nrdives, oneDayTrip) + shownText;
break;
}
}