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=9535
This commit is contained in:
Rom Walton 2006-02-23 08:24:19 +00:00
parent 5b4a247ea5
commit 7769fd3952
5 changed files with 42 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
checkin_notes
View File

@ -2263,3 +2263,14 @@ Rom 22 Feb 2006
api/
boinc_api.C, .h
windows_opengl.C
Rom 22 Feb 2006
- Code Cleanup
- Make S@H enhanced compile again on Windows.
clientgui/
AccountManagerProcessingPage.cpp
MainFrame.h
ProjectProcessingPage.cpp
lib/
proxy_info.C

30
clientgui/AccountManagerProcessingPage.cpp
View File

@ -219,7 +219,8 @@ void CAccountManagerProcessingPage::OnCancel( wxWizardExEvent& event ) {
void CAccountManagerProcessingPage::OnStateChange( CAccountManagerProcessingPageEvent& event )
{
CMainDocument* pDoc = wxGetApp().GetDocument();
CMainDocument* pDoc = wxGetApp().GetDocument();
CWizardAccountManager* pWAM = ((CWizardAccountManager*)GetParent());
wxDateTime dtStartExecutionTime;
wxDateTime dtCurrentExecutionTime;
wxTimeSpan tsExecutionTime;
@ -237,8 +238,8 @@ void CAccountManagerProcessingPage::OnStateChange( CAccountManagerProcessingPage
switch(GetCurrentState()) {
case ATTACHACCTMGR_INIT:
((CWizardAccountManager*)GetParent())->DisableNextButton();
((CWizardAccountManager*)GetParent())->DisableBackButton();
pWAM->DisableNextButton();
pWAM->DisableBackButton();
StartProgress(m_pProgressIndicator);
SetNextState(ATTACHACCTMGR_ATTACHACCTMGR_BEGIN);
@ -248,14 +249,14 @@ void CAccountManagerProcessingPage::OnStateChange( CAccountManagerProcessingPage
break;
case ATTACHACCTMGR_ATTACHACCTMGR_EXECUTE:
// Attempt to attach to the accout manager.
url = ((CWizardAccountManager*)GetParent())->m_AccountManagerInfoPage->GetProjectURL().c_str();
username = ((CWizardAccountManager*)GetParent())->m_AccountInfoPage->GetAccountEmailAddress().c_str();
password = ((CWizardAccountManager*)GetParent())->m_AccountInfoPage->GetAccountPassword().c_str();
url = pWAM->m_AccountManagerInfoPage->GetProjectURL().c_str();
username = pWAM->m_AccountInfoPage->GetAccountEmailAddress().c_str();
password = pWAM->m_AccountInfoPage->GetAccountPassword().c_str();
pDoc->rpc.acct_mgr_rpc(
url.c_str(),
username.c_str(),
password.c_str(),
((CWizardAccountManager*)GetParent())->m_bCredentialsCached
pWAM->m_bCredentialsCached
);
// Wait until we are done processing the request.
@ -293,17 +294,16 @@ void CAccountManagerProcessingPage::OnStateChange( CAccountManagerProcessingPage
SetProjectAccountNotFound(false);
}
strBuffer = pWAM->m_CompletionErrorPage->m_pServerMessagesCtrl->GetLabel();
if ((HTTP_STATUS_INTERNAL_SERVER_ERROR == reply.error_num) || CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTPROPERTIESURL)) {
strBuffer = ((CWizardAccountManager*)GetParent())->m_CompletionErrorPage->m_pServerMessagesCtrl->GetLabel();
strBuffer += _T("An internal server error has occurred.\n");
((CWizardAccountManager*)GetParent())->m_CompletionErrorPage->m_pServerMessagesCtrl->SetLabel(strBuffer);
strBuffer +=
_("An internal server error has occurred.\n");
} else {
strBuffer = ((CWizardAccountManager*)GetParent())->m_CompletionErrorPage->m_pServerMessagesCtrl->GetLabel();
for (i=0; i<reply.messages.size(); i++) {
strBuffer += wxString(reply.messages[i].c_str()) + wxString(wxT("\n"));
}
((CWizardAccountManager*)GetParent())->m_CompletionErrorPage->m_pServerMessagesCtrl->SetLabel(strBuffer);
}
pWAM->m_CompletionErrorPage->m_pServerMessagesCtrl->SetLabel(strBuffer);
}
SetNextState(ATTACHACCTMGR_CLEANUP);
break;
@ -314,9 +314,9 @@ void CAccountManagerProcessingPage::OnStateChange( CAccountManagerProcessingPage
default:
// Allow a glimps of what the result was before advancing to the next page.
wxSleep(1);
((CWizardAccountManager*)GetParent())->EnableNextButton();
((CWizardAccountManager*)GetParent())->EnableBackButton();
((CWizardAccountManager*)GetParent())->SimulateNextButton();
pWAM->EnableNextButton();
pWAM->EnableBackButton();
pWAM->SimulateNextButton();
bPostNewEvent = false;
break;
}

1
clientgui/MainFrame.h
View File

@ -108,7 +108,6 @@ public:
int GetReminderFrequency() { return m_iReminderFrequency; }
wxString GetDialupConnectionName() { return m_strNetworkDialupConnectionName; }
bool GetDialupPromptForCredentials() { return m_bNetworkDialupPromptCredentials; }
void ResetReminderTimers();

28
clientgui/ProjectProcessingPage.cpp
View File

@ -460,22 +460,20 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& event )
SetProjectAccountNotFound(false);
}
strBuffer = pWAP->m_CompletionErrorPage->m_pServerMessagesCtrl->GetLabel();
if ((HTTP_STATUS_NOT_FOUND == ao->error_num) || CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTPROPERTIESURL)) {
strBuffer = pWAP->m_CompletionErrorPage->m_pServerMessagesCtrl->GetLabel();
strBuffer += _T("Required wizard file(s) are missing from the target server.\n(lookup_account.php/create_account.php)\n");
pWAP->m_CompletionErrorPage->m_pServerMessagesCtrl->SetLabel(strBuffer);
strBuffer +=
_("Required wizard file(s) are missing from the target server.\n"
"(lookup_account.php/create_account.php)\n");
} else if ((HTTP_STATUS_INTERNAL_SERVER_ERROR == ao->error_num) || CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTPROPERTIESURL)) {
strBuffer = pWAP->m_CompletionErrorPage->m_pServerMessagesCtrl->GetLabel();
strBuffer += _T("An internal server error has occurred.\n");
pWAP->m_CompletionErrorPage->m_pServerMessagesCtrl->SetLabel(strBuffer);
} else if (BOINC_SUCCESS != ao->error_num) {
strBuffer = pWAP->m_CompletionErrorPage->m_pServerMessagesCtrl->GetLabel();
strBuffer +=
_("An internal server error has occurred.\n");
} else {
for (i=0; i<ao->messages.size(); i++) {
strBuffer += wxString(ao->messages[i].c_str()) + wxString(wxT("\n"));
}
pWAP->m_CompletionErrorPage->m_pServerMessagesCtrl->SetLabel(strBuffer);
}
pWAP->m_CompletionErrorPage->m_pServerMessagesCtrl->SetLabel(strBuffer);
}
}
SetNextState(ATTACHPROJECT_ATTACHPROJECT_BEGIN);
@ -527,17 +525,17 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& event )
pWAP->SetProjectAuthenticator(ao->authenticator.c_str());
} else {
SetProjectAttachSucceeded(false);
strBuffer = pWAP->m_CompletionErrorPage->m_pServerMessagesCtrl->GetLabel();
if ((HTTP_STATUS_INTERNAL_SERVER_ERROR == reply.error_num) || CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTPROPERTIESURL)) {
strBuffer = pWAP->m_CompletionErrorPage->m_pServerMessagesCtrl->GetLabel();
strBuffer += _T("An internal server error has occurred.\n");
pWAP->m_CompletionErrorPage->m_pServerMessagesCtrl->SetLabel(strBuffer);
strBuffer +=
_("An internal server error has occurred.\n");
} else {
strBuffer = pWAP->m_CompletionErrorPage->m_pServerMessagesCtrl->GetLabel();
for (i=0; i<reply.messages.size(); i++) {
strBuffer += wxString(reply.messages[i].c_str()) + wxString(wxT("\n"));
}
pWAP->m_CompletionErrorPage->m_pServerMessagesCtrl->SetLabel(strBuffer);
}
pWAP->m_CompletionErrorPage->m_pServerMessagesCtrl->SetLabel(strBuffer);
}
} else {
SetProjectAttachSucceeded(false);

3
lib/proxy_info.C
View File

@ -21,8 +21,11 @@
#include "boinc_win.h"
#endif
#ifndef _WIN32
#include "config.h"
#include <string>
#endif
using std::string;
#include "parse.h"