From 3a3d61ba5332144ce226f59a9d79927e411de0a7 Mon Sep 17 00:00:00 2001 From: Rodrigo Severo Date: Mon, 13 Jan 2014 22:11:14 -0200 Subject: Pre-configured CSV imports should also set the field separator Pre-configured imports in Import Dive Log File for CSV files should also set the pre-defined field separator. [Dirk Hohndel: cleaned up hideous whitespace] Signed-off-by:Rodrigo Severo Signed-off-by: Dirk Hohndel --- qt-ui/divelogimportdialog.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'qt-ui') diff --git a/qt-ui/divelogimportdialog.cpp b/qt-ui/divelogimportdialog.cpp index 55907a39d..2a7166a98 100644 --- a/qt-ui/divelogimportdialog.cpp +++ b/qt-ui/divelogimportdialog.cpp @@ -24,7 +24,7 @@ DiveLogImportDialog::DiveLogImportDialog(QStringList *fn, QWidget *parent) : ui->CSVSeparator->addItem("Tab"); ui->CSVSeparator->addItem(","); - ui->CSVSeparator->addItem(";"); + ui->CSVSeparator->addItem(";"); ui->knownImports->setCurrentIndex(1); connect(ui->CSVDepth, SIGNAL(valueChanged(int)), this, SLOT(unknownImports(int))); @@ -90,6 +90,11 @@ void DiveLogImportDialog::on_knownImports_currentIndexChanged(int index) SET_VALUE_AND_CHECKBOX(CSVpo2, po2CheckBox, CSVApps[index].po2); SET_VALUE_AND_CHECKBOX(CSVcns, cnsCheckBox, CSVApps[index].cns); SET_VALUE_AND_CHECKBOX(CSVstopdepth, stopdepthCheckBox, CSVApps[index].stopdepth); + ui->CSVSeparator->blockSignals(true); + int separator_index = ui->CSVSeparator->findText(CSVApps[index].separator); + if (separator_index != -1) + ui->CSVSeparator->setCurrentIndex(separator_index); + ui->CSVSeparator->blockSignals(false); } void DiveLogImportDialog::unknownImports(bool arg1) -- cgit v1.2.3-70-g09d2