Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-08 14:13:57 +01:00
Code Issues Releases Wiki Activity

Rename Settings to Options in RTP dialogs

Browse Source 
This was suggested here:

http://audacity.238276.n2.nabble.com/Effect-options-dialogs-should-be-titled-Options-not-Settings-tt7566034.html

(Probably should delete your pluginregister.cfg file, but not a requirement.)
This commit is contained in:
lllucius@gmail.com
2014-12-15 04:49:06 +00:00
parent 83ba6da21a
commit 3da4e22cee
3 changed files with 59 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/effects/audiounits/AudioUnitEffect.cpp
View File

@@ -275,15 +275,15 @@ OSType AudioUnitEffectsModule::ToOSType(const wxString & type)
///////////////////////////////////////////////////////////////////////////////
//
// AudioUnitEffectSettingsDialog
// AudioUnitEffectOptionsDialog
//
///////////////////////////////////////////////////////////////////////////////
class AudioUnitEffectSettingsDialog:public wxDialog
class AudioUnitEffectOptionsDialog:public wxDialog
{
public:
AudioUnitEffectSettingsDialog(wxWindow * parent, EffectHostInterface *host);
virtual ~AudioUnitEffectSettingsDialog();
AudioUnitEffectOptionsDialog(wxWindow * parent, EffectHostInterface *host);
virtual ~AudioUnitEffectOptionsDialog();
void PopulateOrExchange(ShuttleGui & S);
@@ -297,27 +297,27 @@ private:
DECLARE_EVENT_TABLE()
};
BEGIN_EVENT_TABLE(AudioUnitEffectSettingsDialog, wxDialog)
EVT_BUTTON(wxID_OK, AudioUnitEffectSettingsDialog::OnOk)
BEGIN_EVENT_TABLE(AudioUnitEffectOptionsDialog, wxDialog)
EVT_BUTTON(wxID_OK, AudioUnitEffectOptionsDialog::OnOk)
END_EVENT_TABLE()
AudioUnitEffectSettingsDialog::AudioUnitEffectSettingsDialog(wxWindow * parent, EffectHostInterface *host)
: wxDialog(parent, wxID_ANY, wxString(_("Audio Unit Effect Settings")))
AudioUnitEffectOptionsDialog::AudioUnitEffectOptionsDialog(wxWindow * parent, EffectHostInterface *host)
: wxDialog(parent, wxID_ANY, wxString(_("Audio Unit Effect Options")))
{
mHost = host;
mHost->GetSharedConfig(wxT("Settings"), wxT("UseLatency"), mUseLatency, true);
mHost->GetSharedConfig(wxT("Settings"), wxT("UseGUI"), mUseGUI, true);
mHost->GetSharedConfig(wxT("Options"), wxT("UseLatency"), mUseLatency, true);
mHost->GetSharedConfig(wxT("Options"), wxT("UseGUI"), mUseGUI, true);
ShuttleGui S(this, eIsCreating);
PopulateOrExchange(S);
}
AudioUnitEffectSettingsDialog::~AudioUnitEffectSettingsDialog()
AudioUnitEffectOptionsDialog::~AudioUnitEffectOptionsDialog()
{
}
void AudioUnitEffectSettingsDialog::PopulateOrExchange(ShuttleGui & S)
void AudioUnitEffectOptionsDialog::PopulateOrExchange(ShuttleGui & S)
{
S.SetBorder(5);
S.StartHorizontalLay(wxEXPAND, 1);
@@ -364,7 +364,7 @@ void AudioUnitEffectSettingsDialog::PopulateOrExchange(ShuttleGui & S)
Center();
}
void AudioUnitEffectSettingsDialog::OnOk(wxCommandEvent & WXUNUSED(evt))
void AudioUnitEffectOptionsDialog::OnOk(wxCommandEvent & WXUNUSED(evt))
{
if (!Validate())
{
@@ -374,8 +374,8 @@ void AudioUnitEffectSettingsDialog::OnOk(wxCommandEvent & WXUNUSED(evt))
ShuttleGui S(this, eIsGettingFromDialog);
PopulateOrExchange(S);
mHost->SetSharedConfig(wxT("Settings"), wxT("UseLatency"), mUseLatency);
mHost->SetSharedConfig(wxT("Settings"), wxT("UseGUI"), mUseGUI);
mHost->SetSharedConfig(wxT("Options"), wxT("UseLatency"), mUseLatency);
mHost->SetSharedConfig(wxT("Options"), wxT("UseGUI"), mUseGUI);
EndModal(wxID_OK);
}
@@ -1131,8 +1131,8 @@ bool AudioUnitEffect::SetHost(EffectHostInterface *host)
// mHost will be null during registration
if (mHost)
{
mHost->GetSharedConfig(wxT("Settings"), wxT("UseLatency"), mUseLatency, true);
mHost->GetSharedConfig(wxT("Settings"), wxT("UseGUI"), mUseGUI, true);
mHost->GetSharedConfig(wxT("Options"), wxT("UseLatency"), mUseLatency, true);
mHost->GetSharedConfig(wxT("Options"), wxT("UseGUI"), mUseGUI, true);
bool haveDefaults;
mHost->GetPrivateConfig(mHost->GetFactoryDefaultsGroup(), wxT("Initialized"), haveDefaults, false);
@@ -2064,8 +2064,11 @@ bool AudioUnitEffect::HasOptions()
void AudioUnitEffect::ShowOptions()
{
AudioUnitEffectSettingsDialog dlg(mParent, mHost);
AudioUnitEffectOptionsDialog dlg(mParent, mHost);
dlg.ShowModal();
mHost->GetSharedConfig(wxT("Options"), wxT("UseLatency"), mUseLatency, true);
mHost->GetSharedConfig(wxT("Options"), wxT("UseGUI"), mUseGUI, true);
}
// ============================================================================