mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-20 11:00:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improve 'Yes for all' button in CSV import dialog

Browse Source 
See issue #1121.
This commit is contained in:
Martin Kleusberg
2017-09-27 15:52:34 +02:00
parent d2185d234b
commit 425bfa1e75
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/ImportCsvDialog.cpp
View File

@@ -29,8 +29,7 @@ ImportCsvDialog::ImportCsvDialog(const QStringList &filenames, DBBrowserDB* db,
: QDialog(parent),
ui(new Ui::ImportCsvDialog),
csvFilenames(filenames),
pdb(db),
dontAskForExistingTableAgain(false)
pdb(db)
{
ui->setupUi(this);
@@ -169,9 +168,6 @@ void ImportCsvDialog::accept()
settings.setValue("encoding", currentEncoding());
settings.endGroup();
// Reset the 'don't ask again' flag for the message box
dontAskForExistingTableAgain = false;
// Get all the selected files and start the import
if (ui->filePickerBlock->isVisible())
{
@@ -485,14 +481,15 @@ void ImportCsvDialog::importCsv(const QString& fileName, const QString &name)
if(obj.dynamicCast<sqlb::Table>()->fields().size() != fieldList.size())
{
QMessageBox::warning(this, QApplication::applicationName(),
tr("There is already a table of that name and an import into an existing table is only possible if the number of columns match."));
tr("There is already a table named '%1' and an import into an existing table is only possible if the number of columns match.").arg(tableName));
return;
} else {
// Only ask whether to import into the existing table if the 'Yes all' button has not been clicked (yet)
if(!dontAskForExistingTableAgain)
if(!dontAskForExistingTableAgain.contains(tableName))
{
int answer = QMessageBox::question(this, QApplication::applicationName(), tr("There is already a table of that name. Do you want to import the data into it?"),
QMessageBox::Yes | QMessageBox::No | QMessageBox::YesAll, QMessageBox::No);
int answer = QMessageBox::question(this, QApplication::applicationName(),
tr("There is already a table named '%1'. Do you want to import the data into it?").arg(tableName),
QMessageBox::Yes | QMessageBox::No | QMessageBox::YesAll, QMessageBox::No);
// Cancel if the No button has been clicked
if(answer == QMessageBox::No)
@@ -500,7 +497,7 @@ void ImportCsvDialog::importCsv(const QString& fileName, const QString &name)
// If the 'Yes all' button has been clicked, save that for later
if(answer == QMessageBox::YesAll)
dontAskForExistingTableAgain = true;
dontAskForExistingTableAgain.append(tableName);
}
// If we reached this point, this means that either the 'Yes' or the 'Yes all' button has been clicked or that no message box was shown at all
@@ -521,6 +518,10 @@ void ImportCsvDialog::importCsv(const QString& fileName, const QString &name)
{
if(!pdb->createTable(sqlb::ObjectIdentifier("main", tableName), fieldList))
return rollback(this, pdb, restorepointName, 0, tr("Creating the table failed: %1").arg(pdb->lastError()));
// If we're creating the table in this import session, don't ask the user if it's okay to import more data into it. It seems
// safe to just assume that's what they want.
dontAskForExistingTableAgain.append(tableName);
} else {
// Importing into an existing table. So find out something about it's structure.

2
src/ImportCsvDialog.h
View File

@@ -38,7 +38,7 @@ private:
QString selectedFile;
DBBrowserDB* pdb;
QCompleter* encodingCompleter;
bool dontAskForExistingTableAgain;
QStringList dontAskForExistingTableAgain;
CSVParser::ParserResult parseCSV(const QString& fileName, std::function<bool(size_t, CSVRow)> rowFunction, size_t count = 0);
sqlb::FieldVector generateFieldList(const QString& filename);