From 4eacc27765650c1cee03ce5aa7c222dd08514486 Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Fri, 13 Oct 2006 17:02:28 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=11282
---
 checkin_notes                     | 9 +++++++++
 clientgui/BOINCBaseWizard.cpp     | 2 ++
 clientgui/BOINCBaseWizard.h       | 1 +
 clientgui/CompletionPage.cpp      | 6 ++++++
 clientgui/WizardAttachProject.cpp | 1 +
 5 files changed, 19 insertions(+)

diff --git a/checkin_notes b/checkin_notes
index c92ec9e683..b6ff71b4a9 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -11099,3 +11099,12 @@ Rom    12 Oct 2006
     clientgui/
         AdvancedFrame.cpp
 
+Rom    13 Oct 2006
+    - If we have received the authenticator via a setup cookie then run the
+        wizard in a completely automated fashion. Only stop if there was an
+        error.
+        
+    clientgui/
+        BOINCBaseWizard.cpp, .h
+        CompletionPage.cpp
+        WizardAttachProject.cpp
diff --git a/clientgui/BOINCBaseWizard.cpp b/clientgui/BOINCBaseWizard.cpp
index f76521c042..13915cef4a 100644
--- a/clientgui/BOINCBaseWizard.cpp
+++ b/clientgui/BOINCBaseWizard.cpp
@@ -46,6 +46,7 @@ CBOINCBaseWizard::CBOINCBaseWizard() :
     IsAccountManagerWizard = false;
     IsAccountManagerUpdateWizard = false;
     IsAccountManagerRemoveWizard = false;
+    close_when_completed = false;
 }
 
 CBOINCBaseWizard::CBOINCBaseWizard(wxWindow *parent, int id, const wxString& title, const wxBitmap& bitmap, const wxPoint& pos, long style) :
@@ -55,6 +56,7 @@ CBOINCBaseWizard::CBOINCBaseWizard(wxWindow *parent, int id, const wxString& tit
     IsAccountManagerWizard = false;
     IsAccountManagerUpdateWizard = false;
     IsAccountManagerRemoveWizard = false;
+    close_when_completed = false;
 }
 
 /*!
diff --git a/clientgui/BOINCBaseWizard.h b/clientgui/BOINCBaseWizard.h
index 15f850da70..172ae45583 100644
--- a/clientgui/BOINCBaseWizard.h
+++ b/clientgui/BOINCBaseWizard.h
@@ -82,6 +82,7 @@ public:
     ACCOUNT_OUT         account_out;
     bool                account_created_successfully;
     bool                attached_to_project_successfully;
+    bool                close_when_completed;
     wxString            project_name;
     wxString            project_url;
     wxString            project_authenticator;
diff --git a/clientgui/CompletionPage.cpp b/clientgui/CompletionPage.cpp
index f453b92b7f..b335bd4b09 100644
--- a/clientgui/CompletionPage.cpp
+++ b/clientgui/CompletionPage.cpp
@@ -328,6 +328,12 @@ void CCompletionPage::OnPageChanged( wxWizardExEvent& event ) {
     }
 
     Fit();
+
+    // Is this supposed to be completely automated?
+    // If so, then go ahead and close the wizard down now.
+    if (pWAP->close_when_completed) {
+        pWAP->SimulateNextButton();
+    }
 }
   
 /*!
diff --git a/clientgui/WizardAttachProject.cpp b/clientgui/WizardAttachProject.cpp
index cb2b36a2ce..5c59b57327 100644
--- a/clientgui/WizardAttachProject.cpp
+++ b/clientgui/WizardAttachProject.cpp
@@ -284,6 +284,7 @@ bool CWizardAttachProject::Run( wxString& WXUNUSED(strName), wxString& strURL, b
 
         if (DetectSetupAuthenticator(strURL.mbc_str(), szAuthenticator, &dwSize)) {
             m_bCredentialsDetected = true;
+            close_when_completed = true;
             m_AccountKeyPage->m_strAccountKey = szAuthenticator;
         }
     }