From 6e527a0891ab1d5ad51c39722dce26d5d4eeb596 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Wed, 3 Jun 2009 08:59:24 +0000 Subject: [PATCH] MGR: finish changes to combined attach wizard svn path=/trunk/boinc/; revision=18273 --- checkin_notes | 14 ++++++++++++-- clientgui/AccountInfoPage.cpp | 35 ++++++++++++++++++++++++----------- clientgui/AccountInfoPage.h | 1 + clientgui/BOINCWizards.h | 3 ++- 4 files changed, 39 insertions(+), 14 deletions(-) diff --git a/checkin_notes b/checkin_notes index 3d9a41ae3a..b7d977f5a0 100644 --- a/checkin_notes +++ b/checkin_notes @@ -4900,7 +4900,7 @@ Charlie 1 June 2009 wxMutex from to to be consistent with examples in literature, hoping this might fix an intermittent hang in - wxConition::Wait(). + wxCondition::Wait(). - Mac MGR: Mac OS 10.3.9 does not have sqlite3, so we must weak-link. clientgui/ @@ -4955,7 +4955,7 @@ David 2 June 2009 Charlie 2 June 2009 - MGR: cosmetic changes to combined attach wizard, partial fix - to "Forgot password" link for accoount managers. + to "Forgot password" link for account managers. clientgui/ AccountInfoPage.cpp @@ -4963,3 +4963,13 @@ Charlie 2 June 2009 ProjecttInfoPage.cpp ProjectListCtrl.cpp, .h WelcomePage.cpp + +Charlie 3 June 2009 + - MGR: finish changes to combined attach wizard, change "Forgot + password" link for account managers to a link to AM's home + page, add static text that you must register at web site + before proceeding or go to web site for forgotten psasword. + + clientgui/ + AccountInfoPage.cpp, .h + BOINCWizards.h diff --git a/clientgui/AccountInfoPage.cpp b/clientgui/AccountInfoPage.cpp index a0f29e2115..634ed6b15c 100644 --- a/clientgui/AccountInfoPage.cpp +++ b/clientgui/AccountInfoPage.cpp @@ -99,6 +99,7 @@ bool CAccountInfoPage::Create( CBOINCBaseWizard* parent ) m_pAccountConfirmPasswordStaticCtrl = NULL; m_pAccountConfirmPasswordCtrl = NULL; m_pAccountPasswordRequirmentsStaticCtrl = NULL; + m_pAccountManagerLinkLabelStaticCtrl = NULL; m_pAccountForgotPasswordCtrl = NULL; ////@end CAccountInfoPage member initialisation @@ -188,9 +189,13 @@ void CAccountInfoPage::CreateControls() m_pAccountPasswordRequirmentsStaticCtrl->SetFont(wxFont(7, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE)); itemFlexGridSizer64->Add(m_pAccountPasswordRequirmentsStaticCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_pAccountManagerLinkLabelStaticCtrl = new wxStaticText; + m_pAccountManagerLinkLabelStaticCtrl->Create( itemWizardPage56, ID_ACCOUNTLINKLABELSTATICCTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer57->Add(m_pAccountManagerLinkLabelStaticCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_pAccountForgotPasswordCtrl = new wxHyperLink; m_pAccountForgotPasswordCtrl->Create( itemWizardPage56, ID_ACCOUNTFORGOTPASSWORDCTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer64->Add(m_pAccountForgotPasswordCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer57->Add(m_pAccountForgotPasswordCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); // Set validators // m_pAccountEmailAddressCtrl is setup when the OnPageChange event is fired since @@ -276,6 +281,7 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event ) { wxASSERT(pSkinAdvanced); wxASSERT(pSkinWizardATAM); + wxASSERT(pWAP); wxASSERT(m_pTitleStaticCtrl); wxASSERT(m_pAccountQuestionStaticCtrl); wxASSERT(m_pAccountInformationStaticCtrl); @@ -288,6 +294,7 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event ) { wxASSERT(m_pAccountConfirmPasswordStaticCtrl); wxASSERT(m_pAccountConfirmPasswordCtrl); wxASSERT(m_pAccountPasswordRequirmentsStaticCtrl); + wxASSERT(m_pAccountManagerLinkLabelStaticCtrl); wxASSERT(m_pAccountForgotPasswordCtrl); wxASSERT(wxDynamicCast(pSkinAdvanced, CSkinAdvanced)); wxASSERT(wxDynamicCast(pSkinWizardATAM, CSkinWizardATAM)); @@ -317,9 +324,9 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event ) { m_pAccountConfirmPasswordStaticCtrl->Hide(); m_pAccountConfirmPasswordCtrl->Hide(); m_pAccountPasswordRequirmentsStaticCtrl->Hide(); - } - - if (!IS_ACCOUNTMANAGERWIZARD()) { + m_pAccountManagerLinkLabelStaticCtrl->Show(); + } else { + m_pAccountManagerLinkLabelStaticCtrl->Hide(); if (pc.account_creation_disabled || pc.client_account_creation_disabled) { m_pAccountCreateCtrl->SetValue(false); m_pAccountCreateCtrl->Hide(); @@ -333,7 +340,7 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event ) { } m_pTitleStaticCtrl->SetLabel( - _("User information") + _("Identify your account ") ); if (!IS_ACCOUNTMANAGERWIZARD() && !IS_ACCOUNTMANAGERUPDATEWIZARD()) { @@ -430,19 +437,25 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event ) { m_pAccountPasswordRequirmentsStaticCtrl->SetLabel( str ); } - m_pAccountForgotPasswordCtrl->SetLabel( - _("Forgot your password?") - ); if (!IS_ACCOUNTMANAGERWIZARD()) { - wxASSERT(pWAP); + m_pAccountForgotPasswordCtrl->SetLabel( + _("Forgot your password?") + ); m_pAccountForgotPasswordCtrl->SetURL( wxString(pWAP->m_ProjectInfoPage->GetProjectURL() + _T("get_passwd.php")) ); } else { -// wxASSERT(pWAM); + m_pAccountManagerLinkLabelStaticCtrl->SetLabel( + _("If you have not yet registered with this account manager,\n" + "please do so before proceeding. Click on the link below\n" + "to register or to retrieve a forgotten password." ) + ); + m_pAccountForgotPasswordCtrl->SetLabel( + _("Account manager website") + ); m_pAccountForgotPasswordCtrl->SetURL( - wxString(pWAP->m_AccountManagerInfoPage->GetProjectURL() + _T("get_passwd.php")) + wxString(pWAP->m_AccountManagerInfoPage->GetProjectURL()) ); } diff --git a/clientgui/AccountInfoPage.h b/clientgui/AccountInfoPage.h index 917e6ba21e..588e62c5c6 100644 --- a/clientgui/AccountInfoPage.h +++ b/clientgui/AccountInfoPage.h @@ -103,6 +103,7 @@ public: wxStaticText* m_pAccountConfirmPasswordStaticCtrl; wxTextCtrl* m_pAccountConfirmPasswordCtrl; wxStaticText* m_pAccountPasswordRequirmentsStaticCtrl; + wxStaticText* m_pAccountManagerLinkLabelStaticCtrl; wxString m_strAccountEmailAddress; wxString m_strAccountPassword; wxString m_strAccountConfirmPassword; diff --git a/clientgui/BOINCWizards.h b/clientgui/BOINCWizards.h index 30a7ec6874..6a8dd78057 100644 --- a/clientgui/BOINCWizards.h +++ b/clientgui/BOINCWizards.h @@ -105,7 +105,8 @@ #define ID_ACCOUNTCONFIRMPASSWORDSTATICCTRL 11406 #define ID_ACCOUNTCONFIRMPASSWORDCTRL 11407 #define ID_ACCOUNTREQUIREMENTSSTATICCTRL 11408 -#define ID_ACCOUNTFORGOTPASSWORDCTRL 11409 +#define ID_ACCOUNTLINKLABELSTATICCTRL 11409 +#define ID_ACCOUNTFORGOTPASSWORDCTRL 11410 // Proxy Page Controls #define ID_PROXYHTTPSERVERSTATICCTRL 11500