From 5a4ee76c46d7b6630d0c686feff10e399e5b1601 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Tue, 16 Sep 2008 23:50:34 +0000 Subject: [PATCH] MGR: Do not force focus changes because t interferes with disability access (reverse changes of 9/12, 9/13) svn path=/trunk/boinc/; revision=16006 --- checkin_notes | 11 +++++++++++ clientgui/BOINCBaseView.cpp | 4 ---- clientgui/ViewMessages.cpp | 6 ------ clientgui/ViewProjects.cpp | 20 ++------------------ clientgui/ViewTransfers.cpp | 4 ---- clientgui/ViewWork.cpp | 7 ------- 6 files changed, 13 insertions(+), 39 deletions(-) diff --git a/checkin_notes b/checkin_notes index 63f4c390d2..862239b5cc 100644 --- a/checkin_notes +++ b/checkin_notes @@ -7474,3 +7474,14 @@ David 16 Sept 2008 sched/ census.C hr_info.C + +Charlie 16 Sep 2008 + MGR: Reverse change of 9/12, 9/13: do not force focus changes because + it interferes with disability access via alternate input devices. + + clientgui/ + BOINCBaseView.cpp + ViewMessages.cpp + ViewProjects.cpp + ViewTransfers.cpp + ViewWork.cpp diff --git a/clientgui/BOINCBaseView.cpp b/clientgui/BOINCBaseView.cpp index 431f1e0534..6f16fb6b68 100644 --- a/clientgui/BOINCBaseView.cpp +++ b/clientgui/BOINCBaseView.cpp @@ -316,10 +316,6 @@ void CBOINCBaseView::OnListRender(wxTimerEvent& event) { RestoreSelections(); UpdateSelection(); - if (wxGetApp().IsActive()) { - m_pListPane->SetFocus(); // Keep selections highlighted properly on Windows - } - m_bProcessingListRenderEvent = false; } diff --git a/clientgui/ViewMessages.cpp b/clientgui/ViewMessages.cpp index 2e1e612529..17f0771350 100644 --- a/clientgui/ViewMessages.cpp +++ b/clientgui/ViewMessages.cpp @@ -179,8 +179,6 @@ void CViewMessages::OnMessagesCopyAll( wxCommandEvent& WXUNUSED(event) ) { wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); wxASSERT(m_pListPane); - m_pListPane->SetFocus(); // Keep selections highlighted properly on Windows - #ifdef wxUSE_CLIPBOARD wxInt32 iIndex = -1; @@ -213,8 +211,6 @@ void CViewMessages::OnMessagesCopySelected( wxCommandEvent& WXUNUSED(event) ) { wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); wxASSERT(m_pListPane); - m_pListPane->SetFocus(); // Keep selections highlighted properly on Windows - #ifdef wxUSE_CLIPBOARD wxInt32 iIndex = -1; @@ -253,8 +249,6 @@ void CViewMessages::OnMessagesFilter( wxCommandEvent& WXUNUSED(event) ) { wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); wxASSERT(m_pListPane); - m_pListPane->SetFocus(); // Keep selections highlighted properly on Windows - m_iFilteredIndexes.Clear(); m_strFilteredProjectName.clear(); diff --git a/clientgui/ViewProjects.cpp b/clientgui/ViewProjects.cpp index c6c9c1c9a6..a9ff077c20 100644 --- a/clientgui/ViewProjects.cpp +++ b/clientgui/ViewProjects.cpp @@ -273,8 +273,6 @@ void CViewProjects::OnProjectUpdate( wxCommandEvent& WXUNUSED(event) ) { wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); wxASSERT(m_pListPane); - m_pListPane->SetFocus(); // Keep selections highlighted properly on Windows - pFrame->UpdateStatusText(_("Updating project...")); row = -1; while (1) { @@ -308,8 +306,6 @@ void CViewProjects::OnProjectSuspend( wxCommandEvent& WXUNUSED(event) ) { wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); wxASSERT(m_pListPane); - m_pListPane->SetFocus(); // Keep selections highlighted properly on Windows - row = -1; while (1) { // Step through all selected items @@ -351,8 +347,6 @@ void CViewProjects::OnProjectNoNewWork( wxCommandEvent& WXUNUSED(event) ) { wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); wxASSERT(m_pListPane); - m_pListPane->SetFocus(); // Keep selections highlighted properly on Windows - row = -1; while (1) { // Step through all selected items @@ -399,8 +393,6 @@ void CViewProjects::OnProjectReset( wxCommandEvent& WXUNUSED(event) ) { wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); wxASSERT(m_pListPane); - m_pListPane->SetFocus(); // Keep selections highlighted properly on Windows - if (!pDoc->IsUserAuthorized()) return; @@ -457,8 +449,6 @@ void CViewProjects::OnProjectDetach( wxCommandEvent& WXUNUSED(event) ) { wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); wxASSERT(m_pListPane); - m_pListPane->SetFocus(); // Keep selections highlighted properly on Windows - if (!pDoc->IsUserAuthorized()) return; @@ -500,12 +490,10 @@ void CViewProjects::OnProjectDetach( wxCommandEvent& WXUNUSED(event) ) { void CViewProjects::OnShowItemProperties( wxCommandEvent& WXUNUSED(event) ) { - long item = m_pListPane->GetFirstSelected(); - PROJECT* project = wxGetApp().GetDocument()->project(m_iSortedIndexes[item]); - wxASSERT(m_pListPane); - m_pListPane->SetFocus(); // Keep selections highlighted properly on Windows + long item = m_pListPane->GetFirstSelected(); + PROJECT* project = wxGetApp().GetDocument()->project(m_iSortedIndexes[item]); if(!project) return; //displaying the infos on a dialog @@ -522,10 +510,6 @@ void CViewProjects::OnProjectWebsiteClicked( wxEvent& event ) { wxASSERT(pFrame); wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); - wxASSERT(m_pListPane); - - m_pListPane->SetFocus(); // Keep selections highlighted properly on Windows - pFrame->UpdateStatusText(_("Launching browser...")); int website_task_index = event.GetId() - ID_TASK_PROJECT_WEB_PROJDEF_MIN; diff --git a/clientgui/ViewTransfers.cpp b/clientgui/ViewTransfers.cpp index 51e550ddc7..8148f8383f 100644 --- a/clientgui/ViewTransfers.cpp +++ b/clientgui/ViewTransfers.cpp @@ -244,8 +244,6 @@ void CViewTransfers::OnTransfersRetryNow( wxCommandEvent& WXUNUSED(event) ) { wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); wxASSERT(m_pListPane); - m_pListPane->SetFocus(); // Keep selections highlighted properly on Windows - pFrame->UpdateStatusText(_("Retrying transfer now...")); row = -1; while (1) { @@ -281,8 +279,6 @@ void CViewTransfers::OnTransfersAbort( wxCommandEvent& WXUNUSED(event) ) { wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); wxASSERT(m_pListPane); - m_pListPane->SetFocus(); // Keep selections highlighted properly on Windows - if (!pDoc->IsUserAuthorized()) return; diff --git a/clientgui/ViewWork.cpp b/clientgui/ViewWork.cpp index d523f8a8ba..551de3c414 100644 --- a/clientgui/ViewWork.cpp +++ b/clientgui/ViewWork.cpp @@ -279,7 +279,6 @@ void CViewWork::OnWorkSuspend( wxCommandEvent& WXUNUSED(event) ) { wxASSERT(m_pTaskPane); wxASSERT(m_pListPane); - m_pListPane->SetFocus(); // Keep selections highlighted properly on Windows row = -1; while (1) { // Step through all selected items @@ -320,7 +319,6 @@ void CViewWork::OnWorkShowGraphics( wxCommandEvent& WXUNUSED(event) ) { wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); wxASSERT(m_pListPane); - m_pListPane->SetFocus(); // Keep selections highlighted properly on Windows pFrame->UpdateStatusText(_("Showing graphics for task...")); // We don't change "Show Graphics" button to "Hide Graphics" because Mac allows user to bring @@ -381,8 +379,6 @@ void CViewWork::OnWorkAbort( wxCommandEvent& WXUNUSED(event) ) { wxASSERT(m_pTaskPane); wxASSERT(m_pListPane); - m_pListPane->SetFocus(); // Keep selections highlighted properly on Windows - if (!pDoc->IsUserAuthorized()) return; pFrame->UpdateStatusText(_("Aborting result...")); @@ -430,8 +426,6 @@ void CViewWork::OnWorkAbort( wxCommandEvent& WXUNUSED(event) ) { void CViewWork::OnShowItemProperties( wxCommandEvent& WXUNUSED(event) ) { wxASSERT(m_pListPane); - m_pListPane->SetFocus(); // Keep selections highlighted properly on Windows - long item = m_pListPane->GetFirstSelected(); RESULT* result = wxGetApp().GetDocument()->result(m_iSortedIndexes[item]); @@ -453,7 +447,6 @@ void CViewWork::OnProjectWebsiteClicked( wxEvent& event ) { wxASSERT(m_pTaskPane); wxASSERT(m_pListPane); - m_pListPane->SetFocus(); // Keep selections highlighted properly on Windows pFrame->UpdateStatusText(_("Launching browser...")); int website_task_index = event.GetId() - ID_TASK_PROJECT_WEB_PROJDEF_MIN;