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=9601
This commit is contained in:
Rom Walton 2006-03-06 17:31:02 +00:00
parent 1208ef595a
commit dd09f559f1
3 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
checkin_notes
View File

@ -2606,3 +2606,11 @@ David 5 Mar 2006
client/
cs_scheduler.C
file_names.h
Rom 6 Mar 2006
- Bug Fix: Fix a couple text issues when using an existing account
in the wizard
clientgui/
AccountInfoPage.cpp
CompletionPage.cpp

19
clientgui/AccountInfoPage.cpp
View File

@ -309,9 +309,16 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event ) {
m_pAccountConfirmPasswordCtrl->Hide();
}
m_pAccountPasswordStaticCtrl->SetLabel(
_("Choose a &password:")
);
if (m_pAccountUseExistingCtrl->GetValue()) {
m_pAccountPasswordStaticCtrl->SetLabel(
_("&Password:")
);
} else {
m_pAccountPasswordStaticCtrl->SetLabel(
_("Choose a &password:")
);
}
m_pAccountConfirmPasswordStaticCtrl->SetLabel(
_("C&onfirm password:")
);
@ -477,6 +484,9 @@ void CAccountInfoPage::OnCancel( wxWizardExEvent& event ) {
*/
void CAccountInfoPage::OnAccountUseExistingCtrlSelected( wxCommandEvent& event ) {
m_pAccountPasswordStaticCtrl->SetLabel(
_("&Password:")
);
m_pAccountConfirmPasswordStaticCtrl->Hide();
m_pAccountConfirmPasswordCtrl->Hide();
m_pAccountEmailAddressCtrl->SetFocus();
@ -488,6 +498,9 @@ void CAccountInfoPage::OnAccountUseExistingCtrlSelected( wxCommandEvent& event )
*/
void CAccountInfoPage::OnAccountCreateCtrlSelected( wxCommandEvent& event ) {
m_pAccountPasswordStaticCtrl->SetLabel(
_("Choose a &password:")
);
m_pAccountConfirmPasswordStaticCtrl->Show();
m_pAccountConfirmPasswordCtrl->Show();
m_pAccountEmailAddressCtrl->SetFocus();

28
clientgui/CompletionPage.cpp
View File

@ -182,6 +182,8 @@ wxIcon CCompletionPage::GetIconResource( const wxString& name )
void CCompletionPage::OnPageChanged( wxWizardExEvent& event ) {
if (event.GetDirection() == false) return;
CWizardAttachProject* pWAP = ((CWizardAttachProject*)GetParent());
wxASSERT(m_pCompletionTitle);
wxASSERT(m_pCompletionWelcome);
wxASSERT(m_pCompletionBrandedMessage);
@ -210,17 +212,23 @@ void CCompletionPage::OnPageChanged( wxWizardExEvent& event ) {
m_pCompletionBrandedMessage->SetLabel( strBrandedMessage );
wxString strMessage;
if (wxGetApp().GetBrand()->IsBranded() &&
!wxGetApp().GetBrand()->GetAPWizardCompletionMessage().IsEmpty()) {
strMessage = wxGetApp().GetBrand()->GetAPWizardCompletionMessage();
} else {
strMessage =
_("When you click Finish, your web browser will go to a page where\n"
"you can set your account name and preferences.");
}
if (pWAP->m_AccountInfoPage->m_pAccountCreateCtrl->GetValue()) {
wxString strMessage;
if (wxGetApp().GetBrand()->IsBranded() &&
!wxGetApp().GetBrand()->GetAPWizardCompletionMessage().IsEmpty()) {
strMessage = wxGetApp().GetBrand()->GetAPWizardCompletionMessage();
} else {
strMessage =
_("When you click Finish, your web browser will go to a page where\n"
"you can set your account name and preferences.");
}
m_pCompletionMessage->SetLabel( strMessage );
m_pCompletionMessage->SetLabel( strMessage );
} else {
m_pCompletionMessage->SetLabel(
_("Click Finish to close.")
);
}
} else if (IS_ACCOUNTMANAGERWIZARD()) {