Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-26 07:13:49 +01:00
Code Issues Releases Wiki Activity

Define and use TranslatableStringArray. This lets you define "listeners"...

Browse Source 
... for language changes, without inserting extra code to send the
notifications.
This commit is contained in:
Paul Licameli
2015-08-17 11:49:13 -04:00
parent 5c77d34a35
commit b9db3bd83d
9 changed files with 138 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/prefs/SpectrogramSettings.cpp
View File

@@ -16,6 +16,7 @@ Paul Licameli
#include "../Audacity.h"
#include "SpectrogramSettings.h"
#include "../NumberScale.h"
#include "../TranslatableStringArray.h"
#include <algorithm>
#include <wx/msgdlg.h>
@@ -142,65 +143,49 @@ SpectrogramSettings& SpectrogramSettings::defaults()
return instance;
}
namespace
{
wxArrayString &scaleNamesArray()
{
static wxArrayString theArray;
return theArray;
}
wxArrayString &algorithmNamesArray()
{
static wxArrayString theArray;
return theArray;
}
}
//static
void SpectrogramSettings::InvalidateNames()
{
scaleNamesArray().Clear();
algorithmNamesArray().Clear();
}
//static
const wxArrayString &SpectrogramSettings::GetScaleNames()
{
wxArrayString &theArray = scaleNamesArray();
class ScaleNamesArray : public TranslatableStringArray
{
virtual void Populate()
{
// Keep in correspondence with enum SpectrogramSettings::ScaleType:
mContents.Add(_("Linear"));
mContents.Add(_("Logarithmic"));
/* i18n-hint: The name of a frequency scale in psychoacoustics */
mContents.Add(_("Mel"));
/* i18n-hint: The name of a frequency scale in psychoacoustics, named for Heinrich Barkhausen */
mContents.Add(_("Bark"));
/* i18n-hint: The name of a frequency scale in psychoacoustics, abbreviates Equivalent Rectangular Bandwidth */
mContents.Add(_("ERBS"));
/* i18n-hint: A mathematical formula where f stands for frequency */
mContents.Add(_("1 / f"));
}
};
if (theArray.IsEmpty()) {
// Keep in correspondence with enum SpectrogramSettings::ScaleType:
theArray.Add(_("Linear"));
theArray.Add(_("Logarithmic"));
/* i18n-hint: The name of a frequency scale in psychoacoustics */
theArray.Add(_("Mel"));
/* i18n-hint: The name of a frequency scale in psychoacoustics, named for Heinrich Barkhausen */
theArray.Add(_("Bark"));
/* i18n-hint: The name of a frequency scale in psychoacoustics, abbreviates Equivalent Rectangular Bandwidth */
theArray.Add(_("ERBS"));
/* i18n-hint: A mathematical formula where f stands for frequency */
theArray.Add(_("1 / f"));
}
return theArray;
static ScaleNamesArray theArray;
return theArray.Get();
}
//static
const wxArrayString &SpectrogramSettings::GetAlgorithmNames()
{
wxArrayString &theArray = algorithmNamesArray();
class AlgorithmNamesArray : public TranslatableStringArray
{
virtual void Populate()
{
// Keep in correspondence with enum SpectrogramSettings::Algorithm:
mContents.Add(_("Frequencies"));
/* i18n-hint: the Reassignment algorithm for spectrograms */
mContents.Add(_("Reassignment"));
/* i18n-hint: EAC abbreviates "Enhanced Autocorrelation" */
mContents.Add(_("Pitch (EAC)"));
}
};
if (theArray.IsEmpty()) {
// Keep in correspondence with enum SpectrogramSettings::Algorithm:
theArray.Add(_("Frequencies"));
/* i18n-hint: the Reassignment algorithm for spectrograms */
theArray.Add(_("Reassignment"));
/* i18n-hint: EAC abbreviates "Enhanced Autocorrelation" */
theArray.Add(_("Pitch (EAC)"));
}
return theArray;
static AlgorithmNamesArray theArray;
return theArray.Get();
}
bool SpectrogramSettings::Validate(bool quiet)

1
src/prefs/SpectrogramSettings.h
View File

@@ -62,7 +62,6 @@ public:
stNumScaleTypes,
};
static void InvalidateNames(); // in case of language change
static const wxArrayString &GetScaleNames();
static const wxArrayString &GetAlgorithmNames();

35
src/prefs/WaveformSettings.cpp
View File

@@ -22,6 +22,7 @@ Paul Licameli
#include <wx/intl.h>
#include "../Prefs.h"
#include "../TranslatableStringArray.h"
WaveformSettings::Globals::Globals()
{
@@ -145,33 +146,21 @@ void WaveformSettings::NextHigherDBRange()
ConvertToActualDBRange();
}
namespace
{
wxArrayString &scaleNamesArray()
{
static wxArrayString theArray;
return theArray;
}
}
//static
void WaveformSettings::InvalidateNames()
{
scaleNamesArray().Clear();
}
//static
const wxArrayString &WaveformSettings::GetScaleNames()
{
wxArrayString &theArray = scaleNamesArray();
class ScaleNamesArray : public TranslatableStringArray
{
virtual void Populate()
{
// Keep in correspondence with enum WaveTrack::WaveTrackDisplay:
mContents.Add(_("Linear"));
mContents.Add(_("Logarithmic"));
}
};
if (theArray.IsEmpty()) {
// Keep in correspondence with enum WaveTrack::WaveTrackDisplay:
theArray.Add(_("Linear"));
theArray.Add(_("Logarithmic"));
}
return theArray;
static ScaleNamesArray theArray;
return theArray.Get();
}
WaveformSettings::~WaveformSettings()

1
src/prefs/WaveformSettings.h
View File

@@ -57,7 +57,6 @@ public:
stNumScaleTypes,
};
static void InvalidateNames(); // in case of language change
static const wxArrayString &GetScaleNames();
ScaleType scaleType;