Rewrite FileNames::SelectFile using FileTypes...

... And more uniformity in the descriptions of file types used in more than
one place

Also fixes missing translations in VSTEffect.cpp

src/AudacityLogger.cpp

@@ -255,7 +255,7 @@ void AudacityLogger::OnSave(wxCommandEvent & WXUNUSED(e))
       wxEmptyString,
       fName,
       wxT("txt"),
-                        wxT("*.txt"),
+      { FileNames::TextFiles },
       wxFD_SAVE | wxFD_OVERWRITE_PROMPT | wxRESIZE_BORDER,
       mFrame.get());
 

src/Benchmark.cpp

@@ -265,7 +265,7 @@ void BenchmarkDialog::OnSave( wxCommandEvent & WXUNUSED(event))
       wxEmptyString,
       fName,
       wxT("txt"),
-                        wxT("*.txt"),
+      { FileNames::TextFiles },
       wxFD_SAVE | wxRESIZE_BORDER,
       this);
 

src/FFmpeg.cpp

@@ -449,7 +449,8 @@ class FindFFmpegDialog final : public wxDialogWrapper
 {
 public:
 
-   FindFFmpegDialog(wxWindow *parent, const wxString &path, const wxString &name, const wxString &type)
+   FindFFmpegDialog(wxWindow *parent, const wxString &path, const wxString &name,
+      FileNames::FileTypes types)
       :  wxDialogWrapper(parent, wxID_ANY, XO("Locate FFmpeg"))
    {
       SetName();
@@ -457,7 +458,7 @@ public:
 
       mPath = path;
       mName = name;
-      mType = type;
+      mTypes = std::move( types );
 
       mLibPath.Assign(mPath, mName);
 
@@ -522,7 +523,7 @@ public:
          mLibPath.GetPath(),
          mLibPath.GetName(),
          wxT(""),
-         mType,
+         mTypes,
          wxFD_OPEN | wxRESIZE_BORDER,
          this);
       if (!path.empty()) {
@@ -547,7 +548,7 @@ private:
 
    wxString mPath;
    wxString mName;
-   wxString mType;
+   FileNames::FileTypes mTypes;
 
    wxTextCtrl *mPathText;
 
@@ -659,7 +660,7 @@ bool FFmpegLibs::FindLibs(wxWindow *parent)
    FindFFmpegDialog fd(parent,
                         path,
                         name,
-                        GetLibraryTypeString());
+                        GetLibraryTypes());
 
    if (fd.ShowModal() == wxID_CANCEL) {
       wxLogMessage(wxT("User canceled the dialog. Failed to find FFmpeg libraries."));

src/FFmpeg.h

@@ -242,10 +242,14 @@ public:
 #if defined(__WXMSW__)
    /* Library names and file filters for Windows only */
 
-   wxString GetLibraryTypeString()
+   FileNames::FileTypes GetLibraryTypes()
    {
+      return {
          /* i18n-hint: do not translate avformat.  Preserve the computer gibberish.*/
-      return _("Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files|*");
+         { XO("Only avformat.dll"), { wxT("avformat.dll") } },
+         FileNames::DynamicLibraries,
+         FileNames::AllFiles
+      };
    }
 
    wxString GetLibAVFormatPath()
@@ -276,9 +280,12 @@ public:
    }
 #elif defined(__WXMAC__)
    /* Library names and file filters for Mac OS only */
-   wxString GetLibraryTypeString()
+   FileNames::FileTypes GetLibraryTypes()
    {
-      return _("Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*");
+      return {
+         FileNames::DynamicLibraries,
+         FileNames::AllFiles
+      };
    }
 
    wxString GetLibAVFormatPath()
@@ -309,9 +316,13 @@ public:
 #else
    /* Library names and file filters for other platforms, basically Linux and
     * other *nix platforms */
-   wxString GetLibraryTypeString()
+   FileNames::FileTypes GetLibraryTypes()
    {
-      return _("Only libavformat.so|libavformat*.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*");
+      return {
+         { XO("Only libavformat.so"), { wxT("libavformat*.so*") } },
+         FileNames::DynamicLibraries,
+         FileNames::AllFiles
+      };
    }
 
    wxString GetLibAVFormatPath()

src/FileNames.cpp

@@ -562,7 +562,7 @@ FileNames::SelectFile(Operation op,
    const FilePath& default_path,
    const FilePath& default_filename,
    const FileExtension& default_extension,
-           const wxString& wildcard,
+   const FileTypes& fileTypes,
    int flags,
    wxWindow *parent)
 {
@@ -572,7 +572,8 @@ FileNames::SelectFile(Operation op,
          filter = wxT("*.") + default_extension;
       return FileSelector(
             message.Translation(), path, default_filename, filter,
-            wildcard, flags, parent, wxDefaultCoord, wxDefaultCoord);
+            FormatWildcard( fileTypes ),
+            flags, parent, wxDefaultCoord, wxDefaultCoord);
    });
 }
 
@@ -711,7 +712,7 @@ char *FileNames::VerifyFilename(const wxString &s, bool input)
    }
    else {
       wxFileName ff(name);
-      wxString ext;
+      FileExtension ext;
       while ((char *) (const char *)name.mb_str() == NULL) {
          AudacityMessageBox(
             XO(
@@ -723,7 +724,10 @@ char *FileNames::VerifyFilename(const wxString &s, bool input)
             wxEmptyString,
             name,
             ext,
-                             ext.empty() ? wxT("*") : (wxT("*.") + ext),
+            { ext.empty()
+               ? FileNames::AllFiles
+               : FileType{ {}, { ext } }
+            },
             wxFD_SAVE | wxRESIZE_BORDER,
             wxGetTopLevelParent(NULL));
       }

src/FileNames.h

@@ -163,7 +163,7 @@ public:
       const FilePath& default_path,
       const FilePath& default_filename,
       const FileExtension& default_extension,
-                const wxString& wildcard,
+      const FileTypes& fileTypes,
       int flags,
       wxWindow *parent);
 

src/FreqWindow.cpp

@@ -1070,7 +1070,7 @@ void FrequencyPlotDialog::OnExport(wxCommandEvent & WXUNUSED(event))
       wxEmptyString,
       fName,
       wxT("txt"),
-                                 _("Text files (*.txt)|*.txt|All files|*"),
+      { FileNames::TextFiles, FileNames::AllFiles },
       wxFD_SAVE | wxRESIZE_BORDER,
       this);
 

src/LabelDialog.cpp

@@ -632,7 +632,7 @@ void LabelDialog::OnImport(wxCommandEvent & WXUNUSED(event))
          wxEmptyString,     // Path
          wxT(""),       // Name
          wxT("txt"),   // Extension
-                    _("Text files (*.txt)|*.txt|All files|*"),
+         { FileNames::TextFiles, FileNames::AllFiles },
          wxRESIZE_BORDER, // Flags
          this);    // Parent
 
@@ -681,7 +681,7 @@ void LabelDialog::OnExport(wxCommandEvent & WXUNUSED(event))
       wxEmptyString,
       fName,
       wxT("txt"),
-      wxT("*.txt"),
+      { FileNames::TextFiles },
       wxFD_SAVE | wxFD_OVERWRITE_PROMPT | wxRESIZE_BORDER,
       this);
 

src/ProjectFileManager.cpp

@@ -849,7 +849,7 @@ For an audio file that will open in other apps, use 'Export'.\n");
          filename.GetPath(),
          filename.GetFullName(),
          wxT("aup"),
-         _("Audacity projects") + wxT(" (*.aup)|*.aup"),
+         { FileNames::AudacityProjects },
          wxFD_SAVE | wxRESIZE_BORDER,
          &window);
 

src/Tags.cpp

@@ -1238,7 +1238,7 @@ void TagsEditorDialog::OnLoad(wxCommandEvent & WXUNUSED(event))
       FileNames::DataDir(),
       wxT("Tags.xml"),
       wxT("xml"),
-                     wxT("*.xml"),
+      { FileNames::XMLFiles },
       wxFD_OPEN | wxRESIZE_BORDER,
       this);
 
@@ -1294,7 +1294,7 @@ void TagsEditorDialog::OnSave(wxCommandEvent & WXUNUSED(event))
       FileNames::DataDir(),
       wxT("Tags.xml"),
       wxT("xml"),
-                     wxT("*.xml"),
+      { FileNames::XMLFiles },
       wxFD_SAVE | wxFD_OVERWRITE_PROMPT | wxRESIZE_BORDER,
       this);
 

src/TimerRecordDialog.cpp

@@ -322,7 +322,7 @@ void TimerRecordDialog::OnAutoSavePathButton_Click(wxCommandEvent& WXUNUSED(even
       m_fnAutoSaveFile.GetPath(),
       m_fnAutoSaveFile.GetFullName(),
       wxT("aup"),
-      _("Audacity projects") + wxT(" (*.aup)|*.aup"),
+      { FileNames::AudacityProjects },
       wxFD_SAVE | wxRESIZE_BORDER,
       this);
 

src/effects/Contrast.cpp

@@ -536,7 +536,7 @@ void ContrastDialog::OnExport(wxCommandEvent & WXUNUSED(event))
       wxEmptyString,
       fName,
       wxT("txt"),
-                        _("Text files (*.txt)|*.txt|All files|*"),
+      { FileNames::TextFiles, FileNames::AllFiles },
       wxFD_SAVE | wxRESIZE_BORDER,
       this);
 

src/effects/VST/VSTEffect.cpp

@@ -1865,7 +1865,11 @@ void VSTEffect::ExportPresets()
       FileNames::DataDir(),
       wxEmptyString,
       wxT("xml"),
-                       wxT("Standard VST bank file (*.fxb)|*.fxb|Standard VST program file (*.fxp)|*.fxp|Audacity VST preset file (*.xml)|*.xml"),
+      {
+        { XO("Standard VST bank file"), { wxT("fxb") }, true },
+        { XO("Standard VST program file"), { wxT("fxp") }, true },
+        { XO("Audacity VST preset file"), { wxT("xml") }, true },
+      },
       wxFD_SAVE | wxFD_OVERWRITE_PROMPT | wxRESIZE_BORDER,
       NULL);
 
@@ -1918,7 +1922,11 @@ void VSTEffect::ImportPresets()
       FileNames::DataDir(),
       wxEmptyString,
       wxT("xml"),
-                       wxT("VST preset files (*.fxb; *.fxp; *.xml)|*.fxb;*.fxp;*.xml"),
+      { {
+         XO("VST preset files"),
+         { wxT("fxb"), wxT("fxp"), wxT("xml") },
+         true
+      } },
       wxFD_OPEN | wxRESIZE_BORDER,
       mParent);
 

src/export/ExportCL.cpp

@@ -175,10 +175,13 @@ bool ExportCLOptions::TransferDataFromWindow()
 void ExportCLOptions::OnBrowse(wxCommandEvent& WXUNUSED(event))
 {
    wxString path;
-   wxString ext;
+   FileExtension ext;
+   FileNames::FileType type = FileNames::AllFiles;
 
 #if defined(__WXMSW__)
    ext = wxT("exe");
+   /* i18n-hint files that can be run as programs */
+   type = { XO("Executables"), { ext } };
 #endif
 
    path = FileNames::SelectFile(FileNames::Operation::Open,
@@ -186,7 +189,7 @@ void ExportCLOptions::OnBrowse(wxCommandEvent& WXUNUSED(event))
       wxEmptyString,
       wxEmptyString,
       ext,
-                       ext.empty() ? wxT("*") : (wxT("*.") + ext),
+      { type },
       wxFD_OPEN | wxRESIZE_BORDER,
       this);
    if (path.empty()) {

src/export/ExportMP3.cpp

@@ -553,7 +553,8 @@ public:
 
 #ifndef DISABLE_DYNAMIC_LOADING_LAME
 
-   FindDialog(wxWindow *parent, wxString path, wxString name, wxString type)
+   FindDialog(wxWindow *parent, wxString path, wxString name,
+      FileNames::FileTypes types)
    :  wxDialogWrapper(parent, wxID_ANY,
    /* i18n-hint: LAME is the name of an MP3 converter and should not be translated*/
    XO("Locate LAME"))
@@ -563,7 +564,7 @@ public:
 
       mPath = path;
       mName = name;
-      mType = type;
+      mTypes = std::move( types );
 
       mLibPath.Assign(mPath, mName);
 
@@ -630,7 +631,7 @@ public:
             mLibPath.GetPath(),
             mLibPath.GetName(),
             wxT(""),
-                                   mType,
+            mTypes,
             wxFD_OPEN | wxRESIZE_BORDER,
             this);
       if (!path.empty()) {
@@ -658,7 +659,7 @@ private:
 
    wxString mPath;
    wxString mName;
-   wxString mType;
+   FileNames::FileTypes mTypes;
 #endif // DISABLE_DYNAMIC_LOADING_LAME
 
    wxTextCtrl *mPathText;
@@ -800,7 +801,7 @@ public:
    wxString GetLibraryVersion();
    wxString GetLibraryName();
    wxString GetLibraryPath();
-   wxString GetLibraryTypeString();
+   FileNames::FileTypes GetLibraryTypes();
 
    /* returns the number of samples PER CHANNEL to send for each call to EncodeBuffer */
    int InitializeStream(unsigned channels, int sampleRate);
@@ -944,7 +945,7 @@ bool MP3Exporter::FindLibrary(wxWindow *parent)
    FindDialog fd(parent,
       path,
       name,
-                 GetLibraryTypeString());
+      GetLibraryTypes());
 
    if (fd.ShowModal() == wxID_CANCEL) {
       return false;
@@ -1493,9 +1494,13 @@ wxString MP3Exporter::GetLibraryName()
    return wxT("lame_enc.dll");
 }
 
-wxString MP3Exporter::GetLibraryTypeString()
+FileNames::FileTypes MP3Exporter::GetLibraryTypes()
 {
-   return _("Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files|*");
+   return {
+      { XO("Only lame_enc.dll"), { wxT("lame_enc.dll") } },
+      FileNames::DynamicLibraries,
+      FileNames::AllFiles
+   };
 }
 
 #elif defined(__WXMAC__)
@@ -1527,11 +1532,20 @@ wxString MP3Exporter::GetLibraryName()
    return wxT("libmp3lame.dylib");
 }
 
-wxString MP3Exporter::GetLibraryTypeString()
+FileNames::FileTypes MP3Exporter::GetLibraryTypes()
 {
-   if (sizeof(void*) == 8)
+   return {
-      return wxString(_("Only libmp3lame64bit.dylib|libmp3lame64bit.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"));
+      (sizeof(void*) == 8)
-   return wxString(_("Only libmp3lame.dylib|libmp3lame.dylib|Dynamic Libraries (*.dylib)|*.dylib|All Files (*)|*"));
+         ? FileNames::FileType{
+              XO("Only libmp3lame64bit.dylib"), { wxT("libmp3lame64bit.dylib") }
+           }
+         : FileNames::FileType{
+              XO("Only libmp3lame.dylib"), { wxT("libmp3lame.dylib") }
+           }
+      ,
+      FileNames::DynamicLibraries,
+      FileNames::AllFiles
+   };
 }
 
 #else //!__WXMAC__
@@ -1547,9 +1561,14 @@ wxString MP3Exporter::GetLibraryName()
    return wxT("libmp3lame.so.0");
 }
 
-wxString MP3Exporter::GetLibraryTypeString()
+FileNames::FileTypes MP3Exporter::GetLibraryTypes()
 {
-   return wxString(_("Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"));
+   return {
+      { XO("Only libmp3lame.so.0"), { wxT("libmp3lame.so.0") } },
+      { XO("Primary shared object files"), { wxT("so") }, true },
+      { XO("Extended libraries"), { wxT("so*") }, true },
+      FileNames::AllFiles
+   };
 }
 #endif
 

src/menus/FileMenus.cpp

@@ -232,7 +232,7 @@ void OnExportLabels(const CommandContext &context)
       wxEmptyString,
       fName,
       wxT("txt"),
-                        wxT("*.txt"),
+      { FileNames::TextFiles },
       wxFD_SAVE | wxFD_OVERWRITE_PROMPT | wxRESIZE_BORDER,
       &window);
 
@@ -318,7 +318,10 @@ void OnExportMIDI(const CommandContext &context)
          wxEmptyString,
          fName,
          wxT("mid"),
-         _("MIDI file (*.mid)|*.mid|Allegro file (*.gro)|*.gro"),
+         {
+            { XO("MIDI file"),    { wxT("mid") }, true },
+            { XO("Allegro file"), { wxT("gro") }, true },
+         },
          wxFD_SAVE | wxFD_OVERWRITE_PROMPT | wxRESIZE_BORDER,
          &window);
 
@@ -419,7 +422,7 @@ void OnImportLabels(const CommandContext &context)
          wxEmptyString,     // Path
          wxT(""),       // Name
          wxT("txt"),   // Extension
-                    _("Text files (*.txt)|*.txt|All files|*"),
+         { FileNames::TextFiles, FileNames::AllFiles },
          wxRESIZE_BORDER,        // Flags
          &window);    // Parent
 
@@ -463,7 +466,15 @@ void OnImportMIDI(const CommandContext &context)
       wxEmptyString,     // Path
       wxT(""),       // Name
       wxT(""),       // Extension
-      _("MIDI and Allegro files (*.mid;*.midi;*.gro)|*.mid;*.midi;*.gro|MIDI files (*.mid;*.midi)|*.mid;*.midi|Allegro files (*.gro)|*.gro|All files|*"),
+      {
+         { XO("MIDI and Allegro files"),
+           { wxT("mid"), wxT("midi"), wxT("gro"), }, true },
+         { XO("MIDI files"),
+           { wxT("mid"), wxT("midi"), }, true },
+         { XO("Allegro files"),
+           { wxT("gro"), }, true },
+         FileNames::AllFiles
+      },
       wxRESIZE_BORDER,        // Flags
       &window);    // Parent
 
@@ -484,7 +495,7 @@ void OnImportRaw(const CommandContext &context)
          wxEmptyString,     // Path
          wxT(""),       // Name
          wxT(""),       // Extension
-                    _("All files|*"),
+         { FileNames::AllFiles },
          wxRESIZE_BORDER,        // Flags
          &window);    // Parent
 

src/menus/HelpMenus.cpp

@@ -63,7 +63,7 @@ void ShowDiagnostics(
          wxEmptyString,
          defaultPath,
          wxT("txt"),
-         wxT("*.txt"),
+         { FileNames::TextFiles },
          wxFD_SAVE | wxFD_OVERWRITE_PROMPT | wxRESIZE_BORDER,
          &window);
       if (!fName.empty())

src/prefs/KeyConfigPrefs.cpp

@@ -348,7 +348,7 @@ void KeyConfigPrefs::OnImport(wxCommandEvent & WXUNUSED(event))
       wxEmptyString,
       file,
       wxT(""),
-                       _("XML files (*.xml)|*.xml|All files|*"),
+      { FileNames::XMLFiles, FileNames::AllFiles },
       wxRESIZE_BORDER,
       this);
 
@@ -377,7 +377,7 @@ void KeyConfigPrefs::OnExport(wxCommandEvent & WXUNUSED(event))
       wxEmptyString,
       file,
       wxT("xml"),
-                       _("XML files (*.xml)|*.xml|All files|*"),
+      { FileNames::XMLFiles, FileNames::AllFiles },
       wxFD_SAVE | wxFD_OVERWRITE_PROMPT | wxRESIZE_BORDER,
       this);