diff --git a/arm9/source/globalsettings.cpp b/arm9/source/globalsettings.cpp index 1d79934..a449f73 100644 --- a/arm9/source/globalsettings.cpp +++ b/arm9/source/globalsettings.cpp @@ -82,22 +82,23 @@ void cGlobalSettings::loadSettings() { homebrewreset = ini.GetInt("system", "homebrewreset", homebrewreset); resetHotKey = ini.GetInt("system", "resethotkey", resetHotKey); phatCol = ini.GetInt("system", "phatCol", phatCol); - - temp = ini.GetString("system", "scrollSpeed", "fast"); - scrollSpeed = - (temp == "slow") ? EScrollSlow : ((temp == "medium") ? EScrollMedium : EScrollFast); - - temp = ini.GetString("system", "viewMode", "icon"); - viewMode = (temp == "list") ? EViewList - : (temp == "icon") ? EViewIcon - : (temp == "small") ? EViewSmall - : EViewInternal; - - temp = ini.GetString("system", "slot2mode", "ask"); - slot2mode = (temp == "gba") ? ESlot2Gba : ((temp == "nds") ? ESlot2Nds : ESlot2Ask); - + temp = ini.GetString("system", "saveext", ".sav"); saveExt = (temp == ".sav"); + temp = ini.GetString("system", "scrollSpeed", "fast"); + scrollSpeed = (temp == "slow") ? EScrollSlow + : (temp == "medium") ? EScrollMedium + : EScrollFast; + temp = ini.GetString("system", "viewMode", "icon"); + viewMode = (temp == "list") ? EViewList + : (temp == "icon") ? EViewIcon + : (temp == "small") ? EViewSmall + : (temp == "internal") ? EViewInternal + : EViewInternal; + temp = ini.GetString("system", "slot2mode", "ask"); + slot2mode = (temp == "gba") ? ESlot2Gba + : (temp == "nds") ? ESlot2Nds + : ESlot2Ask; #ifdef __KERNEL_LAUNCHER_SUPPORT__ temp = ini.GetString("system", "nds-bootstrap", "false"); @@ -137,11 +138,16 @@ void cGlobalSettings::saveSettings() { ini.SetInt("system", "resethotkey", resetHotKey); ini.SetInt("system", "dsonly", dsOnly); ini.SetInt("system", "phatCol", phatCol); - - ini.SetString("system", "scrollSpeed", - (scrollSpeed == EScrollSlow) - ? "slow" - : ((scrollSpeed == EScrollMedium) ? "medium" : "fast")); + ini.SetString( + "system", "saveext", + saveExt ? ".sav" + : ".nds.sav"); + ini.SetString( + "system", "scrollSpeed", + (scrollSpeed == EScrollSlow) ? "slow" + : (scrollSpeed == EScrollMedium) ? "medium" + : (scrollSpeed == EScrollFast) ? "fast" + : "fast"); ini.SetString( "system", "viewMode", (viewMode == EViewList) ? "list" @@ -149,9 +155,12 @@ void cGlobalSettings::saveSettings() { : (viewMode == EViewSmall) ? "small" : (viewMode == EViewInternal) ? "internal" : "internal"); - ini.SetString("system", "slot2mode", - (slot2mode == ESlot2Gba) ? "gba" : ((slot2mode == ESlot2Nds) ? "nds" : "ask")); - ini.SetString("system", "saveext", saveExt ? ".sav" : ".nds.sav"); + ini.SetString( + "system", "slot2mode", + (slot2mode == ESlot2Gba) ? "gba" + : (slot2mode == ESlot2Nds) ? "nds" + : (slot2mode == ESlot2Ask) ? "ask" + : "ask" ); #ifdef __KERNEL_LAUNCHER_SUPPORT__ ini.SetString("system", "nds-bootstrap", diff --git a/arm9/source/inifile.cpp b/arm9/source/inifile.cpp index bcb43d7..2ef262a 100644 --- a/arm9/source/inifile.cpp +++ b/arm9/source/inifile.cpp @@ -190,29 +190,30 @@ bool CIniFile::SaveIniFileModified(const std::string& FileName) { bool CIniFile::SaveIniFile(const std::string& FileName) { if (FileName != "") m_sFileName = FileName; - FILE* f = fopen(m_sFileName.c_str(), "wb"); - if (NULL == f) { + FILE* f = fopen(m_sFileName.c_str(), "w"); + if (f == NULL) { return false; } for (size_t ii = 0; ii < m_FileContainer.size(); ii++) { std::string& strline = m_FileContainer[ii]; size_t notSpace = strline.find_first_not_of(' '); - strline = strline.substr(notSpace); - if (strline.find('[') == 0 && ii > 0) { - if (!m_FileContainer[ii - 1].empty() && m_FileContainer[ii - 1] != "") - fwrite("\r\n", 1, 2, f); + if (notSpace != std::string::npos) { + strline = strline.substr(notSpace); } - if (!strline.empty() && strline != "") { - fwrite(strline.c_str(), 1, strline.length(), f); - fwrite("\r\n", 1, 2, f); + + if (strline.find('[') == 0 && ii > 0) { + if (!m_FileContainer[ii - 1].empty()) + fprintf(f, "\n"); + } + + if (!strline.empty()) { + fprintf(f, "%s\n", strline.c_str()); } } fclose(f); - m_bModified = false; - return true; } diff --git a/arm9/source/mainwnd.cpp b/arm9/source/mainwnd.cpp index ba8965d..b3fd6ba 100644 --- a/arm9/source/mainwnd.cpp +++ b/arm9/source/mainwnd.cpp @@ -537,8 +537,7 @@ void cMainWnd::setParam(void) { _values.clear(); _values.push_back(LANG("switches", "Disable")); _values.push_back(LANG("switches", "Enable")); - settingWnd.addSettingItem(LANG("file settings", "show hidden files"), _values, - gs().showHiddenFiles); + settingWnd.addSettingItem(LANG("file settings", "show hidden files"), _values, gs().showHiddenFiles); _values.clear(); _values.push_back(".nds.sav"); _values.push_back(".sav"); @@ -556,8 +555,8 @@ void cMainWnd::setParam(void) { settingWnd.addSettingItem(LANG("nds bootstrap", "dsmode"), _values, gs().dsOnly); #ifdef __DSIMODE__ _values.clear(); - _values.push_back("disable"); _values.push_back("enable"); + _values.push_back("disable"); settingWnd.addSettingItem(LANG("nds bootstrap", "phatCol"), _values, gs().phatCol); #endif _values.clear(); @@ -610,8 +609,8 @@ void cMainWnd::setParam(void) { // page 3: filesystem gs().showHiddenFiles = settingWnd.getItemSelection(2, 0); - gs().saveExt = settingWnd.getItemSelection(2, 2); - gs().saveDir = settingWnd.getItemSelection(2, 3); + gs().saveExt = settingWnd.getItemSelection(2, 1); + gs().saveDir = settingWnd.getItemSelection(2, 2); // page 4: ndsbs gs().dsOnly = settingWnd.getItemSelection(3, 0); diff --git a/arm9/source/version.h b/arm9/source/version.h index ef784d5..1536b55 100644 --- a/arm9/source/version.h +++ b/arm9/source/version.h @@ -8,7 +8,7 @@ */ #define AKMENU_VERSION_MAIN "1" -#define AKMENU_VERSION_SUB "6" +#define AKMENU_VERSION_SUB "6.1" #ifndef __KERNEL_LAUNCHER_SUPPORT__ #define AKMENU_LOADER_NAME "nds-bootstrap" diff --git a/language/Deutsch/language.txt b/language/Deutsch/language.txt index ad2694a..23f77db 100644 --- a/language/Deutsch/language.txt +++ b/language/Deutsch/language.txt @@ -280,6 +280,7 @@ target slot = Ziel Speicher-Slot flash memory = Flash Memory microsd card = microSD Card slot2 card = Slot2 Card +slot1 card = Slot1 Card favorites = Favoriten [hotkeys] diff --git a/language/Français/language.txt b/language/Français/language.txt index 4a5cb5b..a865f9e 100644 --- a/language/Français/language.txt +++ b/language/Français/language.txt @@ -278,7 +278,7 @@ target slot = Slot de destination flash memory = Flash Memory microsd card = microSD Card slot2 card = Slot 2 Card -slot2 card = Slot 1 Card +slot1 card = Slot 1 Card favorites = Favorites [hotkeys] diff --git a/package/_nds/akmenunext/language/Deutsch/language.txt b/package/_nds/akmenunext/language/Deutsch/language.txt index ad2694a..23f77db 100644 --- a/package/_nds/akmenunext/language/Deutsch/language.txt +++ b/package/_nds/akmenunext/language/Deutsch/language.txt @@ -280,6 +280,7 @@ target slot = Ziel Speicher-Slot flash memory = Flash Memory microsd card = microSD Card slot2 card = Slot2 Card +slot1 card = Slot1 Card favorites = Favoriten [hotkeys] diff --git a/package/_nds/akmenunext/language/Français/language.txt b/package/_nds/akmenunext/language/Français/language.txt index 4a5cb5b..a865f9e 100644 --- a/package/_nds/akmenunext/language/Français/language.txt +++ b/package/_nds/akmenunext/language/Français/language.txt @@ -278,7 +278,7 @@ target slot = Slot de destination flash memory = Flash Memory microsd card = microSD Card slot2 card = Slot 2 Card -slot2 card = Slot 1 Card +slot1 card = Slot 1 Card favorites = Favorites [hotkeys]