diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2015-02-13 23:52:41 -0800 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2015-02-13 23:52:41 -0800 |
commit | 56de6b73f67d5ddeec74153303a27866e39279c7 (patch) | |
tree | 45040e1fb23c26e12b3002e9381f13717a9eb78d /qt-ui/maintab.h | |
parent | 2843dc38c9e64e87ac1ee84e2cb0147f630ab117 (diff) | |
parent | f81e2c111d9c563a78e62c3bae64bec07c052ec0 (diff) | |
download | subsurface-56de6b73f67d5ddeec74153303a27866e39279c7.tar.gz |
Merge branch 'divesites'
This brings in the dive site infrastructure and initial UI work
Diffstat (limited to 'qt-ui/maintab.h')
-rw-r--r-- | qt-ui/maintab.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/qt-ui/maintab.h b/qt-ui/maintab.h index a279baf7a..8869b068e 100644 --- a/qt-ui/maintab.h +++ b/qt-ui/maintab.h @@ -10,6 +10,7 @@ #include <QTabWidget> #include <QDialog> #include <QMap> +#include <QUuid> #include "ui_maintab.h" #include "completionmodels.h" @@ -55,7 +56,7 @@ public: signals: void addDiveFinished(); void dateTimeChanged(); - + void requestDiveSiteEdit(uint32_t uuid); public slots: void addCylinder_clicked(); @@ -65,7 +66,6 @@ slots: void rejectChanges(); void on_location_textChanged(const QString &text); void on_location_editingFinished(); - void on_coordinates_textChanged(const QString &text); void on_divemaster_textChanged(); void on_buddy_textChanged(); void on_suit_textChanged(const QString &text); @@ -92,7 +92,8 @@ slots: void escDetected(void); void photoDoubleClicked(const QString filePath); void removeSelectedPhotos(); - void updateGpsCoordinates(); + void prepareDiveSiteEdit(); + void showLocation(); private: Ui::MainTab ui; |