From 5ac5619a77fb739e9e564e75c5537aaebd750a1a Mon Sep 17 00:00:00 2001 From: Miika Turkia Date: Thu, 22 Jan 2015 18:09:44 +0200 Subject: [PATCH] Set the known import selection for Seabear import Signed-off-by: Miika Turkia Signed-off-by: Dirk Hohndel --- qt-ui/divelogimportdialog.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt-ui/divelogimportdialog.cpp b/qt-ui/divelogimportdialog.cpp index ecb3fa063..a2b2cc3a2 100644 --- a/qt-ui/divelogimportdialog.cpp +++ b/qt-ui/divelogimportdialog.cpp @@ -373,6 +373,9 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy) if (firstLine.contains("SEABEAR")) { seabear = true; firstLine = "Sample time;Sample depth;Sample ndl;Sample tts;Sample stopdepth;Sample temperature;Sample pressure"; + blockSignals(true); + ui->knownImports->setCurrentText("Seabear CSV"); + blockSignals(false); } QString separator = ui->CSVSeparator->currentText() == tr("Tab") ? "\t" : ui->CSVSeparator->currentText(); currColumns = firstLine.split(separator); @@ -411,7 +414,7 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy) } if (matchedSome) { ui->dragInstructions->setText(tr("Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.")); - if (triggeredBy != KNOWNTYPES) { + if (triggeredBy != KNOWNTYPES && !seabear) { blockSignals(true); ui->knownImports->setCurrentIndex(0); // <- that's "Manual import" blockSignals(false);