mirror of https://github.com/BOINC/boinc.git
*** empty log message ***
svn path=/trunk/boinc/; revision=7349
This commit is contained in:
parent
99ca42559d
commit
9939a0cf7d
|
@ -1305,6 +1305,7 @@ void CProjectPropertiesPage::OnPageChanged( wxWizardEvent& event )
|
||||||
* wxEVT_WIZARD_CANCEL event handler for ID_PROJECTPROPERTIESPAGE
|
* wxEVT_WIZARD_CANCEL event handler for ID_PROJECTPROPERTIESPAGE
|
||||||
*/
|
*/
|
||||||
void CProjectPropertiesPage::OnCancel( wxWizardEvent& event ) {
|
void CProjectPropertiesPage::OnCancel( wxWizardEvent& event ) {
|
||||||
|
((CWizAttachProject*)GetParent())->ProcessCancelEvent(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
@ -1324,9 +1325,6 @@ void CProjectPropertiesPage::OnStateChange( CProjectPropertiesPageEvent& event )
|
||||||
|
|
||||||
switch(GetCurrentState()) {
|
switch(GetCurrentState()) {
|
||||||
case PROJPROP_INIT:
|
case PROJPROP_INIT:
|
||||||
// Change the cursor to an hourglass
|
|
||||||
::wxBeginBusyCursor();
|
|
||||||
|
|
||||||
StartProgress(m_ProjectPropertiesProgress);
|
StartProgress(m_ProjectPropertiesProgress);
|
||||||
|
|
||||||
SetNextState(PROJPROP_RETRPROJECTPROPERTIES_BEGIN);
|
SetNextState(PROJPROP_RETRPROJECTPROPERTIES_BEGIN);
|
||||||
|
@ -1345,7 +1343,9 @@ void CProjectPropertiesPage::OnStateChange( CProjectPropertiesPageEvent& event )
|
||||||
while (ERR_IN_PROGRESS == iReturnValue) {
|
while (ERR_IN_PROGRESS == iReturnValue) {
|
||||||
iReturnValue = pDoc->rpc.get_project_config_poll(*pc);
|
iReturnValue = pDoc->rpc.get_project_config_poll(*pc);
|
||||||
IncrementProgress(m_ProjectPropertiesProgress);
|
IncrementProgress(m_ProjectPropertiesProgress);
|
||||||
wxSleep(1);
|
|
||||||
|
::wxMilliSleep(250);
|
||||||
|
::wxSafeYield(GetParent());
|
||||||
}
|
}
|
||||||
|
|
||||||
// We either successfully retrieved the project's account creation
|
// We either successfully retrieved the project's account creation
|
||||||
|
@ -1397,7 +1397,9 @@ void CProjectPropertiesPage::OnStateChange( CProjectPropertiesPageEvent& event )
|
||||||
while (ERR_IN_PROGRESS == iReturnValue) {
|
while (ERR_IN_PROGRESS == iReturnValue) {
|
||||||
iReturnValue = pDoc->rpc.lookup_website_poll();
|
iReturnValue = pDoc->rpc.lookup_website_poll();
|
||||||
IncrementProgress(m_ProjectPropertiesProgress);
|
IncrementProgress(m_ProjectPropertiesProgress);
|
||||||
wxSleep(1);
|
|
||||||
|
::wxMilliSleep(250);
|
||||||
|
::wxSafeYield(GetParent());
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((BOINC_SUCCESS == iReturnValue) && !CHECK_DEBUG_FLAG(WIZDEBUG_ERRYAHOOCOMM)) {
|
if ((BOINC_SUCCESS == iReturnValue) && !CHECK_DEBUG_FLAG(WIZDEBUG_ERRYAHOOCOMM)) {
|
||||||
|
@ -1419,7 +1421,9 @@ void CProjectPropertiesPage::OnStateChange( CProjectPropertiesPageEvent& event )
|
||||||
while (ERR_IN_PROGRESS == iReturnValue) {
|
while (ERR_IN_PROGRESS == iReturnValue) {
|
||||||
iReturnValue = pDoc->rpc.lookup_website_poll();
|
iReturnValue = pDoc->rpc.lookup_website_poll();
|
||||||
IncrementProgress(m_ProjectPropertiesProgress);
|
IncrementProgress(m_ProjectPropertiesProgress);
|
||||||
wxSleep(1);
|
|
||||||
|
::wxMilliSleep(250);
|
||||||
|
::wxSafeYield(GetParent());
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((BOINC_SUCCESS == iReturnValue) && !CHECK_DEBUG_FLAG(WIZDEBUG_ERRGOOGLECOMM)) {
|
if ((BOINC_SUCCESS == iReturnValue) && !CHECK_DEBUG_FLAG(WIZDEBUG_ERRGOOGLECOMM)) {
|
||||||
|
@ -1452,9 +1456,6 @@ void CProjectPropertiesPage::OnStateChange( CProjectPropertiesPageEvent& event )
|
||||||
wxSleep(1);
|
wxSleep(1);
|
||||||
((CWizAttachProject*)GetParent())->SimulateNextButton();
|
((CWizAttachProject*)GetParent())->SimulateNextButton();
|
||||||
|
|
||||||
// Change the cursor to a normal cursor
|
|
||||||
::wxEndBusyCursor();
|
|
||||||
|
|
||||||
bPostNewEvent = false;
|
bPostNewEvent = false;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -2253,9 +2254,6 @@ void CAttachProjectPage::OnStateChange( CAttachProjectPageEvent& event )
|
||||||
|
|
||||||
switch(GetCurrentState()) {
|
switch(GetCurrentState()) {
|
||||||
case ATTACHPROJECT_INIT:
|
case ATTACHPROJECT_INIT:
|
||||||
// Change the cursor to an hourglass
|
|
||||||
::wxBeginBusyCursor();
|
|
||||||
|
|
||||||
// Set initial bitmap
|
// Set initial bitmap
|
||||||
SetupProgressImage(m_ProjectCommunitcationsImageCtrl, m_iProjectCommunitcationsProgressImage);
|
SetupProgressImage(m_ProjectCommunitcationsImageCtrl, m_iProjectCommunitcationsProgressImage);
|
||||||
|
|
||||||
|
@ -2290,7 +2288,9 @@ void CAttachProjectPage::OnStateChange( CAttachProjectPageEvent& event )
|
||||||
iReturnValue = ERR_IN_PROGRESS;
|
iReturnValue = ERR_IN_PROGRESS;
|
||||||
while (ERR_IN_PROGRESS == iReturnValue) {
|
while (ERR_IN_PROGRESS == iReturnValue) {
|
||||||
iReturnValue = pDoc->rpc.create_account_poll(*ao);
|
iReturnValue = pDoc->rpc.create_account_poll(*ao);
|
||||||
wxSleep(1);
|
|
||||||
|
::wxMilliSleep(250);
|
||||||
|
::wxSafeYield(GetParent());
|
||||||
|
|
||||||
// Show a glimer of progress by incrementing the progress bitmap
|
// Show a glimer of progress by incrementing the progress bitmap
|
||||||
IncrementProgressImage(m_ProjectCommunitcationsImageCtrl, m_iProjectCommunitcationsProgressImage);
|
IncrementProgressImage(m_ProjectCommunitcationsImageCtrl, m_iProjectCommunitcationsProgressImage);
|
||||||
|
@ -2308,7 +2308,9 @@ void CAttachProjectPage::OnStateChange( CAttachProjectPageEvent& event )
|
||||||
iReturnValue = ERR_IN_PROGRESS;
|
iReturnValue = ERR_IN_PROGRESS;
|
||||||
while (ERR_IN_PROGRESS == iReturnValue) {
|
while (ERR_IN_PROGRESS == iReturnValue) {
|
||||||
iReturnValue = pDoc->rpc.lookup_account_poll(*ao);
|
iReturnValue = pDoc->rpc.lookup_account_poll(*ao);
|
||||||
wxSleep(1);
|
|
||||||
|
::wxMilliSleep(250);
|
||||||
|
::wxSafeYield(GetParent());
|
||||||
|
|
||||||
// Show a glimer of progress by incrementing the progress bitmap
|
// Show a glimer of progress by incrementing the progress bitmap
|
||||||
IncrementProgressImage(m_ProjectCommunitcationsImageCtrl, m_iProjectCommunitcationsProgressImage);
|
IncrementProgressImage(m_ProjectCommunitcationsImageCtrl, m_iProjectCommunitcationsProgressImage);
|
||||||
|
@ -2345,7 +2347,9 @@ void CAttachProjectPage::OnStateChange( CAttachProjectPageEvent& event )
|
||||||
while (ERR_IN_PROGRESS == iReturnValue) {
|
while (ERR_IN_PROGRESS == iReturnValue) {
|
||||||
iReturnValue = pDoc->rpc.project_attach_poll();
|
iReturnValue = pDoc->rpc.project_attach_poll();
|
||||||
IncrementProgressImage(m_ProjectCommunitcationsImageCtrl, m_iProjectCommunitcationsProgressImage);
|
IncrementProgressImage(m_ProjectCommunitcationsImageCtrl, m_iProjectCommunitcationsProgressImage);
|
||||||
wxSleep(1);
|
|
||||||
|
::wxMilliSleep(250);
|
||||||
|
::wxSafeYield(GetParent());
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((BOINC_SUCCESS == iReturnValue) && !CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTATTACH)) {
|
if ((BOINC_SUCCESS == iReturnValue) && !CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTATTACH)) {
|
||||||
|
@ -2364,9 +2368,6 @@ void CAttachProjectPage::OnStateChange( CAttachProjectPageEvent& event )
|
||||||
wxSleep(1);
|
wxSleep(1);
|
||||||
((CWizAttachProject*)GetParent())->SimulateNextButton();
|
((CWizAttachProject*)GetParent())->SimulateNextButton();
|
||||||
|
|
||||||
// Change the cursor to a normal cursor
|
|
||||||
::wxEndBusyCursor();
|
|
||||||
|
|
||||||
bPostNewEvent = false;
|
bPostNewEvent = false;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue