1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-07 15:49:42 +02:00

🐛 Fixes for About Dialog and Download URLs

This commit is contained in:
Cookie Engineer 2021-07-04 17:50:51 +02:00
parent 8271f4ddf8
commit 46e4c648fb
No known key found for this signature in database
GPG Key ID: 340F6A4848C5F849
4 changed files with 2 additions and 42 deletions

@ -576,8 +576,7 @@ void AboutDialog::PopulateInformationPage( ShuttleGui & S )
informationStr informationStr
<< wxT("<h2><center>") << wxT("<h2><center>")
<< XO("Build Information") << XO("Build Information")
<< wxT("</center></h2>\n") << wxT("</center></h2>\n");
<< VerCheckHtml();
informationStr informationStr
<< wxT("<h3>") << wxT("<h3>")

@ -219,11 +219,6 @@ static wxString HelpTextBuiltIn( const wxString & Key )
wxStringOutputStream o; wxStringOutputStream o;
wxTextOutputStream s(o); wxTextOutputStream s(o);
s s
#if defined(IS_ALPHA) || defined(IS_BETA)
<< wxT("<hr><center><h3>")
<< XO("Get the Official Released Version of Audacity")
<< wxT("</h3></center>")
<< VerCheckHtml()
#ifdef IS_ALPHA #ifdef IS_ALPHA
<< alphamsg << alphamsg
#else #else
@ -386,29 +381,3 @@ const wxString VerCheckArgs(){
return result; return result;
} }
// Text of hyperlink to check versions.
const wxString VerCheckHtml()
{
wxStringOutputStream o;
wxTextOutputStream s(o);
s
<< "<center>[["
<< VerCheckUrl().GET()
<< "|"
<< XO("Check Online")
<< "]]</center>\n";
return o.GetString();
}
// Url with Version check args attached.
const URLString VerCheckUrl()
{
//The version we intend to use for live Audacity.
#define VER_CHECK_URL "https://www.audacityteam.org/download/?"
//For testing of our scriptlet.
//#define VER_CHECK_URL "http://www.audacityteam.org/slug/?"
//For testing locally
//#define VER_CHECK_URL "http://localhost:63342/WorkingDocs/demos/download.html?"
return wxString( wxT(VER_CHECK_URL)) +VerCheckArgs();
}

@ -23,8 +23,6 @@ AUDACITY_DLL_API wxString HelpText( const wxString & Key );
AUDACITY_DLL_API TranslatableString TitleText( const wxString & Key ); AUDACITY_DLL_API TranslatableString TitleText( const wxString & Key );
extern AUDACITY_DLL_API const wxString VerCheckArgs(); extern AUDACITY_DLL_API const wxString VerCheckArgs();
extern AUDACITY_DLL_API const URLString VerCheckUrl();
extern AUDACITY_DLL_API const wxString VerCheckHtml();
extern AUDACITY_DLL_API wxString FormatHtmlText( const wxString & Text ); extern AUDACITY_DLL_API wxString FormatHtmlText( const wxString & Text );
#endif #endif

@ -431,7 +431,7 @@ void OnMenuTree(const CommandContext &context)
void OnCheckForUpdates(const CommandContext &WXUNUSED(context)) void OnCheckForUpdates(const CommandContext &WXUNUSED(context))
{ {
::OpenInDefaultBrowser( VerCheckUrl()); ::OpenInDefaultBrowser("https://github.com/cookiengineer/audacity/releases");
} }
void OnAbout(const CommandContext &context) void OnAbout(const CommandContext &context)
@ -558,12 +558,6 @@ BaseItemSharedPtr HelpMenu()
, ,
#endif #endif
// DA: Does not fully support update checking.
#ifndef EXPERIMENTAL_DA
Command( wxT("Updates"), XXO("&Check for Updates..."),
FN(OnCheckForUpdates),
AlwaysEnabledFlag ),
#endif
Command( wxT("About"), XXO("&About Audacity..."), FN(OnAbout), Command( wxT("About"), XXO("&About Audacity..."), FN(OnAbout),
AlwaysEnabledFlag ) AlwaysEnabledFlag )
) )