From 6b8f57d4844f46eed3ea4c22afb27944df13288e Mon Sep 17 00:00:00 2001 From: Martin Kleusberg Date: Tue, 16 Jun 2015 23:58:02 +0200 Subject: [PATCH] Make sure there are file extension filters set for all file dialogs --- src/FileDialog.h | 5 +++++ src/MainWindow.cpp | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/FileDialog.h b/src/FileDialog.h index 3f4a5176..2221f6a6 100644 --- a/src/FileDialog.h +++ b/src/FileDialog.h @@ -15,6 +15,11 @@ public: static QString getExistingDirectory(QWidget* parent = 0, const QString& caption = QString(), Options options = 0); + static QString getSqlDatabaseFileFilter() + { + return tr("SQLite database files (*.db *.sqlite *.sqlite3 *.db3);;All files (*)"); + } + private: static QString getFileDialogPath(); static void setFileDialogPath(const QString& new_path); diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index ff61d526..590601d2 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -206,7 +206,7 @@ bool MainWindow::fileOpen(const QString& fileName, bool dontAddToRecentFiles) this, tr("Choose a database file") #ifndef Q_OS_MAC // Filters on OS X are buggy - , tr("SQLite database files (*.db *.sqlite *.sqlite3 *.db3);;All files (*)") + , FileDialog::getSqlDatabaseFileFilter() #endif ); } @@ -246,7 +246,9 @@ bool MainWindow::fileOpen(const QString& fileName, bool dontAddToRecentFiles) void MainWindow::fileNew() { - QString fileName = FileDialog::getSaveFileName(this, tr("Choose a filename to save under")); + QString fileName = FileDialog::getSaveFileName(this, + tr("Choose a filename to save under"), + FileDialog::getSqlDatabaseFileFilter()); if(!fileName.isEmpty()) { if(QFile::exists(fileName)) @@ -921,7 +923,8 @@ void MainWindow::importDatabaseFromSQL() { newDbFile = FileDialog::getSaveFileName( this, - tr("Choose a filename to save under")); + tr("Choose a filename to save under"), + FileDialog::getSqlDatabaseFileFilter()); if(QFile::exists(newDbFile)) { QMessageBox::information(this, QApplication::applicationName(), tr("File %1 already exists. Please choose a different name.").arg(newDbFile)); @@ -2016,7 +2019,8 @@ void MainWindow::fileAttach() // Get file name of database to attach QString file = FileDialog::getOpenFileName( this, - tr("Choose a database file")); + tr("Choose a database file"), + FileDialog::getSqlDatabaseFileFilter()); if(!QFile::exists(file)) return;