Yaya48/dolphin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4896 from leoetlino/esformats

Browse Source 
Use ESFormats for tickets, TMDs and views
This commit is contained in:
Matthew Parlane
2017-02-27 16:15:05 +13:00
committed by GitHub
parent d1b343ab5a 44a3db21e4
commit 48aeb5bf4b
31 changed files with 579 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/DolphinWX/FrameTools.cpp
+1 -17
View File
@@ -1225,23 +1225,7 @@ void CFrame::OnInstallWAD(wxCommandEvent& event)
void CFrame::UpdateLoadWiiMenuItem() const
{
auto* const menu_item = GetMenuBar()->FindItem(IDM_LOAD_WII_MENU);
const auto& sys_menu_loader = DiscIO::CNANDContentManager::Access().GetNANDLoader(
TITLEID_SYSMENU, Common::FROM_CONFIGURED_ROOT);
if (sys_menu_loader.IsValid())
{
const int version = sys_menu_loader.GetTitleVersion();
const char region = sys_menu_loader.GetCountryChar();
menu_item->Enable();
menu_item->SetItemLabel(wxString::Format(_("Load Wii System Menu %d%c"), version, region));
}
else
{
menu_item->Enable(false);
menu_item->SetItemLabel(_("Load Wii System Menu"));
}
GetMenuBar()->Refresh(true, nullptr);
}
void CFrame::OnFifoPlayer(wxCommandEvent& WXUNUSED(event))
Source/Core/DolphinWX/ISOProperties/InfoPanel.cpp
+2 -2
View File
@@ -182,7 +182,7 @@ void InfoPanel::LoadISODetails()
m_fst->SetValue(StrToWxStr(std::to_string(m_opened_iso->GetFSTSize())));
if (m_ios_version)
{
IOS::HLE::TMDReader tmd{m_opened_iso->GetTMD()};
const IOS::ES::TMDReader tmd = m_opened_iso->GetTMD();
if (tmd.IsValid())
m_ios_version->SetValue(StringFromFormat("IOS%u", static_cast<u32>(tmd.GetIOSId())));
}
@@ -223,7 +223,7 @@ wxStaticBoxSizer* InfoPanel::CreateISODetailsSizer()
{_("Apploader Date:"), m_date},
{_("FST Size:"), m_fst},
}};
if (!m_opened_iso->GetTMD().empty())
if (m_opened_iso->GetTMD().IsValid())
controls.emplace_back(_("IOS Version:"), m_ios_version);
const int space_10 = FromDIP(10);
Source/Core/DolphinWX/MainMenuBar.cpp
+3 -2
View File
@@ -12,6 +12,7 @@
#include "Core/Core.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/State.h"
#include "DiscIO/Enums.h"
#include "DiscIO/NANDContentLoader.h"
#include "DolphinWX/Globals.h"
#include "DolphinWX/WxUtils.h"
@@ -546,8 +547,8 @@ void MainMenuBar::RefreshWiiSystemMenuLabel() const
if (sys_menu_loader.IsValid())
{
const auto sys_menu_version = sys_menu_loader.GetTitleVersion();
const auto sys_menu_region = sys_menu_loader.GetCountryChar();
const u16 sys_menu_version = sys_menu_loader.GetTMD().GetTitleVersion();
const char sys_menu_region = DiscIO::GetSysMenuRegion(sys_menu_version);
item->Enable();
item->SetItemLabel(
wxString::Format(_("Load Wii System Menu %u%c"), sys_menu_version, sys_menu_region));