undo: make picture (media) deletion undoable

The code is rather complex. Firstly, we have different representations
of pictures throughout the code. Secondly, this tries to do add the
pictures in batches to the divepicture model and that is always rather
tricky.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

1 files changed, 7 insertions, 3 deletions

diff --git a/qt-models/divepicturemodel.h b/qt-models/divepicturemodel.h
index 395dbedd1..d7b043d44 100644
--- a/qt-models/divepicturemodel.h
+++ b/qt-models/divepicturemodel.h
@@ -3,6 +3,7 @@
 #define DIVEPICTUREMODEL_H
 
 #include "core/units.h"
+#include "core/pictureobj.h"
 
 #include <QAbstractTableModel>
 #include <QImage>
@@ -16,6 +17,9 @@ struct PictureEntry {
 	QImage image;
 	int offsetSeconds;
 	duration_t length;
+	PictureEntry(dive *, const PictureObj &);
+	PictureEntry(dive *, const picture &);
+	bool operator<(const PictureEntry &) const;
 };
 
 class DivePictureModel : public QAbstractTableModel {
@@ -26,13 +30,13 @@ public:
 	QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 	int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 	void updateDivePictures();
-	void removePictures(const QVector<QString> &fileUrls);
-signals:
-	void picturesRemoved(const QVector<QString> &fileUrls);
+	void removePictures(const QModelIndexList &);
 public slots:
 	void setZoomLevel(int level);
 	void updateThumbnail(QString filename, QImage thumbnail, duration_t duration);
 	void pictureOffsetChanged(dive *d, const QString filename, offset_t offset);
+	void picturesRemoved(dive *d, QVector<QString> filenames);
+	void picturesAdded(dive *d, QVector<PictureObj> pics);
 private:
 	DivePictureModel();
 	std::vector<PictureEntry> pictures;