mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-01 01:03:24 +00:00
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>
This commit is contained in:
parent
188cdc7d06
commit
092e8463fe
2 changed files with 1 additions and 9 deletions
|
@ -472,12 +472,8 @@ QString MainWindow::filter()
|
||||||
{
|
{
|
||||||
QString f;
|
QString f;
|
||||||
f += "ALL ( *.ssrf *.xml *.XML *.uddf *.udcf *.UDFC *.jlb *.JLB ";
|
f += "ALL ( *.ssrf *.xml *.XML *.uddf *.udcf *.UDFC *.jlb *.JLB ";
|
||||||
#ifdef LIBZIP
|
|
||||||
f += "*.sde *.SDE *.dld *.DLD ";
|
f += "*.sde *.SDE *.dld *.DLD ";
|
||||||
#endif
|
|
||||||
#ifdef SQLITE3
|
|
||||||
f += "*.db";
|
f += "*.db";
|
||||||
#endif
|
|
||||||
f += ");;";
|
f += ");;";
|
||||||
|
|
||||||
f += "Subsurface (*.ssrf);;";
|
f += "Subsurface (*.ssrf);;";
|
||||||
|
@ -486,13 +482,9 @@ QString MainWindow::filter()
|
||||||
f += "UDCF (*.udcf *.UDCF);;";
|
f += "UDCF (*.udcf *.UDCF);;";
|
||||||
f += "JLB (*.jlb *.JLB);;";
|
f += "JLB (*.jlb *.JLB);;";
|
||||||
|
|
||||||
#ifdef LIBZIP
|
|
||||||
f += "SDE (*.sde *.SDE);;";
|
f += "SDE (*.sde *.SDE);;";
|
||||||
f += "DLD (*.dld *.DLD);;";
|
f += "DLD (*.dld *.DLD);;";
|
||||||
#endif
|
|
||||||
#ifdef SQLITE3
|
|
||||||
f += "DB (*.db)";
|
f += "DB (*.db)";
|
||||||
#endif
|
|
||||||
|
|
||||||
return f;
|
return f;
|
||||||
}
|
}
|
||||||
|
|
|
@ -202,5 +202,5 @@ void PreferencesDialog::buttonClicked(QAbstractButton* button)
|
||||||
void PreferencesDialog::on_chooseFile_clicked()
|
void PreferencesDialog::on_chooseFile_clicked()
|
||||||
{
|
{
|
||||||
QFileInfo fi(system_default_filename());
|
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)")));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue