diff --git a/src/Menus.cpp b/src/Menus.cpp index 56e9b3b7c..170edd5bc 100644 --- a/src/Menus.cpp +++ b/src/Menus.cpp @@ -662,7 +662,7 @@ void AudacityProject::CreateMenusAndCommands() #ifdef EXPERIMENTAL_SPECTRAL_EDITING c->BeginSubMenu(_("S&pectral")); - c->AddItem(wxT("ToggleFrequencySelection"), XXO("To&ggle Frequency Selection"), FN(OnToggleSpectralSelection), wxT("Q")); + c->AddItem(wxT("ToggleSpectralSelection"), XXO("To&ggle Spectral Selection"), FN(OnToggleSpectralSelection), wxT("Q")); c->AddItem(wxT("NextHigherPeakFrequency"), XXO("Next &Higher Peak Frequency"), FN(OnNextHigherPeakFrequency)); c->AddItem(wxT("NextLowerPeakFrequency"), XXO("Next &Lower Peak Frequency"), FN(OnNextLowerPeakFrequency)); c->EndSubMenu(); @@ -807,7 +807,7 @@ void AudacityProject::CreateMenusAndCommands() c->AddCheck(wxT("ShowSelectionTB"), XXO("&Selection Toolbar"), FN(OnShowSelectionToolBar), 0, AlwaysEnabledFlag, AlwaysEnabledFlag); #ifdef EXPERIMENTAL_SPECTRAL_EDITING /* i18n-hint: Clicking this menu item shows the toolbar for selecting a frequency range of audio*/ - c->AddCheck(wxT("ShowFrequencySelectionTB"), XXO("Fre&quency Selection Toolbar"), FN(OnShowSpectralSelectionToolBar), 0, AlwaysEnabledFlag, AlwaysEnabledFlag); + c->AddCheck(wxT("ShowSpectralSelectionTB"), XXO("Spe&ctral Selection Toolbar"), FN(OnShowSpectralSelectionToolBar), 0, AlwaysEnabledFlag, AlwaysEnabledFlag); #endif c->EndSubMenu(); @@ -2380,7 +2380,7 @@ void AudacityProject::ModifyToolbarMenus() mCommandManager.Check(wxT("ShowSelectionTB"), mToolManager->IsVisible(SelectionBarID)); #ifdef EXPERIMENTAL_SPECTRAL_EDITING - mCommandManager.Check(wxT("ShowFrequencySelectionTB"), + mCommandManager.Check(wxT("ShowSpectralSelectionTB"), mToolManager->IsVisible(SpectralSelectionBarID)); #endif mCommandManager.Check(wxT("ShowToolsTB"), diff --git a/src/Screenshot.cpp b/src/Screenshot.cpp index ef4b74b27..507130239 100644 --- a/src/Screenshot.cpp +++ b/src/Screenshot.cpp @@ -389,7 +389,7 @@ void ScreenFrame::PopulateOrExchange(ShuttleGui & S) S.StartHorizontalLay(); { S.Id(IdCaptureSelectionBar).AddButton(_("SelectionBar")); - S.Id(IdCaptureSpectralSelection).AddButton(_("Frequency Selection")); + S.Id(IdCaptureSpectralSelection).AddButton(_("Spectral Selection")); S.Id(IdCaptureTools).AddButton(_("Tools")); S.Id(IdCaptureTransport).AddButton(_("Transport")); } diff --git a/src/commands/ScreenshotCommand.cpp b/src/commands/ScreenshotCommand.cpp index 3acecb424..d45e29ffc 100644 --- a/src/commands/ScreenshotCommand.cpp +++ b/src/commands/ScreenshotCommand.cpp @@ -57,7 +57,7 @@ static const wxString kCaptureWhatStrings[ ScreenshotCommand::nCaptureWhats ] = XO("Scriptables"), XO("Preferences"), XO("Selectionbar"), - XO("Frequency_Selection"), + XO("Spectral_Selection"), XO("Tools"), XO("Transport"), XO("Mixer"), diff --git a/src/commands/SelectCommand.h b/src/commands/SelectCommand.h index 393dbbb56..ec73be1b8 100644 --- a/src/commands/SelectCommand.h +++ b/src/commands/SelectCommand.h @@ -65,7 +65,7 @@ public: bool Apply(const CommandContext & context) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Frequency_Selection");}; + wxString ManualPage() override {return wxT("Spectral_Selection");}; bool bHasBottom; bool bHasTop; diff --git a/src/effects/nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp index 968806cc7..1717f8f2a 100644 --- a/src/effects/nyquist/Nyquist.cpp +++ b/src/effects/nyquist/Nyquist.cpp @@ -529,7 +529,7 @@ bool NyquistEffect::Init() } if (!bAllowSpectralEditing || ((mF0 < 0.0) && (mF1 < 0.0))) { - Effect::MessageBox(_("To use 'Spectral effects', enable 'Frequency Selection'\n" + Effect::MessageBox(_("To use 'Spectral effects', enable 'Spectral Selection'\n" "in the track Spectrogram settings and select the\n" "frequency range for the effect to act on."), wxOK | wxICON_EXCLAMATION | wxCENTRE, _("Error")); diff --git a/src/prefs/SpectrogramSettings.cpp b/src/prefs/SpectrogramSettings.cpp index b02820357..7b3f80057 100644 --- a/src/prefs/SpectrogramSettings.cpp +++ b/src/prefs/SpectrogramSettings.cpp @@ -38,7 +38,7 @@ SpectrogramSettings::Globals::Globals() void SpectrogramSettings::Globals::SavePrefs() { #ifdef SPECTRAL_SELECTION_GLOBAL_SWITCH - gPrefs->Write(wxT("/Spectrum/EnableFrequencySelection"), spectralSelection); + gPrefs->Write(wxT("/Spectrum/EnableSpectralSelection"), spectralSelection); #endif } @@ -46,7 +46,7 @@ void SpectrogramSettings::Globals::LoadPrefs() { #ifdef SPECTRAL_SELECTION_GLOBAL_SWITCH spectralSelection - = (gPrefs->Read(wxT("/Spectrum/EnableFrequencySelection"), 0L) != 0); + = (gPrefs->Read(wxT("/Spectrum/EnableSpectralSelection"), 0L) != 0); #endif } @@ -272,7 +272,7 @@ void SpectrogramSettings::LoadPrefs() scaleType = ScaleType(gPrefs->Read(wxT("/Spectrum/ScaleType"), 0L)); #ifndef SPECTRAL_SELECTION_GLOBAL_SWITCH - spectralSelection = (gPrefs->Read(wxT("/Spectrum/EnableFrequencySelection"), 0L) != 0); + spectralSelection = (gPrefs->Read(wxT("/Spectrum/EnableSpectralSelection"), 0L) != 0); #endif algorithm = Algorithm(gPrefs->Read(wxT("/Spectrum/Algorithm"), 0L)); @@ -320,7 +320,7 @@ void SpectrogramSettings::SavePrefs() gPrefs->Write(wxT("/Spectrum/ScaleType"), (int) scaleType); #ifndef SPECTRAL_SELECTION_GLOBAL_SWITCH - gPrefs->Write(wxT("/Spectrum/EnableFrequencySelection"), spectralSelection); + gPrefs->Write(wxT("/Spectrum/EnableSpectralSelection"), spectralSelection); #endif gPrefs->Write(wxT("/Spectrum/Algorithm"), (int) algorithm); diff --git a/src/prefs/SpectrumPrefs.cpp b/src/prefs/SpectrumPrefs.cpp index 7a349eeac..e5b5eb3f4 100644 --- a/src/prefs/SpectrumPrefs.cpp +++ b/src/prefs/SpectrumPrefs.cpp @@ -249,7 +249,7 @@ void SpectrumPrefs::PopulateOrExchange(ShuttleGui & S) S.EndStatic(); #ifndef SPECTRAL_SELECTION_GLOBAL_SWITCH - S.Id(ID_SPECTRAL_SELECTION).TieCheckBox(_("Ena&ble Frequency Selection"), + S.Id(ID_SPECTRAL_SELECTION).TieCheckBox(_("Ena&ble Spectral Selection"), mTempSettings.spectralSelection); #endif @@ -289,7 +289,7 @@ void SpectrumPrefs::PopulateOrExchange(ShuttleGui & S) #ifdef SPECTRAL_SELECTION_GLOBAL_SWITCH S.StartStatic(_("Global settings")); { - S.TieCheckBox(_("Ena&ble frequency selection"), + S.TieCheckBox(_("Ena&ble spectral selection"), SpectrogramSettings::Globals::Get().spectralSelection); } S.EndStatic(); diff --git a/src/toolbars/SpectralSelectionBar.cpp b/src/toolbars/SpectralSelectionBar.cpp index d74f4f975..41bceb627 100644 --- a/src/toolbars/SpectralSelectionBar.cpp +++ b/src/toolbars/SpectralSelectionBar.cpp @@ -84,10 +84,10 @@ BEGIN_EVENT_TABLE(SpectralSelectionBar, ToolBar) END_EVENT_TABLE() static const wxString preferencePath -(wxT("/GUI/Toolbars/FrequencySelection/CenterAndWidthChoice")); +(wxT("/GUI/Toolbars/SpectralSelection/CenterAndWidthChoice")); SpectralSelectionBar::SpectralSelectionBar() -: ToolBar(SpectralSelectionBarID, _("Frequency Selection"), wxT("FrequencySelection")) +: ToolBar(SpectralSelectionBarID, _("Spectral Selection"), wxT("SpectralSelection")) , mListener(NULL), mbCenterAndWidth(true) , mCenter(0.0), mWidth(0.0), mLow(0.0), mHigh(0.0) , mCenterCtrl(NULL), mWidthCtrl(NULL), mLowCtrl(NULL), mHighCtrl(NULL) @@ -146,7 +146,7 @@ void SpectralSelectionBar::Populate() }; mChoice = safenew wxChoice (this, OnChoiceID, wxDefaultPosition, wxDefaultSize, 2, choices, - 0, wxDefaultValidator, _("Frequency Selection")); + 0, wxDefaultValidator, _("Spectral Selection")); mChoice->SetSelection(mbCenterAndWidth ? 0 : 1); #ifdef __WXGTK__ // Combo boxes are taller on Linux, and if we don't do the following, the selection toolbar will @@ -232,7 +232,7 @@ void SpectralSelectionBar::UpdatePrefs() } // Set label to pull in language change - SetLabel(_("Frequency Selection")); + SetLabel(_("Spectral Selection")); RegenerateTooltips();