mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-07 20:13:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Desktop: follow autogroup setting in UI

Browse source 
When importing a dive (using import from logfile) and it is a
ssrf/xml file that contains the autogroup setting, the autogroup
is effectuated in the dive list. Not sure that I like this
behavior, but thats the way it currently is. Simply wrong
is that in this case the menu item toggle is not adapted
so we end up with a dive list that is autogrouped, but
the menu toggle is off.

This can be solved by setting the UI toggle in a more central
location.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2018-01-01 21:54:38 +01:00 • committed by mturkia
parent ac505600f3
commit e16b58ee08
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
desktop-widgets/mainwindow.cpp
View file

@ -475,6 +475,7 @@ void MainWindow::refreshDisplay(bool doRecreateDiveList)
dive_list()->setEnabled(true); dive_list()->setEnabled(true);
dive_list()->setFocus(); dive_list()->setFocus();
WSInfoModel::instance()->updateInfo(); WSInfoModel::instance()->updateInfo();
ui.actionAutoGroup->setChecked(autogroup);
if (amount_selected == 0) if (amount_selected == 0)
cleanUpEmpty(); cleanUpEmpty();
} }
@ -615,7 +616,6 @@ void MainWindow::on_actionCloudstorageopen_triggered()
process_dives(false, false); process_dives(false, false);
hideProgressBar(); hideProgressBar();
refreshDisplay(); refreshDisplay();
ui.actionAutoGroup->setChecked(autogroup);
} }
void MainWindow::on_actionCloudstoragesave_triggered() void MainWindow::on_actionCloudstoragesave_triggered()
@ -1802,7 +1802,6 @@ void MainWindow::loadFiles(const QStringList fileNames)
process_dives(false, false); process_dives(false, false);
refreshDisplay(); refreshDisplay();
ui.actionAutoGroup->setChecked(autogroup);
int min_datafile_version = get_min_datafile_version(); int min_datafile_version = get_min_datafile_version();
if (min_datafile_version >0 && min_datafile_version < DATAFORMAT_VERSION) { if (min_datafile_version >0 && min_datafile_version < DATAFORMAT_VERSION) {