Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-02 08:59:28 +02:00
Code Issues Releases Wiki Activity

AUP3: Accessibility fixes in Auto Recovery dialog

Browse Source
This commit is contained in:
Leland Lucius 2020-08-04 09:49:36 -05:00
parent 06877a7742
commit 0ff51ffcee
1 changed files with 61 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/AutoRecoveryDialog.cpp
View File

@ -51,6 +51,8 @@ private:
void OnSkip(wxCommandEvent &evt); void OnSkip(wxCommandEvent &evt);
void OnColumnClicked(wxListEvent &evt); void OnColumnClicked(wxListEvent &evt);
void OnItemActivated(wxListEvent &evt); void OnItemActivated(wxListEvent &evt);
void OnListKeyDown(wxKeyEvent &evt);
void OnKeyDown(wxKeyEvent &evt);
FilePaths mFiles; FilePaths mFiles;
wxListCtrl *mFileList; wxListCtrl *mFileList;
@ -95,13 +97,18 @@ void AutoRecoveryDialog::PopulateOrExchange(ShuttleGui &S)
S.SetBorder(5); S.SetBorder(5);
S.StartVerticalLay(wxEXPAND, 1); S.StartVerticalLay(wxEXPAND, 1);
{ {
S.AddVariableText( S.AddFixedText(
XO("Some projects were not saved properly the last time Audacity was run.\nFortunately, the following projects can be automatically recovered:"), XO("The following projects were not saved properly the last time Audacity was run and "
false); "can be automatically recovered.\n\n"
"After recovery, save the projects to ensure changes are written to disk."),
false,
500);
S.StartStatic(XO("Recoverable projects"), 1); S.StartStatic(XO("Recoverable &projects"), 1);
{ {
mFileList = S.Id(ID_FILE_LIST).AddListControlReportMode( mFileList = S.Id(ID_FILE_LIST)
.ConnectRoot(wxEVT_KEY_DOWN, &AutoRecoveryDialog::OnListKeyDown)
.AddListControlReportMode(
{ {
/*i18n-hint: (verb). It instruct the user to select items.*/ /*i18n-hint: (verb). It instruct the user to select items.*/
XO("Select"), XO("Select"),
@ -113,16 +120,12 @@ void AutoRecoveryDialog::PopulateOrExchange(ShuttleGui &S)
} }
S.EndStatic(); S.EndStatic();
S.AddVariableText(
XO("After recovery, save the project to save the changes to disk."),
false);
S.StartHorizontalLay(wxALIGN_CENTRE, 0); S.StartHorizontalLay(wxALIGN_CENTRE, 0);
{ {
S.Id(ID_QUIT_AUDACITY).AddButton(XXO("Quit Audacity")); S.Id(ID_QUIT_AUDACITY).AddButton(XXO("&Quit Audacity"));
S.Id(ID_DISCARD_SELECTED).AddButton(XXO("Discard Selected")); S.Id(ID_DISCARD_SELECTED).AddButton(XXO("&Discard Selected"));
S.Id(ID_RECOVER_SELECTED).AddButton(XXO("Recover Selected")); S.Id(ID_RECOVER_SELECTED).AddButton(XXO("&Recover Selected"));
S.Id(ID_SKIP).AddButton(XXO("Skip")); S.Id(ID_SKIP).AddButton(XXO("&Skip"));
} }
S.EndHorizontalLay(); S.EndHorizontalLay();
} }
@ -186,6 +189,14 @@ void AutoRecoveryDialog::PopulateList()
mFileList->SetMinSize(mFileList->GetBestSize()); mFileList->SetMinSize(mFileList->GetBestSize());
mFileList->SetColumnWidth(0, wxLIST_AUTOSIZE_USEHEADER); mFileList->SetColumnWidth(0, wxLIST_AUTOSIZE_USEHEADER);
mFileList->SetColumnWidth(1, 500); mFileList->SetColumnWidth(1, 500);
if (item)
{
mFileList->SetItemState(0,
wxLIST_STATE_FOCUSED | wxLIST_STATE_SELECTED,
wxLIST_STATE_FOCUSED | wxLIST_STATE_SELECTED);
}
} }
bool AutoRecoveryDialog::HaveChecked() bool AutoRecoveryDialog::HaveChecked()
@ -354,6 +365,43 @@ void AutoRecoveryDialog::OnItemActivated(wxListEvent &evt)
mFileList->CheckItem(item, !mFileList->IsItemChecked(item)); mFileList->CheckItem(item, !mFileList->IsItemChecked(item));
} }
void AutoRecoveryDialog::OnListKeyDown(wxKeyEvent &evt)
{
switch (evt.GetKeyCode())
{
case WXK_SPACE:
{
bool selected = false;
long item = -1;
while (true)
{
item = mFileList->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
if (item == wxNOT_FOUND)
{
break;
}
mFileList->CheckItem(item, !mFileList->IsItemChecked(item));
}
}
break;
case WXK_ESCAPE:
EndModal(ID_SKIP);
break;
case WXK_RETURN:
// Don't know why wxListCtrls prevent default dialog action,
// but they do, so handle it.
EmulateButtonClickIfPresent(GetAffirmativeId());
break;
default:
evt.Skip();
break;
}
}
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
static bool RecoverAllProjects(const FilePaths &files, static bool RecoverAllProjects(const FilePaths &files,