1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-03 17:39:25 +02:00

Merge remote-tracking branch 'dave/searchboxname'

This commit is contained in:
James Crook 2015-05-08 22:07:14 +01:00
commit 26a6242064

View File

@ -151,6 +151,7 @@ void KeyConfigPrefs::Populate()
else if (mViewByKey->GetValue()) {
mViewType = ViewByKey;
mFilterLabel->SetLabel(_("&Hotkey:"));
mFilter->SetName(wxStripMenuCodes(mFilterLabel->GetLabel()));
}
mView->SetView(mViewType);
@ -207,7 +208,7 @@ void KeyConfigPrefs::PopulateOrExchange(ShuttleGui & S)
wxSize(210, -1),
#endif
wxTE_PROCESS_ENTER);
mFilter->SetName(_("Filter"));
mFilter->SetName(wxStripMenuCodes(mFilterLabel->GetLabel()));
mFilter->Connect(wxEVT_KEY_DOWN,
wxKeyEventHandler(KeyConfigPrefs::OnFilterKeyDown),
NULL,
@ -617,6 +618,7 @@ void KeyConfigPrefs::OnViewBy(wxCommandEvent & e)
}
mView->SetView(mViewType);
mFilter->SetName(wxStripMenuCodes(mFilterLabel->GetLabel()));
}
bool KeyConfigPrefs::Apply()