From 17bfefda26909c957ce20d93533499f697d3a4f9 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Tue, 28 Feb 2012 11:58:30 +0000 Subject: [PATCH] MGR: Change strings in Simple View to match changes in Advanced View: "Remaining" -> "Remaining (Estimated)", "Home page" svn path=/trunk/boinc/; revision=25352 --- checkin_notes | 9 +++++++++ clientgui/sg_ProjectWebSitesPopup.cpp | 2 +- clientgui/sg_TaskPanel.cpp | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/checkin_notes b/checkin_notes index c9594513ac..11be7ee019 100644 --- a/checkin_notes +++ b/checkin_notes @@ -2316,3 +2316,12 @@ David 27 Feb 2012 vda/ vda.cpp sched_vda.cpp,h + +Charlie 28 Feb 2012 + - MGR: Change strings in Simple View to match changes in Advanced View: + "Remaining" -> "Remaining (Estimated)", "Home page" instead of project + name in web links. + + clientgui/ + sg_ProjectWebSitesPopup.cpp + sg_TaskPanel.cpp diff --git a/clientgui/sg_ProjectWebSitesPopup.cpp b/clientgui/sg_ProjectWebSitesPopup.cpp index efd3fadd8a..eaf8cff205 100644 --- a/clientgui/sg_ProjectWebSitesPopup.cpp +++ b/clientgui/sg_ProjectWebSitesPopup.cpp @@ -64,7 +64,7 @@ void CSimpleProjectWebSitesPopupButton::AddMenuItems() size_t urlCount = project->gui_urls.size(); // Add the home page link - wxMenuItem *urlItem = new wxMenuItem(m_ProjectWebSitesPopUpMenu, WEBSITE_URL_MENU_ID_HOMEPAGE,wxString(project->project_name.c_str(), wxConvUTF8)); + wxMenuItem *urlItem = new wxMenuItem(m_ProjectWebSitesPopUpMenu, WEBSITE_URL_MENU_ID_HOMEPAGE, wxString("Home page", wxConvUTF8)); Connect( WEBSITE_URL_MENU_ID_HOMEPAGE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CSimpleProjectWebSitesPopupButton::OnMenuLinkClicked) ); m_ProjectWebSitesPopUpMenu->Append(urlItem); diff --git a/clientgui/sg_TaskPanel.cpp b/clientgui/sg_TaskPanel.cpp index 55a102324f..92c95ff9c4 100755 --- a/clientgui/sg_TaskPanel.cpp +++ b/clientgui/sg_TaskPanel.cpp @@ -836,7 +836,7 @@ wxString CSimpleTaskPanel::GetTimeRemainingString(double f) { } else { s = FormatTime(f); } - str.Printf(_("Remaining: %s"), s.c_str()); + str.Printf(_("Remaining (Estimated): %s"), s.c_str()); return str; }