summaryrefslogtreecommitdiffstats
path: root/desktop-widgets/mainwindow.cpp
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2019-03-29 18:29:08 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-04-12 18:19:07 +0300
commit837ab6c90b7952095c0dadf2de18db883b0f5ecf (patch)
tree3e6a619cdda0b5cc06308887a2df265fa95fdf2f /desktop-widgets/mainwindow.cpp
parentbfb6a55707ffe1ffc36fddf2c98b9d5f91721317 (diff)
downloadsubsurface-837ab6c90b7952095c0dadf2de18db883b0f5ecf.tar.gz
Desktop: read tab-items from current_dive, not displayed_dive
The whole edit logic moved from displayed_dive to current_dive and it became more and more tedious to keep these in sync. Therefore, simply always display current_dive. The only exceptions are the equipment tab and the planner, as these are not yet integrated in the undo system. Once this is done, displayed_dive can be removed. Moreover, remove the clear parameter from updateDiveInfo(). Instead simply clear of there is no current_dive set. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets/mainwindow.cpp')
-rw-r--r--desktop-widgets/mainwindow.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp
index 0e4daf0e2..cc1adc3b2 100644
--- a/desktop-widgets/mainwindow.cpp
+++ b/desktop-widgets/mainwindow.cpp
@@ -465,7 +465,7 @@ void MainWindow::selectionChanged()
{
if (!current_dive) {
mainTab->clearTabs();
- mainTab->updateDiveInfo(true);
+ mainTab->updateDiveInfo();
graphics->setEmptyState();
} else {
graphics->plotDive(nullptr, false, true);
@@ -634,8 +634,9 @@ void MainWindow::on_actionCloudOnline_triggered()
void MainWindow::cleanUpEmpty()
{
+ current_dive = nullptr;
mainTab->clearTabs();
- mainTab->updateDiveInfo(true);
+ mainTab->updateDiveInfo();
graphics->setEmptyState();
diveList->reload();
diveList->setSortOrder(DiveTripModelBase::NR, Qt::DescendingOrder);