summaryrefslogtreecommitdiffstats
path: root/desktop-widgets/mainwindow.cpp
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2018-09-08 19:58:11 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-10-11 16:22:27 -0700
commitb19adecb9f679b3b4523d679e65dedc2849d50e6 (patch)
tree4002a578dcfab0470e1bff0c27b6fa25a2484aa3 /desktop-widgets/mainwindow.cpp
parente0fcf99d0ac3ec23e6009a55b6e59c47c668081b (diff)
downloadsubsurface-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/mainwindow.cpp')
-rw-r--r--desktop-widgets/mainwindow.cpp14
1 files changed, 3 insertions, 11 deletions
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp
index 625c094c1..0476dfae8 100644
--- a/desktop-widgets/mainwindow.cpp
+++ b/desktop-widgets/mainwindow.cpp
@@ -890,19 +890,11 @@ void MainWindow::planCanceled()
void MainWindow::planCreated()
{
- // get the new dive selected and assign a number if reasonable
- graphics()->setProfileState();
- if (displayed_dive.id == 0) {
- // we might have added a new dive (so displayed_dive was cleared out by clone_dive()
- dive_list()->unselectDives();
- select_dive(get_dive(dive_table.nr - 1));
- dive_list()->selectDive(get_divenr(current_dive)); // TODO: don't convert dive->idx and back
- set_dive_nr_for_current_dive();
- }
// make sure our UI is in a consistent state
- information()->updateDiveInfo();
showProfile();
- refreshDisplay();
+ setApplicationState("Default");
+ dive_list()->setEnabled(true);
+ dive_list()->setFocus();
}
void MainWindow::setPlanNotes()