actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ThemeManager] Add global Scripts dir. [originally by shakesoda from broken]

Browse Source
This commit is contained in:
AJ Kelly
2011-09-26 17:52:08 -05:00
parent 9bc8f488f7
commit e590230968
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ThemeManager.cpp
+8 -5
View File
@@ -445,7 +445,7 @@ void ThemeManager::ClearSubscribers()
}
}
void ThemeManager::RunLuaScripts( const RString &sMask )
void ThemeManager::RunLuaScripts( const RString &sMask, bool bUseThemeDir )
{
/* Run all script files with the given mask in Lua for all themes. Start
* from the deepest fallback theme and work outwards. */
@@ -463,13 +463,13 @@ void ThemeManager::RunLuaScripts( const RString &sMask )
* scripts call GetThemeName(), it'll return the theme the script is in. */
m_sCurThemeName = iter->sThemeName;
const RString &sThemeDir = GetThemeDirFromName( m_sCurThemeName );
const RString &sThemeDir = bUseThemeDir ? GetThemeDirFromName( m_sCurThemeName ) : "/";
vector<RString> asElementPaths;
// get files from directories
vector<RString> asElementChildPaths;
vector<RString> arrayScriptDirs;
GetDirListing( sThemeDir + "Scripts/*", arrayScriptDirs, true );
GetDirListing( sScriptDir + "Scripts/*", arrayScriptDirs, true );
SortRStringArray( arrayScriptDirs );
StripCvsAndSvn( arrayScriptDirs );
StripMacResourceForks( arrayScriptDirs );
@@ -477,7 +477,7 @@ void ThemeManager::RunLuaScripts( const RString &sMask )
{
// Find all Lua files in this directory, add them to asElementPaths
RString sScriptDirName = *s;
GetDirListing( sThemeDir + "Scripts/" + sScriptDirName + "/" + sMask, asElementChildPaths, false, true );
GetDirListing( sScriptDir + "Scripts/" + sScriptDirName + "/" + sMask, asElementChildPaths, false, true );
for( unsigned i = 0; i < asElementChildPaths.size(); ++i )
{
// push these Lua files into the main element paths
@@ -487,7 +487,7 @@ void ThemeManager::RunLuaScripts( const RString &sMask )
}
// get regular Lua files
GetDirListing( sThemeDir + "Scripts/" + sMask, asElementPaths, false, true );
GetDirListing( sScriptDir + "Scripts/" + sMask, asElementPaths, false, true );
// load Lua files
for( unsigned i = 0; i < asElementPaths.size(); ++i )
@@ -513,7 +513,10 @@ void ThemeManager::UpdateLuaGlobals()
// explicitly refresh cached metrics that we use.
ScreenDimensions::ReloadScreenDimensions();
// run global scripts
RunLuaScripts( "*.lua" );
// run theme scripts
RunLuaScripts( "*.lua", true );
#endif
}