Undo: make editing of dive-time an undoable operation

The whole undo system assumes that the indexes in the dive table
do not change under its feet. On desktop, there seems only one
exception left: editing of the dive time. To circumvent this,
hook editing of the dive-time to the already existing UndoShiftTime
command.

This introduces a temporary UI-inconsistency: this is the only
edit that is reflected in the undo-list. This will be fixed in
due course, when other edit actions are also made undoable.

UndoShiftTime is changed to take pointers to dives (which should
be stable by now) instead of uniq-ids.

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

1 files changed, 6 insertions, 8 deletions

diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp
index ee0ed9578..7f1e6cbc2 100644
--- a/desktop-widgets/tab-widgets/maintab.cpp
+++ b/desktop-widgets/tab-widgets/maintab.cpp
@@ -864,10 +864,6 @@ void MainTab::acceptChanges()
 		}
 		if (displayed_dive.watertemp.mkelvin != cd->watertemp.mkelvin)
 			MODIFY_DIVES(selectedDives, EDIT_VALUE(watertemp.mkelvin));
-		if (displayed_dive.when != cd->when) {
-			time_t offset = cd->when - displayed_dive.when;
-			MODIFY_DIVES(selectedDives, mydive->when -= offset;);
-		}
 
 		if (displayed_dive.dive_site_uuid != cd->dive_site_uuid)
 			MODIFY_DIVES(selectedDives, EDIT_VALUE(dive_site_uuid));
@@ -969,6 +965,12 @@ void MainTab::acceptChanges()
 				invalidate_dive_cache(d);
 			}
 		}
+
+		if (displayed_dive.when != cd->when) {
+			timestamp_t offset = cd->when - displayed_dive.when;
+			if (offset)
+				MainWindow::instance()->undoStack->push(new UndoShiftTime(selectedDives, (int)offset));
+		}
 	}
 	if (editMode != TRIP && current_dive->divetrip) {
 		current_dive->divetrip->when = current_dive->when;
@@ -987,9 +989,6 @@ void MainTab::acceptChanges()
 	int scrolledBy = MainWindow::instance()->dive_list()->verticalScrollBar()->sliderPosition();
 	resetPallete();
 	if (editMode == MANUALLY_ADDED_DIVE) {
-		// since a newly added dive could be in the middle of the dive_table we need
-		// to resort the dive list and make sure the newly added dive gets selected again
-		sort_table(&dive_table);
 		MainWindow::instance()->dive_list()->reload(DiveTripModel::CURRENT, true);
 		int newDiveNr = get_divenr(get_dive_by_uniq_id(addedId));
 		MainWindow::instance()->dive_list()->unselectDives();
@@ -1002,7 +1001,6 @@ void MainTab::acceptChanges()
 		if (do_replot)
 			MainWindow::instance()->graphics()->replot();
 		MainWindow::instance()->dive_list()->rememberSelection();
-		sort_table(&dive_table);
 		MainWindow::instance()->refreshDisplay();
 		MainWindow::instance()->dive_list()->restoreSelection();
 	}