diff --git a/include/utils/config.hpp b/include/utils/config.hpp index a692a53..0eb1b90 100644 --- a/include/utils/config.hpp +++ b/include/utils/config.hpp @@ -61,8 +61,8 @@ public: std::string _3dsxPath() const { return this->v_3dsxPath; }; void _3dsxPath(const std::string &v) { this->v_3dsxPath = v; if (!this->changesMade) this->changesMade = true; }; - std::string ndsPath() const { return this->v_ndsPath; }; - void ndsPath(const std::string &v) { this->v_ndsPath = v; if (!this->changesMade) this->changesMade = true; }; + std::string romsPath() const { return this->v_romsPath; }; + void romsPath(const std::string &v) { this->v_romsPath = v; if (!this->changesMade) this->changesMade = true; }; std::string archPath() const { return this->v_archivePath; }; void archPath(const std::string &v) { this->v_archivePath = v; if (!this->changesMade) this->changesMade = true; }; @@ -117,8 +117,8 @@ private: nlohmann::json json; bool changesMade = false; - std::string v_language = "en", v_lastStore = "darkstore-homebrew.unistore", - v_3dsxPath = "sdmc:/3ds", v_ndsPath = "sdmc:/roms/nds", v_archivePath = "sdmc:", + std::string v_language = "en", v_lastStore = "darkstore-homebrew.store", + v_3dsxPath = "sdmc:/3ds", v_romsPath = "sdmc:/roms", v_archivePath = "sdmc:", v_shortcutPath = "sdmc:/3ds/DarkStore/shortcuts", v_firmPath = "sdmc:/luma/payloads", v_theme = "Default"; bool v_list = false, v_autoUpdate = true, v_metadata = true, v_updateCheck = true, v_updateNightly = false, diff --git a/romfs/lang/en/app.json b/romfs/lang/en/app.json index 1f718cb..505c66c 100644 --- a/romfs/lang/en/app.json +++ b/romfs/lang/en/app.json @@ -24,7 +24,7 @@ "CHANGE_3DSX_PATH": "Change 3DSX path", "CHANGE_ARCHIVE_PATH": "Change archive path", "CHANGE_FIRM_PATH": "Change firm path", - "CHANGE_NDS_PATH": "Change NDS path", + "CHANGE_ROMS_PATH": "Change ROMS path", "CHANGE_SHORTCUT_PATH": "Change shortcut path", "CHECK_STORE_UPDATES": "Checking for Store updates...", "CHECK_DS_UPDATES": "Checking for DarkStore updates...", diff --git a/source/menu/settings.cpp b/source/menu/settings.cpp index 7ecdf3d..c2ed149 100644 --- a/source/menu/settings.cpp +++ b/source/menu/settings.cpp @@ -83,7 +83,7 @@ static const Structs::ButtonPos Theme = { 40, 196, 280, 24 }; // Themes. static const std::vector mainStrings = { "LANGUAGE", "SELECT_STORE", "AUTO_UPDATE_SETTINGS_BTN", "GUI_SETTINGS_BTN", "DIRECTORY_SETTINGS_BTN", "CREDITS", "EXIT_APP" }; -static const std::vector dirStrings = { "CHANGE_3DSX_PATH", "3DSX_IN_FOLDER", "CHANGE_NDS_PATH", "CHANGE_ARCHIVE_PATH", "CHANGE_SHORTCUT_PATH", "CHANGE_FIRM_PATH" }; +static const std::vector dirStrings = { "CHANGE_3DSX_PATH", "3DSX_IN_FOLDER", "CHANGE_ROMS_PATH", "CHANGE_ARCHIVE_PATH", "CHANGE_SHORTCUT_PATH", "CHANGE_FIRM_PATH" }; extern std::vector> Themes; /* Note: Украïнська is spelled using a latin i with dieresis to work in the system font */ @@ -333,7 +333,7 @@ static void SettingsHandleMain(int &page, bool &dspSettings, int &storeMode, int Here you can.. - Change the Directory of... - - 3DSX, NDS & Archives. + - 3DSX, ROMS & Archives. int &page: Reference to the page. int &selection: Reference to the Selection. @@ -377,8 +377,8 @@ static void SettingsHandleDir(int &page, int &selection) { config->_3dsxInFolder(!config->_3dsxInFolder()); } else if (touching(touch, dirButtons[2])) { - const std::string path = Overlays::SelectDir(config->ndsPath(), Lang::get("SELECT_DIR")); - if (path != "") config->ndsPath(path); + const std::string path = Overlays::SelectDir(config->romsPath(), Lang::get("SELECT_DIR")); + if (path != "") config->romsPath(path); } else if (touching(touch, dirButtons[3])) { const std::string path = Overlays::SelectDir(config->archPath(), Lang::get("SELECT_DIR")); @@ -408,8 +408,8 @@ static void SettingsHandleDir(int &page, int &selection) { break; case 2: - path = Overlays::SelectDir(config->ndsPath(), Lang::get("SELECT_DIR")); - if (path != "") config->ndsPath(path); + path = Overlays::SelectDir(config->romsPath(), Lang::get("SELECT_DIR")); + if (path != "") config->romsPath(path); break; case 3: diff --git a/source/utils/config.cpp b/source/utils/config.cpp index 0bfb963..e6c028f 100644 --- a/source/utils/config.cpp +++ b/source/utils/config.cpp @@ -129,7 +129,7 @@ Config::Config() { if (this->json.contains("AutoUpdate")) this->autoupdate(this->getBool("AutoUpdate")); if (this->json.contains("_3DSX_Path")) this->_3dsxPath(this->getString("_3DSX_Path")); if (this->json.contains("_3DSX_InFolder")) this->_3dsxInFolder(this->getBool("_3DSX_InFolder")); - if (this->json.contains("NDS_Path")) this->ndsPath(this->getString("NDS_Path")); + if (this->json.contains("ROMS_Path")) this->romsPath(this->getString("ROMS_Path")); if (this->json.contains("Archive_Path")) this->archPath(this->getString("Archive_Path")); if (this->json.contains("Firm_Path")) this->firmPath(this->getString("Firm_Path")); if (this->json.contains("MetaData")) this->metadata(this->getBool("MetaData")); @@ -169,7 +169,7 @@ void Config::save() { this->setBool("AutoUpdate", this->autoupdate()); this->setString("_3DSX_Path", this->_3dsxPath()); this->setBool("_3DSX_InFolder", this->_3dsxInFolder()); - this->setString("NDS_Path", this->ndsPath()); + this->setString("ROMS_Path", this->romsPath()); this->setString("Archive_Path", this->archPath()); this->setString("Firm_Path", this->firmPath()); this->setBool("MetaData", this->metadata()); diff --git a/source/utils/scriptUtils.cpp b/source/utils/scriptUtils.cpp index d3a635b..f46025d 100644 --- a/source/utils/scriptUtils.cpp +++ b/source/utils/scriptUtils.cpp @@ -53,7 +53,7 @@ Result ScriptUtils::removeFile(const std::string &file, bool isARG) { out = std::regex_replace(file, std::regex("%ARCHIVE_DEFAULT%"), config->archPath()); out = std::regex_replace(out, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2")); out = std::regex_replace(out, std::regex("%3DSX%"), config->_3dsxPath()); - out = std::regex_replace(out, std::regex("%NDS%"), config->ndsPath()); + out = std::regex_replace(out, std::regex("%ROMS%"), config->romsPath()); out = std::regex_replace(out, std::regex("%FIRM%"), config->firmPath()); Result ret = NONE; @@ -97,13 +97,13 @@ Result ScriptUtils::copyFile(const std::string &source, const std::string &desti _source = std::regex_replace(source, std::regex("%ARCHIVE_DEFAULT%"), config->archPath()); _source = std::regex_replace(_source, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2")); _source = std::regex_replace(_source, std::regex("%3DSX%"), config->_3dsxPath()); - _source = std::regex_replace(_source, std::regex("%NDS%"), config->ndsPath()); + _source = std::regex_replace(_source, std::regex("%ROMS%"), config->romsPath()); _source = std::regex_replace(_source, std::regex("%FIRM%"), config->firmPath()); _dest = std::regex_replace(destination, std::regex("%ARCHIVE_DEFAULT%"), config->archPath()); _dest = std::regex_replace(_dest, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2")); _dest = std::regex_replace(_dest, std::regex("%3DSX%"), config->_3dsxPath()); - _dest = std::regex_replace(_dest, std::regex("%NDS%"), config->ndsPath()); + _dest = std::regex_replace(_dest, std::regex("%ROMS%"), config->romsPath()); _dest = std::regex_replace(_dest, std::regex("%FIRM%"), config->firmPath()); if (isARG) { @@ -141,13 +141,13 @@ Result ScriptUtils::renameFile(const std::string &oldName, const std::string &ne old = std::regex_replace(oldName, std::regex("%ARCHIVE_DEFAULT%"), config->archPath()); old = std::regex_replace(old, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2")); old = std::regex_replace(old, std::regex("%3DSX%"), config->_3dsxPath()); - old = std::regex_replace(old, std::regex("%NDS%"), config->ndsPath()); + old = std::regex_replace(old, std::regex("%ROMS%"), config->romsPath()); old = std::regex_replace(old, std::regex("%FIRM%"), config->firmPath()); _new = std::regex_replace(newName, std::regex("%ARCHIVE_DEFAULT%"), config->archPath()); _new = std::regex_replace(_new, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2")); _new = std::regex_replace(_new, std::regex("%3DSX%"), config->_3dsxPath()); - _new = std::regex_replace(_new, std::regex("%NDS%"), config->ndsPath()); + _new = std::regex_replace(_new, std::regex("%ROMS%"), config->romsPath()); _new = std::regex_replace(_new, std::regex("%FIRM%"), config->firmPath()); /* TODO: Kinda avoid that? */ @@ -161,7 +161,7 @@ Result ScriptUtils::downloadRelease(const std::string &repo, const std::string & std::string out; out = std::regex_replace(output, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2")); out = std::regex_replace(out, std::regex("%3DSX%"), config->_3dsxPath()); - out = std::regex_replace(out, std::regex("%NDS%"), config->ndsPath()); + out = std::regex_replace(out, std::regex("%ROMS%"), config->romsPath()); out = std::regex_replace(out, std::regex("%ARCHIVE_DEFAULT%"), config->archPath()); out = std::regex_replace(out, std::regex("%FIRM%"), config->firmPath()); @@ -205,7 +205,7 @@ Result ScriptUtils::downloadFile(const std::string &file, const std::string &out std::string out; out = std::regex_replace(output, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2")); out = std::regex_replace(out, std::regex("%3DSX%"), config->_3dsxPath()); - out = std::regex_replace(out, std::regex("%NDS%"), config->ndsPath()); + out = std::regex_replace(out, std::regex("%ROMS%"), config->romsPath()); out = std::regex_replace(out, std::regex("%ARCHIVE_DEFAULT%"), config->archPath()); out = std::regex_replace(out, std::regex("%FIRM%"), config->firmPath()); @@ -251,7 +251,7 @@ void ScriptUtils::installFile(const std::string &file, bool updatingSelf, const in = std::regex_replace(file, std::regex("%ARCHIVE_DEFAULT%"), config->archPath()); in = std::regex_replace(in, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2")); in = std::regex_replace(in, std::regex("%3DSX%"), config->_3dsxPath()); - in = std::regex_replace(in, std::regex("%NDS%"), config->ndsPath()); + in = std::regex_replace(in, std::regex("%ROMS%"), config->romsPath()); in = std::regex_replace(in, std::regex("%FIRM%"), config->firmPath()); if (isARG) { @@ -282,13 +282,13 @@ Result ScriptUtils::extractFile(const std::string &file, const std::string &inpu in = std::regex_replace(file, std::regex("%ARCHIVE_DEFAULT%"), config->archPath()); in = std::regex_replace(in, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2")); in = std::regex_replace(in, std::regex("%3DSX%"), config->_3dsxPath()); - in = std::regex_replace(in, std::regex("%NDS%"), config->ndsPath()); + in = std::regex_replace(in, std::regex("%ROMS%"), config->romsPath()); in = std::regex_replace(in, std::regex("%FIRM%"), config->firmPath()); out = std::regex_replace(output, std::regex("%ARCHIVE_DEFAULT%"), config->archPath()); out = std::regex_replace(out, std::regex("%3DSX%/(.*)\\.(.*)"), config->_3dsxPath() + (config->_3dsxInFolder() ? "/$1/$1.$2" : "/$1.$2")); out = std::regex_replace(out, std::regex("%3DSX%"), config->_3dsxPath()); - out = std::regex_replace(out, std::regex("%NDS%"), config->ndsPath()); + out = std::regex_replace(out, std::regex("%ROMS%"), config->romsPath()); out = std::regex_replace(out, std::regex("%FIRM%"), config->firmPath()); if (isARG) {