mirror of
				https://github.com/subsurface/subsurface.git
				synced 2025-02-19 22:16:15 +00:00 
			
		
		
		
	Having subsurface-core as a directory name really messes with autocomplete and is obviously redundant. Simmilarly, qt-mobile caused an autocomplete conflict and also was inconsistent with the desktop-widget name for the directory containing the "other" UI. And while cleaning up the resulting change in the path name for include files, I decided to clean up those even more to make them consistent overall. This could have been handled in more commits, but since this requires a make clean before the build, it seemed more sensible to do it all in one. 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 "core/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
 |