Runtime theme changing - jira#USDX-156

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

2 files changed, 86 insertions, 4 deletions

diff --git a/Game/Code/Classes/UGraphic.pas b/Game/Code/Classes/UGraphic.pas
index bfad2d73..e13fdf43 100644
--- a/Game/Code/Classes/UGraphic.pas
+++ b/Game/Code/Classes/UGraphic.pas
@@ -230,6 +230,7 @@ procedure LoadTextures;
 procedure InitializeScreen;
 procedure LoadLoadingScreen;
 procedure LoadScreens;
+procedure UnLoadScreens;
 
 function LoadingThreadFunction: integer;
 
@@ -692,7 +693,7 @@ begin
   ScreenCredits    :=       TScreenCredits.Create;
   Log.BenchmarkEnd(3); Log.LogBenchmark('====> Screen Credits', 3); Log.BenchmarkStart(3);
 
-  end;
+end;
 
 function LoadingThreadFunction: integer;
 begin
@@ -700,4 +701,40 @@ begin
   Result:= 1;
 end;
 
+procedure UnLoadScreens;
+begin

+  freeandnil( ScreenMain );

+  freeandnil( ScreenName );

+  freeandnil( ScreenLevel);

+  freeandnil( ScreenSong );

+  freeandnil( ScreenSongMenu );

+  freeandnil( ScreenSing );

+  freeandnil( ScreenScore);

+  freeandnil( ScreenTop5 );

+  freeandnil( ScreenOptions );

+  freeandnil( ScreenOptionsGame );

+  freeandnil( ScreenOptionsGraphics );

+  freeandnil( ScreenOptionsSound );

+  freeandnil( ScreenOptionsLyrics );

+//  freeandnil( ScreenOptionsThemes );

+  freeandnil( ScreenOptionsRecord );

+  freeandnil( ScreenOptionsAdvanced );

+  freeandnil( ScreenEditSub );

+  freeandnil( ScreenEdit );

+  freeandnil( ScreenEditConvert );

+  freeandnil( ScreenOpen );

+  freeandnil( ScreenSingModi );

+  freeandnil( ScreenSongMenu );

+  freeandnil( ScreenSongJumpto);

+  freeandnil( ScreenPopupCheck );

+  freeandnil( ScreenPopupError );

+  freeandnil( ScreenPartyNewRound );

+  freeandnil( ScreenPartyScore    );

+  freeandnil( ScreenPartyWin     );

+  freeandnil( ScreenPartyOptions  );

+  freeandnil( ScreenPartyPlayer   );

+  freeandnil( ScreenStatMain     );

+  freeandnil( ScreenStatDetail    );

+end;
+
 end.
diff --git a/Game/Code/Screens/UScreenOptionsThemes.pas b/Game/Code/Screens/UScreenOptionsThemes.pas
index 750e8859..5b7e4d43 100644
--- a/Game/Code/Screens/UScreenOptionsThemes.pas
+++ b/Game/Code/Screens/UScreenOptionsThemes.pas
@@ -37,13 +37,28 @@ begin
       SDLK_BACKSPACE :

         begin

           Ini.Save;

+

+          // Reload all screens, after Theme changed

+          // Todo : JB - Check if theme was actually changed

+          UGraphic.UnLoadScreens();

+          UGraphic.LoadScreens();

+

           AudioPlayback.PlayBack;

           FadeTo(@ScreenOptions);

         end;

       SDLK_RETURN:

         begin

-          if SelInteraction = 3 then begin

+          if SelInteraction = 3 then

+          begin

             Ini.Save;

+

+            // Reload all screens, after Theme changed

+            // Todo : JB - Check if theme was actually changed

+            UGraphic.UnLoadScreens();

+            UGraphic.LoadScreens();

+

+            UGraphic.LoadScreens();

+

             AudioPlayback.PlayBack;

             FadeTo(@ScreenOptions);

           end;

@@ -54,14 +69,16 @@ begin
         InteractPrev;

       SDLK_RIGHT:

         begin

-          if (SelInteraction >= 0) and (SelInteraction <= 2) then begin

+          if (SelInteraction >= 0) and (SelInteraction <= 2) then 

+          begin

             AudioPlayback.PlayOption;

             InteractInc;

           end;

         end;

       SDLK_LEFT:

         begin

-          if (SelInteraction >= 0) and (SelInteraction <= 2) then begin

+          if (SelInteraction >= 0) and (SelInteraction <= 2) then 

+          begin

             AudioPlayback.PlayOption;

             InteractDec;

           end;

@@ -78,6 +95,20 @@ begin
   begin

     Skin.OnThemeChange;

     UpdateSelectSlideOptions (Theme.OptionsThemes.SelectSkin, SkinSelect, ISkin, Ini.SkinNo);

+

+    Theme.LoadTheme('Themes\' + ITheme[Ini.Theme] + '.ini', Ini.Color);

+

+    ScreenOptionsThemes := TScreenOptionsThemes.create();

+    ScreenOptionsThemes.onshow;

+    Display.ActualScreen := @ScreenOptionsThemes;

+    ScreenOptionsThemes.Draw;

+

+

+    Display.Draw;

+    SwapBuffers;

+

+    freeandnil( self );

+    

   end;

 end;

 

@@ -89,6 +120,20 @@ begin
   begin

     Skin.OnThemeChange;

     UpdateSelectSlideOptions (Theme.OptionsThemes.SelectSkin, SkinSelect, ISkin, Ini.SkinNo);

+

+    Theme.LoadTheme('Themes\' + ITheme[Ini.Theme] + '.ini', Ini.Color);

+

+    ScreenOptionsThemes := TScreenOptionsThemes.create();

+    ScreenOptionsThemes.onshow;

+    Display.ActualScreen := @ScreenOptionsThemes;

+    ScreenOptionsThemes.Draw;

+

+

+    Display.Draw;

+    SwapBuffers;

+

+    freeandnil( self );

+    

   end;

 end;