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

- MGR: Massive wizard cleanup 

- Remove diagnostic framework, it wasn't being used anymore
            and basically cluttered things up.
        - Remove the notion of the Account Manager Remove wizard,
            it hasn't ever been used.
        - Simplify the welcome page
        - Trim down the height of the wizard by hiding the new
            cookie controls on the Account Info page.  The wizard
            needs to stay compatible with small displays.
    - MGR: Only display the 'This is not a BOINC project' on an
        HTTP 404 error.  For a gethostbyname, xml parsing, and
        socket connect error display the 'project is temporarly
        unavailable'.
        
    clientgui/
        AccountInfoPage.cpp
        AccountManagerInfoPage.cpp
        AccountManagerProcessingPage.cpp
        AccountManagerPropertiesPage.cpp
        BOINCBaseWizard.cpp, .h
        BOINCWizards.h
        CompletionPage.cpp
        ProjectInfoPage.cpp
        ProjectListCtrl.cpp
        ProjectProcessingPage.cpp
        ProjectPropertiesPage.cpp, .h
        UnavailablePage.cpp
        WelcomePage.cpp, .h
        WizardAttachProject.cpp

svn path=/trunk/boinc/; revision=18456
This commit is contained in:
Rom Walton 2009-06-19 06:42:36 +00:00
parent 817153c96b
commit cf8e4c5e89
18 changed files with 309 additions and 549 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
checkin_notes
View File

@ -5810,3 +5810,34 @@ David 18 June 2009
py/Boinc/
setup_project.py
Rom 19 June 2009
- MGR: Massive wizard cleanup
- Remove diagnostic framework, it wasn't being used anymore
and basically cluttered things up.
- Remove the notion of the Account Manager Remove wizard,
it hasn't ever been used.
- Simplify the welcome page
- Trim down the height of the wizard by hiding the new
cookie controls on the Account Info page. The wizard
needs to stay compatible with small displays.
- MGR: Only display the 'This is not a BOINC project' on an
HTTP 404 error. For a gethostbyname, xml parsing, and
socket connect error display the 'project is temporarly
unavailable'.
clientgui/
AccountInfoPage.cpp
AccountManagerInfoPage.cpp
AccountManagerProcessingPage.cpp
AccountManagerPropertiesPage.cpp
BOINCBaseWizard.cpp, .h
BOINCWizards.h
CompletionPage.cpp
ProjectInfoPage.cpp
ProjectListCtrl.cpp
ProjectProcessingPage.cpp
ProjectPropertiesPage.cpp, .h
UnavailablePage.cpp
WelcomePage.cpp, .h
WizardAttachProject.cpp

5
clientgui/AccountInfoPage.cpp
View File

@ -135,10 +135,12 @@ void CAccountInfoPage::CreateControls()
m_pCookieDetectionFailedStaticCtrl = new wxStaticText;
m_pCookieDetectionFailedStaticCtrl->Create( itemWizardPage56, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_pCookieDetectionFailedStaticCtrl->Hide();
itemBoxSizer57->Add(m_pCookieDetectionFailedStaticCtrl, 0, wxALIGN_LEFT|wxALL, 5);
m_pCookieDetectionFailedCtrl = new wxHyperLink;
m_pCookieDetectionFailedCtrl->Create( itemWizardPage56, ID_ACCOUNTCOOKIEDETECTIONFAILEDCTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_pCookieDetectionFailedCtrl->Hide();
itemBoxSizer57->Add(m_pCookieDetectionFailedCtrl, 0, wxALIGN_LEFT|wxALL, 5);
m_pAccountQuestionStaticCtrl = new wxStaticText;
@ -330,6 +332,9 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event ) {
if (!(pWAP->m_bCookieRequired && !pWAP->m_bCredentialsDetected)) {
m_pCookieDetectionFailedStaticCtrl->Hide();
m_pCookieDetectionFailedCtrl->Hide();
} else {
m_pCookieDetectionFailedStaticCtrl->Show();
m_pCookieDetectionFailedCtrl->Show();
}
m_pAccountQuestionStaticCtrl->Hide();

2
clientgui/AccountManagerInfoPage.cpp
View File

@ -119,8 +119,6 @@ void CAccountManagerInfoPage::CreateControls()
m_pDescriptionStaticCtrl->Create( itemWizardPage23, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer24->Add(m_pDescriptionStaticCtrl, 0, wxALIGN_LEFT|wxALL, 5);
itemBoxSizer24->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5);
wxFlexGridSizer* itemFlexGridSizer3 = new wxFlexGridSizer(2, 1, 0, 0);
itemFlexGridSizer3->AddGrowableRow(0);
itemFlexGridSizer3->AddGrowableCol(0);

9
clientgui/AccountManagerProcessingPage.cpp
View File

@ -301,7 +301,7 @@ void CAccountManagerProcessingPage::OnStateChange( CAccountManagerProcessingPage
::wxSafeYield(GetParent());
}
if (!iReturnValue && !reply.error_num && !CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTATTACH)) {
if (!iReturnValue && !reply.error_num) {
SetProjectAttachSucceeded(true);
pWAP->SetAttachedToProjectSuccessfully(true);
} else {
@ -310,9 +310,8 @@ void CAccountManagerProcessingPage::OnStateChange( CAccountManagerProcessingPage
if ((ERR_NOT_FOUND == reply.error_num) ||
(ERR_DB_NOT_FOUND == reply.error_num) ||
(ERR_BAD_EMAIL_ADDR == reply.error_num) ||
(ERR_BAD_PASSWD == reply.error_num) ||
CHECK_DEBUG_FLAG(WIZDEBUG_ERRACCOUNTNOTFOUND)) {
(ERR_BAD_PASSWD == reply.error_num)
) {
// For any logon error, make sure we do not attempt to use cached credentials
// on any follow-ups.
pWAP->m_bCredentialsCached = false;
@ -322,7 +321,7 @@ void CAccountManagerProcessingPage::OnStateChange( CAccountManagerProcessingPage
}
strBuffer = pWAP->m_CompletionErrorPage->m_pServerMessagesCtrl->GetLabel();
if ((HTTP_STATUS_INTERNAL_SERVER_ERROR == reply.error_num) || CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTPROPERTIESURL)) {
if ((HTTP_STATUS_INTERNAL_SERVER_ERROR == reply.error_num)) {
strBuffer +=
_("An internal server error has occurred.\n");
} else {

14
clientgui/AccountManagerPropertiesPage.cpp
View File

@ -298,25 +298,25 @@ void CAccountManagerPropertiesPage::OnStateChange( CAccountManagerPropertiesPage
bSuccessfulCondition =
(!iReturnValue) && (!pc->error_num) ||
(!iReturnValue) && (ERR_ACCT_CREATION_DISABLED == pc->error_num);
if (bSuccessfulCondition && !CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTPROPERTIES)) {
if (bSuccessfulCondition) {
SetProjectPropertiesSucceeded(true);
bSuccessfulCondition = pc->account_creation_disabled;
if (bSuccessfulCondition || CHECK_DEBUG_FLAG(WIZDEBUG_ERRACCOUNTCREATIONDISABLED)) {
if (bSuccessfulCondition) {
SetProjectAccountCreationDisabled(true);
} else {
SetProjectAccountCreationDisabled(false);
}
bSuccessfulCondition = pc->client_account_creation_disabled;
if (bSuccessfulCondition || CHECK_DEBUG_FLAG(WIZDEBUG_ERRCLIENTACCOUNTCREATIONDISABLED)) {
if (bSuccessfulCondition) {
SetProjectClientAccountCreationDisabled(true);
} else {
SetProjectClientAccountCreationDisabled(false);
}
bSuccessfulCondition = !pc->terms_of_use.empty();
if (bSuccessfulCondition || CHECK_DEBUG_FLAG(WIZDEBUG_ERRTERMSOFUSEREQUIRED)) {
if (bSuccessfulCondition) {
SetTermsOfUseRequired(true);
} else {
SetTermsOfUseRequired(false);
@ -333,7 +333,7 @@ void CAccountManagerPropertiesPage::OnStateChange( CAccountManagerPropertiesPage
(!iReturnValue) && (ERR_GETHOSTBYNAME == pc->error_num) ||
(!iReturnValue) && (ERR_CONNECT == pc->error_num) ||
(!iReturnValue) && (ERR_XML_PARSE == pc->error_num);
if (bSuccessfulCondition || CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTPROPERTIESURL)) {
if (bSuccessfulCondition) {
SetProjectPropertiesURLFailure(true);
} else {
SetProjectPropertiesURLFailure(false);
@ -345,7 +345,7 @@ void CAccountManagerPropertiesPage::OnStateChange( CAccountManagerPropertiesPage
((!iReturnValue) && (ERR_CONNECT != pc->error_num)) &&
((!iReturnValue) && (ERR_XML_PARSE != pc->error_num)) &&
(!iReturnValue);
if (bSuccessfulCondition || CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTPROPERTIESURL)) {
if (bSuccessfulCondition) {
SetServerReportedError(true);
strBuffer = pWAP->m_CompletionErrorPage->m_pServerMessagesCtrl->GetLabel();
@ -387,7 +387,7 @@ void CAccountManagerPropertiesPage::OnStateChange( CAccountManagerPropertiesPage
}
bSuccessfulCondition = NETWORK_STATUS_WANT_CONNECTION != status.network_status;
if (bSuccessfulCondition && !CHECK_DEBUG_FLAG(WIZDEBUG_ERRNETDETECTION)) {
if (bSuccessfulCondition) {
SetNetworkConnectionDetected(true);
} else {
SetNetworkConnectionDetected(false);

23
clientgui/BOINCBaseWizard.cpp
View File

@ -51,7 +51,6 @@ CBOINCBaseWizard::CBOINCBaseWizard() :
IsAttachToProjectWizard = false;
IsAccountManagerWizard = false;
IsAccountManagerUpdateWizard = false;
IsAccountManagerRemoveWizard = false;
close_when_completed = false;
}
@ -61,31 +60,9 @@ CBOINCBaseWizard::CBOINCBaseWizard(wxWindow *parent, int id, const wxString& tit
IsAttachToProjectWizard = false;
IsAccountManagerWizard = false;
IsAccountManagerUpdateWizard = false;
IsAccountManagerRemoveWizard = false;
close_when_completed = false;
}
/*!
* Set the diagnostics flags.
*/
void CBOINCBaseWizard::SetDiagFlags( unsigned long ulFlags )
{
m_ulDiagFlags = ulFlags;
}
/*!
* Check the desired bitmask against our existing bitmask.
*/
bool CBOINCBaseWizard::IsDiagFlagsSet( unsigned long ulFlags )
{
if (ulFlags & m_ulDiagFlags) {
return true;
}
return false;
}
/*!
* Determine if the wizard page has a previous page
*/

6
clientgui/BOINCBaseWizard.h
View File

@ -40,11 +40,6 @@ public:
const wxPoint& pos = wxDefaultPosition,
long style = wxDEFAULT_DIALOG_STYLE);
/// Diagnostics functions
virtual void SetDiagFlags( unsigned long ulFlags );
virtual bool IsDiagFlagsSet( unsigned long ulFlags );
unsigned long m_ulDiagFlags;
/// Track page transitions
wxWizardPageEx* PopPageTransition();
virtual wxWizardPageEx* _PopPageTransition();
@ -76,7 +71,6 @@ public:
bool IsAttachToProjectWizard;
bool IsAccountManagerWizard;
bool IsAccountManagerUpdateWizard;
bool IsAccountManagerRemoveWizard;
/// Global Wizard Status
PROJECT_CONFIG project_config;

44
clientgui/BOINCWizards.h
View File

@ -65,24 +65,10 @@
// Completion Error Page Multiline Text Control
#define ID_TEXTCTRL 11002
// Change applications button control
#define ID_CHANGEAPPS 11003
// Welcome Page Controls
#define ID_SELECTPROJECTWIZARD 11020
#define ID_SELECTAMWIZARD 11021
// Debug Flag Controls
#define ID_ERRPROJECTPROPERTIES 11100
#define ID_ERRPROJECTCOMM 11101
#define ID_ERRPROJECTPROPERTIESURL 11102
#define ID_ERRACCOUNTCREATIONDISABLED 11103
#define ID_ERRCLIENTACCOUNTCREATIONDISABLED 11104
#define ID_ERRACCOUNTALREADYEXISTS 11105
#define ID_ERRPROJECTALREADYATTACHED 11106
#define ID_ERRPROJECTATTACHFAILURE 11107
#define ID_ERRGOOGLECOMM 11108
#define ID_ERRNETDETECTION 11110
#define ID_WELCOMESELECTWIZARDPROJECT 11100
#define ID_WELCOMESELECTWIZARDACCOUNTMGR 11101
#define ID_WELCOMECHANGEAPPS 11102
// Project Info/Account Manager Info Controls
#define ID_PROJECTSELECTIONCTRL 11200
@ -157,27 +143,6 @@ class CErrProxyPage;
class wxHyperLink;
// Diagnostics Tools
//
#define WIZDEBUG_ERRPROJECTPROPERTIES 0x00000001
#define WIZDEBUG_ERRPROJECTPROPERTIESURL 0x00000002
#define WIZDEBUG_ERRGOOGLECOMM 0x00000008
#define WIZDEBUG_ERRNETDETECTION 0x00000010
#define WIZDEBUG_ERRPROJECTCOMM 0x00000020
#define WIZDEBUG_ERRACCOUNTNOTFOUND 0x00000040
#define WIZDEBUG_ERRACCOUNTALREADYEXISTS 0x00000080
#define WIZDEBUG_ERRACCOUNTCREATIONDISABLED 0x00000100
#define WIZDEBUG_ERRCLIENTACCOUNTCREATIONDISABLED 0x00000200
#define WIZDEBUG_ERRPROJECTATTACH 0x00000400
#define WIZDEBUG_ERRPROJECTALREADYATTACHED 0x00000800
#define WIZDEBUG_ERRTERMSOFUSEREQUIRED 0x00001000
#define PROCESS_DEBUG_FLAG(ulFlags) \
((CBOINCBaseWizard*)GetParent())->SetDiagFlags(ulFlags)
#define CHECK_DEBUG_FLAG(id) \
((CBOINCBaseWizard*)GetParent())->IsDiagFlagsSet(id)
// Wizard Detection
//
#define IS_ATTACHTOPROJECTWIZARD() \
@ -189,9 +154,6 @@ class wxHyperLink;
#define IS_ACCOUNTMANAGERUPDATEWIZARD() \
((CBOINCBaseWizard*)GetParent())->IsAccountManagerUpdateWizard
#define IS_ACCOUNTMANAGERREMOVEWIZARD() \
((CBOINCBaseWizard*)GetParent())->IsAccountManagerRemoveWizard
// Commonly defined macros
//

23
clientgui/CompletionPage.cpp
View File

@ -54,7 +54,6 @@ BEGIN_EVENT_TABLE( CCompletionPage, wxWizardPageEx )
EVT_WIZARDEX_PAGE_CHANGED( -1, CCompletionPage::OnPageChanged )
EVT_WIZARDEX_CANCEL( -1, CCompletionPage::OnCancel )
EVT_WIZARDEX_FINISHED( ID_COMPLETIONPAGE, CCompletionPage::OnFinished )
////@end CCompletionPage event table entries
END_EVENT_TABLE()
@ -174,7 +173,6 @@ wxBitmap CCompletionPage::GetBitmapResource( const wxString& WXUNUSED(name) )
wxIcon CCompletionPage::GetIconResource( const wxString& WXUNUSED(name) )
{
// Icon retrieval
////@begin CCompletionPage icon retrieval
return wxNullIcon;
////@end CCompletionPage icon retrieval
@ -242,27 +240,6 @@ void CCompletionPage::OnPageChanged( wxWizardExEvent& event ) {
_("Click Finish to close.")
);
} else if (IS_ACCOUNTMANAGERREMOVEWIZARD()) {
// Remove Completed
wxString strTitle;
if (pSkinAdvanced->IsBranded()) {
// %s is the project name
// i.e. 'GridRepublic'
strTitle.Printf(
_("Removal from %s completed."),
pSkinAdvanced->GetApplicationShortName().c_str()
);
} else {
strTitle = _("Removal succeeded!");
}
m_pCompletionTitle->SetLabel( strTitle );
m_pCompletionMessage->SetLabel(
_("Click Finish to close.")
);
} else {
// Attach Completed

6
clientgui/ProjectInfoPage.cpp
View File

@ -123,13 +123,13 @@ void CProjectInfoPage::CreateControls()
m_pDescriptionStaticCtrl->Create( itemWizardPage23, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer24->Add(m_pDescriptionStaticCtrl, 0, wxALIGN_LEFT|wxALL, 5);
wxFlexGridSizer* itemFlexGridSizer3 = new wxFlexGridSizer(1, 1, 0, 0);
wxFlexGridSizer* itemFlexGridSizer3 = new wxFlexGridSizer(2, 1, 0, 0);
itemFlexGridSizer3->AddGrowableRow(0);
itemFlexGridSizer3->AddGrowableCol(0);
itemBoxSizer24->Add(itemFlexGridSizer3, 1, wxGROW|wxALL, 5);
m_pProjectListCtrl = new CProjectListCtrl;
m_pProjectListCtrl->Create( itemWizardPage23, wxSize(250,185) );
m_pProjectListCtrl->Create( itemWizardPage23, wxSize(250,155) );
itemFlexGridSizer3->Add(m_pProjectListCtrl, 0, wxGROW|wxRIGHT, 10);
wxFlexGridSizer* itemFlexGridSizer11 = new wxFlexGridSizer(2, 1, 0, 0);
@ -142,7 +142,7 @@ void CProjectInfoPage::CreateControls()
wxFlexGridSizer* itemFlexGridSizer14 = new wxFlexGridSizer(1, 2, 0, 0);
itemFlexGridSizer14->AddGrowableCol(1);
itemBoxSizer22->Add(itemFlexGridSizer14, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxRIGHT, 10);
itemBoxSizer24->Add(itemFlexGridSizer14, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxRIGHT, 10);
m_pProjectUrlStaticCtrl = new wxStaticText;
m_pProjectUrlStaticCtrl->Create( itemWizardPage23, ID_PROJECTURLSTATICCTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

8
clientgui/ProjectListCtrl.cpp
View File

@ -61,23 +61,23 @@ CProjectListCtrl::CProjectListCtrl( )
{
}
CProjectListCtrl::CProjectListCtrl( wxWindow* parent, wxSize theSize )
CProjectListCtrl::CProjectListCtrl( wxWindow* parent, wxSize size )
{
Create( parent, theSize );
Create( parent, size );
}
/*!
* CProjectList creator
*/
bool CProjectListCtrl::Create( wxWindow* parent, wxSize theSize )
bool CProjectListCtrl::Create( wxWindow* parent, wxSize size )
{
////@begin CProjectListCtrl member initialisation
m_pMainSizer = NULL;
////@end CProjectListCtrl member initialisation
////@begin CProjectListCtrl creation
wxScrolledWindow::Create( parent, wxID_ANY, wxDefaultPosition, theSize, wxSUNKEN_BORDER );
wxScrolledWindow::Create( parent, wxID_ANY, wxDefaultPosition, size, wxSUNKEN_BORDER );
SetExtraStyle( wxWS_EX_BLOCK_EVENTS );
SetMinSize(GetSize());

17
clientgui/ProjectProcessingPage.cpp
View File

@ -436,7 +436,7 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE
::wxSafeYield(GetParent());
}
if ((!iReturnValue) && !ao->error_num && !CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTCOMM)) {
if ((!iReturnValue) && !ao->error_num) {
pWAP->SetAccountCreatedSuccessfully(true);
}
} else {
@ -469,7 +469,7 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE
}
}
if ((!iReturnValue) && !ao->error_num && !CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTCOMM)) {
if ((!iReturnValue) && !ao->error_num) {
SetProjectCommunitcationsSucceeded(true);
} else {
SetProjectCommunitcationsSucceeded(false);
@ -477,7 +477,6 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE
if ((ao->error_num == ERR_DB_NOT_UNIQUE)
|| (ao->error_num == ERR_NONUNIQUE_EMAIL)
|| (ao->error_num == ERR_BAD_PASSWD && creating_account)
|| CHECK_DEBUG_FLAG(WIZDEBUG_ERRACCOUNTALREADYEXISTS)
) {
SetProjectAccountAlreadyExists(true);
} else {
@ -487,18 +486,18 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE
if ((ERR_NOT_FOUND == ao->error_num) ||
(ao->error_num == ERR_DB_NOT_FOUND) ||
(ERR_BAD_EMAIL_ADDR == ao->error_num) ||
(ERR_BAD_PASSWD == ao->error_num) ||
CHECK_DEBUG_FLAG(WIZDEBUG_ERRACCOUNTNOTFOUND)) {
(ERR_BAD_PASSWD == ao->error_num)
) {
SetProjectAccountNotFound(true);
} else {
SetProjectAccountNotFound(false);
}
strBuffer = pWAP->m_CompletionErrorPage->m_pServerMessagesCtrl->GetLabel();
if ((HTTP_STATUS_NOT_FOUND == ao->error_num) || CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTPROPERTIESURL)) {
if ((HTTP_STATUS_NOT_FOUND == ao->error_num)) {
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)) {
} else if ((HTTP_STATUS_INTERNAL_SERVER_ERROR == ao->error_num)) {
strBuffer +=
_("An internal server error has occurred.\n");
} else {
@ -551,7 +550,7 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE
::wxSafeYield(GetParent());
}
if (!iReturnValue && !reply.error_num && !CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTATTACH)) {
if (!iReturnValue && !reply.error_num) {
SetProjectAttachSucceeded(true);
pWAP->SetAttachedToProjectSuccessfully(true);
pWAP->SetProjectURL(wxString(ai->url.c_str(), wxConvUTF8));
@ -560,7 +559,7 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE
SetProjectAttachSucceeded(false);
strBuffer = pWAP->m_CompletionErrorPage->m_pServerMessagesCtrl->GetLabel();
if ((HTTP_STATUS_INTERNAL_SERVER_ERROR == reply.error_num) || CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTPROPERTIESURL)) {
if ((HTTP_STATUS_INTERNAL_SERVER_ERROR == reply.error_num)) {
strBuffer +=
_("An internal server error has occurred.\n");
} else {

31
clientgui/ProjectPropertiesPage.cpp
View File

@ -110,6 +110,7 @@ bool CProjectPropertiesPage::Create( CBOINCBaseWizard* parent )
m_bProjectPropertiesSucceeded = false;
m_bProjectPropertiesURLFailure = false;
m_bProjectPropertiesCommunicationFailure = false;
m_bProjectAccountCreationDisabled = false;
m_bProjectClientAccountCreationDisabled = false;
m_bNetworkConnectionDetected = false;
@ -334,6 +335,7 @@ void CProjectPropertiesPage::OnPageChanged( wxWizardExEvent& event ) {
SetProjectPropertiesSucceeded(false);
SetProjectPropertiesURLFailure(false);
SetProjectPropertiesCommunicationFailure(false);
SetProjectAccountCreationDisabled(false);
SetProjectClientAccountCreationDisabled(false);
SetNetworkConnectionDetected(false);
@ -423,25 +425,25 @@ void CProjectPropertiesPage::OnStateChange( CProjectPropertiesPageEvent& WXUNUSE
bSuccessfulCondition =
(!iReturnValue) && (!pc->error_num) ||
(!iReturnValue) && (ERR_ACCT_CREATION_DISABLED == pc->error_num);
if (bSuccessfulCondition && !CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTPROPERTIES)) {
if (bSuccessfulCondition) {
SetProjectPropertiesSucceeded(true);
bSuccessfulCondition = pc->account_creation_disabled;
if (bSuccessfulCondition || CHECK_DEBUG_FLAG(WIZDEBUG_ERRACCOUNTCREATIONDISABLED)) {
if (bSuccessfulCondition) {
SetProjectAccountCreationDisabled(true);
} else {
SetProjectAccountCreationDisabled(false);
}
bSuccessfulCondition = pc->client_account_creation_disabled;
if (bSuccessfulCondition || CHECK_DEBUG_FLAG(WIZDEBUG_ERRCLIENTACCOUNTCREATIONDISABLED)) {
if (bSuccessfulCondition) {
SetProjectClientAccountCreationDisabled(true);
} else {
SetProjectClientAccountCreationDisabled(false);
}
bSuccessfulCondition = !pc->terms_of_use.empty();
if (bSuccessfulCondition || CHECK_DEBUG_FLAG(WIZDEBUG_ERRTERMSOFUSEREQUIRED)) {
if (bSuccessfulCondition) {
SetTermsOfUseRequired(true);
} else {
SetTermsOfUseRequired(false);
@ -452,23 +454,30 @@ void CProjectPropertiesPage::OnStateChange( CProjectPropertiesPageEvent& WXUNUSE
SetProjectPropertiesSucceeded(false);
bSuccessfulCondition =
(!iReturnValue) && (ERR_FILE_NOT_FOUND == pc->error_num) ||
(!iReturnValue) && (ERR_GETHOSTBYNAME == pc->error_num) ||
(!iReturnValue) && (ERR_CONNECT == pc->error_num) ||
(!iReturnValue) && (ERR_XML_PARSE == pc->error_num);
if (bSuccessfulCondition || CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTPROPERTIESURL)) {
(!iReturnValue) && (ERR_FILE_NOT_FOUND == pc->error_num);
if (bSuccessfulCondition) {
SetProjectPropertiesURLFailure(true);
} else {
SetProjectPropertiesURLFailure(false);
}
bSuccessfulCondition =
(!iReturnValue) && (ERR_GETHOSTBYNAME == pc->error_num) ||
(!iReturnValue) && (ERR_CONNECT == pc->error_num) ||
(!iReturnValue) && (ERR_XML_PARSE == pc->error_num);
if (bSuccessfulCondition) {
SetProjectPropertiesCommunicationFailure(true);
} else {
SetProjectPropertiesCommunicationFailure(false);
}
bSuccessfulCondition =
((!iReturnValue) && (ERR_FILE_NOT_FOUND != pc->error_num)) &&
((!iReturnValue) && (ERR_GETHOSTBYNAME != pc->error_num)) &&
((!iReturnValue) && (ERR_CONNECT != pc->error_num)) &&
((!iReturnValue) && (ERR_XML_PARSE != pc->error_num)) &&
(!iReturnValue);
if (bSuccessfulCondition || CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTPROPERTIESURL)) {
if (bSuccessfulCondition) {
SetServerReportedError(true);
strBuffer = pWAP->m_CompletionErrorPage->m_pServerMessagesCtrl->GetLabel();
@ -511,7 +520,7 @@ void CProjectPropertiesPage::OnStateChange( CProjectPropertiesPageEvent& WXUNUSE
}
bSuccessfulCondition = NETWORK_STATUS_WANT_CONNECTION != status.network_status;
if (bSuccessfulCondition && !CHECK_DEBUG_FLAG(WIZDEBUG_ERRNETDETECTION)) {
if (bSuccessfulCondition) {
SetNetworkConnectionDetected(true);
} else {
SetNetworkConnectionDetected(false);

4
clientgui/ProjectPropertiesPage.h
View File

@ -112,6 +112,9 @@ public:
bool GetProjectPropertiesURLFailure() const { return m_bProjectPropertiesURLFailure ; }
void SetProjectPropertiesURLFailure(bool value) { m_bProjectPropertiesURLFailure = value ; }
bool GetProjectPropertiesCommunicationFailure() const { return m_bProjectPropertiesCommunicationFailure ; }
void SetProjectPropertiesCommunicationFailure(bool value) { m_bProjectPropertiesCommunicationFailure = value ; }
bool GetProjectAccountCreationDisabled() const { return m_bProjectAccountCreationDisabled ; }
void SetProjectAccountCreationDisabled(bool value) { m_bProjectAccountCreationDisabled = value ; }
@ -144,6 +147,7 @@ public:
////@end CProjectPropertiesPage member variables
bool m_bProjectPropertiesSucceeded;
bool m_bProjectPropertiesURLFailure;
bool m_bProjectPropertiesCommunicationFailure;
bool m_bProjectAccountCreationDisabled;
bool m_bProjectClientAccountCreationDisabled;
bool m_bNetworkConnectionDetected;

4
clientgui/UnavailablePage.cpp
View File

@ -184,14 +184,14 @@ void CErrUnavailablePage::OnPageChanged( wxWizardExEvent& event ) {
_("Project temporarily unavailable")
);
m_pDirectionsStaticCtrl->SetLabel(
_("The project is temporarily unavailable.\n\nPlease try again later.")
_("The project is temporarily unavailable.\n\nPlease check the URL or try again later.")
);
} else if (IS_ACCOUNTMANAGERWIZARD()) {
m_pTitleStaticCtrl->SetLabel(
_("Account manager temporarily unavailable")
);
m_pDirectionsStaticCtrl->SetLabel(
_("The account manager is temporarily unavailable.\n\nPlease try again later.")
_("The account manager is temporarily unavailable.\n\nPlease check the URL or try again later.")
);
} else {
wxASSERT(FALSE);

446
clientgui/WelcomePage.cpp
View File

@ -19,8 +19,6 @@
#pragma implementation "WelcomePage.h"
#endif
//#define __WIZ_DEBUG__
#include "stdwx.h"
#include "diagnostics.h"
#include "util.h"
@ -36,7 +34,6 @@
#include "BOINCWizards.h"
#include "BOINCBaseWizard.h"
#include "WizardAttachProject.h"
//#include "WizardAccountManager.h"
#include "WelcomePage.h"
#include "hyperlink.h"
@ -58,13 +55,10 @@ BEGIN_EVENT_TABLE( CWelcomePage, wxWizardPageEx )
////@begin CWelcomePage event table entries
EVT_WIZARDEX_PAGE_CHANGED( -1, CWelcomePage::OnPageChanged )
EVT_WIZARDEX_PAGE_CHANGING( -1, CWelcomePage::OnPageChanging )
EVT_RADIOBUTTON( ID_WELCOMESELECTWIZARDPROJECT, CWelcomePage::OnWizardSelectionChanged )
EVT_RADIOBUTTON( ID_WELCOMESELECTWIZARDACCOUNTMGR, CWelcomePage::OnWizardSelectionChanged )
EVT_BUTTON( ID_WELCOMECHANGEAPPS, CWelcomePage::OnChangeApplications )
EVT_WIZARDEX_CANCEL( -1, CWelcomePage::OnCancel )
EVT_SET_FOCUS( CWelcomePage::OnSetFocus )
EVT_SHOW( CWelcomePage::OnShow )
EVT_BUTTON( ID_CHANGEAPPS, CWelcomePage::OpenWCG )
EVT_RADIOBUTTON( ID_SELECTPROJECTWIZARD, CWelcomePage::OnProjectWizardCtrlSelected )
EVT_RADIOBUTTON( ID_SELECTAMWIZARD, CWelcomePage::OnAMWizardCtrlSelected )
////@end CWelcomePage event table entries
END_EVENT_TABLE()
@ -88,36 +82,12 @@ CWelcomePage::CWelcomePage( CBOINCBaseWizard* parent )
bool CWelcomePage::Create( CBOINCBaseWizard* parent )
{
// Determine if we are the wcg version of the client
// and connect to wcg
wcg = false;
#if defined (_WCG)
std::string wcgUrl="http://www.worldcommunitygrid.org/";
CMainDocument* pDoc = wxGetApp().GetDocument();
if ( pDoc->state.lookup_project(wcgUrl) ) {
wcg=true;
}
#endif
////@begin CWelcomePage member initialisation
m_pTitleStaticCtrl = NULL;
m_pDescriptionStaticCtrl = NULL;
m_pAttachToProjectCtrl = NULL;
m_pAttachToAccountManagerCtrl = NULL;
m_pDirectionsStaticCtrl = NULL;
m_pSelectProjectWizardCtrl = NULL;
m_pSelectAMWizardCtrl = NULL;
#if defined(__WIZ_DEBUG__)
m_pErrDescriptionCtrl = NULL;
m_pErrProjectPropertiesCtrl = NULL;
m_pErrProjectCommCtrl = NULL;
m_pErrProjectPropertiesURLCtrl = NULL;
m_pErrAccountCreationDisabledCtrl = NULL;
m_pErrClientAccountCreationDisabledCtrl = NULL;
m_pErrAccountAlreadyExistsCtrl = NULL;
m_pErrProjectAlreadyAttachedCtrl = NULL;
m_pErrProjectAttachFailureCtrl = NULL;
m_pErrGoogleCommCtrl = NULL;
m_pErrNetDetectionCtrl = NULL;
#endif
////@end CWelcomePage member initialisation
////@begin CWelcomePage creation
@ -158,89 +128,23 @@ void CWelcomePage::CreateControls()
itemFlexGridSizer62->AddGrowableCol(1);
itemBoxSizer3->Add(itemFlexGridSizer62, 0, wxGROW|wxALL, 5);
if (IS_ATTACHTOPROJECTWIZARD() || IS_ACCOUNTMANAGERWIZARD()) {
m_pSelectProjectWizardCtrl = new wxRadioButton;
m_pSelectProjectWizardCtrl->Create( itemWizardPage2, ID_SELECTPROJECTWIZARD, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
m_pSelectProjectWizardCtrl->SetValue(TRUE);
itemFlexGridSizer62->Add(m_pSelectProjectWizardCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
m_pAttachToProjectCtrl = new wxRadioButton;
m_pAttachToProjectCtrl->Create( itemWizardPage2, ID_WELCOMESELECTWIZARDPROJECT, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
m_pAttachToProjectCtrl->SetValue(TRUE);
itemFlexGridSizer62->Add(m_pAttachToProjectCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
m_pSelectAMWizardCtrl = new wxRadioButton;
m_pSelectAMWizardCtrl->Create( itemWizardPage2, ID_SELECTAMWIZARD, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_pSelectAMWizardCtrl->SetValue(FALSE);
itemFlexGridSizer62->Add(m_pSelectAMWizardCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
}
#if defined(__WIZ_DEBUG__)
m_pErrDescriptionCtrl = new wxStaticBox(itemWizardPage2, wxID_ANY, wxEmptyString);
wxStaticBoxSizer* itemStaticBoxSizer7 = new wxStaticBoxSizer(m_pErrDescriptionCtrl, wxVERTICAL);
itemBoxSizer3->Add(itemStaticBoxSizer7, 0, wxGROW|wxALL, 5);
wxFlexGridSizer* itemFlexGridSizer8 = new wxFlexGridSizer(-1, 2, 0, 0);
itemFlexGridSizer8->AddGrowableCol(0);
itemFlexGridSizer8->AddGrowableCol(1);
itemStaticBoxSizer7->Add(itemFlexGridSizer8, 0, wxGROW|wxALL, 5);
m_pErrProjectPropertiesCtrl = new wxCheckBox;
m_pErrProjectPropertiesCtrl->Create( itemWizardPage2, ID_ERRPROJECTPROPERTIES, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
m_pErrProjectPropertiesCtrl->SetValue(FALSE);
itemFlexGridSizer8->Add(m_pErrProjectPropertiesCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0);
m_pErrProjectCommCtrl = new wxCheckBox;
m_pErrProjectCommCtrl->Create( itemWizardPage2, ID_ERRPROJECTCOMM, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
m_pErrProjectCommCtrl->SetValue(FALSE);
itemFlexGridSizer8->Add(m_pErrProjectCommCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0);
m_pErrProjectPropertiesURLCtrl = new wxCheckBox;
m_pErrProjectPropertiesURLCtrl->Create( itemWizardPage2, ID_ERRPROJECTPROPERTIESURL, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
m_pErrProjectPropertiesURLCtrl->SetValue(FALSE);
itemFlexGridSizer8->Add(m_pErrProjectPropertiesURLCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0);
m_pErrAccountCreationDisabledCtrl = new wxCheckBox;
m_pErrAccountCreationDisabledCtrl->Create( itemWizardPage2, ID_ERRACCOUNTCREATIONDISABLED, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
m_pErrAccountCreationDisabledCtrl->SetValue(FALSE);
itemFlexGridSizer8->Add(m_pErrAccountCreationDisabledCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 0);
m_pErrClientAccountCreationDisabledCtrl = new wxCheckBox;
m_pErrClientAccountCreationDisabledCtrl->Create( itemWizardPage2, ID_ERRCLIENTACCOUNTCREATIONDISABLED, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
m_pErrClientAccountCreationDisabledCtrl->SetValue(FALSE);
itemFlexGridSizer8->Add(m_pErrClientAccountCreationDisabledCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0);
m_pErrAccountAlreadyExistsCtrl = new wxCheckBox;
m_pErrAccountAlreadyExistsCtrl->Create( itemWizardPage2, ID_ERRACCOUNTALREADYEXISTS, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
m_pErrAccountAlreadyExistsCtrl->SetValue(FALSE);
itemFlexGridSizer8->Add(m_pErrAccountAlreadyExistsCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0);
m_pErrProjectAlreadyAttachedCtrl = new wxCheckBox;
m_pErrProjectAlreadyAttachedCtrl->Create( itemWizardPage2, ID_ERRPROJECTALREADYATTACHED, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
m_pErrProjectAlreadyAttachedCtrl->SetValue(FALSE);
itemFlexGridSizer8->Add(m_pErrProjectAlreadyAttachedCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 0);
m_pErrProjectAttachFailureCtrl = new wxCheckBox;
m_pErrProjectAttachFailureCtrl->Create( itemWizardPage2, ID_ERRPROJECTATTACHFAILURE, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
m_pErrProjectAttachFailureCtrl->SetValue(FALSE);
itemFlexGridSizer8->Add(m_pErrProjectAttachFailureCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 0);
m_pErrGoogleCommCtrl = new wxCheckBox;
m_pErrGoogleCommCtrl->Create( itemWizardPage2, ID_ERRGOOGLECOMM, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
m_pErrGoogleCommCtrl->SetValue(FALSE);
itemFlexGridSizer8->Add(m_pErrGoogleCommCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0);
itemFlexGridSizer8->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5);
m_pErrNetDetectionCtrl = new wxCheckBox;
m_pErrNetDetectionCtrl->Create( itemWizardPage2, ID_ERRNETDETECTION, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
m_pErrNetDetectionCtrl->SetValue(FALSE);
itemFlexGridSizer8->Add(m_pErrNetDetectionCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0);
#endif
m_pAttachToAccountManagerCtrl = new wxRadioButton;
m_pAttachToAccountManagerCtrl->Create( itemWizardPage2, ID_WELCOMESELECTWIZARDACCOUNTMGR, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_pAttachToAccountManagerCtrl->SetValue(FALSE);
itemFlexGridSizer62->Add(m_pAttachToAccountManagerCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
m_pDirectionsStaticCtrl = new wxStaticText;
m_pDirectionsStaticCtrl->Create( itemWizardPage2, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer3->Add(m_pDirectionsStaticCtrl, 0, wxALIGN_LEFT|wxALL, 5);
if (wcg) {
m_pAppButton = new wxButton(itemWizardPage2, ID_CHANGEAPPS, _("Change Research Applications at World Community Grid"));
itemBoxSizer3->Add(m_pAppButton,0, wxALIGN_CENTER,5);
}
m_pChangeApplicationsCtrl = new wxButton;
m_pChangeApplicationsCtrl->Create(itemWizardPage2, ID_WELCOMECHANGEAPPS, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer3->Add(m_pChangeApplicationsCtrl, 0, wxALIGN_CENTER, 5);
itemWizardPage2->SetSizer(itemBoxSizer3);
@ -267,7 +171,7 @@ wxWizardPageEx* CWelcomePage::GetNext() const
return PAGE_TRANSITION_NEXT(ID_COMPLETIONERRORPAGE);
} else if (IS_ATTACHTOPROJECTWIZARD()) {
return PAGE_TRANSITION_NEXT(ID_PROJECTINFOPAGE);
} else if (IS_ACCOUNTMANAGERUPDATEWIZARD() || IS_ACCOUNTMANAGERREMOVEWIZARD()) {
} else if (IS_ACCOUNTMANAGERUPDATEWIZARD()) {
return PAGE_TRANSITION_NEXT(ID_ACCOUNTMANAGERPROCESSINGPAGE);
} else if (IS_ACCOUNTMANAGERWIZARD()) {
return PAGE_TRANSITION_NEXT(ID_ACCOUNTMANAGERINFOPAGE);
@ -317,9 +221,9 @@ void CWelcomePage::OnPageChanged( wxWizardExEvent& event ) {
if (event.GetDirection() == false) return;
CMainDocument* pDoc = wxGetApp().GetDocument();
CWizardAttachProject* pWAP = ((CWizardAttachProject*)GetParent());
ACCT_MGR_INFO ami;
bool is_acct_mgr_detected = false;
bool is_wcg_client = false;
wxString strBuffer = wxEmptyString;
@ -327,214 +231,120 @@ void CWelcomePage::OnPageChanged( wxWizardExEvent& event ) {
wxASSERT(wxDynamicCast(pDoc, CMainDocument));
wxASSERT(m_pTitleStaticCtrl);
wxASSERT(m_pDescriptionStaticCtrl);
wxASSERT(m_pAttachToProjectCtrl);
wxASSERT(m_pAttachToAccountManagerCtrl);
wxASSERT(m_pDirectionsStaticCtrl);
#if defined(__WIZ_DEBUG__)
wxASSERT(m_pErrDescriptionCtrl);
wxASSERT(m_pErrProjectPropertiesCtrl);
wxASSERT(m_pErrProjectCommCtrl);
wxASSERT(m_pErrProjectPropertiesURLCtrl);
wxASSERT(m_pErrAccountCreationDisabledCtrl);
wxASSERT(m_pErrClientAccountCreationDisabledCtrl);
wxASSERT(m_pErrAccountAlreadyExistsCtrl);
wxASSERT(m_pErrProjectAlreadyAttachedCtrl);
wxASSERT(m_pErrProjectAttachFailureCtrl);
wxASSERT(m_pErrGoogleCommCtrl);
wxASSERT(m_pErrNetDetectionCtrl);
wxASSERT(m_pChangeApplicationsCtrl);
#if defined (_WCG)
// Determine if we are the World Community Grid version of the client
// and connected to World Community Grid
if ( pDoc->state.lookup_project("http://www.worldcommunitygrid.org/") ) {
is_wcg_client = true;
}
#endif
if (IS_ATTACHTOPROJECTWIZARD() || IS_ACCOUNTMANAGERWIZARD()) {
wxASSERT(m_pSelectProjectWizardCtrl);
wxASSERT(m_pSelectAMWizardCtrl);
m_pSelectProjectWizardCtrl->SetLabel(
_("Attach to project")
);
m_pSelectProjectWizardCtrl->Show();
m_pSelectProjectWizardCtrl->Enable();
m_pSelectAMWizardCtrl->SetLabel(
_("Attach to account manager")
);
m_pSelectAMWizardCtrl->Show();
}
m_pTitleStaticCtrl->SetLabel(
_("Attach to project or account manager")
);
if (IS_ATTACHTOPROJECTWIZARD()) {
m_pSelectProjectWizardCtrl->SetValue(true);
m_pSelectAMWizardCtrl->SetValue(false);
m_pTitleStaticCtrl->SetLabel(
_("Attach to project or account manager")
);
pDoc->rpc.acct_mgr_info(ami);
is_acct_mgr_detected = ami.acct_mgr_url.size() ? true : false;
pDoc->rpc.acct_mgr_info(ami);
is_acct_mgr_detected = ami.acct_mgr_url.size() ? true : false;
if (is_acct_mgr_detected) {
strBuffer.Printf(
_("If possible, add projects at the\n%s web site.\n\nProjects added via this wizard will not be\nlisted on or managed via %s."),
wxString(ami.acct_mgr_name.c_str(), wxConvUTF8).c_str(),
wxString(ami.acct_mgr_name.c_str(), wxConvUTF8).c_str()
);
m_pDescriptionStaticCtrl->SetLabel(
strBuffer
);
m_pSelectAMWizardCtrl->Disable();
} else {
if (!wcg) {
m_pDescriptionStaticCtrl->SetLabel(
_("We'll guide you through the process of attaching\nto a project or account manager.")
);
} else {
m_pDescriptionStaticCtrl->SetLabel(
_("You have selected to attach to a new BOINC project. Attaching to a new\nproject means that you will be connecting your computer to a new website\nand organization. If this is what you wanted to do, then please click on\nthe 'Next' button below.\n\nSome projects like World Community Grid run multiple research applications.\nIf you want to change which research applications are sent to your computer\nto run, then you should visit the project's website and modify your\npreferences there.\n\nTo change which research applications are sent to you from\nWorld Community Grid then please click on the following button:")
);
}
m_pSelectAMWizardCtrl->Enable();
}
} else if (IS_ACCOUNTMANAGERREMOVEWIZARD()) {
wxASSERT(pWAP);
wxASSERT(wxDynamicCast(pWAP, CWizardAttachProject));
if (is_acct_mgr_detected) {
strBuffer.Printf(
_("&Stop using%s"),
pWAP->m_strProjectName.c_str()
);
m_pTitleStaticCtrl->SetLabel(
strBuffer
);
strBuffer.Printf(
_("We'll now remove this computer from %s. From now on,\nattach and detach projects directly from this computer.\n"
),
pWAP->m_strProjectName.c_str()
_("If possible, add projects at the\n%s web site.\n\nProjects added via this wizard will not be\nlisted on or managed via %s."),
wxString(ami.acct_mgr_name.c_str(), wxConvUTF8).c_str(),
wxString(ami.acct_mgr_name.c_str(), wxConvUTF8).c_str()
);
m_pDescriptionStaticCtrl->SetLabel(
strBuffer
);
if (m_pSelectProjectWizardCtrl) {
m_pSelectProjectWizardCtrl->SetValue(false);
m_pSelectProjectWizardCtrl->Hide();
m_pSelectProjectWizardCtrl->Disable();
}
if (m_pSelectAMWizardCtrl) {
m_pSelectAMWizardCtrl->SetValue(false);
m_pSelectAMWizardCtrl->Hide();
m_pSelectAMWizardCtrl->Disable();
}
} else if (IS_ACCOUNTMANAGERWIZARD()) {
wxASSERT(pWAP);
wxASSERT(wxDynamicCast(pWAP, CWizardAttachProject));
m_pTitleStaticCtrl->SetLabel(
_("Account manager")
);
m_pDescriptionStaticCtrl->SetLabel(
_("We'll now guide you through the process of attaching\nto an account manager.\n\nIf you want to attach to a single project, click Cancel,\nthen select the 'Attach to project' menu item instead."
)
);
if (m_pSelectProjectWizardCtrl) {
m_pSelectProjectWizardCtrl->SetValue(false);
m_pSelectProjectWizardCtrl->Hide();
m_pSelectProjectWizardCtrl->Disable();
}
if (m_pSelectAMWizardCtrl) {
m_pSelectAMWizardCtrl->SetValue(false);
m_pSelectAMWizardCtrl->Hide();
m_pSelectAMWizardCtrl->Disable();
}
m_pAttachToAccountManagerCtrl->Disable();
} else {
wxASSERT(FALSE);
if (!is_wcg_client) {
m_pDescriptionStaticCtrl->SetLabel(
_("We'll guide you through the process of attaching\nto a project or account manager.")
);
} else {
m_pDescriptionStaticCtrl->SetLabel(
_("You have selected to attach to a new BOINC project. Attaching to a new\nproject means that you will be connecting your computer to a new website\nand organization. If this is what you wanted to do, then please click on\nthe 'Next' button below.\n\nSome projects like World Community Grid run multiple research applications.\nIf you want to change which research applications are sent to your computer\nto run, then you should visit the project's website and modify your\npreferences there.\n\nTo change which research applications are sent to you from\nWorld Community Grid then please click on the following button:")
);
m_pChangeApplicationsCtrl->SetLabel(
_("Change Research Applications at World Community Grid")
);
}
m_pAttachToAccountManagerCtrl->Enable();
}
#if defined(__WIZ_DEBUG__)
m_pErrDescriptionCtrl->SetLabel(
_("Debug Flags")
m_pAttachToProjectCtrl->SetLabel(
_("Attach to project")
);
m_pErrProjectPropertiesCtrl->SetLabel(
_("Project Properties Failure")
m_pAttachToAccountManagerCtrl->SetLabel(
_("Attach to account manager")
);
m_pErrProjectCommCtrl->SetLabel(
_("Project Communication Failure")
);
m_pErrProjectPropertiesURLCtrl->SetLabel(
_("Project Properties URL Failure")
);
m_pErrAccountCreationDisabledCtrl->SetLabel(
_("Account Creation Disabled")
);
m_pErrClientAccountCreationDisabledCtrl->SetLabel(
_("Client Account Creation Disabled")
);
m_pErrAccountAlreadyExistsCtrl->SetLabel(
_("Account Already Exists")
);
m_pErrProjectAlreadyAttachedCtrl->SetLabel(
_("Project Already Attached")
);
m_pErrProjectAttachFailureCtrl->SetLabel(
_("Project Attach Failure")
);
m_pErrGoogleCommCtrl->SetLabel(
_("Failure Communicating with Reference Site")
);
m_pErrNetDetectionCtrl->SetLabel(
_("Net Detection Failure")
);
#endif
if (!wcg) {
if (!is_wcg_client) {
m_pDirectionsStaticCtrl->SetLabel(
_("To continue, click Next.")
);
m_pChangeApplicationsCtrl->Hide();
}
Fit();
wxLogTrace(wxT("Function Start/End"), wxT("CWelcomePage::OnPageChanged - Function End"));
}
/*!
* wxEVT_WIZARD_PAGE_CHANGING event handler for ID_WELCOMEPAGE
* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_WELCOMESELECTWIZARDPROJECT
* or ID_WELCOMESELECTWIZARDACCOUNTMGR
*/
void CWelcomePage::OnWizardSelectionChanged( wxCommandEvent& event ) {
wxLogTrace(wxT("Function Start/End"), wxT("CWelcomePage::OnWizardSelectionChanged - Function Begin"));
CWizardAttachProject* pWAP = ((CWizardAttachProject*)GetParent());
wxASSERT(pWAP);
wxASSERT(wxDynamicCast(pWAP, CWizardAttachProject));
if (ID_WELCOMESELECTWIZARDPROJECT == event.GetId()) {
pWAP->IsAttachToProjectWizard = true;
pWAP->IsAccountManagerWizard = false;
} else if (ID_WELCOMESELECTWIZARDACCOUNTMGR == event.GetId()) {
pWAP->IsAttachToProjectWizard = false;
pWAP->IsAccountManagerWizard = true;
}
wxLogTrace(wxT("Function Start/End"), wxT("CWelcomePage::OnWizardSelectionChanged - Function End"));
}
/*!
* wxEVT_BUTTON event handler for ID_WELCOMECHANGEAPPS
*/
void CWelcomePage::OnPageChanging( wxWizardExEvent& event ) {
if (event.GetDirection() == false) return;
unsigned long ulFlags = 0;
#if defined(__WIZ_DEBUG__)
if (m_pErrProjectPropertiesCtrl->GetValue()) {
ulFlags |= WIZDEBUG_ERRPROJECTPROPERTIES;
}
if (m_pErrProjectPropertiesURLCtrl->GetValue()) {
ulFlags |= WIZDEBUG_ERRPROJECTPROPERTIESURL;
}
if (m_pErrProjectCommCtrl->GetValue()) {
ulFlags |= WIZDEBUG_ERRPROJECTCOMM;
}
if (m_pErrGoogleCommCtrl->GetValue()) {
ulFlags |= WIZDEBUG_ERRGOOGLECOMM;
}
if (m_pErrAccountAlreadyExistsCtrl->GetValue()) {
ulFlags |= WIZDEBUG_ERRACCOUNTALREADYEXISTS;
}
if (m_pErrAccountCreationDisabledCtrl->GetValue()) {
ulFlags |= WIZDEBUG_ERRACCOUNTCREATIONDISABLED;
}
if (m_pErrClientAccountCreationDisabledCtrl->GetValue()) {
ulFlags |= WIZDEBUG_ERRCLIENTACCOUNTCREATIONDISABLED;
}
if (m_pErrProjectAttachFailureCtrl->GetValue()) {
ulFlags |= WIZDEBUG_ERRPROJECTATTACH;
}
if (m_pErrProjectAlreadyAttachedCtrl->GetValue()) {
ulFlags |= WIZDEBUG_ERRPROJECTALREADYATTACHED;
}
if (m_pErrNetDetectionCtrl->GetValue()) {
ulFlags |= WIZDEBUG_ERRNETDETECTION;
}
#endif
PROCESS_DEBUG_FLAG( ulFlags );
void CWelcomePage::OnChangeApplications( wxCommandEvent& /* event */ ) {
wxLogTrace(wxT("Function Start/End"), wxT("CWelcomePage::OnChangeApplications - Function Begin"));
CWizardAttachProject* pWAP = ((CWizardAttachProject*)GetParent());
wxASSERT(pWAP);
wxASSERT(wxDynamicCast(pWAP, CWizardAttachProject));
wxHyperLink::ExecuteLink(wxT("http://www.worldcommunitygrid.org/ms/viewMyProjects.do"));
pWAP->SimulateCancelButton();
wxLogTrace(wxT("Function Start/End"), wxT("CWelcomePage::OnChangeApplications - Function End"));
}
/*!
* wxEVT_WIZARD_CANCEL event handler for ID_WELCOMEPAGE
*/
@ -542,51 +352,3 @@ void CWelcomePage::OnPageChanging( wxWizardExEvent& event ) {
void CWelcomePage::OnCancel( wxWizardExEvent& event ) {
PROCESS_CANCELEVENT(event);
}
/*!
* wxEVT_SET_FOCUS event handler for ID_WELCOMEPAGE
*/
void CWelcomePage::OnSetFocus( wxFocusEvent& event ) {
wxLogTrace(wxT("Function Start/End"), wxT("CWelcomePage::OnSetFocus - Function Begin"));
event.Skip();
wxLogTrace(wxT("Function Start/End"), wxT("CWelcomePage::OnSetFocus - Function End"));
}
/*!
* wxEVT_SHOW event handler for ID_WELCOMEPAGE
*/
void CWelcomePage::OnShow( wxShowEvent& event ) {
wxLogTrace(wxT("Function Start/End"), wxT("CWelcomePage::OnShow - Function Begin"));
event.Skip();
wxLogTrace(wxT("Function Start/End"), wxT("CWelcomePage::OnShow - Function End"));
}
/*!
* event handler for ID_WELCOMEPAGE
*/
void CWelcomePage::OpenWCG( wxCommandEvent& /* event */ ) {
wxLogTrace(wxT("Function Start/End"), wxT("CWelcomePage::OpenWCG - Function Begin"));
wxString wcgUrl("http://www.worldcommunitygrid.org/ms/viewMyProjects.do", wxConvUTF8);
wxHyperLink::ExecuteLink(wcgUrl);
CWizardAttachProject* pWAP = ((CWizardAttachProject*)GetParent());
pWAP->SimulateCancelButton();
wxLogTrace(wxT("Function Start/End"), wxT("CWelcomePage::OpenWCG- Function End"));
}
void CWelcomePage::OnProjectWizardCtrlSelected( wxCommandEvent& /* event */ ) {
CBOINCBaseWizard* pBW = (CWizardAttachProject*)GetParent();
pBW->IsAttachToProjectWizard = true;
pBW->IsAccountManagerWizard = false;
}
void CWelcomePage::OnAMWizardCtrlSelected( wxCommandEvent& /* event */ ) {
CBOINCBaseWizard* pBW = (CWizardAttachProject*)GetParent();
pBW->IsAttachToProjectWizard = false;
pBW->IsAccountManagerWizard = true;
}

44
clientgui/WelcomePage.h
View File

@ -48,26 +48,15 @@ public:
/// wxEVT_WIZARD_PAGE_CHANGED event handler for ID_WELCOMEPAGE
void OnPageChanged( wxWizardExEvent& event );
/// wxEVT_WIZARD_PAGE_CHANGING event handler for ID_WELCOMEPAGE
void OnPageChanging( wxWizardExEvent& event );
/// wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_SELECTPROJECTWIZARD
void OnProjectWizardCtrlSelected( wxCommandEvent& event );
/// wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_SELECTAMWIZARD
void OnAMWizardCtrlSelected( wxCommandEvent& event );
/// wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for
/// ID_WELCOMESELECTWIZARDPROJECT or ID_WELCOMESELECTWIZARDACCOUNTMGR
void OnWizardSelectionChanged( wxCommandEvent& event );
/// wxEVT_WIZARD_CANCEL event handler for ID_WELCOMEPAGE
void OnCancel( wxWizardExEvent& event );
/// wxEVT_SET_FOCUS event handler for ID_WELCOMEPAGE
void OnSetFocus( wxFocusEvent& event );
/// wxEVT_SHOW event handler for ID_WELCOMEPAGE
void OnShow( wxShowEvent& event );
/// wxEVT_BUTTON event handler for ID_CHANGEAPPS
void OpenWCG( wxCommandEvent& event );
/// wxEVT_BUTTON event handler for ID_WELCOMECHANGEAPPS
void OnChangeApplications( wxCommandEvent& event );
////@end CWelcomePage event handler declarations
@ -84,34 +73,19 @@ public:
/// Retrieves icon resources
wxIcon GetIconResource( const wxString& name );
////@end CWelcomePage member function declarations
/// Should we show tooltips?
static bool ShowToolTips();
/// Show button for changing application selections
wxButton* m_pAppButton;
bool wcg;
////@begin CWelcomePage member variables
wxStaticText* m_pTitleStaticCtrl;
wxStaticText* m_pDescriptionStaticCtrl;
wxStaticText* m_pDirectionsStaticCtrl;
wxRadioButton* m_pSelectProjectWizardCtrl;
wxRadioButton* m_pSelectAMWizardCtrl;
#if defined(__WXDEBUG__)
wxStaticBox* m_pErrDescriptionCtrl;
wxCheckBox* m_pErrProjectPropertiesCtrl;
wxCheckBox* m_pErrProjectCommCtrl;
wxCheckBox* m_pErrProjectPropertiesURLCtrl;
wxCheckBox* m_pErrAccountCreationDisabledCtrl;
wxCheckBox* m_pErrClientAccountCreationDisabledCtrl;
wxCheckBox* m_pErrAccountAlreadyExistsCtrl;
wxCheckBox* m_pErrProjectAlreadyAttachedCtrl;
wxCheckBox* m_pErrProjectAttachFailureCtrl;
wxCheckBox* m_pErrGoogleCommCtrl;
wxCheckBox* m_pErrNetDetectionCtrl;
#endif
wxRadioButton* m_pAttachToProjectCtrl;
wxRadioButton* m_pAttachToAccountManagerCtrl;
wxButton* m_pChangeApplicationsCtrl;
////@end CWelcomePage member variables
};

141
clientgui/WizardAttachProject.cpp
View File

@ -122,9 +122,6 @@ bool CWizardAttachProject::Create( wxWindow* parent, wxWindowID id, const wxPoin
m_ErrProxyPage = NULL;
////@end CWizardAttachProject member initialisation
// Wizard support
m_ulDiagFlags = 0;
// Cancel Checking
m_bCancelInProgress = false;
@ -132,7 +129,6 @@ bool CWizardAttachProject::Create( wxWindow* parent, wxWindowID id, const wxPoin
IsAttachToProjectWizard = true;
IsAccountManagerWizard = false;
IsAccountManagerUpdateWizard = false;
IsAccountManagerRemoveWizard = false;
// Global wizard status
project_config.clear();
@ -193,18 +189,6 @@ void CWizardAttachProject::CreateControls()
m_WelcomePage->Create( itemWizard1 );
GetPageAreaSizer()->Add(m_WelcomePage);
m_ProjectInfoPage = new CProjectInfoPage;
m_ProjectInfoPage->Create( itemWizard1 );
GetPageAreaSizer()->Add(m_ProjectInfoPage);
m_ProjectPropertiesPage = new CProjectPropertiesPage;
m_ProjectPropertiesPage->Create( itemWizard1 );
GetPageAreaSizer()->Add(m_ProjectPropertiesPage);
m_ProjectProcessingPage = new CProjectProcessingPage;
m_ProjectProcessingPage->Create( itemWizard1 );
GetPageAreaSizer()->Add(m_ProjectProcessingPage);
m_AccountManagerInfoPage = new CAccountManagerInfoPage;
m_AccountManagerInfoPage->Create( itemWizard1 );
GetPageAreaSizer()->Add(m_AccountManagerInfoPage);
@ -217,6 +201,18 @@ void CWizardAttachProject::CreateControls()
m_AccountManagerProcessingPage->Create( itemWizard1 );
GetPageAreaSizer()->Add(m_AccountManagerProcessingPage);
m_ProjectInfoPage = new CProjectInfoPage;
m_ProjectInfoPage->Create( itemWizard1 );
GetPageAreaSizer()->Add(m_ProjectInfoPage);
m_ProjectPropertiesPage = new CProjectPropertiesPage;
m_ProjectPropertiesPage->Create( itemWizard1 );
GetPageAreaSizer()->Add(m_ProjectPropertiesPage);
m_ProjectProcessingPage = new CProjectProcessingPage;
m_ProjectProcessingPage->Create( itemWizard1 );
GetPageAreaSizer()->Add(m_ProjectProcessingPage);
m_AccountInfoPage = new CAccountInfoPage;
m_AccountInfoPage->Create( itemWizard1 );
GetPageAreaSizer()->Add(m_AccountInfoPage);
@ -264,24 +260,98 @@ void CWizardAttachProject::CreateControls()
////@end CWizardAttachProject content construction
wxLogTrace(wxT("Function Status"), wxT("CWizardAttachProject::CreateControls - Begin Page Map"));
wxLogTrace(wxT("Function Status"), wxT("CWizardAttachProject::CreateControls - m_WelcomePage = id: '%d', location: '%p'"), m_WelcomePage->GetId(), m_WelcomePage);
wxLogTrace(wxT("Function Status"), wxT("CWizardAttachProject::CreateControls - m_ProjectInfoPage = id: '%d', location: '%p'"), m_ProjectInfoPage->GetId(), m_ProjectInfoPage);
wxLogTrace(wxT("Function Status"), wxT("CWizardAttachProject::CreateControls - m_ProjectPropertiesPage = id: '%d', location: '%p'"), m_ProjectPropertiesPage->GetId(), m_ProjectPropertiesPage);
wxLogTrace(wxT("Function Status"), wxT("CWizardAttachProject::CreateControls - m_ProjectProcessingPage = id: '%d', location: '%p'"), m_ProjectProcessingPage->GetId(), m_ProjectProcessingPage);
wxLogTrace(wxT("Function Status"), wxT("CWizardAttachProject::CreateControls - m_AccountManagerInfoPage = id: '%d', location: '%p'"), m_AccountManagerInfoPage->GetId(), m_AccountManagerInfoPage);
wxLogTrace(wxT("Function Status"), wxT("CWizardAttachProject::CreateControls - m_AccountManagerPropertiesPage = id: '%d', location: '%p'"), m_AccountManagerPropertiesPage->GetId(), m_AccountManagerPropertiesPage);
wxLogTrace(wxT("Function Status"), wxT("CWizardAttachProject::CreateControls - m_AccountManagerProcessingPage = id: '%d', location: '%p'"), m_AccountManagerProcessingPage->GetId(), m_AccountManagerProcessingPage);
wxLogTrace(wxT("Function Status"), wxT("CWizardAttachProject::CreateControls - m_TermsOfUsePage = id: '%d', location: '%p'"), m_TermsOfUsePage->GetId(), m_TermsOfUsePage);
wxLogTrace(wxT("Function Status"), wxT("CWizardAttachProject::CreateControls - m_AccountInfoPage = id: '%d', location: '%p'"), m_AccountInfoPage->GetId(), m_AccountInfoPage);
wxLogTrace(wxT("Function Status"), wxT("CWizardAttachProject::CreateControls - m_CompletionPage = id: '%d', location: '%p'"), m_CompletionPage->GetId(), m_CompletionPage);
wxLogTrace(wxT("Function Status"), wxT("CWizardAttachProject::CreateControls - m_CompletionErrorPage = id: '%d', location: '%p'"), m_CompletionErrorPage->GetId(), m_CompletionErrorPage);
wxLogTrace(wxT("Function Status"), wxT("CWizardAttachProject::CreateControls - m_ErrNotDetectedPage = id: '%d', location: '%p'"), m_ErrNotDetectedPage->GetId(), m_ErrNotDetectedPage);
wxLogTrace(wxT("Function Status"), wxT("CWizardAttachProject::CreateControls - m_ErrUnavailablePage = id: '%d', location: '%p'"), m_ErrUnavailablePage->GetId(), m_ErrUnavailablePage);
wxLogTrace(wxT("Function Status"), wxT("CWizardAttachProject::CreateControls - m_ErrNoInternetConnectionPage = id: '%d', location: '%p'"), m_ErrNoInternetConnectionPage->GetId(), m_ErrNoInternetConnectionPage);
wxLogTrace(wxT("Function Status"), wxT("CWizardAttachProject::CreateControls - m_ErrNotFoundPage = id: '%d', location: '%p'"), m_ErrNotFoundPage->GetId(), m_ErrNotFoundPage);
wxLogTrace(wxT("Function Status"), wxT("CWizardAttachProject::CreateControls - m_ErrAlreadyExistsPage = id: '%d', location: '%p'"), m_ErrAlreadyExistsPage->GetId(), m_ErrAlreadyExistsPage);
wxLogTrace(wxT("Function Status"), wxT("CWizardAttachProject::CreateControls - m_ErrProxyInfoPage = id: '%d', location: '%p'"), m_ErrProxyInfoPage->GetId(), m_ErrProxyInfoPage);
wxLogTrace(wxT("Function Status"), wxT("CWizardAttachProject::CreateControls - m_ErrProxyPage = id: '%d', location: '%p'"), m_ErrProxyPage->GetId(), m_ErrProxyPage);
wxLogTrace(
wxT("Function Status"),
wxT("CWizardAttachProject::CreateControls - m_WelcomePage = id: '%d', location: '%p', height: '%d', width: '%d'"),
m_WelcomePage->GetId(), m_WelcomePage, m_WelcomePage->GetBestSize().GetHeight(), m_WelcomePage->GetBestSize().GetWidth()
);
wxLogTrace(
wxT("Function Status"),
wxT("CWizardAttachProject::CreateControls - m_ProjectInfoPage = id: '%d', location: '%p', height: '%d', width: '%d'"),
m_ProjectInfoPage->GetId(), m_ProjectInfoPage, m_ProjectInfoPage->GetBestSize().GetHeight(), m_ProjectInfoPage->GetBestSize().GetWidth()
);
wxLogTrace(
wxT("Function Status"),
wxT("CWizardAttachProject::CreateControls - m_ProjectPropertiesPage = id: '%d', location: '%p', height: '%d', width: '%d'"),
m_ProjectPropertiesPage->GetId(), m_ProjectPropertiesPage, m_ProjectPropertiesPage->GetBestSize().GetHeight(), m_ProjectPropertiesPage->GetBestSize().GetWidth()
);
wxLogTrace(
wxT("Function Status"),
wxT("CWizardAttachProject::CreateControls - m_ProjectProcessingPage = id: '%d', location: '%p', height: '%d', width: '%d'"),
m_ProjectProcessingPage->GetId(), m_ProjectProcessingPage, m_ProjectProcessingPage->GetBestSize().GetHeight(), m_ProjectProcessingPage->GetBestSize().GetWidth()
);
wxLogTrace(
wxT("Function Status"),
wxT("CWizardAttachProject::CreateControls - m_AccountManagerInfoPage = id: '%d', location: '%p', height: '%d', width: '%d'"),
m_AccountManagerInfoPage->GetId(), m_AccountManagerInfoPage, m_AccountManagerInfoPage->GetBestSize().GetHeight(), m_AccountManagerInfoPage->GetBestSize().GetWidth()
);
wxLogTrace(
wxT("Function Status"),
wxT("CWizardAttachProject::CreateControls - m_AccountManagerPropertiesPage = id: '%d', location: '%p', height: '%d', width: '%d'"),
m_AccountManagerPropertiesPage->GetId(), m_AccountManagerPropertiesPage, m_AccountManagerPropertiesPage->GetBestSize().GetHeight(), m_AccountManagerPropertiesPage->GetBestSize().GetWidth()
);
wxLogTrace(
wxT("Function Status"),
wxT("CWizardAttachProject::CreateControls - m_AccountManagerProcessingPage = id: '%d', location: '%p', height: '%d', width: '%d'"),
m_AccountManagerProcessingPage->GetId(), m_AccountManagerProcessingPage, m_AccountManagerProcessingPage->GetBestSize().GetHeight(), m_AccountManagerProcessingPage->GetBestSize().GetWidth()
);
wxLogTrace(
wxT("Function Status"),
wxT("CWizardAttachProject::CreateControls - m_TermsOfUsePage = id: '%d', location: '%p', height: '%d', width: '%d'"),
m_TermsOfUsePage->GetId(), m_TermsOfUsePage, m_TermsOfUsePage->GetBestSize().GetHeight(), m_TermsOfUsePage->GetBestSize().GetWidth()
);
wxLogTrace(
wxT("Function Status"),
wxT("CWizardAttachProject::CreateControls - m_AccountInfoPage = id: '%d', location: '%p', height: '%d', width: '%d'"),
m_AccountInfoPage->GetId(), m_AccountInfoPage, m_AccountInfoPage->GetBestSize().GetHeight(), m_AccountInfoPage->GetBestSize().GetWidth()
);
wxLogTrace(
wxT("Function Status"),
wxT("CWizardAttachProject::CreateControls - m_CompletionPage = id: '%d', location: '%p', height: '%d', width: '%d'"),
m_CompletionPage->GetId(), m_CompletionPage, m_CompletionPage->GetBestSize().GetHeight(), m_CompletionPage->GetBestSize().GetWidth()
);
wxLogTrace(
wxT("Function Status"),
wxT("CWizardAttachProject::CreateControls - m_CompletionErrorPage = id: '%d', location: '%p', height: '%d', width: '%d'"),
m_CompletionErrorPage->GetId(), m_CompletionErrorPage, m_CompletionErrorPage->GetBestSize().GetHeight(), m_CompletionErrorPage->GetBestSize().GetWidth()
);
wxLogTrace(
wxT("Function Status"),
wxT("CWizardAttachProject::CreateControls - m_ErrNotDetectedPage = id: '%d', location: '%p', height: '%d', width: '%d'"),
m_ErrNotDetectedPage->GetId(), m_ErrNotDetectedPage, m_ErrNotDetectedPage->GetBestSize().GetHeight(), m_ErrNotDetectedPage->GetBestSize().GetWidth()
);
wxLogTrace(
wxT("Function Status"),
wxT("CWizardAttachProject::CreateControls - m_ErrUnavailablePage = id: '%d', location: '%p', height: '%d', width: '%d'"),
m_ErrUnavailablePage->GetId(), m_ErrUnavailablePage, m_ErrUnavailablePage->GetBestSize().GetHeight(), m_ErrUnavailablePage->GetBestSize().GetWidth()
);
wxLogTrace(
wxT("Function Status"),
wxT("CWizardAttachProject::CreateControls - m_ErrNoInternetConnectionPage = id: '%d', location: '%p', height: '%d', width: '%d'"),
m_ErrNoInternetConnectionPage->GetId(), m_ErrNoInternetConnectionPage, m_ErrNoInternetConnectionPage->GetBestSize().GetHeight(), m_ErrNoInternetConnectionPage->GetBestSize().GetWidth()
);
wxLogTrace(
wxT("Function Status"),
wxT("CWizardAttachProject::CreateControls - m_ErrNotFoundPage = id: '%d', location: '%p', height: '%d', width: '%d'"),
m_ErrNotFoundPage->GetId(), m_ErrNotFoundPage, m_ErrNotFoundPage->GetBestSize().GetHeight(), m_ErrNotFoundPage->GetBestSize().GetWidth()
);
wxLogTrace(
wxT("Function Status"),
wxT("CWizardAttachProject::CreateControls - m_ErrAlreadyExistsPage = id: '%d', location: '%p', height: '%d', width: '%d'"),
m_ErrAlreadyExistsPage->GetId(), m_ErrAlreadyExistsPage, m_ErrAlreadyExistsPage->GetBestSize().GetHeight(), m_ErrAlreadyExistsPage->GetBestSize().GetWidth()
);
wxLogTrace(
wxT("Function Status"),
wxT("CWizardAttachProject::CreateControls - m_ErrProxyInfoPage = id: '%d', location: '%p', height: '%d', width: '%d'"),
m_ErrProxyInfoPage->GetId(), m_ErrProxyInfoPage, m_ErrProxyInfoPage->GetBestSize().GetHeight(), m_ErrProxyInfoPage->GetBestSize().GetWidth()
);
wxLogTrace(
wxT("Function Status"),
wxT("CWizardAttachProject::CreateControls - m_ErrProxyPage = id: '%d', location: '%p', height: '%d', width: '%d'"),
m_ErrProxyPage->GetId(), m_ErrProxyPage, m_ErrProxyPage->GetBestSize().GetHeight(), m_ErrProxyPage->GetBestSize().GetWidth()
);
wxLogTrace(wxT("Function Status"), wxT("CWizardAttachProject::CreateControls - End Page Map"));
wxLogTrace(wxT("Function Start/End"), wxT("CWizardAttachProject::CreateControls - Function End"));
}
@ -324,7 +394,7 @@ bool CWizardAttachProject::Run( wxString& WXUNUSED(strName), wxString& strURL, b
bool CWizardAttachProject::SyncToAccountManager() {
ACCT_MGR_INFO ami;
CMainDocument* pDoc = wxGetApp().GetDocument();
CMainDocument* pDoc = wxGetApp().GetDocument();
wxASSERT(pDoc);
wxASSERT(wxDynamicCast(pDoc, CMainDocument));
@ -368,7 +438,6 @@ bool CWizardAttachProject::SyncToAccountManager() {
if ( !ami.acct_mgr_url.empty() && (m_bCredentialsCached || m_bCredentialsDetected) && m_AccountManagerProcessingPage) {
IsAccountManagerUpdateWizard = true;
IsAccountManagerRemoveWizard = false;
return RunWizard(m_AccountManagerProcessingPage);
} else if ( ami.acct_mgr_url.size() && !m_bCredentialsCached && m_AccountManagerProcessingPage) {
return RunWizard(m_AccountManagerPropertiesPage);