[PATCH] Cleaned up file list in open and import dialogs

[John Van Ostrand]

Sorry, my gitiquette isn't fully developed yet. The Liquivision import
patch is needed.

On Fri, Nov 7, 2014 at 4:14 PM, Dirk Hohndel <dirk at hohndel.org> wrote:

> Does not apply to master...
>
> /D
>
> On Fri, Nov 07, 2014 at 12:56:23PM -0500, John Van Ostrand wrote:
> > Lists were getting a little jumbled. I sorted the extensions and added
> > suitable human readable names.
> > ---
> >  qt-ui/mainwindow.cpp | 43 +++++++++++++++++++++++++++----------------
> >  1 file changed, 27 insertions(+), 16 deletions(-)
> >
> > diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
> > index 3b74c86..3a4919f 100644
> > --- a/qt-ui/mainwindow.cpp
> > +++ b/qt-ui/mainwindow.cpp
> > @@ -725,23 +725,27 @@ void MainWindow::on_actionUserManual_triggered()
> >  QString MainWindow::filter()
> >  {
> >       QString f;
> > -     f += "ALL ( *.ssrf *.xml *.XML *.uddf *.udcf *.UDFC *.jlb *.JLB ";
> > -     f += "*.sde *.SDE *.dld *.DLD ";
> > -     f += "*.db *.can ";
> > -     f += "*.lvd ";
> > +     f += "Dive log files ( *.ssrf ";
> > +     f += "*.can *.CAN ";
> > +     f += "*.db *.DB " ;
> > +     f += "*.dld *.DLD ";
> > +     f += "*.jlb *.JLB ";
> > +     f += "*.lvd *.LVD ";
> > +     f += "*.sde *.SDE ";
> > +     f += "*.udcf *.UDCF ";
> > +     f += "*.uddf *.UDDF ";
> > +     f += "*.xml *.XML ";
> >       f += ");;";
> >
> >       f += "Subsurface (*.ssrf);;";
> > -     f += "XML (*.xml *.XML);;";
> > -     f += "UDDF (*.uddf);;";
> > +     f += "Cochran (*.can *.CAN);;";
> > +     f += "DiveLogs.de (*.dld *.DLD);;";
> > +     f += "JDiveLog  (*.jlb *.JLB);;";
> > +     f += "LiquiVision (*.lvd *.LVD);;";
> > +     f += "Suunto (*.sde *.SDE *.db *.DB);;";
> >       f += "UDCF (*.udcf *.UDCF);;";
> > -     f += "JLB  (*.jlb *.JLB);;";
> > -
> > -     f += "SDE (*.sde *.SDE);;";
> > -     f += "DLD (*.dld *.DLD);;";
> > -     f += "DB (*.db);;";
> > -     f += "CAN (*.can);;";
> > -     f += "LVD (*.lvd)";
> > +     f += "UDDF (*.uddf *.UDDF);;";
> > +     f += "XML (*.xml *.XML)";
> >
> >       return f;
> >  }
> > @@ -1251,9 +1255,16 @@ void MainWindow::loadFiles(const QStringList
> fileNames)
> >  void MainWindow::on_actionImportDiveLog_triggered()
> >  {
> >       QStringList fileNames = QFileDialog::getOpenFileNames(this,
> tr("Open dive log file"), lastUsedDir(),
> > -             tr("Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld
> *.sde *.db *.can *.lvd);;"
> > -                     "XML files (*.xml);;UDDF/UDCF files(*.uddf
> *.udcf);;JDiveLog files(*.jlb);;"
> > -                     "Suunto files(*.sde *.db);;CSV files(*.csv);;MkVI
> files(*.txt);;All files(*)"));
> > +             tr("Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd
> *.sde *.udcf *.uddf *.xml);;"
> > +                     "Cochran files (*.can);;"
> > +                     "CSV files (*.csv);;"
> > +                     "DiveLog.de files (*.dld);;"
> > +                     "JDiveLog files (*.jlb);;"
> > +                     "MkVI files (*.txt);;"
> > +                     "Suunto files(*.sde *.db);;"
> > +                     "UDDF/UDCF files (*.uddf *.udcf);;"
> > +                     "XML files (*.xml);;"
> > +                     "All files(*)"));
> >
> >       if (fileNames.isEmpty())
> >               return;
> > --
> > 1.8.3.1
> >
> > _______________________________________________
> > subsurface mailing list
> > subsurface at subsurface-divelog.org
> > http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
>



-- 
John Van Ostrand
At large on sabbatical
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20141107/4cfdfa99/attachment.html>