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: pass down selection to tab widgets

Browse source 
On selection change, pass down selection (including current
dive and dc) to the tab widgets. Ultimately, this should
remove access to global variables. A number of new accesses
are marked as TODO. They shall be removed in due course.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2022-09-04 11:04:01 +02:00 • committed by bstoeger
parent 908da77863
commit cded7ef5fe
16 changed files with 62 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

14
desktop-widgets/tab-widgets/maintab.cpp
View file

@ -49,7 +49,7 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
// call colorsChanged() for the initial setup now that the extraWidgets are loaded
colorsChanged();
connect(&diveListNotifier, &DiveListNotifier::settingsChanged, this, &MainTab::updateDiveInfo);
connect(&diveListNotifier, &DiveListNotifier::settingsChanged, this, &MainTab::settingsChanged);
QShortcut *closeKey = new QShortcut(QKeySequence(Qt::Key_Escape), this);
connect(closeKey, &QShortcut::activated, this, &MainTab::escDetected);
@ -70,7 +70,13 @@ void MainTab::nextInputField(QKeyEvent *event)
keyPressEvent(event);
}
void MainTab::updateDiveInfo()
void MainTab::settingsChanged()
{
// TODO: remember these
updateDiveInfo(getDiveSelection(), current_dive, dc_number);
}
void MainTab::updateDiveInfo(const std::vector<dive *> &selection, dive *currentDive, int currentDC)
{
// don't execute this while planning a dive
if (DivePlannerPointsModel::instance()->isPlanner())
@ -81,9 +87,9 @@ void MainTab::updateDiveInfo()
for (TabBase *widget: extraWidgets)
widget->setEnabled(enabled);
if (current_dive) {
if (currentDive) {
for (TabBase *widget: extraWidgets)
widget->updateData();
widget->updateData(selection, currentDive, currentDC);
if (single_selected_trip()) {
// Remember the tab selected for last dive but only if we're not on the dive site tab
if (lastSelectedDive)