From dd09f559f1f88825fc6507dd79149a69e397b3eb Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Mon, 6 Mar 2006 17:31:02 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=9601
---
 checkin_notes                 |  8 ++++++++
 clientgui/AccountInfoPage.cpp | 19 ++++++++++++++++---
 clientgui/CompletionPage.cpp  | 28 ++++++++++++++++++----------
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index bd29860cf7..3e5655460c 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -2606,3 +2606,11 @@ David  5 Mar 2006
     client/
         cs_scheduler.C
         file_names.h
+
+Rom    6 Mar 2006
+    - Bug Fix: Fix a couple text issues when using an existing account
+        in the wizard
+        
+    clientgui/
+        AccountInfoPage.cpp
+        CompletionPage.cpp
diff --git a/clientgui/AccountInfoPage.cpp b/clientgui/AccountInfoPage.cpp
index 7654c70f3f..ef1abf563b 100644
--- a/clientgui/AccountInfoPage.cpp
+++ b/clientgui/AccountInfoPage.cpp
@@ -309,9 +309,16 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event ) {
         m_pAccountConfirmPasswordCtrl->Hide();
     }
 
-    m_pAccountPasswordStaticCtrl->SetLabel(
-        _("Choose a &password:")
-    );
+    if (m_pAccountUseExistingCtrl->GetValue()) {
+        m_pAccountPasswordStaticCtrl->SetLabel(
+            _("&Password:")
+        );
+    } else {
+        m_pAccountPasswordStaticCtrl->SetLabel(
+            _("Choose a &password:")
+        );
+    }
+
     m_pAccountConfirmPasswordStaticCtrl->SetLabel(
         _("C&onfirm password:")
     );
@@ -477,6 +484,9 @@ void CAccountInfoPage::OnCancel( wxWizardExEvent& event ) {
  */
  
 void CAccountInfoPage::OnAccountUseExistingCtrlSelected( wxCommandEvent& event ) {
+    m_pAccountPasswordStaticCtrl->SetLabel(
+        _("&Password:")
+    );
     m_pAccountConfirmPasswordStaticCtrl->Hide();
     m_pAccountConfirmPasswordCtrl->Hide();
     m_pAccountEmailAddressCtrl->SetFocus();
@@ -488,6 +498,9 @@ void CAccountInfoPage::OnAccountUseExistingCtrlSelected( wxCommandEvent& event )
  */
  
 void CAccountInfoPage::OnAccountCreateCtrlSelected( wxCommandEvent& event ) {
+    m_pAccountPasswordStaticCtrl->SetLabel(
+        _("Choose a &password:")
+    );
     m_pAccountConfirmPasswordStaticCtrl->Show();
     m_pAccountConfirmPasswordCtrl->Show();
     m_pAccountEmailAddressCtrl->SetFocus();
diff --git a/clientgui/CompletionPage.cpp b/clientgui/CompletionPage.cpp
index 074d3fe505..dc1829d555 100644
--- a/clientgui/CompletionPage.cpp
+++ b/clientgui/CompletionPage.cpp
@@ -182,6 +182,8 @@ wxIcon CCompletionPage::GetIconResource( const wxString& name )
 void CCompletionPage::OnPageChanged( wxWizardExEvent& event ) {
     if (event.GetDirection() == false) return;
 
+    CWizardAttachProject* pWAP = ((CWizardAttachProject*)GetParent());
+
     wxASSERT(m_pCompletionTitle);
     wxASSERT(m_pCompletionWelcome);
     wxASSERT(m_pCompletionBrandedMessage);
@@ -210,17 +212,23 @@ void CCompletionPage::OnPageChanged( wxWizardExEvent& event ) {
 
         m_pCompletionBrandedMessage->SetLabel( strBrandedMessage );
 
-        wxString strMessage;
-        if (wxGetApp().GetBrand()->IsBranded() && 
-            !wxGetApp().GetBrand()->GetAPWizardCompletionMessage().IsEmpty()) {
-            strMessage = wxGetApp().GetBrand()->GetAPWizardCompletionMessage();
-        } else {
-            strMessage = 
-                _("When you click Finish, your web browser will go to a page where\n"
-                  "you can set your account name and preferences.");
-        }
+        if (pWAP->m_AccountInfoPage->m_pAccountCreateCtrl->GetValue()) {
+            wxString strMessage;
+            if (wxGetApp().GetBrand()->IsBranded() && 
+                !wxGetApp().GetBrand()->GetAPWizardCompletionMessage().IsEmpty()) {
+                strMessage = wxGetApp().GetBrand()->GetAPWizardCompletionMessage();
+            } else {
+                strMessage = 
+                    _("When you click Finish, your web browser will go to a page where\n"
+                    "you can set your account name and preferences.");
+            }
 
-        m_pCompletionMessage->SetLabel( strMessage );
+            m_pCompletionMessage->SetLabel( strMessage );
+        } else {
+            m_pCompletionMessage->SetLabel(
+                _("Click Finish to close.")
+            );
+        }
 
     } else if (IS_ACCOUNTMANAGERWIZARD()) {