Simpler Screens

PartyModes/PartyModeChallenge/PartyScreenChallengeConfig.cs

@@ -10,7 +10,7 @@ namespace Vocaluxe.PartyModes
     public class PartyScreenChallengeConfig : CMenuParty
     {
         // Version number for theme files. Increment it, if you've changed something on the theme files!
-        const int ScreenVersion = 1;
+        protected override int _ScreenVersion { get { return 1; } }
 
         const string SelectSlideNumPlayers = "SelectSlideNumPlayers";
         const string SelectSlideNumMics = "SelectSlideNumMics";
@@ -28,14 +28,12 @@ namespace Vocaluxe.PartyModes
         {
         }
 
-        protected override void Init()
+        public override void Init()
         {
             base.Init();
 
-            _ThemeName = "PartyScreenChallengeConfig";
             _ThemeSelectSlides = new string[] { SelectSlideNumPlayers, SelectSlideNumMics, SelectSlideNumRounds };
             _ThemeButtons = new string[] { ButtonNext, ButtonBack };
-            _ScreenVersion = ScreenVersion;
 
             Data = new DataFromScreen();
             FromScreenConfig config = new FromScreenConfig();
@@ -63,7 +61,7 @@ namespace Vocaluxe.PartyModes
             }
             catch (Exception e)
             {
-                CBase.Log.LogError("Error in party mode screen challenge config. Can't cast received data from game mode " + _ThemeName + ". " + e.Message);;
+                CBase.Log.LogError("Error in party mode screen challenge config. Can't cast received data from game mode " + ThemeName + ". " + e.Message);;
             }
 
         }
@@ -153,11 +151,6 @@ namespace Vocaluxe.PartyModes
             return true;
         }
 
-        public override void OnClose()
-        {
-            base.OnClose();
-        }
-
         private void RebuildSlides()
         {
             // build num player slide (min player ... max player);
@@ -251,7 +244,7 @@ namespace Vocaluxe.PartyModes
 
         private void Next()
         {
-            _PartyMode.DataFromScreen(_ThemeName, Data);
+            _PartyMode.DataFromScreen(ThemeName, Data);
         }
     }
 }

PartyModes/PartyModeChallenge/PartyScreenChallengeMain.cs

@@ -28,7 +28,7 @@ namespace Vocaluxe.PartyModes
     public class PartyScreenChallengeMain : CMenuParty
     {
         // Version number for theme files. Increment it, if you've changed something on the theme files!
-        const int ScreenVersion = 1;
+        protected override int _ScreenVersion { get { return 1; } }
 
         const string TextPosition = "TextPosition";
         const string TextPlayerName = "TextPlayerName";
@@ -81,15 +81,13 @@ namespace Vocaluxe.PartyModes
             Data.ScreenMain = new FromScreenMain();
         }
 
-        protected override void Init()
+        public override void Init()
         {
             base.Init();
 
-            _ThemeName = "PartyScreenChallengeMain";
             _ThemeTexts = new string[] { TextPosition, TextPlayerName, TextNumPlayed, TextWon, TextSingPoints, TextGamePoints, TextNextPlayer, TextPopupReallyExit, TextRoundNumber, TextRoundPlayer, TextRoundScore, TextFinishMessage, TextFinishPlayerWin, TextNextPlayerMessage };
             _ThemeButtons = new string[] { ButtonNextRound, ButtonBack, ButtonExit, ButtonPopupYes, ButtonPopupNo, ButtonPlayerScrollDown, ButtonPlayerScrollUp, ButtonRoundsScrollDown, ButtonRoundsScrollUp };
             _ThemeStatics = new string[] { StaticPopupBG, StaticNextPlayer };
-            _ScreenVersion = ScreenVersion;
         }
 
         public override void LoadTheme(string XmlPath)
@@ -122,7 +120,7 @@ namespace Vocaluxe.PartyModes
             }
             catch (Exception e)
             {
-                CBase.Log.LogError("Error in party mode screen challenge main. Can't cast received data from game mode " + _ThemeName + ". " + e.Message); ;
+                CBase.Log.LogError("Error in party mode screen challenge main. Can't cast received data from game mode " + ThemeName + ". " + e.Message); ;
             }
 
         }
@@ -292,16 +290,11 @@ namespace Vocaluxe.PartyModes
             return true;
         }
 
-        public override void OnClose()
-        {
-            base.OnClose();
-        }
-
         private void NextRound()
         {
             Data.ScreenMain.FadeToNameSelection = false;
             Data.ScreenMain.FadeToSongSelection = true;
-            _PartyMode.DataFromScreen(_ThemeName, Data);
+            _PartyMode.DataFromScreen(ThemeName, Data);
         }
 
         private void EndParty()
@@ -326,7 +319,7 @@ namespace Vocaluxe.PartyModes
         {
             Data.ScreenMain.FadeToNameSelection = true;
             Data.ScreenMain.FadeToSongSelection = false;
-            _PartyMode.DataFromScreen(_ThemeName, Data);
+            _PartyMode.DataFromScreen(ThemeName, Data);
         }
 
         private void UpdateNextPlayerPositions()

PartyModes/PartyModeChallenge/PartyScreenChallengeNames.cs

@@ -10,7 +10,7 @@ namespace Vocaluxe.PartyModes
     public class PartyScreenChallengeNames : CMenuParty
     {
         // Version number for theme files. Increment it, if you've changed something on the theme files!
-        const int ScreenVersion = 1;
+        protected override int _ScreenVersion { get { return 1; } }
 
         const string ButtonNext = "ButtonNext";
         const string ButtonBack = "ButtonBack";
@@ -57,7 +57,7 @@ namespace Vocaluxe.PartyModes
         {
         }
 
-        protected override void Init()
+        public override void Init()
         {
             base.Init();
 
@@ -68,10 +68,8 @@ namespace Vocaluxe.PartyModes
 
             Data.ScreenNames.ProfileIDs = new List<int>();
 
-            _ThemeName = "PartyScreenChallengeNames";
             List<string> buttons = new List<string>();
             _ThemeButtons = new string[] { ButtonBack, ButtonNext, ButtonPlayerDestination, ButtonPlayerChoose };
-            _ScreenVersion = ScreenVersion;
 
             Data = new DataFromScreen();
             FromScreenNames names = new FromScreenNames();
@@ -108,7 +106,7 @@ namespace Vocaluxe.PartyModes
             }
             catch (Exception e)
             {
-                CBase.Log.LogError("Error in party mode screen challenge names. Can't cast received data from game mode " + _ThemeName + ". " + e.Message); ;
+                CBase.Log.LogError("Error in party mode screen challenge names. Can't cast received data from game mode " + ThemeName + ". " + e.Message); ;
             }
 
         }
@@ -286,11 +284,6 @@ namespace Vocaluxe.PartyModes
             return true;
         }
 
-        public override void OnClose()
-        {
-            base.OnClose();
-        }
-
         private void AddButtonPlayerDestination()
         {
             Buttons[ButtonPlayerDestination].Visible = false;
@@ -521,14 +514,14 @@ namespace Vocaluxe.PartyModes
         {
             Data.ScreenNames.FadeToConfig = true;
             Data.ScreenNames.FadeToMain = false;
-            _PartyMode.DataFromScreen(_ThemeName, Data);
+            _PartyMode.DataFromScreen(ThemeName, Data);
         }
 
         private void Next()
         {
             Data.ScreenNames.FadeToConfig = false;
             Data.ScreenNames.FadeToMain = true;
-            _PartyMode.DataFromScreen(_ThemeName, Data);
+            _PartyMode.DataFromScreen(ThemeName, Data);
         }
     }
 }