*** empty log message ***

svn path=/trunk/boinc/; revision=4464
This commit is contained in:
Rom Walton 2004-10-31 22:41:15 +00:00
parent 45d042ce39
commit 860f9e8712
2 changed files with 18 additions and 5 deletions

View File

@ -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;
}

View File

@ -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;
}