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

Qt: Change array and rename flags to region

This commit is contained in:
RedDevilus 2022-06-01 13:27:48 +02:00 committed by refractionpcsx2
parent 4b76594d8d
commit 6d3f42a441
32 changed files with 37 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
pcsx2-qt/GameList/GameListModel.cpp
View File

@ -283,7 +283,7 @@ QVariant GameListModel::data(const QModelIndex& index, int role) const
}
case Column_Region:
{
return regionArray[static_cast<int>(ge->region)].pixmap;
return m_region_pixmaps[static_cast<int>(ge->region)];
}
case Column_Compatibility:
@ -456,92 +456,12 @@ void GameListModel::loadCommonImages()
m_type_exe_pixmap = QIcon(QStringLiteral(":/icons/applications-system-24.png")).pixmap(QSize(24, 24));
m_type_playlist_pixmap = QIcon(QStringLiteral(":/icons/address-book-new-22.png")).pixmap(QSize(22, 22));
regionArray[Region::NTSC_B].regionindex = NTSC-B;
regionArray[Region::NTSC_B].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-b.png")).pixmap(QSize(42, 30));
regionArray[Region::NTSC_C].regionindex = NTSC-C;
regionArray[Region::NTSC_C].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-c.png")).pixmap(QSize(42, 30));
regionArray[Region::NTSC_HK].regionindex = NTSC-HK;
regionArray[Region::NTSC_HK].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-hk.png")).pixmap(QSize(42, 30));
regionArray[Region::NTSC_J].regionindex = NTSC-J;
regionArray[Region::NTSC_J].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-jp.png")).pixmap(QSize(42, 30));
regionArray[Region::NTSC_K].regionindex = NTSC-K;
regionArray[Region::NTSC_K].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-k.png")).pixmap(QSize(42, 30));
regionArray[Region::NTSC_T].regionindex = NTSC-T;
regionArray[Region::NTSC_T].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-t.png")).pixmap(QSize(42, 30));
regionArray[Region::NTSC_U].regionindex = NTSC-U;
regionArray[Region::NTSC_U].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-us.png")).pixmap(QSize(42, 30));
regionArray[Region::Other].regionindex = Other;
regionArray[Region::Other].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-other.png")).pixmap(QSize(42, 30));
regionArray[Region::PAL_A].regionindex = PAL-A;
regionArray[Region::PAL_A].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-a.png")).pixmap(QSize(42, 30));
regionArray[Region::PAL_AF].regionindex = NTSC-AF;
regionArray[Region::PAL_AF].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-af.png")).pixmap(QSize(42, 30));
regionArray[Region::PAL_AU].regionindex = PAL-AU;
regionArray[Region::PAL_AU].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-au.png")).pixmap(QSize(42, 30));
regionArray[Region::PAL_BE].regionindex = PAL-BE;
regionArray[Region::PAL_BE].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-be.png")).pixmap(QSize(42, 30));
regionArray[Region::PAL_E].regionindex = PAL-E;
regionArray[Region::PAL_E].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-eu.png")).pixmap(QSize(42, 30));
regionArray[Region::PAL_F].regionindex = PAL-F;
regionArray[Region::PAL_F].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-f.png")).pixmap(QSize(42, 30));
regionArray[Region::PAL_FI].regionindex = PAL-FI;
regionArray[Region::PAL_FI].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-fi.png")).pixmap(QSize(42, 30));
regionArray[Region::PAL_G].regionindex = PAL-G;
regionArray[Region::PAL_G].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-g.png")).pixmap(QSize(42, 30));
regionArray[Region::PAL_GR].regionindex = PAL-GR;
regionArray[Region::PAL_GR].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-gr.png")).pixmap(QSize(42, 30));
regionArray[Region::PAL_I].regionindex = PAL-I;
regionArray[Region::PAL_I].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-i.png")).pixmap(QSize(42, 30));
regionArray[Region::PAL_IN].regionindex = PAL-IN;
regionArray[Region::PAL_IN].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-in.png")).pixmap(QSize(42, 30));
regionArray[Region::PAL_M].regionindex = PAL-M;
regionArray[Region::PAL_M].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-eu.png")).pixmap(QSize(42, 30));
regionArray[Region::PAL_NL].regionindex = PAL-NL;
regionArray[Region::PAL_NL].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-nl.png")).pixmap(QSize(42, 30));
regionArray[Region::PAL_NO].regionindex = PAL-NO;
regionArray[Region::PAL_NO].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-no.png")).pixmap(QSize(42, 30));
regionArray[Region::PAL_P].regionindex = PAL-P;
regionArray[Region::PAL_P].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-p.png")).pixmap(QSize(42, 30));
regionArray[Region::PAL_R].regionindex = PAL-R;
regionArray[Region::PAL_R].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-r.png")).pixmap(QSize(42, 30));
regionArray[Region::PAL_S].regionindex = PAL-S;
regionArray[Region::PAL_S].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-s.png")).pixmap(QSize(42, 30));
regionArray[Region::PAL_SC].regionindex = PAL-SC;
regionArray[Region::PAL_SC].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-sc.png")).pixmap(QSize(42, 30));
regionArray[Region::PAL_SW].regionindex = PAL-SW;
regionArray[Region::PAL_SW].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-sw.png")).pixmap(QSize(42, 30));
regionArray[Region::PAL_SWI].regionindex = PAL-SWI;
regionArray[Region::PAL_SWI].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-swi.png")).pixmap(QSize(42, 30));
regionArray[Region::PAL_UK].regionindex = PAL-UK;
regionArray[Region::PAL_UK].flagimage = QIcon(QStringLiteral(":/icons/flags/flag-uk.png")).pixmap(QSize(42, 30));
for (u32 i = 0; i < static_cast<u32>(GameList::Region::Count); i++)
{
m_region_pixmaps[i] = QIcon(
QStringLiteral(":/icons/flags/%1.png").arg(GameList::RegionToString(static_cast<GameList::Region>(i))))
.pixmap(QSize(42, 30));
}
for (u32 i = 1; i < GameList::CompatibilityRatingCount; i++)
m_compatibility_pixmaps[i].load(QStringLiteral(":/icons/star-%1.png").arg(i - 1));

7
pcsx2-qt/GameList/GameListModel.h
View File

@ -73,11 +73,6 @@ public:
private:
void loadCommonImages();
struct regionStruct {
Region regionindex;
QPixmap flagimage;
}
regionStruct regionArray[100];
void setColumnDisplayNames();
float m_cover_scale = 1.0f;
@ -89,7 +84,7 @@ struct regionStruct {
QPixmap m_type_disc_with_settings_pixmap;
QPixmap m_type_exe_pixmap;
QPixmap m_type_playlist_pixmap;
QPixmap m_region_pixmaps[static_cast<u32>(GameList::Region::Count)];
QPixmap m_placeholder_pixmap;
std::array<QPixmap, static_cast<int>(GameList::CompatibilityRatingCount)> m_compatibility_pixmaps;

0
pcsx2-qt/resources/icons/flags/flag-b.png → pcsx2-qt/resources/icons/flags/NTSC-B.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

0
pcsx2-qt/resources/icons/flags/flag-c.png → pcsx2-qt/resources/icons/flags/NTSC-C.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

0
pcsx2-qt/resources/icons/flags/flag-hk.png → pcsx2-qt/resources/icons/flags/NTSC-HK.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

0
pcsx2-qt/resources/icons/flags/flag-jp.png → pcsx2-qt/resources/icons/flags/NTSC-J.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
pcsx2-qt/resources/icons/flags/flag-k.png → pcsx2-qt/resources/icons/flags/NTSC-K.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

0
pcsx2-qt/resources/icons/flags/flag-t.png → pcsx2-qt/resources/icons/flags/NTSC-T.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

0
pcsx2-qt/resources/icons/flags/flag-us.png → pcsx2-qt/resources/icons/flags/NTSC-U.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

0
pcsx2-qt/resources/icons/flags/flag-other.png → pcsx2-qt/resources/icons/flags/Other.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 369 B

After

Width:  |  Height:  |  Size: 369 B

0
pcsx2-qt/resources/icons/flags/flag-a.png → pcsx2-qt/resources/icons/flags/PAL-A.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

0
pcsx2-qt/resources/icons/flags/flag-af.png → pcsx2-qt/resources/icons/flags/PAL-AF.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

0
pcsx2-qt/resources/icons/flags/flag-au.png → pcsx2-qt/resources/icons/flags/PAL-AU.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 608 B

After

Width:  |  Height:  |  Size: 608 B

0
pcsx2-qt/resources/icons/flags/flag-be.png → pcsx2-qt/resources/icons/flags/PAL-BE.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
pcsx2-qt/resources/icons/flags/flag-eu.png → pcsx2-qt/resources/icons/flags/PAL-E.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

0
pcsx2-qt/resources/icons/flags/flag-f.png → pcsx2-qt/resources/icons/flags/PAL-F.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
pcsx2-qt/resources/icons/flags/flag-fi.png → pcsx2-qt/resources/icons/flags/PAL-FI.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 318 B

After

Width:  |  Height:  |  Size: 318 B

0
pcsx2-qt/resources/icons/flags/flag-g.png → pcsx2-qt/resources/icons/flags/PAL-G.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
pcsx2-qt/resources/icons/flags/flag-gr.png → pcsx2-qt/resources/icons/flags/PAL-GR.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 608 B

After

Width:  |  Height:  |  Size: 608 B

0
pcsx2-qt/resources/icons/flags/flag-i.png → pcsx2-qt/resources/icons/flags/PAL-I.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
pcsx2-qt/resources/icons/flags/flag-in.png → pcsx2-qt/resources/icons/flags/PAL-IN.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
pcsx2-qt/resources/icons/flags/PAL-M.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

0
pcsx2-qt/resources/icons/flags/flag-nl.png → pcsx2-qt/resources/icons/flags/PAL-NL.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 274 B

After

Width:  |  Height:  |  Size: 274 B

0
pcsx2-qt/resources/icons/flags/flag-no.png → pcsx2-qt/resources/icons/flags/PAL-NO.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 412 B

After

Width:  |  Height:  |  Size: 412 B

0
pcsx2-qt/resources/icons/flags/flag-p.png → pcsx2-qt/resources/icons/flags/PAL-P.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

0
pcsx2-qt/resources/icons/flags/flag-r.png → pcsx2-qt/resources/icons/flags/PAL-R.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 278 B

After

Width:  |  Height:  |  Size: 278 B

0
pcsx2-qt/resources/icons/flags/flag-s.png → pcsx2-qt/resources/icons/flags/PAL-S.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

0
pcsx2-qt/resources/icons/flags/flag-sc.png → pcsx2-qt/resources/icons/flags/PAL-SC.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 959 B

After

Width:  |  Height:  |  Size: 959 B

0
pcsx2-qt/resources/icons/flags/flag-sw.png → pcsx2-qt/resources/icons/flags/PAL-SW.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 581 B

After

Width:  |  Height:  |  Size: 581 B

0
pcsx2-qt/resources/icons/flags/flag-swi.png → pcsx2-qt/resources/icons/flags/PAL-SWI.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

0
pcsx2-qt/resources/icons/flags/flag-uk.png → pcsx2-qt/resources/icons/flags/PAL-UK.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

57
pcsx2-qt/resources/resources.qrc
View File

@ -45,35 +45,36 @@
<file>icons/black/svg/window-2-line.svg</file>
<file>icons/black/index.theme</file>
<file>icons/discord.png</file>
<file>icons/flags/flag-a.png</file>
<file>icons/flags/flag-af.png</file>
<file>icons/flags/flag-au.png</file>
<file>icons/flags/flag-b.png</file>
<file>icons/flags/flag-be.png</file>
<file>icons/flags/flag-c.png</file>
<file>icons/flags/flag-cn.png</file>
<file>icons/flags/flag-eu.png</file>
<file>icons/flags/flag-f.png</file>
<file>icons/flags/flag-fi.png</file>
<file>icons/flags/flag-g.png</file>
<file>icons/flags/flag-gr.png</file>
<file>icons/flags/flag-hk.png</file>
<file>icons/flags/flag-i.png</file>
<file>icons/flags/flag-in.png</file>
<file>icons/flags/flag-jp.png</file>
<file>icons/flags/flag-k.png</file>
<file>icons/flags/flag-nl.png</file>
<file>icons/flags/flag-no.png</file>
<file>icons/flags/flag-other.png</file>
<file>icons/flags/flag-p.png</file>
<file>icons/flags/flag-r.png</file>
<file>icons/flags/flag-s.png</file>
<file>icons/flags/flag-sc.png</file>
<file>icons/flags/flag-sw.png</file>
<file>icons/flags/flag-swi.png</file>
<file>icons/flags/flag-t.png</file>
<file>icons/flags/flag-uk.png</file>
<file>icons/flags/flag-us.png</file>
<file>icons/flags/NTSC-B.png</file>
<file>icons/flags/NTSC-C.png</file>
<file>icons/flags/NTSC-HK.png</file>
<file>icons/flags/NTSC-J.png</file>
<file>icons/flags/NTSC-K.png</file>
<file>icons/flags/NTSC-T.png</file>
<file>icons/flags/NTSC-U.png</file>
<file>icons/flags/Other.png</file>
<file>icons/flags/PAL-A.png</file>
<file>icons/flags/PAL-AF.png</file>
<file>icons/flags/PAL-AU.png</file>
<file>icons/flags/PAL-BE.png</file>
<file>icons/flags/PAL-E.png</file>
<file>icons/flags/PAL-F.png</file>
<file>icons/flags/PAL-FI.png</file>
<file>icons/flags/PAL-G.png</file>
<file>icons/flags/PAL-GR.png</file>
<file>icons/flags/PAL-I.png</file>
<file>icons/flags/PAL-IN.png</file>
<file>icons/flags/PAL-M.png</file>
<file>icons/flags/PAL-NL.png</file>
<file>icons/flags/PAL-NO.png</file>
<file>icons/flags/PAL-P.png</file>
<file>icons/flags/PAL-R.png</file>
<file>icons/flags/PAL-S.png</file>
<file>icons/flags/PAL-SC.png</file>
<file>icons/flags/PAL-SW.png</file>
<file>icons/flags/PAL-SWI.png</file>
<file>icons/flags/PAL-UK.png</file>
<file>icons/logo.png</file>
<file>icons/media-optical-24.png</file>
<file>icons/media-optical-gear-24.png</file>