Changed hbmenu logo

Makefile.pc

@@ -12,7 +12,7 @@ test : pc_main/main.cpp pc_main/pc_launch.c \
 	common/menu-entry.c common/menu-list.c common/text.c \
 	common/nanojpeg.c common/ui.c common/math.c common/theme.c \
 	build_pc/tahoma24.o build_pc/tahoma12.o build_pc/switchicon_questionmark.bin.o build_pc/folder_icon.bin.o \
-	build_pc/button_a_light.bin.o build_pc/button_a_dark.bin.o
+	build_pc/button_a_light.bin.o build_pc/button_a_dark.bin.o build_pc/hbmenu_logo_light.bin.o build_pc/hbmenu_logo_dark.bin.o
 	gcc -Wall -O2 -g0 $^ -lsfml-graphics -lsfml-window -lsfml-system -lstdc++ -I. -Ibuild_pc -o $@
 
 build_pc/tahoma12.o	:	data/tahoma12.nxfnt
@@ -45,5 +45,15 @@ build_pc/button_a_dark.bin.o	:	data/button_a_dark.bin
 	@echo $(notdir $<)
 	@$(bin2o)
 
+build_pc/hbmenu_logo_light.bin.o	:	data/hbmenu_logo_light.bin
+	mkdir -p $(dir $@)
+	@echo $(notdir $<)
+	@$(bin2o)
+
+build_pc/hbmenu_logo_dark.bin.o	:	data/hbmenu_logo_dark.bin
+	mkdir -p $(dir $@)
+	@echo $(notdir $<)
+	@$(bin2o)
+
 clean:
 	rm -rf build_pc/ test

common/menu.c

@@ -285,18 +285,18 @@ void menuLoop() {
     drawWave(timer, themeCurrent.frontWaveColor, 280.0, 4.0, -2.5);
     timer += 0.05;
 
-    DrawText(tahoma24, 40, 30, themeCurrent.textColor, "hbmenu");
-    DrawText(tahoma12, 40 + 120, 30 + 16, themeCurrent.textColor, "v2.0.0");
-    DrawText(tahoma12, 40, 720 - 32 - 16, themeCurrent.textColor, menu->dirname);
+    drawImage(40, 20, 140, 60, themeCurrent.hbmenuLogoImage, IMAGE_MODE_RGB32);
+    DrawText(tahoma12, 180, 47, themeCurrent.textColor, "v2.0.0");
+    DrawText(tahoma12, 40, 720 - 48, themeCurrent.textColor, menu->dirname);
 
     //drawTime();
 
-    drawImage(1280 - 190 + 64, 720 - 32 - 16, 32, 32, themeCurrent.buttonAImage, IMAGE_MODE_RGB32);
-    DrawText(tahoma12, 1280 - 190 + 32 + 68, 720 - 32 - 16 + 4, themeCurrent.textColor, "Launch");
+    drawImage(1280 - 126, 720 - 48, 32, 32, themeCurrent.buttonAImage, IMAGE_MODE_RGB32);
+    DrawText(tahoma12, 1280 - 90, 720 - 44, themeCurrent.textColor, "Launch");
 
     if (menu->nEntries==0)
     {
-        DrawText(tahoma12, 64, 96 + 32, themeCurrent.textColor, textGetString(StrId_NoAppsFound_Msg));
+        DrawText(tahoma12, 64, 128, themeCurrent.textColor, textGetString(StrId_NoAppsFound_Msg));
     }
     else
     {

common/theme.c

@@ -1,6 +1,8 @@
 #include "theme.h"
 #include "button_a_light_bin.h"
 #include "button_a_dark_bin.h"
+#include "hbmenu_logo_light_bin.h"
+#include "hbmenu_logo_dark_bin.h"
 
 void themeStartup(ThemePreset preset) {
     switch (preset) {
@@ -13,7 +15,8 @@ void themeStartup(ThemePreset preset) {
                 backgroundColor: MakeColor(233, 236, 241, 255),
                 highlightColor: MakeColor(129, 137, 236, 255),
                 enableWaveBlending: 0,
-                buttonAImage: button_a_light_bin
+                buttonAImage: button_a_light_bin,
+                hbmenuLogoImage: hbmenu_logo_light_bin
             };
             break;
 
@@ -26,7 +29,8 @@ void themeStartup(ThemePreset preset) {
                 backgroundColor: MakeColor(45, 55, 66, 255),
                 highlightColor: MakeColor(129, 137, 236, 255),
                 enableWaveBlending: 0,
-                buttonAImage: button_a_dark_bin
+                buttonAImage: button_a_dark_bin,
+                hbmenuLogoImage: hbmenu_logo_dark_bin
             };
             break;
     }

common/theme.h

@@ -12,6 +12,7 @@ typedef struct
     color_t highlightColor;
     bool enableWaveBlending;
     const uint8_t *buttonAImage;
+    const uint8_t *hbmenuLogoImage;
 } theme_t;
 
 typedef enum