diff options
author | Henrik Brautaset Aronsen <subsurface@henrik.synth.no> | 2013-11-17 22:10:38 +0100 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2013-11-17 13:39:57 -0800 |
commit | 092e8463fef3b942cdeb3f958b0005fe403f5879 (patch) | |
tree | 61693b11dc3b551b65e096b738cb65546460fc2b /qt-ui | |
parent | 188cdc7d0617f46afbc71d1eb21b0058c3447a30 (diff) | |
download | subsurface-092e8463fef3b942cdeb3f958b0005fe403f5879.tar.gz |
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 <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui')
-rw-r--r-- | qt-ui/mainwindow.cpp | 8 | ||||
-rw-r--r-- | qt-ui/preferences.cpp | 2 |
2 files changed, 1 insertions, 9 deletions
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)"))); } |