Minor changes for UI version

Shadowtrance · Apr 14, 2016 · fd03217 · fd03217
1 parent 443a7ce
commit fd03217
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -16,7 +16,7 @@ include $(DEVKITARM)/ds_rules
 # INCLUDES is a list of directories containing header files
 # SPECS is the directory containing the important build and link files
 #---------------------------------------------------------------------------------
-export TARGET	:=	EmuNAND9
+export TARGET	:=	EmuNAND9UI
 BUILD		:=	build
 SOURCES		:=	source source/fatfs source/abstraction
 DATA		:=	data
@@ -25,7 +25,7 @@ INCLUDES	:=	include source source/fatfs
 #---------------------------------------------------------------------------------
 # THEME: if set to anything, name of the themes file folder inside resources
 #---------------------------------------------------------------------------------
-THEME	:=	
+THEME	:=	/E9UI
 
 #---------------------------------------------------------------------------------
 # options for code generation

diff --git a/resources/BrahmaAppInfo b/resources/BrahmaAppInfo
@@ -1,6 +1,6 @@
-APP_TITLE = EmuNAND9
+APP_TITLE = EmuNAND9UI
 APP_DESCRIPTION = Open source 3DS EmuNAND format tool
-APP_AUTHOR = d0k3
+APP_AUTHOR = d0k3 & Shadowtrance
 
 PAYLOAD_MEM = 1
 VOODOO = 0xF
diff --git a/resources/BrahmaIcon.png b/resources/BrahmaIcon.png
diff --git a/resources/CakesROP/drunkenlogo.png b/resources/CakesROP/drunkenlogo.png
diff --git a/source/theme.c b/source/theme.c
@@ -39,17 +39,17 @@ void LoadThemeGfxLogo(void) {
     LoadThemeGfx(GFX_LOGO, LOGO_TOP);
     #if defined LOGO_TEXT_X && defined LOGO_TEXT_Y
     if (CheckFS()) {
-        DrawStringF(LOGO_TEXT_X, LOGO_TEXT_Y -  0, LOGO_TOP, "SD storage: %lluMB / %lluMB", RemainingStorageSpace() / (1024*1024), TotalStorageSpace() / (1024*1024));
+        DrawStringF(LOGO_TEXT_X  + 34, LOGO_TEXT_Y -  8, LOGO_TOP, "SD storage: %lluMB / %lluMB", RemainingStorageSpace() / (1024*1024), TotalStorageSpace() / (1024*1024));
     } else {
-        DrawStringF(LOGO_TEXT_X, LOGO_TEXT_Y -  0, LOGO_TOP, "SD storage: unknown filesystem");
+        DrawStringF(LOGO_TEXT_X  + 34, LOGO_TEXT_Y -  8, LOGO_TOP, "SD storage: unknown filesystem");
     }
-    DrawStringF(LOGO_TEXT_X, LOGO_TEXT_Y - 10, LOGO_TOP, "EmuNAND: %s",
+    DrawStringF(LOGO_TEXT_X + 74, LOGO_TEXT_Y - 28, LOGO_TOP, "EmuNAND: %s",
         (emunand_state == RES_EMUNAND_NOT_READY) ? "SD not ready" :
         (emunand_state == RES_EMUNAND_GATEWAY) ? "GW EmuNAND" : 
         (emunand_state == RES_EMUNAND_REDNAND) ? "RedNAND" : "SD is ready" );
     #ifdef WORK_DIR
     if (DirOpen(WORK_DIR)) {
-        DrawStringF(LOGO_TEXT_X, LOGO_TEXT_Y - 20, LOGO_TOP, "Work directory: %s", WORK_DIR);
+        DrawStringF(LOGO_TEXT_X + 48, LOGO_TEXT_Y - 18, LOGO_TOP, "Work directory: %s", WORK_DIR);
         DirClose();
     }
     #endif

diff --git a/source/theme.h b/source/theme.h
@@ -19,12 +19,13 @@
 #define COLOR_BLUE          RGB(0xFF, 0x00, 0xFF)
 #define COLOR_GREY          RGB(0x77, 0x77, 0x77)
 #define COLOR_PURPLE        RGB(0x66, 0x00, 0xFF)
+#define COLOR_FBLUE         RGB(0x26, 0x60, 0x95) // matches the font text
 
 #define LOGO_TOP        true
-#define LOGO_TEXT_X     10
+#define LOGO_TEXT_X     50
 #define LOGO_TEXT_Y     SCREEN_HEIGHT - 10
 #define LOGO_COLOR_BG   COLOR_TRANSPARENT
-#define LOGO_COLOR_FONT COLOR_WHITE
+#define LOGO_COLOR_FONT COLOR_FBLUE
 
 #define STD_COLOR_BG   LOGO_COLOR_BG
 #define STD_COLOR_FONT LOGO_COLOR_FONT