Merge branch 'external-theme'

Data/User/Themes/Boomy/README.txt

@@ -0,0 +1 @@
+Boomy: Milosz Wlazlo [miloszwl@miloszwl.com]

Source/Core/Common/Src/CommonPaths.h

@@ -89,6 +89,7 @@
 #define MAIL_LOGS_DIR		LOGS_DIR DIR_SEP "Mail"
 #define SHADERS_DIR 		"Shaders"
 #define WII_SYSCONF_DIR		"shared2" DIR_SEP "sys"
+#define THEMES_DIR		"Themes"
 
 // Filenames
 // Files in the directory returned by GetUserPath(D_CONFIG_IDX)

Source/Core/Common/Src/FileSearch.cpp

@@ -25,6 +25,7 @@
 #endif
 
 #include <string>
+#include <algorithm>
 
 #include "FileSearch.h"
 
@@ -72,36 +73,36 @@ void CFileSearch::FindFiles(const std::string& _searchString, const std::string&
 
 
 #else
-	size_t dot_pos = _searchString.rfind(".");
+	// TODO: super lame/broken
 
-	if (dot_pos == std::string::npos)
-		return;
+	auto end_match(_searchString);
+
+	// assuming we have a "*.blah"-like pattern
+	if (!end_match.empty() && end_match[0] == '*')
+		end_match.erase(0, 1);
+
+	// ugly
+	if (end_match == ".*")
+		end_match.clear();
 
-	std::string ext = _searchString.substr(dot_pos);
 	DIR* dir = opendir(_strPath.c_str());
 
 	if (!dir)
 		return;
 
-	dirent* dp;
-
-	while (true)
+	while (auto const dp = readdir(dir))
 	{
-		dp = readdir(dir);
+		std::string found(dp->d_name);
 
-		if (!dp)
-			break;
-
-		std::string s(dp->d_name);
-
-		if ( (!ext.compare(".*") && s.compare(".") && s.compare("..")) ||
-				((s.size() > ext.size()) && (!strcasecmp(s.substr(s.size() - ext.size()).c_str(), ext.c_str())) ))
+		if ((found != ".") && (found != "..")
+			&& (found.size() >= end_match.size())
+			&& std::equal(end_match.rbegin(), end_match.rend(), found.rbegin()))
 		{
 			std::string full_name;
 			if (_strPath.c_str()[_strPath.size()-1] == DIR_SEP_CHR)
-				full_name = _strPath + s;
+				full_name = _strPath + found;
 			else
-				full_name = _strPath + DIR_SEP + s;
+				full_name = _strPath + DIR_SEP + found;
 
 			m_FileNames.push_back(full_name);
 		}

Source/Core/Common/Src/FileUtil.cpp

@@ -678,6 +678,7 @@ std::string &GetUserPath(const unsigned int DirIDX, const std::string &newPath)
 		paths[D_DUMPDSP_IDX]		= paths[D_USER_IDX] + DUMP_DSP_DIR DIR_SEP;
 		paths[D_LOGS_IDX]			= paths[D_USER_IDX] + LOGS_DIR DIR_SEP;
 		paths[D_MAILLOGS_IDX]		= paths[D_USER_IDX] + MAIL_LOGS_DIR DIR_SEP;
+		paths[D_THEMES_IDX]			= paths[D_USER_IDX] + THEMES_DIR DIR_SEP;
 		paths[D_WIISYSCONF_IDX]		= paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR DIR_SEP;
 		paths[F_DOLPHINCONFIG_IDX]	= paths[D_CONFIG_IDX] + DOLPHIN_CONFIG;
 		paths[F_DSPCONFIG_IDX]		= paths[D_CONFIG_IDX] + DSP_CONFIG;

Source/Core/Common/Src/FileUtil.h

@@ -50,6 +50,7 @@ enum {
 	D_LOGS_IDX,
 	D_MAILLOGS_IDX,
 	D_WIISYSCONF_IDX,
+	D_THEMES_IDX,
 	F_DOLPHINCONFIG_IDX,
 	F_DSPCONFIG_IDX,
 	F_DEBUGGERCONFIG_IDX,

Source/Core/Core/Src/ConfigManager.cpp

@@ -164,7 +164,6 @@ void SConfig::SaveSettings()
 	ini.Set("Interface", "OnScreenDisplayMessages",	m_LocalCoreStartupParameter.bOnScreenDisplayMessages);
 	ini.Set("Interface", "HideCursor",			m_LocalCoreStartupParameter.bHideCursor);
 	ini.Set("Interface", "AutoHideCursor",		m_LocalCoreStartupParameter.bAutoHideCursor);
-	ini.Set("Interface", "Theme",				m_LocalCoreStartupParameter.iTheme);
 	ini.Set("Interface", "MainWindowPosX",		(m_LocalCoreStartupParameter.iPosX == -32000) ? 0 : m_LocalCoreStartupParameter.iPosX); // TODO - HAX
 	ini.Set("Interface", "MainWindowPosY",		(m_LocalCoreStartupParameter.iPosY == -32000) ? 0 : m_LocalCoreStartupParameter.iPosY); // TODO - HAX
 	ini.Set("Interface", "MainWindowWidth",		m_LocalCoreStartupParameter.iWidth);
@@ -175,6 +174,7 @@ void SConfig::SaveSettings()
 	ini.Set("Interface", "ShowLogWindow",		m_InterfaceLogWindow);
 	ini.Set("Interface", "ShowLogConfigWindow",	m_InterfaceLogConfigWindow);
 	ini.Set("Interface", "ShowConsole",			m_InterfaceConsole);
+	ini.Set("Interface", "ThemeName",			m_LocalCoreStartupParameter.theme_name);
 
 	// Hotkeys
 	for (int i = 0; i < NUM_HOTKEYS; i++)
@@ -303,7 +303,6 @@ void SConfig::LoadSettings()
 		ini.Get("Interface", "OnScreenDisplayMessages",	&m_LocalCoreStartupParameter.bOnScreenDisplayMessages,	true);
 		ini.Get("Interface", "HideCursor",			&m_LocalCoreStartupParameter.bHideCursor,		false);
 		ini.Get("Interface", "AutoHideCursor",		&m_LocalCoreStartupParameter.bAutoHideCursor,	false);
-		ini.Get("Interface", "Theme",				&m_LocalCoreStartupParameter.iTheme,			0);
 		ini.Get("Interface", "MainWindowPosX",		&m_LocalCoreStartupParameter.iPosX,				100);
 		ini.Get("Interface", "MainWindowPosY",		&m_LocalCoreStartupParameter.iPosY,				100);
 		ini.Get("Interface", "MainWindowWidth",		&m_LocalCoreStartupParameter.iWidth,			800);
@@ -314,6 +313,7 @@ void SConfig::LoadSettings()
 		ini.Get("Interface", "ShowLogWindow",		&m_InterfaceLogWindow,							false);
 		ini.Get("Interface", "ShowLogConfigWindow",	&m_InterfaceLogConfigWindow,					false);
 		ini.Get("Interface", "ShowConsole",			&m_InterfaceConsole,							false);
+		ini.Get("Interface", "ThemeName",			&m_LocalCoreStartupParameter.theme_name,		"Boomy");
 
 		// Hotkeys
 		for (int i = 0; i < NUM_HOTKEYS; i++)