mirrors/nxdumptool
1
0
Fork 0
mirror of https://github.com/DarkMatterCore/nxdumptool.git synced 2024-11-22 18:26:39 +00:00
Code Issues Releases Activity

[ci skip] GamecardTab: fix transition to DumpOptionsFrame view

Browse source
This commit is contained in:
Pablo Curiel 2024-04-15 13:47:50 +02:00
parent 9525f37e51
commit 27465434d4
4 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/gamecard_tab.hpp
View file

@ -40,6 +40,9 @@ namespace nxdt::views
nxdt::tasks::GameCardStatusEvent::Subscription gc_status_task_sub; nxdt::tasks::GameCardStatusEvent::Subscription gc_status_task_sub;
GameCardStatus gc_status = GameCardStatus_NotInserted; GameCardStatus gc_status = GameCardStatus_NotInserted;
std::string raw_filename_full = "";
std::string raw_filename_id_only = "";
void ProcessGameCardStatus(GameCardStatus gc_status); void ProcessGameCardStatus(GameCardStatus gc_status);
std::string GetFormattedSizeString(GameCardSizeFunc func); std::string GetFormattedSizeString(GameCardSizeFunc func);
std::string GetCardIdSetString(FsGameCardIdSet *card_id_set); std::string GetCardIdSetString(FsGameCardIdSet *card_id_set);

2
include/options_tab.hpp
View file

@ -77,7 +77,7 @@ namespace nxdt::views
brls::menu_timer_t notification_timer = 0.0f; brls::menu_timer_t notification_timer = 0.0f;
brls::menu_timer_ctx_entry_t notification_timer_ctx = {0}; brls::menu_timer_ctx_entry_t notification_timer_ctx = {0};
void DisplayNotification(std::string str); void DisplayNotification(const std::string& str);
public: public:
OptionsTab(RootView *root_view); OptionsTab(RootView *root_view);
~OptionsTab(void); ~OptionsTab(void);

21
source/gamecard_tab.cpp
View file

@ -113,11 +113,12 @@ namespace nxdt::views
void GameCardTab::PopulateList(void) void GameCardTab::PopulateList(void)
{ {
TitleApplicationMetadata **app_metadata = NULL; TitleApplicationMetadata **app_metadata = nullptr;
u32 app_metadata_count = 0; u32 app_metadata_count = 0;
GameCardHeader card_header = {0}; GameCardHeader card_header = {0};
GameCardInfo card_info = {0}; GameCardInfo card_info = {0};
FsGameCardIdSet card_id_set = {0}; FsGameCardIdSet card_id_set = {0};
char *raw_filename = nullptr;
bool update_focused_view = this->IsListItemFocused(); bool update_focused_view = this->IsListItemFocused();
int focus_stack_index = this->GetFocusStackViewIndex(); int focus_stack_index = this->GetFocusStackViewIndex();
@ -242,19 +243,25 @@ namespace nxdt::views
/* ListItem elements. */ /* ListItem elements. */
this->list->addView(new brls::Header("gamecard_tab/list/dump_options"_i18n)); this->list->addView(new brls::Header("gamecard_tab/list/dump_options"_i18n));
raw_filename = titleGenerateGameCardFileName(TitleNamingConvention_Full, TitleFileNameIllegalCharReplaceType_None);
this->raw_filename_full = std::string(raw_filename);
if (raw_filename) free(raw_filename);
raw_filename = titleGenerateGameCardFileName(TitleNamingConvention_IdAndVersionOnly, TitleFileNameIllegalCharReplaceType_None);
this->raw_filename_id_only = std::string(raw_filename);
if (raw_filename) free(raw_filename);
raw_filename = nullptr;
brls::ListItem *dump_card_image = new brls::ListItem("gamecard_tab/list/dump_card_image/label"_i18n, "gamecard_tab/list/dump_card_image/description"_i18n); brls::ListItem *dump_card_image = new brls::ListItem("gamecard_tab/list/dump_card_image/label"_i18n, "gamecard_tab/list/dump_card_image/description"_i18n);
dump_card_image->getClickEvent()->subscribe([this](brls::View *view) { dump_card_image->getClickEvent()->subscribe([this](brls::View *view) {
char *raw_filename = titleGenerateGameCardFileName(configGetInteger("naming_convention"), TitleFileNameIllegalCharReplaceType_None);
if (!raw_filename) return;
brls::Image *icon = new brls::Image(); brls::Image *icon = new brls::Image();
icon->setImage(BOREALIS_ASSET("icon/" APP_TITLE ".jpg")); icon->setImage(BOREALIS_ASSET("icon/" APP_TITLE ".jpg"));
icon->setScaleType(brls::ImageScaleType::SCALE); icon->setScaleType(brls::ImageScaleType::SCALE);
brls::Application::pushView(new DumpOptionsFrame(this->root_view, "gamecard_tab/list/dump_card_image/label"_i18n, icon, std::string(raw_filename), ".xci"), brls::ViewAnimation::SLIDE_LEFT); brls::Application::pushView(new DumpOptionsFrame(this->root_view, "gamecard_tab/list/dump_card_image/label"_i18n, icon,
configGetInteger("naming_convention") == TitleNamingConvention_Full ? raw_filename_full : raw_filename_id_only, ".xci"), brls::ViewAnimation::SLIDE_LEFT);
free(raw_filename);
}); });
this->list->addView(dump_card_image); this->list->addView(dump_card_image);

4
source/options_tab.cpp
View file

@ -370,9 +370,9 @@ namespace nxdt::views
brls::menu_timer_kill(&(this->notification_timer)); brls::menu_timer_kill(&(this->notification_timer));
} }
void OptionsTab::DisplayNotification(std::string str) void OptionsTab::DisplayNotification(const std::string& str)
{ {
if (str == "" || !this->display_notification) return; if (str.empty() || !this->display_notification) return;
brls::Application::notify(str); brls::Application::notify(str);
this->display_notification = false; this->display_notification = false;