From 07320bd57ccfe24e4a9cb2489e9e2bdc4e1eae88 Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Wed, 5 Apr 2006 07:48:14 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=9799
---
 checkin_notes                 |  9 +++++++
 clientgui/AccountInfoPage.cpp | 44 ++++++++++++++++++-----------------
 2 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 2e5e832b5f..6c811a934c 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -3563,3 +3563,12 @@ David  4 Apr 2006
         client_types.C,h
         cpu_sched.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
diff --git a/clientgui/AccountInfoPage.cpp b/clientgui/AccountInfoPage.cpp
index 070f0a20b3..f6adb863cf 100644
--- a/clientgui/AccountInfoPage.cpp
+++ b/clientgui/AccountInfoPage.cpp
@@ -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(
         _("User information")
     );
@@ -296,21 +319,12 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event ) {
             );
         }
     } 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() && 
             !wxGetApp().GetBrand()->GetAMWizardAccountInfoText().IsEmpty()) {
             m_pAccountInformationStaticCtrl->SetLabel(
                 wxGetApp().GetBrand()->GetAMWizardAccountInfoText()
             );
         }
-        m_pAccountConfirmPasswordStaticCtrl->Hide();
-        m_pAccountConfirmPasswordCtrl->Hide();
     }
 
     if (m_pAccountUseExistingCtrl->GetValue()) {
@@ -327,18 +341,6 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event ) {
         _("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()) {
         wxString strQuestion;
         strQuestion.Printf(