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

UI restructure: updateDiveInfo shows the selected dive by default

Browse source 
So don't be redundant.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-07-02 12:58:41 -07:00
parent 2a55e55868
commit 635a7ab771
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qt-ui/maintab.cpp
View file

@ -879,7 +879,7 @@ void MainTab::rejectChanges()
MainWindow::instance()->globe()->reload(); MainWindow::instance()->globe()->reload();
if (lastMode == MANUALLY_ADDED_DIVE) { if (lastMode == MANUALLY_ADDED_DIVE) {
// more clean up // more clean up
updateDiveInfo(selected_dive); updateDiveInfo();
MainWindow::instance()->showProfile(); MainWindow::instance()->showProfile();
// we already reloaded the divelist above, so don't recreate it or we'll lose the selection // we already reloaded the divelist above, so don't recreate it or we'll lose the selection
MainWindow::instance()->refreshDisplay(false); MainWindow::instance()->refreshDisplay(false);

8
qt-ui/mainwindow.cpp
View file

@ -176,7 +176,7 @@ void MainWindow::current_dive_changed(int divenr)
ui.globe->centerOnCurrentDive(); ui.globe->centerOnCurrentDive();
} }
ui.newProfile->plotDive(); ui.newProfile->plotDive();
ui.InfoWidget->updateDiveInfo(divenr); ui.InfoWidget->updateDiveInfo();
} }
void MainWindow::on_actionNew_triggered() void MainWindow::on_actionNew_triggered()
@ -409,7 +409,7 @@ void MainWindow::createFakeDiveForAddAndPlan()
ui.ListWidget->unselectDives(); ui.ListWidget->unselectDives();
ui.ListWidget->reload(DiveTripModel::CURRENT); ui.ListWidget->reload(DiveTripModel::CURRENT);
ui.ListWidget->selectDives(QList<int>() << dive_table.nr - 1); ui.ListWidget->selectDives(QList<int>() << dive_table.nr - 1);
ui.InfoWidget->updateDiveInfo(selected_dive); ui.InfoWidget->updateDiveInfo();
} }
void MainWindow::removeFakeDiveForAddAndPlan() void MainWindow::removeFakeDiveForAddAndPlan()
@ -651,7 +651,7 @@ void MainWindow::on_actionPreviousDC_triggered()
unsigned nrdc = number_of_computers(current_dive); unsigned nrdc = number_of_computers(current_dive);
dc_number = (dc_number + nrdc - 1) % nrdc; dc_number = (dc_number + nrdc - 1) % nrdc;
ui.newProfile->plotDive(); ui.newProfile->plotDive();
ui.InfoWidget->updateDiveInfo(selected_dive); ui.InfoWidget->updateDiveInfo();
} }
void MainWindow::on_actionNextDC_triggered() void MainWindow::on_actionNextDC_triggered()
@ -659,7 +659,7 @@ void MainWindow::on_actionNextDC_triggered()
unsigned nrdc = number_of_computers(current_dive); unsigned nrdc = number_of_computers(current_dive);
dc_number = (dc_number + 1) % nrdc; dc_number = (dc_number + 1) % nrdc;
ui.newProfile->plotDive(); ui.newProfile->plotDive();
ui.InfoWidget->updateDiveInfo(selected_dive); ui.InfoWidget->updateDiveInfo();
} }
void MainWindow::on_actionFullScreen_triggered(bool checked) void MainWindow::on_actionFullScreen_triggered(bool checked)

2
qt-ui/profile/profilewidget2.cpp
View file

@ -1055,7 +1055,7 @@ void ProfileWidget2::changeGas()
add_gas_switch_event(d, get_dive_dc(d, diveComputer), seconds, get_gasidx(d, &gasmix)); add_gas_switch_event(d, get_dive_dc(d, diveComputer), seconds, get_gasidx(d, &gasmix));
// this means we potentially have a new tank that is being used and needs to be shown // this means we potentially have a new tank that is being used and needs to be shown
fixup_dive(d); fixup_dive(d);
MainWindow::instance()->information()->updateDiveInfo(selected_dive); MainWindow::instance()->information()->updateDiveInfo();
mark_divelist_changed(true); mark_divelist_changed(true);
replot(); replot();
} }

2
qt-ui/subsurfacewebservices.cpp
View file

@ -342,7 +342,7 @@ void SubsurfaceWebServices::buttonClicked(QAbstractButton *button)
mark_divelist_changed(true); mark_divelist_changed(true);
MainWindow::instance()->globe()->repopulateLabels(); MainWindow::instance()->globe()->repopulateLabels();
MainWindow::instance()->globe()->centerOnCurrentDive(); MainWindow::instance()->globe()->centerOnCurrentDive();
MainWindow::instance()->information()->updateDiveInfo(selected_dive); MainWindow::instance()->information()->updateDiveInfo();
} }
/* store last entered uid in config */ /* store last entered uid in config */