Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-16 08:34:10 +02:00
Code Issues Releases Wiki Activity

Shorter solution for patch #13 (scroll bars), also removes superfluous ifs left after removing number-of-digits = 1 or 2 choice code.

Browse Source
This commit is contained in:
james.k.crook 2010-02-11 14:42:44 +00:00
parent 44596429a7
commit e3134f1a12
1 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/export/ExportMultiple.cpp
View File

@ -534,36 +534,26 @@ void ExportMultiple::OnExport(wxCommandEvent& event)
) )
), mExported.GetCount()); ), mExported.GetCount());
// This results dialog is a child of this dialog.
SuccessDialog dlg(this, SuccessDialog dlg(this,
wxID_ANY, wxID_ANY,
wxString(_("Export Multiple")) ); wxString(_("Export Multiple")) );
ShuttleGui S(&dlg, eIsCreating); ShuttleGui S(&dlg, eIsCreating);
S.StartVerticalLay(); S.StartVerticalLay();
{ {
S.AddTitle(msg); S.AddTitle(msg);
S.SetStyle(wxLC_LIST | wxLC_SINGLE_SEL | wxLC_HRULES | wxSUNKEN_BORDER | wxString FileList;
wxVSCROLL | wxHSCROLL);
wxListCtrl *l = S.AddListControl();
l->SetBackgroundStyle(wxBG_STYLE_COLOUR);
#if defined (__WXGTK__)
// setting dlg.GetBackgroundColour does not work as expected in wxGTK
l->SetBackgroundColour(wxColour(wxT("wxNullColour")));
#else
l->SetBackgroundColour(dlg.GetBackgroundColour());
#endif
l->Refresh();
for (size_t i = 0; i < mExported.GetCount(); i++) { for (size_t i = 0; i < mExported.GetCount(); i++) {
l->InsertItem(i, mExported[i]); FileList += mExported[i];
FileList += '\n';
} }
S.SetStyle( wxTE_READONLY|wxHSCROLL|wxTE_MULTILINE );
S.AddTextWindow( FileList );
S.AddStandardButtons(eOkButton); S.AddStandardButtons(eOkButton);
l->SetFocus();
// this handles double-click and prevents item activation when a list-item is double-clicked
MouseEvtHandler *mouseHdlr = new MouseEvtHandler();
l->PushEventHandler(mouseHdlr);
} }
dlg.Fit(); dlg.SetMinSize( wxSize(125,200) );
dlg.SetSize( wxSize(450,400) );
dlg.Center(); dlg.Center();
dlg.ShowModal(); dlg.ShowModal();
} }
@ -662,8 +652,7 @@ int ExportMultiple::ExportMultipleByLabel(bool byName,
// Numbering files... // Numbering files...
if (!byName) { if (!byName) {
if (numFiles) name.Printf(wxT("%s-%02d"), prefix.c_str(), l+1);
name.Printf(wxT("%s-%02d"), prefix.c_str(), l+1);
} else if (addNumber) { } else if (addNumber) {
// Following discussion with GA, always have 2 digits // Following discussion with GA, always have 2 digits
// for easy file-name sorting (on Windows) // for easy file-name sorting (on Windows)
@ -797,9 +786,7 @@ int ExportMultiple::ExportMultipleByTrack(bool byName,
} }
} }
else { else {
if (numTracks) { name = (wxString::Format(wxT("%s-%02d"), prefix.c_str(), l+1));
name = (wxString::Format(wxT("%s-%02d"), prefix.c_str(), l+1));
}
} }
// store sanitised and user checked name in object // store sanitised and user checked name in object