diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp index e21eaf77f..17f7031eb 100644 --- a/src/AboutDialog.cpp +++ b/src/AboutDialog.cpp @@ -355,6 +355,7 @@ visit our [[http://forum.audacityteam.org/|forum]]."); wxString creditStr = FormatHtmlText( wxString( wxT("
") ) + +// DA: Description and provenance in About box #ifdef EXPERIMENTAL_DA #undef _ #define _(s) wxGetTranslation((s)) @@ -370,8 +371,11 @@ visit our [[http://forum.audacityteam.org/|forum]]."); //wxT("

") + par2Str + wxT("

") + _("Credits") + wxT("

") + wxT("

") + +// DA: Customisation credit +#ifdef EXPERIMENTAL_DA wxT("

") + wxString::Format(_("DarkAudacity Customisation")) + wxT("
") + wxT("James Crook, art, coding & design
") + +#endif wxT("

") + wxString::Format(_("Audacity Team Members")) + wxT("
") + GetCreditsByRole(roleTeamMember) + @@ -395,6 +399,8 @@ visit our [[http://forum.audacityteam.org/|forum]]."); GetCreditsByRole(roleThanks) + wxT("


Audacity website: [[http://www.audacityteam.org/|http://www.audacityteam.org/]]") + + +// DA: Link for DA url too #ifdef EXPERIMENTAL_DA wxT("
DarkAudacity website: [[http://www.darkaudacity.com/|http://www.darkaudacity.com/]]") + #endif diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp index b133289f0..dd3c13d02 100644 --- a/src/AudacityApp.cpp +++ b/src/AudacityApp.cpp @@ -1275,6 +1275,8 @@ bool AudacityApp::OnInit() // Don't use AUDACITY_NAME here. // We want Audacity with a capital 'A' + +// DA: App name #ifndef EXPERIMENTAL_DA wxString appName = wxT("Audacity"); #else @@ -1309,6 +1311,8 @@ bool AudacityApp::OnInit() /* On Unix systems, the default temp dir is in /var/tmp. */ defaultTempDir.Printf(wxT("/var/tmp/audacity-%s"), wxGetUserId().c_str()); + +// DA: Path env variable. #ifndef EXPERIMENTAL_DA wxString pathVar = wxGetenv(wxT("AUDACITY_PATH")); #else diff --git a/src/Experimental.h b/src/Experimental.h index 90612b777..1343afaef 100644 --- a/src/Experimental.h +++ b/src/Experimental.h @@ -48,7 +48,7 @@ // feature to link audio tracks to a label track #define EXPERIMENTAL_SYNC_LOCK -// enables dark audacity theme and customisations. +// DA: Enables dark audacity theme and customisations. #define EXPERIMENTAL_DA // experimental theming diff --git a/src/FileNames.cpp b/src/FileNames.cpp index 73311c223..60dfb9cc7 100644 --- a/src/FileNames.cpp +++ b/src/FileNames.cpp @@ -252,6 +252,7 @@ wxString FileNames::ThemeImageDefsAsCee() wxString FileNames::ThemeCacheAsCee( ) { +// DA: Theme sourcery file name. #ifndef EXPERIMENTAL_DA return wxFileName( ThemeDir(), wxT("ThemeAsCeeCode.h") ).GetFullPath(); #else diff --git a/src/HelpText.cpp b/src/HelpText.cpp index 301540374..15e52f5bf 100644 --- a/src/HelpText.cpp +++ b/src/HelpText.cpp @@ -210,7 +210,9 @@ static wxString HelpTextBuiltIn( const wxString & Key ) _("

The version of Audacity you are using is an Alpha test version.") + " " + _("We strongly recommend that you use our latest stable released version, which has full documentation and support.

")+ _("You can help us get Audacity ready for release by joining our [[http://www.audacityteam.org/community/|community]].




")+ -#endif +#endif + +// DA: Support methods text. #ifdef EXPERIMENTAL_DA wxT("

DarkAudacity ") + AUDACITY_VERSION_STRING + wxT("

") + _("

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