From 8ce471c2f537c2e73bbcd514a9b5c2b7ae61813d Mon Sep 17 00:00:00 2001 From: Guido Lerch Date: Tue, 20 Oct 2015 21:03:53 +0200 Subject: Context menu for images: change DivePicture model Altering DivePicture model to allow deleting images from the QListView without immediate updating of the list. Updating is determined by an additioanl parameter Signed-off-by: Guido Lerch Signed-off-by: Dirk Hohndel --- qt-models/divepicturemodel.cpp | 10 ++++++---- qt-models/divepicturemodel.h | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'qt-models') diff --git a/qt-models/divepicturemodel.cpp b/qt-models/divepicturemodel.cpp index 1f37423e2..bb5db33b7 100644 --- a/qt-models/divepicturemodel.cpp +++ b/qt-models/divepicturemodel.cpp @@ -111,12 +111,14 @@ QVariant DivePictureModel::data(const QModelIndex &index, int role) const return ret; } -void DivePictureModel::removePicture(const QString &fileUrl) +void DivePictureModel::removePicture(const QString &fileUrl, bool last) { dive_remove_picture(fileUrl.toUtf8().data()); - copy_dive(current_dive, &displayed_dive); - updateDivePictures(); - mark_divelist_changed(true); + if (last) { + copy_dive(current_dive, &displayed_dive); + updateDivePictures(); + mark_divelist_changed(true); + } } int DivePictureModel::rowCount(const QModelIndex &parent) const diff --git a/qt-models/divepicturemodel.h b/qt-models/divepicturemodel.h index d6393e45f..7390fc5eb 100644 --- a/qt-models/divepicturemodel.h +++ b/qt-models/divepicturemodel.h @@ -33,7 +33,7 @@ public: virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; virtual void updateDivePictures(); void updateDivePicturesWhenDone(QList >); - void removePicture(const QString& fileUrl); + void removePicture(const QString& fileUrl, bool last); protected: DivePictureModel(); -- cgit v1.2.3-70-g09d2