From 9d43c9175cfe4699f52934cec0103b20eb3eb579 Mon Sep 17 00:00:00 2001 From: James Crook Date: Sun, 12 Apr 2015 14:23:48 +0100 Subject: [PATCH] Fix revision ident hyperlinking It needed a LinkingHtmlWindow, not just a wxHtmlWindow. It needed http, not https. I also left an example string with comment in RevisionIdent.h --- .travis.yml | 4 ++-- src/AboutDialog.cpp | 4 ++-- src/RevisionIdent.h | 8 ++++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2a6024293..487b52fb0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ before_install: - sudo apt-get update -qq - sudo apt-get install -y libwxgtk2.8-dev - - git show -s --format="wxT(\"%h of %cd\")" - - git show -s --format="wxT(\"%h of %cd\")" > ./src/RevisionIdent.h + - git show -s --format="wxT(\"%h of %cd\")" + - git show -s --format="wxT(\"%h of %cd\")" > ./src/RevisionIdent.h language: cpp compiler: - gcc diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp index 830d10822..2132911cb 100644 --- a/src/AboutDialog.cpp +++ b/src/AboutDialog.cpp @@ -339,7 +339,7 @@ void AboutDialog::PopulateInformationPage( ShuttleGui & S ) wxString informationStr; // string to build up list of information in S.StartNotebookPage( _("Build Information") ); // start the tab S.StartVerticalLay(2); // create the window - HtmlWindow *html = new HtmlWindow(S.GetParent(), -1, wxDefaultPosition, + HtmlWindow *html = new LinkingHtmlWindow(S.GetParent(), -1, wxDefaultPosition, wxSize(ABOUT_DIALOG_WIDTH, 264), wxHW_SCROLLBAR_AUTO | wxSUNKEN_BORDER); // create a html pane in it to put the content in. @@ -582,7 +582,7 @@ void AboutDialog::PopulateLicensePage( ShuttleGui & S ) { S.StartNotebookPage( _("GPL License") ); S.StartVerticalLay(1); - HtmlWindow *html = new HtmlWindow(S.GetParent(), -1, + HtmlWindow *html = new LinkingHtmlWindow(S.GetParent(), -1, wxDefaultPosition, wxSize(ABOUT_DIALOG_WIDTH, 264), wxHW_SCROLLBAR_AUTO | wxSUNKEN_BORDER); diff --git a/src/RevisionIdent.h b/src/RevisionIdent.h index a0bee9b61..552ffee03 100644 --- a/src/RevisionIdent.h +++ b/src/RevisionIdent.h @@ -21,8 +21,12 @@ *//********************************************************************/ +// The commented out string below is like the one the build servers +// will replace this file with. +wxT("28864ac of Sun Apr 12 12:40:22 2015 +0100") + + // The string below is what you get if // the build system does not replace this file. - -wxT("No revision identifier was provided") +//wxT("No revision identifier was provided")