From 3fc4bf3ea9ad9d660dd908c46bd9e2ed9b8e8a39 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Thu, 31 Aug 2006 15:01:41 +0000
Subject: [PATCH] *** empty log message ***

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

diff --git a/checkin_notes b/checkin_notes
index e944dcdb51..c6de39a9b3 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -9536,3 +9536,12 @@ Rom    31 Aug 2006
         AccountInfoPage.cpp
         AccountManagerPropertiesPage.cpp
         ProjectPropertiesPage.cpp, .h
+
+David  31 Aug 2006
+	- Manager: if project doesn't allow account creation, say so,
+		and don't show yes/no radio buttons
+		NOTE: it still doesn't work right if you try alpha first,
+		and then cplan.
+
+    clientgui/
+        AccountInfoPage.cpp
diff --git a/clientgui/AccountInfoPage.cpp b/clientgui/AccountInfoPage.cpp
index a7c1c9fd2e..ef15e06f45 100644
--- a/clientgui/AccountInfoPage.cpp
+++ b/clientgui/AccountInfoPage.cpp
@@ -289,9 +289,9 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event ) {
     if (!IS_ACCOUNTMANAGERWIZARD()) {
         if (((CBOINCBaseWizard*)GetParent())->project_config.account_creation_disabled) {
             m_pAccountCreateCtrl->SetValue(false);
+           m_pAccountCreateCtrl->Hide();
             m_pAccountUseExistingCtrl->SetValue(true);
-
-            m_pAccountCreateCtrl->Disable();
+            m_pAccountUseExistingCtrl->Hide();
             m_pAccountConfirmPasswordStaticCtrl->Hide();
             m_pAccountConfirmPasswordCtrl->Hide();
             m_pAccountPasswordRequirmentsStaticCtrl->Hide();
@@ -308,9 +308,17 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event ) {
     );
 
     if (!IS_ACCOUNTMANAGERWIZARD() && !IS_ACCOUNTMANAGERUPDATEWIZARD()) {
-        m_pAccountQuestionStaticCtrl->SetLabel(
-            _("Are you already running this project?")
-        );
+		if (((CBOINCBaseWizard*)GetParent())->project_config.account_creation_disabled) {
+			m_pAccountQuestionStaticCtrl->SetLabel(
+				_("This project is not currently accepting new accounts.\n"
+					"You can attach only if you already have an account."
+				)
+			);
+		} else {
+			m_pAccountQuestionStaticCtrl->SetLabel(
+				_("Are you already running this project?")
+			);
+		}
         m_pAccountCreateCtrl->SetLabel(
             _("&No, new user")
         );
@@ -402,8 +410,7 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event ) {
         if (m_pAccountInformationStaticCtrl) {
             if (m_pAccountInformationStaticCtrl->GetLabel().IsEmpty()) {
                 m_pAccountInformationStaticCtrl->SetLabel(
-                    _("Enter the email address and password you used on\n"
-                    "the web site.")
+                    _("Enter the email address and password of your account\n")
                 );
             }
         }