From f07b6d8c1e17e259598467f69f921a72321bf62e Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Mon, 27 Mar 2006 06:59:57 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=9733 --- checkin_notes | 10 ++++ clientgui/ViewWork.cpp | 19 +++++-- locale/client/en_US/BOINC Manager.mo | Bin 540 -> 540 bytes locale/client/en_US/BOINC Manager.po | 72 ++++++++++++++------------- 4 files changed, 63 insertions(+), 38 deletions(-) diff --git a/checkin_notes b/checkin_notes index cccbb71003..d296aebfe4 100755 --- a/checkin_notes +++ b/checkin_notes @@ -3274,3 +3274,13 @@ Rom 26 Mar 2006 gui_rpc_client_ops.C locale/client/en_US/ BOINC Manager.mo, .po + +Rom 26 Mar 2006 + - Bug Fix: Provide that little extra tid bit of information that might keep + somebody from aborting a CPDN task when it is 70% complete and not over + due. + + clientgui/ + ViewWork.cpp + locale/client/en_US/ + BOINC Manager.mo, .po diff --git a/clientgui/ViewWork.cpp b/clientgui/ViewWork.cpp index e88dbcae94..519c7c60f1 100644 --- a/clientgui/ViewWork.cpp +++ b/clientgui/ViewWork.cpp @@ -254,10 +254,15 @@ void CViewWork::OnWorkShowGraphics( wxCommandEvent& WXUNUSED(event) ) { void CViewWork::OnWorkAbort( wxCommandEvent& WXUNUSED(event) ) { wxLogTrace(wxT("Function Start/End"), wxT("CViewWork::OnWorkAbort - Function Begin")); - wxInt32 iAnswer = 0; + wxInt32 iAnswer = 0; + wxInt32 iResult = 0; wxString strMessage = wxEmptyString; + wxString strName = wxEmptyString; + wxString strProgress = wxEmptyString; + wxString strStatus = wxEmptyString; CMainDocument* pDoc = wxGetApp().GetDocument(); CMainFrame* pFrame = wxGetApp().GetFrame(); + RESULT* result = NULL; wxASSERT(pDoc); wxASSERT(pFrame); @@ -268,9 +273,17 @@ void CViewWork::OnWorkAbort( wxCommandEvent& WXUNUSED(event) ) { pFrame->UpdateStatusText(_("Aborting result...")); + iResult = m_pListPane->GetFirstSelected(); + FormatName(iResult, strName); + FormatProgress(iResult, strProgress); + FormatStatus(iResult, strStatus); + strMessage.Printf( - _("Are you sure you want to abort this task '%s'?"), - pDoc->result(m_pListPane->GetFirstSelected())->name.c_str() + _("Are you sure you want to abort this task '%s'?\n" + "(Progress: %s, Status: %s)"), + strName.c_str(), + strProgress.c_str(), + strStatus.c_str() ); iAnswer = ::wxMessageBox( diff --git a/locale/client/en_US/BOINC Manager.mo b/locale/client/en_US/BOINC Manager.mo index 4fa8c4cc5775efc82e9fbbc9b44894456f149faf..91e83c60a197f5fc6e331a08051dd99720603830 100755 GIT binary patch delta 16 XcmbQkGKXct1Xd#>D^tsjQ`;E!D-)xQQ`;E\n" "Language-Team: BOINC Development Team \n" "MIME-Version: 1.0\n" @@ -1373,7 +1373,7 @@ msgstr "" #: clientgui/ViewProjects.cpp:114 #: clientgui/ViewProjects.cpp:564 #: clientgui/ViewWork.cpp:111 -#: clientgui/ViewWork.cpp:504 +#: clientgui/ViewWork.cpp:517 msgid "Suspend" msgstr "" @@ -1480,12 +1480,12 @@ msgid "Detach from Project" msgstr "" #: clientgui/ViewProjects.cpp:375 -#: clientgui/ViewWork.cpp:306 +#: clientgui/ViewWork.cpp:319 msgid "Launching browser..." msgstr "" #: clientgui/ViewProjects.cpp:560 -#: clientgui/ViewWork.cpp:498 +#: clientgui/ViewWork.cpp:511 msgid "Resume" msgstr "" @@ -1506,7 +1506,7 @@ msgid "Don't fetch new tasks for this project." msgstr "" #: clientgui/ViewProjects.cpp:678 -#: clientgui/ViewWork.cpp:740 +#: clientgui/ViewWork.cpp:753 msgid "Suspended by user" msgstr "" @@ -1666,12 +1666,12 @@ msgid "Retry in " msgstr "" #: clientgui/ViewTransfers.cpp:527 -#: clientgui/ViewWork.cpp:728 +#: clientgui/ViewWork.cpp:741 msgid "Download failed" msgstr "" #: clientgui/ViewTransfers.cpp:529 -#: clientgui/ViewWork.cpp:767 +#: clientgui/ViewWork.cpp:780 msgid "Upload failed" msgstr "" @@ -1681,12 +1681,12 @@ msgid "Suspended" msgstr "" #: clientgui/ViewTransfers.cpp:535 -#: clientgui/ViewWork.cpp:769 +#: clientgui/ViewWork.cpp:782 msgid "Uploading" msgstr "" #: clientgui/ViewTransfers.cpp:535 -#: clientgui/ViewWork.cpp:730 +#: clientgui/ViewWork.cpp:743 msgid "Downloading" msgstr "" @@ -1700,14 +1700,14 @@ msgstr "" #: clientgui/ViewWork.cpp:104 #: clientgui/ViewWork.cpp:213 -#: clientgui/ViewWork.cpp:519 -#: clientgui/ViewWork.cpp:527 +#: clientgui/ViewWork.cpp:532 +#: clientgui/ViewWork.cpp:540 msgid "Show graphics" msgstr "" #: clientgui/ViewWork.cpp:105 -#: clientgui/ViewWork.cpp:520 -#: clientgui/ViewWork.cpp:528 +#: clientgui/ViewWork.cpp:533 +#: clientgui/ViewWork.cpp:541 msgid "Show application graphics in a window." msgstr "" @@ -1763,83 +1763,85 @@ msgstr "" msgid "Are you sure you want to display graphics on a remote machine?" msgstr "" -#: clientgui/ViewWork.cpp:269 +#: clientgui/ViewWork.cpp:274 msgid "Aborting result..." msgstr "" -#: clientgui/ViewWork.cpp:272 +#: clientgui/ViewWork.cpp:282 #, c-format -msgid "Are you sure you want to abort this task '%s'?" +msgid "" +"Are you sure you want to abort this task '%s'?\n" +"(Progress: %s, Status: %s)" msgstr "" -#: clientgui/ViewWork.cpp:278 +#: clientgui/ViewWork.cpp:291 msgid "Abort task" msgstr "" -#: clientgui/ViewWork.cpp:499 +#: clientgui/ViewWork.cpp:512 msgid "Resume work for this task." msgstr "" -#: clientgui/ViewWork.cpp:505 +#: clientgui/ViewWork.cpp:518 msgid "Suspend work for this task." msgstr "" -#: clientgui/ViewWork.cpp:513 +#: clientgui/ViewWork.cpp:526 msgid "Hide graphics" msgstr "" -#: clientgui/ViewWork.cpp:514 +#: clientgui/ViewWork.cpp:527 msgid "Hide application graphics window." msgstr "" -#: clientgui/ViewWork.cpp:724 +#: clientgui/ViewWork.cpp:737 msgid "New" msgstr "" -#: clientgui/ViewWork.cpp:736 -#: clientgui/ViewWork.cpp:760 +#: clientgui/ViewWork.cpp:749 +#: clientgui/ViewWork.cpp:773 msgid "Aborted by user" msgstr "" -#: clientgui/ViewWork.cpp:738 +#: clientgui/ViewWork.cpp:751 msgid "Project suspended by user" msgstr "" -#: clientgui/ViewWork.cpp:742 +#: clientgui/ViewWork.cpp:755 msgid "Activities suspended" msgstr "" -#: clientgui/ViewWork.cpp:745 +#: clientgui/ViewWork.cpp:758 msgid "Running" msgstr "" -#: clientgui/ViewWork.cpp:747 +#: clientgui/ViewWork.cpp:760 msgid "Preempted" msgstr "" -#: clientgui/ViewWork.cpp:749 -#: clientgui/ViewWork.cpp:752 +#: clientgui/ViewWork.cpp:762 +#: clientgui/ViewWork.cpp:765 msgid "Ready to run" msgstr "" -#: clientgui/ViewWork.cpp:762 +#: clientgui/ViewWork.cpp:775 msgid "Computation error" msgstr "" -#: clientgui/ViewWork.cpp:774 +#: clientgui/ViewWork.cpp:787 msgid "Acknowledged" msgstr "" -#: clientgui/ViewWork.cpp:776 +#: clientgui/ViewWork.cpp:789 msgid "Ready to report" msgstr "" -#: clientgui/ViewWork.cpp:778 +#: clientgui/ViewWork.cpp:791 #, c-format msgid "Error: invalid state '%d'" msgstr "" -#: clientgui/ViewWork.cpp:786 +#: clientgui/ViewWork.cpp:799 msgid "Activities suspended by user" msgstr ""