Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-03 22:19:07 +02:00
Code Issues Releases Wiki Activity

Third of a series of patches from Steve and Richard to fix delivering local and remote help pages. (Second one not committed as it was just a wording change)

Browse Source
This commit is contained in:
martynshaw99 2014-08-25 23:46:50 +00:00
parent d628de846b
commit 6f2c161317
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/widgets/HelpSystem.cpp
View File

@ -190,6 +190,13 @@ void HelpSystem::ShowHelpDialog(wxWindow *parent,
} }
} }
// Obtain the local file system file name, without the anchor if present.
wxString localfile;
if (localFileName.Find('#', true) != wxNOT_FOUND)
localfile = localFileName.BeforeLast('#');
else
localfile = localFileName;
if( localFileName.Contains(wxT("Quick_Help")) ) if( localFileName.Contains(wxT("Quick_Help")) )
// 'Quick_Help' is installed locally // 'Quick_Help' is installed locally
OpenInDefaultBrowser( localFileName ); OpenInDefaultBrowser( localFileName );
@ -198,7 +205,7 @@ void HelpSystem::ShowHelpDialog(wxWindow *parent,
// Always go to remote URL. Use External browser. // Always go to remote URL. Use External browser.
OpenInDefaultBrowser( remoteURL ); OpenInDefaultBrowser( remoteURL );
} }
else if( !wxFileExists( localFileName )) else if( !wxFileExists( localfile ))
{ {
// If you give an empty remote URL, you should have already ensured // If you give an empty remote URL, you should have already ensured
// that the file exists! // that the file exists!

7
src/widgets/HelpSystem.h
View File

@ -42,7 +42,12 @@ public:
bool bIsFile, bool bModal); bool bIsFile, bool bModal);
/// Displays a file in your browser, if it's available locally, /// Displays a file in your browser, if it's available locally,
/// OR else links to the internet. /// OR else links to the internet. Generally using this outside this class
/// is depreciated in favour of the "smarter" overload below, unless there
/// is a good reason for using this form.
/// @param localFileName Name and path of the file on the local machine
/// file system to be opened. file.name#anchor syntax is allowed, and therefore
/// file names containing a '#' are not (on any platform).
static void ShowHelpDialog(wxWindow *parent, static void ShowHelpDialog(wxWindow *parent,
const wxString &localFileName, const wxString &localFileName,
const wxString &remoteURL); const wxString &remoteURL);