From 8795ba591c6d57ab49d4965ffd242ce1dabe8764 Mon Sep 17 00:00:00 2001 From: Martin Kleusberg Date: Fri, 5 Oct 2018 13:26:20 +0200 Subject: [PATCH] Don't add multiple "All files" filter to the Open/Save file dialogs See issue #1556. --- src/FileExtensionManager.cpp | 16 +++++++--------- src/PreferencesDialog.cpp | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/FileExtensionManager.cpp b/src/FileExtensionManager.cpp index 82a855a8..808f5517 100644 --- a/src/FileExtensionManager.cpp +++ b/src/FileExtensionManager.cpp @@ -13,15 +13,13 @@ FileExtensionManager::FileExtensionManager(QStringList init, QWidget *parent) : QString description = itemString.left(itemString.indexOf('(')).trimmed(); QString extension = itemString; extension = extension.remove (0, itemString.indexOf('(')+1).remove(')').simplified().trimmed(); - if ( extension.compare("*") != 0 ) //We exclude "All files" from the table - { - QTableWidgetItem *newItemDescription = new QTableWidgetItem(description); - QTableWidgetItem *newItemExtension = new QTableWidgetItem(extension); - ui->tableExtensions->insertRow(i); - ui->tableExtensions->setItem(i, 0, newItemDescription); - ui->tableExtensions->setItem(i, 1, newItemExtension); - i++; - } + + QTableWidgetItem *newItemDescription = new QTableWidgetItem(description); + QTableWidgetItem *newItemExtension = new QTableWidgetItem(extension); + ui->tableExtensions->insertRow(i); + ui->tableExtensions->setItem(i, 0, newItemDescription); + ui->tableExtensions->setItem(i, 1, newItemExtension); + i++; } connect(ui->buttonAdd, SIGNAL(clicked(bool)), this, SLOT(addItem())); diff --git a/src/PreferencesDialog.cpp b/src/PreferencesDialog.cpp index ead82c13..2ac3ad49 100644 --- a/src/PreferencesDialog.cpp +++ b/src/PreferencesDialog.cpp @@ -16,7 +16,7 @@ PreferencesDialog::PreferencesDialog(QWidget* parent) : QDialog(parent), ui(new Ui::PreferencesDialog), - m_dbFileExtensions(FileDialog::getSqlDatabaseFileFilter().split(";;")) + m_dbFileExtensions(Settings::getValue("General", "DBFileExtensions").toString().split(";;")) { ui->setupUi(this); ui->treeSyntaxHighlighting->setColumnHidden(0, true);