diff options
author | Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-05-03 19:19:54 +0200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2018-05-13 07:08:34 -0700 |
commit | 57bf174c4f0092d25865b7f15b864c9bbaa45eda (patch) | |
tree | b535cea18d651ec3a665c7b6f1aefa015f695a4e /desktop-widgets/tab-widgets/maintab.cpp | |
parent | 9d342d0e1aac56c44a80e5025d4cf3b89c5746cf (diff) | |
download | subsurface-57bf174c4f0092d25865b7f15b864c9bbaa45eda.tar.gz |
Desktop: On dive edit from the dive list or map, switch to new state
If "Edit dive" is selected from the dive list or the map view, switch
to a new mode, which shows the dive infos and the profile.
After the edit, switch back to the previous state.
Fixes #1213
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets/tab-widgets/maintab.cpp')
-rw-r--r-- | desktop-widgets/tab-widgets/maintab.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp index 525079908..bd16f9686 100644 --- a/desktop-widgets/tab-widgets/maintab.cpp +++ b/desktop-widgets/tab-widgets/maintab.cpp @@ -334,6 +334,7 @@ void MainTab::enableEdition(EditMode newEditMode) ui.editDiveSiteButton->setEnabled(false); MainWindow::instance()->dive_list()->setEnabled(false); MainWindow::instance()->setEnabledToolbar(false); + MainWindow::instance()->enterEditState(); if (isTripEdit) { // we are editing trip location and notes @@ -991,6 +992,7 @@ void MainTab::acceptChanges() DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::NOTHING); MainWindow::instance()->dive_list()->verticalScrollBar()->setSliderPosition(scrolledBy); MainWindow::instance()->dive_list()->setFocus(); + MainWindow::instance()->exitEditState(); cylindersModel->changed = false; weightModel->changed = false; MainWindow::instance()->setEnabledToolbar(true); @@ -1058,6 +1060,7 @@ void MainTab::rejectChanges() // show the profile and dive info MainWindow::instance()->graphics()->replot(); MainWindow::instance()->setEnabledToolbar(true); + MainWindow::instance()->exitEditState(); cylindersModel->changed = false; weightModel->changed = false; cylindersModel->updateDive(); |