audacia
/
audacia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bug 26 followup: remove help button and include File > Check Dependencies recommendation in message

This commit is contained in:
mchinen 2011-03-06 18:07:12 +00:00
parent 36dbff73b4
commit c420e785ae
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Project.cpp
View File

@ -3900,9 +3900,14 @@ void AudacityProject::OnTimer(wxTimerEvent& event)
// Check if a warning for missing aliased files should be displayed
if (gAudioIO->ShouldShowMissingAliasedFileWarning()) {
wxString errorMessage = _("One or more external audio files could not be found.\nIt is possible they were moved, deleted, or the drive they were on was unmounted.\nSilence is being substituted for the affected audio.");
wxString errorMessage = _("One or more external audio files could not be found.\n"
"It is possible they were moved, deleted, or the drive they "
"were on was unmounted.\n"
"Silence is being substituted for the affected audio.\n"
"Choose File > Check Dependencies to view the "
"original location of the missing files.");
ShowModelessErrorDialog(this, _("Files Missing"),
errorMessage, wxT("innerlink:wma-proprietary"), true);
errorMessage, wxT(""), true);
// Only show this warning once per playback.
gAudioIO->SetMissingAliasedFileWarningShouldShow(false);
}

6
src/widgets/ErrorDialog.cpp
View File

@ -70,6 +70,10 @@ ErrorDialog::ErrorDialog(
const bool Close, const bool modal):
wxDialog(parent, (wxWindowID)-1, dlogTitle)
{
long buttonMask;
// only add the help button if we have a URL
buttonMask = (helpURL == wxT("")) ? eOkButton : (eHelpButton | eOkButton);
dhelpURL = helpURL;
dClose = Close;
dModal = modal;
@ -81,7 +85,7 @@ ErrorDialog::ErrorDialog(
S.SetBorder( 20 );
S.AddFixedText( message );
S.SetBorder( 2 );
S.AddStandardButtons(eHelpButton | eOkButton);
S.AddStandardButtons( buttonMask );
}
S.EndVerticalLay();