From 61b9f30a20c7437510d782ba930f70ea001de570 Mon Sep 17 00:00:00 2001 From: James Crook Date: Tue, 23 Aug 2016 01:09:59 +0100 Subject: [PATCH] Logo changes. --- src/AboutDialog.cpp | 3 ++- src/AllThemeResources.h | 2 +- src/HelpText.cpp | 28 +++++++++++++++------------- src/SplashDialog.cpp | 5 ++--- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp index ad6cd8aac..5f8317064 100644 --- a/src/AboutDialog.cpp +++ b/src/AboutDialog.cpp @@ -343,7 +343,8 @@ visit our forum."); // New way to add to About box.... - S.StartNotebookPage( wxT("DarkAudacity") ); + auto pPage = S.StartNotebookPage( wxT("DarkAudacity") ); + pPage->SetBackgroundColour(wxColour(0xAB, 0xAB,0xAB )); S.StartVerticalLay(1); { diff --git a/src/AllThemeResources.h b/src/AllThemeResources.h index 95454d589..83ebb982a 100644 --- a/src/AllThemeResources.h +++ b/src/AllThemeResources.h @@ -249,7 +249,7 @@ from there. Audacity will look for a file called "Pause.png". */ SET_THEME_FLAGS( resFlagNewLine ); -#define LOGOWITHNAME_WIDTH 506 +#define LOGOWITHNAME_WIDTH 768 #define LOGOWITHNAME_HEIGHT 200 DEFINE_IMAGE( bmpAudacityLogo, wxImage( 215, 190 ), wxT("AudacityLogo")); diff --git a/src/HelpText.cpp b/src/HelpText.cpp index cb1a0ddb1..7656cb2e1 100644 --- a/src/HelpText.cpp +++ b/src/HelpText.cpp @@ -25,8 +25,10 @@ static wxString WrapText( const wxString & Text ) { return wxString(wxT(""))+ wxT("") + - wxT("") + + wxT("") + + wxT("")+ wxT("

") + Text + + wxT("")+ wxT(""); } @@ -90,6 +92,7 @@ static wxString LinkExpand( const wxString & Text ) Key = Key.Mid( 0, j ); LinkText = LinkText.Mid( 0, k ); + LinkText=""+LinkText+""; wxString Replacement; if( Key.StartsWith( wxT("wiki:") )) { @@ -108,6 +111,7 @@ static wxString LinkExpand( const wxString & Text ) Replacement = Link( Key, LinkText ); } + Temp = Temp.Mid( 0, i ) + Replacement + Temp.Mid( i + j + k + 5 );// 5 for the [[|]] } return Temp; @@ -158,7 +162,7 @@ wxString TitleText( const wxString & Key ) if(Key ==wxT("save") ) { /* i18n-hint: Title for a topic.*/ - return _("Saving a DarkAudacity Project"); + return _("Saving an Audacity Project"); } if(Key ==wxT("wma-proprietary") ) { @@ -186,22 +190,20 @@ static wxString HelpTextBuiltIn( const wxString & Key ) /* i18n-hint: Preserve [[file:quick_help.html as it's the name of a file.*/ return WrapText( wxString(wxT("")) + - wxT("

DarkAudacity ") + AUDACITY_VERSION_STRING + wxT("

") + - _("

DarkAudacity is based on Audacity:") + wxT("") + - - _("

Audacity has these support methods:") + wxT("") - ); + wxT("

Audacity ") + AUDACITY_VERSION_STRING + wxT("

") + + _("How to get help") + wxT("

") + + _("These are our support methods:") + wxT("

") + wxT("") + + _("More: Visit our [[http://wiki.audacityteam.org/index.php|Wiki]] for tips, tricks, extra tutorials and effects plug-ins.") + wxT("

") + ); } if(Key==wxT("wma-proprietary")) { return WrapText( wxString(wxT("

"))+ - _("DarkAudacity can import unprotected files in many other formats (such as M4A and WMA, \ + _("Audacity can import unprotected files in many other formats (such as M4A and WMA, \ compressed WAV files from portable recorders and audio from video files) if you download and install \ the optional \ FFmpeg library to your computer.") + wxT("

") + diff --git a/src/SplashDialog.cpp b/src/SplashDialog.cpp index 9b8489913..44e40ca58 100644 --- a/src/SplashDialog.cpp +++ b/src/SplashDialog.cpp @@ -64,7 +64,6 @@ SplashDialog::SplashDialog(wxWindow * parent) wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) { SetName(GetTitle()); - this->SetBackgroundColour(theTheme.Colour( clrAboutBoxBackground )); m_pLogo = NULL; //v ShuttleGui S( this, eIsCreating ); Populate( S ); @@ -77,8 +76,8 @@ SplashDialog::SplashDialog(wxWindow * parent) void SplashDialog::Populate( ShuttleGui & S ) { - this->SetBackgroundColour(theTheme.Colour( clrAboutBoxBackground )); - bool bShow; +// this->SetBackgroundColour(theTheme.Colour( clrAboutBoxBackground )); + this->SetBackgroundColour(wxColour(0xAB, 0xAB,0xAB )); bool bShow; gPrefs->Read(wxT("/GUI/ShowSplashScreen"), &bShow, true ); S.StartVerticalLay(1);