diff --git a/checkin_notes b/checkin_notes
index 026a111b2e..8ca91edb33 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -97,3 +97,22 @@ Bruce 6 Jan 2006
graphics_impl.h
graphics_impl_lib.C
+Rom 6 Jan 2006
+ - Branding update for GridRepublic
+
+ clientgui/
+ AccountInfoPage.cpp
+ AccountManagerProcessingPage.cpp
+ AccountManagerPropertiesPage.cpp
+ BOINCGUIApp.cpp, .h
+ BOINCGUIApp.rc
+ CompletionPage.cpp, .h
+ MainFrame.cpp
+ resource.h
+ clientgui/res/
+ gridrepublic2.ico (Added)
+ win_build/installerv2/
+ GridRepublic.ism
+ win_build/installerv2/redist/GridRepublic/
+ acct_mgr_url.xml
+ GR_splash.bmp
diff --git a/clientgui/AccountInfoPage.cpp b/clientgui/AccountInfoPage.cpp
index e6316f52ab..11cb9d8f5c 100644
--- a/clientgui/AccountInfoPage.cpp
+++ b/clientgui/AccountInfoPage.cpp
@@ -138,7 +138,7 @@ void CAccountInfoPage::CreateControls()
itemFlexGridSizer61->Add(m_AccountUseExistingCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5);
} else {
m_AccountManagerInformation = new wxStaticText;
- m_AccountManagerInformation->Create( itemWizardPage56, wxID_STATIC, _("Please provide your email address and password you used on\nthe website so that your projects and preferences can be retrieved."), wxDefaultPosition, wxDefaultSize, 0 );
+ m_AccountManagerInformation->Create( itemWizardPage56, wxID_STATIC, _("Please provide the email address and password you used on\nthe website so that your projects and preferences can be retrieved."), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer57->Add(m_AccountManagerInformation, 0, wxALIGN_LEFT|wxALL, 5);
itemBoxSizer57->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5);
@@ -267,8 +267,6 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event )
}
}
- if (m_AccountEmailAddressCtrl) m_AccountEmailAddressCtrl->SetFocus();
-
if (((CBOINCBaseWizard*)GetParent())->project_config.account_creation_disabled) {
if (!IS_ACCOUNTMANAGERWIZARD()) {
m_AccountCreateCtrl->SetValue(false);
@@ -283,7 +281,7 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event )
if (((CBOINCBaseWizard*)GetParent())->project_config.uses_username) {
if (m_AccountManagerInformation) {
m_AccountManagerInformation->SetLabel(
- _("Please provide your username and password you used on\n"
+ _("Please provide the username and password you used on\n"
"the website so that your projects and preferences can be retrieved.")
);
}
@@ -293,7 +291,7 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event )
} else {
if (m_AccountManagerInformation) {
m_AccountManagerInformation->SetLabel(
- _("Please provide your email address and password you used on\n"
+ _("Please provide the email address and password you used on\n"
"the website so that your projects and preferences can be retrieved.")
);
}
@@ -303,6 +301,8 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event )
}
Fit();
+
+ if (m_AccountEmailAddressCtrl) m_AccountEmailAddressCtrl->SetFocus();
}
/*!
diff --git a/clientgui/AccountManagerProcessingPage.cpp b/clientgui/AccountManagerProcessingPage.cpp
index c2bd857ee1..07d81ae910 100644
--- a/clientgui/AccountManagerProcessingPage.cpp
+++ b/clientgui/AccountManagerProcessingPage.cpp
@@ -129,7 +129,7 @@ void CAccountManagerProcessingPage::CreateControls()
itemWizardPage51->SetSizer(itemBoxSizer52);
wxStaticText* itemStaticText53 = new wxStaticText;
- itemStaticText53->Create( itemWizardPage51, wxID_STATIC, _("Communicating with account manager\nPlease wait..."), wxDefaultPosition, wxDefaultSize, 0 );
+ itemStaticText53->Create( itemWizardPage51, wxID_STATIC, _("Communicating with website\nPlease wait..."), wxDefaultPosition, wxDefaultSize, 0 );
itemStaticText53->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana")));
itemBoxSizer52->Add(itemStaticText53, 0, wxALIGN_LEFT|wxALL, 5);
diff --git a/clientgui/AccountManagerPropertiesPage.cpp b/clientgui/AccountManagerPropertiesPage.cpp
index d93b60e2cd..e4d151f02f 100644
--- a/clientgui/AccountManagerPropertiesPage.cpp
+++ b/clientgui/AccountManagerPropertiesPage.cpp
@@ -132,7 +132,7 @@ void CAccountManagerPropertiesPage::CreateControls()
itemWizardPage34->SetSizer(itemBoxSizer35);
wxStaticText* itemStaticText36 = new wxStaticText;
- itemStaticText36->Create( itemWizardPage34, wxID_STATIC, _("Communicating with account manager\nPlease wait..."), wxDefaultPosition, wxDefaultSize, 0 );
+ itemStaticText36->Create( itemWizardPage34, wxID_STATIC, _("Communicating with website\nPlease wait..."), wxDefaultPosition, wxDefaultSize, 0 );
itemStaticText36->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana")));
itemBoxSizer35->Add(itemStaticText36, 0, wxALIGN_LEFT|wxALL, 5);
diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
index fdfaed683b..06b46a353f 100644
--- a/clientgui/BOINCGUIApp.cpp
+++ b/clientgui/BOINCGUIApp.cpp
@@ -83,6 +83,9 @@ bool CBrandingScheme::OnInit( wxConfigBase *pConfig ) {
m_strProjectName = wxT("GridRepublic");
m_bitmapAPWizardLogo = wxBitmap(gridrepublicamwizard_xpm);
m_bitmapAMWizardLogo = wxBitmap(gridrepublicamwizard_xpm);
+ m_strAMWizardAttachMessage =
+ wxT("Together we are building the most powerful computer in the world;\n"
+ "Together anything is possible!");
break;
default:
// Running in native mode without any branding
@@ -94,6 +97,7 @@ bool CBrandingScheme::OnInit( wxConfigBase *pConfig ) {
m_strProjectName = wxT("BOINC");
m_bitmapAPWizardLogo = wxBitmap(attachprojectwizard_xpm);
m_bitmapAMWizardLogo = wxBitmap(attachprojectwizard_xpm);
+ m_strAMWizardAttachMessage = wxEmptyString;
break;
}
@@ -223,7 +227,7 @@ bool CBOINCGUIApp::OnInit() {
// Setup the branding scheme
m_pBranding = new CBrandingScheme;
- wxASSERT(m_pLocale);
+ wxASSERT(m_pBranding);
m_pBranding->OnInit(m_pConfig);
@@ -329,6 +333,10 @@ int CBOINCGUIApp::OnExit() {
delete m_pDocument;
}
+ if (m_pBranding) {
+ delete m_pBranding;
+ }
+
if (m_pLocale) {
delete m_pLocale;
}
diff --git a/clientgui/BOINCGUIApp.h b/clientgui/BOINCGUIApp.h
index 0fe22e1283..a1bbec81e2 100644
--- a/clientgui/BOINCGUIApp.h
+++ b/clientgui/BOINCGUIApp.h
@@ -46,6 +46,7 @@ private:
wxString m_strProjectName;
wxBitmap m_bitmapAPWizardLogo;
wxBitmap m_bitmapAMWizardLogo;
+ wxString m_strAMWizardAttachMessage;
public:
bool IsBranded() { return m_bIsBranded; }
@@ -57,6 +58,7 @@ public:
wxString GetProjectName() { return m_strProjectName; }
wxBitmap* GetAPWizardLogo() { return &m_bitmapAPWizardLogo; }
wxBitmap* GetAMWizardLogo() { return &m_bitmapAMWizardLogo; }
+ wxString GetAMWizardSuccessMessage() { return m_strAMWizardAttachMessage; }
bool OnInit( wxConfigBase* pConfig );
};
diff --git a/clientgui/BOINCGUIApp.rc b/clientgui/BOINCGUIApp.rc
index f9fe2803da..b6d69fd92c 100644
--- a/clientgui/BOINCGUIApp.rc
+++ b/clientgui/BOINCGUIApp.rc
@@ -32,6 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#ifdef _GRIDREPUBLIC
APP_ICON ICON "res\\gridrepublic.ico"
+APP_ICON2 ICON "res\\gridrepublic2.ico"
#else
diff --git a/clientgui/CompletionPage.cpp b/clientgui/CompletionPage.cpp
index f1c5d5efa0..14f4e63f74 100644
--- a/clientgui/CompletionPage.cpp
+++ b/clientgui/CompletionPage.cpp
@@ -74,6 +74,9 @@ CCompletionPage::CCompletionPage( CBOINCBaseWizard* parent )
bool CCompletionPage::Create( CBOINCBaseWizard* parent )
{
////@begin CCompletionPage member initialisation
+ m_CompletionTitle = NULL;
+ m_CompletionWelcome = NULL;
+ m_CompletionBrandedMessage = NULL;
m_CompletionMessage = NULL;
////@end CCompletionPage member initialisation
@@ -100,34 +103,76 @@ void CCompletionPage::CreateControls()
wxBoxSizer* itemBoxSizer80 = new wxBoxSizer(wxVERTICAL);
itemWizardPage79->SetSizer(itemBoxSizer80);
- wxStaticText* itemStaticText81 = new wxStaticText;
- wxStaticText* itemStaticText82 = new wxStaticText;
- m_CompletionMessage = new wxStaticText;
if (IS_ATTACHTOPROJECTWIZARD()) {
- itemStaticText81->Create( itemWizardPage79, wxID_STATIC, _("Attached to project"), wxDefaultPosition, wxDefaultSize, 0 );
- itemStaticText81->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana")));
- itemBoxSizer80->Add(itemStaticText81, 0, wxALIGN_LEFT|wxALL, 5);
+ m_CompletionTitle = new wxStaticText;
+ m_CompletionTitle->Create( itemWizardPage79, wxID_STATIC, _("Attached to project"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_CompletionTitle->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD, FALSE, wxT("Verdana")));
+ itemBoxSizer80->Add(m_CompletionTitle, 0, wxALIGN_LEFT|wxALL, 5);
- itemStaticText82->Create( itemWizardPage79, wxID_STATIC, _("You are now successfully attached to this project."), wxDefaultPosition, wxDefaultSize, 0 );
- itemBoxSizer80->Add(itemStaticText82, 0, wxALIGN_LEFT|wxALL, 5);
+ m_CompletionBrandedMessage = new wxStaticText;
+ m_CompletionBrandedMessage->Create( itemWizardPage79, wxID_STATIC, _("You are now successfully attached to this project."), wxDefaultPosition, wxDefaultSize, 0 );
+ itemBoxSizer80->Add(m_CompletionBrandedMessage, 0, wxALIGN_LEFT|wxALL, 5);
itemBoxSizer80->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5);
+ m_CompletionMessage = new wxStaticText;
m_CompletionMessage->Create( itemWizardPage79, wxID_STATIC, _("When you click Finish, your web browser will go to a page where\nyou can set your account name and preferences."), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer80->Add(m_CompletionMessage, 0, wxALIGN_LEFT|wxALL, 5);
}
if (IS_ACCOUNTMANAGERWIZARD()) {
- itemStaticText81->Create( itemWizardPage79, wxID_STATIC, _("Attached to account manager"), wxDefaultPosition, wxDefaultSize, 0 );
- itemStaticText81->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana")));
- itemBoxSizer80->Add(itemStaticText81, 0, wxALIGN_LEFT|wxALL, 5);
+ wxString strTitle;
+ if (wxGetApp().GetBrand()->IsBranded()) {
+ // %s is the project name
+ // i.e. 'GridRepublic'
+ strTitle.Printf(
+ _("Attached to %s"),
+ wxGetApp().GetBrand()->GetProjectName().c_str()
+ );
+ } else {
+ strTitle = _("Attached to account manager");
+ }
- itemStaticText82->Create( itemWizardPage79, wxID_STATIC, _("You are now successfully attached to this account manager."), wxDefaultPosition, wxDefaultSize, 0 );
- itemBoxSizer80->Add(itemStaticText82, 0, wxALIGN_LEFT|wxALL, 5);
+ m_CompletionTitle = new wxStaticText;
+ m_CompletionTitle->Create( itemWizardPage79, wxID_STATIC, strTitle, wxDefaultPosition, wxDefaultSize, 0 );
+ m_CompletionTitle->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD, FALSE, wxT("Verdana")));
+ itemBoxSizer80->Add(m_CompletionTitle, 0, wxALIGN_LEFT|wxALL, 5);
- itemBoxSizer80->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5);
+ if (wxGetApp().GetBrand()->IsBranded()) {
+ // %s is the project name
+ // i.e. 'GridRepublic'
+ wxString strWelcome;
+ strWelcome.Printf(
+ _("Welcome to %s!"),
+ wxGetApp().GetBrand()->GetProjectName().c_str()
+ );
+ m_CompletionWelcome = new wxStaticText;
+ m_CompletionWelcome->Create( itemWizardPage79, wxID_STATIC, strWelcome, wxDefaultPosition, wxDefaultSize, 0 );
+ m_CompletionWelcome->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxBOLD, FALSE, wxT("Verdana")));
+ itemBoxSizer80->Add(m_CompletionWelcome, 0, wxALIGN_LEFT|wxALL, 5);
+ }
- m_CompletionMessage->Create( itemWizardPage79, wxID_STATIC, _("When you click Finish, your web browser will go to a page where\nyou can set your account name and preferences."), wxDefaultPosition, wxDefaultSize, 0 );
+ wxString strBrandedMessage;
+ if (wxGetApp().GetBrand()->IsBranded()) {
+ // 1st %s is the project name
+ // i.e. 'GridRepublic'
+ // 2nd %s is the account manager success message
+ strBrandedMessage.Printf(
+ _("You are now successfully attached to the %s system.\n"
+ "%s"),
+ wxGetApp().GetBrand()->GetProjectName().c_str(),
+ wxGetApp().GetBrand()->GetAMWizardSuccessMessage().c_str()
+ );
+ } else {
+ strBrandedMessage = _("You are now successfully attached to this account manager.");
+ }
+
+ m_CompletionBrandedMessage = new wxStaticText;
+ m_CompletionBrandedMessage->Create( itemWizardPage79, wxID_STATIC, strBrandedMessage, wxDefaultPosition, wxDefaultSize, 0 );
+ itemBoxSizer80->Add(m_CompletionBrandedMessage, 0, wxALIGN_LEFT|wxALL, 5);
+
+ m_CompletionMessage = new wxStaticText;
+ m_CompletionMessage->Create( itemWizardPage79, wxID_STATIC, _("Click Finish to close."), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer80->Add(m_CompletionMessage, 0, wxALIGN_LEFT|wxALL, 5);
}
diff --git a/clientgui/CompletionPage.h b/clientgui/CompletionPage.h
index 5c63c190c8..760de8241d 100644
--- a/clientgui/CompletionPage.h
+++ b/clientgui/CompletionPage.h
@@ -77,6 +77,9 @@ public:
static bool ShowToolTips();
////@begin CCompletionPage member variables
+ wxStaticText* m_CompletionTitle;
+ wxStaticText* m_CompletionWelcome;
+ wxStaticText* m_CompletionBrandedMessage;
wxStaticText* m_CompletionMessage;
////@end CCompletionPage member variables
};
diff --git a/clientgui/MainFrame.cpp b/clientgui/MainFrame.cpp
index 7c6ee6d38f..09e66f1277 100644
--- a/clientgui/MainFrame.cpp
+++ b/clientgui/MainFrame.cpp
@@ -1405,7 +1405,13 @@ void CMainFrame::OnConnect(CMainFrameEvent&) {
pDoc->rpc.acct_mgr_info(ami);
if (ami.acct_mgr_url.size()) {
pAMWizard = new CWizardAccountManager(this);
- pAMWizard->Run();
+ if (pAMWizard->Run()) {
+ // If successful, hide the main window
+ Hide();
+ } else {
+ // If failure, display the messages tab
+ m_pNotebook->SetSelection(ID_LIST_MESSAGESVIEW - ID_LIST_BASE);
+ }
} else {
pAPWizard = new CWizardAttachProject(this);
pDoc->rpc.get_project_init_status(pis);
diff --git a/win_build/installerv2/redist/GridRepublic/GridRepublic.ico b/clientgui/res/gridrepublic2.ico
similarity index 100%
rename from win_build/installerv2/redist/GridRepublic/GridRepublic.ico
rename to clientgui/res/gridrepublic2.ico
diff --git a/clientgui/resource.h b/clientgui/resource.h
index 31925769f0..4470166293 100644
--- a/clientgui/resource.h
+++ b/clientgui/resource.h
@@ -2,7 +2,8 @@
// Microsoft Visual C++ generated include file.
// Used by BOINCGUIApp.rc
//
-#define APP_ICON 100
+#define APP_ICON 0
+#define APP_ICON2 1
// Next default values for new objects
//
diff --git a/win_build/installerv2/GridRepublic.ism b/win_build/installerv2/GridRepublic.ism
index ec0a8503e1..8faa053e84 100644
Binary files a/win_build/installerv2/GridRepublic.ism and b/win_build/installerv2/GridRepublic.ism differ
diff --git a/win_build/installerv2/redist/GridRepublic/GR_splash.bmp b/win_build/installerv2/redist/GridRepublic/GR_splash.bmp
index fbd04dc287..8ee9eecd40 100644
Binary files a/win_build/installerv2/redist/GridRepublic/GR_splash.bmp and b/win_build/installerv2/redist/GridRepublic/GR_splash.bmp differ
diff --git a/win_build/installerv2/redist/GridRepublic/acct_mgr_url.xml b/win_build/installerv2/redist/GridRepublic/acct_mgr_url.xml
index 27f2cd8393..6d164c9465 100644
--- a/win_build/installerv2/redist/GridRepublic/acct_mgr_url.xml
+++ b/win_build/installerv2/redist/GridRepublic/acct_mgr_url.xml
@@ -2,6 +2,15 @@
Grid Republic
http://www.gridrepublic.com/
-
+1024
+efbeefcfcbb82b7b58f7ea9b126805486fe917bece0647dd8a87d4110adb9390
+b71ecdbb812f7785afac5a0028fbc76507a257666ea89b5c20cb84e72f9183dc
+eca42195689846eb37dd46cb63f9fe16435a4e8aca762f95bd0a8b21ae614082
+a258af17c6367010be57ac43df459ebfa8bd169cf6dc779726dff88141bb28cd
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000010001
+.
\ No newline at end of file