diff options
| -rw-r--r-- | qt-models/divelocationmodel.cpp | 15 | ||||
| -rw-r--r-- | qt-models/divelocationmodel.h | 2 | ||||
| -rw-r--r-- | qt-ui/locationinformation.cpp | 9 |
3 files changed, 22 insertions, 4 deletions
diff --git a/qt-models/divelocationmodel.cpp b/qt-models/divelocationmodel.cpp index 05d68c27d..d45df349c 100644 --- a/qt-models/divelocationmodel.cpp +++ b/qt-models/divelocationmodel.cpp @@ -60,3 +60,18 @@ int32_t LocationInformationModel::addDiveSite(const QString& name, int lon, int update(); return uuid; } + +bool LocationInformationModel::setData(const QModelIndex &index, const QVariant &value, int role) +{ + if (!index.isValid()) + return false; + + if (role != Qt::EditRole) + return false; + + struct dive_site *ds = get_dive_site(index.row()); + free(ds->name); + ds->name = copy_string(qPrintable(value.toString())); + emit dataChanged(index, index); + return true; +} diff --git a/qt-models/divelocationmodel.h b/qt-models/divelocationmodel.h index c9dd5cee5..7ca0c926a 100644 --- a/qt-models/divelocationmodel.h +++ b/qt-models/divelocationmodel.h @@ -12,7 +12,7 @@ public: int rowCount(const QModelIndex &parent = QModelIndex()) const; QVariant data(const QModelIndex &index = QModelIndex(), int role = Qt::DisplayRole) const; int32_t addDiveSite(const QString& name, int lat = 0, int lon = 0); - + bool setData(const QModelIndex &index, const QVariant &value, int role); public slots: void update(); private: diff --git a/qt-ui/locationinformation.cpp b/qt-ui/locationinformation.cpp index b6c4f7fa9..25d3ddecb 100644 --- a/qt-ui/locationinformation.cpp +++ b/qt-ui/locationinformation.cpp @@ -202,9 +202,12 @@ void LocationInformationWidget::on_diveSiteDescription_textChanged(const QString void LocationInformationWidget::on_diveSiteName_textChanged(const QString& text) { - if (!currentDs || !same_string(qPrintable(text), currentDs->name)) { - free(displayed_dive_site.name); - displayed_dive_site.name = copy_string(qPrintable(text)); + if (currentDs && text != currentDs->name) { + // This needs to be changed directly into the model so that + // the changes are replyed on the ComboBox with the current selection. + + QModelIndex idx = ui.currentLocation->model()->index(ui.currentLocation->currentIndex(),0); + LocationInformationModel::instance()->setData(idx, text, Qt::EditRole); markChangedWidget(ui.diveSiteName); emit coordinatesChanged(); } |