mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Desktop: read tab-items from current_dive, not displayed_dive

Browse source 
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>
This commit is contained in:
Berthold Stoeger 2019-03-29 18:29:08 +01:00 • committed by Dirk Hohndel
parent bfb6a55707
commit 837ab6c90b
5 changed files with 44 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

5
desktop-widgets/mainwindow.cpp
View file

@ -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);