Merge branch 'divesites'

This brings in the dive site infrastructure and initial UI work

1 files changed, 25 insertions, 0 deletions

diff --git a/qt-ui/simplewidgets.h b/qt-ui/simplewidgets.h
index 8d5b4f73c..d0cb60508 100644
--- a/qt-ui/simplewidgets.h
+++ b/qt-ui/simplewidgets.h
@@ -6,6 +6,7 @@ class QAbstractButton;
 class QNetworkReply;
 
 #include <QWidget>
+#include <QGroupBox>
 #include <QDialog>
 #include <stdint.h>
 
@@ -214,6 +215,30 @@ private:
 	Ui::FilterWidget ui;
 };
 
+#include "ui_locationInformation.h"
+
+class LocationInformationWidget : public QGroupBox {
+Q_OBJECT
+public:
+	LocationInformationWidget(QWidget *parent = 0);
+
+public slots:
+	void acceptChanges();
+	void rejectChanges();
+
+	void showEvent(QShowEvent *);
+
+	void setLocationId(uint32_t uuid);
+	void updateGpsCoordinates(void);
+
+signals:
+	void informationManagementEnded();
+
+private:
+	struct dive_site *currentDs;
+	Ui::LocationInformation ui;
+};
+
 bool isGnome3Session();
 QImage grayImage(const QImage &coloredImg);