dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-06-04 05:45:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

ISO: Move icon loading to a common function in qt_utils.h

Browse Source
This commit is contained in:
Functionable 2026-01-07 19:02:27 +00:00 committed by Elad
parent bc1d0b9e65
commit 714359b544
4 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rpcs3/rpcs3qt/game_list_base.cpp
View File

@ -1,8 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "qt_utils.h"
#include "game_list_base.h" #include "game_list_base.h"
#include "Loader/ISO.h"
#include <QDir> #include <QDir>
#include <QPainter> #include <QPainter>
@ -54,18 +53,10 @@ void game_list_base::IconLoadFunction(game_info game, qreal device_pixel_ratio,
{ {
if (game->icon_in_archive) if (game->icon_in_archive)
{ {
iso_archive archive(game->info.path); game->icon_in_archive = gui::utils::load_icon(game->icon, game->info.icon_path, game->info.path);
auto icon_file = archive.open(game->info.icon_path);
auto icon_size = icon_file.size();
QByteArray data(icon_size, 0);
icon_file.read(data.data(), icon_size);
QImage iconImage;
if (iconImage.loadFromData(data))
{
game->icon = QPixmap::fromImage(iconImage);
}
} }
else if (game_list_log.warning)
if (!game->icon_in_archive && game_list_log.warning)
{ {
bool logged = false; bool logged = false;
{ {

24
rpcs3/rpcs3qt/qt_utils.cpp
View File

@ -12,6 +12,7 @@
#include "Emu/system_utils.hpp" #include "Emu/system_utils.hpp"
#include "Utilities/File.h" #include "Utilities/File.h"
#include "Loader/ISO.h"
#include <cmath> #include <cmath>
LOG_CHANNEL(gui_log, "GUI"); LOG_CHANNEL(gui_log, "GUI");
@ -682,6 +683,29 @@ namespace gui
return QString("%1 days ago %2").arg(current_date - exctrated_date).arg(date.toString(fmt_relative)); return QString("%1 days ago %2").arg(current_date - exctrated_date).arg(date.toString(fmt_relative));
} }
bool load_icon(QPixmap& icon, const std::string& icon_path,
const std::string& archive_path)
{
if (!is_file_iso(archive_path)) return false;
iso_archive archive(archive_path);
if (!archive.exists(icon_path)) return false;
auto icon_file = archive.open(icon_path);
auto icon_size = icon_file.size();
QByteArray data(icon_size, 0);
icon_file.read(data.data(), icon_size);
QImage iconImage;
if (iconImage.loadFromData(data))
{
icon = QPixmap::fromImage(iconImage);
}
return true;
}
QString format_timestamp(s64 time, const QString& fmt) QString format_timestamp(s64 time, const QString& fmt)
{ {
return format_datetime(datetime(time), fmt); return format_datetime(datetime(time), fmt);

3
rpcs3/rpcs3qt/qt_utils.h
View File

@ -178,6 +178,9 @@ namespace gui
return color_scheme() == Qt::ColorScheme::Dark; return color_scheme() == Qt::ColorScheme::Dark;
} }
// Loads an icon from an (ISO) archive file.
bool load_icon(QPixmap& icon, const std::string& icon_path, const std::string& archive_path);
template <typename T> template <typename T>
void stop_future_watcher(QFutureWatcher<T>& watcher, bool cancel, std::shared_ptr<atomic_t<bool>> cancel_flag = nullptr) void stop_future_watcher(QFutureWatcher<T>& watcher, bool cancel, std::shared_ptr<atomic_t<bool>> cancel_flag = nullptr)
{ {

11
rpcs3/rpcs3qt/savestate_manager_dialog.cpp
View File

@ -450,16 +450,7 @@ void savestate_manager_dialog::ResizeGameIcons()
if (!archive_path.empty()) if (!archive_path.empty())
{ {
iso_archive archive(archive_path); gui::utils::load_icon(icon, icon_path, archive_path);
auto icon_file = archive.open(icon_path);
auto icon_size = icon_file.size();
QByteArray data(icon_size, 0);
icon_file.read(data.data(), icon_size);
QImage iconImage;
if (iconImage.loadFromData(data))
{
icon = QPixmap::fromImage(iconImage);
}
} }
if (cancel && cancel->load()) if (cancel && cancel->load())