8 files changed, 43 insertions, 21 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4295ae29a..b1d230167 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,4 @@
+Desktop: implement dive invalidation
 Mobile-android: remove libusb/FTDI support (largely non-functional)
 Mobile-android: Continue download after obtaining USB permission
 Mobile-android: Add usb-serial-for-android driver support
diff --git a/commands/command.cpp b/commands/command.cpp
index fe55b20d6..1fb968778 100644
--- a/commands/command.cpp
+++ b/commands/command.cpp
@@ -168,6 +168,11 @@ int editMode(int index, int newValue, bool currentDiveOnly)
 	return execute_edit(new EditMode(index, newValue, currentDiveOnly));
 }
 
+int editInvalid(int newValue, bool currentDiveOnly)
+{
+	return execute_edit(new EditInvalid(newValue, currentDiveOnly));
+}
+
 int editSuit(const QString &newValue, bool currentDiveOnly)
 {
 	return execute_edit(new EditSuit(newValue, currentDiveOnly));
diff --git a/commands/command.h b/commands/command.h
index 5663da157..e19d093cb 100644
--- a/commands/command.h
+++ b/commands/command.h
@@ -66,6 +66,7 @@ void purgeUnusedDiveSites();
 int editNotes(const QString &newValue, bool currentDiveOnly);
 int editSuit(const QString &newValue, bool currentDiveOnly);
 int editMode(int index, int newValue, bool currentDiveOnly);
+int editInvalid(int newValue, bool currentDiveOnly);
 int editRating(int newValue, bool currentDiveOnly);
 int editVisibility(int newValue, bool currentDiveOnly);
 int editWaveSize(int newValue, bool currentDiveOnly);
diff --git a/commands/command_edit.cpp b/commands/command_edit.cpp
index 7fd56e0d2..a880f9f2f 100644
--- a/commands/command_edit.cpp
+++ b/commands/command_edit.cpp
@@ -574,6 +574,27 @@ DiveField EditMode::fieldId() const
 	return DiveField::MODE;
 }
 
+// ***** Invalid *****
+void EditInvalid::set(struct dive *d, int invalid) const
+{
+	d->invalid = invalid;
+}
+
+int EditInvalid::data(struct dive *d) const
+{
+	return d->invalid;
+}
+
+QString EditInvalid::fieldName() const
+{
+	return tr("invalid");
+}
+
+DiveField EditInvalid::fieldId() const
+{
+	return DiveField::INVALID;
+}
+
 // ***** Tag based commands *****
 EditTagsBase::EditTagsBase(const QStringList &newListIn, bool currentDiveOnly) :
 	EditDivesBase(currentDiveOnly),
diff --git a/commands/command_edit.h b/commands/command_edit.h
index 101c8b79b..cbbd0d968 100644
--- a/commands/command_edit.h
+++ b/commands/command_edit.h
@@ -222,6 +222,15 @@ public:
 	DiveField fieldId() const override;
 };
 
+class EditInvalid : public EditBase<int> {
+public:
+	using EditBase<int>::EditBase;	// Use constructor of base class.
+	void set(struct dive *d, int number) const override;
+	int data(struct dive *d) const override;
+	QString fieldName() const override;
+	DiveField fieldId() const override;
+};
+
 // Fields that work with tag-lists (tags, buddies, divemasters) work differently and therefore
 // have their own base class. In this case, it's not a template, as all these lists are base
 // on strings.
diff --git a/core/save-xml.c b/core/save-xml.c
index 3570861e4..6662069d8 100644
--- a/core/save-xml.c
+++ b/core/save-xml.c
@@ -499,7 +499,7 @@ void save_one_dive_to_mb(struct membuffer *b, struct dive *dive, bool anonymize)
 	if (dive->chill)
 		put_format(b, " chill='%d'", dive->chill);
 	if (dive->invalid)
-		put_format(b, " invalid");
+		put_format(b, " invalid='1'");
 	save_tags(b, dive->tag_list);
 	if (dive->dive_site)
 		put_format(b, " divesiteid='%8x'", dive->dive_site->uuid);
diff --git a/core/subsurface-qt/divelistnotifier.h b/core/subsurface-qt/divelistnotifier.h
index 5ef25e832..f1b5da2c6 100644
--- a/core/subsurface-qt/divelistnotifier.h
+++ b/core/subsurface-qt/divelistnotifier.h
@@ -35,6 +35,7 @@ struct DiveField {
 	unsigned int mode : 1;
 	unsigned int notes : 1;
 	unsigned int salinity : 1;
+	unsigned int invalid : 1;
 	enum Flags {
 		NONE = 0,
 		NR = 1 << 0,
@@ -57,7 +58,8 @@ struct DiveField {
 		TAGS = 1 << 17,
 		MODE = 1 << 18,
 		NOTES = 1 << 19,
-		SALINITY = 1 << 20
+		SALINITY = 1 << 20,
+		INVALID = 1 << 21
 	};
 	DiveField(int flags);
 };
diff --git a/desktop-widgets/divelistview.cpp b/desktop-widgets/divelistview.cpp
index 1f3a20455..7050863bf 100644
--- a/desktop-widgets/divelistview.cpp
+++ b/desktop-widgets/divelistview.cpp
@@ -838,22 +838,7 @@ void DiveListView::addToTrip(int delta)
 
 void DiveListView::markDiveInvalid()
 {
-	int i;
-	struct dive *d = contextMenuIndex.data(DiveTripModelBase::DIVE_ROLE).value<struct dive *>();
-	if (!d)
-		return;
-	for_each_dive (i, d) {
-		if (!d->selected)
-			continue;
-		//TODO: this should be done in the future
-		// now mark the dive invalid... how do we do THAT?
-		// d->invalid = true;
-	}
-	mark_divelist_changed(true);
-	MainWindow::instance()->refreshDisplay();
-	if (prefs.display_invalid_dives == false) {
-		clearSelection();
-	}
+	Command::editInvalid(true, false);
 }
 
 void DiveListView::deleteDive()
@@ -935,9 +920,7 @@ void DiveListView::contextMenuEvent(QContextMenuEvent *event)
 	}
 	if (d) {
 		popup.addAction(tr("Delete dive(s)"), this, &DiveListView::deleteDive);
-#if 0
-		popup.addAction(tr("Mark dive(s) invalid", this, &DiveListView::markDiveInvalid);
-#endif
+		popup.addAction(tr("Mark dive(s) invalid"), this, &DiveListView::markDiveInvalid);
 	}
 	if (amount_selected > 1 && consecutive_selected())
 		popup.addAction(tr("Merge selected dives"), this, &DiveListView::mergeDives);