diff --git a/src/apps/aboutsystem/AboutSystem.cpp b/src/apps/aboutsystem/AboutSystem.cpp index 0d55ab1ef9..c6b737acbb 100644 --- a/src/apps/aboutsystem/AboutSystem.cpp +++ b/src/apps/aboutsystem/AboutSystem.cpp @@ -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); } diff --git a/src/apps/aboutsystem/AboutSystem.rdef b/src/apps/aboutsystem/AboutSystem.rdef index 7e0ed2f146..9bbecba655 100644 --- a/src/apps/aboutsystem/AboutSystem.rdef +++ b/src/apps/aboutsystem/AboutSystem.rdef @@ -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" diff --git a/src/apps/installer/Installer.rdef b/src/apps/installer/Installer.rdef index 54b43f5790..3d3f67f4c7 100644 --- a/src/apps/installer/Installer.rdef +++ b/src/apps/installer/Installer.rdef @@ -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" diff --git a/src/apps/installer/InstallerWindow.cpp b/src/apps/installer/InstallerWindow.cpp index 2da3ddbb73..1f76418d68 100644 --- a/src/apps/installer/InstallerWindow.cpp +++ b/src/apps/installer/InstallerWindow.cpp @@ -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"); }