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

*** empty log message *** 

svn path=/trunk/boinc/; revision=11772
This commit is contained in:
David Anderson 2007-01-05 00:24:54 +00:00
parent 4b120a868e
commit 18aab9b7f9
3 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
checkin_notes
View File

@ -90,4 +90,19 @@ Kevin 4 Jan 2007
clientgui/sg_DlgMessages.cpp clientgui/sg_DlgMessages.cpp
clientgui/sg_DlgPreferences.cpp clientgui/sg_DlgPreferences.cpp
David 4 Jan 2007
- core client: if an app fails to start,
it could be that the executable has been munged.
So verify the files; this will find the bad file
and download it again.
- Manager: in Attach to Account Manager wizard, add some text saying
if they want to just attach to a single project,
use the Attach to Project wizard instead.
Some users tried to attach SETI@home using the acct mgr wizard
and got all bent outta shape when it didn't work.
client/
app_start.C
clientgui/
WelcomePage.cpp

4
client/app_start.C
View File

@ -660,6 +660,10 @@ int ACTIVE_TASK::start(bool first_time) {
// go here on error; "buf" contains error message, "retval" is nonzero // go here on error; "buf" contains error message, "retval" is nonzero
// //
error: error:
// if something failed, it's possible that the executable was munged.
// Verify it to trigger another download.
//
gstate.input_files_available(result, true);
gstate.report_result_error(*result, buf); gstate.report_result_error(*result, buf);
task_state = PROCESS_COULDNT_START; task_state = PROCESS_COULDNT_START;
return retval; return retval;

19
clientgui/WelcomePage.cpp
View File

@ -21,6 +21,8 @@
#pragma implementation "WelcomePage.h" #pragma implementation "WelcomePage.h"
#endif #endif
//#define __WIZ_DEBUG__
#include "stdwx.h" #include "stdwx.h"
#include "diagnostics.h" #include "diagnostics.h"
#include "util.h" #include "util.h"
@ -88,7 +90,7 @@ bool CWelcomePage::Create( CBOINCBaseWizard* parent )
m_pTitleStaticCtrl = NULL; m_pTitleStaticCtrl = NULL;
m_pDescriptionStaticCtrl = NULL; m_pDescriptionStaticCtrl = NULL;
m_pDirectionsStaticCtrl = NULL; m_pDirectionsStaticCtrl = NULL;
#if defined(__WXDEBUG__) #if defined(__WIZ_DEBUG__)
m_pErrDescriptionCtrl = NULL; m_pErrDescriptionCtrl = NULL;
m_pErrProjectPropertiesCtrl = NULL; m_pErrProjectPropertiesCtrl = NULL;
m_pErrProjectCommCtrl = NULL; m_pErrProjectCommCtrl = NULL;
@ -138,7 +140,7 @@ void CWelcomePage::CreateControls()
itemBoxSizer3->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); itemBoxSizer3->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5);
#if defined(__WXDEBUG__) #if defined(__WIZ_DEBUG__)
m_pErrDescriptionCtrl = new wxStaticBox(itemWizardPage2, wxID_ANY, wxEmptyString); m_pErrDescriptionCtrl = new wxStaticBox(itemWizardPage2, wxID_ANY, wxEmptyString);
wxStaticBoxSizer* itemStaticBoxSizer7 = new wxStaticBoxSizer(m_pErrDescriptionCtrl, wxVERTICAL); wxStaticBoxSizer* itemStaticBoxSizer7 = new wxStaticBoxSizer(m_pErrDescriptionCtrl, wxVERTICAL);
itemBoxSizer3->Add(itemStaticBoxSizer7, 0, wxGROW|wxALL, 5); itemBoxSizer3->Add(itemStaticBoxSizer7, 0, wxGROW|wxALL, 5);
@ -292,7 +294,7 @@ void CWelcomePage::OnPageChanged( wxWizardExEvent& event ) {
wxASSERT(m_pTitleStaticCtrl); wxASSERT(m_pTitleStaticCtrl);
wxASSERT(m_pDescriptionStaticCtrl); wxASSERT(m_pDescriptionStaticCtrl);
wxASSERT(m_pDirectionsStaticCtrl); wxASSERT(m_pDirectionsStaticCtrl);
#if defined(__WXDEBUG__) #if defined(__WIZ_DEBUG__)
wxASSERT(m_pErrDescriptionCtrl); wxASSERT(m_pErrDescriptionCtrl);
wxASSERT(m_pErrProjectPropertiesCtrl); wxASSERT(m_pErrProjectPropertiesCtrl);
wxASSERT(m_pErrProjectCommCtrl); wxASSERT(m_pErrProjectCommCtrl);
@ -337,14 +339,17 @@ void CWelcomePage::OnPageChanged( wxWizardExEvent& event ) {
_("Account manager") _("Account manager")
); );
m_pDescriptionStaticCtrl->SetLabel( m_pDescriptionStaticCtrl->SetLabel(
_("We'll now guide you through the process of adding\n" _("We'll now guide you through the process of attaching\n"
"an account manager.") "to an account manager.\n\n"
"If you want to attach to a single project, click Cancel,\n"
"then select the 'Attach to project' menu item instead."
)
); );
} else { } else {
wxASSERT(FALSE); wxASSERT(FALSE);
} }
#if defined(__WXDEBUG__) #if defined(__WIZ_DEBUG__)
m_pErrDescriptionCtrl->SetLabel( m_pErrDescriptionCtrl->SetLabel(
_("Debug Flags") _("Debug Flags")
); );
@ -399,7 +404,7 @@ void CWelcomePage::OnPageChanging( wxWizardExEvent& event ) {
unsigned long ulFlags = 0; unsigned long ulFlags = 0;
#if defined(__WXDEBUG__) #if defined(__WIZ_DEBUG__)
if (m_pErrProjectPropertiesCtrl->GetValue()) { if (m_pErrProjectPropertiesCtrl->GetValue()) {
ulFlags |= WIZDEBUG_ERRPROJECTPROPERTIES; ulFlags |= WIZDEBUG_ERRPROJECTPROPERTIES;
} }