Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-04-29 23:29:41 +02:00
Code Issues Releases Wiki Activity

Modifications to Benjamin Drung's patch (003) as agreed with James:

Browse Source 
* "Using Label/Track Name" is default again
* Clearer wording for the two different "numbering" options, both of which now use two-digit numbering    
* Last used "Name files" radio button is remembered and written to .cfg (patch by Ed)
This commit is contained in:
windinthew 2010-02-10 14:03:47 +00:00
parent a6001192f2
commit bfb812a9e4
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/export/ExportMultiple.cpp
View File

@ -303,16 +303,20 @@ void ExportMultiple::PopulateOrExchange(ShuttleGui& S)
S.SetBorder(5);
S.StartStatic(_("Name files:"), false);
{
{
S.SetBorder(2);
mByNumberAndName = S.Id(ByNameAndNumberID)
.AddRadioButton(_("Using number AND Label/Track Name"));
S.StartRadioButtonGroup(wxT("/Export/TrackNameWithOrWithoutNumbers"), wxT("labelTrack"));
{
mByName = S.Id(ByNameID)
.TieRadioButton(_("Using Label/Track Name"), wxT("labelTrack"));
mByName = S.Id(ByNameID)
.AddRadioButtonToGroup(_("Using Label/Track Name"));
mByNumberAndName = S.Id(ByNameAndNumberID)
.TieRadioButton(_("Numbering before Label/Track Name"), wxT("numberBefore"));
mByNumber = S.Id(ByNumberID)
.AddRadioButtonToGroup(_("Numbering consecutively"));
mByNumber = S.Id(ByNumberID)
.TieRadioButton(_("Numbering after Label/Track Name"), wxT("numberAfter"));
}
S.EndRadioButtonGroup();
S.StartHorizontalLay(wxEXPAND, false);
{
@ -658,13 +662,11 @@ int ExportMultiple::ExportMultipleByLabel(bool byName,
// Numbering files...
if (!byName) {
if (numFiles > 9)
if (numFiles)
name.Printf(wxT("%s-%02d"), prefix.c_str(), l+1);
else
name.Printf(wxT("%s-%d"), prefix.c_str(), l+1);
} else if (addNumber) {
// Following discussion with GA, always have 2 digits
// for easy file-name sorting (on windows)
// for easy file-name sorting (on Windows)
name.Prepend(wxString::Format(wxT("%02d-"), l+1));
}
@ -795,12 +797,9 @@ int ExportMultiple::ExportMultipleByTrack(bool byName,
}
}
else {
if (numTracks > 9) {
if (numTracks) {
name = (wxString::Format(wxT("%s-%02d"), prefix.c_str(), l+1));
}
else {
name = (wxString::Format(wxT("%s-%d"), prefix.c_str(), l+1));
}
}
// store sanitised and user checked name in object