From 0f4252125d0ef4ea27fba3661fca7623f232d46e Mon Sep 17 00:00:00 2001 From: James Crook Date: Sun, 21 Aug 2016 23:12:09 +0100 Subject: [PATCH] More customisation for DarkAudacity name/site. Includes tweaks to help text, as for example manual is NOT included with distribution. Version now has an 'x' suffix. --- src/AboutDialog.cpp | 12 ++++++------ src/Audacity.h | 7 ++++--- src/AudacityApp.cpp | 4 ++-- src/HelpText.cpp | 20 +++++++++++--------- src/Menus.cpp | 2 +- src/Project.cpp | 6 +++--- src/SplashDialog.cpp | 2 +- win/audacity.rc | 2 +- 8 files changed, 29 insertions(+), 26 deletions(-) diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp index 168486fed..ad6cd8aac 100644 --- a/src/AboutDialog.cpp +++ b/src/AboutDialog.cpp @@ -233,7 +233,7 @@ AboutDialog *AboutDialog::ActiveIntance() } AboutDialog::AboutDialog(wxWindow * parent) - : wxDialogWrapper(parent, -1, _("About Dark Audacity"), + : wxDialogWrapper(parent, -1, _("About DarkAudacity"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) { @@ -300,14 +300,14 @@ visit our forum."); localeStr + wxT("\">") + wxT("
") + - wxT("

Dark Audacity ") + wxString(AUDACITY_VERSION_STRING) + wxT("

") + - _("Customised version of Audacity, the free, open source, cross-platform software " ) + + wxT("

DarkAudacity ") + wxString(AUDACITY_VERSION_STRING) + wxT("

") + + _("Customised version of the Audacity free, open source, cross-platform software " ) + _("for recording and editing sounds.") + //wxT("


") + par1Str + //wxT("

") + par2Str + wxT("

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

") + wxT("

") + - wxT("

") + wxString::Format(_("Dark Audacity Customisation")) + wxT("
") + + wxT("

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

") + wxString::Format(_("Audacity Team Members")) + wxT("
") + @@ -332,7 +332,7 @@ visit our forum."); GetCreditsByRole(roleThanks) + wxT("


Audacity website: http://www.audacityteam.org/") + - wxT("
Dark Audacity website: http://www.darkaudacity.com/") + + wxT("
DarkAudacity website: http://www.darkaudacity.com/") + wxT("


") + _("Audacity® software is copyright")+ wxT("© 1999-2016 Audacity Team.
") + _("The name Audacity® is a registered trademark of Dominic Mazzoni.") + @@ -343,7 +343,7 @@ visit our forum."); // New way to add to About box.... - S.StartNotebookPage( wxT("Audacity") ); + S.StartNotebookPage( wxT("DarkAudacity") ); S.StartVerticalLay(1); { diff --git a/src/Audacity.h b/src/Audacity.h index 3637ab2ca..7d2d5cdfb 100644 --- a/src/Audacity.h +++ b/src/Audacity.h @@ -27,7 +27,7 @@ // We only do alpha builds and release versions. // Most of the time we're in development, so IS_ALPHA should be defined // to 1. -#define IS_ALPHA 1 +#define IS_ALPHA 0 // Increment as appropriate every time we release a NEW version. #define AUDACITY_VERSION 2 @@ -38,7 +38,8 @@ #if IS_ALPHA #define AUDACITY_SUFFIX wxT("-alpha-") __TDATE__ #else - #define AUDACITY_SUFFIX wxT("") // for a stable release + //#define AUDACITY_SUFFIX wxT("") // for a stable release + #define AUDACITY_SUFFIX wxT("x ") __TDATE__ #endif #define AUDACITY_MAKESTR( x ) #x @@ -54,7 +55,7 @@ #define AUDACITY_FILE_VERSION AUDACITY_QUOTE( AUDACITY_VERSION ) "," \ AUDACITY_QUOTE( AUDACITY_RELEASE ) "," \ AUDACITY_QUOTE( AUDACITY_REVISION ) "," \ - AUDACITY_QUOTE( AUDACITY_MODLEVEL ) + AUDACITY_QUOTE( AUDACITY_MODLEVEL ) " x" // Increment this every time the prefs need to be reset // the first part (before the r) indicates the version the reset took place diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp index 0b10fef7e..289e892ff 100644 --- a/src/AudacityApp.cpp +++ b/src/AudacityApp.cpp @@ -1197,7 +1197,7 @@ bool AudacityApp::OnInit() wxTheApp->SetAppName(appName); // Explicitly set since OSX will use it for the "Quit" menu item - wxTheApp->SetAppDisplayName(wxT("Dark Audacity")); + wxTheApp->SetAppDisplayName(wxT("DarkAudacity")); wxTheApp->SetVendorName(wxT("Audacity")); // Unused strings that we want to be translated, even though @@ -1443,7 +1443,7 @@ bool AudacityApp::OnInit() fileMenu->Append(wxID_NEW, wxString(_("&New")) + wxT("\tCtrl+N")); fileMenu->Append(wxID_OPEN, wxString(_("&Open...")) + wxT("\tCtrl+O")); fileMenu->AppendSubMenu(urecentMenu.release(), _("Open &Recent...")); - fileMenu->Append(wxID_ABOUT, _("&About Audacity...")); + fileMenu->Append(wxID_ABOUT, _("&About DarkAudacity...")); fileMenu->Append(wxID_PREFERENCES, wxString(_("&Preferences...")) + wxT("\tCtrl+,")); { diff --git a/src/HelpText.cpp b/src/HelpText.cpp index 7e87c2ba3..cb1a0ddb1 100644 --- a/src/HelpText.cpp +++ b/src/HelpText.cpp @@ -186,20 +186,22 @@ 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("

Dark 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("

") - ); + wxT("

DarkAudacity ") + AUDACITY_VERSION_STRING + wxT("

") + + _("

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

Audacity has these support methods:") + wxT("") + ); } if(Key==wxT("wma-proprietary")) { return WrapText( wxString(wxT("

"))+ - _("Audacity can import unprotected files in many other formats (such as M4A and WMA, \ + _("DarkAudacity 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/Menus.cpp b/src/Menus.cpp index 5f0318ee9..b7713dffe 100644 --- a/src/Menus.cpp +++ b/src/Menus.cpp @@ -1125,7 +1125,7 @@ void AudacityProject::CreateMenusAndCommands() #endif c->AddItem(wxT("Updates"), _("&Check for Updates..."), FN(OnCheckForUpdates)); - c->AddItem(wxT("About"), _("&About Audacity..."), FN(OnAbout)); + c->AddItem(wxT("About"), _("&About DarkAudacity..."), FN(OnAbout)); c->EndMenu(); diff --git a/src/Project.cpp b/src/Project.cpp index 101a8a2df..cddeefbe8 100644 --- a/src/Project.cpp +++ b/src/Project.cpp @@ -828,7 +828,7 @@ END_EVENT_TABLE() AudacityProject::AudacityProject(wxWindow * parent, wxWindowID id, const wxPoint & pos, const wxSize & size) - : wxFrame(parent, id, wxT("Dark Audacity"), pos, size), + : wxFrame(parent, id, wxT("DarkAudacity"), pos, size), mRate((double) gPrefs->Read(wxT("/SamplingRate/DefaultProjectSampleRate"), AudioIO::GetOptimalSupportedSampleRate())), mDefaultFormat((sampleFormat) gPrefs-> Read(wxT("/SamplingRate/DefaultProjectSampleFormat"), floatSample)), @@ -1110,7 +1110,7 @@ AudacityProject::AudacityProject(wxWindow * parent, wxWindowID id, int widths[] = {0, GetControlToolBar()->WidthForStatusBar(mStatusBar), -1, 150}; mStatusBar->SetStatusWidths(4, widths); - wxString msg = wxString::Format(_("Welcome to Dark Audacity version %s"), + wxString msg = wxString::Format(_("Welcome to DarkAudacity version %s"), AUDACITY_VERSION_STRING); mStatusBar->SetStatusText(msg, mainStatusBarField); GetControlToolBar()->UpdateStatusBar(this); @@ -1334,7 +1334,7 @@ void AudacityProject::SetProjectTitle() wxString name = GetName(); if( name.IsEmpty() ) { - name = wxT("Dark Audacity"); + name = wxT("DarkAudacity"); } if (mIsRecovered) diff --git a/src/SplashDialog.cpp b/src/SplashDialog.cpp index fc4495f38..9b8489913 100644 --- a/src/SplashDialog.cpp +++ b/src/SplashDialog.cpp @@ -59,7 +59,7 @@ END_EVENT_TABLE() IMPLEMENT_CLASS(SplashDialog, wxDialogWrapper) SplashDialog::SplashDialog(wxWindow * parent) - : wxDialogWrapper(parent, -1, _("Welcome to Dark Audacity!"), + : wxDialogWrapper(parent, -1, _("Welcome to DarkAudacity!"), wxPoint( -1, 60 ), // default x position, y position 60 pixels from top of screen. wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) { diff --git a/win/audacity.rc b/win/audacity.rc index 7072e8ffd..a50dd22b1 100644 --- a/win/audacity.rc +++ b/win/audacity.rc @@ -29,7 +29,7 @@ BEGIN VALUE "LegalCopyright", "Copyright © 2016. All rights reserved." VALUE "LegalTrademarks", "Audacity® is a registered trademark of Dominic Mazzoni." VALUE "OriginalFilename", "DarkAudacity.exe" - VALUE "ProductName", "DarkAudacity®" + VALUE "ProductName", "DarkAudacity" VALUE "ProductVersion", AUDACITY_FILE_VERSION END END