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

selection: move current dc logic to profile widget

Browse source 
The current dc global makes no sense on mobile. Therefore,
move the logic of the currently displayed dive computer
to the profile widget and remove the dc_number global
variable.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2022-09-17 19:07:35 +02:00 • committed by bstoeger
parent 19baae449d
commit cad80e5a53
10 changed files with 92 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

41
desktop-widgets/mainwindow.cpp
View file

@ -300,14 +300,6 @@ void MainWindow::enableDisableCloudActions()
ui.actionCloudstoragesave->setEnabled(prefs.cloud_verification_status == qPrefCloudStorage::CS_VERIFIED);
}
void MainWindow::enableDisableOtherDCsActions()
{
bool nr = number_of_computers(current_dive) > 1;
enableShortcuts();
ui.actionNextDC->setEnabled(nr);
ui.actionPreviousDC->setEnabled(nr);
}
void MainWindow::setDefaultState()
{
setApplicationState(ApplicationState::Default);
@ -333,10 +325,19 @@ void MainWindow::updateAutogroup()
void MainWindow::divesSelected(const std::vector<dive *> &selection, dive *currentDive, int currentDC)
{
mainTab->updateDiveInfo(selection, currentDive, currentDC);
if (currentDive)
enableDisableOtherDCsActions();
profile->plotCurrentDive();
// We call plotDive first, so that the profile can decide which
// dive computer to plot. The plotted dive computer is then
// used for displaying data in the tab-widgets.
profile->plotDive(currentDive, currentDC);
mainTab->updateDiveInfo(selection, profile->d, profile->dc);
// Activate cursor keys to switch through DCs if there are more than one DC.
if (currentDive) {
bool nr = number_of_computers(current_dive) > 1;
enableShortcuts();
ui.actionNextDC->setEnabled(nr);
ui.actionPreviousDC->setEnabled(nr);
}
}
void MainWindow::on_actionNew_triggered()
@ -665,8 +666,8 @@ void MainWindow::on_actionReplanDive_triggered()
disableShortcuts(true);
copy_dive(current_dive, &displayed_dive); // Planning works on a copy of the dive (for now).
profile->setPlanState(&displayed_dive, dc_number);
plannerWidgets->replanDive(dc_number);
profile->setPlanState(&displayed_dive, profile->dc);
plannerWidgets->replanDive(profile->dc);
}
void MainWindow::on_actionDivePlanner_triggered()
@ -825,20 +826,16 @@ void MainWindow::restoreSplitterSizes()
void MainWindow::on_actionPreviousDC_triggered()
{
unsigned nrdc = number_of_computers(current_dive);
dc_number = (dc_number + nrdc - 1) % nrdc;
profile->plotCurrentDive();
profile->prevDC();
// TODO: remove
mainTab->updateDiveInfo(getDiveSelection(), current_dive, dc_number);
mainTab->updateDiveInfo(getDiveSelection(), profile->d, profile->dc);
}
void MainWindow::on_actionNextDC_triggered()
{
unsigned nrdc = number_of_computers(current_dive);
dc_number = (dc_number + 1) % nrdc;
profile->plotCurrentDive();
profile->nextDC();
// TODO: remove
mainTab->updateDiveInfo(getDiveSelection(), current_dive, dc_number);
mainTab->updateDiveInfo(getDiveSelection(), profile->d, profile->dc);
}
void MainWindow::on_actionFullScreen_triggered(bool checked)