1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-26 17:18:41 +02:00

incremental layout updates based on Steve's mock-up

This commit is contained in:
v.audacity 2013-05-13 01:22:14 +00:00
parent 2c827c163e
commit a7d0ddc49a

View File

@ -4,7 +4,7 @@
ChangePitch.cpp ChangePitch.cpp
Vaughan Johnson, Dominic Mazzoni Vaughan Johnson, Dominic Mazzoni, Steve Daulton
Change Pitch effect provides raising or lowering Change Pitch effect provides raising or lowering
the pitch without changing the tempo. the pitch without changing the tempo.
@ -281,39 +281,44 @@ void ChangePitchDialog::PopulateOrExchange(ShuttleGui & S)
S.EndHorizontalLay(); S.EndHorizontalLay();
S.SetBorder(5); S.SetBorder(5);
S.StartMultiColumn(6, wxCENTER); /* i18n-hint: (noun) Musical pitch.*/
S.StartStatic(wxT("Pitch"));
{ {
/* i18n-hint: (noun) Musical pitch.*/ S.StartMultiColumn(6, wxCENTER);
S.AddUnits(_("Pitch:"));
S.StartHorizontalLay(wxALIGN_CENTER_VERTICAL);
{ {
m_pChoice_FromPitch = S.Id(ID_CHOICE_FROMPITCH).AddChoice(_("from"), wxT(""), &pitch); S.StartHorizontalLay(wxALIGN_CENTER_VERTICAL);
m_pChoice_FromPitch->SetName(_("From Pitch")); {
m_pChoice_FromPitch->SetSizeHints(80, -1); m_pChoice_FromPitch = S.Id(ID_CHOICE_FROMPITCH).AddChoice(_("from"), wxT(""), &pitch);
m_pChoice_FromPitch->SetName(_("From Pitch"));
m_pChoice_FromPitch->SetSizeHints(80, -1);
m_pChoice_ToPitch = S.Id(ID_CHOICE_TOPITCH).AddChoice(_("to"), wxT(""), &pitch); m_pChoice_ToPitch = S.Id(ID_CHOICE_TOPITCH).AddChoice(_("to"), wxT(""), &pitch);
m_pChoice_ToPitch->SetName(_("To Pitch")); m_pChoice_ToPitch->SetName(_("To Pitch"));
m_pChoice_ToPitch->SetSizeHints(80, -1); m_pChoice_ToPitch->SetSizeHints(80, -1);
}
S.EndHorizontalLay();
} }
S.EndHorizontalLay(); S.EndMultiColumn();
S.StartMultiColumn(2, wxCENTER);
{
S.AddPrompt(_("Semitones (half-steps):"));
S.StartHorizontalLay(wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, false);
{
m_pTextCtrl_SemitonesChange = S.Id(ID_TEXT_SEMITONESCHANGE)
.AddTextBox(wxT(""), wxT(""), 12);
m_pTextCtrl_SemitonesChange->SetName(_("Semitones in half-steps"));
m_pTextCtrl_SemitonesChange->SetValidator(numvld);
}
S.EndHorizontalLay();
}
S.EndMultiColumn();
} }
S.EndMultiColumn(); S.EndStatic();
S.StartMultiColumn(2, wxCENTER); S.StartStatic(wxT("Frequency (Hz)"));
{ {
S.AddPrompt(_("Semitones (half-steps):")); S.StartHorizontalLay(wxCENTER, false);
S.StartHorizontalLay(wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, false);
{
m_pTextCtrl_SemitonesChange = S.Id(ID_TEXT_SEMITONESCHANGE)
.AddTextBox(wxT(""), wxT(""), 12);
m_pTextCtrl_SemitonesChange->SetName(_("Semitones in half-steps"));
m_pTextCtrl_SemitonesChange->SetValidator(numvld);
}
S.EndHorizontalLay();
S.AddPrompt(_("Frequency (Hz):"));
S.StartHorizontalLay(wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, false);
{ {
m_pTextCtrl_FromFrequency = S.Id(ID_TEXT_FROMFREQUENCY) m_pTextCtrl_FromFrequency = S.Id(ID_TEXT_FROMFREQUENCY)
.AddTextBox(_("from"), wxT(""), 12); .AddTextBox(_("from"), wxT(""), 12);
@ -327,28 +332,23 @@ void ChangePitchDialog::PopulateOrExchange(ShuttleGui & S)
} }
S.EndHorizontalLay(); S.EndHorizontalLay();
S.AddPrompt(_("Percent Change:")); S.StartHorizontalLay(wxCENTER, false);
S.StartHorizontalLay(wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, false);
{ {
m_pTextCtrl_PercentChange = S.Id(ID_TEXT_PERCENTCHANGE) m_pTextCtrl_PercentChange = S.Id(ID_TEXT_PERCENTCHANGE).AddTextBox(wxT("Percent Change:"), wxT(""), 12);
.AddTextBox(wxT(""), wxT(""), 12);
m_pTextCtrl_PercentChange->SetName(_("Percent Change"));
m_pTextCtrl_PercentChange->SetValidator(numvld); m_pTextCtrl_PercentChange->SetValidator(numvld);
} }
S.EndHorizontalLay(); S.EndHorizontalLay();
}
S.EndMultiColumn();
S.StartHorizontalLay(wxEXPAND); S.StartHorizontalLay(wxEXPAND);
{ {
S.SetStyle(wxSL_HORIZONTAL); S.SetStyle(wxSL_HORIZONTAL);
m_pSlider_PercentChange = S.Id(ID_SLIDER_PERCENTCHANGE) m_pSlider_PercentChange = S.Id(ID_SLIDER_PERCENTCHANGE)
.AddSlider(wxT(""), 0, (int)PERCENTCHANGE_MAX, (int)PERCENTCHANGE_MIN); .AddSlider(wxT(""), 0, (int)PERCENTCHANGE_MAX, (int)PERCENTCHANGE_MIN);
m_pSlider_PercentChange->SetName(_("Percent Change")); m_pSlider_PercentChange->SetName(_("Percent Change"));
}
S.EndHorizontalLay();
} }
S.EndHorizontalLay(); S.EndStatic();
return;
} }
bool ChangePitchDialog::TransferDataToWindow() bool ChangePitchDialog::TransferDataToWindow()