1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-21 14:02:57 +02:00

Bug 1597 - Enh: Greater clarity over status of versions needed

- For ALPHA builds we do a check version with the Welcome screen (if welcome screen is enabled).
- A 'Check Online' in the About box provides a new route to check version
- Check Version now passes CommitId and Build Date/Time to identify a version.

To actually close the bug we need the javascript on the server page to put up informative messages.
This commit is contained in:
James Crook
2017-02-25 22:30:23 +00:00
parent 43291687a5
commit c53e2dbb77
9 changed files with 67 additions and 27 deletions

View File

@@ -45,9 +45,37 @@ hold information about one contributor to Audacity.
#include "AllThemeResources.h"
#include "../images/AudacityLogoWithName.xpm"
#include "RevisionIdent.h"
// RevisionIdent.h may contain #defines like these ones:
//#define REV_LONG "28864acb238cb3ca71dda190a2d93242591dd80e"
//#define REV_TIME "Sun Apr 12 12:40:22 2015 +0100"
#ifndef REV_TIME
#define REV_TIME "unknown date and time"
#endif
#ifdef REV_LONG
#define REV_IDENT wxString( "[[http://github.com/audacity/audacity/commit/" )+ REV_LONG + "|" + wxString( REV_LONG ).Left(6) + "]] of " + REV_TIME
#else
#define REV_IDENT wxT("No revision identifier was provided")
#endif
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
wxString timeStr = wxString( __DATE__ ) + wxString( __TIME__ );
result += wxString("&ComitId=")+wxString(REV_LONG).Left(6) + "&Time=" + timeStr;
#endif
result.Replace(" ","");
return result;
}
void AboutDialog::CreateCreditsList()
{
// The Audacity Team: developers and support
@@ -409,6 +437,13 @@ void AboutDialog::PopulateInformationPage( ShuttleGui & S )
informationStr = wxT("<h2><center>");
informationStr += _("Build Information");
informationStr += wxT("</center></h2>\n");
// Only for debug builds, for now.
#if __WXDEBUG__
informationStr += wxT("<center>");
informationStr += wxString("[[http://www.audacityteam.org/download/?") + VerCheckArgs() + "|" +
_("Check Online") + "]]";
informationStr += wxT("</center>\n");
#endif
// top level heading
informationStr += wxT("<h3>");
informationStr += _("File Format Support");
@@ -583,15 +618,7 @@ void AboutDialog::PopulateInformationPage( ShuttleGui & S )
// Current date
AddBuildinfoRow(&informationStr, _("Program build date: "), __TDATE__);
// Uncomment the next two lines to test hyperlinks work from here.
// AddBuildinfoRow(&informationStr, wxT("Link Test:"),
// wxT("[[https:www.audacityteam.org|Click bait]]") );
AddBuildinfoRow(&informationStr, _("Commit Id:"),
#include "RevisionIdent.h"
);
AddBuildinfoRow(&informationStr, _("Commit Id:"), REV_IDENT );
#ifdef __WXDEBUG__
AddBuildinfoRow(&informationStr, _("Build type:"), _("Debug build"));
#else