diff options
author | Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-09-08 19:58:11 +0200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2018-10-11 16:22:27 -0700 |
commit | b19adecb9f679b3b4523d679e65dedc2849d50e6 (patch) | |
tree | 4002a578dcfab0470e1bff0c27b6fa25a2484aa3 /desktop-widgets/tab-widgets | |
parent | e0fcf99d0ac3ec23e6009a55b6e59c47c668081b (diff) | |
download | subsurface-b19adecb9f679b3b4523d679e65dedc2849d50e6.tar.gz |
Undo: make adding of planned dive undo-able
Planned dives were still added by directly calling core code.
This could confuse the undo-machinery, leading to crashes.
Instead, use the proper undo-command. The problem is that as
opposed to the other AddDive-commands, planned dives may
belong to a trip. Thus, the interface to the AddDive command
was changed to respect the divetrip field. Make sure that
the other callers reset that field (actually, it should never
be set). Add a comment describing the perhaps surprising
interface (the passed-in dive, usually displayed dive, is
reset).
Moreover, a dive cloned in the planner is not assigned a
new number. Thus, add an argument to the AddDive-command,
which expresses whether a new number should be generated
for the to-be-added dive.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets/tab-widgets')
-rw-r--r-- | desktop-widgets/tab-widgets/maintab.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp index 92e55784f..d45bc246d 100644 --- a/desktop-widgets/tab-widgets/maintab.cpp +++ b/desktop-widgets/tab-widgets/maintab.cpp @@ -799,7 +799,7 @@ void MainTab::acceptChanges() updateDiveSite(ui.location->currDiveSiteUuid(), &displayed_dive); copyTagsToDisplayedDive(); - Command::addDive(&displayed_dive, autogroup); + Command::addDive(&displayed_dive, autogroup, true); editMode = NONE; MainWindow::instance()->exitEditState(); @@ -810,8 +810,6 @@ void MainTab::acceptChanges() ui.editDiveSiteButton->setEnabled(!ui.location->text().isEmpty()); emit addDiveFinished(); DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::NOTHING); - int scrolledBy = MainWindow::instance()->dive_list()->verticalScrollBar()->sliderPosition(); - MainWindow::instance()->dive_list()->verticalScrollBar()->setSliderPosition(scrolledBy); MainWindow::instance()->dive_list()->setFocus(); resetPallete(); displayed_dive.divetrip = nullptr; // Should not be necessary, just in case! |