Batch upload to Tuna branch

Author: NathanNeurotic

installer/menu.c

@@ -73,67 +73,23 @@ enum INSUFF_SPC_SCREEN_ID {
     INSUFF_SPC_SCREEN_ID_BTN_OK,
 };
 
-UIMenuItem MainMenuItems[] = {
-    {MITEM_BUTTON, MAIN_MENU_ID_BTN_INST, 20, 75, 280, 22, LANG_MENU_INSTALL, 1, 0, 0},
-    {MITEM_BUTTON, MAIN_MENU_ID_BTN_UNINST, 20, 108, 280, 22, LANG_MENU_UNINSTALL, 1, 0, 0},
-    {MITEM_BUTTON, MAIN_MENU_ID_BTN_PFS, 20, 141, 280, 22, LANG_MENU_PFS, 1, 0, 0},
-    {MITEM_BUTTON, MAIN_MENU_ID_BTN_OSDMENU, 20, 174, 280, 22, LANG_MENU_OSDMENU, 1, 0, 0},
-    {MITEM_BUTTON, MAIN_MENU_ID_BTN_OPENTUNA, 20, 207, 280, 22, LANG_MENU_OPENTUNA, 1, 0, 0},
-    {MITEM_BUTTON, MAIN_MENU_ID_BTN_RETURN, 20, 240, 280, 22, LANG_MENU_RETURN, 1, 0, 0},
-    {MITEM_END, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+UI
+MenuItem MainMenuItems[] = {
+    {MITEM_ACTION, MAIN_MENU_ID_BTN_INSTALL, LANG_MENU_INSTALL, NULL, 0, 0, 0, 0},
+    {MITEM_ACTION, MAIN_MENU_ID_BTN_RETURN, LANG_MENU_RETURN, NULL, 0, 0, 0, 0},
+    {MITEM_END, 0, 0, NULL, 0, 0, 0, 0}
 };
-static struct UIMenuItem ExtraMenuItems[] = {{
-    {MITEM_LABEL, 0, 0, 0, 0, 0, 0, SYS_UI_LBL_MENU_EXTRAS}},
-    {MITEM_SEPERATOR}},
-    {MITEM_BREAK}},
-
-    {MITEM_BUTTON, MAIN_MENU_ID_BTN_INST_CROSS_PSX, MITEM_FLAG_POS_MID, 0, 24, 0, 0, SYS_UI_LBL_INSTALL_CROSS_PSX}},
-    {MITEM_BREAK}},
-    {MITEM_BREAK}},
-    {MITEM_BUTTON, MAIN_MENU_ID_BTN_INST_FHDB, MITEM_FLAG_POS_MID, 0, 24, 0, 0, SYS_UI_LBL_INSTALL_FHDB}},
-    {MITEM_BREAK}},
-    {MITEM_BREAK}},
-    {MITEM_BUTTON, MAIN_MENU_ID_BTN_UINST_FHDB, MITEM_FLAG_POS_MID, 0, 24, 0, 0, SYS_UI_LBL_UINSTALL_FHDB}},
-    {MITEM_BREAK}},
-    {MITEM_BREAK}},
-    {MITEM_BUTTON, MAIN_MENU_ID_BTN_FORMAT_HDD, MITEM_FLAG_POS_MID, 0, 24, 0, 0, SYS_UI_LBL_FORMAT_HDD}},
-    {MITEM_BREAK}},
-    {MITEM_BREAK}},
 
-    {MITEM_STRING, MAIN_MENU_ID_DESCRIPTION, MITEM_FLAG_POS_ABS | MITEM_FLAG_READONLY, 0, 0, 32, 370}},
-    {MITEM_BREAK}},
-    {MITEM_STRING, MAIN_MENU_ID_VERSION, MITEM_FLAG_POS_ABS | MITEM_FLAG_READONLY, 0, 0, 520, 420}},
-    {MITEM_BREAK}},
-UIMenuItem ExtraMenuItems[] = {
-    {MITEM_BUTTON, EXTRA_MENU_ID_BTN_COPY, 20, 75, 280, 22, LANG_MENU_COPY, 1, 0, 0},
-    {MITEM_BUTTON, EXTRA_MENU_ID_BTN_DELETE, 20, 108, 280, 22, LANG_MENU_DELETE, 1, 0, 0},
-    {MITEM_BUTTON, EXTRA_MENU_ID_BTN_RENAME, 20, 141, 280, 22, LANG_MENU_RENAME, 1, 0, 0},
-    {MITEM_BUTTON, EXTRA_MENU_ID_BTN_RETURN, 20, 174, 280, 22, LANG_MENU_RETURN, 1, 0, 0},
-    {MITEM_END, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+MenuItem ExtraMenuItems[] = {
+    {MITEM_ACTION, MAIN_MENU_ID_BTN_UNINST, LANG_MENU_UNINSTALL, NULL, 0, 0, 0, 0},
+    {MITEM_END, 0, 0, NULL, 0, 0, 0, 0}
 };
-    {MITEM_LABEL, PRG_SCREEN_ID_TITLE}},
-    {MITEM_SEPERATOR}},
-    {MITEM_BREAK}},
 
-    {MITEM_LABEL, PRG_SCREEN_ID_ETA_LBL, 0, 0, 0, 0, 0, SYS_UI_LBL_ETA}},
-    {MITEM_TAB}},
-    {MITEM_VALUE, PRG_SCREEN_ID_ETA_HOURS, MITEM_FLAG_READONLY, MITEM_FORMAT_UDEC, 2}},
-    {MITEM_COLON, PRG_SCREEN_ID_ETA_MINS_SEP}},
-    {MITEM_VALUE, PRG_SCREEN_ID_ETA_MINS, MITEM_FLAG_READONLY, MITEM_FORMAT_UDEC, 2}},
-    {MITEM_COLON, PRG_SCREEN_ID_ETA_SECS_SEP}},
-    {MITEM_VALUE, PRG_SCREEN_ID_ETA_SECS, MITEM_FLAG_READONLY, MITEM_FORMAT_UDEC, 2}},
-    {MITEM_BREAK}},
-    {MITEM_BREAK}},
-    {MITEM_LABEL, PRG_SCREEN_ID_RATE_LBL, 0, 0, 0, 0, 0, SYS_UI_LBL_RATE}},
-    {MITEM_TAB}},
-    {MITEM_TAB}},
-    {MITEM_VALUE, PRG_SCREEN_ID_RATE, MITEM_FLAG_READONLY}},
-UIMenuItem MCMenuItems[] = {
-    {MITEM_BUTTON, MC_MENU_ID_BTN_DELETE, 20, 75, 280, 22, LANG_MENU_DELETE, 1, 0, 0},
-    {MITEM_BUTTON, MC_MENU_ID_BTN_FORMAT, 20, 108, 280, 22, LANG_MENU_FORMAT, 1, 0, 0},
-    {MITEM_BUTTON, MC_MENU_ID_BTN_RETURN, 20, 141, 280, 22, LANG_MENU_RETURN, 1, 0, 0},
-    {MITEM_END, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+MenuItem MCMenuItems[] = {
+    {MITEM_ACTION, MAIN_MENU_ID_BTN_PFS, LANG_MENU_PFS, NULL, 0, 0, 0, 0},
+    {MITEM_END, 0, 0, NULL, 0, 0, 0, 0}
 };
+
     {MITEM_LABEL, 0, 0, 0, 0, 0, 0, SYS_UI_LBL_REQUIRED_SPC}},
     {MITEM_TAB}},
     {MITEM_TAB}},