From 6f05194b02fd8944f65f8706f8a1ca5b444a03cd Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Sun, 13 Jul 2014 23:36:35 +0200 Subject: HTML: Add dive photos to the detailed view Dive photos are copied to the photos directory on export. The photos section appears only if photos exist. C++ helper functions are added to copy images to the photos directory, Additionally the photos directory must be passed as a parameter to the write_one_dive function to save photos to it. Some options structure may be needed instead of passing many arguments. Signed-off-by: Gehad elrobey Signed-off-by: Miika Turkia Signed-off-by: Dirk Hohndel --- qt-ui/divelogexportdialog.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/divelogexportdialog.cpp b/qt-ui/divelogexportdialog.cpp index f896235e0..22218025a 100644 --- a/qt-ui/divelogexportdialog.cpp +++ b/qt-ui/divelogexportdialog.cpp @@ -81,13 +81,16 @@ void DiveLogExportDialog::exportHtmlInit(const QString &filename) QFileInfo info(file); QDir mainDir = info.absoluteDir(); mainDir.mkdir(file.fileName() + "_files"); - QString exportFiles = file.fileName() + "_files/"; + QString exportFiles = file.fileName() + "_files"; QString json_dive_data = exportFiles + QDir::separator() + "file.json"; QString json_settings = exportFiles + QDir::separator() + "settings.json"; + QString photos_directory = exportFiles + QDir::separator() + "photos" + QDir::separator(); + mainDir.mkdir(photos_directory); + exportFiles += "/"; exportHTMLsettings(json_settings); - export_HTML(json_dive_data.toUtf8().data(), ui->exportSelectedDives->isChecked(), ui->exportListOnly->isChecked()); + export_HTML(json_dive_data.toUtf8().data(), photos_directory.toUtf8().data(), ui->exportSelectedDives->isChecked(), ui->exportListOnly->isChecked()); QString searchPath = getSubsurfaceDataPath("theme"); if (searchPath.isEmpty()) -- cgit v1.2.3-70-g09d2