diff --git a/clientgui/AdvancedFrame.cpp b/clientgui/AdvancedFrame.cpp index e9b08e8..5c41497 100644 --- a/clientgui/AdvancedFrame.cpp +++ b/clientgui/AdvancedFrame.cpp @@ -199,7 +199,6 @@ BEGIN_EVENT_TABLE (CAdvancedFrame, CBOINCBaseFrame) // Custom Events & Timers EVT_FRAME_CONNECT(CAdvancedFrame::OnConnect) EVT_FRAME_NOTIFICATION(CAdvancedFrame::OnNotification) - EVT_FRAME_UPDATESTATUS(CAdvancedFrame::OnUpdateStatus) EVT_TIMER(ID_REFRESHSTATETIMER, CAdvancedFrame::OnRefreshState) EVT_TIMER(ID_FRAMERENDERTIMER, CAdvancedFrame::OnFrameRender) EVT_NOTEBOOK_PAGE_CHANGED(ID_FRAMENOTEBOOK, CAdvancedFrame::OnNotebookSelectionChanged) @@ -1951,16 +1950,6 @@ void CAdvancedFrame::OnNotification(CFrameEvent& WXUNUSED(event)) { } -void CAdvancedFrame::OnUpdateStatus(CFrameEvent& event) { - wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnUpdateStatus - Function Begin")); - - m_pStatusbar->SetStatusText(event.m_message); - ::wxSleep(0); - - wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnUpdateStatus - Function End")); -} - - void CAdvancedFrame::OnRefreshState(wxTimerEvent& WXUNUSED(event)) { wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnRefreshState - Function Begin")); diff --git a/clientgui/AdvancedFrame.h b/clientgui/AdvancedFrame.h index a44bce9..4ddfc60 100644 --- a/clientgui/AdvancedFrame.h +++ b/clientgui/AdvancedFrame.h @@ -98,8 +98,6 @@ public: void OnConnect( CFrameEvent& event ); void OnNotification( CFrameEvent& event ); - void OnUpdateStatus( CFrameEvent& event ); - void ResetReminderTimers(); bool RestoreState(); diff --git a/clientgui/BOINCBaseFrame.h b/clientgui/BOINCBaseFrame.h index 3e226bf..0d4ef92 100644 --- a/clientgui/BOINCBaseFrame.h +++ b/clientgui/BOINCBaseFrame.h @@ -87,8 +87,6 @@ public: virtual void StopTimers(); virtual void UpdateRefreshTimerInterval(); - inline void UpdateStatusText( const wxChar* ){} - void ShowAlert( const wxString title, const wxString message, diff --git a/clientgui/MainDocument.cpp b/clientgui/MainDocument.cpp index 9fa22c4..fa7b953 100644 --- a/clientgui/MainDocument.cpp +++ b/clientgui/MainDocument.cpp @@ -581,7 +581,6 @@ int CMainDocument::OnPoll() { } if (IsComputerNameLocal(hostName)) { - pFrame->UpdateStatusText(_("Starting client")); if (m_pClientManager->StartupBOINCCore()) { Connect(wxT("localhost"), portNum, password, TRUE, TRUE); } else { @@ -589,11 +588,8 @@ int CMainDocument::OnPoll() { pFrame->ShowDaemonStartFailedAlert(); } } else { - pFrame->UpdateStatusText(_("Connecting to client")); Connect(hostName, portNum, password, TRUE, password.IsEmpty()); } - - pFrame->UpdateStatusText(wxEmptyString); } // Check connection state, connect if needed. @@ -1203,7 +1199,6 @@ int CMainDocument::ForceCacheUpdate(bool immediate) { if (IsConnected()) { wxASSERT(wxDynamicCast(pFrame, CBOINCBaseFrame)); - pFrame->UpdateStatusText(_("Retrieving system state; please wait...")); m_dtCachedStateTimestamp = wxDateTime::Now(); m_iGet_state_rpc_result = rpc.get_state(state); @@ -1213,7 +1208,6 @@ int CMainDocument::ForceCacheUpdate(bool immediate) { m_pNetworkConnection->SetStateDisconnected(); } - pFrame->UpdateStatusText(wxEmptyString); } else { retval = -1; } diff --git a/clientgui/ViewProjects.cpp b/clientgui/ViewProjects.cpp index e7be8ba..d63f622 100644 --- a/clientgui/ViewProjects.cpp +++ b/clientgui/ViewProjects.cpp @@ -390,7 +390,6 @@ void CViewProjects::OnProjectUpdate( wxCommandEvent& WXUNUSED(event) ) { wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); wxASSERT(m_pListPane); - pFrame->UpdateStatusText(_("Updating project...")); row = -1; while (1) { // Step through all selected items @@ -399,7 +398,6 @@ void CViewProjects::OnProjectUpdate( wxCommandEvent& WXUNUSED(event) ) { pDoc->ProjectUpdate(m_iSortedIndexes[row]); } - pFrame->UpdateStatusText(wxT("")); m_bForceUpdateSelection = true; UpdateSelection(); @@ -432,13 +430,9 @@ void CViewProjects::OnProjectSuspend( wxCommandEvent& WXUNUSED(event) ) { PROJECT* project = pDoc->project(m_iSortedIndexes[row]); if (project) { if (project->suspended_via_gui) { - pFrame->UpdateStatusText(_("Resuming project...")); pDoc->ProjectResume(m_iSortedIndexes[row]); - pFrame->UpdateStatusText(wxT("")); } else { - pFrame->UpdateStatusText(_("Suspending project...")); pDoc->ProjectSuspend(m_iSortedIndexes[row]); - pFrame->UpdateStatusText(wxT("")); } } } @@ -473,13 +467,9 @@ void CViewProjects::OnProjectNoNewWork( wxCommandEvent& WXUNUSED(event) ) { PROJECT* project = pDoc->project(m_iSortedIndexes[row]); if (project) { if (project->dont_request_more_work) { - pFrame->UpdateStatusText(_("Telling project to allow additional task downloads...")); pDoc->ProjectAllowMoreWork(m_iSortedIndexes[row]); - pFrame->UpdateStatusText(wxT("")); } else { - pFrame->UpdateStatusText(_("Telling project to not fetch any additional tasks...")); pDoc->ProjectNoMoreWork(m_iSortedIndexes[row]); - pFrame->UpdateStatusText(wxT("")); } } } @@ -513,8 +503,6 @@ void CViewProjects::OnProjectReset( wxCommandEvent& WXUNUSED(event) ) { if (!pDoc->IsUserAuthorized()) return; - pFrame->UpdateStatusText(_("Resetting project...")); - row = -1; while (1) { // Step through all selected items @@ -542,8 +530,6 @@ void CViewProjects::OnProjectReset( wxCommandEvent& WXUNUSED(event) ) { } } - pFrame->UpdateStatusText(wxT("")); - m_bForceUpdateSelection = true; UpdateSelection(); pFrame->FireRefreshView(); @@ -571,8 +557,6 @@ void CViewProjects::OnProjectDetach( wxCommandEvent& WXUNUSED(event) ) { if (!pDoc->IsUserAuthorized()) return; - pFrame->UpdateStatusText(_("Removing project...")); - row = -1; while (1) { // Step through all selected items @@ -600,8 +584,6 @@ void CViewProjects::OnProjectDetach( wxCommandEvent& WXUNUSED(event) ) { } } - pFrame->UpdateStatusText(wxT("")); - m_bForceUpdateSelection = true; UpdateSelection(); pFrame->FireRefreshView(); @@ -631,15 +613,12 @@ void CViewProjects::OnProjectWebsiteClicked( wxEvent& event ) { wxASSERT(pFrame); wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); - pFrame->UpdateStatusText(_("Launching browser...")); int website_task_index = event.GetId() - ID_TASK_PROJECT_WEB_PROJDEF_MIN; wxLaunchDefaultBrowser( m_TaskGroups[1]->m_Tasks[website_task_index]->m_strWebSiteLink ); - pFrame->UpdateStatusText(wxT("")); - UpdateSelection(); pFrame->FireRefreshView(); diff --git a/clientgui/ViewStatistics.cpp b/clientgui/ViewStatistics.cpp index 6706d84..83564ce 100644 --- a/clientgui/ViewStatistics.cpp +++ b/clientgui/ViewStatistics.cpp @@ -2074,12 +2074,10 @@ void CViewStatistics::OnStatisticsUserTotal( wxCommandEvent& WXUNUSED(event) ) { wxASSERT(pFrame); wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); - pFrame->UpdateStatusText(_("Updating charts...")); m_PaintStatistics->m_SelectedStatistic = show_user_total; m_PaintStatistics->m_Zoom_Auto = true; m_PaintStatistics->m_GraphMarker1 = false; m_PaintStatistics->m_full_repaint = true; - pFrame->UpdateStatusText(wxT("")); UpdateSelection(); pFrame->FireRefreshView(); @@ -2095,12 +2093,10 @@ void CViewStatistics::OnStatisticsUserAverage( wxCommandEvent& WXUNUSED(event) ) wxASSERT(pFrame); wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); - pFrame->UpdateStatusText(_("Updating charts...")); m_PaintStatistics->m_SelectedStatistic = show_user_average; m_PaintStatistics->m_Zoom_Auto = true; m_PaintStatistics->m_GraphMarker1 = false; m_PaintStatistics->m_full_repaint = true; - pFrame->UpdateStatusText(wxT("")); UpdateSelection(); pFrame->FireRefreshView(); @@ -2116,12 +2112,10 @@ void CViewStatistics::OnStatisticsHostTotal( wxCommandEvent& WXUNUSED(event) ) { wxASSERT(pFrame); wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); - pFrame->UpdateStatusText(_("Updating charts...")); m_PaintStatistics->m_SelectedStatistic = show_host_total; m_PaintStatistics->m_Zoom_Auto = true; m_PaintStatistics->m_GraphMarker1 = false; m_PaintStatistics->m_full_repaint = true; - pFrame->UpdateStatusText(wxT("")); UpdateSelection(); pFrame->FireRefreshView(); @@ -2138,12 +2132,10 @@ void CViewStatistics::OnStatisticsHostAverage( wxCommandEvent& WXUNUSED(event) ) wxASSERT(pFrame); wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); - pFrame->UpdateStatusText(_("Updating charts...")); m_PaintStatistics->m_SelectedStatistic = show_host_average; m_PaintStatistics->m_Zoom_Auto = true; m_PaintStatistics->m_GraphMarker1 = false; m_PaintStatistics->m_full_repaint = true; - pFrame->UpdateStatusText(wxT("")); UpdateSelection(); pFrame->FireRefreshView(); @@ -2159,12 +2151,10 @@ void CViewStatistics::OnStatisticsModeViewAllSeparate( wxCommandEvent& WXUNUSED( wxASSERT(pFrame); wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); - pFrame->UpdateStatusText(_("Updating charts...")); m_PaintStatistics->m_ModeViewStatistic = mode_all_separate; m_PaintStatistics->m_Zoom_Auto = true; m_PaintStatistics->m_GraphMarker1 = false; m_PaintStatistics->m_full_repaint = true; - pFrame->UpdateStatusText(wxT("")); UpdateSelection(); pFrame->FireRefreshView(); @@ -2180,12 +2170,10 @@ void CViewStatistics::OnStatisticsModeViewOneProject( wxCommandEvent& WXUNUSED(e wxASSERT(pFrame); wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); - pFrame->UpdateStatusText(_("Updating charts...")); m_PaintStatistics->m_ModeViewStatistic = mode_one_project; m_PaintStatistics->m_Zoom_Auto = true; m_PaintStatistics->m_GraphMarker1 = false; m_PaintStatistics->m_full_repaint = true; - pFrame->UpdateStatusText(wxT("")); UpdateSelection(); pFrame->FireRefreshView(); @@ -2201,12 +2189,10 @@ void CViewStatistics::OnStatisticsModeViewAllTogether( wxCommandEvent& WXUNUSED( wxASSERT(pFrame); wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); - pFrame->UpdateStatusText(_("Updating charts...")); m_PaintStatistics->m_ModeViewStatistic = mode_all_together; m_PaintStatistics->m_Zoom_Auto = true; m_PaintStatistics->m_GraphMarker1 = false; m_PaintStatistics->m_full_repaint = true; - pFrame->UpdateStatusText(wxT("")); UpdateSelection(); pFrame->FireRefreshView(); @@ -2222,12 +2208,10 @@ void CViewStatistics::OnStatisticsModeViewSum( wxCommandEvent& WXUNUSED(event) ) wxASSERT(pFrame); wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); - pFrame->UpdateStatusText(_("Updating charts...")); m_PaintStatistics->m_ModeViewStatistic = mode_sum; m_PaintStatistics->m_Zoom_Auto = true; m_PaintStatistics->m_GraphMarker1 = false; m_PaintStatistics->m_full_repaint = true; - pFrame->UpdateStatusText(wxT("")); UpdateSelection(); pFrame->FireRefreshView(); @@ -2243,7 +2227,6 @@ void CViewStatistics::OnStatisticsNextProject( wxCommandEvent& WXUNUSED(event) ) wxASSERT(pFrame); wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); - pFrame->UpdateStatusText(_("Updating charts...")); if (m_PaintStatistics->m_ModeViewStatistic == mode_one_project) m_PaintStatistics->m_NextProjectStatistic++; m_PaintStatistics->m_Zoom_Auto = true; m_PaintStatistics->m_GraphMarker1 = false; @@ -2251,7 +2234,6 @@ void CViewStatistics::OnStatisticsNextProject( wxCommandEvent& WXUNUSED(event) ) if (m_PaintStatistics->m_ModeViewStatistic == mode_all_separate) m_PaintStatistics->m_Legend_Shift_Mode2++; if (m_PaintStatistics->m_ModeViewStatistic == mode_all_together) m_PaintStatistics->m_Legend_Shift_Mode2++; if (m_PaintStatistics->m_ModeViewStatistic == mode_sum) m_PaintStatistics->m_Legend_Shift_Mode2++; - pFrame->UpdateStatusText(wxT("")); UpdateSelection(); pFrame->FireRefreshView(); @@ -2267,7 +2249,6 @@ void CViewStatistics::OnStatisticsPrevProject( wxCommandEvent& WXUNUSED(event) ) wxASSERT(pFrame); wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); - pFrame->UpdateStatusText(_("Updating charts...")); if (m_PaintStatistics->m_ModeViewStatistic == mode_one_project) m_PaintStatistics->m_NextProjectStatistic--; m_PaintStatistics->m_Zoom_Auto = true; m_PaintStatistics->m_GraphMarker1 = false; @@ -2275,7 +2256,6 @@ void CViewStatistics::OnStatisticsPrevProject( wxCommandEvent& WXUNUSED(event) ) if (m_PaintStatistics->m_ModeViewStatistic == mode_all_separate) m_PaintStatistics->m_Legend_Shift_Mode2--; if (m_PaintStatistics->m_ModeViewStatistic == mode_all_together) m_PaintStatistics->m_Legend_Shift_Mode2--; if (m_PaintStatistics->m_ModeViewStatistic == mode_sum) m_PaintStatistics->m_Legend_Shift_Mode2--; - pFrame->UpdateStatusText(wxT("")); UpdateSelection(); pFrame->FireRefreshView(); diff --git a/clientgui/ViewTransfers.cpp b/clientgui/ViewTransfers.cpp index cc2c4da..fc54121 100644 --- a/clientgui/ViewTransfers.cpp +++ b/clientgui/ViewTransfers.cpp @@ -381,7 +381,6 @@ void CViewTransfers::OnTransfersRetryNow( wxCommandEvent& WXUNUSED(event) ) { return; } - pFrame->UpdateStatusText(_("Retrying transfer now...")); row = -1; while (1) { // Step through all selected items @@ -390,7 +389,6 @@ void CViewTransfers::OnTransfersRetryNow( wxCommandEvent& WXUNUSED(event) ) { pDoc->TransferRetryNow(m_iSortedIndexes[row]); } - pFrame->UpdateStatusText(wxT("")); UpdateSelection(); pFrame->ResetReminderTimers(); @@ -419,8 +417,6 @@ void CViewTransfers::OnTransfersAbort( wxCommandEvent& WXUNUSED(event) ) { if (!pDoc->IsUserAuthorized()) return; - pFrame->UpdateStatusText(_("Aborting transfer...")); - row = -1; while (1) { // Step through all selected items @@ -448,8 +444,6 @@ void CViewTransfers::OnTransfersAbort( wxCommandEvent& WXUNUSED(event) ) { } } - pFrame->UpdateStatusText(wxT("")); - UpdateSelection(); pFrame->FireRefreshView(); diff --git a/clientgui/ViewWork.cpp b/clientgui/ViewWork.cpp index cdc7147..a48548f 100644 --- a/clientgui/ViewWork.cpp +++ b/clientgui/ViewWork.cpp @@ -451,17 +451,13 @@ void CViewWork::OnWorkSuspend( wxCommandEvent& WXUNUSED(event) ) { RESULT* result = pDoc->result(m_iSortedIndexes[row]); if (result) { if (result->suspended_via_gui) { - pFrame->UpdateStatusText(_("Resuming task...")); pDoc->WorkResume(result->project_url, result->name); } else { - pFrame->UpdateStatusText(_("Suspending task...")); pDoc->WorkSuspend(result->project_url, result->name); } } } - pFrame->UpdateStatusText(wxT("")); - UpdateSelection(); pFrame->FireRefreshView(); @@ -483,8 +479,6 @@ void CViewWork::OnWorkShowGraphics( wxCommandEvent& WXUNUSED(event) ) { wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); wxASSERT(m_pListPane); - pFrame->UpdateStatusText(_("Showing graphics for task...")); - row = -1; while (1) { // Step through all selected items @@ -497,8 +491,6 @@ void CViewWork::OnWorkShowGraphics( wxCommandEvent& WXUNUSED(event) ) { } } - pFrame->UpdateStatusText(wxT("")); - UpdateSelection(); pFrame->FireRefreshView(); @@ -520,8 +512,6 @@ void CViewWork::OnWorkShowVMConsole( wxCommandEvent& WXUNUSED(event) ) { wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); wxASSERT(m_pListPane); - pFrame->UpdateStatusText(_("Showing VM console for task...")); - row = -1; while (1) { // Step through all selected items @@ -534,8 +524,6 @@ void CViewWork::OnWorkShowVMConsole( wxCommandEvent& WXUNUSED(event) ) { } } - pFrame->UpdateStatusText(wxT("")); - UpdateSelection(); pFrame->FireRefreshView(); @@ -593,8 +581,6 @@ void CViewWork::OnWorkAbort( wxCommandEvent& WXUNUSED(event) ) { return; } - pFrame->UpdateStatusText(_("Aborting task...")); - row = -1; while (1) { // Step through all selected items @@ -607,8 +593,6 @@ void CViewWork::OnWorkAbort( wxCommandEvent& WXUNUSED(event) ) { } } - pFrame->UpdateStatusText(wxT("")); - UpdateSelection(); pFrame->FireRefreshView(); @@ -693,15 +677,11 @@ void CViewWork::OnProjectWebsiteClicked( wxEvent& event ) { wxASSERT(m_pTaskPane); wxASSERT(m_pListPane); - pFrame->UpdateStatusText(_("Launching browser...")); - int website_task_index = event.GetId() - ID_TASK_PROJECT_WEB_PROJDEF_MIN; wxLaunchDefaultBrowser( m_TaskGroups[1]->m_Tasks[website_task_index]->m_strWebSiteLink ); - pFrame->UpdateStatusText(wxT("")); - UpdateSelection(); pFrame->FireRefreshView();