Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-03-10 00:15:31 +01:00
Code Issues Releases Wiki Activity

Rewrite FileNames::SelectFile using FileTypes...

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

Also fixes missing translations in VSTEffect.cpp
This commit is contained in:
Paul Licameli
2019-12-26 22:48:00 -05:00
parent 9204319b86
commit aa39f9ade2
18 changed files with 226 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/FileNames.cpp
View File

@@ -558,13 +558,13 @@ void FileNames::UpdateDefaultPath(Operation op, const FilePath &path)
wxString
FileNames::SelectFile(Operation op,
const TranslatableString& message,
const FilePath& default_path,
const FilePath& default_filename,
const FileExtension& default_extension,
const wxString& wildcard,
int flags,
wxWindow *parent)
const TranslatableString& message,
const FilePath& default_path,
const FilePath& default_filename,
const FileExtension& default_extension,
const FileTypes& fileTypes,
int flags,
wxWindow *parent)
{
return WithDefaultPath(op, default_path, [&](const FilePath &path) {
wxString filter;
@@ -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(
@@ -719,13 +720,16 @@ char *FileNames::VerifyFilename(const wxString &s, bool input)
ext = ff.GetExt();
name = FileNames::SelectFile(FileNames::Operation::_None,
XO("Specify New Filename:"),
wxEmptyString,
name,
ext,
ext.empty() ? wxT("*") : (wxT("*.") + ext),
wxFD_SAVE | wxRESIZE_BORDER,
wxGetTopLevelParent(NULL));
XO("Specify New Filename:"),
wxEmptyString,
name,
ext,
{ ext.empty()
? FileNames::AllFiles
: FileType{ {}, { ext } }
},
wxFD_SAVE | wxRESIZE_BORDER,
wxGetTopLevelParent(NULL));
}
}