mirror of
https://github.com/subsurface/subsurface.git
synced 2024-12-11 03:21:29 +00:00
604971ca0c
One specific string did not translate. First, Dirk and I (via IRC)
suspected a leading space was the issue (see commit eccac1321f).
However, I found out that the problem was still there. A non translated
string "%1 shown", when applying a filter on the divelist, and looking at
a trip line. It shows always untranslated "%1 shown". Extracting
to-be-translated strings from the code, I found 2 errors: Class
<classname> lacks Q_OBJECT macro.
This patch adds a missing tr() definition and implementation to 2 structs.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
96 lines
1.8 KiB
C++
96 lines
1.8 KiB
C++
#ifndef DIVETRIPMODEL_H
|
|
#define DIVETRIPMODEL_H
|
|
|
|
#include "treemodel.h"
|
|
#include "dive.h"
|
|
|
|
struct DiveItem : public TreeItem {
|
|
Q_DECLARE_TR_FUNCTIONS(TripItem)
|
|
public:
|
|
enum Column {
|
|
NR,
|
|
DATE,
|
|
RATING,
|
|
DEPTH,
|
|
DURATION,
|
|
TEMPERATURE,
|
|
TOTALWEIGHT,
|
|
SUIT,
|
|
CYLINDER,
|
|
GAS,
|
|
SAC,
|
|
OTU,
|
|
MAXCNS,
|
|
LOCATION,
|
|
COLUMNS
|
|
};
|
|
|
|
virtual QVariant data(int column, int role) const;
|
|
int diveId;
|
|
virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
|
|
virtual Qt::ItemFlags flags(const QModelIndex &index) const;
|
|
QString displayDate() const;
|
|
QString displayDuration() const;
|
|
QString displayDepth() const;
|
|
QString displayDepthWithUnit() const;
|
|
QString displayTemperature() const;
|
|
QString displayWeight() const;
|
|
QString displaySac() const;
|
|
int weight() const;
|
|
};
|
|
|
|
struct TripItem : public TreeItem {
|
|
Q_DECLARE_TR_FUNCTIONS(TripItem)
|
|
public:
|
|
virtual QVariant data(int column, int role) const;
|
|
dive_trip_t *trip;
|
|
};
|
|
|
|
class DiveTripModel : public TreeModel {
|
|
Q_OBJECT
|
|
public:
|
|
enum Column {
|
|
NR,
|
|
DATE,
|
|
RATING,
|
|
DEPTH,
|
|
DURATION,
|
|
TEMPERATURE,
|
|
TOTALWEIGHT,
|
|
SUIT,
|
|
CYLINDER,
|
|
GAS,
|
|
SAC,
|
|
OTU,
|
|
MAXCNS,
|
|
LOCATION,
|
|
COLUMNS
|
|
};
|
|
|
|
enum ExtraRoles {
|
|
STAR_ROLE = Qt::UserRole + 1,
|
|
DIVE_ROLE,
|
|
TRIP_ROLE,
|
|
SORT_ROLE,
|
|
DIVE_IDX
|
|
};
|
|
enum Layout {
|
|
TREE,
|
|
LIST,
|
|
CURRENT
|
|
};
|
|
|
|
Qt::ItemFlags flags(const QModelIndex &index) const;
|
|
virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
|
|
virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
|
|
DiveTripModel(QObject *parent = 0);
|
|
Layout layout() const;
|
|
void setLayout(Layout layout);
|
|
|
|
private:
|
|
void setupModelData();
|
|
QMap<dive_trip_t *, TripItem *> trips;
|
|
Layout currentLayout;
|
|
};
|
|
|
|
#endif
|