From 9b2fe62bc99221678bce66ab4694f06296ec2fdb Mon Sep 17 00:00:00 2001 From: JosJuice Date: Fri, 30 Oct 2015 10:04:54 +0100 Subject: [PATCH] Move nobanner and fileplatform from Themes to Resources fileplatform is moved so it's in the same place as the other platform icons, and nobanner is moved just because it fits better in Resources. Both of them were identical in all of Dolphin's themes. --- .../Platform_File.png} | Bin Data/Sys/{Themes/Boomy => Resources}/nobanner.png | Bin .../Clean Blue => Resources}/nobanner@2x.png | Bin Data/Sys/Themes/Clean Blue/fileplatform.png | Bin 278 -> 0 bytes Data/Sys/Themes/Clean Blue/nobanner.png | Bin 321 -> 0 bytes Data/Sys/Themes/Clean Lite/fileplatform.png | Bin 278 -> 0 bytes Data/Sys/Themes/Clean Lite/nobanner.png | Bin 321 -> 0 bytes Data/Sys/Themes/Clean Lite/nobanner@2x.png | Bin 553 -> 0 bytes Data/Sys/Themes/Clean Pink/fileplatform.png | Bin 278 -> 0 bytes Data/Sys/Themes/Clean Pink/nobanner.png | Bin 321 -> 0 bytes Data/Sys/Themes/Clean Pink/nobanner@2x.png | Bin 553 -> 0 bytes Data/Sys/Themes/Clean/fileplatform.png | Bin 278 -> 0 bytes Data/Sys/Themes/Clean/nobanner.png | Bin 321 -> 0 bytes Data/Sys/Themes/Clean/nobanner@2x.png | Bin 553 -> 0 bytes Source/Core/Common/CommonPaths.h | 1 + Source/Core/DolphinQt/Utils/Resources.cpp | 10 +++++----- Source/Core/DolphinQt2/Resources.cpp | 12 ++++++------ Source/Core/DolphinWX/GameListCtrl.cpp | 2 +- Source/Core/DolphinWX/ISOFile.cpp | 2 +- 19 files changed, 14 insertions(+), 13 deletions(-) rename Data/Sys/{Themes/Boomy/fileplatform.png => Resources/Platform_File.png} (100%) rename Data/Sys/{Themes/Boomy => Resources}/nobanner.png (100%) rename Data/Sys/{Themes/Clean Blue => Resources}/nobanner@2x.png (100%) delete mode 100644 Data/Sys/Themes/Clean Blue/fileplatform.png delete mode 100644 Data/Sys/Themes/Clean Blue/nobanner.png delete mode 100644 Data/Sys/Themes/Clean Lite/fileplatform.png delete mode 100644 Data/Sys/Themes/Clean Lite/nobanner.png delete mode 100644 Data/Sys/Themes/Clean Lite/nobanner@2x.png delete mode 100644 Data/Sys/Themes/Clean Pink/fileplatform.png delete mode 100644 Data/Sys/Themes/Clean Pink/nobanner.png delete mode 100644 Data/Sys/Themes/Clean Pink/nobanner@2x.png delete mode 100644 Data/Sys/Themes/Clean/fileplatform.png delete mode 100644 Data/Sys/Themes/Clean/nobanner.png delete mode 100644 Data/Sys/Themes/Clean/nobanner@2x.png diff --git a/Data/Sys/Themes/Boomy/fileplatform.png b/Data/Sys/Resources/Platform_File.png similarity index 100% rename from Data/Sys/Themes/Boomy/fileplatform.png rename to Data/Sys/Resources/Platform_File.png diff --git a/Data/Sys/Themes/Boomy/nobanner.png b/Data/Sys/Resources/nobanner.png similarity index 100% rename from Data/Sys/Themes/Boomy/nobanner.png rename to Data/Sys/Resources/nobanner.png diff --git a/Data/Sys/Themes/Clean Blue/nobanner@2x.png b/Data/Sys/Resources/nobanner@2x.png similarity index 100% rename from Data/Sys/Themes/Clean Blue/nobanner@2x.png rename to Data/Sys/Resources/nobanner@2x.png diff --git a/Data/Sys/Themes/Clean Blue/fileplatform.png b/Data/Sys/Themes/Clean Blue/fileplatform.png deleted file mode 100644 index 0e6a2367292e6725159bfec0699d755d896bad53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^2|%pC!3HGX9;gigQfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#K8FmyvFb*Hz;8gI#hxyXAsP4HUUB4V3J__1n7n2E zj$BQSMI22n4h6P;Pqvt-v-N8j8}k0y|M4mBIevd828M`5YtB!68+B>hW0n36;o`dd ztDo0p|CzgF@muZUe|iU^1p|c=k1=?**b1g`U2xNw#38DSr z1<%~X^wgl##FWaylc_d9MWO*dA+Bj@X<1oW+1c5-xw!=e1;xe14Gj$!YaL913J!U? zIEGl9?!98ocUVE7e?QU`?&s1k%c<@T* zbIlFe8;Z4`kA)sH?vG>lZ(?-*pdw+wHf_NHiHIhq;0v65K91@Z2JBM>4#4h`f`vUoAdG>V=i&FJ4Gb9cJ8IN3%}J%wh5S Q3-k?xr>mdKI;Vst0A#*#Jpcdz diff --git a/Data/Sys/Themes/Clean Lite/fileplatform.png b/Data/Sys/Themes/Clean Lite/fileplatform.png deleted file mode 100644 index 0e6a2367292e6725159bfec0699d755d896bad53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^2|%pC!3HGX9;gigQfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#K8FmyvFb*Hz;8gI#hxyXAsP4HUUB4V3J__1n7n2E zj$BQSMI22n4h6P;Pqvt-v-N8j8}k0y|M4mBIevd828M`5YtB!68+B>hW0n36;o`dd ztDo0p|CzgF@muZUe|iU^1p|c=k1=?**b1g`U2xNw#38DSr z1<%~X^wgl##FWaylc_d9MWO*dA+Bj@X<1oW+1c5-xw!=e1;xe14Gj$!YaL913J!U? zIEGl9?!98ocUVE7e?QU`?&s1k%c<@T* zbIlFe8;Z4`kA)sH?vG>lZ(?-*pdw+wHf_NHiHIhq;0v65K91@Z2JBM>4#4h`f`vUoAdG>V=i&FJ4Gb9cJ8IN3%}J%wh5S Q3-k?xr>mdKI;Vst0A#*#Jpcdz diff --git a/Data/Sys/Themes/Clean Lite/nobanner@2x.png b/Data/Sys/Themes/Clean Lite/nobanner@2x.png deleted file mode 100644 index 8ad3b2c8434492a06828461cc48098b07b5aad4b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 553 zcmV+^0@nSBP)j_59`@u z?{(fwy;qAKb3m;PMd{H6)YMR#9%(@B31U)H$<{Jvp69j0cp&UI~faVyA(h~=0w4pRTiGT=ze#)S~ z!~Qd^!wNu#dNK_adN2eaAw6k^3OyJCker?zLxmm;0Z3F&f}uhWh5#h3$J{XE)7O>#K8FmyvFb*Hz;8gI#hxyXAsP4HUUB4V3J__1n7n2E zj$BQSMI22n4h6P;Pqvt-v-N8j8}k0y|M4mBIevd828M`5YtB!68+B>hW0n36;o`dd ztDo0p|CzgF@muZUe|iU^1p|c=k1=?**b1g`U2xNw#38DSr z1<%~X^wgl##FWaylc_d9MWO*dA+Bj@X<1oW+1c5-xw!=e1;xe14Gj$!YaL913J!U? zIEGl9?!98ocUVE7e?QU`?&s1k%c<@T* zbIlFe8;Z4`kA)sH?vG>lZ(?-*pdw+wHf_NHiHIhq;0v65K91@Z2JBM>4#4h`f`vUoAdG>V=i&FJ4Gb9cJ8IN3%}J%wh5S Q3-k?xr>mdKI;Vst0A#*#Jpcdz diff --git a/Data/Sys/Themes/Clean Pink/nobanner@2x.png b/Data/Sys/Themes/Clean Pink/nobanner@2x.png deleted file mode 100644 index 8ad3b2c8434492a06828461cc48098b07b5aad4b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 553 zcmV+^0@nSBP)j_59`@u z?{(fwy;qAKb3m;PMd{H6)YMR#9%(@B31U)H$<{Jvp69j0cp&UI~faVyA(h~=0w4pRTiGT=ze#)S~ z!~Qd^!wNu#dNK_adN2eaAw6k^3OyJCker?zLxmm;0Z3F&f}uhWh5#h3$J{XE)7O>#K8FmyvFb*Hz;8gI#hxyXAsP4HUUB4V3J__1n7n2E zj$BQSMI22n4h6P;Pqvt-v-N8j8}k0y|M4mBIevd828M`5YtB!68+B>hW0n36;o`dd ztDo0p|CzgF@muZUe|iU^1p|c=k1=?**b1g`U2xNw#38DSr z1<%~X^wgl##FWaylc_d9MWO*dA+Bj@X<1oW+1c5-xw!=e1;xe14Gj$!YaL913J!U? zIEGl9?!98ocUVE7e?QU`?&s1k%c<@T* zbIlFe8;Z4`kA)sH?vG>lZ(?-*pdw+wHf_NHiHIhq;0v65K91@Z2JBM>4#4h`f`vUoAdG>V=i&FJ4Gb9cJ8IN3%}J%wh5S Q3-k?xr>mdKI;Vst0A#*#Jpcdz diff --git a/Data/Sys/Themes/Clean/nobanner@2x.png b/Data/Sys/Themes/Clean/nobanner@2x.png deleted file mode 100644 index 8ad3b2c8434492a06828461cc48098b07b5aad4b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 553 zcmV+^0@nSBP)j_59`@u z?{(fwy;qAKb3m;PMd{H6)YMR#9%(@B31U)H$<{Jvp69j0cp&UI~faVyA(h~=0w4pRTiGT=ze#)S~ z!~Qd^!wNu#dNK_adN2eaAw6k^3OyJCker?zLxmm;0Z3F&f}uhWh5#h3$J #include +#include "Common/CommonPaths.h" #include "Common/FileUtil.h" #include "Core/ConfigManager.h" @@ -17,7 +18,7 @@ QVector Resources::m_pixmaps; void Resources::Init() { - QString dir = QString::fromStdString(File::GetSysDirectory() + "Resources/"); + QString dir = QString::fromStdString(File::GetSysDirectory() + RESOURCES_DIR + DIR_SEP); m_regions.resize(DiscIO::IVolume::NUMBER_OF_COUNTRIES); m_regions[DiscIO::IVolume::COUNTRY_JAPAN].load(GetImageFilename("Flag_Japan", dir)); @@ -40,6 +41,7 @@ void Resources::Init() m_platforms[0].load(GetImageFilename("Platform_Gamecube", dir)); m_platforms[1].load(GetImageFilename("Platform_Wii", dir)); m_platforms[2].load(GetImageFilename("Platform_Wad", dir)); + m_platforms[3].load(GetImageFilename("Platform_File", dir)); m_ratings.resize(6); m_ratings[0].load(GetImageFilename("rating0", dir)); @@ -52,6 +54,7 @@ void Resources::Init() m_pixmaps.resize(NUM_ICONS); m_pixmaps[DOLPHIN_LOGO].load(GetImageFilename("Dolphin", dir)); m_pixmaps[DOLPHIN_LOGO_LARGE].load(GetImageFilename("dolphin_logo", dir)); + m_pixmaps[BANNER_MISSING].load(GetImageFilename("nobanner", dir)); UpdatePixmaps(); } @@ -69,12 +72,9 @@ void Resources::UpdatePixmaps() m_pixmaps[TOOLBAR_CONFIGURE].load(GetImageFilename("config", dir)); m_pixmaps[TOOLBAR_GRAPHICS].load(GetImageFilename("graphics", dir)); m_pixmaps[TOOLBAR_CONTROLLERS].load(GetImageFilename("classic", dir)); - m_pixmaps[TOOLBAR_HELP].load(GetImageFilename("nobanner", dir)); // TODO + m_pixmaps[TOOLBAR_HELP].load(GetImageFilename("config", dir)); // TODO // TODO: toolbar[MEMCARD]; // TODO: toolbar[HOTKEYS]; - m_pixmaps[BANNER_MISSING].load(GetImageFilename("nobanner", dir)); - // TODO: Make this consistent with the other files - m_platforms[3].load(GetImageFilename("fileplatform", dir)); } QString Resources::GetImageFilename(const char* name, QString dir) diff --git a/Source/Core/DolphinQt2/Resources.cpp b/Source/Core/DolphinQt2/Resources.cpp index 05b1014252..70666d4b25 100644 --- a/Source/Core/DolphinQt2/Resources.cpp +++ b/Source/Core/DolphinQt2/Resources.cpp @@ -4,6 +4,7 @@ #include +#include "Common/CommonPaths.h" #include "Common/FileUtil.h" #include "Core/ConfigManager.h" #include "DolphinQt2/Resources.h" @@ -15,13 +16,13 @@ QList Resources::m_misc; void Resources::Init() { - QString sys_dir = QString::fromStdString(File::GetSysDirectory() + "Resources/"); + QString sys_dir = QString::fromStdString(File::GetSysDirectory() + RESOURCES_DIR + DIR_SEP); QStringList platforms{ QStringLiteral("Platform_Gamecube.png"), QStringLiteral("Platform_Wii.png"), QStringLiteral("Platform_Wad.png"), - QStringLiteral("Platform_Wii.png") + QStringLiteral("Platform_File.png") }; for (QString platform : platforms) m_platforms.append(QPixmap(platform.prepend(sys_dir))); @@ -56,10 +57,9 @@ void Resources::Init() for (QString rating : ratings) m_ratings.append(QPixmap(rating.prepend(sys_dir))); - QString theme_dir = QString::fromStdString(File::GetThemeDir(SConfig::GetInstance().theme_name)); - m_misc.append(QPixmap(QStringLiteral("nobanner.png").prepend(theme_dir))); - m_misc.append(QPixmap(QStringLiteral("dolphin_logo.png").prepend(theme_dir))); - m_misc.append(QPixmap(QStringLiteral("Dolphin.png").prepend(theme_dir))); + m_misc.append(QPixmap(QStringLiteral("nobanner.png").prepend(sys_dir))); + m_misc.append(QPixmap(QStringLiteral("dolphin_logo.png").prepend(sys_dir))); + m_misc.append(QPixmap(QStringLiteral("Dolphin.png").prepend(sys_dir))); } QPixmap Resources::GetPlatform(int platform) diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index 25ae8b4ce6..30864cac54 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -197,7 +197,7 @@ void CGameListCtrl::InitBitmaps() m_PlatformImageIndex[0] = m_imageListSmall->Add(wxBitmap(Platform_Gamecube_xpm)); m_PlatformImageIndex[1] = m_imageListSmall->Add(wxBitmap(Platform_Wii_xpm)); m_PlatformImageIndex[2] = m_imageListSmall->Add(wxBitmap(Platform_Wad_xpm)); - m_PlatformImageIndex[3] = m_imageListSmall->Add(wxBitmap(StrToWxStr(File::GetThemeDir(SConfig::GetInstance().theme_name) + "fileplatform.png"), wxBITMAP_TYPE_PNG)); + m_PlatformImageIndex[3] = m_imageListSmall->Add(wxBitmap(StrToWxStr(File::GetSysDirectory() + RESOURCES_DIR + DIR_SEP + "Platform_File.png"), wxBITMAP_TYPE_PNG)); m_EmuStateImageIndex.resize(6); m_EmuStateImageIndex[0] = m_imageListSmall->Add(wxBitmap(rating_0)); diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp index 58d7b71ad7..ca278e1c73 100644 --- a/Source/Core/DolphinWX/ISOFile.cpp +++ b/Source/Core/DolphinWX/ISOFile.cpp @@ -176,7 +176,7 @@ GameListItem::GameListItem(const std::string& _rFileName, const std::unordered_m } // Fallback in case no banner is available. - ReadPNGBanner(File::GetThemeDir(SConfig::GetInstance().theme_name) + "nobanner.png"); + ReadPNGBanner(File::GetSysDirectory() + RESOURCES_DIR + DIR_SEP + "nobanner.png"); } GameListItem::~GameListItem()