Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 06:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed an issue where a menu option was available when it shouldn't be.

Browse source 
Also changed some misleading comments related to graying out menu options.
This commit is contained in:
Leon Styhre 2021-07-11 13:47:31 +02:00
parent 738f8854cb
commit 3757b31fbc
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
es-app/src/guis/GuiMenu.cpp
View file

@ -937,7 +937,7 @@ void GuiMenu::openOtherOptions()
} }
}); });
// If the RunInBackground setting is enabled, then disable this option. // If the RunInBackground setting is enabled, then gray out this option.
if (Settings::getInstance()->getBool("RunInBackground")) { if (Settings::getInstance()->getBool("RunInBackground")) {
launch_workaround->setEnabled(false); launch_workaround->setEnabled(false);
launch_workaround->setOpacity(DISABLED_OPACITY); launch_workaround->setOpacity(DISABLED_OPACITY);

25
es-app/src/guis/GuiScraperMenu.cpp
View file

@ -240,7 +240,7 @@ void GuiScraperMenu::openContentOptions()
} }
}); });
// Ratings are not supported by TheGamesDB, so disable the option if this scraper is selected. // Ratings are not supported by TheGamesDB, so gray out the option if this scraper is selected.
if (Settings::getInstance()->getString("Scraper") == "thegamesdb") { if (Settings::getInstance()->getString("Scraper") == "thegamesdb") {
scrape_ratings->setEnabled(false); scrape_ratings->setEnabled(false);
scrape_ratings->setOpacity(DISABLED_OPACITY); scrape_ratings->setOpacity(DISABLED_OPACITY);
@ -271,7 +271,7 @@ void GuiScraperMenu::openContentOptions()
} }
}); });
// Videos are not supported by TheGamesDB, so disable the option if this scraper is selected. // Videos are not supported by TheGamesDB, so gray out the option if this scraper is selected.
if (Settings::getInstance()->getString("Scraper") == "thegamesdb") { if (Settings::getInstance()->getString("Scraper") == "thegamesdb") {
scrape_videos->setEnabled(false); scrape_videos->setEnabled(false);
scrape_videos->setOpacity(DISABLED_OPACITY); scrape_videos->setOpacity(DISABLED_OPACITY);
@ -325,7 +325,7 @@ void GuiScraperMenu::openContentOptions()
} }
}); });
// 3D box images are not supported by TheGamesDB, so disable the option if this scraper // 3D box images are not supported by TheGamesDB, so gray out the option if this scraper
// is selected. // is selected.
if (Settings::getInstance()->getString("Scraper") == "thegamesdb") { if (Settings::getInstance()->getString("Scraper") == "thegamesdb") {
scrape_3dboxes->setEnabled(false); scrape_3dboxes->setEnabled(false);
@ -544,7 +544,7 @@ void GuiScraperMenu::openOtherOptions()
} }
}); });
// Regions are not supported by TheGamesDB, so disable the option if this scraper is selected. // Regions are not supported by TheGamesDB, so gray out the option if this scraper is selected.
if (Settings::getInstance()->getString("Scraper") == "thegamesdb") { if (Settings::getInstance()->getString("Scraper") == "thegamesdb") {
scraper_region->setEnabled(false); scraper_region->setEnabled(false);
scraper_region->setOpacity(DISABLED_OPACITY); scraper_region->setOpacity(DISABLED_OPACITY);
@ -592,7 +592,8 @@ void GuiScraperMenu::openOtherOptions()
} }
}); });
// Languages are not supported by TheGamesDB, so disable the option if this scraper is selected. // Languages are not supported by TheGamesDB, so gray out the option if this scraper is
// selected.
if (Settings::getInstance()->getString("Scraper") == "thegamesdb") { if (Settings::getInstance()->getString("Scraper") == "thegamesdb") {
scraper_language->setEnabled(false); scraper_language->setEnabled(false);
scraper_language->setOpacity(DISABLED_OPACITY); scraper_language->setOpacity(DISABLED_OPACITY);
@ -667,7 +668,7 @@ void GuiScraperMenu::openOtherOptions()
} }
}); });
// If interactive mode is set to off, then disable this option. // If interactive mode is set to off, then gray out this option.
if (!Settings::getInstance()->getBool("ScraperInteractive")) { if (!Settings::getInstance()->getBool("ScraperInteractive")) {
scraper_semiautomatic->setEnabled(false); scraper_semiautomatic->setEnabled(false);
scraper_semiautomatic->setOpacity(DISABLED_OPACITY); scraper_semiautomatic->setOpacity(DISABLED_OPACITY);
@ -704,7 +705,7 @@ void GuiScraperMenu::openOtherOptions()
} }
}); });
// If respecting excluded files is set to off, then disable this option. // If respecting excluded files is set to off, then gray out this option.
if (!Settings::getInstance()->getBool("ScraperRespectExclusions")) { if (!Settings::getInstance()->getBool("ScraperRespectExclusions")) {
scraper_exclude_recursively->setEnabled(false); scraper_exclude_recursively->setEnabled(false);
scraper_exclude_recursively->setOpacity(DISABLED_OPACITY); scraper_exclude_recursively->setOpacity(DISABLED_OPACITY);
@ -740,6 +741,16 @@ void GuiScraperMenu::openOtherOptions()
} }
}); });
// The TLS/certificate issue is not present for TheGamesDB, so gray out the option if this
// scraper is selected.
if (Settings::getInstance()->getString("Scraper") == "thegamesdb") {
retry_peer_verification->setEnabled(false);
retry_peer_verification->setOpacity(DISABLED_OPACITY);
retry_peer_verification->getParent()
->getChild(retry_peer_verification->getChildIndex() - 1)
->setOpacity(DISABLED_OPACITY);
}
// Switch callbacks. // Switch callbacks.
auto interactiveToggleFunc = [scraper_semiautomatic]() { auto interactiveToggleFunc = [scraper_semiautomatic]() {
if (scraper_semiautomatic->getEnabled()) { if (scraper_semiautomatic->getEnabled()) {