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

Changed es_settings.cfg to es_settings.xml

Browse source
This commit is contained in:
Leon Styhre 2021-06-16 19:05:24 +02:00
parent fa624f9f2c
commit dc29b97e91
14 changed files with 34 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
es-app/src/CollectionSystemsManager.cpp
View file

@ -1180,7 +1180,7 @@ void CollectionSystemsManager::populateCustomCollection(CollectionSystemData* sy
std::unordered_map<std::string,FileData*>
allFilesMap = getAllGamesCollection()->getRootFolder()->getChildrenByFilename();
// Get the ROM directory, either as configured in es_settings.cfg, or if no value
// Get the ROM directory, either as configured in es_settings.xml, or if no value
// is set there, then use the default hardcoded path.
const std::string rompath = FileData::getROMDirectory();

2
es-app/src/SystemData.cpp
View file

@ -269,7 +269,7 @@ bool SystemData::loadConfig()
// If there is a %ROMPATH% variable set for the system, expand it. By doing this
// it's possible to use either absolute ROM paths in es_systems.xml or to utilize
// the ROM path configured as ROMDirectory in es_settings.cfg. If it's set to ""
// the ROM path configured as ROMDirectory in es_settings.xml. If it's set to ""
// in this configuration file, the default hardcoded path $HOME/ROMs/ will be used.
path = Utils::String::replace(path, "%ROMPATH%", rompath);
#if defined(_WIN64)

2
es-app/src/VolumeControl.cpp
View file

@ -82,7 +82,7 @@ void VolumeControl::init()
#if defined(__linux__)
// Try to open mixer device.
if (mixerHandle == nullptr) {
// Allow user to override the AudioCard and AudioDevice in es_settings.cfg.
// Allow user to override the AudioCard and AudioDevice in es_settings.xml.
#if defined(_RPI_)
mixerCard = Settings::getInstance()->getString("AudioCard");
mixerName = Settings::getInstance()->getString("AudioDevice");

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

@ -249,7 +249,7 @@ GuiCollectionSystemsOptions::GuiCollectionSystemsOptions(
collectionsConfigEntry += (*it);
}
}
// If the system to be deleted was present in es_settings.cfg, we
// If the system to be deleted was present in es_settings.xml, we
// need to re-write it.
if (collectionsConfigEntry !=
Settings::getInstance()->getString("CollectionSystemsCustom")) {

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

@ -307,7 +307,7 @@ void GuiMenu::openUIOptions()
break;
}
}
// If an invalid sort order was defined in es_settings.cfg, then apply the default
// If an invalid sort order was defined in es_settings.xml, then apply the default
// sort order 'filename, ascending'.
if (sortOrder == "")
sortOrder = Settings::getInstance()->getDefaultString("DefaultSortOrder");

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

@ -62,7 +62,7 @@ GuiScraperMenu::GuiScraperMenu(Window* window, std::string title)
mMenu.setNeedsSaving();
}
// The filter setting is only retained during the program session i.e. it's not saved
// to es_settings.cfg.
// to es_settings.xml.
if (mFilters->getSelectedId() != Settings::getInstance()->getInt("ScraperFilter"))
Settings::getInstance()->setInt("ScraperFilter", mFilters->getSelectedId());
});

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

@ -4,7 +4,7 @@
// GuiSettings.cpp
//
// User interface template for a settings GUI.
// The saving of es_settings.cfg, the reload of gamelists and some other actions are
// The saving of es_settings.xml, the reload of gamelists and some other actions are
// also triggered to be executed here via flags set by the menu entries' lambda functions.
//

2
es-app/src/guis/GuiSettings.h
View file

@ -4,7 +4,7 @@
// GuiSettings.h
//
// User interface template for a settings GUI.
// The saving of es_settings.cfg, the reload of gamelists and some other actions are
// The saving of es_settings.xml, the reload of gamelists and some other actions are
// also triggered to be executed here via flags set by the menu entries' lambda functions.
//

6
es-app/src/main.cpp
View file

@ -14,7 +14,7 @@
// main.cpp
//
// Main program loop. Interprets command-line arguments, checks for the
// home folder and es_settings.cfg configuration file, sets up the application
// home folder and es_settings.xml configuration file, sets up the application
// environment and starts listening to SDL events.
//
@ -466,8 +466,8 @@ int main(int argc, char* argv[])
// Check if the configuration file exists, and if not, create it.
// This should only happen on first application startup.
if (!Utils::FileSystem::exists(Utils::FileSystem::getHomePath() +
"/.emulationstation/es_settings.cfg")) {
LOG(LogInfo) << "Settings file es_settings.cfg does not exist, creating it...";
"/.emulationstation/es_settings.xml")) {
LOG(LogInfo) << "Settings file es_settings.xml does not exist, creating it...";
Settings::getInstance()->saveFile();
}
else if (settingsNeedSaving) {

4
es-app/src/scrapers/ScreenScraper.h
View file

@ -75,11 +75,11 @@ public:
// Which Region to use when selecting the artwork.
// Applies to: artwork, name of the game, date of release.
// This is read from es_settings.cfg, setting 'ScraperRegion'.
// This is read from es_settings.xml, setting 'ScraperRegion'.
// Which Language to use when selecting the textual information.
// Applies to: description, genre.
// This is read from es_settings.cfg, setting 'ScraperLanguage'.
// This is read from es_settings.xml, setting 'ScraperLanguage'.
ScreenScraperConfig() {};
} configuration;

2
es-core/src/AudioManager.cpp
View file

@ -107,7 +107,7 @@ void AudioManager::init()
" could not be set, obtained " << std::to_string(sAudioFormat.samples);
}
// Just in case someone changed the es_settings.cfg file manually to invalid values.
// Just in case someone changed the es_settings.xml file manually to invalid values.
if (Settings::getInstance()->getInt("SoundVolumeNavigation") > 100)
Settings::getInstance()->setInt("SoundVolumeNavigation", 100);
if (Settings::getInstance()->getInt("SoundVolumeNavigation") < 0)

28
es-core/src/Settings.cpp
View file

@ -3,7 +3,7 @@
// EmulationStation Desktop Edition
// Settings.cpp
//
// Functions to read from and write to the configuration file es_settings.cfg.
// Functions to read from and write to the configuration file es_settings.xml.
// The default values for the application settings are defined here as well.
//
@ -21,7 +21,7 @@
Settings* Settings::sInstance = nullptr;
// These values are NOT saved to es_settings.cfg since they're not set via
// These values are NOT saved to es_settings.xml since they're not set via
// the in-program settings menu. Most can be set using command-line arguments,
// but some are debug flags that are either hardcoded or set by internal debug
// functions.
@ -310,7 +310,7 @@ void Settings::setDefaults()
mIntMap["ScreenRotate"] = { 0, 0 };
//
// Settings that can be changed in es_settings.cfg
// Settings that can be changed in es_settings.xml
// but that are not configurable via the GUI.
//
@ -345,9 +345,9 @@ void saveMap(pugi::xml_document& doc, std::map<K, V>& map, const std::string& ty
void Settings::saveFile()
{
LOG(LogDebug) << "Settings::saveFile(): Saving settings to es_settings.cfg";
LOG(LogDebug) << "Settings::saveFile(): Saving settings to es_settings.xml";
const std::string path = Utils::FileSystem::getHomePath() +
"/.emulationstation/es_settings.cfg";
"/.emulationstation/es_settings.xml";
pugi::xml_document doc;
@ -373,20 +373,28 @@ void Settings::saveFile()
void Settings::loadFile()
{
const std::string path = Utils::FileSystem::getHomePath() +
// Prior to ES-DE v1.1, the configuration file had the .cfg suffix instead of .xml
const std::string legacyConfigFile = Utils::FileSystem::getHomePath() +
"/.emulationstation/es_settings.cfg";
if (!Utils::FileSystem::exists(path))
const std::string configFile = Utils::FileSystem::getHomePath() +
"/.emulationstation/es_settings.xml";
if (Utils::FileSystem::exists(legacyConfigFile) && !Utils::FileSystem::exists(configFile))
Utils::FileSystem::renameFile(legacyConfigFile, configFile, false);
if (!Utils::FileSystem::exists(configFile))
return;
pugi::xml_document doc;
#if defined(_WIN64)
pugi::xml_parse_result result = doc.load_file(Utils::String::stringToWideString(path).c_str());
pugi::xml_parse_result result =
doc.load_file(Utils::String::stringToWideString(configFile).c_str());
#else
pugi::xml_parse_result result = doc.load_file(path.c_str());
pugi::xml_parse_result result = doc.load_file(configFile.c_str());
#endif
if (!result) {
LOG(LogError) << "Could not parse the es_settings.cfg file\n " << result.description();
LOG(LogError) << "Could not parse the es_settings.xml file\n " << result.description();
return;
}

2
es-core/src/Settings.h
View file

@ -3,7 +3,7 @@
// EmulationStation Desktop Edition
// Settings.h
//
// Functions to read from and write to the configuration file es_settings.cfg.
// Functions to read from and write to the configuration file es_settings.xml.
// The default values for the application settings are defined here as well.
//

2
es-core/src/renderers/Renderer.cpp
View file

@ -89,7 +89,7 @@ namespace Renderer
initialCursorState = (SDL_ShowCursor(0) != 0);
int displayIndex = Settings::getInstance()->getInt("DisplayIndex");
// Check that an invalid value has not been manually entered in the es_settings.cfg file.
// Check that an invalid value has not been manually entered in the es_settings.xml file.
if (displayIndex != 1 && displayIndex != 2 && displayIndex != 3 && displayIndex != 4) {
Settings::getInstance()->setInt("DisplayIndex", 1);
displayIndex = 0;