Merge pull request ps2homebrew#239 from Tupakaveli/master

Gui Overhaul, Part 2
citronalco · Jan 27, 2020 · 9d49481 · 9d49481
2 parents e89a8f5 + 6acf75e
commit 9d49481
Show file tree

Hide file tree

Showing 100 changed files with 810 additions and 242 deletions.
diff --git a/Makefile b/Makefile
@@ -61,9 +61,16 @@ FRONTEND_OBJS = pad.o fntsys.o renderman.o menusys.o OSDHistory.o system.o lang.
 
 GFX_OBJS =	usb_icon.o hdd_icon.o eth_icon.o app_icon.o \
 		cross_icon.o triangle_icon.o circle_icon.o square_icon.o select_icon.o start_icon.o \
-		left_icon.o right_icon.o up_icon.o down_icon.o L1_icon.o L2_icon.o R1_icon.o R2_icon.o \
-		load0.o load1.o load2.o load3.o load4.o load5.o load6.o load7.o logo.o bg_overlay.o freesans.o \
-		icon_sys.o icon_icn.o
+		left_icon.o right_icon.o up_icon.o down_icon.o \
+		load0.o load1.o load2.o load3.o load4.o load5.o load6.o load7.o \
+		background.o info.o cover.o disc.o screen.o logo.o case.o \
+		ELF.o HDL.o ISO.o UL.o CD.o DVD.o Aspect_s.o Aspect_w.o Aspect_w1.o Aspect_w2.o \
+		Device_1.o Device_2.o Device_3.o Device_4.o Device_5.o Device_6.o Device_all.o \
+		Rating_0.o Rating_1.o Rating_2.o Rating_3.o Rating_4.o Rating_5.o \
+		Scan_240p.o Scan_240p1.o Scan_480i.o Scan_480p.o Scan_480p1.o Scan_480p2.o \
+		Scan_480p3.o Scan_480p4.o Scan_480p5.o Scan_576i.o Scan_576p.o Scan_720p.o \
+		Scan_1080i.o Scan_1080i2.o Scan_1080p.o Vmode_multi.o Vmode_ntsc.o Vmode_pal.o \
+		poeveticanew.o icon_sys.o icon_icn.o
 
 MISC_OBJS =	icon_sys_A.o icon_sys_J.o icon_sys_C.o conf_theme_OPL.o \
 		boot.o cancel.o confirm.o cursor.o message.o transition.o
@@ -651,12 +658,6 @@ $(EE_ASM_DIR)load6.s: gfx/load6.png | $(EE_ASM_DIR)
 $(EE_ASM_DIR)load7.s: gfx/load7.png | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ load7_png
 
-$(EE_ASM_DIR)logo.s: gfx/logo.png | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ logo_png
-
-$(EE_ASM_DIR)bg_overlay.s: gfx/bg_overlay.png | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ bg_overlay_png
-
 $(EE_ASM_DIR)usb_icon.s: gfx/usb.png | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ usb_png
 
@@ -699,20 +700,152 @@ $(EE_ASM_DIR)up_icon.s: gfx/up.png | $(EE_ASM_DIR)
 $(EE_ASM_DIR)down_icon.s: gfx/down.png | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ down_png
 
-$(EE_ASM_DIR)L1_icon.s: gfx/L1.png | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ L1_png
+$(EE_ASM_DIR)background.s: gfx/background.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ background_png
+
+$(EE_ASM_DIR)info.s: gfx/info.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ info_png
+
+$(EE_ASM_DIR)cover.s: gfx/cover.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ cover_png
+
+$(EE_ASM_DIR)disc.s: gfx/disc.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ disc_png
+
+$(EE_ASM_DIR)screen.s: gfx/screen.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ screen_png
+
+$(EE_ASM_DIR)ELF.s: gfx/ELF.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ ELF_png
+
+$(EE_ASM_DIR)HDL.s: gfx/HDL.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ HDL_png
+
+$(EE_ASM_DIR)ISO.s: gfx/ISO.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ ISO_png
+
+$(EE_ASM_DIR)UL.s: gfx/UL.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ UL_png
+
+$(EE_ASM_DIR)CD.s: gfx/CD.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ CD_png
+
+$(EE_ASM_DIR)DVD.s: gfx/DVD.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ DVD_png
+
+$(EE_ASM_DIR)Aspect_s.s: gfx/Aspect_s.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Aspect_s_png
+
+$(EE_ASM_DIR)Aspect_w.s: gfx/Aspect_w.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Aspect_w_png
+
+$(EE_ASM_DIR)Aspect_w1.s: gfx/Aspect_w1.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Aspect_w1_png
+
+$(EE_ASM_DIR)Aspect_w2.s: gfx/Aspect_w2.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Aspect_w2_png
+
+$(EE_ASM_DIR)Device_1.s: gfx/Device_1.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Device_1_png
+
+$(EE_ASM_DIR)Device_2.s: gfx/Device_2.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Device_2_png
+
+$(EE_ASM_DIR)Device_3.s: gfx/Device_3.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Device_3_png
+
+$(EE_ASM_DIR)Device_4.s: gfx/Device_4.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Device_4_png
+
+$(EE_ASM_DIR)Device_5.s: gfx/Device_5.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Device_5_png
+
+$(EE_ASM_DIR)Device_6.s: gfx/Device_6.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Device_6_png
+
+$(EE_ASM_DIR)Device_all.s: gfx/Device_all.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Device_all_png
 
-$(EE_ASM_DIR)L2_icon.s: gfx/L2.png | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ L2_png
+$(EE_ASM_DIR)Rating_0.s: gfx/Rating_0.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Rating_0_png
 
-$(EE_ASM_DIR)R1_icon.s: gfx/R1.png | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ R1_png
+$(EE_ASM_DIR)Rating_1.s: gfx/Rating_1.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Rating_1_png
+
+$(EE_ASM_DIR)Rating_2.s: gfx/Rating_2.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Rating_2_png
+
+$(EE_ASM_DIR)Rating_3.s: gfx/Rating_3.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Rating_3_png
+
+$(EE_ASM_DIR)Rating_4.s: gfx/Rating_4.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Rating_4_png
+
+$(EE_ASM_DIR)Rating_5.s: gfx/Rating_5.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Rating_5_png
+
+$(EE_ASM_DIR)Scan_240p.s: gfx/Scan_240p.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Scan_240p_png
+
+$(EE_ASM_DIR)Scan_240p1.s: gfx/Scan_240p1.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Scan_240p1_png
+
+$(EE_ASM_DIR)Scan_480i.s: gfx/Scan_480i.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Scan_480i_png
+
+$(EE_ASM_DIR)Scan_480p.s: gfx/Scan_480p.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Scan_480p_png
+
+$(EE_ASM_DIR)Scan_480p1.s: gfx/Scan_480p1.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Scan_480p1_png
+
+$(EE_ASM_DIR)Scan_480p2.s: gfx/Scan_480p2.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Scan_480p2_png
+
+$(EE_ASM_DIR)Scan_480p3.s: gfx/Scan_480p3.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Scan_480p3_png
+
+$(EE_ASM_DIR)Scan_480p4.s: gfx/Scan_480p4.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Scan_480p4_png
+
+$(EE_ASM_DIR)Scan_480p5.s: gfx/Scan_480p5.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Scan_480p5_png
+
+$(EE_ASM_DIR)Scan_576i.s: gfx/Scan_576i.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Scan_576i_png
+
+$(EE_ASM_DIR)Scan_576p.s: gfx/Scan_576p.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Scan_576p_png
+
+$(EE_ASM_DIR)Scan_720p.s: gfx/Scan_720p.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Scan_720p_png
+
+$(EE_ASM_DIR)Scan_1080i.s: gfx/Scan_1080i.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Scan_1080i_png
+
+$(EE_ASM_DIR)Scan_1080i2.s: gfx/Scan_1080i2.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Scan_1080i2_png
+
+$(EE_ASM_DIR)Scan_1080p.s: gfx/Scan_1080p.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Scan_1080p_png
+
+$(EE_ASM_DIR)Vmode_multi.s: gfx/Vmode_multi.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Vmode_multi_png
+
+$(EE_ASM_DIR)Vmode_ntsc.s: gfx/Vmode_ntsc.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Vmode_ntsc_png
+
+$(EE_ASM_DIR)Vmode_pal.s: gfx/Vmode_pal.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ Vmode_pal_png
+
+$(EE_ASM_DIR)logo.s: gfx/logo.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ logo_png
 
-$(EE_ASM_DIR)R2_icon.s: gfx/R2.png | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ R2_png
+$(EE_ASM_DIR)case.s: gfx/case.png | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ case_png
 
-$(EE_ASM_DIR)freesans.s: thirdparty/FreeSans_basic_latin.ttf | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ freesansfont_raw
+$(EE_ASM_DIR)poeveticanew.s: thirdparty/PoeVeticaNew.ttf | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ poeveticanew_raw
 
 $(EE_ASM_DIR)icon_sys.s: gfx/icon.sys | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ icon_sys

diff --git a/gfx/Aspect_s.png b/gfx/Aspect_s.png
diff --git a/gfx/Aspect_w.png b/gfx/Aspect_w.png
diff --git a/gfx/Aspect_w1.png b/gfx/Aspect_w1.png
diff --git a/gfx/Aspect_w2.png b/gfx/Aspect_w2.png
diff --git a/gfx/CD.png b/gfx/CD.png
diff --git a/gfx/DVD.png b/gfx/DVD.png
diff --git a/gfx/Device_1.png b/gfx/Device_1.png
diff --git a/gfx/Device_2.png b/gfx/Device_2.png
diff --git a/gfx/Device_3.png b/gfx/Device_3.png
diff --git a/gfx/Device_4.png b/gfx/Device_4.png
diff --git a/gfx/Device_5.png b/gfx/Device_5.png
diff --git a/gfx/Device_6.png b/gfx/Device_6.png
diff --git a/gfx/Device_all.png b/gfx/Device_all.png
diff --git a/gfx/ELF.png b/gfx/ELF.png
diff --git a/gfx/HDL.png b/gfx/HDL.png
diff --git a/gfx/ISO.png b/gfx/ISO.png
diff --git a/gfx/L1.png b/gfx/L1.png
diff --git a/gfx/L2.png b/gfx/L2.png
diff --git a/gfx/L3.png b/gfx/L3.png
diff --git a/gfx/R1.png b/gfx/R1.png
diff --git a/gfx/R2.png b/gfx/R2.png
diff --git a/gfx/R3.png b/gfx/R3.png
diff --git a/gfx/Rating_0.png b/gfx/Rating_0.png
diff --git a/gfx/Rating_1.png b/gfx/Rating_1.png
diff --git a/gfx/Rating_2.png b/gfx/Rating_2.png
diff --git a/gfx/Rating_3.png b/gfx/Rating_3.png
diff --git a/gfx/Rating_4.png b/gfx/Rating_4.png
diff --git a/gfx/Rating_5.png b/gfx/Rating_5.png
diff --git a/gfx/Scan_1080i.png b/gfx/Scan_1080i.png
diff --git a/gfx/Scan_1080i2.png b/gfx/Scan_1080i2.png
diff --git a/gfx/Scan_1080p.png b/gfx/Scan_1080p.png
diff --git a/gfx/Scan_240p.png b/gfx/Scan_240p.png
diff --git a/gfx/Scan_240p1.png b/gfx/Scan_240p1.png
diff --git a/gfx/Scan_480i.png b/gfx/Scan_480i.png
diff --git a/gfx/Scan_480p.png b/gfx/Scan_480p.png
diff --git a/gfx/Scan_480p1.png b/gfx/Scan_480p1.png
diff --git a/gfx/Scan_480p2.png b/gfx/Scan_480p2.png
diff --git a/gfx/Scan_480p3.png b/gfx/Scan_480p3.png
diff --git a/gfx/Scan_480p4.png b/gfx/Scan_480p4.png
diff --git a/gfx/Scan_480p5.png b/gfx/Scan_480p5.png
diff --git a/gfx/Scan_576i.png b/gfx/Scan_576i.png
diff --git a/gfx/Scan_576p.png b/gfx/Scan_576p.png
diff --git a/gfx/Scan_720p.png b/gfx/Scan_720p.png
diff --git a/gfx/UL.png b/gfx/UL.png
diff --git a/gfx/Vmode_multi.png b/gfx/Vmode_multi.png
diff --git a/gfx/Vmode_ntsc.png b/gfx/Vmode_ntsc.png
diff --git a/gfx/Vmode_pal.png b/gfx/Vmode_pal.png
diff --git a/gfx/app.png b/gfx/app.png
diff --git a/gfx/background.png b/gfx/background.png
diff --git a/gfx/bg_overlay.png b/gfx/bg_overlay.png
diff --git a/gfx/case.png b/gfx/case.png
diff --git a/gfx/circle.png b/gfx/circle.png
diff --git a/gfx/cover.png b/gfx/cover.png
diff --git a/gfx/cross.png b/gfx/cross.png
diff --git a/gfx/disc.png b/gfx/disc.png
diff --git a/gfx/down.png b/gfx/down.png
diff --git a/gfx/eth.png b/gfx/eth.png
diff --git a/gfx/hdd.png b/gfx/hdd.png
diff --git a/gfx/info.png b/gfx/info.png
diff --git a/gfx/left.png b/gfx/left.png
diff --git a/gfx/load1.png b/gfx/load1.png
diff --git a/gfx/load3.png b/gfx/load3.png
diff --git a/gfx/load4.png b/gfx/load4.png
diff --git a/gfx/load5.png b/gfx/load5.png
diff --git a/gfx/load7.png b/gfx/load7.png
diff --git a/gfx/logo.png b/gfx/logo.png
diff --git a/gfx/right.png b/gfx/right.png
diff --git a/gfx/screen.png b/gfx/screen.png
diff --git a/gfx/select.png b/gfx/select.png
diff --git a/gfx/square.png b/gfx/square.png
diff --git a/gfx/start.png b/gfx/start.png
diff --git a/gfx/triangle.png b/gfx/triangle.png
diff --git a/gfx/up.png b/gfx/up.png
diff --git a/gfx/usb.png b/gfx/usb.png
diff --git a/include/dialogs.h b/include/dialogs.h
@@ -14,6 +14,7 @@ enum UI_ITEMS {
     UICFG_UICOL,
     UICFG_TXTCOL,
     UICFG_SELCOL,
+    UICFG_RESETCOL,
     UICFG_AUTOSORT,
     UICFG_COVERART,
     UICFG_WIDESCREEN,

diff --git a/include/iosupport.h b/include/iosupport.h
@@ -65,7 +65,7 @@ enum ERROR_CODE {
 #define COMPAT_MODE_7 0x40 // Unused
 #define COMPAT_MODE_8 0x80 // Unused
 
-#define COMPAT_MODE_COUNT 8
+#define COMPAT_MODE_COUNT 6 // only count modes in use
 
 #define OPL_MOD_STORAGE 0x00097000    //(default) Address of the module storage region
 

diff --git a/include/lang.h b/include/lang.h
@@ -128,7 +128,7 @@ enum _STR_IDS {
     _STR_USE_GENERIC,
     _STR_VMC_SCREEN,
     _STR_VMC_NAME,
-    _STR_VMC_SIZE,
+    _STR_SIZE,
     _STR_VMC_STATUS,
     _STR_VMC_PROGRESS,
     _STR_VMC_FILE_EXISTS,
@@ -146,7 +146,7 @@ enum _STR_IDS {
     _STR_VMODE,
     _STR_UICOLOR,
     _STR_SELCOLOR,
-    _STR_USE_INFO_SCREEN, // string no longer used
+    _STR_RESETCOLOR,
     _STR_INFO,
     _STR_ALTSTARTUP,
     _STR_COLOR_SELECTION,
@@ -278,6 +278,12 @@ enum _STR_IDS {
     _STR_PERGAME_SETTINGS,
     _STR_ALL_SETTINGS,
     _STR_GAME_SETTINGS_PROMPT,
+    _STR_FORUM_DETAILS,
+    _STR_INFO_TITLE,
+    _STR_INFO_GENRE,
+    _STR_INFO_RELEASE,
+    _STR_INFO_DEVELOPER,
+    _STR_INFO_DESCRIPTION,
 
     LANG_STR_COUNT
 };

diff --git a/include/opl.h b/include/opl.h
@@ -187,6 +187,8 @@ unsigned char gDefaultTextColor[3];
 unsigned char gDefaultSelTextColor[3];
 unsigned char gDefaultUITextColor[3];
 
+void setDefaultColors(void);
+
 #define MENU_ITEM_HEIGHT 19
 
 // BLURT output

diff --git a/include/textures.h b/include/textures.h
@@ -24,12 +24,61 @@ enum INTERNAL_TEXTURE {
     SQUARE_ICON,
     SELECT_ICON,
     START_ICON,
+    /* currently unused.
     L1_ICON,
     L2_ICON,
+    L3_ICON,
     R1_ICON,
     R2_ICON,
+    R3_ICON, */
+    MAIN_BG,
+    INFO_BG,
+    COVER_DEFAULT,
+    DISC_DEFAULT,
+    SCREEN_DEFAULT,
+    ELF_FORMAT,
+    HDL_FORMAT,
+    ISO_FORMAT,
+    UL_FORMAT,
+    CD_MEDIA,
+    DVD_MEDIA,
+    ASPECT_STD,
+    ASPECT_WIDE,
+    ASPECT_WIDE1,
+    ASPECT_WIDE2,
+    DEVICE_1,
+    DEVICE_2,
+    DEVICE_3,
+    DEVICE_4,
+    DEVICE_5,
+    DEVICE_6,
+    DEVICE_ALL,
+    RATING_0,
+    RATING_1,
+    RATING_2,
+    RATING_3,
+    RATING_4,
+    RATING_5,
+    SCAN_240P,
+    SCAN_240P1,
+    SCAN_480I,
+    SCAN_480P,
+    SCAN_480P1,
+    SCAN_480P2,
+    SCAN_480P3,
+    SCAN_480P4,
+    SCAN_480P5,
+    SCAN_576I,
+    SCAN_576P,
+    SCAN_720P,
+    SCAN_1080I,
+    SCAN_1080I2,
+    SCAN_1080P,
+    VMODE_MULTI,
+    VMODE_NTSC,
+    VMODE_PAL,
     LOGO_PICTURE,
-    BG_OVERLAY,
+    CASE_OVERLAY,
 
     TEXTURES_COUNT
 };

diff --git a/lng/lang_English.lng b/lng/lang_English.lng
@@ -24,7 +24,7 @@ English template
 Open PS2 Loader %s
 Save Changes
 Back
-Network Config
+Network Settings
 Advanced Options
 <no values>
 Settings saved to %s
@@ -163,7 +163,7 @@ Automatic HDD Spin Down
 Video Mode
 Dialog Color
 Selected Color
-Unused
+Reset Colors
 Info
 Custom ELF
 Color Selection
@@ -229,7 +229,7 @@ Auto start in %i s...
 Auto Start
 Value in second(s), 0 to disable auto start.
 PS2 Logo
-Only displayed for a valid disc logo which matches the console's region.
+Displayed for a valid disc logo matching the console's region.
 Configure PADEMU
 Pad Emulator Settings
 Enable Pad Emulator
@@ -295,3 +295,9 @@ Global
 Per Game
 All
 Select settings to remove.
+Support Forums:
+Title
+Genre
+Release
+Developer
+Description