[PATCH] Add more file types to import/default log file dialog
subsurface at henrik.synth.no
subsurface at henrik.synth.no
Sun Nov 17 13:10:38 UTC 2013
From: Henrik Brautaset Aronsen <subsurface at henrik.synth.no>
- 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 at henrik.synth.no>
---
qt-ui/mainwindow.cpp | 8 --------
qt-ui/preferences.cpp | 2 +-
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 6ed0491..183143a 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 eb7eb73..5973db6 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)")));
}
--
1.8.3.4 (Apple Git-47)
More information about the subsurface
mailing list