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=9268
This commit is contained in:
Rom Walton 2006-01-19 12:22:22 +00:00
parent c84e14cc6c
commit 494f09ddaf
6 changed files with 58 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
checkin_notes
View File

@ -617,3 +617,13 @@ David 18 Jan 2006
pers_file_xfer.C
lib/
util.C
Rom 19 Jan 2006
- CPDNBBC Update
clientgui/
BOINCGUIApp.cpp, .h
CompletionPage.cpp
MainFrame.cpp
win_build/installerv2/redist/CPDNBBC
CPDNBBC_splash.bmp

52
clientgui/BOINCGUIApp.cpp
View File

@ -29,6 +29,7 @@
#include "BOINCGUIApp.h"
#include "diagnostics.h"
#include "MainFrame.h"
#include "Events.h"
#include "MainDocument.h"
@ -113,9 +114,12 @@ bool CBrandingScheme::OnInit( wxConfigBase *pConfig ) {
m_strCompanyWebsite = wxT("http://www.gridrepublic.com/");
m_strProjectName = wxT("GridRepublic");
m_strAPWizardTitle = wxEmptyString;
m_bDefaultTabSpecified = false;
m_iDefaultTab = 0;
m_bitmapAPWizardLogo = wxBitmap(gridrepublicamwizard_xpm);
m_strAPWizardAccountInfoText = wxEmptyString;
m_strAPWizardCompletionTitle = wxEmptyString;
m_strAPWizardCompletionBrandedMessage = wxEmptyString;
m_strAPWizardCompletionMessage = wxEmptyString;
m_strAMWizardTitle = wxEmptyString;
m_bitmapAMWizardLogo = wxBitmap(gridrepublicamwizard_xpm);
@ -123,43 +127,32 @@ bool CBrandingScheme::OnInit( wxConfigBase *pConfig ) {
break;
case 2:
// Running as a CPDNBBC client.
m_strApplicationName = wxT("BBC Climate Change Experiment Manager");
m_strApplicationName = wxT("The BOINC Manager for the BBC Climate Change Experiment");
m_iconApplicationIcon = wxIcon(boinc_xpm);
m_bitmapApplicationLogo = wxBitmap(boincsm_xpm);
m_strCompanyName = wxT("ClimatePrediction.net");
m_strCompanyWebsite = wxT("http://bbc.cpdn.org/beta/");
m_strProjectName = wxT("BBC Climate Change Experiment");
m_strAPWizardTitle = _T("Start Project");
m_bDefaultTabSpecified = true;
m_iDefaultTab = ID_LIST_WORKVIEW - ID_LIST_BASE;
m_strAPWizardTitle = _("Start Project");
m_bitmapAPWizardLogo = wxBitmap(attachprojectwizard_xpm);
m_strAPWizardAccountInfoText =
_T("Please enter an e-mail address and password to participate in our\n"
"interactive user forum and receive occasional project announcements.\n"
"You can block all e-mails from the project on your \"preferences\"\n"
"page whenever you like, and we will not pass on your e-mail address\n"
"to any third party. You can still run the experiment if you enter a\n"
"dummy address, but you will not be able to join in the user forum.");
_("Please enter an e-mail address and password to participate in our\n"
"interactive user forum and receive occasional project announcements.\n"
"You can block all e-mails from the project on your \"preferences\"\n"
"page whenever you like, and we will not pass on your e-mail address\n"
"to any third party. You can still run the experiment if you enter a\n"
"dummy address, but you will not be able to join in the user forum.");
m_strAPWizardCompletionTitle =
_T("Project Started");
_("Project Started");
m_strAPWizardCompletionBrandedMessage =
_("Congratulations, you have now successfully started your Climate\n"
"Change Experiment.\n");
m_strAPWizardCompletionMessage =
_T("Congratulations, you have now successfully started your Climate\n"
"Change Experiment.\n"
"\n"
"Your climate model will run whenever you are logged on to this\n"
"computer. It should not affect normal tasks, but you can adjust\n"
"your preferences so that it only runs at specified times. If you\n"
"turn off the computer the model will restart automatically from\n"
"where it left off.\n"
"\n"
"You can see how your experiment is progressing at any time by\n"
"clicking on the BOINC icon (B) in the system tray in the bottom\n"
"right corner of your screen. Your results will be returned\n"
"automatically to the project's servers at the end of every\n"
"model-decade. Don't worry if you think you may not manage to\n"
"complete a full simulation: run as many model-decades as you\n"
"can.\n"
"\n"
"Thank you for your contribution to the world's largest climate\n"
"modelling experiment.");
_("Click Finish to close. This will automatically launch a web browser\n"
"that will tell more about your experiment and how to customize your\n"
"settings.");
m_strAMWizardTitle = wxEmptyString;
m_bitmapAMWizardLogo = wxBitmap(attachprojectwizard_xpm);
m_strAMWizardAttachMessage = wxEmptyString;
@ -172,9 +165,12 @@ bool CBrandingScheme::OnInit( wxConfigBase *pConfig ) {
m_strCompanyName = wxT("Space Sciences Laboratory, U.C. Berkeley");
m_strCompanyWebsite = wxT("http://boinc.berkeley.edu/");
m_strProjectName = wxT("BOINC");
m_bDefaultTabSpecified = false;
m_iDefaultTab = 0;
m_strAPWizardTitle = wxEmptyString;
m_bitmapAPWizardLogo = wxBitmap(attachprojectwizard_xpm);
m_strAPWizardCompletionTitle = wxEmptyString;
m_strAPWizardCompletionBrandedMessage = wxEmptyString;
m_strAPWizardCompletionMessage = wxEmptyString;
m_strAMWizardTitle = wxEmptyString;
m_strAPWizardAccountInfoText = wxEmptyString;

6
clientgui/BOINCGUIApp.h
View File

@ -44,10 +44,13 @@ private:
wxString m_strCompanyName;
wxString m_strCompanyWebsite;
wxString m_strProjectName;
bool m_bDefaultTabSpecified;
int m_iDefaultTab;
wxString m_strAPWizardTitle;
wxBitmap m_bitmapAPWizardLogo;
wxString m_strAPWizardAccountInfoText;
wxString m_strAPWizardCompletionTitle;
wxString m_strAPWizardCompletionBrandedMessage;
wxString m_strAPWizardCompletionMessage;
wxString m_strAMWizardTitle;
wxBitmap m_bitmapAMWizardLogo;
@ -61,10 +64,13 @@ public:
wxString GetCompanyName() { return m_strCompanyName; }
wxString GetCompanyWebsite() { return m_strCompanyWebsite; }
wxString GetProjectName() { return m_strProjectName; }
bool IsDefaultTabSpecified() { return m_bDefaultTabSpecified; }
int GetDefaultTab() { return m_iDefaultTab; }
wxString GetAPWizardTitle() { return m_strAPWizardTitle; }
wxBitmap* GetAPWizardLogo() { return &m_bitmapAPWizardLogo; }
wxString GetAPWizardAccountInfoText() { return m_strAPWizardAccountInfoText; }
wxString GetAPWizardCompletionTitle() { return m_strAPWizardCompletionTitle; }
wxString GetAPWizardCompletionBrandedMessage() { return m_strAPWizardCompletionBrandedMessage; }
wxString GetAPWizardCompletionMessage() { return m_strAPWizardCompletionMessage; }
wxString GetAMWizardTitle() { return m_strAMWizardTitle; }
wxBitmap* GetAMWizardLogo() { return &m_bitmapAMWizardLogo; }

14
clientgui/CompletionPage.cpp
View File

@ -120,8 +120,8 @@ void CCompletionPage::CreateControls()
wxString strBrandedMessage;
if (wxGetApp().GetBrand()->IsBranded() &&
!wxGetApp().GetBrand()->GetAPWizardCompletionMessage().IsEmpty()) {
strBrandedMessage = wxGetApp().GetBrand()->GetAPWizardCompletionMessage();
!wxGetApp().GetBrand()->GetAPWizardCompletionBrandedMessage().IsEmpty()) {
strBrandedMessage = wxGetApp().GetBrand()->GetAPWizardCompletionBrandedMessage();
} else {
strBrandedMessage = _("You are now successfully attached to this project.");
}
@ -132,8 +132,16 @@ void CCompletionPage::CreateControls()
itemBoxSizer80->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5);
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\nyou can set your account name and preferences.");
}
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 );
m_CompletionMessage->Create( itemWizardPage79, wxID_STATIC, strMessage, wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer80->Add(m_CompletionMessage, 0, wxALIGN_LEFT|wxALL, 5);
}

9
clientgui/MainFrame.cpp
View File

@ -772,8 +772,13 @@ bool CMainFrame::RestoreState() {
pConfig->Read(wxT("NetworkDialupConnectionName"), &m_strNetworkDialupConnectionName, wxEmptyString);
pConfig->Read(wxT("NetworkDialupPromptCredentials"), &m_bNetworkDialupPromptCredentials, false);
pConfig->Read(wxT("CurrentPage"), &iCurrentPage, (ID_LIST_WORKVIEW - ID_LIST_BASE));
m_pNotebook->SetSelection(iCurrentPage);
if (wxGetApp().GetBrand()->IsBranded() &&
wxGetApp().GetBrand()->IsDefaultTabSpecified()) {
m_pNotebook->SetSelection(wxGetApp().GetBrand()->GetDefaultTab());
} else {
pConfig->Read(wxT("CurrentPage"), &iCurrentPage, (ID_LIST_WORKVIEW - ID_LIST_BASE));
m_pNotebook->SetSelection(iCurrentPage);
}
pConfig->Read(wxT("WindowIconized"), &bWindowIconized, false);
#if defined(__WXMSW__) || defined(__WXMAC__)

BIN
win_build/installerv2/redist/CPDNBBC/CPDNBBC_splash.bmp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 961 KiB

After

Width:  |  Height:  |  Size: 961 KiB