As per -quality discussion:

* Add missing colons to controls text in generators (outside the translatable string, so as to not break translations)
* Also right-justify "Duration" in Chirp and Tone to match other controls.  
* TODOs added to possibly move colons back into the translatable string after 2.0 (per Vaughan's suggestion).
This commit is contained in:
windinthew 2011-03-25 05:53:02 +00:00
parent 5100fa66bc
commit f2ce7854a3
3 changed files with 24 additions and 10 deletions

View File

@ -446,7 +446,10 @@ void DtmfDialog::PopulateOrExchange( ShuttleGui & S )
mDtmfStringT = S.Id(ID_DTMF_STRING_TEXT).AddTextBox(_("DTMF sequence:"), wxT(""), 10);
mDtmfStringT->SetValidator(vldDtmf);
S.TieTextBox(_("Amplitude (0-1)"), dAmplitude, 10);
// The added colon to improve visual consistency was placed outside
// the translatable strings to avoid breaking translations close to 2.0.
// TODO: Make colon part of the translatable string after 2.0.
S.TieTextBox(_("Amplitude (0-1)") + wxString(wxT(":")), dAmplitude, 10);
S.AddPrompt(_("Duration:"));
if (mDtmfDurationT == NULL)

View File

@ -192,9 +192,12 @@ void NoiseDialog::PopulateOrExchange( ShuttleGui & S )
{
S.StartMultiColumn(2, wxCENTER);
{
S.TieChoice(_("Noise type"), nType, nTypeList);
S.TieTextBox(_("Amplitude (0-1)"), nAmplitude, 10);
S.AddPrompt(_("Duration"));
// The added colon to improve visual consistency was placed outside
// the translatable strings to avoid breaking translations close to 2.0.
// TODO: Make colon part of the translatable string after 2.0.
S.TieChoice(_("Noise type") + wxString(wxT(":")), nType, nTypeList);
S.TieTextBox(_("Amplitude (0-1)") + wxString(wxT(":")), nAmplitude, 10);
S.AddPrompt(_("Duration") + wxString(wxT(":")));
if (mNoiseDurationT == NULL)
{
mNoiseDurationT = new

View File

@ -274,9 +274,13 @@ void ToneGenDialog::PopulateOrExchangeStandard( ShuttleGui & S )
{
S.TieChoice(_("Waveform") + wxString(wxT(":")), waveform, waveforms);
S.SetSizeHints(-1, -1);
S.TieTextBox(_("Frequency (Hz)"),frequency[0], 5);
S.TieTextBox(_("Amplitude (0-1)"),amplitude[0], 5);
S.AddFixedText(_("Duration"), false);
// The added colon to improve visual consistency was placed outside
// the translatable strings to avoid breaking translations close to 2.0.
// TODO: Make colon part of the translatable string after 2.0.
S.TieTextBox(_("Frequency (Hz)") + wxString(wxT(":")), frequency[0], 5);
S.TieTextBox(_("Amplitude (0-1)") + wxString(wxT(":")), amplitude[0], 5);
S.AddPrompt(_("Duration") + wxString(wxT(":")));
if (mToneDurationT == NULL)
{
mToneDurationT = new
@ -311,16 +315,20 @@ void ToneGenDialog::PopulateOrExchangeExtended( ShuttleGui & S )
S.AddFixedText(wxT(""));
S.AddTitle(_("Start"));
S.AddTitle(_("End"));
S.TieTextBox(_("Frequency (Hz)"),frequency[0], 10)->SetName(_("Frequency Hertz Start"));
// The added colon to improve visual consistency was placed outside
// the translatable strings to avoid breaking translations close to 2.0.
// TODO: Make colon part of the translatable string after 2.0.
S.TieTextBox(_("Frequency (Hz)") + wxString(wxT(":")), frequency[0], 10)->SetName(_("Frequency Hertz Start"));
S.TieTextBox(wxT(""), frequency[1], 10)->SetName(_("Frequency Hertz End"));
S.TieTextBox(_("Amplitude (0-1)"),amplitude[0], 10)->SetName(_("Amplitude Start"));
S.TieTextBox(_("Amplitude (0-1)") + wxString(wxT(":")), amplitude[0], 10)->SetName(_("Amplitude Start"));
S.TieTextBox(wxT(""), amplitude[1], 10)->SetName(_("Amplitude End"));
}
S.EndMultiColumn();
S.StartMultiColumn(2, wxCENTER);
{
S.TieChoice(_("Interpolation:"), interpolation, interpolations);
S.AddFixedText(_("Duration"), false);
S.AddPrompt(_("Duration") + wxString(wxT(":")));
if (mToneDurationT == NULL)
{
mToneDurationT = new