diff --git a/api/boinc_api.C b/api/boinc_api.C index 2e9b2384fb..3d82e9f834 100644 --- a/api/boinc_api.C +++ b/api/boinc_api.C @@ -126,6 +126,7 @@ int boinc_init() { options.defaults(); return boinc_init_options(options); } + int boinc_init_options(BOINC_OPTIONS& opt) { int retval; retval = boinc_init_options_general(opt); diff --git a/api/boinc_gl.h b/api/boinc_gl.h index 660c241917..9b0934cca6 100644 --- a/api/boinc_gl.h +++ b/api/boinc_gl.h @@ -54,7 +54,7 @@ # include # endif -# include "GL/glut.h" +# include "glut.h" /* # if defined(HAVE_GLUT_H) # include "glut.h" diff --git a/checkin_notes b/checkin_notes index bb90e07b38..1ecee54e29 100755 --- a/checkin_notes +++ b/checkin_notes @@ -19962,10 +19962,39 @@ David 21 Nov 2004 team*.php Rom 21 Nov 2004 - - Bug Fix: I think this fixes the "Could not find item xxx in list view" error messages - for all tabs. After detecting a disconnected state, resrt the cache to and cache from - variables since the listview control does not reissue a cache request when all the - items have been deleted. + - Bug Fix: I think this fixes the "Could not find item xxx in list view" + error messages for all tabs. + After detecting a disconnected state, + resrt the cache to and cache from variables + since the listview control does not reissue a cache request + when all the items have been deleted. clientgui/ BOINCBaseView.cpp + +David 22 Nov 2004 + - print error msg if app_info.xml has unparsed text + - support notion of "batch" in work creation + - shorten messages in BOINC manager + + api/ + boinc_api.C + boinc_gl.h + client/ + cs_statefile.C + clientgui/ + BOINCTaskBar.cpp + MainDocument.cpp + MainFrame.cpp + Makefile.old + ValidateAccountKey.cpp + ValidateURL.cpp + ViewMessages.cpp + ViewProjects.cpp + ViewTransfers.cpp + ViewWork.cpp + db/ + boinc_db.h + tools/ + backend_lib.C + create_work.C diff --git a/client/cs_statefile.C b/client/cs_statefile.C index 81ad49fca7..96627dd065 100644 --- a/client/cs_statefile.C +++ b/client/cs_statefile.C @@ -471,6 +471,7 @@ int CLIENT_STATE::parse_app_info(PROJECT* p, FILE* in) { app_versions.push_back(avp); continue; } + msg_printf(p, MSG_ERROR, "Unparsed line in app_info.xml: %s", buf); } return ERR_XML_PARSE; } diff --git a/clientgui/BOINCTaskBar.cpp b/clientgui/BOINCTaskBar.cpp index 3aa46a5e3b..49d81fbea9 100644 --- a/clientgui/BOINCTaskBar.cpp +++ b/clientgui/BOINCTaskBar.cpp @@ -313,7 +313,7 @@ void CTaskBarIcon::CreateContextMenu() menu->AppendRadioItem( ID_TB_ACTIVITYRUNBASEDONPREPERENCES, _("Run based on &preferences"), wxEmptyString ); menu->AppendRadioItem( ID_TB_ACTIVITYSUSPEND, _("&Suspend"), wxEmptyString ); menu->AppendSeparator(); - menu->AppendCheckItem( ID_TB_NETWORKSUSPEND, _("&Disable BOINC Network Access"), wxEmptyString ); + menu->AppendCheckItem( ID_TB_NETWORKSUSPEND, _("&Disable BOINC network access"), wxEmptyString ); menu->AppendSeparator(); menu->Append( wxID_ABOUT, _("&About BOINC Manager..."), wxEmptyString ); menu->AppendSeparator(); diff --git a/clientgui/MainDocument.cpp b/clientgui/MainDocument.cpp index fa6ae45404..6b605639ef 100644 --- a/clientgui/MainDocument.cpp +++ b/clientgui/MainDocument.cpp @@ -104,7 +104,7 @@ wxInt32 CMainDocument::CachedStateUpdate() if ( pFrame ) { wxASSERT(wxDynamicCast(pFrame, CMainFrame)); - pFrame->UpdateStatusbar( _("Retrieving the BOINC system state. Please wait...") ); + pFrame->UpdateStatusbar( _("Retrieving system state; please wait...") ); } m_dtCachedStateTimestamp = m_dtCachedStateLockTimestamp; @@ -118,7 +118,7 @@ wxInt32 CMainDocument::CachedStateUpdate() if ( pFrame ) { wxASSERT(wxDynamicCast(pFrame, CMainFrame)); - pFrame->UpdateStatusbar( _("Retrieving the BOINC host information. Please wait...") ); + pFrame->UpdateStatusbar( _("Retrieving host information; please wait...") ); } retval = rpc.get_host_info(host); diff --git a/clientgui/MainFrame.cpp b/clientgui/MainFrame.cpp index 7fb5eb1c8c..1d3988a625 100644 --- a/clientgui/MainFrame.cpp +++ b/clientgui/MainFrame.cpp @@ -176,17 +176,17 @@ bool CMainFrame::CreateMenu() menuFile->AppendRadioItem( ID_ACTIVITYRUNALWAYS, _("&Run always"), - _("Runs BOINC without regards to the configured preferences for the computer") + _("Does work regardless of preferences") ); menuFile->AppendRadioItem( ID_ACTIVITYRUNBASEDONPREPERENCES, _("Run based on &preferences"), - _("Runs BOINC according to the preferences configured for the computer") + _("Does work according to your preferences") ); menuFile->AppendRadioItem( ID_ACTIVITYSUSPEND, _("&Suspend"), - _("Suspends processing and network activity without regards to the configured preferences") + _("Stops work regardless of preferences") ); menuFile->AppendSeparator(); @@ -194,7 +194,7 @@ bool CMainFrame::CreateMenu() menuFile->AppendCheckItem( ID_NETWORKSUSPEND, _("&Disable BOINC Network Access"), - _("Disables network activity without suspending BOINC") + _("Stops BOINC network activity") ); menuFile->AppendSeparator(); @@ -202,7 +202,7 @@ bool CMainFrame::CreateMenu() menuFile->Append( ID_RUNBENCHMARKS, _("Run &Benchmarks"), - _("Runs the CPU Benchmarks for BOINC") + _("Runs BOINC CPU benchmarks") ); menuFile->AppendSeparator(); @@ -210,7 +210,7 @@ bool CMainFrame::CreateMenu() menuFile->Append( ID_SELECTCOMPUTER, _("Select Computer..."), - _("Allows you to remotely connect up to another computer running BOINC") + _("Connect to another computer running BOINC") ); menuFile->AppendSeparator(); @@ -234,7 +234,7 @@ bool CMainFrame::CreateMenu() menuHelp->Append( wxID_ABOUT, _("&About BOINC Manager..."), - _("Displays general information about BOINC and BOINC Manager") + _("Show information about BOINC and BOINC Manager") ); // construct menu @@ -587,7 +587,7 @@ void CMainFrame::OnSelectComputer( wxCommandEvent& WXUNUSED(event) ) strMachine = ::wxGetTextFromUser( _("Which computer do you wish to connect to?"), - _("Select Computer...") + _("Select computer...") ); iRetVal = pDoc->Connect( strMachine ); diff --git a/clientgui/Makefile.old b/clientgui/Makefile.old index 8563108e59..3b90c8c39d 100644 --- a/clientgui/Makefile.old +++ b/clientgui/Makefile.old @@ -1,7 +1,7 @@ CXX = $(shell wx-config --cxx) # comment out the following as needed -#OTHER_LIBS = -lsocket -lnsl +OTHER_LIBS = -lsocket -lnsl CFLAGS = -g -I ../ -I ../lib -DNOTASKBAR -DNOCLIPBOARD @@ -38,10 +38,10 @@ OBJS = \ # change the following as needed # Mac version: -WLIBS = -framework QuickTime -framework IOKit -framework Carbon -framework Cocoa -framework System -L../../wxMac-2.5.3/lib -lwx_mac_adv-2.5 -lwx_mac_core-2.5 -lwx_mac_html-2.5 -lwx_base_carbon-2.5 -lwx_base_carbon_net-2.5 -lwxtiff-2.5 -lwxjpeg-2.5 -lwxpng-2.5 -lwxexpat-2.5 -framework QuickTime -framework IOKit -framework Carbon -framework Cocoa -framework System -lz -lpthread -liconv -framework WebKit +#WLIBS = -framework QuickTime -framework IOKit -framework Carbon -framework Cocoa -framework System -L../../wxMac-2.5.3/lib -lwx_mac_adv-2.5 -lwx_mac_core-2.5 -lwx_mac_html-2.5 -lwx_base_carbon-2.5 -lwx_base_carbon_net-2.5 -lwxtiff-2.5 -lwxjpeg-2.5 -lwxpng-2.5 -lwxexpat-2.5 -framework QuickTime -framework IOKit -framework Carbon -framework Cocoa -framework System -lz -lpthread -liconv -framework WebKit # all others: -#WLIBS = `wx-config --libs` +WLIBS = `wx-config --libs` boincmgr: $(OBJS) $(CXX) -o $(PROGRAM) $(OBJS) $(WLIBS) $(OTHER_LIBS) diff --git a/clientgui/ValidateAccountKey.cpp b/clientgui/ValidateAccountKey.cpp index a72a06dde1..927262fe2d 100644 --- a/clientgui/ValidateAccountKey.cpp +++ b/clientgui/ValidateAccountKey.cpp @@ -21,6 +21,9 @@ // Revision History: // // $Log$ +// Revision 1.4 2004/11/22 19:17:06 davea +// *** empty log message *** +// // Revision 1.3 2004/10/26 16:58:34 rwalton // *** empty log message *** // @@ -89,7 +92,7 @@ bool CValidateAccountKey::Validate(wxWindow *parent) { ok = FALSE; - m_errormsg = _("Invalid Account Key, please enter a valid Account Key"); + m_errormsg = _("Invalid Account Key; please enter a valid Account Key"); } if ( !ok ) diff --git a/clientgui/ValidateURL.cpp b/clientgui/ValidateURL.cpp index d2f9ef24eb..b2484c1985 100644 --- a/clientgui/ValidateURL.cpp +++ b/clientgui/ValidateURL.cpp @@ -21,6 +21,9 @@ // Revision History: // // $Log$ +// Revision 1.5 2004/11/22 19:17:06 davea +// *** empty log message *** +// // Revision 1.4 2004/10/26 16:58:34 rwalton // *** empty log message *** // @@ -93,11 +96,11 @@ bool CValidateURL::Validate(wxWindow *parent) ok = FALSE; if ( wxURL_SNTXERR == val.GetError() ) - m_errormsg = _("No URL supplied, please enter a valid project URL."); + m_errormsg = _("No URL supplied; please enter a valid project URL."); else if ( wxURL_NOPROTO == val.GetError() ) - m_errormsg = _("'%s' does not contain a protocol which can get this URL."); + m_errormsg = _("'%s' does not start with http://"); else if ( wxURL_NOHOST == val.GetError() ) - m_errormsg = _("'%s' does not contain a host name."); + m_errormsg = _("'%s' does not contain a valid host name."); else if ( wxURL_NOPATH == val.GetError() ) m_errormsg = _("'%s' does not contain a valid path."); } diff --git a/clientgui/ViewMessages.cpp b/clientgui/ViewMessages.cpp index c7e5c71e57..e654afc861 100644 --- a/clientgui/ViewMessages.cpp +++ b/clientgui/ViewMessages.cpp @@ -66,7 +66,7 @@ const wxString LINKDESC_TASKCOPYALL = const wxString LINK_TASKCOPYMESSAGE = wxT(SECTION_TASK "copymessage"); const wxString LINKDESC_TASKCOPYMESSAGE = _("Copy Selection
" - "Clicking copy selection, copies the selected message(s) to the system clipboard.

You can select multiple items by holding down either the shift key or control key before clicking on the next desired message."); + "Clicking copy selection copies the selected message(s) to the system clipboard.

You can select multiple items by holding down the shift key or control key while clicking on the next desired message."); IMPLEMENT_DYNAMIC_CLASS(CViewMessages, CBOINCBaseView) diff --git a/clientgui/ViewProjects.cpp b/clientgui/ViewProjects.cpp index 0c03776a20..5a7ee5f5db 100644 --- a/clientgui/ViewProjects.cpp +++ b/clientgui/ViewProjects.cpp @@ -67,52 +67,50 @@ const wxString LINKDESC_DEFAULT = const wxString LINK_TASKATTACH = wxT(SECTION_TASK "attach"); const wxString LINKDESC_TASKATTACH = - _("Attach to Project
" - "Clicking attach to project allows you to join other BOINC " - "projects. You will need a valid project URL and Authenticator."); + _("Attach to project
" + "Join a BOINC project. " + "You will need a project URL and account key."); const wxString LINK_TASKDETACH = wxT(SECTION_TASK "detach"); const wxString LINKDESC_TASKDETACH = - _("Detach from Project
" - "Clicking detach from project removes the computer from the currently " - "selected project. You may wish to update the project first to submit " + _("Detach from project
" + "Detach this computer from this project. " + "You may wish to update the project first to report " "any completed work."); const wxString LINK_TASKRESET = wxT(SECTION_TASK "reset"); const wxString LINKDESC_TASKRESET = - _("Reset Project
" - "Clicking reset project removes all workunits and applications from " - "the currently selected project. You may wish to update the project " - "first to submit any completed work."); + _("Reset project
" + "Remove all workunits and applications from this project. " + "You may wish to update the project " + "first to report any completed work."); const wxString LINK_TASKSUSPEND = wxT(SECTION_TASK "suspend"); const wxString LINKDESC_TASKSUSPEND = - _("Suspend Project
" - "Clicking suspend project will pause the project from any additional " - "computation for that project until the resume project option is selected."); + _("Suspend project
" + "Stop work for this project " + "(you can resume later)."); const wxString LINK_TASKRESUME = wxT(SECTION_TASK "resume"); const wxString LINKDESC_TASKRESUME = - _("Resume Project
" - "Clicking resume project resumes computation for a project that has been" - "previously suspended."); + _("Resume project
" + "Resume work for this project"); const wxString LINK_TASKUPDATE = wxT(SECTION_TASK "update"); const wxString LINKDESC_TASKUPDATE = - _("Update Project
" - "Clicking update project submits any outstanding work and refreshes " - "your credit and preferences for the currently selected project."); + _("Update project
" + "Report all completed work and refresh " + "your credit and preferences for this project."); const wxString LINK_WEBBOINC = wxT(SECTION_WEB "boinc"); const wxString LINKDESC_WEBBOINC = - _("BOINC Homepage
" - "This will open a browser window to the BOINC homepage."); + _("BOINC home page
" + "Open the BOINC home page in a web browser."); const wxString LINK_WEBPROJECT = wxT(SECTION_WEB "project"); const wxString LINKDESC_WEBPROJECT = - _("Project Homepage
" - "This will open a browser window to the currently selected project " - "homepage."); + _("Project home page
" + "Open this project's home page in a web browser."); const wxString LINK_WEB = wxT(SECTION_WEB ":"); @@ -147,7 +145,7 @@ CViewProjects::CViewProjects(wxNotebook* pNotebook) : m_pTaskPane->AddVirtualFile(BITMAP_BOINC, bmpBOINC, wxBITMAP_TYPE_XPM); m_pTaskPane->CreateTaskHeader(BITMAP_TASKHEADER, bmpTask, _("Tasks")); - m_pTaskPane->CreateTaskHeader(BITMAP_WEBHEADER, bmpWeb, _("Websites")); + m_pTaskPane->CreateTaskHeader(BITMAP_WEBHEADER, bmpWeb, _("Web sites")); m_pTaskPane->CreateTaskHeader(BITMAP_TIPSHEADER, bmpTips, _("Quick Tips")); m_pListPane->InsertColumn(COLUMN_PROJECT, _("Project"), wxLIST_FORMAT_LEFT, 150); @@ -278,7 +276,7 @@ void CViewProjects::OnTaskLinkClicked( const wxHtmlLinkInfo& link ) pDoc->GetProjectProjectName(iProjectIndex, strProjectName); strMessage.Printf( - _("Are you sure you wish to detach from project '%s'?"), + _("Are you sure you want to detach from project '%s'?"), strProjectName.c_str()); iAnswer = wxMessageBox( @@ -301,7 +299,7 @@ void CViewProjects::OnTaskLinkClicked( const wxHtmlLinkInfo& link ) pDoc->GetProjectProjectName(iProjectIndex, strProjectName); strMessage.Printf( - _("Are you sure you wish to reset project '%s'?"), + _("Are you sure you want to reset project '%s'?"), strProjectName.c_str()); iAnswer = wxMessageBox( diff --git a/clientgui/ViewTransfers.cpp b/clientgui/ViewTransfers.cpp index ccb045435d..92c45095ad 100644 --- a/clientgui/ViewTransfers.cpp +++ b/clientgui/ViewTransfers.cpp @@ -57,19 +57,18 @@ const wxString LINKDESC_DEFAULT = - _("Please click a transfer item to see additional options."); + _("Click an item to see additional options."); const wxString LINK_TASKRETRY = wxT(SECTION_TASK "retry"); const wxString LINKDESC_TASKRETRY = - _("Retry Now
" - "Clicking retry now will attempt to upload the result data file " - "to the project server now."); + _("Retry now
" + "Click Retry now to upload the file now"); const wxString LINK_TASKABORT = wxT(SECTION_TASK "abort"); const wxString LINKDESC_TASKABORT = - _("Abort Upload
" - "Clicking abort upload will delete the result from the upload queue. " - "Doing this will keep you from being granted any credit for this result."); + _("Abort upload
" + "Click Abort upload to delete the file from the upload queue. " + "This will prevent you from being granted credit for this result."); IMPLEMENT_DYNAMIC_CLASS(CViewTransfers, CBOINCBaseView) @@ -215,7 +214,7 @@ void CViewTransfers::OnTaskLinkClicked( const wxHtmlLinkInfo& link ) pDoc->GetTransferFileName(iProjectIndex, strName); strMessage.Printf( - _("Are you sure you wish to abort this file transfer '%s'?"), + _("Are you sure you want to abort this file transfer '%s'?"), strName.c_str()); iAnswer = wxMessageBox( diff --git a/clientgui/ViewWork.cpp b/clientgui/ViewWork.cpp index a5f6718a84..ee3ecc7256 100644 --- a/clientgui/ViewWork.cpp +++ b/clientgui/ViewWork.cpp @@ -58,29 +58,28 @@ const wxString LINKDESC_DEFAULT = - _("Please click a result to see additional options."); + _("Click a result to see additional options."); const wxString LINK_TASKSUSPEND = wxT(SECTION_TASK "suspend"); const wxString LINKDESC_TASKSUSPEND = _("Suspend
" - "Clicking suspend allows you to suspend the currently selected result."); + "Click Suspend to suspend the result."); const wxString LINK_TASKRESUME = wxT(SECTION_TASK "resume"); const wxString LINKDESC_TASKRESUME = _("Resume
" - "Clicking resume allows you to resume a previously suspended result."); + "Click Resume to resume a suspended result."); const wxString LINK_TASKSHOWGRAPHICS = wxT(SECTION_TASK "showgraphics"); const wxString LINKDESC_TASKSHOWGRAPHICS= - _("Show Graphics
" - "Clicking show graphics will display a window giving you a chance " - "to see how the active result will look while in screensaver mode."); + _("Show graphics
" + "Click Show graphics to show application graphics in a window."); const wxString LINK_TASKABORT = wxT(SECTION_TASK "abort"); const wxString LINKDESC_TASKABORT = - _("Abort Result
" - "Clicking abort result will delete the result from the work queue. " - "Doing this will keep you from being granted any credit for this result."); + _("Abort result
" + "Click Abort result to delete the result from the work queue. " + "This will prevent you from being granted credit for the result."); IMPLEMENT_DYNAMIC_CLASS(CViewWork, CBOINCBaseView) @@ -108,15 +107,15 @@ CViewWork::CViewWork(wxNotebook* pNotebook) : m_pTaskPane->AddVirtualFile(BITMAP_RESULTS, bmpResult, wxBITMAP_TYPE_XPM); m_pTaskPane->CreateTaskHeader(BITMAP_TASKHEADER, bmpTask, _("Tasks")); - m_pTaskPane->CreateTaskHeader(BITMAP_TIPSHEADER, bmpTips, _("Quick Tips")); + m_pTaskPane->CreateTaskHeader(BITMAP_TIPSHEADER, bmpTips, _("Quick tips")); m_pListPane->InsertColumn(COLUMN_PROJECT, _("Project"), wxLIST_FORMAT_LEFT, 125); m_pListPane->InsertColumn(COLUMN_APPLICATION, _("Application"), wxLIST_FORMAT_LEFT, 95); m_pListPane->InsertColumn(COLUMN_NAME, _("Name"), wxLIST_FORMAT_LEFT, 285); m_pListPane->InsertColumn(COLUMN_CPUTIME, _("CPU time"), wxLIST_FORMAT_RIGHT, 80); m_pListPane->InsertColumn(COLUMN_PROGRESS, _("Progress"), wxLIST_FORMAT_CENTRE, 60); - m_pListPane->InsertColumn(COLUMN_TOCOMPLETETION, _("To Completetion"), wxLIST_FORMAT_RIGHT, 100); - m_pListPane->InsertColumn(COLUMN_REPORTDEADLINE, _("Report Deadline"), wxLIST_FORMAT_LEFT, 150); + m_pListPane->InsertColumn(COLUMN_TOCOMPLETETION, _("To completetion"), wxLIST_FORMAT_RIGHT, 100); + m_pListPane->InsertColumn(COLUMN_REPORTDEADLINE, _("Report deadline"), wxLIST_FORMAT_LEFT, 150); m_pListPane->InsertColumn(COLUMN_STATUS, _("Status"), wxLIST_FORMAT_LEFT, 135); m_bTipsHeaderHidden = false; @@ -270,12 +269,12 @@ void CViewWork::OnTaskLinkClicked( const wxHtmlLinkInfo& link ) pDoc->GetWorkName(iProjectIndex, strResultName); strMessage.Printf( - _("Are you sure you wish to abort this result '%s'?"), + _("Are you sure you want to abort this result '%s'?"), strResultName.c_str()); iAnswer = wxMessageBox( strMessage, - _("Abort Result"), + _("Abort result"), wxYES_NO | wxICON_QUESTION, this ); diff --git a/db/boinc_db.h b/db/boinc_db.h index 987b49f5cf..c4e8509987 100755 --- a/db/boinc_db.h +++ b/db/boinc_db.h @@ -335,7 +335,7 @@ struct WORKUNIT { // quicker or reflect loss rate int max_error_results; // WU error if < #error results int max_total_results; // WU error if < #total results - // (need this in case results never returned + // (need this in case results are never returned) int max_success_results; // WU error if < #success results // without consensus (i.e. WU is nondeterministic) char result_template_file[64]; diff --git a/doc/download.php b/doc/download.php index f6451022a5..7a6e4e4550 100755 --- a/doc/download.php +++ b/doc/download.php @@ -12,14 +12,14 @@ function version_start($num, $date, $xml) { function version($platform, $filename, $xml) { $path = "dl/$filename"; $dlink = "Download"; - $md = md5($path); + $md = md5_file($path); if ($xml) { echo " $platform http://boinc.berkeley.edu/$path $filename - $md5 + $md "; } else { diff --git a/doc/links.php b/doc/links.php index 52839f8122..3482fb554c 100644 --- a/doc/links.php +++ b/doc/links.php @@ -118,8 +118,8 @@ show_link( //); show_link( "Slovak", - "BOINC translation by slavko.sk", - "http://slavko.sk/boinc" + "www.boinc.sk", + "http://www.boinc.sk/" ); show_link( "Spanish", diff --git a/doc/software.php b/doc/software.php index e928d4756e..2f024a5c05 100644 --- a/doc/software.php +++ b/doc/software.php @@ -24,17 +24,18 @@ some information is

Other software

-Required for compiling: +Required for compiling: -Required on the database server: +Required on the database server: After installing and running the server, @@ -48,8 +49,10 @@ the account under which Apache runs grant all on *.* to nobody@localhost; grant all on *.* to nobody; +Set your PATH variable to include MySQL programs +(typically /usr/local/mysql and /usr/local/mysql/bin). -Required on the master/scheduler server(s): +Required on other server(s):