diff --git a/checkin_notes b/checkin_notes index 7e5ce0f815..c7f677b1d2 100755 --- a/checkin_notes +++ b/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 diff --git a/clientgui/wizards/AccountInfoPage.cpp b/clientgui/AccountInfoPage.cpp similarity index 99% rename from clientgui/wizards/AccountInfoPage.cpp rename to clientgui/AccountInfoPage.cpp index 155a12212d..405271bc76 100644 --- a/clientgui/wizards/AccountInfoPage.cpp +++ b/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); diff --git a/clientgui/wizards/AccountInfoPage.h b/clientgui/AccountInfoPage.h similarity index 100% rename from clientgui/wizards/AccountInfoPage.h rename to clientgui/AccountInfoPage.h diff --git a/clientgui/wizards/AccountKeyPage.cpp b/clientgui/AccountKeyPage.cpp similarity index 99% rename from clientgui/wizards/AccountKeyPage.cpp rename to clientgui/AccountKeyPage.cpp index 74be106baa..e344b64978 100644 --- a/clientgui/wizards/AccountKeyPage.cpp +++ b/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(); } /*! diff --git a/clientgui/wizards/AccountKeyPage.h b/clientgui/AccountKeyPage.h similarity index 100% rename from clientgui/wizards/AccountKeyPage.h rename to clientgui/AccountKeyPage.h diff --git a/clientgui/wizards/AccountManagerInfoPage.cpp b/clientgui/AccountManagerInfoPage.cpp similarity index 99% rename from clientgui/wizards/AccountManagerInfoPage.cpp rename to clientgui/AccountManagerInfoPage.cpp index 0c12bd1854..433027b9a7 100644 --- a/clientgui/wizards/AccountManagerInfoPage.cpp +++ b/clientgui/AccountManagerInfoPage.cpp @@ -148,7 +148,7 @@ void CAccountManagerInfoPage::CreateControls() */ void CAccountManagerInfoPage::OnPageChanged( wxWizardExEvent& event ) { - event.Skip(); + if (m_AccountManagerUrlCtrl) m_AccountManagerUrlCtrl->SetFocus(); } /*! diff --git a/clientgui/wizards/AccountManagerInfoPage.h b/clientgui/AccountManagerInfoPage.h similarity index 100% rename from clientgui/wizards/AccountManagerInfoPage.h rename to clientgui/AccountManagerInfoPage.h diff --git a/clientgui/wizards/AccountManagerProcessingPage.cpp b/clientgui/AccountManagerProcessingPage.cpp similarity index 100% rename from clientgui/wizards/AccountManagerProcessingPage.cpp rename to clientgui/AccountManagerProcessingPage.cpp diff --git a/clientgui/wizards/AccountManagerProcessingPage.h b/clientgui/AccountManagerProcessingPage.h similarity index 100% rename from clientgui/wizards/AccountManagerProcessingPage.h rename to clientgui/AccountManagerProcessingPage.h diff --git a/clientgui/wizards/AccountManagerPropertiesPage.cpp b/clientgui/AccountManagerPropertiesPage.cpp similarity index 100% rename from clientgui/wizards/AccountManagerPropertiesPage.cpp rename to clientgui/AccountManagerPropertiesPage.cpp diff --git a/clientgui/wizards/AccountManagerPropertiesPage.h b/clientgui/AccountManagerPropertiesPage.h similarity index 100% rename from clientgui/wizards/AccountManagerPropertiesPage.h rename to clientgui/AccountManagerPropertiesPage.h diff --git a/clientgui/wizards/AlreadyAttachedPage.cpp b/clientgui/AlreadyAttachedPage.cpp similarity index 100% rename from clientgui/wizards/AlreadyAttachedPage.cpp rename to clientgui/AlreadyAttachedPage.cpp diff --git a/clientgui/wizards/AlreadyAttachedPage.h b/clientgui/AlreadyAttachedPage.h similarity index 100% rename from clientgui/wizards/AlreadyAttachedPage.h rename to clientgui/AlreadyAttachedPage.h diff --git a/clientgui/wizards/AlreadyExistsPage.cpp b/clientgui/AlreadyExistsPage.cpp similarity index 100% rename from clientgui/wizards/AlreadyExistsPage.cpp rename to clientgui/AlreadyExistsPage.cpp diff --git a/clientgui/wizards/AlreadyExistsPage.h b/clientgui/AlreadyExistsPage.h similarity index 100% rename from clientgui/wizards/AlreadyExistsPage.h rename to clientgui/AlreadyExistsPage.h diff --git a/clientgui/wizards/BOINCBaseWizard.cpp b/clientgui/BOINCBaseWizard.cpp similarity index 100% rename from clientgui/wizards/BOINCBaseWizard.cpp rename to clientgui/BOINCBaseWizard.cpp diff --git a/clientgui/wizards/BOINCBaseWizard.h b/clientgui/BOINCBaseWizard.h similarity index 100% rename from clientgui/wizards/BOINCBaseWizard.h rename to clientgui/BOINCBaseWizard.h diff --git a/clientgui/wizards/BOINCWizards.h b/clientgui/BOINCWizards.h similarity index 100% rename from clientgui/wizards/BOINCWizards.h rename to clientgui/BOINCWizards.h diff --git a/clientgui/wizards/CompletionErrorPage.cpp b/clientgui/CompletionErrorPage.cpp similarity index 100% rename from clientgui/wizards/CompletionErrorPage.cpp rename to clientgui/CompletionErrorPage.cpp diff --git a/clientgui/wizards/CompletionErrorPage.h b/clientgui/CompletionErrorPage.h similarity index 100% rename from clientgui/wizards/CompletionErrorPage.h rename to clientgui/CompletionErrorPage.h diff --git a/clientgui/wizards/CompletionPage.cpp b/clientgui/CompletionPage.cpp similarity index 100% rename from clientgui/wizards/CompletionPage.cpp rename to clientgui/CompletionPage.cpp diff --git a/clientgui/wizards/CompletionPage.h b/clientgui/CompletionPage.h similarity index 100% rename from clientgui/wizards/CompletionPage.h rename to clientgui/CompletionPage.h diff --git a/clientgui/DlgAbout.cpp b/clientgui/DlgAbout.cpp index d2d57a8e92..8b3539e237 100644 --- a/clientgui/DlgAbout.cpp +++ b/clientgui/DlgAbout.cpp @@ -30,7 +30,7 @@ #include "DlgAbout.h" #ifdef __WXMSW__ -#include "version.h" +#include "../version.h" #else #include "config.h" #endif diff --git a/clientgui/MainFrame.cpp b/clientgui/MainFrame.cpp index 1f19d35fee..d261d583a0 100644 --- a/clientgui/MainFrame.cpp +++ b/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" diff --git a/clientgui/Makefile.am b/clientgui/Makefile.am index c0793636df..3502e4dc06 100644 --- a/clientgui/Makefile.am +++ b/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 \ diff --git a/clientgui/wizards/NoInternetConnectionPage.cpp b/clientgui/NoInternetConnectionPage.cpp similarity index 100% rename from clientgui/wizards/NoInternetConnectionPage.cpp rename to clientgui/NoInternetConnectionPage.cpp diff --git a/clientgui/wizards/NoInternetConnectionPage.h b/clientgui/NoInternetConnectionPage.h similarity index 100% rename from clientgui/wizards/NoInternetConnectionPage.h rename to clientgui/NoInternetConnectionPage.h diff --git a/clientgui/wizards/NotDetectedPage.cpp b/clientgui/NotDetectedPage.cpp similarity index 100% rename from clientgui/wizards/NotDetectedPage.cpp rename to clientgui/NotDetectedPage.cpp diff --git a/clientgui/wizards/NotDetectedPage.h b/clientgui/NotDetectedPage.h similarity index 100% rename from clientgui/wizards/NotDetectedPage.h rename to clientgui/NotDetectedPage.h diff --git a/clientgui/wizards/NotFoundPage.cpp b/clientgui/NotFoundPage.cpp similarity index 100% rename from clientgui/wizards/NotFoundPage.cpp rename to clientgui/NotFoundPage.cpp diff --git a/clientgui/wizards/NotFoundPage.h b/clientgui/NotFoundPage.h similarity index 100% rename from clientgui/wizards/NotFoundPage.h rename to clientgui/NotFoundPage.h diff --git a/clientgui/wizards/ProjectInfoPage.cpp b/clientgui/ProjectInfoPage.cpp similarity index 99% rename from clientgui/wizards/ProjectInfoPage.cpp rename to clientgui/ProjectInfoPage.cpp index 081caeb768..97606e9496 100644 --- a/clientgui/wizards/ProjectInfoPage.cpp +++ b/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(); } /*! diff --git a/clientgui/wizards/ProjectInfoPage.h b/clientgui/ProjectInfoPage.h similarity index 100% rename from clientgui/wizards/ProjectInfoPage.h rename to clientgui/ProjectInfoPage.h diff --git a/clientgui/wizards/ProjectProcessingPage.cpp b/clientgui/ProjectProcessingPage.cpp similarity index 100% rename from clientgui/wizards/ProjectProcessingPage.cpp rename to clientgui/ProjectProcessingPage.cpp diff --git a/clientgui/wizards/ProjectProcessingPage.h b/clientgui/ProjectProcessingPage.h similarity index 100% rename from clientgui/wizards/ProjectProcessingPage.h rename to clientgui/ProjectProcessingPage.h diff --git a/clientgui/wizards/ProjectPropertiesPage.cpp b/clientgui/ProjectPropertiesPage.cpp similarity index 100% rename from clientgui/wizards/ProjectPropertiesPage.cpp rename to clientgui/ProjectPropertiesPage.cpp diff --git a/clientgui/wizards/ProjectPropertiesPage.h b/clientgui/ProjectPropertiesPage.h similarity index 100% rename from clientgui/wizards/ProjectPropertiesPage.h rename to clientgui/ProjectPropertiesPage.h diff --git a/clientgui/wizards/ProxyPage.cpp b/clientgui/ProxyPage.cpp similarity index 99% rename from clientgui/wizards/ProxyPage.cpp rename to clientgui/ProxyPage.cpp index dcdeaef98a..cb617ea4b0 100644 --- a/clientgui/wizards/ProxyPage.cpp +++ b/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(); } } diff --git a/clientgui/wizards/ProxyPage.h b/clientgui/ProxyPage.h similarity index 100% rename from clientgui/wizards/ProxyPage.h rename to clientgui/ProxyPage.h diff --git a/clientgui/wizards/UnavailablePage.cpp b/clientgui/UnavailablePage.cpp similarity index 100% rename from clientgui/wizards/UnavailablePage.cpp rename to clientgui/UnavailablePage.cpp diff --git a/clientgui/wizards/UnavailablePage.h b/clientgui/UnavailablePage.h similarity index 100% rename from clientgui/wizards/UnavailablePage.h rename to clientgui/UnavailablePage.h diff --git a/clientgui/wizards/WelcomePage.cpp b/clientgui/WelcomePage.cpp similarity index 100% rename from clientgui/wizards/WelcomePage.cpp rename to clientgui/WelcomePage.cpp diff --git a/clientgui/wizards/WelcomePage.h b/clientgui/WelcomePage.h similarity index 100% rename from clientgui/wizards/WelcomePage.h rename to clientgui/WelcomePage.h diff --git a/clientgui/wizards/WizardAccountManager.cpp b/clientgui/WizardAccountManager.cpp similarity index 100% rename from clientgui/wizards/WizardAccountManager.cpp rename to clientgui/WizardAccountManager.cpp diff --git a/clientgui/wizards/WizardAccountManager.h b/clientgui/WizardAccountManager.h similarity index 100% rename from clientgui/wizards/WizardAccountManager.h rename to clientgui/WizardAccountManager.h diff --git a/clientgui/wizards/WizardAttachProject.cpp b/clientgui/WizardAttachProject.cpp similarity index 100% rename from clientgui/wizards/WizardAttachProject.cpp rename to clientgui/WizardAttachProject.cpp diff --git a/clientgui/wizards/WizardAttachProject.h b/clientgui/WizardAttachProject.h similarity index 100% rename from clientgui/wizards/WizardAttachProject.h rename to clientgui/WizardAttachProject.h diff --git a/clientgui/wizards/wizardex.cpp b/clientgui/wizardex.cpp similarity index 100% rename from clientgui/wizards/wizardex.cpp rename to clientgui/wizardex.cpp diff --git a/clientgui/wizards/wizardex.h b/clientgui/wizardex.h similarity index 100% rename from clientgui/wizards/wizardex.h rename to clientgui/wizardex.h diff --git a/lib/gui_rpc_client.C b/lib/gui_rpc_client.C index b7605e7a73..1b5b9f7942 100644 --- a/lib/gui_rpc_client.C +++ b/lib/gui_rpc_client.C @@ -25,7 +25,7 @@ #endif #ifdef _WIN32 -#include "version.h" +#include "../version.h" #else #include "config.h" #include diff --git a/lib/gui_rpc_client_ops.C b/lib/gui_rpc_client_ops.C index 5796e1fe5e..d276c0c76a 100644 --- a/lib/gui_rpc_client_ops.C +++ b/lib/gui_rpc_client_ops.C @@ -26,7 +26,7 @@ #endif #ifdef _WIN32 -#include "version.h" +#include "../version.h" #else #include "config.h" #include diff --git a/win_build/boincmgr_curl.vcproj b/win_build/boincmgr_curl.vcproj index 9244eb53bb..f9af51175b 100644 --- a/win_build/boincmgr_curl.vcproj +++ b/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 @@ + RelativePath="..\clientgui\AccountInfoPage.cpp"> + RelativePath="..\clientgui\AccountInfoPage.h"> + RelativePath="..\clientgui\AccountKeyPage.cpp"> + RelativePath="..\clientgui\AccountKeyPage.h"> + RelativePath="..\clientgui\AccountManagerInfoPage.cpp"> + RelativePath="..\clientgui\AccountManagerInfoPage.h"> + RelativePath="..\clientgui\AccountManagerProcessingPage.cpp"> + RelativePath="..\clientgui\AccountManagerProcessingPage.h"> + RelativePath="..\clientgui\AccountManagerPropertiesPage.cpp"> + RelativePath="..\clientgui\AccountManagerPropertiesPage.h"> + RelativePath="..\clientgui\AlreadyAttachedPage.cpp"> + RelativePath="..\clientgui\AlreadyAttachedPage.h"> + RelativePath="..\clientgui\AlreadyExistsPage.cpp"> + RelativePath="..\clientgui\AlreadyExistsPage.h"> + RelativePath="..\clientgui\BOINCBaseWizard.cpp"> + RelativePath="..\clientgui\BOINCBaseWizard.h"> + RelativePath="..\clientgui\BOINCWizards.h"> + RelativePath="..\clientgui\CompletionErrorPage.cpp"> + RelativePath="..\clientgui\CompletionErrorPage.h"> + RelativePath="..\clientgui\CompletionPage.cpp"> + RelativePath="..\clientgui\CompletionPage.h"> + RelativePath="..\clientgui\NoInternetConnectionPage.cpp"> + RelativePath="..\clientgui\NoInternetConnectionPage.h"> + RelativePath="..\clientgui\NotDetectedPage.cpp"> + RelativePath="..\clientgui\NotDetectedPage.h"> + RelativePath="..\clientgui\NotFoundPage.cpp"> + RelativePath="..\clientgui\NotFoundPage.h"> + RelativePath="..\clientgui\ProjectInfoPage.cpp"> + RelativePath="..\clientgui\ProjectInfoPage.h"> + RelativePath="..\clientgui\ProjectProcessingPage.cpp"> + RelativePath="..\clientgui\ProjectProcessingPage.h"> + RelativePath="..\clientgui\ProjectPropertiesPage.cpp"> + RelativePath="..\clientgui\ProjectPropertiesPage.h"> + RelativePath="..\clientgui\ProxyPage.cpp"> + RelativePath="..\clientgui\ProxyPage.h"> + RelativePath="..\clientgui\UnavailablePage.cpp"> + RelativePath="..\clientgui\UnavailablePage.h"> + RelativePath="..\clientgui\WelcomePage.cpp"> + RelativePath="..\clientgui\WelcomePage.h"> + RelativePath="..\clientgui\WizardAccountManager.cpp"> + RelativePath="..\clientgui\WizardAccountManager.h"> + RelativePath="..\clientgui\WizardAttachProject.cpp"> + RelativePath="..\clientgui\WizardAttachProject.h"> + RelativePath="..\clientgui\wizardex.cpp"> + RelativePath="..\clientgui\wizardex.h">