Mercurial > hg > svgui

changeset 1421:70e93f996da6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix inadvertent hardcoding of SV file extension
author Chris Cannam
date Mon, 18 Feb 2019 14:33:35 +0000
parents 2e0d9e68343d
children 6f51297a0250 ec6605563544
files widgets/InteractiveFileFinder.cpp
diffstat 1 files changed, 17 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/widgets/InteractiveFileFinder.cpp	Thu Feb 14 13:12:44 2019 +0000
+++ b/widgets/InteractiveFileFinder.cpp	Mon Feb 18 14:33:35 2019 +0000
@@ -71,7 +71,7 @@
     case SessionFile:
         settingsKeyStub = "session";
         title = tr("Select a session file");
-        filter = tr("%1 session files (*.%1)\nRDF files (%3)\nAll files (*.*)")
+        filter = tr("%1 session files (*.%2)\nRDF files (%3)\nAll files (*.*)")
             .arg(QApplication::applicationName())
             .arg(m_sessionExtension)
             .arg(RDFImporter::getKnownExtensions());
@@ -114,11 +114,11 @@
 
     case SessionOrAudioFile:
         settingsKeyStub = "last";
-        filter = tr("All supported files (*.sv %1 %2)\n%3 session files (*.%4)\nAudio files (%2)\nRDF files (%1)\nAll files (*.*)")
+        filter = tr("All supported files (*.%1 %2 %3)\n%4 session files (*.%1)\nAudio files (%3)\nRDF files (%2)\nAll files (*.*)")
+            .arg(m_sessionExtension)
             .arg(RDFImporter::getKnownExtensions())
             .arg(AudioFileReaderFactory::getKnownExtensions())
-            .arg(QApplication::applicationName())
-            .arg(m_sessionExtension);
+            .arg(QApplication::applicationName());
         break;
 
     case ImageFile:
@@ -147,12 +147,12 @@
 
     case AnyFile:
         settingsKeyStub = "last";
-        filter = tr("All supported files (*.sv %1 %2 %3)\n%4 session files (*.%5)\nAudio files (%1)\nLayer files (%2)\nRDF files (%3)\nAll files (*.*)")
+        filter = tr("All supported files (*.%1 %2 %3 %4)\n%5 session files (*.%1)\nAudio files (%2)\nLayer files (%3)\nRDF files (%4)\nAll files (*.*)")
+            .arg(m_sessionExtension)
             .arg(AudioFileReaderFactory::getKnownExtensions())
             .arg(DataFileReaderFactory::getKnownExtensions())
             .arg(RDFImporter::getKnownExtensions())
-            .arg(QApplication::applicationName())
-            .arg(m_sessionExtension);
+            .arg(QApplication::applicationName());
         break;
     };
 
@@ -247,7 +247,8 @@
         settingsKeyStub = "savesession";
         title = tr("Select a session file");
         filter = tr("%1 session files (*.%2)\nAll files (*.*)")
-            .arg(QApplication::applicationName()).arg(m_sessionExtension);
+            .arg(QApplication::applicationName())
+            .arg(m_sessionExtension);
         break;
 
     case AudioFile:
@@ -260,25 +261,29 @@
     case LayerFile:
         settingsKeyStub = "savelayer";
         title = tr("Select a file to export to");
-        filter = tr("Sonic Visualiser Layer XML files (*.svl)\nComma-separated data files (*.csv)\nRDF/Turtle files (%1)\nMIDI files (*.mid)\nText files (*.txt)\nAll files (*.*)").arg(RDFExporter::getSupportedExtensions());
+        filter = tr("Sonic Visualiser Layer XML files (*.svl)\nComma-separated data files (*.csv)\nRDF/Turtle files (%1)\nMIDI files (*.mid)\nText files (*.txt)\nAll files (*.*)")
+            .arg(RDFExporter::getSupportedExtensions());
         break;
 
     case LayerFileNoMidi:
         settingsKeyStub = "savelayer";
         title = tr("Select a file to export to");
-        filter = tr("Sonic Visualiser Layer XML files (*.svl)\nComma-separated data files (*.csv)\nRDF/Turtle files (%1)\nText files (*.txt)\nAll files (*.*)").arg(RDFExporter::getSupportedExtensions());
+        filter = tr("Sonic Visualiser Layer XML files (*.svl)\nComma-separated data files (*.csv)\nRDF/Turtle files (%1)\nText files (*.txt)\nAll files (*.*)")
+            .arg(RDFExporter::getSupportedExtensions());
         break;
 
     case LayerFileNonSV:
         settingsKeyStub = "savelayer";
         title = tr("Select a file to export to");
-        filter = tr("Comma-separated data files (*.csv)\nSonic Visualiser Layer XML files (*.svl)\nRDF/Turtle files (%1)\nMIDI files (*.mid)\nText files (*.txt)\nAll files (*.*)").arg(RDFExporter::getSupportedExtensions());
+        filter = tr("Comma-separated data files (*.csv)\nSonic Visualiser Layer XML files (*.svl)\nRDF/Turtle files (%1)\nMIDI files (*.mid)\nText files (*.txt)\nAll files (*.*)")
+            .arg(RDFExporter::getSupportedExtensions());
         break;
 
     case LayerFileNoMidiNonSV:
         settingsKeyStub = "savelayer";
         title = tr("Select a file to export to");
-        filter = tr("Comma-separated data files (*.csv)\nSonic Visualiser Layer XML files (*.svl)\nRDF/Turtle files (%1)\nText files (*.txt)\nAll files (*.*)").arg(RDFExporter::getSupportedExtensions());
+        filter = tr("Comma-separated data files (*.csv)\nSonic Visualiser Layer XML files (*.svl)\nRDF/Turtle files (%1)\nText files (*.txt)\nAll files (*.*)")
+            .arg(RDFExporter::getSupportedExtensions());
         break;
 
     case SessionOrAudioFile: