Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-04 17:49:45 +02:00
Code Issues Releases Wiki Activity

Rewording and re-ordering of orphan blockfiles alert, per Martyn's suggestion.

Browse Source 
Add project data folder name to most ProjectFSCK alerts.
This commit is contained in:
v.audacity 2011-10-28 01:32:47 +00:00
parent e25373490d
commit 04d3e77632
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/DirManager.cpp
View File

@ -1407,8 +1407,9 @@ int DirManager::ProjectFSCK(const bool bForceError, const bool bAutoRecoverMode)
else else
{ {
wxString msgA = wxString msgA =
_("Project check detected %d missing external audio \ _("Project check of \"%s\" folder \
\nfile(s) ('aliased files'). There is no way for Audacity \ \ndetected %d missing external audio file(s) \
\n('aliased files'). There is no way for Audacity \
\nto recover these files automatically. \ \nto recover these files automatically. \
\n\nIf you choose the first or second option below, \ \n\nIf you choose the first or second option below, \
\nyou can try to find and restore the missing files \ \nyou can try to find and restore the missing files \
@ -1416,7 +1417,7 @@ _("Project check detected %d missing external audio \
\n\nNote that for the second option, the waveform \ \n\nNote that for the second option, the waveform \
\nmay not show silence."); \nmay not show silence.");
wxString msg; wxString msg;
msg.Printf(msgA, missingAliasedFilePathHash.size()); msg.Printf(msgA, this->projName.c_str(), missingAliasedFilePathHash.size());
const wxChar *buttons[] = const wxChar *buttons[] =
{_("Close project immediately with no changes"), {_("Close project immediately with no changes"),
_("Treat missing audio as silence (this session only)"), _("Treat missing audio as silence (this session only)"),
@ -1473,11 +1474,12 @@ _("Project check detected %d missing external audio \
else else
{ {
wxString msgA = wxString msgA =
_("Project check detected %d missing alias (.auf) \ _("Project check of \"%s\" folder \
\nblockfile(s). Audacity can fully regenerate these \ \ndetected %d missing alias (.auf) blockfile(s). \
\nfiles from the current audio in the project."); \nAudacity can fully regenerate these files \
\nfrom the current audio in the project.");
wxString msg; wxString msg;
msg.Printf(msgA, missingAUFHash.size()); msg.Printf(msgA, this->projName.c_str(), missingAUFHash.size());
const wxChar *buttons[] = {_("Regenerate alias summary files (safe and recommended)"), const wxChar *buttons[] = {_("Regenerate alias summary files (safe and recommended)"),
_("Fill in silence for missing display data (this session only)"), _("Fill in silence for missing display data (this session only)"),
_("Close project immediately with no further changes"), _("Close project immediately with no further changes"),
@ -1523,17 +1525,18 @@ _("Project check detected %d missing alias (.auf) \
else else
{ {
wxString msgA = wxString msgA =
_("Project check detected %d missing audio data \ _("Project check of \"%s\" folder \
\n(.au) blockfile(s), probably due to a bug, system \ \ndetected %d missing audio data (.au) blockfile(s), \
\ncrash, or accidental deletion. There is no way for \ \nprobably due to a bug, system crash, or accidental \
\nAudacity to recover these missing files automatically. \ \ndeletion. There is no way for Audacity to recover \
\nthese missing files automatically. \
\n\nIf you choose the first or second option below, \ \n\nIf you choose the first or second option below, \
\nyou can try to find and restore the missing files \ \nyou can try to find and restore the missing files \
\nto their previous location. \ \nto their previous location. \
\n\nNote that for the second option, the waveform \ \n\nNote that for the second option, the waveform \
\nmay not show silence."); \nmay not show silence.");
wxString msg; wxString msg;
msg.Printf(msgA, missingAUHash.size()); msg.Printf(msgA, this->projName.c_str(), missingAUHash.size());
const wxChar *buttons[] = const wxChar *buttons[] =
{_("Close project immediately with no further changes"), {_("Close project immediately with no further changes"),
_("Treat missing audio as silence (this session only)"), _("Treat missing audio as silence (this session only)"),
@ -1584,22 +1587,24 @@ _("Project check detected %d missing audio data \
else else
{ {
wxString msgA = wxString msgA =
_("Project check found %d orphan block file(s). These files are \ _("Project check of \"%s\" folder \
\nunused and probably left over from a crash or some other bug."); \nfound %d orphan block file(s). These files are \
wxString msg; \nunused by this project, but doing no harm.");
msg.Printf(msgA, (int)orphanFilePathArray.GetCount()); wxString msg;
msg.Printf(msgA, this->projName.c_str(), (int)orphanFilePathArray.GetCount());
const wxChar *buttons[] = {_("Close project immediately with no further changes"), const wxChar *buttons[] =
_("Continue without deleting; ignore the extra files this session"), {_("Continue without deleting; ignore the extra files this session"),
_("Delete orphan files permanently"), _("Close project immediately with no further changes"),
NULL}; _("Delete orphan files permanently"),
NULL};
wxLog::FlushActive(); // MultiDialog has "Show Log..." button, so make sure log is current. wxLog::FlushActive(); // MultiDialog has "Show Log..." button, so make sure log is current.
action = ShowMultiDialog(msg, _("Warning - Orphan Blockfile(s)"), buttons); action = ShowMultiDialog(msg, _("Warning - Orphan Blockfile(s)"), buttons);
} }
if (action == 0) if (action == 1)
nResult = FSCKstatus_CLOSE_REQ; nResult = FSCKstatus_CLOSE_REQ;
// Nothing is done if (action == 1). // Nothing is done if (action == 0).
else if (action == 2) else if (action == 2)
{ {
// FSCKstatus_CHANGED was bogus here. // FSCKstatus_CHANGED was bogus here.