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=7470
This commit is contained in:
Rom Walton 2005-08-24 07:10:23 +00:00
parent 0c755568a4
commit 4c1a159118
2 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
checkin_notes
View File

@ -10923,6 +10923,8 @@ Rom 23 Aug 2005
Rom 23 Aug 2005
- Fix LF problem with Wizard files
- Remove finish page on error
- Enable next and back buttons on a cancel event
clientgui/
BOINCGUI.pjd

33
clientgui/WizAttachProject.cpp
View File

@ -334,11 +334,6 @@ bool CWizAttachProject::HasNextPage( wxWizardPage* page )
bNoNextPageDetected |= (page == m_CompletionPage);
bNoNextPageDetected |= (page == m_CompletionErrorPage);
bNoNextPageDetected |= (page == m_ErrProjectNotDetectedPage);
bNoNextPageDetected |= (page == m_ErrProjectUnavailablePage);
bNoNextPageDetected |= (page == m_ErrNoInternetConnectionPage);
bNoNextPageDetected |= (page == m_ErrAccountAlreadyExistsPage);
bNoNextPageDetected |= (page == m_ErrAccountCreationDisabledPage);
if (bNoNextPageDetected)
return false;
@ -483,6 +478,10 @@ void CWizAttachProject::ProcessCancelEvent( wxWizardEvent& event ) {
this
);
// Reenable the next and back buttons if they have been disabled
GetNextButton()->Enable();
GetBackButton()->Enable();
// Page specific rules - Disable the validator(s)
if (wxYES == iRetVal) {
if (GetCurrentPage() == m_ProjectInfoPage) {
@ -2841,10 +2840,6 @@ wxWizardPage* CErrProjectNotDetectedPage::GetPrev() const
wxWizardPage* CErrProjectNotDetectedPage::GetNext() const
{
if (((CWizAttachProject*)GetParent())->IsCancelInProgress()) {
// Cancel Event Detected
return PAGE_TRANSITION_NEXT(ID_COMPLETIONERRORPAGE);
}
return NULL;
}
@ -2997,10 +2992,6 @@ wxWizardPage* CErrProjectUnavailablePage::GetPrev() const
wxWizardPage* CErrProjectUnavailablePage::GetNext() const
{
if (((CWizAttachProject*)GetParent())->IsCancelInProgress()) {
// Cancel Event Detected
return PAGE_TRANSITION_NEXT(ID_COMPLETIONERRORPAGE);
}
return NULL;
}
@ -3148,10 +3139,6 @@ wxWizardPage* CErrNoInternetConnectionPage::GetPrev() const
wxWizardPage* CErrNoInternetConnectionPage::GetNext() const
{
if (((CWizAttachProject*)GetParent())->IsCancelInProgress()) {
// Cancel Event Detected
return PAGE_TRANSITION_NEXT(ID_COMPLETIONERRORPAGE);
}
return NULL;
}
@ -3298,10 +3285,6 @@ wxWizardPage* CErrAccountNotFoundPage::GetPrev() const
wxWizardPage* CErrAccountNotFoundPage::GetNext() const
{
if (((CWizAttachProject*)GetParent())->IsCancelInProgress()) {
// Cancel Event Detected
return PAGE_TRANSITION_NEXT(ID_COMPLETIONERRORPAGE);
}
return NULL;
}
@ -3448,10 +3431,6 @@ wxWizardPage* CErrAccountAlreadyExistsPage::GetPrev() const
wxWizardPage* CErrAccountAlreadyExistsPage::GetNext() const
{
if (((CWizAttachProject*)GetParent())->IsCancelInProgress()) {
// Cancel Event Detected
return PAGE_TRANSITION_NEXT(ID_COMPLETIONERRORPAGE);
}
return NULL;
}
@ -3599,10 +3578,6 @@ wxWizardPage* CErrAccountCreationDisabledPage::GetPrev() const
wxWizardPage* CErrAccountCreationDisabledPage::GetNext() const
{
if (((CWizAttachProject*)GetParent())->IsCancelInProgress()) {
// Cancel Event Detected
return PAGE_TRANSITION_NEXT(ID_COMPLETIONERRORPAGE);
}
return NULL;
}