Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

- manager: if user clicks Retry in Transfer tab while network is suspended, 

show an alert.
	- manager: in transfers tab, show it if transfers are suspended
		because network is suspended
	- manager: in tasks tab, if a task is downloading or uploading
		and network is suspended, show it

svn path=/trunk/boinc/; revision=21346
This commit is contained in:
David Anderson 2010-05-01 05:28:59 +00:00
parent 79e3c6c5be
commit e53fdf854b
4 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
checkin_notes
View File

@ -3295,3 +3295,17 @@ Charlie 30 Apr 2010
logic which as lost in code cleanup of 26 Apr 2010.
cs_prefs.pp
David 30 Apr 2010
- manager: if user clicks Retry in Transfer tab while network is suspended,
show an alert.
- manager: in transfers tab, show it if transfers are suspended
because network is suspended
- manager: in tasks tab, if a task is downloading or uploading
and network is suspended, show it
client/
work_fetch.cpp
clientgui/
ViewTransfers.cpp
ViewWork.cpp

7
client/work_fetch.cpp
View File

@ -941,13 +941,6 @@ void WORK_FETCH::compute_shares() {
if (!p->pwf.can_fetch_work) continue;
if (p->cpu_pwf.may_have_work) {
p->cpu_pwf.fetchable_share = cpu_work_fetch.total_fetchable_share?p->resource_share/cpu_work_fetch.total_fetchable_share:1;
if (log_flags.work_fetch_debug) {
msg_printf(p, MSG_INFO,
"[work_fetch] FS: %f = %f/%f\n",
p->cpu_pwf.fetchable_share, p->resource_share,
cpu_work_fetch.total_fetchable_share
);
}
}
if (coproc_cuda && p->cuda_pwf.may_have_work) {
p->cuda_pwf.fetchable_share = cuda_work_fetch.total_fetchable_share?p->resource_share/cuda_work_fetch.total_fetchable_share:1;

17
clientgui/ViewTransfers.cpp
View File

@ -273,6 +273,18 @@ void CViewTransfers::OnTransfersRetryNow( wxCommandEvent& WXUNUSED(event) ) {
wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame));
wxASSERT(m_pListPane);
CC_STATUS status;
pDoc->GetCoreClientStatus(status);
if (status.network_suspend_reason) {
wxGetApp().SafeMessageBox(
_("Network activity is suspended.\nYou can enable it using the Activity menu."),
_("BOINC"),
wxOK | wxICON_INFORMATION,
this
);
return;
}
pFrame->UpdateStatusText(_("Retrying transfer now..."));
row = -1;
while (1) {
@ -760,7 +772,10 @@ void CViewTransfers::GetDocStatus(wxInt32 item, wxString& strBuffer) const {
strBuffer = _("Upload failed");
} else {
if (status.network_suspend_reason) {
strBuffer = _("Suspended");
strBuffer = transfer->generated_locally
?_("Suspended upload")
:_("Suspended download")
;
} else {
if (transfer->xfer_active) {
strBuffer = transfer->generated_locally? _("Uploading") : _("Downloading");

6
clientgui/ViewWork.cpp
View File

@ -1124,6 +1124,9 @@ void CViewWork::GetDocStatus(wxInt32 item, wxString& strBuffer) const {
strBuffer += _("Download failed");
} else {
strBuffer += _("Downloading");
if (status.network_suspend_reason) {
strBuffer += _(" (suspended)");
}
}
break;
case RESULT_FILES_DOWNLOADED:
@ -1197,6 +1200,9 @@ void CViewWork::GetDocStatus(wxInt32 item, wxString& strBuffer) const {
strBuffer += _("Upload failed");
} else {
strBuffer += _("Uploading");
if (status.network_suspend_reason) {
strBuffer += _(" (suspended)");
}
}
break;
case RESULT_ABORTED: