Fix saving/restoring of settings in Import CSV dialog

MKleusberg · MKleusberg · commit e2f3186d194c · 2019-05-11T16:10:31.000+02:00
Saving and restoring of quote and separator characters did not work as expected in the Import CSV dialog since the last commits. A missing "else" made us try to save the string "Other" as the quote character when a custom quote character was selected. Also the translation from and to the saved format on disk had its problems. See issue #1860.
diff --git a/src/ImportCsvDialog.cpp b/src/ImportCsvDialog.cpp
@@ -58,8 +58,8 @@ ImportCsvDialog::ImportCsvDialog(const QStringList &filenames, DBBrowserDB* db,
     ui->checkboxHeader->setChecked(Settings::getValue("importcsv", "firstrowheader").toBool());
     ui->checkBoxTrimFields->setChecked(Settings::getValue("importcsv", "trimfields").toBool());
     ui->checkBoxSeparateTables->setChecked(Settings::getValue("importcsv", "separatetables").toBool());
-    setSeparatorChar(static_cast<char32_t>(Settings::getValue("importcsv", "separator").toInt()));
-    setQuoteChar(static_cast<char32_t>(Settings::getValue("importcsv", "quotecharacter").toInt()));
+    setSeparatorChar(Settings::getValue("importcsv", "separator").toChar());
+    setQuoteChar(Settings::getValue("importcsv", "quotecharacter").toChar());
     setEncoding(Settings::getValue("importcsv", "encoding").toString());
 
     ui->checkboxHeader->blockSignals(false);
@@ -375,7 +375,7 @@ CSVParser::ParserResult ImportCsvDialog::parseCSV(const QString &fileName, std::
     QFile file(fileName);
     file.open(QIODevice::ReadOnly);
 
-    CSVParser csv(ui->checkBoxTrimFields->isChecked(), currentSeparatorChar(), currentQuoteChar());
+    CSVParser csv(ui->checkBoxTrimFields->isChecked(), toUtf8(currentSeparatorChar()), toUtf8(currentQuoteChar()));
 
     // Only show progress dialog if we parse all rows. The assumption here is that if a row count limit has been set, it won't be a very high one.
     if(count == 0)
@@ -704,7 +704,7 @@ bool ImportCsvDialog::importCsv(const QString& fileName, const QString& name)
     return true;
 }
 
-void ImportCsvDialog::setQuoteChar(char32_t c)
+void ImportCsvDialog::setQuoteChar(QChar c)
 {
     QComboBox* combo = ui->comboQuote;
     int index = combo->findText(QString(c));
@@ -719,21 +719,20 @@ void ImportCsvDialog::setQuoteChar(char32_t c)
     }
 }
 
-char32_t ImportCsvDialog::currentQuoteChar() const
+QChar ImportCsvDialog::currentQuoteChar() const
 {
     QString value;
 
     // The last item in the combobox is the 'Other' item; if it is selected return the text of the line edit field instead
     if(ui->comboQuote->currentIndex() == ui->comboQuote->count()-1)
         value = ui->editCustomQuote->text().length() ? ui->editCustomQuote->text() : "";
-
-    if(ui->comboQuote->currentText().length())
+    else if(ui->comboQuote->currentText().length())
         value = ui->comboQuote->currentText();
 
-    return toUtf8(value);
+    return value.size() ? value.front() : QChar();
 }
 
-void ImportCsvDialog::setSeparatorChar(char32_t c)
+void ImportCsvDialog::setSeparatorChar(QChar c)
 {
     QComboBox* combo = ui->comboSeparator;
     QString sText = c == '\t' ? QString("Tab") : QString(c);
@@ -749,7 +748,7 @@ void ImportCsvDialog::setSeparatorChar(char32_t c)
     }
 }
 
-char32_t ImportCsvDialog::currentSeparatorChar() const
+QChar ImportCsvDialog::currentSeparatorChar() const
 {
     QString value;
 
@@ -759,7 +758,7 @@ char32_t ImportCsvDialog::currentSeparatorChar() const
     else
         value = ui->comboSeparator->currentText() == tr("Tab") ? "\t" : ui->comboSeparator->currentText();
 
-    return toUtf8(value);
+    return value.size() ? value.front() : QChar();
 }
 
 void ImportCsvDialog::setEncoding(const QString& sEnc)
diff --git a/src/ImportCsvDialog.h b/src/ImportCsvDialog.h
@@ -45,11 +45,11 @@ private slots:
 
     bool importCsv(const QString& f, const QString& n = QString());
 
-    void setQuoteChar(char32_t c);
-    char32_t currentQuoteChar() const;
+    void setQuoteChar(QChar c);
+    QChar currentQuoteChar() const;
 
-    void setSeparatorChar(char32_t c);
-    char32_t currentSeparatorChar() const;
+    void setSeparatorChar(QChar c);
+    QChar currentSeparatorChar() const;
 
     void setEncoding(const QString& sEnc);
     QString currentEncoding() const;

Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,8 @@ ImportCsvDialog::ImportCsvDialog(const QStringList &filenames, DBBrowserDB* db,`
`58`	`58`	`ui->checkboxHeader->setChecked(Settings::getValue("importcsv", "firstrowheader").toBool());`
`59`	`59`	`ui->checkBoxTrimFields->setChecked(Settings::getValue("importcsv", "trimfields").toBool());`
`60`	`60`	`ui->checkBoxSeparateTables->setChecked(Settings::getValue("importcsv", "separatetables").toBool());`
`61`		`- setSeparatorChar(static_cast<char32_t>(Settings::getValue("importcsv", "separator").toInt()));`
`62`		`- setQuoteChar(static_cast<char32_t>(Settings::getValue("importcsv", "quotecharacter").toInt()));`
	`61`	`+ setSeparatorChar(Settings::getValue("importcsv", "separator").toChar());`
	`62`	`+ setQuoteChar(Settings::getValue("importcsv", "quotecharacter").toChar());`
`63`	`63`	`setEncoding(Settings::getValue("importcsv", "encoding").toString());`
`64`	`64`
`65`	`65`	`ui->checkboxHeader->blockSignals(false);`
`@@ -375,7 +375,7 @@ CSVParser::ParserResult ImportCsvDialog::parseCSV(const QString &fileName, std::`
`375`	`375`	`QFile file(fileName);`
`376`	`376`	`file.open(QIODevice::ReadOnly);`
`377`	`377`
`378`		`- CSVParser csv(ui->checkBoxTrimFields->isChecked(), currentSeparatorChar(), currentQuoteChar());`
	`378`	`+ CSVParser csv(ui->checkBoxTrimFields->isChecked(), toUtf8(currentSeparatorChar()), toUtf8(currentQuoteChar()));`
`379`	`379`
`380`	`380`	`// Only show progress dialog if we parse all rows. The assumption here is that if a row count limit has been set, it won't be a very high one.`
`381`	`381`	`if(count == 0)`
`@@ -704,7 +704,7 @@ bool ImportCsvDialog::importCsv(const QString& fileName, const QString& name)`
`704`	`704`	`return true;`
`705`	`705`	`}`
`706`	`706`
`707`		`-void ImportCsvDialog::setQuoteChar(char32_t c)`
	`707`	`+void ImportCsvDialog::setQuoteChar(QChar c)`
`708`	`708`	`{`
`709`	`709`	`QComboBox* combo = ui->comboQuote;`
`710`	`710`	`int index = combo->findText(QString(c));`
`@@ -719,21 +719,20 @@ void ImportCsvDialog::setQuoteChar(char32_t c)`
`719`	`719`	`}`
`720`	`720`	`}`
`721`	`721`
`722`		`-char32_t ImportCsvDialog::currentQuoteChar() const`
	`722`	`+QChar ImportCsvDialog::currentQuoteChar() const`
`723`	`723`	`{`
`724`	`724`	`QString value;`
`725`	`725`
`726`	`726`	`// The last item in the combobox is the 'Other' item; if it is selected return the text of the line edit field instead`
`727`	`727`	`if(ui->comboQuote->currentIndex() == ui->comboQuote->count()-1)`
`728`	`728`	`value = ui->editCustomQuote->text().length() ? ui->editCustomQuote->text() : "";`
`729`		`-`
`730`		`- if(ui->comboQuote->currentText().length())`
	`729`	`+ else if(ui->comboQuote->currentText().length())`
`731`	`730`	`value = ui->comboQuote->currentText();`
`732`	`731`
`733`		`- return toUtf8(value);`
	`732`	`+ return value.size() ? value.front() : QChar();`
`734`	`733`	`}`
`735`	`734`
`736`		`-void ImportCsvDialog::setSeparatorChar(char32_t c)`
	`735`	`+void ImportCsvDialog::setSeparatorChar(QChar c)`
`737`	`736`	`{`
`738`	`737`	`QComboBox* combo = ui->comboSeparator;`
`739`	`738`	`QString sText = c == '\t' ? QString("Tab") : QString(c);`
`@@ -749,7 +748,7 @@ void ImportCsvDialog::setSeparatorChar(char32_t c)`
`749`	`748`	`}`
`750`	`749`	`}`
`751`	`750`
`752`		`-char32_t ImportCsvDialog::currentSeparatorChar() const`
	`751`	`+QChar ImportCsvDialog::currentSeparatorChar() const`
`753`	`752`	`{`
`754`	`753`	`QString value;`
`755`	`754`
`@@ -759,7 +758,7 @@ char32_t ImportCsvDialog::currentSeparatorChar() const`
`759`	`758`	`else`
`760`	`759`	`value = ui->comboSeparator->currentText() == tr("Tab") ? "\t" : ui->comboSeparator->currentText();`
`761`	`760`
`762`		`- return toUtf8(value);`
	`761`	`+ return value.size() ? value.front() : QChar();`
`763`	`762`	`}`
`764`	`763`
`765`	`764`	`void ImportCsvDialog::setEncoding(const QString& sEnc)`