Ticket #6183: logos.patch

src/apps/aboutsystem/AboutSystem.cpp

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

src/apps/aboutsystem/AboutSystem.rdef

@@ -16 +16 @@
 
 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, "aboutsystem.png") #'PNG ' import "../../../data/artwork/HAIKU logo - black on white - tiny.png";
+#else
+resource(1, "aboutsystem.png") #'PNG ' import "../../../data/artwork/HAIKU logo - black on white - tiny - wip.png";
+#endif
+#endif
 
 resource vector_icon {
     $"6E636966090500020012020000003D4000BDA0000000004AE0004A1000000166"

src/apps/installer/InstallerWindow.cpp

@@ -170 +170 @@
 
     BSize logoSize = logoView->MinSize();
     logoView->SetExplicitMaxSize(logoSize);
-    fStatusView->SetExplicitMinSize(BSize(logoSize.width * 0.66,
-        B_SIZE_UNSET));
+    if ( logoSize.width > 0 )
+        fStatusView->SetExplicitMinSize(BSize(logoSize.width * 0.66,
+            B_SIZE_UNSET));
 
     fDestMenu = new BPopUpMenu(B_TRANSLATE("scanning" B_UTF8_ELLIPSIS),
         true, false);

src/apps/installer/Installer.rdef

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

src/system/kernel/boot_splash.cpp

@@ -15 +15 @@
 #include <KernelExport.h>
 
 #define __BOOTSPLASH_KERNEL__
-#include <boot/images.h>
+#ifdef HAIKU_DISTRO_COMPATIBILITY_OFFICIAL
+#ifdef HAIKU_OFFICIAL_RELEASE
+#include <boot/images-tm.h>
+#else
+#include <boot/images-tm-wip.h>
+#endif
+#else
+#include <boot/images-sans-tm.h>
+#endif
 
 
 #include <boot_item.h>

src/system/boot/platform/generic/video_splash.cpp

@@ -11 +11 @@
 #include <boot/platform.h>
 #include <boot/menu.h>
 #include <boot/kernel_args.h>
-#include <boot/images.h>
 #include <boot/platform/generic/video.h>
 
+#ifdef HAIKU_DISTRO_COMPATIBILITY_OFFICIAL
+#ifdef HAIKU_OFFICIAL_RELEASE
+#include <boot/images-tm.h>
+#else
+#include <boot/images-tm-wip.h>
+#endif
+#else
+#include <boot/images-sans-tm.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>