Archive/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-28 13:28:01 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Qt: Do not use gamedata icon if game has custom icon

Browse source
This commit is contained in:
Megamouse 2025-03-17 12:55:09 +01:00
parent 6e080044a0
commit 5b540aed73
2 changed files with 52 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

100
rpcs3/rpcs3qt/game_list_frame.cpp
View file

@ -582,8 +582,8 @@ void game_list_frame::OnParsingFinished()
const auto add_game = [this, localized_title, localized_icon, localized_movie, dev_flash, cat_unknown_localized = localized.category.unknown.toStdString(), cat_unknown = cat::cat_unknown.toStdString(), game_icon_path, _hdd, play_hover_movies = m_play_hover_movies, show_custom_icons = m_show_custom_icons](const std::string& dir_or_elf) const auto add_game = [this, localized_title, localized_icon, localized_movie, dev_flash, cat_unknown_localized = localized.category.unknown.toStdString(), cat_unknown = cat::cat_unknown.toStdString(), game_icon_path, _hdd, play_hover_movies = m_play_hover_movies, show_custom_icons = m_show_custom_icons](const std::string& dir_or_elf)
{ {
GameInfo game{}; gui_game_info game{};
game.path = dir_or_elf; game.info.path = dir_or_elf;
const Localized thread_localized; const Localized thread_localized;
@ -599,13 +599,13 @@ void game_list_frame::OnParsingFinished()
return; return;
} }
game.serial = dir_or_elf.substr(dir_or_elf.find_last_of(fs::delim) + 1); game.info.serial = dir_or_elf.substr(dir_or_elf.find_last_of(fs::delim) + 1);
game.category = cat::cat_ps3_os.toStdString(); // Key for operating system executables game.info.category = cat::cat_ps3_os.toStdString(); // Key for operating system executables
game.version = utils::get_firmware_version(); game.info.version = utils::get_firmware_version();
game.app_ver = game.version; game.info.app_ver = game.info.version;
game.fw = game.version; game.info.fw = game.info.version;
game.bootable = 1; game.info.bootable = 1;
game.icon_path = dev_flash + "vsh/resource/explore/icon/icon_home.png"; game.info.icon_path = dev_flash + "vsh/resource/explore/icon/icon_home.png";
if (dir_or_elf.starts_with(dev_flash)) if (dir_or_elf.starts_with(dev_flash))
{ {
@ -618,13 +618,13 @@ void game_list_frame::OnParsingFinished()
if (const auto it = thread_localized.title.titles.find(path_vfs); it != thread_localized.title.titles.cend()) if (const auto it = thread_localized.title.titles.find(path_vfs); it != thread_localized.title.titles.cend())
{ {
game.name = it->second.toStdString(); game.info.name = it->second.toStdString();
} }
} }
if (game.name.empty()) if (game.info.name.empty())
{ {
game.name = game.serial; game.info.name = game.info.serial;
} }
} }
else else
@ -632,52 +632,53 @@ void game_list_frame::OnParsingFinished()
std::string_view name = psf::get_string(psf, localized_title); std::string_view name = psf::get_string(psf, localized_title);
if (name.empty()) name = psf::get_string(psf, "TITLE", cat_unknown_localized); if (name.empty()) name = psf::get_string(psf, "TITLE", cat_unknown_localized);
game.serial = std::string(title_id); game.info.serial = std::string(title_id);
game.name = std::string(name); game.info.name = std::string(name);
game.app_ver = std::string(psf::get_string(psf, "APP_VER", cat_unknown_localized)); game.info.app_ver = std::string(psf::get_string(psf, "APP_VER", cat_unknown_localized));
game.version = std::string(psf::get_string(psf, "VERSION", cat_unknown_localized)); game.info.version = std::string(psf::get_string(psf, "VERSION", cat_unknown_localized));
game.category = std::string(psf::get_string(psf, "CATEGORY", cat_unknown)); game.info.category = std::string(psf::get_string(psf, "CATEGORY", cat_unknown));
game.fw = std::string(psf::get_string(psf, "PS3_SYSTEM_VER", cat_unknown_localized)); game.info.fw = std::string(psf::get_string(psf, "PS3_SYSTEM_VER", cat_unknown_localized));
game.parental_lvl = psf::get_integer(psf, "PARENTAL_LEVEL", 0); game.info.parental_lvl = psf::get_integer(psf, "PARENTAL_LEVEL", 0);
game.resolution = psf::get_integer(psf, "RESOLUTION", 0); game.info.resolution = psf::get_integer(psf, "RESOLUTION", 0);
game.sound_format = psf::get_integer(psf, "SOUND_FORMAT", 0); game.info.sound_format = psf::get_integer(psf, "SOUND_FORMAT", 0);
game.bootable = psf::get_integer(psf, "BOOTABLE", 0); game.info.bootable = psf::get_integer(psf, "BOOTABLE", 0);
game.attr = psf::get_integer(psf, "ATTRIBUTE", 0); game.info.attr = psf::get_integer(psf, "ATTRIBUTE", 0);
} }
if (show_custom_icons) if (show_custom_icons)
{ {
if (std::string icon_path = game_icon_path + game.serial + "/ICON0.PNG"; fs::is_file(icon_path)) if (std::string icon_path = game_icon_path + game.info.serial + "/ICON0.PNG"; fs::is_file(icon_path))
{ {
game.icon_path = std::move(icon_path); game.info.icon_path = std::move(icon_path);
game.has_custom_icon = true;
} }
} }
if (game.icon_path.empty()) if (game.info.icon_path.empty())
{ {
if (std::string icon_path = sfo_dir + "/" + localized_icon; fs::is_file(icon_path)) if (std::string icon_path = sfo_dir + "/" + localized_icon; fs::is_file(icon_path))
{ {
game.icon_path = std::move(icon_path); game.info.icon_path = std::move(icon_path);
} }
else else
{ {
game.icon_path = sfo_dir + "/ICON0.PNG"; game.info.icon_path = sfo_dir + "/ICON0.PNG";
} }
} }
if (game.movie_path.empty()) if (game.info.movie_path.empty())
{ {
if (std::string movie_path = sfo_dir + "/" + localized_movie; fs::is_file(movie_path)) if (std::string movie_path = sfo_dir + "/" + localized_movie; fs::is_file(movie_path))
{ {
game.movie_path = std::move(movie_path); game.info.movie_path = std::move(movie_path);
} }
else if (std::string movie_path = sfo_dir + "/ICON1.PAM"; fs::is_file(movie_path)) else if (std::string movie_path = sfo_dir + "/ICON1.PAM"; fs::is_file(movie_path))
{ {
game.movie_path = std::move(movie_path); game.info.movie_path = std::move(movie_path);
} }
} }
const QString serial = qstr(game.serial); const QString serial = QString::fromStdString(game.info.serial);
m_games_mutex.lock(); m_games_mutex.lock();
@ -709,7 +710,7 @@ void game_list_frame::OnParsingFinished()
m_games_mutex.unlock(); m_games_mutex.unlock();
QString qt_cat = qstr(game.category); QString qt_cat = QString::fromStdString(game.info.category);
if (const auto boot_cat = thread_localized.category.cat_boot.find(qt_cat); boot_cat != thread_localized.category.cat_boot.cend()) if (const auto boot_cat = thread_localized.category.cat_boot.find(qt_cat); boot_cat != thread_localized.category.cat_boot.cend())
{ {
@ -719,7 +720,7 @@ void game_list_frame::OnParsingFinished()
{ {
qt_cat = data_cat->second; qt_cat = data_cat->second;
} }
else if (game.category == cat_unknown) else if (game.info.category == cat_unknown)
{ {
qt_cat = thread_localized.category.unknown; qt_cat = thread_localized.category.unknown;
} }
@ -728,16 +729,14 @@ void game_list_frame::OnParsingFinished()
qt_cat = thread_localized.category.other; qt_cat = thread_localized.category.other;
} }
gui_game_info info{}; game.localized_category = std::move(qt_cat);
info.info = std::move(game); game.compat = m_game_compat->GetCompatibility(game.info.serial);
info.localized_category = std::move(qt_cat); game.has_custom_config = fs::is_file(rpcs3::utils::get_custom_config_path(game.info.serial));
info.compat = m_game_compat->GetCompatibility(info.info.serial); game.has_custom_pad_config = fs::is_file(rpcs3::utils::get_custom_input_config_path(game.info.serial));
info.has_custom_config = fs::is_file(rpcs3::utils::get_custom_config_path(info.info.serial)); game.has_hover_gif = fs::is_file(game_icon_path + game.info.serial + "/hover.gif");
info.has_custom_pad_config = fs::is_file(rpcs3::utils::get_custom_input_config_path(info.info.serial)); game.has_hover_pam = !game.info.movie_path.empty();
info.has_hover_gif = fs::is_file(game_icon_path + info.info.serial + "/hover.gif");
info.has_hover_pam = !info.info.movie_path.empty();
m_games.push(std::make_shared<gui_game_info>(std::move(info))); m_games.push(std::make_shared<gui_game_info>(std::move(game)));
}; };
const auto add_disc_dir = [this](const std::string& path, std::vector<std::string>& legit_paths) const auto add_disc_dir = [this](const std::string& path, std::vector<std::string>& legit_paths)
@ -896,13 +895,16 @@ void game_list_frame::OnRefreshFinished()
} }
} }
if (std::string icon_path = other->info.path + "/" + localized_icon; fs::is_file(icon_path)) if (!entry->has_custom_icon)
{ {
entry->info.icon_path = std::move(icon_path); if (std::string icon_path = other->info.path + "/" + localized_icon; fs::is_file(icon_path))
} {
else if (std::string icon_path = other->info.path + "/ICON0.PNG"; fs::is_file(icon_path)) entry->info.icon_path = std::move(icon_path);
{ }
entry->info.icon_path = std::move(icon_path); else if (std::string icon_path = other->info.path + "/ICON0.PNG"; fs::is_file(icon_path))
{
entry->info.icon_path = std::move(icon_path);
}
} }
if (std::string movie_path = other->info.path + "/" + localized_movie; fs::is_file(movie_path)) if (std::string movie_path = other->info.path + "/" + localized_movie; fs::is_file(movie_path))

1
rpcs3/rpcs3qt/gui_game_info.h
View file

@ -17,6 +17,7 @@ struct gui_game_info
QPixmap pxmap; QPixmap pxmap;
bool has_custom_config = false; bool has_custom_config = false;
bool has_custom_pad_config = false; bool has_custom_pad_config = false;
bool has_custom_icon = false;
bool has_hover_gif = false; bool has_hover_gif = false;
bool has_hover_pam = false; bool has_hover_pam = false;
movie_item_base* item = nullptr; movie_item_base* item = nullptr;