From 2002e751f78833b56acba0d9b40ad32411bbcc73 Mon Sep 17 00:00:00 2001
From: James Crook <james.k.crook@gmail.com>
Date: Wed, 24 Aug 2016 15:58:03 +0100
Subject: [PATCH] Quick Help now goes to Video Tutorials (which don't exist
yet).
Also emphasise 'Audacity Manual' in the help menu.
With this change I'm being careful to make sure it's clear that the manual is for Audacity rather than for DarkAudacity. For the time being DarkAudacity is for people who know Audacity already and want to try the dark theme. Because of that, it is enough to highlight the differences between Audacity and DarkAudacity and link to the existing Audacity manual. If the differences continue to grow over time wit future editions, then I will need the promised 'Video Tutorials'. So I link to the page for them now. That page will have their up to date status information.
---
src/HelpText.cpp | 6 +++---
src/Menus.cpp | 5 ++++-
src/widgets/HelpSystem.cpp | 4 ++--
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/HelpText.cpp b/src/HelpText.cpp
index dfb4590a7d..df922f9df7 100644
--- a/src/HelpText.cpp
+++ b/src/HelpText.cpp
@@ -199,11 +199,11 @@ static wxString HelpTextBuiltIn( const wxString & Key )
wxString(wxT("")) +
wxT("<center><h3>DarkAudacity ") + AUDACITY_VERSION_STRING + wxT("</h3></center>") +
_("<br><br>DarkAudacity is based on Audacity:") + wxT("<ul><li>") +
- _(" email to [[mailto:james@audacityteam.org|'james@audacityteam.org']] - for help using DarkAudacity.") + wxT("</li><li>") +
- _(" see [[http://www.darkaudacity.com|www.darkaudacity.com]] - for differences between DarkAudacity and Audacity.") + wxT("</li></ul>") +
+ _(" [[http://www.darkaudacity.com|www.darkaudacity.com]] - for differences between them.") + wxT("</li><li>") +
+ _(" email to [[mailto:james@audacityteam.org|james@audacityteam.org]] - for help using DarkAudacity.") + wxT("</li><li>") +
+ _(" [[http://www.darkaudacity.com/video.html|Tutorials]] - for getting started with DarkAudacity.") + wxT("</li></ul>") +
_("<br><br>Audacity has these support methods:") + wxT("<ul><li>") +
- _(" [[http://manual.audacityteam.org/quick_help.html|'Quick Help']] - for getting started with Audacity.") + wxT("</li><li>") +
_(" [[http://manual.audacityteam.org/|Manual]] - for comprehensive Audacity documentation") + wxT("</li><li>") +
_(" [[http://forum.audacityteam.org/|Forum]] - for large knowledge base on using Audacity.") + wxT("</li></ul>")
);
diff --git a/src/Menus.cpp b/src/Menus.cpp
index 2b3899cdb6..e46ca1e791 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -1090,7 +1090,10 @@ void AudacityProject::CreateMenusAndCommands()
c->BeginMenu(_("&Help"));
c->SetDefaultFlags(AlwaysEnabledFlag, AlwaysEnabledFlag);
- c->AddItem(wxT("QuickHelp"), _("&Quick Help"), FN(OnQuickHelp));
+ // 'Getting Started' rather than 'Quick Help' for DarkAudacity.
+ // At the moment the video tutorials are aspirational (aka do not exist yet).
+ // Emphasise that manual is for Audacity, not DarkAudacity.
+ c->AddItem(wxT("QuickHelp"), _("&Getting Started"), FN(OnQuickHelp));
c->AddItem(wxT("Manual"), _("Audacity &Manual"), FN(OnManual));
c->AddSeparator();
diff --git a/src/widgets/HelpSystem.cpp b/src/widgets/HelpSystem.cpp
index 60bfc16d91..934d131037 100644
--- a/src/widgets/HelpSystem.cpp
+++ b/src/widgets/HelpSystem.cpp
@@ -296,9 +296,9 @@ void HelpSystem::ShowHelpDialog(wxWindow *parent,
}
else if (releasePageName == wxT("Quick_Help"))
{
- releasePageName = wxT("quick_help") + HelpSystem::ReleaseSuffix + anchor;
+ releasePageName = wxT("video") + HelpSystem::ReleaseSuffix + anchor;
localHelpPage = wxFileName(FileNames::HtmlHelpDir(), releasePageName).GetFullPath();
- webHelpPath = wxT("http://")+HelpSystem::HelpHostname+HelpSystem::HelpServerHomeDir;
+ webHelpPath = wxT("http://www.darkaudacity.com/");
}
else
{
--
GitLab