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

[Divesite] Hook qt model for country

Browse source 
See #144

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2017-10-02 17:52:07 +02:00 • committed by Dirk Hohndel
parent 516527e1bd
commit d5ab03ef4e
2 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

17
qt-models/divetripmodel.cpp
View file

@ -36,6 +36,7 @@ static QVariant dive_table_alignment(int column)
case DiveTripModel::CYLINDER: case DiveTripModel::CYLINDER:
case DiveTripModel::GAS: case DiveTripModel::GAS:
case DiveTripModel::PHOTOS: case DiveTripModel::PHOTOS:
case DiveTripModel::COUNTRY:
case DiveTripModel::LOCATION: case DiveTripModel::LOCATION:
retVal = int(Qt::AlignLeft | Qt::AlignVCenter); retVal = int(Qt::AlignLeft | Qt::AlignVCenter);
break; break;
@ -137,6 +138,9 @@ QVariant DiveItem::data(int column, int role) const
case PHOTOS: case PHOTOS:
retVal = countPhotos(dive); retVal = countPhotos(dive);
break; break;
case COUNTRY:
retVal = QString(get_dive_country(dive));
break;
case LOCATION: case LOCATION:
retVal = QString(get_dive_location(dive)); retVal = QString(get_dive_location(dive));
break; break;
@ -180,6 +184,9 @@ QVariant DiveItem::data(int column, int role) const
break; break;
case PHOTOS: case PHOTOS:
break; break;
case COUNTRY:
retVal = QString(get_dive_country(dive));
break;
case LOCATION: case LOCATION:
retVal = QString(get_dive_location(dive)); retVal = QString(get_dive_location(dive));
break; break;
@ -192,6 +199,10 @@ QVariant DiveItem::data(int column, int role) const
break; break;
case Qt::DecorationRole: case Qt::DecorationRole:
switch (column) { switch (column) {
//TODO: ADD A FLAG
case COUNTRY:
retVal = QVariant();
break;
case LOCATION: case LOCATION:
if (dive_has_gps_location(dive)) { if (dive_has_gps_location(dive)) {
IconMetrics im = defaultIconMetrics(); IconMetrics im = defaultIconMetrics();
@ -253,6 +264,9 @@ QVariant DiveItem::data(int column, int role) const
case PHOTOS: case PHOTOS:
retVal = tr("Photos before/during/after dive"); retVal = tr("Photos before/during/after dive");
break; break;
case COUNTRY:
retVal = tr("Country");
break;
case LOCATION: case LOCATION:
retVal = tr("Location"); retVal = tr("Location");
break; break;
@ -461,6 +475,9 @@ QVariant DiveTripModel::headerData(int section, Qt::Orientation orientation, int
case PHOTOS: case PHOTOS:
ret = tr("Photos"); ret = tr("Photos");
break; break;
case COUNTRY:
ret = tr("Country");
break;
case LOCATION: case LOCATION:
ret = tr("Location"); ret = tr("Location");
break; break;

2
qt-models/divetripmodel.h
View file

@ -24,6 +24,7 @@ public:
OTU, OTU,
MAXCNS, MAXCNS,
PHOTOS, PHOTOS,
COUNTRY,
LOCATION, LOCATION,
COLUMNS COLUMNS
}; };
@ -69,6 +70,7 @@ public:
OTU, OTU,
MAXCNS, MAXCNS,
PHOTOS, PHOTOS,
COUNTRY,
LOCATION, LOCATION,
COLUMNS COLUMNS
}; };