From fc6d819616b69f7c69dc8743bc25aa8ad51708a4 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Tue, 25 Aug 2015 21:03:20 -0300 Subject: Create a new dive site and edit it automatically If the user clicks on the first or second option of the drop down list, subsurface will move him to the dive site edit panel automatically, since it's a new dive site and there's no information about it yet. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- qt-models/divelocationmodel.cpp | 4 ++-- qt-models/divelocationmodel.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'qt-models') diff --git a/qt-models/divelocationmodel.cpp b/qt-models/divelocationmodel.cpp index 30b3f82ae..fca322dcf 100644 --- a/qt-models/divelocationmodel.cpp +++ b/qt-models/divelocationmodel.cpp @@ -53,7 +53,7 @@ QVariant LocationInformationModel::data(const QModelIndex &index, int role) cons // Special case to handle the 'create dive site' with name. if (index.row() < 2) { if (index.column() == UUID) - return 0; + return RECENTLY_ADDED_DIVESITE; switch(role) { case Qt::DisplayRole : { if (index.row() == 1) { @@ -92,7 +92,7 @@ QVariant LocationInformationModel::data(const QModelIndex &index, int role) cons case Qt::DisplayRole : switch(index.column()) { case UUID: return ds->uuid; - case NAME: return ds->name; + case NAME: return QString("%1, id:%2").arg(ds->name).arg(ds->uuid); case LATITUDE: return ds->latitude.udeg; case LONGITUDE: return ds->longitude.udeg; case COORDS: return "TODO"; diff --git a/qt-models/divelocationmodel.h b/qt-models/divelocationmodel.h index 77dbb7bca..3bf7161f5 100644 --- a/qt-models/divelocationmodel.h +++ b/qt-models/divelocationmodel.h @@ -7,6 +7,8 @@ class QLineEdit; +#define RECENTLY_ADDED_DIVESITE 1 + class LocationInformationModel : public QAbstractTableModel { Q_OBJECT public: -- cgit v1.2.3-70-g09d2