- port theme detection code from UIni to UThemes

- load new value DefaultSkin from themefiles
- load value Color (skins default color) from skinfiles
- use default skin and color on first start
- use default skin and color on theme/skin change

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2241 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 9 insertions, 3 deletions

diff --git a/src/base/UMain.pas b/src/base/UMain.pas
index 0de8ddeb..550fe9cd 100644
--- a/src/base/UMain.pas
+++ b/src/base/UMain.pas
@@ -171,6 +171,12 @@ begin
     Log.BenchmarkEnd(1);
     Log.LogBenchmark('Loading Skin List', 1);
 
+    Log.BenchmarkStart(1);
+    Log.LogStatus('Loading Theme List', 'Initialization');
+    Theme := TTheme.Create;
+    Log.BenchmarkEnd(1);
+    Log.LogBenchmark('Loading Theme List', 1);
+
     // Ini + Paths
     Log.BenchmarkStart(1);
     Log.LogStatus('Load Ini', 'Initialization');
@@ -196,10 +202,10 @@ begin
 
     // Theme
     Log.BenchmarkStart(1);
-    Log.LogStatus('Load Themes', 'Initialization');
-    Theme := TTheme.Create(ThemePath.Append(ITheme[Ini.Theme] + '.ini'), Ini.Color);
+    Log.LogStatus('Load Theme', 'Initialization');
+    Theme.LoadTheme(Ini.Theme, Ini.Color);
     Log.BenchmarkEnd(1);
-    Log.LogBenchmark('Loading Themes', 1);
+    Log.LogBenchmark('Loading Theme', 1);
 
     // Covers Cache
     Log.BenchmarkStart(1);