From a83c674139562010e9b9ee281b121ed4434c8a5a Mon Sep 17 00:00:00 2001 From: Miika Turkia Date: Mon, 2 May 2016 20:11:35 +0300 Subject: CSV import: support for user specified date format Signed-off-by: Miika Turkia Signed-off-by: Dirk Hohndel --- desktop-widgets/divelogimportdialog.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/divelogimportdialog.cpp b/desktop-widgets/divelogimportdialog.cpp index a1ecf15b8..854a522f2 100644 --- a/desktop-widgets/divelogimportdialog.cpp +++ b/desktop-widgets/divelogimportdialog.cpp @@ -720,6 +720,8 @@ int DiveLogImportDialog::setup_csv_params(QStringList r, char **params, int pnr) { params[pnr++] = strdup("dateField"); params[pnr++] = intdup(r.indexOf(tr("Date"))); + params[pnr++] = strdup("datefmt"); + params[pnr++] = intdup(ui->DateFormat->currentIndex()); params[pnr++] = strdup("timeField"); params[pnr++] = intdup(r.indexOf(tr("Sample time"))); params[pnr++] = strdup("depthField"); @@ -821,7 +823,7 @@ void DiveLogImportDialog::on_buttonBox_accepted() sample->tts.seconds *= 60; } } else { - char *params[41]; + char *params[43]; int pnr = 0; pnr = setup_csv_params(r, params, pnr); @@ -888,7 +890,7 @@ void DiveLogImportDialog::on_buttonBox_accepted() parse_manual_file(fileNames[i].toUtf8().data(), params, pnr - 1); } else { - char *params[41]; + char *params[43]; int pnr = 0; pnr = setup_csv_params(r, params, pnr); -- cgit v1.2.3-70-g09d2