Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

*** empty log message *** 

svn path=/trunk/boinc/; revision=9466
This commit is contained in:
Rom Walton 2006-02-14 21:41:22 +00:00
parent ce89af8702
commit ce3f987c37
6 changed files with 75 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
checkin_notes
View File

@ -1813,3 +1813,17 @@ David 14 Feb 2006
client client
cs_statefile.C cs_statefile.C
Rom 14 Feb 2006
- Bug Fix: After any of the wizards have been executed, recreate the
menus.
- Bug Fix: Call Fit() before setting focus to any of the controls.
Fit() messes up the input focus even though the control still
seems like it is selected and has focus.
clientgui/
AccountInfoPage.cpp
AccountKeyPage.cpp
MainFrame.cpp
ProjectInfoPage.cpp
ProxyPage.cpp

2
clientgui/AccountInfoPage.cpp
View File

@ -400,8 +400,8 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event ) {
m_pAccountPasswordRequirmentsStaticCtrl->SetLabel( str ); m_pAccountPasswordRequirmentsStaticCtrl->SetLabel( str );
} }
m_pAccountEmailAddressCtrl->SetFocus();
Fit(); Fit();
m_pAccountEmailAddressCtrl->SetFocus();
} }
/*! /*!

2
clientgui/AccountKeyPage.cpp
View File

@ -232,8 +232,8 @@ void CAccountKeyPage::OnPageChanged( wxWizardExEvent& event ) {
_("Account key:") _("Account key:")
); );
m_pAccountKeyCtrl->SetFocus();
Fit(); Fit();
m_pAccountKeyCtrl->SetFocus();
} }
/*! /*!

9
clientgui/MainFrame.cpp
View File

@ -1106,6 +1106,8 @@ void CMainFrame::OnProjectsAttachToAccountManager(wxCommandEvent& WXUNUSED(event
if (pWizard) if (pWizard)
pWizard->Destroy(); pWizard->Destroy();
DeleteMenu();
CreateMenu();
FireRefreshView(); FireRefreshView();
m_pRefreshStateTimer->Start(); m_pRefreshStateTimer->Start();
@ -1146,6 +1148,8 @@ void CMainFrame::OnAccountManagerUpdate(wxCommandEvent& WXUNUSED(event)) {
if (pWizard) if (pWizard)
pWizard->Destroy(); pWizard->Destroy();
DeleteMenu();
CreateMenu();
FireRefreshView(); FireRefreshView();
m_pRefreshStateTimer->Start(); m_pRefreshStateTimer->Start();
@ -1186,6 +1190,8 @@ void CMainFrame::OnAccountManagerDetach(wxCommandEvent& WXUNUSED(event)) {
if (pWizard) if (pWizard)
pWizard->Destroy(); pWizard->Destroy();
DeleteMenu();
CreateMenu();
FireRefreshView(); FireRefreshView();
m_pRefreshStateTimer->Start(); m_pRefreshStateTimer->Start();
@ -1230,6 +1236,9 @@ void CMainFrame::OnProjectsAttachToProject( wxCommandEvent& WXUNUSED(event) ) {
if (pWizard) if (pWizard)
pWizard->Destroy(); pWizard->Destroy();
DeleteMenu();
CreateMenu();
m_pRefreshStateTimer->Start(); m_pRefreshStateTimer->Start();
m_pFrameRenderTimer->Start(); m_pFrameRenderTimer->Start();
m_pFrameListPanelRenderTimer->Start(); m_pFrameListPanelRenderTimer->Start();

3
clientgui/ProjectInfoPage.cpp
View File

@ -238,9 +238,8 @@ void CProjectInfoPage::OnPageChanged( wxWizardExEvent& event ) {
wxT("http://boinc.berkeley.edu/") wxT("http://boinc.berkeley.edu/")
); );
m_pProjectUrlCtrl->SetFocus();
Fit(); Fit();
m_pProjectUrlCtrl->SetFocus();
} }
/*! /*!

101
clientgui/ProxyPage.cpp
View File

@ -323,67 +323,64 @@ void CErrProxyPage::OnPageChanged( wxWizardExEvent& event ) {
wxASSERT(m_pProxySOCKSPasswordStaticCtrl); wxASSERT(m_pProxySOCKSPasswordStaticCtrl);
wxASSERT(m_pProxySOCKSPasswordCtrl); wxASSERT(m_pProxySOCKSPasswordCtrl);
if (event.GetDirection() == true) { // Moving from the previous page, update text and get state
// Moving from the previous page, update text and get state
m_pTitleStaticCtrl->SetLabel( m_pTitleStaticCtrl->SetLabel(
_("Proxy configuration") _("Proxy configuration")
); );
m_pProxyHTTPDescriptionCtrl->SetLabel( m_pProxyHTTPDescriptionCtrl->SetLabel(
_("HTTP proxy") _("HTTP proxy")
); );
m_pProxyHTTPServerStaticCtrl->SetLabel( m_pProxyHTTPServerStaticCtrl->SetLabel(
_("Server:") _("Server:")
); );
m_pProxyHTTPPortStaticCtrl->SetLabel( m_pProxyHTTPPortStaticCtrl->SetLabel(
_("Port:") _("Port:")
); );
m_pProxyHTTPUsernameStaticCtrl->SetLabel( m_pProxyHTTPUsernameStaticCtrl->SetLabel(
_("User Name:") _("User Name:")
); );
m_pProxyHTTPPasswordStaticCtrl->SetLabel( m_pProxyHTTPPasswordStaticCtrl->SetLabel(
_("Password:") _("Password:")
); );
#if 0 #if 0
m_pProxyHTTPAutodetectCtrl->SetLabel( m_pProxyHTTPAutodetectCtrl->SetLabel(
_("Autodetect") _("Autodetect")
); );
#endif #endif
m_pProxySOCKSDescriptionCtrl->SetLabel( m_pProxySOCKSDescriptionCtrl->SetLabel(
_("SOCKS proxy") _("SOCKS proxy")
); );
m_pProxySOCKSServerStaticCtrl->SetLabel( m_pProxySOCKSServerStaticCtrl->SetLabel(
_("Server:") _("Server:")
); );
m_pProxySOCKSPortStaticCtrl->SetLabel( m_pProxySOCKSPortStaticCtrl->SetLabel(
_("Port:") _("Port:")
); );
m_pProxySOCKSUsernameStaticCtrl->SetLabel( m_pProxySOCKSUsernameStaticCtrl->SetLabel(
_("User Name:") _("User Name:")
); );
m_pProxySOCKSPasswordStaticCtrl->SetLabel( m_pProxySOCKSPasswordStaticCtrl->SetLabel(
_("Password:") _("Password:")
); );
pDoc->GetProxyConfiguration(); pDoc->GetProxyConfiguration();
m_pProxyHTTPServerCtrl->SetValue(pDoc->proxy_info.http_server_name.c_str()); m_pProxyHTTPServerCtrl->SetValue(pDoc->proxy_info.http_server_name.c_str());
m_pProxyHTTPUsernameCtrl->SetValue(pDoc->proxy_info.http_user_name.c_str()); m_pProxyHTTPUsernameCtrl->SetValue(pDoc->proxy_info.http_user_name.c_str());
m_pProxyHTTPPasswordCtrl->SetValue(pDoc->proxy_info.http_user_passwd.c_str()); m_pProxyHTTPPasswordCtrl->SetValue(pDoc->proxy_info.http_user_passwd.c_str());
strBuffer.Printf(wxT("%d"), pDoc->proxy_info.http_server_port); strBuffer.Printf(wxT("%d"), pDoc->proxy_info.http_server_port);
m_pProxyHTTPPortCtrl->SetValue(strBuffer); m_pProxyHTTPPortCtrl->SetValue(strBuffer);
m_pProxySOCKSServerCtrl->SetValue(pDoc->proxy_info.socks_server_name.c_str()); m_pProxySOCKSServerCtrl->SetValue(pDoc->proxy_info.socks_server_name.c_str());
m_pProxySOCKSUsernameCtrl->SetValue(pDoc->proxy_info.socks5_user_name.c_str()); m_pProxySOCKSUsernameCtrl->SetValue(pDoc->proxy_info.socks5_user_name.c_str());
m_pProxySOCKSPasswordCtrl->SetValue(pDoc->proxy_info.socks5_user_passwd.c_str()); m_pProxySOCKSPasswordCtrl->SetValue(pDoc->proxy_info.socks5_user_passwd.c_str());
strBuffer.Printf(wxT("%d"), pDoc->proxy_info.socks_server_port); strBuffer.Printf(wxT("%d"), pDoc->proxy_info.socks_server_port);
m_pProxySOCKSPortCtrl->SetValue(strBuffer); m_pProxySOCKSPortCtrl->SetValue(strBuffer);
m_pProxyHTTPServerCtrl->SetFocus();
}
Fit(); Fit();
m_pProxyHTTPServerCtrl->SetFocus();
} }
/*! /*!