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

*** empty log message *** 

svn path=/trunk/boinc/; revision=9183
This commit is contained in:
Rom Walton 2006-01-06 10:50:59 +00:00
parent a20ed70b52
commit d74ac631ae
15 changed files with 120 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
checkin_notes
View File

@ -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

10
clientgui/AccountInfoPage.cpp
View File

@ -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();
}
/*!

2
clientgui/AccountManagerProcessingPage.cpp
View File

@ -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);

2
clientgui/AccountManagerPropertiesPage.cpp
View File

@ -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);

10
clientgui/BOINCGUIApp.cpp
View File

@ -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;
}

2
clientgui/BOINCGUIApp.h
View File

@ -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 );
};

1
clientgui/BOINCGUIApp.rc
View File

@ -32,6 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#ifdef _GRIDREPUBLIC
APP_ICON ICON "res\\gridrepublic.ico"
APP_ICON2 ICON "res\\gridrepublic2.ico"
#else

75
clientgui/CompletionPage.cpp
View File

@ -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);
}

3
clientgui/CompletionPage.h
View File

@ -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
};

8
clientgui/MainFrame.cpp
View File

@ -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);

0
win_build/installerv2/redist/GridRepublic/GridRepublic.ico → clientgui/res/gridrepublic2.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

3
clientgui/resource.h
View File

@ -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
//

BIN
win_build/installerv2/GridRepublic.ism
View File

Binary file not shown.

BIN
win_build/installerv2/redist/GridRepublic/GR_splash.bmp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 570 KiB

After

Width:  |  Height:  |  Size: 570 KiB

11
win_build/installerv2/redist/GridRepublic/acct_mgr_url.xml
View File

@ -2,6 +2,15 @@
<name>Grid Republic</name>
<url>http://www.gridrepublic.com/</url>
<signing_key>
1024
efbeefcfcbb82b7b58f7ea9b126805486fe917bece0647dd8a87d4110adb9390
b71ecdbb812f7785afac5a0028fbc76507a257666ea89b5c20cb84e72f9183dc
eca42195689846eb37dd46cb63f9fe16435a4e8aca762f95bd0a8b21ae614082
a258af17c6367010be57ac43df459ebfa8bd169cf6dc779726dff88141bb28cd
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000010001
.
</signing_key>
</acct_mgr>