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

Import: add add_to_new_trip flag to process_imported_dives()

Browse source 
If this flag is set, dives that are not assigned to a trip will
be assigned to a new trip. This flag is set if the user checked
"add to new trip" in the download dialog of the desktop version.

Currently this is a no-op as the dives will already have been
added to a new trip by the downloading code. This will be removed
in a subsequent commit.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-01-13 08:12:47 +02:00 • committed by Dirk Hohndel
parent 31eb86c733
commit 1cd0863cca
14 changed files with 58 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
desktop-widgets/command_divelist.cpp
View file

@ -554,7 +554,7 @@ void AddDive::undoit()
ImportDives::ImportDives(struct dive_table *dives, struct trip_table *trips,
bool prefer_imported, bool downloaded, bool merge_all_trips,
const QString &source)
bool add_to_new_trip, const QString &source)
{
setText(tr("import %n dive(s) from %1", "", dives->nr).arg(source));
@ -562,7 +562,7 @@ ImportDives::ImportDives(struct dive_table *dives, struct trip_table *trips,
struct dive_table dives_to_remove = { 0 };
struct trip_table trips_to_add = { 0 };
process_imported_dives(dives, trips, prefer_imported, downloaded, merge_all_trips,
&dives_to_add, &dives_to_remove, &trips_to_add);
add_to_new_trip, &dives_to_add, &dives_to_remove, &trips_to_add);
// Add trips to the divesToAdd.trips structure
divesToAdd.trips.reserve(trips_to_add.nr);