Berthold Stoeger 0dfc59f38c Import: add merge_all_trips parameter to process_imported_dives() ... When importing log-files we generally want to merge trips. But when downloading and the user chose "generate new trip", that new trip should not be merged into existing trips. Therefore, add a "merge_all_trips" parameter to process_imported_dives(). If false only autogenerated trips [via autogroup] will be merged. In the future we might want to let the user choose if trips should be merged when importing log-files. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>		2019-01-09 20:58:04 -08:00
..
qml	Import: add trip_table argument to DiveImportedModel::repopulate()	2019-01-09 20:58:04 -08:00
qmlmanager.cpp	Import: add merge_all_trips parameter to process_imported_dives()	2019-01-09 20:58:04 -08:00
qmlmanager.h	Mobile: add helper function to fill in the BT name	2018-12-21 14:52:02 -08:00
qmlprefs.cpp	Mobile: set units system in "No cloud mode"	2018-09-19 14:41:11 -07:00
qmlprefs.h	mobile-widgets: replace qmlprefs::theme with qPrefDisplay::theme	2018-09-12 20:18:32 -07:00