Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-24 14:20:19 +01:00
Code Issues Releases Wiki Activity

Multiple export dialog bugs fixed

Browse Source 
Bug 2062 - Export as WAV does not remember the previously used setting
Bug 1355 - "Other uncompressed files" does not (visually) update target
           file extension according to the chosen "Header" type
Bug 1356 - "Other uncompressed files" forces the default extension for
           the format in the exported file
Bug 1381 - Export other uncompressed formats incorrectly assumes max 255
           channels

(and possibly others...not the best bugzilla searcher)
This commit is contained in:
Leland Lucius
2020-03-23 00:47:17 -05:00
parent 8570ab7402
commit 38bf51afea
9 changed files with 456 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib-src/FileDialog/gtk/FileDialogPrivate.cpp
View File

@@ -472,6 +472,35 @@ int FileDialog::ShowModal()
return wxDialog::ShowModal();
}
// Change the currently displayed extension
void FileDialog::SetFileExtension(const wxString& extension)
{
wxString filename;
#if defined(__WXGTK3__)
filename = wxString::FromUTF8(gtk_file_chooser_get_current_name(m_fc));
#else
GtkWidget *entry = find_widget(m_widget, "GtkFileChooserEntry", 0);
if (entry)
{
filename = wxString::FromUTF8(gtk_entry_get_text(GTK_ENTRY(entry)));
}
#endif
if (filename == wxEmptyString)
{
filename = m_fc.GetFilename();
}
if (filename != wxEmptyString)
{
wxFileName fn(filename);
fn.SetExt(extension);
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), fn.GetFullName().utf8_str());
}
}
void FileDialog::DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
int WXUNUSED(width), int WXUNUSED(height),
int WXUNUSED(sizeFlags))
@@ -571,7 +600,7 @@ void FileDialog::SetWildcard(const wxString& wildCard)
void FileDialog::SetFilterIndex(int filterIndex)
{
m_fc.SetFilterIndex( filterIndex);
m_fc.SetFilterIndex( filterIndex );
}
int FileDialog::GetFilterIndex() const

34
lib-src/FileDialog/gtk/FileDialogPrivate.h
View File

@@ -25,23 +25,23 @@ public:
FileDialog() { }
FileDialog(wxWindow *parent,
const wxString& message = wxFileSelectorPromptStr,
const wxString& defaultDir = wxEmptyString,
const wxString& defaultFile = wxEmptyString,
const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
long style = wxFD_DEFAULT_STYLE,
const wxPoint& pos = wxDefaultPosition,
const wxSize& sz = wxDefaultSize,
const wxString& name = wxFileDialogNameStr);
const wxString& message = wxFileSelectorPromptStr,
const wxString& defaultDir = wxEmptyString,
const wxString& defaultFile = wxEmptyString,
const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
long style = wxFD_DEFAULT_STYLE,
const wxPoint& pos = wxDefaultPosition,
const wxSize& sz = wxDefaultSize,
const wxString& name = wxFileDialogNameStr);
bool Create(wxWindow *parent,
const wxString& message = wxFileSelectorPromptStr,
const wxString& defaultDir = wxEmptyString,
const wxString& defaultFile = wxEmptyString,
const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
long style = wxFD_DEFAULT_STYLE,
const wxPoint& pos = wxDefaultPosition,
const wxSize& sz = wxDefaultSize,
const wxString& name = wxFileDialogNameStr);
const wxString& message = wxFileSelectorPromptStr,
const wxString& defaultDir = wxEmptyString,
const wxString& defaultFile = wxEmptyString,
const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
long style = wxFD_DEFAULT_STYLE,
const wxPoint& pos = wxDefaultPosition,
const wxSize& sz = wxDefaultSize,
const wxString& name = wxFileDialogNameStr);
virtual ~FileDialog();
virtual wxString GetPath() const;
@@ -61,6 +61,8 @@ public:
virtual bool SupportsExtraControl() const { return true; }
virtual void SetFileExtension(const wxString& extension);
// Implementation only.
void GTKSelectionChanged(const wxString& filename);
void GTKFolderChanged();