From 860f9e8712692b0d860ee037bf886daf3f6b6000 Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Sun, 31 Oct 2004 22:41:15 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=4464 --- clientgui/ViewTransfers.cpp | 12 ++++++++++-- clientgui/ViewWork.cpp | 11 ++++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/clientgui/ViewTransfers.cpp b/clientgui/ViewTransfers.cpp index 635022f8c9..0e0dd47efe 100644 --- a/clientgui/ViewTransfers.cpp +++ b/clientgui/ViewTransfers.cpp @@ -508,9 +508,10 @@ wxInt32 CViewTransfers::FormatSpeed( wxInt32 item, wxString& strBuffer ) const wxInt32 CViewTransfers::FormatStatus( wxInt32 item, wxString& strBuffer ) const { - int iTime = 0; - int iStatus = 0; + wxInt32 iTime = 0; + wxInt32 iStatus = 0; CMainDocument* pDoc = wxGetApp().GetDocument(); + wxInt32 iActivityMode = -1; wxASSERT(NULL != pDoc); wxASSERT(wxDynamicCast(pDoc, CMainDocument)); @@ -541,6 +542,13 @@ wxInt32 CViewTransfers::FormatStatus( wxInt32 item, wxString& strBuffer ) const strBuffer = pDoc->IsTransferGeneratedLocally( item )? _("Uploading") : _("Downloading"); } + pDoc->GetActivityRunMode( iActivityMode ); + if ( CMainDocument::MODE_NEVER == iActivityMode ) + { + strBuffer = wxT(" ( ") + strBuffer + wxT(" ) "); + strBuffer = _("Suspended") + strBuffer; + } + return 0; } diff --git a/clientgui/ViewWork.cpp b/clientgui/ViewWork.cpp index 5ea59bfc45..8700832491 100644 --- a/clientgui/ViewWork.cpp +++ b/clientgui/ViewWork.cpp @@ -569,6 +569,7 @@ wxInt32 CViewWork::FormatReportDeadline( wxInt32 item, wxString& strBuffer ) con wxInt32 CViewWork::FormatStatus( wxInt32 item, wxString& strBuffer ) const { CMainDocument* pDoc = wxGetApp().GetDocument(); + wxInt32 iActivityMode = -1; wxASSERT(NULL != pDoc); wxASSERT(wxDynamicCast(pDoc, CMainDocument)); @@ -647,9 +648,13 @@ wxInt32 CViewWork::FormatStatus( wxInt32 item, wxString& strBuffer ) const } break; } - //if (gstate.activities_suspended) { - // strBuf = CString(g_szMiscItems[13]) + " (" + strBuf + ")"; - //} + + pDoc->GetActivityRunMode( iActivityMode ); + if ( CMainDocument::MODE_NEVER == iActivityMode ) + { + strBuffer = wxT(" ( ") + strBuffer + wxT(" ) "); + strBuffer = _("Suspended") + strBuffer; + } return 0; }