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=9799
This commit is contained in:
Rom Walton 2006-04-05 07:48:14 +00:00
parent 5b39ce7f39
commit 07320bd57c
2 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
checkin_notes
View File

@ -3563,3 +3563,12 @@ David 4 Apr 2006
client_types.C,h client_types.C,h
cpu_sched.C cpu_sched.C
cs_scheduler.C cs_scheduler.C
Rom 5 Apr 2006
- Bug Fix: Set the AccountInfo.cpp control states before
attempting to set the text for the controls. Otherwise
we'll see text that says 'choose a password' instead
of 'password'.
clientgui/
AccountInfoPage.cpp

44
clientgui/AccountInfoPage.cpp
View File

@ -275,6 +275,29 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event ) {
} }
} }
if (IS_ACCOUNTMANAGERWIZARD() && IS_ACCOUNTMANAGERUPDATEWIZARD()) {
m_pAccountQuestionStaticCtrl->Hide();
m_pAccountCreateCtrl->SetValue(false);
m_pAccountCreateCtrl->Hide();
m_pAccountUseExistingCtrl->SetValue(true);
m_pAccountUseExistingCtrl->Hide();
m_pAccountConfirmPasswordStaticCtrl->Hide();
m_pAccountConfirmPasswordCtrl->Hide();
m_pAccountPasswordRequirmentsStaticCtrl->Hide();
}
if (((CBOINCBaseWizard*)GetParent())->project_config.account_creation_disabled) {
if (!IS_ACCOUNTMANAGERWIZARD()) {
m_pAccountCreateCtrl->SetValue(false);
m_pAccountCreateCtrl->Disable();
m_pAccountUseExistingCtrl->SetValue(true);
m_pAccountConfirmPasswordStaticCtrl->Hide();
m_pAccountConfirmPasswordCtrl->Hide();
m_pAccountPasswordRequirmentsStaticCtrl->Hide();
}
}
m_pTitleStaticCtrl->SetLabel( m_pTitleStaticCtrl->SetLabel(
_("User information") _("User information")
); );
@ -296,21 +319,12 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event ) {
); );
} }
} else { } else {
m_pAccountQuestionStaticCtrl->Hide();
m_pAccountCreateCtrl->SetValue(FALSE);
m_pAccountCreateCtrl->Hide();
m_pAccountUseExistingCtrl->SetValue(TRUE);
m_pAccountUseExistingCtrl->Hide();
m_pAccountPasswordRequirmentsStaticCtrl->Hide();
if (wxGetApp().GetBrand()->IsBranded() && if (wxGetApp().GetBrand()->IsBranded() &&
!wxGetApp().GetBrand()->GetAMWizardAccountInfoText().IsEmpty()) { !wxGetApp().GetBrand()->GetAMWizardAccountInfoText().IsEmpty()) {
m_pAccountInformationStaticCtrl->SetLabel( m_pAccountInformationStaticCtrl->SetLabel(
wxGetApp().GetBrand()->GetAMWizardAccountInfoText() wxGetApp().GetBrand()->GetAMWizardAccountInfoText()
); );
} }
m_pAccountConfirmPasswordStaticCtrl->Hide();
m_pAccountConfirmPasswordCtrl->Hide();
} }
if (m_pAccountUseExistingCtrl->GetValue()) { if (m_pAccountUseExistingCtrl->GetValue()) {
@ -327,18 +341,6 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event ) {
_("C&onfirm password:") _("C&onfirm password:")
); );
if (((CBOINCBaseWizard*)GetParent())->project_config.account_creation_disabled) {
if (!IS_ACCOUNTMANAGERWIZARD()) {
m_pAccountCreateCtrl->SetValue(false);
m_pAccountUseExistingCtrl->SetValue(true);
m_pAccountConfirmPasswordStaticCtrl->Hide();
m_pAccountConfirmPasswordCtrl->Hide();
m_pAccountPasswordRequirmentsStaticCtrl->Hide();
m_pAccountCreateCtrl->Disable();
}
}
if (!((CBOINCBaseWizard*)GetParent())->project_name.IsEmpty()) { if (!((CBOINCBaseWizard*)GetParent())->project_name.IsEmpty()) {
wxString strQuestion; wxString strQuestion;
strQuestion.Printf( strQuestion.Printf(