FlapJackApps/subsurface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Divelist trip text includes the number of dives shown with current filter

Browse Source 
But only if not all dives in the trip are shown.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-11-16 18:46:07 +00:00
parent e5c70de1ee
commit 80bdbc348d
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qt-ui/models.cpp
View File

@ -1068,10 +1068,20 @@ QVariant TripItem::data(int column, int role) const
if (role == Qt::DisplayRole) {
switch (column) {
case DiveTripModel::NR:
QString shownText;
struct dive *d = trip->dives;
int countShown = 0;
while (d) {
if (!d->hidden_by_filter)
countShown++;
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);
ret = QString(trip->location) + ", " + get_trip_date_string(trip->when, trip->nrdives) + shownText;
else
ret = get_trip_date_string(trip->when, trip->nrdives);
ret = get_trip_date_string(trip->when, trip->nrdives) + shownText;
break;
}
}