gui: remove info page option as it is now redundant

ps2homebrew · Nov 1, 2019 · abc09a90db3f4626db4828698a80583bd83a2997 · abc09a9
1 parent a72561c
commit abc09a90db3f4626db4828698a80583bd83a2997
Showing with 4 additions and 17 deletions.

+0 −1 include/config.h

+0 −1 include/dialogs.h

+1 −1 include/lang.h

+0 −1 include/opl.h

+0 −5 src/dialogs.c

+0 −2 src/gui.c

+1 −1 src/lang.c

+2 −5 src/opl.c
diff --git a/include/config.h b/include/config.h
@@ -63,7 +63,6 @@ enum CONFIG_INDEX {
 #define CONFIG_OPL_TEXTCOLOR "text_color"
 #define CONFIG_OPL_UI_TEXTCOLOR "ui_text_color"
 #define CONFIG_OPL_SEL_TEXTCOLOR "sel_text_color"
-#define CONFIG_OPL_USE_INFOSCREEN "use_info_screen"
 #define CONFIG_OPL_ENABLE_NOTIFICATIONS "enable_notifications"
 #define CONFIG_OPL_ENABLE_COVERART "enable_coverart"
 #define CONFIG_OPL_WIDESCREEN "wide_screen"

diff --git a/include/dialogs.h b/include/dialogs.h
@@ -22,7 +22,6 @@ enum UI_ITEMS {
     UICFG_XOFF,
     UICFG_YOFF,
     UICFG_OVERSCAN,
-    UICFG_INFOPAGE,
     UICFG_NOTIFICATIONS,
 
     CFG_DEBUG,

diff --git a/include/lang.h b/include/lang.h
@@ -146,7 +146,7 @@ enum _STR_IDS {
     _STR_VMODE,
     _STR_UICOLOR,
     _STR_SELCOLOR,
-    _STR_USE_INFO_SCREEN,
+    _STR_USE_INFO_SCREEN, // string no longer used
     _STR_INFO,
     _STR_ALTSTARTUP,
     _STR_COLOR_SELECTION,

diff --git a/include/opl.h b/include/opl.h
@@ -118,7 +118,6 @@ int gAPPStartMode;
 
 int gAutosort;
 int gAutoRefresh;
-int gUseInfoScreen;
 int gEnableNotifications;
 int gEnableArt;
 int gWideScreen;

diff --git a/src/dialogs.c b/src/dialogs.c
@@ -266,11 +266,6 @@ struct UIItem diaUIConfig[] = {
     {UI_BOOL, UICFG_COVERART, 1, 1, -1, 0, 0, {.intvalue = {0, 0}}},
     {UI_BREAK},
 
-    {UI_LABEL, 0, 1, 1, -1, -40, 0, {.label = {NULL, _STR_USE_INFO_SCREEN}}},
-    {UI_SPACER},
-    {UI_BOOL, UICFG_INFOPAGE, 1, 1, -1, 0, 0, {.intvalue = {0, 0}}},
-    {UI_BREAK},
-
     {UI_LABEL, 0, 1, 1, -1, -40, 0, {.label = {NULL, _STR_ENABLE_NOTIFICATIONS}}},
     {UI_SPACER},
     {UI_BOOL, UICFG_NOTIFICATIONS, 1, 1, -1, 0, 0, {.intvalue = {0, 0}}},

diff --git a/src/gui.c b/src/gui.c
@@ -611,7 +611,6 @@ void guiShowUIConfig(void)
     diaSetInt(diaUIConfig, UICFG_LANG, lngGetGuiValue());
     diaSetInt(diaUIConfig, UICFG_AUTOSORT, gAutosort);
     diaSetInt(diaUIConfig, UICFG_AUTOREFRESH, gAutoRefresh);
-    diaSetInt(diaUIConfig, UICFG_INFOPAGE, gUseInfoScreen);
     diaSetInt(diaUIConfig, UICFG_NOTIFICATIONS, gEnableNotifications);
     diaSetInt(diaUIConfig, UICFG_COVERART, gEnableArt);
     diaSetInt(diaUIConfig, UICFG_WIDESCREEN, gWideScreen);
@@ -635,7 +634,6 @@ void guiShowUIConfig(void)
         }
         diaGetInt(diaUIConfig, UICFG_AUTOSORT, &gAutosort);
         diaGetInt(diaUIConfig, UICFG_AUTOREFRESH, &gAutoRefresh);
-        diaGetInt(diaUIConfig, UICFG_INFOPAGE, &gUseInfoScreen);
         diaGetInt(diaUIConfig, UICFG_NOTIFICATIONS, &gEnableNotifications);
         diaGetInt(diaUIConfig, UICFG_COVERART, &gEnableArt);
         diaGetInt(diaUIConfig, UICFG_WIDESCREEN, &gWideScreen);

diff --git a/src/lang.c b/src/lang.c
@@ -149,7 +149,7 @@ static char *internalEnglish[LANG_STR_COUNT] = {
     "Video Mode",
     "Dialog Color",
     "Selected Color",
-    "Display Info Page",
+    "Unused", // string no longer used
     "Info",
     "Custom ELF",
     "Color Selection",

diff --git a/src/opl.c b/src/opl.c
@@ -142,7 +142,7 @@ void moduleUpdateMenu(int mode, int themeChanged, int langChanged)
     else {
         menuAddHint(&mod->menuItem, _STR_RUN, gSelectButton == KEY_CIRCLE ? CIRCLE_ICON : CROSS_ICON);
 
-        if (gUseInfoScreen && gTheme->infoElems.first)
+        if (gTheme->infoElems.first)
             menuAddHint(&mod->menuItem, _STR_INFO, SQUARE_ICON);
 
         if (!(mod->support->flags & MODE_FLAG_NO_COMPAT))
@@ -204,7 +204,7 @@ static void itemExecCircle(struct menu_item *curMenu)
 
 static void itemExecSquare(struct menu_item *curMenu)
 {
-    if (curMenu->current && gUseInfoScreen && gTheme->infoElems.first)
+    if (curMenu->current && gTheme->infoElems.first)
         guiSwitchScreen(GUI_SCREEN_INFO);
 }
 
@@ -684,7 +684,6 @@ static void _loadConfig()
             configGetColor(configOPL, CONFIG_OPL_TEXTCOLOR, gDefaultTextColor);
             configGetColor(configOPL, CONFIG_OPL_UI_TEXTCOLOR, gDefaultUITextColor);
             configGetColor(configOPL, CONFIG_OPL_SEL_TEXTCOLOR, gDefaultSelTextColor);
-            configGetInt(configOPL, CONFIG_OPL_USE_INFOSCREEN, &gUseInfoScreen);
             configGetInt(configOPL, CONFIG_OPL_ENABLE_NOTIFICATIONS, &gEnableNotifications);
             configGetInt(configOPL, CONFIG_OPL_ENABLE_COVERART, &gEnableArt);
             configGetInt(configOPL, CONFIG_OPL_WIDESCREEN, &gWideScreen);
@@ -847,7 +846,6 @@ static void _saveConfig()
         configSetColor(configOPL, CONFIG_OPL_TEXTCOLOR, gDefaultTextColor);
         configSetColor(configOPL, CONFIG_OPL_UI_TEXTCOLOR, gDefaultUITextColor);
         configSetColor(configOPL, CONFIG_OPL_SEL_TEXTCOLOR, gDefaultSelTextColor);
-        configSetInt(configOPL, CONFIG_OPL_USE_INFOSCREEN, gUseInfoScreen);
         configSetInt(configOPL, CONFIG_OPL_ENABLE_NOTIFICATIONS, gEnableNotifications);
         configSetInt(configOPL, CONFIG_OPL_ENABLE_COVERART, gEnableArt);
         configSetInt(configOPL, CONFIG_OPL_WIDESCREEN, gWideScreen);
@@ -1445,7 +1443,6 @@ static void setDefaults(void)
     gCheckUSBFragmentation = 1;
     gUSBPrefix[0] = '\0';
     gETHPrefix[0] = '\0';
-    gUseInfoScreen = 0;
     gEnableNotifications = 0;
     gEnableArt = 0;
     gWideScreen = 0;