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

Don't reset the table name as easily in the Import CSV dialog

Browse Source 
See issue #1072.
This commit is contained in:
Martin Kleusberg
2017-09-29 23:08:39 +02:00
parent 263f075d8d
commit bbc4ad5b19
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ImportCsvDialog.cpp
View File

@@ -284,7 +284,7 @@ void ImportCsvDialog::checkInput()
allowImporting = !ui->editName->text().isEmpty();
}
if (ui->filePicker->currentItem()) {
if (ui->filePicker->currentItem() && ui->checkBoxSeparateTables->isChecked()) {
ui->filePicker->currentItem()->setData(Qt::UserRole, ui->editName->text());
}
@@ -303,20 +303,20 @@ void ImportCsvDialog::selectFiles()
ui->filePicker->addItem(item);
}
connect(ui->filePicker, SIGNAL(itemClicked(QListWidgetItem*)), SLOT(updateSelectedFilePreview(QListWidgetItem*)));
connect(ui->filePicker, &QListWidget::itemSelectionChanged, this, &ImportCsvDialog::updateSelectedFilePreview);
}
void ImportCsvDialog::updateSelectedFilePreview(QListWidgetItem* item)
void ImportCsvDialog::updateSelectedFilePreview()
{
selectedFile = item->data(Qt::DisplayRole).toString();
QFileInfo fileInfo(selectedFile);
if (ui->checkBoxSeparateTables->isChecked()) {
auto selection = ui->filePicker->selectedItems();
if(!selection.isEmpty())
{
auto item = selection.first();
selectedFile = item->data(Qt::DisplayRole).toString();
ui->editName->setText(item->data(Qt::UserRole).toString());
} else {
ui->editName->setText(fileInfo.baseName());
updatePreview();
checkInput();
}
updatePreview();
checkInput();
}
void ImportCsvDialog::updateSelection(bool selected)

2
src/ImportCsvDialog.h
View File

@@ -28,7 +28,7 @@ private slots:
void updatePreview();
void checkInput();
void selectFiles();
void updateSelectedFilePreview(QListWidgetItem*);
void updateSelectedFilePreview();
void updateSelection(bool);
void matchSimilar();