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

Fix XML filter for import in Edit Database Cell dock and more.

Browse Source 
The XML branch in the import was incorrectly programmed. Now it sets the
appropriate selected filter.

The list of filters is initialised once and the selected filter is passed
to the dialog using the specific parameter.

Chopped the last space in the image formats list for better style.

Case insensitivity applied to the suffix check as done in other parts of
the code.

See issue #1535.
This commit is contained in:
mgr
2018-09-16 17:12:33 +02:00
parent 60c229c1c4
commit 9ca387886b
1 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/EditDialog.cpp
View File

@@ -289,48 +289,37 @@ void EditDialog::importData()
QList<QByteArray> image_formats_list = QImageReader::supportedImageFormats();
for(int i=0;i<image_formats_list.size();++i)
image_formats.append(QString("*.%1 ").arg(QString::fromUtf8(image_formats_list.at(i))));
// Chop last space
image_formats.chop(1);
QStringList filters;
filters << tr("Text files (*.txt)") <<
tr("JSON files (*.json)") <<
tr("XML files (*.xml)") <<
tr("Image files (%1)").arg(image_formats) <<
tr("Binary files (*.bin)") << tr("All files (*)");
QString selectedFilter;
// Get the current editor mode (eg text, hex, image, json or xml mode)
int mode = ui->comboMode->currentIndex();
// Order the filters according to the mode. First the appropriate for the current mode,
// and then the others in similarity order.
// Set as selected filter the appropriate for the current mode.
switch (mode) {
case TextEditor:
filters << tr("Text files (*.txt)") <<
tr("JSON files (*.json)") <<
tr("XML files (*.xml)") <<
tr("Image files (%1)").arg(image_formats) <<
tr("Binary files (*.bin)") << tr("All files (*)");
selectedFilter = tr("Text files (*.txt)");
break;
case HexEditor:
filters << tr("Binary files (*.bin)") <<
tr("Image files (%1)").arg(image_formats) <<
tr("Text files (*.txt)") <<
tr("JSON files (*.json)") <<
tr("XML files (*.xml)") <<
tr("All files (*)");
selectedFilter = tr("Binary files (*.bin)");
break;
case ImageViewer:
filters << tr("Image files (%1)").arg(image_formats) <<
tr("Binary files (*.bin)") <<
tr("Text files (*.txt)") <<
tr("JSON files (*.json)") <<
tr("XML files (*.xml)") <<
tr("All files (*)");
selectedFilter = tr("Image files (%1)").arg(image_formats);
break;
case JsonEditor:
filters << tr("JSON files (*.json)") <<
tr("Text files (*.txt)") <<
tr("XML files (*.xml)") <<
tr("Image files (%1)").arg(image_formats) <<
tr("Binary files (*.bin)") <<
tr("All files (*)");
selectedFilter = tr("JSON files (*.json)");
break;
case XmlEditor:
sciEdit->setFocus();
selectedFilter = tr("XML files (*.xml)");
break;
}
QString fileName = FileDialog::getOpenFileName(
@@ -338,6 +327,7 @@ void EditDialog::importData()
tr("Choose a file to import")
#ifndef Q_OS_MAC // Filters on OS X are buggy
, filters.join(";;")
, &selectedFilter
#endif
);
if(QFile::exists(fileName))
@@ -403,7 +393,7 @@ void EditDialog::exportData()
case HexBuffer:
// Data source is the hex buffer
// If text option has been selected, the readable representation of the content is saved to file.
if (fileName.endsWith(".txt"))
if (fileName.endsWith(".txt", Qt::CaseInsensitive))
file.write(hexEdit->toReadableString().toUtf8());
else
file.write(hexEdit->data());