diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-10-17 16:07:39 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-10-24 09:51:37 -0700 |
| commit | 39a4090c0a6e1d8fe12516be06ee7b31dd4bc96d (patch) | |
| tree | 7587930b64bf95ec3a652cf761e6ded573931364 /desktop-widgets | |
| parent | fadea413cdb4644b821369b27fad6e5f019d32c2 (diff) | |
| download | subsurface-39a4090c0a6e1d8fe12516be06ee7b31dd4bc96d.tar.gz | |
devices: add devices in Command::importTable()
Add a device_table parameters to Command::importTable() and
add_imported_dives(). The content of this table will be added
to the global device list (respectively removed on undo).
This is currently a no-op, as the parser doesn't yet fill
out the device table, but adds devices directly to the global
device table.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets')
| -rw-r--r-- | desktop-widgets/divelogimportdialog.cpp | 2 | ||||
| -rw-r--r-- | desktop-widgets/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | desktop-widgets/subsurfacewebservices.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/desktop-widgets/divelogimportdialog.cpp b/desktop-widgets/divelogimportdialog.cpp index e6243e98d..fc7e7d81e 100644 --- a/desktop-widgets/divelogimportdialog.cpp +++ b/desktop-widgets/divelogimportdialog.cpp @@ -960,7 +960,7 @@ void DiveLogImportDialog::on_buttonBox_accepted() } QString source = fileNames.size() == 1 ? fileNames[0] : tr("multiple files"); - Command::importDives(&table, &trips, &sites, nullptr, IMPORT_MERGE_ALL_TRIPS, source); + Command::importDives(&table, &trips, &sites, &devices, nullptr, IMPORT_MERGE_ALL_TRIPS, source); } TagDragDelegate::TagDragDelegate(QObject *parent) : QStyledItemDelegate(parent) diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 327eb0578..b1307593a 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -1557,7 +1557,7 @@ void MainWindow::importFiles(const QStringList fileNames) parse_file(fileNamePtr.data(), &table, &trips, &sites, &devices, &filter_presets); } QString source = fileNames.size() == 1 ? fileNames[0] : tr("multiple files"); - Command::importDives(&table, &trips, &sites, &filter_presets, IMPORT_MERGE_ALL_TRIPS, source); + Command::importDives(&table, &trips, &sites, &devices, &filter_presets, IMPORT_MERGE_ALL_TRIPS, source); } void MainWindow::loadFiles(const QStringList fileNames) diff --git a/desktop-widgets/subsurfacewebservices.cpp b/desktop-widgets/subsurfacewebservices.cpp index c5a5cad48..0ca2974b6 100644 --- a/desktop-widgets/subsurfacewebservices.cpp +++ b/desktop-widgets/subsurfacewebservices.cpp @@ -460,7 +460,7 @@ void DivelogsDeWebServices::buttonClicked(QAbstractButton *button) struct device_table devices; struct filter_preset_table filter_presets; parse_file(QFile::encodeName(zipFile.fileName()), &table, &trips, &sites, &devices, &filter_presets); - Command::importDives(&table, &trips, &sites, nullptr, IMPORT_MERGE_ALL_TRIPS, QStringLiteral("divelogs.de")); + Command::importDives(&table, &trips, &sites, &devices, nullptr, IMPORT_MERGE_ALL_TRIPS, QStringLiteral("divelogs.de")); /* store last entered user/pass in config */ qPrefCloudStorage::set_divelogde_user(ui.userID->text()); |