archive/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2025-07-04 22:11:18 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

GfxPack: Refactor + better unicode support

Browse source
This commit is contained in:
Exzap 2023-11-22 17:57:20 +01:00
parent 67f7ce815c
commit bffeb818d1
6 changed files with 64 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/gui/GraphicPacksWindow2.cpp
View file

@ -64,7 +64,7 @@ void GraphicPacksWindow2::FillGraphicPackList() const
{
bool found = false;
if (boost::icontains(p->GetPath(), m_filter))
if (boost::icontains(p->GetVirtualPath(), m_filter))
found = true;
else
{
@ -82,7 +82,7 @@ void GraphicPacksWindow2::FillGraphicPackList() const
continue;
}
const auto& path = p->GetPath();
const auto& path = p->GetVirtualPath();
auto tokens = TokenizeView(path, '/');
auto node = root;
for(size_t i=0; i<tokens.size(); i++)
@ -329,7 +329,7 @@ void GraphicPacksWindow2::SaveStateToConfig()
for (const auto& gp : GraphicPack2::GetGraphicPacks())
{
auto filename = MakeRelativePath(ActiveSettings::GetUserDataPath(), _utf8ToPath(gp->GetFilename())).lexically_normal();
auto filename = _utf8ToPath(gp->GetNormalizedPathString());
if (gp->IsEnabled())
{
data.graphic_pack_entries.try_emplace(filename);
@ -603,34 +603,29 @@ void GraphicPacksWindow2::OnCheckForUpdates(wxCommandEvent& event)
{
if (!CafeSystem::IsTitleRunning())
{
std::vector<GraphicPackPtr> old_packs = GraphicPack2::GetGraphicPacks();
// remember virtual paths of all the enabled packs
std::map<std::string, std::string> previouslyEnabledPacks;
for(auto& it : GraphicPack2::GetGraphicPacks())
{
if(it->IsEnabled())
previouslyEnabledPacks.emplace(it->GetNormalizedPathString(), it->GetVirtualPath());
}
// reload graphic packs
RefreshGraphicPacks();
FillGraphicPackList();
// check if enabled graphic packs are lost:
const auto& new_packs = GraphicPack2::GetGraphicPacks();
std::stringstream lost_packs;
for(const auto& p : old_packs)
// remove packs which are still present
for(auto& it : GraphicPack2::GetGraphicPacks())
previouslyEnabledPacks.erase(it->GetNormalizedPathString());
if(!previouslyEnabledPacks.empty())
{
if (!p->IsEnabled())
continue;
const auto it = std::find_if(new_packs.cbegin(), new_packs.cend(), [&p](const auto& gp)
{
return gp->GetFilename() == p->GetFilename();
});
if(it == new_packs.cend())
std::string lost_packs;
for(auto& it : previouslyEnabledPacks)
{
lost_packs << p->GetPath() << "\n";
lost_packs.append(it.second);
lost_packs.push_back('\n');
}
}
const auto lost_packs_str = lost_packs.str();
if (!lost_packs_str.empty())
{
wxString message = _("This update removed or renamed the following graphic packs:");
message << "\n \n" << lost_packs_str << " \n" << _("You may need to set them up again.");
message << "\n \n" << wxString::FromUTF8(lost_packs) << " \n" << _("You may need to set them up again.");
wxMessageBox(message, _("Warning"), wxOK | wxCENTRE | wxICON_INFORMATION, this);
}
}