piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 13:49:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

real buildfix

Browse Source
This commit is contained in:
Jordan Woyak
2013-04-02 13:04:40 -05:00
parent c65473d9d3
commit d951c4c374
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Common/Src/FileUtil.cpp
View File

@ -19,7 +19,6 @@
#include "CommonPaths.h" #include "CommonPaths.h"
#include "FileUtil.h" #include "FileUtil.h"
#include "StringUtil.h" #include "StringUtil.h"
#include "../../Core/Src/ConfigManager.h"
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
@ -743,15 +742,14 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new
return paths[DirIDX]; return paths[DirIDX];
} }
std::string GetThemeDir() std::string GetThemeDir(const std::string& theme_name)
{ {
std::string theme = SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name + "/"; std::string dir = File::GetUserPath(D_THEMES_IDX) + theme_name + "/";
std::string dir = File::GetUserPath(D_THEMES_IDX) + theme;
#if !defined(_WIN32) #if !defined(_WIN32)
// If theme does not exist in user's dir load from shared directory // If theme does not exist in user's dir load from shared directory
if (!File::Exists(dir)) if (!File::Exists(dir))
dir = SHARED_USER_DIR THEMES_DIR "/" + theme; dir = SHARED_USER_DIR THEMES_DIR "/" + theme_name + "/";
#endif #endif
return dir; return dir;

2
Source/Core/Common/Src/FileUtil.h
View File

@ -135,7 +135,7 @@ bool SetCurrentDir(const std::string &directory);
const std::string& GetUserPath(const unsigned int DirIDX, const std::string &newPath=""); const std::string& GetUserPath(const unsigned int DirIDX, const std::string &newPath="");
// probably doesn't belong here // probably doesn't belong here
std::string GetThemeDir(); std::string GetThemeDir(const std::string& theme_name);
// Returns the path to where the sys file are // Returns the path to where the sys file are
std::string GetSysDirectory(); std::string GetSysDirectory();

2
Source/Core/DolphinWX/Src/FrameTools.cpp
View File

@ -509,7 +509,7 @@ void CFrame::RecreateToolbar()
void CFrame::InitBitmaps() void CFrame::InitBitmaps()
{ {
auto const dir = StrToWxStr(File::GetThemeDir()); auto const dir = StrToWxStr(File::GetThemeDir(SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name));
m_Bitmaps[Toolbar_FileOpen].LoadFile(dir + "open.png", wxBITMAP_TYPE_PNG); m_Bitmaps[Toolbar_FileOpen].LoadFile(dir + "open.png", wxBITMAP_TYPE_PNG);
m_Bitmaps[Toolbar_Refresh].LoadFile(dir + "refresh.png", wxBITMAP_TYPE_PNG); m_Bitmaps[Toolbar_Refresh].LoadFile(dir + "refresh.png", wxBITMAP_TYPE_PNG);

2
Source/Core/DolphinWX/Src/ISOFile.cpp
View File

@ -138,7 +138,7 @@ GameListItem::GameListItem(const std::string& _rFileName)
else else
{ {
// default banner // default banner
m_Image = wxImage(StrToWxStr(File::GetThemeDir()) + "nobanner.png", wxBITMAP_TYPE_PNG); m_Image = wxImage(StrToWxStr(File::GetThemeDir(SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name)) + "nobanner.png", wxBITMAP_TYPE_PNG);
} }
} }