From 092e8463fef3b942cdeb3f958b0005fe403f5879 Mon Sep 17 00:00:00 2001 From: Henrik Brautaset Aronsen Date: Sun, 17 Nov 2013 22:10:38 +0100 Subject: Add more file types to import/default log file dialog - Allow ssrf as a default log file suffix. - Allow sde/dld/db as import log suffices (we don't use the LIBZIP and SQLITE3 ifdefs anymore) Signed-off-by: Henrik Brautaset Aronsen Signed-off-by: Dirk Hohndel --- qt-ui/mainwindow.cpp | 8 -------- qt-ui/preferences.cpp | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 6ed04911d..183143aff 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -472,12 +472,8 @@ QString MainWindow::filter() { QString f; f += "ALL ( *.ssrf *.xml *.XML *.uddf *.udcf *.UDFC *.jlb *.JLB "; -#ifdef LIBZIP f += "*.sde *.SDE *.dld *.DLD "; -#endif -#ifdef SQLITE3 f += "*.db"; -#endif f += ");;"; f += "Subsurface (*.ssrf);;"; @@ -486,13 +482,9 @@ QString MainWindow::filter() f += "UDCF (*.udcf *.UDCF);;"; f += "JLB (*.jlb *.JLB);;"; -#ifdef LIBZIP f += "SDE (*.sde *.SDE);;"; f += "DLD (*.dld *.DLD);;"; -#endif -#ifdef SQLITE3 f += "DB (*.db)"; -#endif return f; } diff --git a/qt-ui/preferences.cpp b/qt-ui/preferences.cpp index eb7eb73ac..5973db65d 100644 --- a/qt-ui/preferences.cpp +++ b/qt-ui/preferences.cpp @@ -202,5 +202,5 @@ void PreferencesDialog::buttonClicked(QAbstractButton* button) void PreferencesDialog::on_chooseFile_clicked() { QFileInfo fi(system_default_filename()); - ui.defaultfilename->setText(QFileDialog::getOpenFileName(this, tr("Open Default Log File"), fi.absolutePath(), tr("XML Files (*.xml)"))); + ui.defaultfilename->setText(QFileDialog::getOpenFileName(this, tr("Open Default Log File"), fi.absolutePath(), tr("Subsurface XML files (*.ssrf *.xml *.XML)"))); } -- cgit v1.2.3-70-g09d2