Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-21 14:02:57 +02:00
Code Issues Releases Wiki Activity

Bug 1597 - Tweak: make version check on welcome user-initiated.

Browse Source 
The welcome screen now has an extra prelude for Alphas, and as result no longer needs to force a version check onto our website.  Users can still do that by clicking "check online".

I've also rearranged the version check code a little, so that there is better reuse.  E.g. we can change the URL in just one place in the code.
This commit is contained in:
James Crook
2017-02-28 19:05:06 +00:00
parent 95e5d37042
commit fc42fd9b0d
5 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/AboutDialog.cpp
View File

@@ -66,7 +66,6 @@ extern wxString FormatHtmlText( const wxString & Text );
// Function to give the xtra arguments to put on the version check string.
const wxString VerCheckArgs(){
wxString result = wxString("from_ver=") + AUDACITY_VERSION_STRING;
#ifdef REV_LONG
result += wxString("&CommitId=")+wxString(REV_LONG).Left(6);
@@ -76,6 +75,28 @@ const wxString VerCheckArgs(){
return result;
}
// Url with Version check args attached.
const wxString VerCheckUrl(){
//The version we intend to use for live Audacity.
#define VER_CHECK_URL "http://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();
}
// Text of htperlink to check versions.
const wxString VerCheckHtml(){
wxString result = "<center>[[";
result += VerCheckUrl() + "|" + _("Check Online");
result += "]]</center>\n";
return result;
}
void AboutDialog::CreateCreditsList()
{
// The Audacity Team: developers and support
@@ -437,20 +458,7 @@ void AboutDialog::PopulateInformationPage( ShuttleGui & S )
informationStr = wxT("<h2><center>");
informationStr += _("Build Information");
informationStr += wxT("</center></h2>\n");
// Only for debug builds, for now.
//The version we intend to use for live Audacity.
#define VER_CHECK_URL "[[http://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?"
informationStr += wxT("<center>");
informationStr += wxString(VER_CHECK_URL) + VerCheckArgs() + "|" +
_("Check Online") + "]]";
informationStr += wxT("</center>\n");
informationStr += VerCheckHtml();
// top level heading
informationStr += wxT("<h3>");
informationStr += _("File Format Support");