Changes to a number of dialogs so that the NVDA screen reader can read the titles. Missed these in my last patch. The accessibility name of the dialog is set to the title.

This commit is contained in:
David Bailes 2015-05-18 13:57:05 +01:00
parent 19e068f087
commit f458df1c7b
32 changed files with 54 additions and 0 deletions

View File

@ -57,6 +57,7 @@ AutoRecoveryDialog::AutoRecoveryDialog(wxWindow *parent) :
wxDefaultPosition, wxDefaultSize,
wxDEFAULT_DIALOG_STYLE & (~wxCLOSE_BOX)) // no close box
{
SetName(GetTitle());
ShuttleGui S(this, eIsCreating);
PopulateOrExchange(S);
}

View File

@ -152,6 +152,7 @@ void BatchProcessDialog::OnApplyToProject(wxCommandEvent & WXUNUSED(event))
wxString name = mChains->GetItemText(item);
wxDialog d(this, wxID_ANY, GetTitle());
d.SetName(d.GetTitle());
ShuttleGui S(&d, eIsCreating);
S.StartHorizontalLay(wxCENTER, false);
@ -265,6 +266,7 @@ void BatchProcessDialog::OnApplyToFiles(wxCommandEvent & WXUNUSED(event))
files.Sort();
wxDialog d(this, wxID_ANY, GetTitle());
d.SetName(d.GetTitle());
ShuttleGui S(&d, eIsCreating);
S.StartVerticalLay(false);

View File

@ -129,6 +129,8 @@ BenchmarkDialog::BenchmarkDialog(wxWindow *parent):
wxDEFAULT_DIALOG_STYLE |
wxRESIZE_BORDER)
{
SetName(GetTitle());
mBlockSizeStr = wxT("64");
mNumEditsStr = wxT("100");
mDataSizeStr = wxT("32");

View File

@ -316,6 +316,7 @@ DependencyDialog::DependencyDialog(wxWindow *parent,
mCopyAllFilesButton(NULL),
mFutureActionChoice(NULL)
{
SetName(GetTitle());
ShuttleGui S(this, eIsCreating);
PopulateOrExchange(S);
}

View File

@ -450,6 +450,7 @@ public:
FindFFmpegDialog(wxWindow *parent, wxString path, wxString name, wxString type)
: wxDialog(parent, wxID_ANY, wxString(_("Locate FFmpeg")))
{
SetName(GetTitle());
ShuttleGui S(this, eIsCreating);
mPath = path;

View File

@ -177,6 +177,7 @@ public:
FFmpegNotFoundDialog(wxWindow *parent)
: wxDialog(parent, wxID_ANY, wxString(_("FFmpeg not found")))
{
SetName(GetTitle());
ShuttleGui S(this, eIsCreating);
PopulateOrExchange(S);
}

View File

@ -74,6 +74,7 @@ LangChoiceDialog::LangChoiceDialog(wxWindow * parent,
const wxString & title):
wxDialog(parent, id, title)
{
SetName(GetTitle());
GetLanguages(mLangCodes, mLangNames);
int ndx = mLangCodes.Index(GetSystemLanguageCode());
wxString lang;

View File

@ -37,6 +37,7 @@ SoundActivatedRecord::SoundActivatedRecord(wxWindow* parent)
wxDefaultSize, wxCAPTION )
// wxDefaultSize, wxCAPTION | wxTHICK_FRAME)
{
SetName(GetTitle());
ShuttleGui S(this, eIsCreatingFromPrefs);
PopulateOrExchange(S);
Fit();

View File

@ -63,6 +63,7 @@ SplashDialog::SplashDialog(wxWindow * parent)
wxPoint( -1, 60 ), // default x position, y position 60 pixels from top of screen.
wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
{
SetName(GetTitle());
this->SetBackgroundColour(theTheme.Colour( clrAboutBoxBackground ));
m_pIcon = NULL;
m_pLogo = NULL; //v

View File

@ -969,6 +969,7 @@ void TagsEditor::OnEdit(wxCommandEvent & WXUNUSED(event))
wxDialog dlg(this, wxID_ANY, _("Edit Genres"),
wxDefaultPosition, wxDefaultSize,
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER);
dlg.SetName(dlg.GetTitle());
wxTextCtrl *tc;
ShuttleGui S(&dlg, eIsCreating);

View File

@ -42,6 +42,7 @@ TimeDialog::TimeDialog(wxWindow *parent,
mTime(time),
mTimeCtrl(NULL)
{
SetName(GetTitle());
ShuttleGui S(this, eIsCreating);
PopulateOrExchange(S);
}

View File

@ -9101,6 +9101,7 @@ void TrackPanel::OnRateOther(wxCommandEvent &event)
while (true)
{
wxDialog dlg(this, wxID_ANY, wxString(_("Set Rate")));
dlg.SetName(dlg.GetTitle());
ShuttleGui S(&dlg, eIsCreating);
wxString rate;
wxArrayString rates;
@ -9429,6 +9430,7 @@ void TrackPanel::OnSetFont(wxCommandEvent & WXUNUSED(event))
/* i18n-hint: (noun) This is the font for the label track.*/
wxDialog dlg(this, wxID_ANY, wxString(_("Label Track Font")));
dlg.SetName(dlg.GetTitle());
ShuttleGui S(&dlg, eIsCreating);
wxListBox *lb;
wxSpinCtrl *sc;

View File

@ -2046,6 +2046,8 @@ NyquistOutputDialog::NyquistOutputDialog(wxWindow * parent, wxWindowID id,
wxString message)
: wxDialog(parent, id, title)
{
SetName(GetTitle());
wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);
wxBoxSizer *hSizer;
wxButton *button;

View File

@ -1110,6 +1110,8 @@ ExportMixerDialog::ExportMixerDialog( TrackList *tracks, bool selectedOnly,
const wxPoint &position, const wxSize& size, long style ) :
wxDialog( parent, id, title, position, size, style | wxRESIZE_BORDER )
{
SetName(GetTitle());
int numTracks = 0;
TrackListIterator iter( tracks );

View File

@ -65,6 +65,8 @@ ExportCLOptions::ExportCLOptions(wxWindow *parent)
: wxDialog(parent, wxID_ANY,
wxString(_("Specify Command Line Encoder")))
{
SetName(GetTitle());
mHistory.Load(*gPrefs, wxT("/FileFormats/ExternalProgramHistory"));
if (mHistory.GetCount() == 0) {
@ -503,6 +505,7 @@ int ExportCL::Export(AudacityProject *project,
wxDefaultPosition,
wxSize(600, 400),
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER);
dlg.SetName(dlg.GetTitle());
ShuttleGui S(&dlg, eIsCreating);
S.AddTextWindow(cmd + wxT("\n\n") + output);

View File

@ -904,6 +904,7 @@ void ExportFFmpeg::SetMetadata(Tags *tags, const char *name, const wxChar *tag)
int ExportFFmpeg::AskResample(int bitrate, int rate, int lowrate, int highrate, const int *sampRates)
{
wxDialog d(NULL, wxID_ANY, wxString(_("Invalid sample rate")));
d.SetName(d.GetTitle());
wxChoice *choice;
ShuttleGui S(&d, eIsCreating);
wxString text;

View File

@ -152,6 +152,7 @@ ExportFFmpegAC3Options::ExportFFmpegAC3Options(wxWindow *parent)
: wxDialog(parent, wxID_ANY,
wxString(_("Specify AC3 Options")))
{
SetName(GetTitle());
ShuttleGui S(this, eIsCreatingFromPrefs);
for (unsigned int i=0; i < (sizeof(iAC3BitRates)/sizeof(int)); i++)
@ -216,6 +217,7 @@ ExportFFmpegAACOptions::ExportFFmpegAACOptions(wxWindow *parent)
: wxDialog(parent, wxID_ANY,
wxString(_("Specify AAC Options")))
{
SetName(GetTitle());
ShuttleGui S(this, eIsCreatingFromPrefs);
PopulateOrExchange(S);
@ -275,6 +277,7 @@ ExportFFmpegAMRNBOptions::ExportFFmpegAMRNBOptions(wxWindow *parent)
: wxDialog(parent, wxID_ANY,
wxString(_("Specify AMR-NB Options")))
{
SetName(GetTitle());
ShuttleGui S(this, eIsCreatingFromPrefs);
for (unsigned int i=0; i < (sizeof(iAMRNBBitRate)/sizeof(int)); i++)
@ -347,6 +350,7 @@ ExportFFmpegWMAOptions::ExportFFmpegWMAOptions(wxWindow *parent)
: wxDialog(parent, wxID_ANY,
wxString(_("Specify WMA Options")))
{
SetName(GetTitle());
ShuttleGui S(this, eIsCreatingFromPrefs);
for (unsigned int i=0; i < (sizeof(iWMABitRate)/sizeof(int)); i++)
@ -1211,6 +1215,7 @@ ExportFFmpegOptions::ExportFFmpegOptions(wxWindow *parent)
: wxDialog(parent, wxID_ANY,
wxString(_("Specify Other Options")))
{
SetName(GetTitle());
ShuttleGui S(this, eIsCreatingFromPrefs);
PickFFmpegLibs();
//FFmpegLibsInst->LoadLibs(NULL,true); //Loaded at startup or from Prefs now

View File

@ -67,6 +67,7 @@ ExportFLACOptions::ExportFLACOptions(wxWindow *parent)
: wxDialog(parent, wxID_ANY,
wxString(_("Specify FLAC Options")))
{
SetName(GetTitle());
ShuttleGui S(this, eIsCreatingFromPrefs);
PopulateOrExchange(S);

View File

@ -108,6 +108,7 @@ ExportMP2Options::ExportMP2Options(wxWindow *parent)
: wxDialog(parent, wxID_ANY,
wxString(_("Specify MP2 Options")))
{
SetName(GetTitle());
ShuttleGui S(this, eIsCreatingFromPrefs);
for (unsigned int i=0; i < (sizeof(iBitrates)/sizeof(int)); i++)

View File

@ -309,6 +309,8 @@ ExportMP3Options::ExportMP3Options(wxWindow *parent)
: wxDialog(parent, wxID_ANY,
wxString(_("Specify MP3 Options")))
{
SetName(GetTitle());
InitMP3_Statics();
mSetRate = gPrefs->Read(wxT("/FileFormats/MP3SetRate"), PRESET_STANDARD);
@ -563,6 +565,7 @@ public:
/* i18n-hint: LAME is the name of an MP3 converter and should not be translated*/
wxString(_("Locate Lame")))
{
SetName(GetTitle());
ShuttleGui S(this, eIsCreating);
mPath = path;
@ -1878,6 +1881,7 @@ wxString ExportMP3::FindName(CHOICES *choices, int cnt, int needle)
int ExportMP3::AskResample(int bitrate, int rate, int lowrate, int highrate)
{
wxDialog d(NULL, wxID_ANY, wxString(_("Invalid sample rate")));
d.SetName(d.GetTitle());
wxChoice *choice;
ShuttleGui S(&d, eIsCreating);
wxString text;

View File

@ -104,6 +104,8 @@ END_EVENT_TABLE()
ExportMultiple::ExportMultiple(AudacityProject *project)
: wxDialog(project, wxID_ANY, wxString(_("Export Multiple")))
{
SetName(GetTitle());
mProject = project;
mTracks = project->GetTracks();
mPlugins = mExporter.GetPlugins();

View File

@ -64,6 +64,7 @@ ExportOGGOptions::ExportOGGOptions(wxWindow *parent, int WXUNUSED(format))
: wxDialog(parent, wxID_ANY,
wxString(_("Specify Ogg Vorbis Options")))
{
SetName(GetTitle());
ShuttleGui S(this, eIsCreatingFromPrefs);
mOggQualityUnscaled = gPrefs->Read(wxT("/FileFormats/OggExportQuality"),50)/10;

View File

@ -129,6 +129,8 @@ ExportPCMOptions::ExportPCMOptions(wxWindow * WXUNUSED(parent), int selformat)
: wxDialog(NULL, wxID_ANY,
wxString(_("Specify Uncompressed Options")))
{
SetName(GetTitle());
mOk = NULL;
int format = 0;

View File

@ -747,6 +747,8 @@ ImportStreamDialog::ImportStreamDialog( ImportFileHandle *_mFile, wxWindow *pare
const wxPoint &position, const wxSize& size, long style ):
wxDialog( parent, id, title, position, size, style | wxRESIZE_BORDER )
{
SetName(GetTitle());
mFile = _mFile;
scount = mFile->GetStreamCount();
for (wxInt32 i = 0; i < scount; i++)

View File

@ -311,6 +311,8 @@ ImportRawDialog::ImportRawDialog(wxWindow * parent,
mOffset(offset),
mRate(rate)
{
SetName(GetTitle());
ShuttleGui S(this, eIsCreating);
wxArrayString encodings;
wxArrayString endians;

View File

@ -793,6 +793,7 @@ void DeviceToolBar::ShowComboDialog(wxChoice *combo, const wxString &title)
wxArrayString inputSources = combo->GetStrings();
wxDialog dlg(NULL, wxID_ANY, title);
dlg.SetName(dlg.GetTitle());
ShuttleGui S(&dlg, eIsCreating);
wxChoice *c;

View File

@ -245,6 +245,7 @@ SliderDialog::SliderDialog(wxWindow * parent, wxWindowID id,
wxDialog(parent,id,title,position),
mStyle(style)
{
SetName(GetTitle());
ShuttleGui S(this, eIsCreating);
S.StartVerticalLay();

View File

@ -80,6 +80,8 @@ ErrorDialog::ErrorDialog(
const bool Close, const bool modal):
wxDialog(parent, (wxWindowID)-1, dlogTitle)
{
SetName(GetTitle());
long buttonMask;
// only add the help button if we have a URL

View File

@ -61,6 +61,7 @@ void HelpSystem::ShowInfoDialog( wxWindow *parent,
wxDefaultPosition, wxDefaultSize,
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxMAXIMIZE_BOX /*| wxDEFAULT_FRAME_STYLE */);
dlog.SetName(dlog.GetTitle());
ShuttleGui S(&dlog, eIsCreating);
S.StartVerticalLay(1);
@ -115,6 +116,7 @@ void HelpSystem::ShowHtmlText(wxWindow *pParent,
#endif
wxDEFAULT_FRAME_STYLE);
pWnd->SetName(pWnd->GetTitle());
ShuttleGui S( pWnd, eIsCreating );
S.SetStyle( wxNO_BORDER | wxTAB_TRAVERSAL );

View File

@ -1966,6 +1966,7 @@ void Meter::OnPreferences(wxCommandEvent & WXUNUSED(event))
// This determines where it pops up.
wxDialog dlg(GetActiveProject(), wxID_ANY, title);
dlg.SetName(dlg.GetTitle());
ShuttleGui S(&dlg, eIsCreating);
S.StartVerticalLay();
{

View File

@ -66,6 +66,8 @@ MultiDialog::MultiDialog(wxWindow * pParent,
wxDefaultPosition, wxDefaultSize,
wxCAPTION) // not wxDEFAULT_DIALOG_STYLE because we don't want wxCLOSE_BOX and wxSYSTEM_MENU
{
SetName(GetTitle());
wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);
wxBoxSizer *vSizer = new wxBoxSizer(wxVERTICAL);
wxBoxSizer *iconAndTextSizer = new wxBoxSizer( wxHORIZONTAL );

View File

@ -1009,6 +1009,8 @@ ProgressDialog::ProgressDialog(const wxString & title, const wxString & message,
mLastValue(0),
mDisable(NULL)
{
SetName(GetTitle());
wxBoxSizer *v;
wxWindow *w;
wxSize ds;