*** empty log message ***

svn path=/trunk/boinc/; revision=8432

checkin_notes

@@ -12590,3 +12590,67 @@ David  3 Oct 2005
 
     html/user/
         edit_email_action.php
+
+Rom    3 Oct 2005
+    - Even though it is bad practice to change build tree structure during
+        a code freeze, we are going to move the wizard files into the
+        clientgui directory to get around some funky mac build environment
+        problem.
+    - Force Input focus on wizard pages that prompt for input on the text
+        controls instead of leaving it to the dialog management code to
+        figure out.
+        
+    clientgui/
+        AccountInfoPage.cpp, .h (Added)
+        AccountKeyPage.cpp, .h (Added)
+        AccountManagerInfoPage.cpp, .h (Added)
+        AccountManagerProcessingPage.cpp, .h (Added)
+        AccountManagerPropertiesPage.cpp, .h (Added)
+        AlreadyAttachedPage.cpp, .h (Added)
+        AlreadyExistsPage.cpp, .h (Added)
+        BOINCBaseWizard.cpp, .h (Added)
+        BOINCWizards.h (Added)
+        CompletionErrorPage.cpp, .h (Added)
+        CompletionPage.cpp, .h (Added)
+        DlgAbout.cpp
+        MainFrame.cpp
+        Makefile.am
+        NoInternetConnectionPage.cpp, .h (Added)
+        NotDetectedPage.cpp, .h (Added)
+        NotFoundPage.cpp, .h (Added)
+        ProjectInfoPage.cpp, .h (Added)
+        ProjectProcessingPage.cpp, .h (Added)
+        ProjectPropertiesPage.cpp, .h (Added)
+        ProxyPage.cpp, .h (Added)
+        UnavailablePage.cpp, .h (Added)
+        WelcomePage.cpp, .h (Added)
+        WizardAccountManager.cpp, .h (Added)
+        WizardAttachProject.cpp, .h (Added)
+        wizardex.cpp, .h (Added)
+    clientgui/wizards
+        AccountInfoPage.cpp, .h (Removed)
+        AccountKeyPage.cpp, .h (Removed)
+        AccountManagerInfoPage.cpp, .h (Removed)
+        AccountManagerProcessingPage.cpp, .h (Removed)
+        AccountManagerPropertiesPage.cpp, .h (Removed)
+        AlreadyAttachedPage.cpp, .h (Removed)
+        AlreadyExistsPage.cpp, .h (Removed)
+        BOINCBaseWizard.cpp, .h (Removed)
+        BOINCWizards.h (Removed)
+        CompletionErrorPage.cpp, .h (Removed)
+        CompletionPage.cpp, .h (Removed)
+        NoInternetConnectionPage.cpp, .h (Removed)
+        NotDetectedPage.cpp, .h (Removed)
+        NotFoundPage.cpp, .h (Removed)
+        ProjectInfoPage.cpp, .h (Removed)
+        ProjectProcessingPage.cpp, .h (Removed)
+        ProjectPropertiesPage.cpp, .h (Removed)
+        ProxyPage.cpp, .h (Removed)
+        UnavailablePage.cpp, .h (Removed)
+        WelcomePage.cpp, .h (Removed)
+        WizardAccountManager.cpp, .h (Removed)
+        WizardAttachProject.cpp, .h (Removed)
+        wizardex.cpp, .h (Removed)
+    lib/
+        gui_rpc_client.C
+        gui_rpc_client_ops.C

clientgui/AccountInfoPage.cpp

@@ -260,6 +260,8 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event )
         }
     }
 
+    if (m_AccountEmailAddressCtrl) m_AccountEmailAddressCtrl->SetFocus();
+
     if (((CBOINCBaseWizard*)GetParent())->project_config.client_account_creation_disabled) {
         if (!IS_ACCOUNTMANAGERWIZARD()) {
             m_AccountCreateCtrl->SetValue(false);

clientgui/AccountKeyPage.cpp

@@ -205,7 +205,7 @@ wxIcon CAccountKeyPage::GetIconResource( const wxString& name )
  */
  
 void CAccountKeyPage::OnPageChanged( wxWizardExEvent& event ) {
-    event.Skip();
+    if (m_AccountKeyCtrl) m_AccountKeyCtrl->SetFocus();
 }
   
 /*!

clientgui/AccountManagerInfoPage.cpp

@@ -148,7 +148,7 @@ void CAccountManagerInfoPage::CreateControls()
  */
 
 void CAccountManagerInfoPage::OnPageChanged( wxWizardExEvent& event ) {
-    event.Skip();
+    if (m_AccountManagerUrlCtrl) m_AccountManagerUrlCtrl->SetFocus();
 }
 
 /*!

clientgui/DlgAbout.cpp

@@ -30,7 +30,7 @@
 #include "DlgAbout.h"
 
 #ifdef __WXMSW__
-#include "version.h"
+#include "../version.h"
 #else
 #include "config.h"
 #endif

clientgui/MainFrame.cpp

@@ -38,11 +38,11 @@
 #include "DlgAccountManagerStatus.h"
 #include "DlgDialupCredentials.h"
 #include "DlgSelectComputer.h"
-#include "wizards/wizardex.h"
-#include "wizards/BOINCWizards.h"
-#include "wizards/BOINCBaseWizard.h"
-#include "wizards/WizardAttachProject.h"
-#include "wizards/WizardAccountManager.h"
+#include "wizardex.h"
+#include "BOINCWizards.h"
+#include "BOINCBaseWizard.h"
+#include "WizardAttachProject.h"
+#include "WizardAccountManager.h"
 
 #include "res/BOINCGUIApp.xpm"
 #include "res/connect.xpm"

clientgui/Makefile.am

@@ -43,28 +43,28 @@ boinc_gui_SOURCES = \
     ViewStatistics.cpp \
     ViewTransfers.cpp \
     ViewWork.cpp \
-    wizards/AccountInfoPage.cpp \
-    wizards/AccountKeyPage.cpp \
-    wizards/AccountManagerInfoPage.cpp \
-    wizards/AccountManagerProcessingPage.cpp \
-    wizards/AccountManagerPropertiesPage.cpp \
-    wizards/AlreadyAttachedPage.cpp \
-    wizards/AlreadyExistsPage.cpp \
-    wizards/BOINCBaseWizard.cpp \
-    wizards/CompletionErrorPage.cpp \
-    wizards/CompletionPage.cpp \
-    wizards/NoInternetConnectionPage.cpp \
-    wizards/NotDetectedPage.cpp \
-    wizards/NotFoundPage.cpp \
-    wizards/ProjectInfoPage.cpp \
-    wizards/ProjectProcessingPage.cpp \
-    wizards/ProjectPropertiesPage.cpp \
-    wizards/ProxyPage.cpp \
-    wizards/UnavailablePage.cpp \
-    wizards/WelcomePage.cpp \
-    wizards/WizardAccountManager.cpp \
-    wizards/WizardAttachProject.cpp \
-    wizards/wizardex.cpp \
+    AccountInfoPage.cpp \
+    AccountKeyPage.cpp \
+    AccountManagerInfoPage.cpp \
+    AccountManagerProcessingPage.cpp \
+    AccountManagerPropertiesPage.cpp \
+    AlreadyAttachedPage.cpp \
+    AlreadyExistsPage.cpp \
+    BOINCBaseWizard.cpp \
+    CompletionErrorPage.cpp \
+    CompletionPage.cpp \
+    NoInternetConnectionPage.cpp \
+    NotDetectedPage.cpp \
+    NotFoundPage.cpp \
+    ProjectInfoPage.cpp \
+    ProjectProcessingPage.cpp \
+    ProjectPropertiesPage.cpp \
+    ProxyPage.cpp \
+    UnavailablePage.cpp \
+    WelcomePage.cpp \
+    WizardAccountManager.cpp \
+    WizardAttachProject.cpp \
+    wizardex.cpp \
     hyperlink.cpp $(mac_sources)
 
 EXTRA_DIST = *.h \

clientgui/ProjectInfoPage.cpp

@@ -205,7 +205,7 @@ wxIcon CProjectInfoPage::GetIconResource( const wxString& name )
  */
 
 void CProjectInfoPage::OnPageChanged( wxWizardExEvent& event ) {
-    event.Skip();
+    if (m_ProjectUrlCtrl) m_ProjectUrlCtrl->SetFocus();
 }
   
 /*!

clientgui/ProxyPage.cpp

@@ -312,6 +312,8 @@ void CErrProxyPage::OnPageChanged( wxWizardExEvent& event ) {
 
         strBuffer.Printf(wxT("%d"), pDoc->proxy_info.socks_server_port);
         m_ProxySOCKSPortCtrl->SetValue(strBuffer);
+
+        m_ProxyHTTPServerCtrl->SetFocus();
     }
 }
  

lib/gui_rpc_client.C

@@ -25,7 +25,7 @@
 #endif
 
 #ifdef _WIN32
-#include "version.h"
+#include "../version.h"
 #else
 #include "config.h"
 #include <sys/types.h>

lib/gui_rpc_client_ops.C

@@ -26,7 +26,7 @@
 #endif
 
 #ifdef _WIN32
-#include "version.h"
+#include "../version.h"
 #else
 #include "config.h"
 #include <sys/types.h>

win_build/boincmgr_curl.vcproj

@@ -23,7 +23,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				GlobalOptimizations="TRUE"
-				AdditionalIncludeDirectories=""$(WXWIN)\include";"$(WXWIN)\contrib\include";"$(WXWIN)\lib\vc_lib\msw";..\lib;..\api;..\clientgui;..\client\win;..\;"
+				AdditionalIncludeDirectories=""$(WXWIN)\include";"$(WXWIN)\contrib\include";"$(WXWIN)\lib\vc_lib\msw";..\lib;..\api;..\clientgui;..\client\win"
 				PreprocessorDefinitions="WIN32;_WIN32;_NDEBUG;_WINDOWS;_MT;_DLL;__WXNDEBUG__;WXNDEBUG;wxUSE_GUI=1"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -85,7 +85,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(WXWIN)\contrib\include&quot;;&quot;$(WXWIN)\include&quot;;&quot;$(WXWIN)\lib\vc_lib\mswd&quot;;..\lib;..\api;..\clientgui;..\client\win;..\;"
+				AdditionalIncludeDirectories="&quot;$(WXWIN)\contrib\include&quot;;&quot;$(WXWIN)\include&quot;;&quot;$(WXWIN)\lib\vc_lib\mswd&quot;;..\lib;..\api;..\clientgui;..\client\win"
 				PreprocessorDefinitions="WIN32;_WIN32;_DEBUG;_WINDOWS;_MT;__WXDEBUG__;WXDEBUG;wxUSE_GUI=1"
 				StringPooling="FALSE"
 				MinimalRebuild="FALSE"
@@ -365,139 +365,139 @@
 			Name="Wizards"
 			Filter="">
 			<File
-				RelativePath="..\clientgui\wizards\AccountInfoPage.cpp">
+				RelativePath="..\clientgui\AccountInfoPage.cpp">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\AccountInfoPage.h">
+				RelativePath="..\clientgui\AccountInfoPage.h">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\AccountKeyPage.cpp">
+				RelativePath="..\clientgui\AccountKeyPage.cpp">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\AccountKeyPage.h">
+				RelativePath="..\clientgui\AccountKeyPage.h">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\AccountManagerInfoPage.cpp">
+				RelativePath="..\clientgui\AccountManagerInfoPage.cpp">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\AccountManagerInfoPage.h">
+				RelativePath="..\clientgui\AccountManagerInfoPage.h">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\AccountManagerProcessingPage.cpp">
+				RelativePath="..\clientgui\AccountManagerProcessingPage.cpp">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\AccountManagerProcessingPage.h">
+				RelativePath="..\clientgui\AccountManagerProcessingPage.h">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\AccountManagerPropertiesPage.cpp">
+				RelativePath="..\clientgui\AccountManagerPropertiesPage.cpp">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\AccountManagerPropertiesPage.h">
+				RelativePath="..\clientgui\AccountManagerPropertiesPage.h">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\AlreadyAttachedPage.cpp">
+				RelativePath="..\clientgui\AlreadyAttachedPage.cpp">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\AlreadyAttachedPage.h">
+				RelativePath="..\clientgui\AlreadyAttachedPage.h">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\AlreadyExistsPage.cpp">
+				RelativePath="..\clientgui\AlreadyExistsPage.cpp">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\AlreadyExistsPage.h">
+				RelativePath="..\clientgui\AlreadyExistsPage.h">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\BOINCBaseWizard.cpp">
+				RelativePath="..\clientgui\BOINCBaseWizard.cpp">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\BOINCBaseWizard.h">
+				RelativePath="..\clientgui\BOINCBaseWizard.h">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\BOINCWizards.h">
+				RelativePath="..\clientgui\BOINCWizards.h">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\CompletionErrorPage.cpp">
+				RelativePath="..\clientgui\CompletionErrorPage.cpp">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\CompletionErrorPage.h">
+				RelativePath="..\clientgui\CompletionErrorPage.h">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\CompletionPage.cpp">
+				RelativePath="..\clientgui\CompletionPage.cpp">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\CompletionPage.h">
+				RelativePath="..\clientgui\CompletionPage.h">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\NoInternetConnectionPage.cpp">
+				RelativePath="..\clientgui\NoInternetConnectionPage.cpp">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\NoInternetConnectionPage.h">
+				RelativePath="..\clientgui\NoInternetConnectionPage.h">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\NotDetectedPage.cpp">
+				RelativePath="..\clientgui\NotDetectedPage.cpp">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\NotDetectedPage.h">
+				RelativePath="..\clientgui\NotDetectedPage.h">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\NotFoundPage.cpp">
+				RelativePath="..\clientgui\NotFoundPage.cpp">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\NotFoundPage.h">
+				RelativePath="..\clientgui\NotFoundPage.h">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\ProjectInfoPage.cpp">
+				RelativePath="..\clientgui\ProjectInfoPage.cpp">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\ProjectInfoPage.h">
+				RelativePath="..\clientgui\ProjectInfoPage.h">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\ProjectProcessingPage.cpp">
+				RelativePath="..\clientgui\ProjectProcessingPage.cpp">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\ProjectProcessingPage.h">
+				RelativePath="..\clientgui\ProjectProcessingPage.h">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\ProjectPropertiesPage.cpp">
+				RelativePath="..\clientgui\ProjectPropertiesPage.cpp">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\ProjectPropertiesPage.h">
+				RelativePath="..\clientgui\ProjectPropertiesPage.h">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\ProxyPage.cpp">
+				RelativePath="..\clientgui\ProxyPage.cpp">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\ProxyPage.h">
+				RelativePath="..\clientgui\ProxyPage.h">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\UnavailablePage.cpp">
+				RelativePath="..\clientgui\UnavailablePage.cpp">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\UnavailablePage.h">
+				RelativePath="..\clientgui\UnavailablePage.h">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\WelcomePage.cpp">
+				RelativePath="..\clientgui\WelcomePage.cpp">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\WelcomePage.h">
+				RelativePath="..\clientgui\WelcomePage.h">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\WizardAccountManager.cpp">
+				RelativePath="..\clientgui\WizardAccountManager.cpp">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\WizardAccountManager.h">
+				RelativePath="..\clientgui\WizardAccountManager.h">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\WizardAttachProject.cpp">
+				RelativePath="..\clientgui\WizardAttachProject.cpp">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\WizardAttachProject.h">
+				RelativePath="..\clientgui\WizardAttachProject.h">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\wizardex.cpp">
+				RelativePath="..\clientgui\wizardex.cpp">
 			</File>
 			<File
-				RelativePath="..\clientgui\wizards\wizardex.h">
+				RelativePath="..\clientgui\wizardex.h">
 			</File>
 		</Filter>
 		<Filter