Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Utilize HAIKU_DISTRO_COMPATIBILITY and HAIKU_OFFICIAL_RELEASE for choosing 

which graphic to display in AboutSystem and Installer.

When 'official' and 'HAIKU_OFFICIAL_RELEASE', the 'release' logo -- eg, alpha 2
will be used. When 'HAIKU_OFFICIAL_RELEASE' is not defined, the 'development'
logo will be used.

When 'default' or 'compatible', no graphic will display. Their appearance
does degrade somewhat gracefully, though InstallerWindow.cpp may need an
adjustment to better set fStatusView->SetExplicitMinSize()

Relates to #6183.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37741 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia 2010-07-25 20:26:48 +00:00
parent 2dc707e529
commit 2873f50a40
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/apps/aboutsystem/AboutSystem.cpp
View File

@ -336,7 +336,7 @@ AboutWindow::QuitRequested()
LogoView::LogoView()
: BView("logo", B_WILL_DRAW)
{
fLogo = BTranslationUtils::GetBitmap(B_PNG_FORMAT, "haikulogo.png");
fLogo = BTranslationUtils::GetBitmap(B_PNG_FORMAT, "logo.png");
SetViewColor(255, 255, 255);
}

8
src/apps/aboutsystem/AboutSystem.rdef
View File

@ -16,7 +16,13 @@ resource app_version {
resource app_flags B_SINGLE_LAUNCH;
resource(1, "haikulogo.png") #'PNG ' import "../../../data/artwork/HAIKU logo - black on white - tiny.png";
#ifdef HAIKU_DISTRO_COMPATIBILITY_OFFICIAL
#ifdef HAIKU_OFFICIAL_RELEASE
resource(1, "logo.png") #'PNG ' import "../../../data/artwork/HAIKU logo - black on white - tiny.png";
#else
resource(1, "logo.png") #'PNG ' import "../../../data/artwork/HAIKU logo - black on white - tiny - versioned.png";
#endif
#endif
resource vector_icon {
$"6E636966090500020012020000003D4000BDA0000000004AE0004A1000000166"

8
src/apps/installer/Installer.rdef
View File

@ -15,7 +15,13 @@ resource app_version {
resource app_flags B_EXCLUSIVE_LAUNCH;
resource(1, "haikulogo.png") #'PNG ' import "../../../data/artwork/HAIKU logo - black on white - installer.png";
#ifdef HAIKU_DISTRO_COMPATIBILITY_OFFICIAL
#ifdef HAIKU_OFFICIAL_RELEASE
resource(1, "logo.png") #'PNG ' import "../../../data/artwork/HAIKU logo - black on white - installer.png";
#else
resource(1, "logo.png") #'PNG ' import "../../../data/artwork/HAIKU logo - black on white - installer - development.png";
#endif
#endif
resource vector_icon {
$"6E6369660F0500020006023861093AA03CBD302A3AE36E4A1739473BE7009A9A"

2
src/apps/installer/InstallerWindow.cpp
View File

@ -134,7 +134,7 @@ LogoView::GetPreferredSize(float* _width, float* _height)
void
LogoView::_Init()
{
fLogo = BTranslationUtils::GetBitmap(B_PNG_FORMAT, "haikulogo.png");
fLogo = BTranslationUtils::GetBitmap(B_PNG_FORMAT, "logo.png");
}