mirrors/nxdumptool
1
0
Fork 0
mirror of https://github.com/DarkMatterCore/nxdumptool.git synced 2024-09-19 13:33:25 +01:00
Code Issues Releases Activity

[ci skip] DumpOptionsFrame: use SelectListItem::updateValues method

Browse source
This commit is contained in:
Pablo Curiel 2024-04-17 21:32:18 +02:00
parent 65b86393c2
commit bd5fea1fb7
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
include/dump_options_frame.hpp
View file

@ -74,17 +74,17 @@ namespace nxdt::views
{ {
if (!this->output_storage_item) return; if (!this->output_storage_item) return;
std::vector<std::string> *storages = this->output_storage_item->getValues(); std::vector<std::string> storages{};
storages->clear();
size_t elem_count = (ConfigOutputStorage_Count + ums_devices->size()); size_t elem_count = (ConfigOutputStorage_Count + ums_devices->size());
u32 selected = this->output_storage_item->getSelectedValue(); u32 selected = this->output_storage_item->getSelectedValue();
/* Fill storages vector. */
for(size_t i = 0; i < elem_count; i++) for(size_t i = 0; i < elem_count; i++)
{ {
if (i == 1) if (i == 1)
{ {
storages->push_back("dump_options/output_storage/value_01"_i18n); storages.push_back("dump_options/output_storage/value_01"_i18n);
continue; continue;
} }
@ -102,12 +102,16 @@ namespace nxdt::views
{ {
std::string ums_extra_info = (cur_ums_device->product_name[0] ? (std::string(cur_ums_device->product_name) + ", ") : ""); std::string ums_extra_info = (cur_ums_device->product_name[0] ? (std::string(cur_ums_device->product_name) + ", ") : "");
ums_extra_info += fmt::format("LUN {}, FS #{}, {}", cur_ums_device->lun, cur_ums_device->fs_idx, LIBUSBHSFS_FS_TYPE_STR(cur_ums_device->fs_type)); ums_extra_info += fmt::format("LUN {}, FS #{}, {}", cur_ums_device->lun, cur_ums_device->fs_idx, LIBUSBHSFS_FS_TYPE_STR(cur_ums_device->fs_type));
storages->push_back(brls::i18n::getStr("dump_options/output_storage/value_02", static_cast<int>(strlen(cur_ums_device->name + 3) - 1), cur_ums_device->name + 3, free_sz_str, total_sz_str, ums_extra_info)); storages.push_back(brls::i18n::getStr("dump_options/output_storage/value_02", static_cast<int>(strlen(cur_ums_device->name + 3) - 1), cur_ums_device->name + 3, free_sz_str, total_sz_str, ums_extra_info));
} else { } else {
storages->push_back(brls::i18n::getStr("dump_options/output_storage/value_00", free_sz_str, total_sz_str)); storages.push_back(brls::i18n::getStr("dump_options/output_storage/value_00", free_sz_str, total_sz_str));
} }
} }
/* Update SelectListItem values. */
/* If the dropdown menu currently is being displayed, it'll be reloaded. */
this->output_storage_item->updateValues(storages);
if (selected > ConfigOutputStorage_UsbHost) if (selected > ConfigOutputStorage_UsbHost)
{ {
/* Set the SD card as the current output storage. */ /* Set the SD card as the current output storage. */
@ -117,7 +121,7 @@ namespace nxdt::views
/* This will take care of both updating the JSON configuration and saniziting the filename provided by the user. */ /* This will take care of both updating the JSON configuration and saniziting the filename provided by the user. */
this->output_storage_item->getValueSelectedEvent()->fire(ConfigOutputStorage_SdCard); this->output_storage_item->getValueSelectedEvent()->fire(ConfigOutputStorage_SdCard);
} else { } else {
/* Set the current output storage once more. This will make sure the device string gets updated. */ /* Set the current output storage once more. This will make sure the selected device string gets updated. */
this->output_storage_item->setSelectedValue(selected); this->output_storage_item->setSelectedValue(selected);
} }
} }

2
libs/borealis

@ -1 +1 @@
Subproject commit 73831023b18d2c60df532bafbf61b1c18c2ab4f0 Subproject commit ed6f2ef76a136b0f77ce599e8401dbdf6bd6d11a