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=9805
This commit is contained in:
Rom Walton 2006-04-06 19:54:02 +00:00
parent 8077cf2bed
commit f606925d4c
2 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
checkin_notes
View File

@ -3615,3 +3615,10 @@ Rom 6 Apr 2006 (From Frank S. Thomas)
clientgui/ clientgui/
MainDocument.cpp MainDocument.cpp
Rom 6 Apr 2006 (From Darrel Holz)
- Bug Fix: Fix the Logo display for BOINC when not running as a branded
client.
clientgui/
DlgAbout.cpp

50
clientgui/DlgAbout.cpp
View File

@ -87,34 +87,32 @@ bool CDlgAbout::Create(wxWindow* parent, wxWindowID id, const wxString& caption,
// Change the various dialog items for the branded manager // Change the various dialog items for the branded manager
// //
wxString buf = wxEmptyString;
buf.Printf(
_("About %s"),
wxGetApp().GetBrand()->GetApplicationName().c_str()
);
SetTitle(buf);
buf.Printf(
_("%s"),
wxGetApp().GetBrand()->GetApplicationName().c_str()
);
m_AboutBOINCTitleCtrl->SetLabel(buf);
wxBitmap bmp;
if (wxGetApp().GetBrand()->IsBranded()) { if (wxGetApp().GetBrand()->IsBranded()) {
wxString buf = wxEmptyString; bmp = wxBitmap(*(wxGetApp().GetBrand()->GetApplicationLogo()));
buf.Printf( } else {
_("About %s"), bmp = wxBitmap(boincsm_xpm);
wxGetApp().GetBrand()->GetApplicationName().c_str()
);
SetTitle(buf);
buf.Printf(
_("%s"),
wxGetApp().GetBrand()->GetApplicationName().c_str()
);
m_AboutBOINCTitleCtrl->SetLabel(buf);
wxBitmap bmp;
if (wxGetApp().GetBrand()->IsBranded()) {
bmp = wxBitmap(*(wxGetApp().GetBrand()->GetApplicationLogo()));
} else {
bmp = wxBitmap(boincsm_xpm);
}
m_AboutBOINCLogoCtrl->SetBitmap(bmp);
m_AboutBOINCSloganCtrl->SetLabel(wxEmptyString);
m_AboutBOINCURLCtrl->SetLabel(
wxGetApp().GetBrand()->GetCompanyWebsite().c_str()
);
} }
m_AboutBOINCLogoCtrl->SetBitmap(bmp);
m_AboutBOINCSloganCtrl->SetLabel(wxEmptyString);
m_AboutBOINCURLCtrl->SetLabel(
wxGetApp().GetBrand()->GetCompanyWebsite().c_str()
);
GetSizer()->Fit(this); GetSizer()->Fit(this);
GetSizer()->SetSizeHints(this); GetSizer()->SetSizeHints(this);