Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-23 17:30:17 +01:00
Code Issues Releases Wiki Activity

Steve's patch, modified by Richard, to sort out the modality of the help window, fixes bug 747.

Browse Source
This commit is contained in:
martynshaw99
2014-08-26 22:53:11 +00:00
parent d2b4eca65b
commit 85080b6d83
2 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/widgets/HelpSystem.cpp
View File

@@ -86,7 +86,8 @@ void HelpSystem::ShowInfoDialog( wxWindow *parent,
void HelpSystem::ShowHtmlText(wxWindow *pParent,
const wxString &Title,
const wxString &HtmlText,
bool bIsFile = false, bool bModal = false)
bool bIsFile,
bool bModal)
{
LinkingHtmlWindow *html;
@@ -172,7 +173,8 @@ void HelpSystem::ShowHtmlText(wxWindow *pParent,
void HelpSystem::ShowHelpDialog(wxWindow *parent,
const wxString &localFileName,
const wxString &remoteURL)
const wxString &remoteURL,
bool bModal)
{
AudacityProject * pProj = GetActiveProject();
wxString HelpMode = wxT("Local");
@@ -209,10 +211,9 @@ void HelpSystem::ShowHelpDialog(wxWindow *parent,
wxASSERT( !remoteURL.IsEmpty() );
// I can't find it'.
// Use Built-in browser to suggest you use the remote url.
//use the remote link
wxString Text = HelpText( wxT("remotehelp") );
Text.Replace( wxT("*URL*"), remoteURL );
ShowHtmlText( parent, _("Help on the Internet"), Text );
ShowHtmlText( parent, _("Help on the Internet"), Text, false, bModal );
}
else if( HelpMode == wxT("Local") )
{
@@ -222,11 +223,13 @@ void HelpSystem::ShowHelpDialog(wxWindow *parent,
else
{
// Local file, Built-in browser
ShowHtmlText( parent, wxT(""), localFileName, true );
ShowHtmlText( parent, wxT(""), localFileName, true, bModal );
}
}
void HelpSystem::ShowHelpDialog(wxWindow *parent, const wxString &PageName)
void HelpSystem::ShowHelpDialog(wxWindow *parent,
const wxString &PageName,
bool bModal)
{
wxString localHelpPage;
wxString webHelpPage;
@@ -274,5 +277,6 @@ void HelpSystem::ShowHelpDialog(wxWindow *parent, const wxString &PageName)
HelpSystem::ShowHelpDialog(
parent,
localHelpPage,
webHelpPage);
webHelpPage,
bModal);
}