Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-01 16:19:43 +02:00
Code Issues Releases Wiki Activity

David Bailes patch for bug 577

Browse Source
This commit is contained in:
v.audacity 2012-10-13 00:59:14 +00:00
parent a7df83f27d
commit fd17ae3903
10 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/LabelDialog.cpp
View File

@ -106,12 +106,15 @@ LabelDialog::LabelDialog(wxWindow *parent,
wxBoxSizer *vs = new wxBoxSizer(wxVERTICAL);
// A little instruction
vs->Add(new wxStaticText(this,
wxID_ANY,
_("Press F2 or double click to edit cell contents.")),
0,
wxALIGN_LEFT | wxALL,
5);
wxStaticText *instruct =
new wxStaticText(this,
wxID_ANY,
_("Press F2 or double click to edit cell contents.")),
instruct->SetName(instruct->GetLabel()); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
vs->Add(instruct,
0,
wxALIGN_LEFT | wxALL,
5);
// Create the main sizer
mGrid = new Grid(this, wxID_ANY);

6
src/ShuttleGui.cpp
View File

@ -218,6 +218,7 @@ void ShuttleGuiBase::AddPrompt(const wxString &Prompt)
miProp=1;
mpWind = new wxStaticText(mpParent, -1, Prompt, wxDefaultPosition, wxDefaultSize,
Style( wxALIGN_RIGHT ));
mpWind->SetName(wxStripMenuCodes(Prompt)); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
UpdateSizersCore( false, wxALL | wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL );
}
@ -231,6 +232,7 @@ void ShuttleGuiBase::AddUnits(const wxString &Prompt)
miProp=1;
mpWind = new wxStaticText(mpParent, -1, Prompt, wxDefaultPosition, wxDefaultSize,
Style( wxALIGN_LEFT ));
mpWind->SetName(Prompt); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
UpdateSizersCore( false, wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL );
}
@ -243,6 +245,7 @@ void ShuttleGuiBase::AddTitle(const wxString &Prompt)
return;
mpWind = new wxStaticText(mpParent, -1, Prompt, wxDefaultPosition, wxDefaultSize,
Style( wxALIGN_CENTRE ));
mpWind->SetName(Prompt); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
UpdateSizers();
}
@ -354,6 +357,7 @@ void ShuttleGuiBase::AddFixedText(const wxString &Str, bool bCenter)
return;
mpWind = new wxStaticText(mpParent, miId, Str, wxDefaultPosition, wxDefaultSize,
Style( wxALIGN_LEFT ));
mpWind->SetName(wxStripMenuCodes(Str)); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
if( bCenter )
{
miProp=1;
@ -372,6 +376,7 @@ wxStaticText * ShuttleGuiBase::AddVariableText(const wxString &Str, bool bCenter
wxStaticText *pStatic;
mpWind = pStatic = new wxStaticText(mpParent, miId, Str, wxDefaultPosition, wxDefaultSize,
Style( wxALIGN_LEFT ));
mpWind->SetName(wxStripMenuCodes(Str)); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
if( bCenter )
{
miProp=1;
@ -570,6 +575,7 @@ void ShuttleGuiBase::AddConstTextBox(const wxString &Prompt, const wxString &Val
miProp=0;
mpWind = new wxStaticText(mpParent, miId, Value, wxDefaultPosition, wxDefaultSize,
Style( 0 ));
mpWind->SetName(Value); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
UpdateSizers();
}

5
src/effects/Compressor.cpp
View File

@ -723,9 +723,11 @@ bool CompressorDialog::TransferDataFromWindow()
mThresholdLabel->SetName(wxString::Format(_("Threshold %d dB"), (int)threshold));
/* i18n-hint: usually leave this as is as dB doesn't get translated*/
mThresholdText->SetLabel(wxString::Format(_("%3d dB"), (int)threshold));
mThresholdText->SetName(mThresholdText->GetLabel()); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
mNoiseFloorLabel->SetName(wxString::Format(_("Noise Floor %d dB"), (int)noisefloor));
mNoiseFloorText->SetLabel(wxString::Format(_("%3d dB"), (int)noisefloor));
mNoiseFloorText->SetName(mNoiseFloorText->GetLabel()); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
if (mRatioSlider->GetValue()%2 == 0) {
mRatioLabel->SetName(wxString::Format(_("Ratio %.0f to 1"), ratio));
@ -739,12 +741,15 @@ bool CompressorDialog::TransferDataFromWindow()
* like 8:1, leave as is.*/
mRatioText->SetLabel(wxString::Format(_("%.1f:1"), ratio));
}
mRatioText->SetName(mRatioText->GetLabel()); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
mAttackLabel->SetName(wxString::Format(_("Attack Time %.1f secs"), attack));
mAttackText->SetLabel(wxString::Format(_("%.1f secs"), attack));
mAttackText->SetName(mAttackText->GetLabel()); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
mDecayLabel->SetName(wxString::Format(_("Decay Time %.1f secs"), decay));
mDecayText->SetLabel(wxString::Format(_("%.1f secs"), decay));
mDecayText->SetName(mDecayText->GetLabel()); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
mPanel->Refresh(false);

3
src/effects/DtmfGen.cpp
View File

@ -566,8 +566,11 @@ void DtmfDialog::Recalculate(void) {
}
mDtmfDutyT->SetLabel(wxString::Format(wxT("%.1f %%"), (float)dDutyCycle/DUTY_SCALE));
mDtmfDutyT->SetName(mDtmfDutyT->GetLabel()); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
mDtmfSilenceT->SetLabel(wxString::Format(wxString(wxT("%d ")) + _("ms"), (int) (dTone * 1000)));
mDtmfSilenceT->SetName(mDtmfSilenceT->GetLabel()); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
mDtmfToneT->SetLabel(wxString::Format(wxString(wxT("%d ")) + _("ms"), (int) (dSilence * 1000)));
mDtmfToneT->SetName(mDtmfToneT->GetLabel()); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
}
void DtmfDialog::OnDutyCycleSlider(wxCommandEvent & event) {

2
src/effects/Equalization.cpp
View File

@ -1276,6 +1276,7 @@ void EqualizationDialog::MakeEqualizationDialog()
wxString label;
label.Printf( wxT("%d"), M );
mMText = new wxStaticText(this, wxID_ANY, label);
mMText->SetName(label); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
szrH->Add( mMText, 0 );
// Add the length / graphic / draw grouping
@ -1487,6 +1488,7 @@ bool EqualizationDialog::TransferDataFromWindow()
M = m;
mPanel->M = M;
mMText->SetLabel(wxString::Format(wxT("%d"), M));
mMText->SetName(mMText->GetLabel()); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
#if wxUSE_TOOLTIPS
tip.Printf(wxT("%d"), M);
MSlider->SetToolTip(tip);

1
src/effects/Repeat.cpp
View File

@ -278,6 +278,7 @@ void RepeatDialog::DisplayNewTime()
str += tt.GetTimeString();
mTotalTime->SetLabel(str);
mTotalTime->SetName(str); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
}
void RepeatDialog::OnRepeatTextChange(wxCommandEvent & event)

1
src/prefs/DirectoriesPrefs.cpp
View File

@ -182,6 +182,7 @@ void DirectoriesPrefs::UpdateFreeSpace(wxCommandEvent & e)
if( mFreeSpace != NULL ) {
mFreeSpace->SetLabel(label);
mFreeSpace->SetName(label); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
}
}

2
src/prefs/LibraryPrefs.cpp
View File

@ -153,6 +153,7 @@ void LibraryPrefs::PopulateOrExchange(ShuttleGui & S)
void LibraryPrefs::SetMP3VersionText(bool prompt)
{
mMP3Version->SetLabel(GetMP3Version(this, prompt));
mMP3Version->SetName(mMP3Version->GetLabel()); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
}
/// Opens a file-finder dialog so that the user can
@ -173,6 +174,7 @@ void LibraryPrefs::OnMP3DownButton(wxCommandEvent & e)
void LibraryPrefs::SetFFmpegVersionText()
{
mFFmpegVersion->SetLabel(GetFFmpegVersion(this));
mFFmpegVersion->SetName(mFFmpegVersion->GetLabel()); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
}
void LibraryPrefs::OnFFmpegFindButton(wxCommandEvent & e)

1
src/widgets/MultiDialog.cpp
View File

@ -74,6 +74,7 @@ MultiDialog::MultiDialog(wxString message,
iconAndTextSizer->Add( icon, 0, wxCENTER );
wxStaticText *statText = new wxStaticText(this, -1, message);
statText->SetName(message); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
iconAndTextSizer->Add(statText, 1, wxCENTER|wxLEFT,15 );
vSizer->Add(iconAndTextSizer, 0, wxALIGN_LEFT|wxALL, 5);

7
src/widgets/ProgressDialog.cpp
View File

@ -1046,6 +1046,7 @@ ProgressDialog::ProgressDialog(const wxString & title, const wxString & message,
wxDefaultPosition,
wxDefaultSize,
wxALIGN_LEFT);
mMessage->SetName(message); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
v->Add(mMessage, 0, wxEXPAND | wxALL, 10);
ds.y += mMessage->GetSize().y + 20;
@ -1072,6 +1073,7 @@ ProgressDialog::ProgressDialog(const wxString & title, const wxString & message,
wxDefaultPosition,
wxDefaultSize,
wxALIGN_RIGHT);
w->SetName(w->GetLabel()); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
g->Add(w, 0, wxALIGN_RIGHT);
mElapsed = new wxStaticText(this,
@ -1080,6 +1082,7 @@ ProgressDialog::ProgressDialog(const wxString & title, const wxString & message,
wxDefaultPosition,
wxDefaultSize,
wxALIGN_LEFT);
mElapsed->SetName(mElapsed->GetLabel()); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
g->Add(mElapsed, 0, wxALIGN_LEFT);
ds.y += mElapsed->GetSize().y + 10;
@ -1092,6 +1095,7 @@ ProgressDialog::ProgressDialog(const wxString & title, const wxString & message,
wxDefaultPosition,
wxDefaultSize,
wxALIGN_RIGHT);
w->SetName(w->GetLabel()); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
g->Add(w, 0, wxALIGN_RIGHT);
mRemaining = new wxStaticText(this,
@ -1100,6 +1104,7 @@ ProgressDialog::ProgressDialog(const wxString & title, const wxString & message,
wxDefaultPosition,
wxDefaultSize,
wxALIGN_LEFT);
mRemaining->SetName(mRemaining->GetLabel()); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
g->Add(mRemaining, 0, wxALIGN_LEFT);
v->Add(g, 0, wxALIGN_CENTER | wxLEFT | wxRIGHT | wxBOTTOM, 10);
@ -1344,7 +1349,9 @@ ProgressDialog::Update(int value, const wxString & message)
wxTimeSpan tsRemains(0, 0, 0, remains);
mElapsed->SetLabel(tsElapsed.Format(wxT("%H:%M:%S")));
mElapsed->SetName(mElapsed->GetLabel()); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
mRemaining->SetLabel(tsRemains.Format(wxT("%H:%M:%S")));
mRemaining->SetName(mRemaining->GetLabel()); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
mLastUpdate = now;
}