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

qthelper: also support "maxcns" and "otu" in Grantlee HTML

Browse source 
Fixes #962

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Lubomir I. Ivanov 2015-11-17 00:29:21 +02:00 • committed by Dirk Hohndel
parent c78a560442
commit 7e749e8ea4
3 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
desktop-widgets/templatelayout.h
View file

@ -93,6 +93,8 @@ else _RETURN_DIVE_PROPERTY_IDX(weight, 2);
else _RETURN_DIVE_PROPERTY_IDX(weight, 3); else _RETURN_DIVE_PROPERTY_IDX(weight, 3);
else _RETURN_DIVE_PROPERTY_IDX(weight, 4); else _RETURN_DIVE_PROPERTY_IDX(weight, 4);
else _RETURN_DIVE_PROPERTY_IDX(weight, 5); else _RETURN_DIVE_PROPERTY_IDX(weight, 5);
else _RETURN_DIVE_PROPERTY(maxcns);
else _RETURN_DIVE_PROPERTY(otu);
GRANTLEE_END_LOOKUP GRANTLEE_END_LOOKUP
#undef _RETURN_DIVE_PROPERTY #undef _RETURN_DIVE_PROPERTY

20
subsurface-core/qthelper.cpp
View file

@ -178,6 +178,16 @@ QString Dive::trip() const
return m_trip; return m_trip;
} }
QString Dive::maxcns() const
{
return m_maxcns;
}
QString Dive::otu() const
{
return m_otu;
}
int Dive::rating() const int Dive::rating() const
{ {
return m_rating; return m_rating;
@ -351,6 +361,16 @@ void Dive::put_trip()
} }
} }
void Dive::put_maxcns()
{
m_maxcns = QString::number(dive->maxcns);
}
void Dive::put_otu()
{
m_otu = QString::number(dive->otu);
}
QString weight_string(int weight_in_grams) QString weight_string(int weight_in_grams)
{ {
QString str; QString str;

8
subsurface-core/qthelper.h
View file

@ -32,6 +32,8 @@ private:
QString m_suit; QString m_suit;
QStringList m_cylinders; QStringList m_cylinders;
QString m_trip; QString m_trip;
QString m_maxcns;
QString m_otu;
struct dive *dive; struct dive *dive;
void put_date_time(); void put_date_time();
void put_timestamp(); void put_timestamp();
@ -49,6 +51,8 @@ private:
void put_suit(); void put_suit();
void put_cylinder(); void put_cylinder();
void put_trip(); void put_trip();
void put_maxcns();
void put_otu();
public: public:
Dive(struct dive *dive) Dive(struct dive *dive)
@ -73,6 +77,8 @@ public:
put_suit(); put_suit();
put_cylinder(); put_cylinder();
put_trip(); put_trip();
put_maxcns();
put_otu();
} }
Dive(); Dive();
~Dive(); ~Dive();
@ -99,6 +105,8 @@ public:
QString cylinders() const; QString cylinders() const;
QString cylinder(int idx) const; QString cylinder(int idx) const;
QString trip() const; QString trip() const;
QString maxcns() const;
QString otu() const;
}; };
// global pointers for our translation // global pointers for our translation