audacia
/
audacia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

TranslatableString for list control column headers, menus

This commit is contained in:
Paul Licameli 2019-12-23 17:57:45 -05:00
parent 6b235bdec5
commit 455d3185a8
10 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AutoRecoveryDialog.cpp
View File

@ -77,7 +77,7 @@ void AutoRecoveryDialog::PopulateOrExchange(ShuttleGui& S)
{
mFileList = S.Id(ID_FILE_LIST)
/*i18n-hint: (noun). It's the name of the project to recover.*/
.AddListControlReportMode( { _("Name") } );
.AddListControlReportMode( { XO("Name") } );
PopulateList();
}
S.EndStatic();

12
src/BatchProcessDialog.cpp
View File

@ -139,7 +139,7 @@ void ApplyMacroDialog::PopulateOrExchange(ShuttleGui &S)
.Style(wxSUNKEN_BORDER | wxLC_REPORT | wxLC_HRULES | wxLC_VRULES |
wxLC_SINGLE_SEL)
// i18n-hint: This is the heading for a column in the edit macros dialog
.AddListControlReportMode( { _("Macro") } );
.AddListControlReportMode( { XO("Macro") } );
}
S.EndStatic();
@ -415,7 +415,7 @@ void ApplyMacroDialog::OnApplyToFiles(wxCommandEvent & WXUNUSED(event))
fileList = S.Id(CommandsListID)
.Style(wxSUNKEN_BORDER | wxLC_REPORT | wxLC_HRULES | wxLC_VRULES |
wxLC_SINGLE_SEL)
.AddListControlReportMode( { _("File") } );
.AddListControlReportMode( { XO("File") } );
// AssignImageList takes ownership
fileList->AssignImageList(imageList.release(), wxIMAGE_LIST_SMALL);
}
@ -624,7 +624,7 @@ void MacrosWindow::PopulateOrExchange(ShuttleGui & S)
.Style(wxSUNKEN_BORDER | wxLC_REPORT | wxLC_HRULES
| wxLC_SINGLE_SEL | wxLC_EDIT_LABELS)
// i18n-hint: This is the heading for a column in the edit macros dialog
.AddListControlReportMode( { _("Macro") } );
.AddListControlReportMode( { XO("Macro") } );
S.StartVerticalLay(wxALIGN_TOP, 0);
{
S.Id(AddButtonID).AddButton(XO("&New"));
@ -657,9 +657,9 @@ void MacrosWindow::PopulateOrExchange(ShuttleGui & S)
wxLC_SINGLE_SEL)
.AddListControlReportMode({
/* i18n-hint: This is the number of the command in the list */
{ _("Num"), wxLIST_FORMAT_RIGHT },
{ _("Command "), wxLIST_FORMAT_RIGHT },
{ _("Parameters"), wxLIST_FORMAT_LEFT }
{ XO("Num"), wxLIST_FORMAT_RIGHT },
{ XO("Command "), wxLIST_FORMAT_RIGHT },
{ XO("Parameters"), wxLIST_FORMAT_LEFT }
});
S.StartVerticalLay(wxALIGN_TOP, 0);

4
src/Dependencies.cpp
View File

@ -357,8 +357,8 @@ void DependencyDialog::PopulateOrExchange(ShuttleGui& S)
S.StartStatic(XO("Project Dependencies"),1);
{
mFileListCtrl = S.Id(FileListID).AddListControlReportMode({
{ _("Audio File"), wxLIST_FORMAT_LEFT, 220 },
{ _("Disk Space"), wxLIST_FORMAT_LEFT, 120 }
{ XO("Audio File"), wxLIST_FORMAT_LEFT, 220 },
{ XO("Disk Space"), wxLIST_FORMAT_LEFT, 120 }
});
PopulateList();

4
src/HistoryWindow.cpp
View File

@ -86,8 +86,8 @@ HistoryDialog::HistoryDialog(AudacityProject *parent, UndoManager *manager):
mList = S
.MinSize()
.AddListControlReportMode(
{ { _("Action"), wxLIST_FORMAT_LEFT, 260 },
{ _("Reclaimable Space"), wxLIST_FORMAT_LEFT, 125 } },
{ { XO("Action"), wxLIST_FORMAT_LEFT, 260 },
{ XO("Reclaimable Space"), wxLIST_FORMAT_LEFT, 125 } },
wxLC_SINGLE_SEL
);

2
src/PluginManager.cpp
View File

@ -580,7 +580,7 @@ void PluginRegistrationDialog::PopulateOrExchange(ShuttleGui &S)
.Style(wxSUNKEN_BORDER | wxLC_REPORT | wxLC_HRULES | wxLC_VRULES )
.ConnectRoot(wxEVT_KEY_DOWN,
&PluginRegistrationDialog::OnListChar)
.AddListControlReportMode({ _("Name"), _("State"), _("Path") });
.AddListControlReportMode({ XO("Name"), XO("State"), XO("Path") });
#if wxUSE_ACCESSIBILITY
mEffects->SetAccessible(mAx = safenew CheckListAx(mEffects));
#endif

6
src/ShuttleGui.cpp
View File

@ -808,7 +808,7 @@ void ShuttleGuiBase::DoInsertListColumns(
for (auto &column : columns)
pListCtrl->InsertColumn(
iCol++, column.heading, column.format, column.width );
iCol++, column.heading.Translation(), column.format, column.width );
if (dummyColumn)
pListCtrl->DeleteColumn( 0 );
@ -860,9 +860,9 @@ wxMenuBar * ShuttleGuiBase::AddMenuBar( )
return mpMenuBar;
}
wxMenu * ShuttleGuiBase::AddMenu( const wxString & Title )
wxMenu * ShuttleGuiBase::AddMenu( const TranslatableString & Title )
{
mpMenuBar->Append( (mpMenu = safenew wxMenu), Title );
mpMenuBar->Append( (mpMenu = safenew wxMenu), Title.Translation() );
return mpMenu;
}

7
src/ShuttleGui.h
View File

@ -313,11 +313,12 @@ public:
struct ListControlColumn{
ListControlColumn(
wxString h, int f = wxLIST_FORMAT_LEFT, int w = wxLIST_AUTOSIZE)
const TranslatableString &h,
int f = wxLIST_FORMAT_LEFT, int w = wxLIST_AUTOSIZE)
: heading(h), format(f), width(w)
{}
wxString heading;
TranslatableString heading;
int format;
int width;
};
@ -340,7 +341,7 @@ public:
wxChoice * AddChoice( const TranslatableString &Prompt,
const TranslatableStrings &choices, const TranslatableString &selected );
wxMenuBar * AddMenuBar( );
wxMenu * AddMenu( const wxString & Title );
wxMenu * AddMenu( const TranslatableString & Title );
void AddIcon( wxBitmap * pBmp);
void AddIconButton( const wxString & Command, const wxString & Params,wxBitmap * pBmp );
void AddFixedText(

2
src/effects/Equalization.cpp
View File

@ -3363,7 +3363,7 @@ void EditCurvesDialog::PopulateOrExchange(ShuttleGui & S)
mList = S.Id(CurvesListID)
.Style(wxSUNKEN_BORDER | wxLC_REPORT | wxLC_HRULES | wxLC_VRULES )
.AddListControlReportMode({
{ _("Curve Name"), wxLIST_FORMAT_RIGHT }
{ XO("Curve Name"), wxLIST_FORMAT_RIGHT }
});
}
S.EndStatic();

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

@ -513,7 +513,7 @@ void AudioUnitEffectExportDialog::PopulateOrExchange(ShuttleGui & S)
{
mList = S.Style(wxLC_REPORT | wxLC_HRULES | wxLC_VRULES |
wxLC_NO_SORT_HEADER)
.AddListControlReportMode( { _("Preset") } );
.AddListControlReportMode( { XO("Preset") } );
}
S.EndStatic();
}
@ -685,7 +685,7 @@ void AudioUnitEffectImportDialog::PopulateOrExchange(ShuttleGui & S)
{
mList = S.Style(wxLC_REPORT | wxLC_HRULES | wxLC_VRULES |
wxLC_NO_SORT_HEADER)
.AddListControlReportMode( { _("Preset"), _("Location") } );
.AddListControlReportMode( { XO("Preset"), XO("Location") } );
}
S.EndStatic();
}

2
src/prefs/ExtImportPrefs.cpp
View File

@ -150,7 +150,7 @@ void ExtImportPrefs::PopulateOrExchange(ShuttleGui & S)
.AddWindow(RuleTable);
PluginList = S.Id(EIPPluginList).AddListControl(
{ { _("Importer order"), wxLIST_FORMAT_LEFT,
{ { XO("Importer order"), wxLIST_FORMAT_LEFT,
wxLIST_AUTOSIZE_USEHEADER } },
wxLC_REPORT | wxLC_SINGLE_SEL
);