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

svn path=/trunk/boinc/; revision=22087

This commit is contained in:
David Anderson 2010-08-01 04:17:04 +00:00
parent 852ab0444c
commit a0380cbffa
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
checkin_notes
View File

@ -5669,6 +5669,7 @@ David 30 Jul 2010
sched_result.cpp
David 31 Jul 2010
- manager: change "Attach to project" to "Add project"
- manager: change "Attach to project" to "Add project";
change "Detach from" to "remove"
clientgui/various

2
clientgui/AdvancedFrame.cpp
View File

@ -1131,7 +1131,7 @@ void CAdvancedFrame::OnWizardDetach(wxCommandEvent& WXUNUSED(event)) {
wxString(ami.acct_mgr_name.c_str(), wxConvUTF8).c_str()
);
strMessage.Printf(
_("If you stop using %s,\nyou'll keep all your current projects,\nbut you'll have to manage projects manually.\n\nDo you want to stop using %s?"),
_("If you detach from %s,\nyou'll keep all your current projects,\nbut you'll have to manage projects manually.\n\nDo you want to detach from %s?"),
wxString(ami.acct_mgr_name.c_str(), wxConvUTF8).c_str(),
wxString(ami.acct_mgr_name.c_str(), wxConvUTF8).c_str()
);

2
clientgui/DlgItemProperties.cpp
View File

@ -218,7 +218,7 @@ void CDlgItemProperties::renderInfos(PROJECT* project_in) {
addProperty(_("Don't request more work"),project->dont_request_more_work ? _("yes") : _("no"));
addProperty(_("Scheduler call in progress"),project->scheduler_rpc_in_progress ? _("yes") : _("no"));
addProperty(_("Attached via account manager"),project->attached_via_acct_mgr ? _("yes") : _("no"));
addProperty(_("Detach when done"),project->detach_when_done ? _("yes") : _("no"));
addProperty(_("Remove when tasks done"),project->detach_when_done ? _("yes") : _("no"));
addProperty(_("Ended"),project->ended ? _("yes") : _("no"));
addSection(_("Credit"));
addProperty(_("User"),

14
clientgui/ViewProjects.cpp
View File

@ -198,8 +198,8 @@ CViewProjects::CViewProjects(wxNotebook* pNotebook) :
pGroup->m_Tasks.push_back( pItem );
pItem = new CTaskItem(
_("Detach"),
_("Detach computer from this project. Tasks in progress will be lost (use 'Update' first to report any completed tasks)."),
_("Remove"),
_("Remove this project. Tasks in progress will be lost (use 'Update' first to report any completed tasks)."),
ID_TASK_PROJECT_DETACH
);
pGroup->m_Tasks.push_back( pItem );
@ -479,7 +479,7 @@ void CViewProjects::OnProjectDetach( wxCommandEvent& WXUNUSED(event) ) {
if (!pDoc->IsUserAuthorized())
return;
pFrame->UpdateStatusText(_("Detaching from project..."));
pFrame->UpdateStatusText(_("Removing project..."));
row = -1;
while (1) {
@ -492,13 +492,13 @@ void CViewProjects::OnProjectDetach( wxCommandEvent& WXUNUSED(event) ) {
}
strMessage.Printf(
_("Are you sure you want to detach from project '%s'?"),
_("Are you sure you want remove project '%s'?"),
pProject->m_strProjectName.c_str()
);
iAnswer = wxGetApp().SafeMessageBox(
strMessage,
_("Detach from Project"),
_("Remove Project"),
wxYES_NO | wxICON_QUESTION,
this
);
@ -1060,10 +1060,10 @@ void CViewProjects::GetDocStatus(wxInt32 item, wxString& strBuffer) const {
append_to_status(strBuffer, _("Won't get new tasks"));
}
if (project->ended) {
append_to_status(strBuffer, _("Project ended - OK to detach"));
append_to_status(strBuffer, _("Project ended - OK to remove"));
}
if (project->detach_when_done) {
append_to_status(strBuffer, _("Will detach when tasks done"));
append_to_status(strBuffer, _("Will remove when tasks done"));
}
if (project->sched_rpc_pending) {
append_to_status(strBuffer, _("Scheduler request pending"));

4
clientgui/sg_StatImageLoader.cpp
View File

@ -208,13 +208,13 @@ void StatImageLoader::OnProjectDetach() {
}
}
strMessage.Printf(
_("Are you sure you want to detach from project '%s'?"),
_("Are you sure you want to remove project '%s'?"),
strProjectName.c_str()
);
iAnswer = wxGetApp().SafeMessageBox(
strMessage,
_("Detach from Project"),
_("Remove Project"),
wxYES_NO | wxICON_QUESTION,
this
);