From 7bf7fb9c8e8948323ef3716723603928413f09f6 Mon Sep 17 00:00:00 2001 From: XorTroll Date: Fri, 15 Nov 2019 18:21:22 +0100 Subject: [PATCH] Add NFC and serial number settings --- Common/Source/cfg/cfg_Config.cpp | 1 + LibraryAppletQMenu/RomFs/LangDefault.json | 2 ++ .../Source/ui/ui_SettingsMenuLayout.cpp | 15 +++++++++++++++ 3 files changed, 18 insertions(+) diff --git a/Common/Source/cfg/cfg_Config.cpp b/Common/Source/cfg/cfg_Config.cpp index 0e57e008..07621e3a 100644 --- a/Common/Source/cfg/cfg_Config.cpp +++ b/Common/Source/cfg/cfg_Config.cpp @@ -596,6 +596,7 @@ namespace cfg rec.name = entry.value("name", ""); rec.author = entry.value("author", ""); rec.version = entry.value("version", ""); + rec.icon = entry.value("icon", ""); auto find = STL_FIND_IF(titles, tit, (tit.app_id == appid)); if(STL_FOUND(titles, find)) diff --git a/LibraryAppletQMenu/RomFs/LangDefault.json b/LibraryAppletQMenu/RomFs/LangDefault.json index 938503ad..58707501 100644 --- a/LibraryAppletQMenu/RomFs/LangDefault.json +++ b/LibraryAppletQMenu/RomFs/LangDefault.json @@ -82,6 +82,8 @@ "set_wireless_lan": "Wireless LAN enabled", "set_bluetooth": "Bluetooth enabled", "set_usb_30": "USB 3.0 enabled", + "set_nfc": "NFC enabled (amiibo)", + "set_serial_no": "Console serial number", "swkbd_console_nick_guide": "Enter new console nickname", "set_enable_conf": "Do you want to enable it?", "set_disable_conf": "Do you want to disable it?", diff --git a/LibraryAppletQMenu/Source/ui/ui_SettingsMenuLayout.cpp b/LibraryAppletQMenu/Source/ui/ui_SettingsMenuLayout.cpp index f6aee740..0526cc9e 100644 --- a/LibraryAppletQMenu/Source/ui/ui_SettingsMenuLayout.cpp +++ b/LibraryAppletQMenu/Source/ui/ui_SettingsMenuLayout.cpp @@ -104,6 +104,12 @@ namespace ui bool usb_30 = false; setsysGetFlag(SetSysFlag_Usb30Enable, &usb_30); this->PushSettingItem(cfg::GetLanguageString(config.main_lang, config.default_lang, "set_usb_30"), EncodeForSettings(usb_30), 10); + bool nfc = false; + setsysGetFlag(SetSysFlag_NfcEnable, &nfc); + this->PushSettingItem(cfg::GetLanguageString(config.main_lang, config.default_lang, "set_nfc"), EncodeForSettings(nfc), 11); + char serial[0x20] = {0}; + setsysGetSerialNumber(serial); + this->PushSettingItem(cfg::GetLanguageString(config.main_lang, config.default_lang, "set_serial_no"), EncodeForSettings(serial), -1); } void SettingsMenuLayout::PushSettingItem(std::string name, std::string value_display, int id) @@ -236,6 +242,15 @@ namespace ui setsysGetFlag(SetSysFlag_Usb30Enable, &usb_30); setsysSetFlag(SetSysFlag_Usb30Enable, !usb_30); + reload_need = true; + break; + } + case 11: + { + bool nfc = false; + setsysGetFlag(SetSysFlag_NfcEnable, &nfc); + setsysSetFlag(SetSysFlag_NfcEnable, !nfc); + reload_need = true; break; }