Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-02-15 23:44:59 +01:00
Code Issues Releases Wiki Activity

IdentInterfaceSymbol in NumericTextCtrl; don't persist translated

Browse Source
This commit is contained in:
Paul Licameli
2017-10-06 11:05:15 -04:00
parent 9015dece06
commit 0fb02a8024
27 changed files with 282 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/toolbars/SelectionBar.cpp
View File

@@ -203,8 +203,8 @@ auStaticText * SelectionBar::AddTitle( const wxString & Title, wxSizer * pSizer
NumericTextCtrl * SelectionBar::AddTime( const wxString Name, int id, wxSizer * pSizer ){
wxString formatName = mListener ? mListener->AS_GetSelectionFormat()
: wxString(wxEmptyString);
auto formatName = mListener ? mListener->AS_GetSelectionFormat()
: NumericFormatId{};
auto pCtrl = safenew NumericTextCtrl(
this, id, NumericConverter::TIME, formatName, 0.0, mRate);
pCtrl->SetName(Name);
@@ -426,8 +426,13 @@ void SelectionBar::SetListener(SelectionBarListener *l)
void SelectionBar::RegenerateTooltips()
{
#if wxUSE_TOOLTIPS
wxString formatName = mListener ? mListener->AS_GetSelectionFormat() : wxString(wxEmptyString);
mSnapTo->SetToolTip(wxString::Format(_("Snap Clicks/Selections to %s"), formatName));
auto formatName =
mListener
? mListener->AS_GetSelectionFormat()
: NumericFormatId{};
mSnapTo->SetToolTip(
wxString::Format(
_("Snap Clicks/Selections to %s"), formatName.Translation() ));
#endif
}
@@ -567,11 +572,11 @@ void SelectionBar::OnUpdate(wxCommandEvent &evt)
evt.Skip(false);
wxString format;
// Save format name before recreating the controls so they resize properly
format = mStartTime->GetBuiltinName(index);
mListener->AS_SetSelectionFormat(format);
{
auto format = mStartTime->GetBuiltinName(index);
mListener->AS_SetSelectionFormat(format);
}
RegenerateTooltips();
@@ -587,7 +592,7 @@ void SelectionBar::OnUpdate(wxCommandEvent &evt)
ValuesToControls();
format = mStartTime->GetBuiltinFormat(index);
auto format = mStartTime->GetBuiltinFormat(index);
for( i=0;i<5;i++)
(*Ctrls[i])->SetFormatString( format );
@@ -765,7 +770,7 @@ void SelectionBar::SetSnapTo(int snap)
mSnapTo->SetSelection(snap);
}
void SelectionBar::SetSelectionFormat(const wxString & format)
void SelectionBar::SetSelectionFormat(const NumericFormatId & format)
{
mStartTime->SetFormatString(mStartTime->GetBuiltinFormat(format));