ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5961 from ligfx/gamefilebanner 

GameFile: handle missing banners in UI instead
This commit is contained in:
Leo Lam 2017-08-22 21:26:38 +02:00 committed by GitHub
parent b13d7f9d47 061da1300a
commit 232b81999a
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/DolphinQt2/Config/InfoWidget.cpp
View File

@ -69,7 +69,6 @@ QGroupBox* InfoWidget::CreateBannerDetails()
m_long_maker = CreateValueDisplay(); m_long_maker = CreateValueDisplay();
m_description = new QTextEdit(); m_description = new QTextEdit();
m_description->setReadOnly(true); m_description->setReadOnly(true);
QWidget* banner = CreateBannerGraphic();
CreateLanguageSelector(); CreateLanguageSelector();
layout->addRow(tr("Show Language:"), m_language_selector); layout->addRow(tr("Show Language:"), m_language_selector);
@ -85,7 +84,11 @@ QGroupBox* InfoWidget::CreateBannerDetails()
{ {
layout->addRow(tr("Name:"), m_long_name); layout->addRow(tr("Name:"), m_long_name);
} }
layout->addRow(tr("Banner:"), banner);
if (!m_game.GetBanner().isNull())
{
layout->addRow(tr("Banner:"), CreateBannerGraphic());
}
group->setLayout(layout); group->setLayout(layout);
return group; return group;

3
Source/Core/DolphinQt2/GameList/GameFile.cpp
View File

@ -99,8 +99,6 @@ void GameFile::ReadBanner(const DiscIO::Volume& volume)
if (!banner.isNull()) if (!banner.isNull())
m_banner = QPixmap::fromImage(banner); m_banner = QPixmap::fromImage(banner);
else
m_banner = Resources::GetMisc(Resources::BANNER_MISSING);
} }
bool GameFile::LoadFileInfo(const QString& path) bool GameFile::LoadFileInfo(const QString& path)
@ -197,7 +195,6 @@ bool GameFile::TryLoadElfDol()
m_country = DiscIO::Country::COUNTRY_UNKNOWN; m_country = DiscIO::Country::COUNTRY_UNKNOWN;
m_blob_type = DiscIO::BlobType::DIRECTORY; m_blob_type = DiscIO::BlobType::DIRECTORY;
m_raw_size = m_size; m_raw_size = m_size;
m_banner = Resources::GetMisc(Resources::BANNER_MISSING);
m_rating = 0; m_rating = 0;
return true; return true;

2
Source/Core/DolphinQt2/GameList/GameListModel.cpp
View File

@ -63,6 +63,8 @@ QVariant GameListModel::data(const QModelIndex& index, int role) const
// GameCube banners are 96x32, but Wii banners are 192x64. // GameCube banners are 96x32, but Wii banners are 192x64.
// TODO: use custom banners from rom directory like DolphinWX? // TODO: use custom banners from rom directory like DolphinWX?
QPixmap banner = game->GetBanner(); QPixmap banner = game->GetBanner();
if (banner.isNull())
banner = Resources::GetMisc(Resources::BANNER_MISSING);
banner.setDevicePixelRatio(std::max(banner.width() / GAMECUBE_BANNER_SIZE.width(), banner.setDevicePixelRatio(std::max(banner.width() / GAMECUBE_BANNER_SIZE.width(),
banner.height() / GAMECUBE_BANNER_SIZE.height())); banner.height() / GAMECUBE_BANNER_SIZE.height()));
return banner; return banner;