Skip to content

Commit

Permalink
Qt: Bump Cache + new other icon
Browse files Browse the repository at this point in the history
  • Loading branch information
@RedDevilus @refractionpcsx2
RedDevilus authored and refractionpcsx2 committed Jun 3, 2022
1 parent 5063961 commit 2333ff7
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 51 deletions.
2 changes: 1 addition & 1 deletion pcsx2-qt/GameList/GameListModel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ 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));

for (u32 i = 0; i < static_cast<u32>(GameList::Region::Count); i++)
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))))
Expand Down
71 changes: 31 additions & 40 deletions pcsx2-qt/Settings/GameSummaryWidget.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-b.png</normaloff>:/icons/flags/flag-b.png</iconset>
<normaloff>:/icons/flags/NTSC-B.png</normaloff>:/icons/flags/NTSC-B.png</iconset>
</property>
</item>
<item>
Expand All @@ -109,7 +109,7 @@
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-c.png</normaloff>:/icons/flags/flag-c.png</iconset>
<normaloff>:/icons/flags/NTSC-C.png</normaloff>:/icons/flags/NTSC-C.png</iconset>
</property>
</item>
<item>
Expand All @@ -118,7 +118,7 @@
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-hk.png</normaloff>:/icons/flags/flag-hk.png</iconset>
<normaloff>:/icons/flags/NTSC-HK.png</normaloff>:/icons/flags/NTSC-HK.png</iconset>
</property>
</item>
<item>
Expand All @@ -127,7 +127,7 @@
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-jp.png</normaloff>:/icons/flags/flag-jp.png</iconset>
<normaloff>:/icons/flags/NTSC-J.png</normaloff>:/icons/flags/NTSC-J.png</iconset>
</property>
</item>
<item>
Expand All @@ -136,7 +136,7 @@
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-k.png</normaloff>:/icons/flags/flag-k.png</iconset>
<normaloff>:/icons/flags/NTSC-K.png</normaloff>:/icons/flags/NTSC-K.png</iconset>
</property>
</item>
<item>
Expand All @@ -145,7 +145,7 @@
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-t.png</normaloff>:/icons/flags/flag-t.png</iconset>
<normaloff>:/icons/flags/NTSC-T.png</normaloff>:/icons/flags/NTSC-T.png</iconset>
</property>
</item>
<item>
Expand All @@ -154,7 +154,7 @@
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-us.png</normaloff>:/icons/flags/flag-us.png</iconset>
<normaloff>:/icons/flags/NTSC-U.png</normaloff>:/icons/flags/NTSC-U.png</iconset>
</property>
</item>
<item>
Expand All @@ -163,16 +163,7 @@
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-other.png</normaloff>:/icons/flags/flag-other.png</iconset>
</property>
</item>
<item>
<property name="text">
<string>PAL (Europe)</string>
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-eu.png</normaloff>:/icons/flags/flag-eu.png</iconset>
<normaloff>:/icons/flags/Other.png</normaloff>:/icons/flags/Other.png</iconset>
</property>
</item>
<item>
Expand All @@ -181,7 +172,7 @@
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-a.png</normaloff>:/icons/flags/flag-a.png</iconset>
<normaloff>:/icons/flags/PAL-A.png</normaloff>:/icons/flags/PAL-A.png</iconset>
</property>
</item>
<item>
Expand All @@ -190,7 +181,7 @@
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-af.png</normaloff>:/icons/flags/flag-af.png</iconset>
<normaloff>:/icons/flags/PAL-AF.png</normaloff>:/icons/flags/PAL-AF.png</iconset>
</property>
</item>
<item>
Expand All @@ -199,7 +190,7 @@
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-au.png</normaloff>:/icons/flags/flag-au.png</iconset>
<normaloff>:/icons/flags/PAL-AU.png</normaloff>:/icons/flags/PAL-AU.png</iconset>
</property>
</item>
<item>
Expand All @@ -208,7 +199,7 @@
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-be.png</normaloff>:/icons/flags/flag-be.png</iconset>
<normaloff>:/icons/flags/PAL-BE.png</normaloff>:/icons/flags/PAL-BE.png</iconset>
</property>
</item>
<item>
Expand All @@ -217,7 +208,7 @@
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-eu.png</normaloff>:/icons/flags/flag-eu.png</iconset>
<normaloff>:/icons/flags/PAL-E.png</normaloff>:/icons/flags/PAL-E.png</iconset>
</property>
</item>
<item>
Expand All @@ -226,7 +217,7 @@
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-f.png</normaloff>:/icons/flags/flag-f.png</iconset>
<normaloff>:/icons/flags/PAL-F.png</normaloff>:/icons/flags/PAL-F.png</iconset>
</property>
</item>
<item>
Expand All @@ -235,7 +226,7 @@
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-fi.png</normaloff>:/icons/flags/flag-fi.png</iconset>
<normaloff>:/icons/flags/PAL-FI.png</normaloff>:/icons/flags/PAL-FI.png</iconset>
</property>
</item>
<item>
Expand All @@ -244,7 +235,7 @@
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-g.png</normaloff>:/icons/flags/flag-g.png</iconset>
<normaloff>:/icons/flags/PAL-G.png</normaloff>:/icons/flags/PAL-G.png</iconset>
</property>
</item>
<item>
Expand All @@ -253,7 +244,7 @@
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-gr.png</normaloff>:/icons/flags/flag-gr.png</iconset>
<normaloff>:/icons/flags/PAL-GR.png</normaloff>:/icons/flags/PAL-GR.png</iconset>
</property>
</item>
<item>
Expand All @@ -262,7 +253,7 @@
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-i.png</normaloff>:/icons/flags/flag-i.png</iconset>
<normaloff>:/icons/flags/PAL-I.png</normaloff>:/icons/flags/PAL-I.png</iconset>
</property>
</item>
<item>
Expand All @@ -271,25 +262,25 @@
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-in.png</normaloff>:/icons/flags/flag-in.png</iconset>
<normaloff>:/icons/flags/PAL-IN.png</normaloff>:/icons/flags/PAL-IN.png</iconset>
</property>
</item>
<item>
<property name="text">
<string>PAL-NL (Netherlands)</string>
<string>PAL-M (Europe/Australia)</string>
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-nl.png</normaloff>:/icons/flags/flag-nl.png</iconset>
<normaloff>:/icons/flags/PAL-M.png</normaloff>:/icons/flags/PAL-M.png</iconset>
</property>
</item>
<item>
<property name="text">
<string>PAL-M (Europe/Australia)</string>
<string>PAL-NL (Netherlands)</string>
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-eu.png</normaloff>:/icons/flags/flag-eu.png</iconset>
<normaloff>:/icons/flags/PAL-NL.png</normaloff>:/icons/flags/PAL-NL.png</iconset>
</property>
</item>
<item>
Expand All @@ -298,7 +289,7 @@
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-no.png</normaloff>:/icons/flags/flag-no.png</iconset>
<normaloff>:/icons/flags/PAL-NO.png</normaloff>:/icons/flags/PAL-NO.png</iconset>
</property>
</item>
<item>
Expand All @@ -307,7 +298,7 @@
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-p.png</normaloff>:/icons/flags/flag-p.png</iconset>
<normaloff>:/icons/flags/PAL-P.png</normaloff>:/icons/flags/PAL-P.png</iconset>
</property>
</item>
<item>
Expand All @@ -316,7 +307,7 @@
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-r.png</normaloff>:/icons/flags/flag-r.png</iconset>
<normaloff>:/icons/flags/PAL-R.png</normaloff>:/icons/flags/PAL-R.png</iconset>
</property>
</item>
<item>
Expand All @@ -325,7 +316,7 @@
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-s.png</normaloff>:/icons/flags/flag-s.png</iconset>
<normaloff>:/icons/flags/PAL-S.png</normaloff>:/icons/flags/PAL-S.png</iconset>
</property>
</item>
<item>
Expand All @@ -334,7 +325,7 @@
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-sc.png</normaloff>:/icons/flags/flag-sc.png</iconset>
<normaloff>:/icons/flags/PAL-SC.png</normaloff>:/icons/flags/PAL-SC.png</iconset>
</property>
</item>
<item>
Expand All @@ -343,7 +334,7 @@
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-sw.png</normaloff>:/icons/flags/flag-sw.png</iconset>
<normaloff>:/icons/flags/PAL-SW.png</normaloff>:/icons/flags/PAL-SW.png</iconset>
</property>
</item>
<item>
Expand All @@ -352,7 +343,7 @@
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-swi.png</normaloff>:/icons/flags/flag-swi.png</iconset>
<normaloff>:/icons/flags/PAL-SWI.png</normaloff>:/icons/flags/PAL-SWI.png</iconset>
</property>
</item>
<item>
Expand All @@ -361,7 +352,7 @@
</property>
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/flags/flag-uk.png</normaloff>:/icons/flags/flag-uk.png</iconset>
<normaloff>:/icons/flags/PAL-UK.png</normaloff>:/icons/flags/PAL-UK.png</iconset>
</property>
</item>
</widget>
Expand Down
Binary file modified pcsx2-qt/resources/icons/flags/Other.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions pcsx2/Frontend/GameList.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
enum : u32
{
GAME_LIST_CACHE_SIGNATURE = 0x45434C47,
GAME_LIST_CACHE_VERSION = 31
GAME_LIST_CACHE_VERSION = 32
};

namespace GameList
Expand Down Expand Up @@ -175,7 +175,7 @@ bool GameList::GetElfListEntry(const std::string& path, GameList::Entry* entry)
entry->compatibility_rating = CompatibilityRating::Unknown;
return true;
}

// clang-format off
bool GameList::GetIsoListEntry(const std::string& path, GameList::Entry* entry)
{
FILESYSTEM_STAT_DATA sd;
Expand Down Expand Up @@ -298,7 +298,7 @@ bool GameList::GetIsoListEntry(const std::string& path, GameList::Entry* entry)

return true;
}

// clang-format off
bool GameList::PopulateEntryFromPath(const std::string& path, GameList::Entry* entry)
{
if (VMManager::IsElfFileName(path.c_str()))
Expand Down
14 changes: 7 additions & 7 deletions pcsx2/Frontend/GameList.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,26 +50,26 @@ namespace GameList
NTSC_T,
NTSC_U,
Other,
PAL_AF,
PAL_AU,
PAL_A,
PAL_AU,
PAL_AF,
PAL_BE,
PAL_E,
PAL_FI,
PAL_F,
PAL_GR,
PAL_FI,
PAL_G,
PAL_IN,
PAL_GR,
PAL_I,
PAL_IN,
PAL_M,
PAL_NL,
PAL_NO,
PAL_P,
PAL_R,
PAL_S,
PAL_SC,
PAL_SWI,
PAL_SW,
PAL_S,
PAL_SWI,
PAL_UK,
Count
};
Expand Down

0 comments on commit 2333ff7

Please sign in to comment.