Renaming for namesheme

VocaluxeLib/PartyModes/CPartyMode.cs

@@ -6,7 +6,7 @@ namespace VocaluxeLib.PartyModes
 {
     public abstract class CPartyMode : IPartyMode
     {
-        protected ScreenSongOptions _ScreenSongOptions;
+        protected SScreenSongOptions _ScreenSongOptions;
         protected Dictionary<string, CMenuParty> _Screens;
         protected string _Folder;
 
@@ -14,9 +14,9 @@ namespace VocaluxeLib.PartyModes
         {
             _Screens = new Dictionary<string, CMenuParty>();
             _Folder = String.Empty;
-            _ScreenSongOptions = new ScreenSongOptions();
-            _ScreenSongOptions.Selection = new SelectionOptions();
-            _ScreenSongOptions.Sorting = new SortingOptions();
+            _ScreenSongOptions = new SScreenSongOptions();
+            _ScreenSongOptions.Selection = new SSelectionOptions();
+            _ScreenSongOptions.Sorting = new SSortingOptions();
         }
 
         #region Implementation
@@ -27,18 +27,18 @@ namespace VocaluxeLib.PartyModes
 
         public void Initialize() {}
 
-        public void AddScreen(CMenuParty Screen, string ScreenName)
+        public void AddScreen(CMenuParty screen, string screenName)
         {
-            _Screens.Add(ScreenName, Screen);
+            _Screens.Add(screenName, screen);
         }
 
-        public virtual void DataFromScreen(string ScreenName, Object Data) {}
+        public virtual void DataFromScreen(string screenName, Object data) {}
 
         public virtual void UpdateGame() {}
 
-        public virtual CMenuParty GetNextPartyScreen(out EScreens AlternativeScreen)
+        public virtual CMenuParty GetNextPartyScreen(out EScreens alternativeScreen)
         {
-            AlternativeScreen = EScreens.ScreenMain;
+            alternativeScreen = EScreens.ScreenMain;
             return null;
         }
 
@@ -52,14 +52,14 @@ namespace VocaluxeLib.PartyModes
             return EScreens.ScreenSong;
         }
 
-        public virtual ScreenSongOptions GetScreenSongOptions()
+        public virtual SScreenSongOptions GetScreenSongOptions()
         {
-            return new ScreenSongOptions();
+            return new SScreenSongOptions();
         }
 
-        public virtual void OnSongChange(int SongIndex, ref ScreenSongOptions ScreenSongOptions) {}
+        public virtual void OnSongChange(int songIndex, ref SScreenSongOptions screenSongOptions) {}
 
-        public virtual void OnCategoryChange(int CategoryIndex, ref ScreenSongOptions ScreenSongOptions) {}
+        public virtual void OnCategoryChange(int categoryIndex, ref SScreenSongOptions screenSongOptions) {}
 
         public virtual int GetMaxPlayer()
         {
@@ -86,21 +86,21 @@ namespace VocaluxeLib.PartyModes
             return 1;
         }
 
-        public virtual void SetSearchString(string SearchString, bool Visible) {}
+        public virtual void SetSearchString(string searchString, bool visible) {}
 
-        public virtual void JokerUsed(int TeamNr)
+        public virtual void JokerUsed(int teamNr)
         {
             if (_ScreenSongOptions.Selection.NumJokers == null)
                 return;
 
-            if (_ScreenSongOptions.Selection.NumJokers.Length < TeamNr)
+            if (_ScreenSongOptions.Selection.NumJokers.Length < teamNr)
                 return;
 
-            if (_ScreenSongOptions.Selection.NumJokers[TeamNr] > 0)
-                _ScreenSongOptions.Selection.NumJokers[TeamNr]--;
+            if (_ScreenSongOptions.Selection.NumJokers[teamNr] > 0)
+                _ScreenSongOptions.Selection.NumJokers[teamNr]--;
         }
 
-        public virtual void SongSelected(int SongID) {}
+        public virtual void SongSelected(int songID) {}
 
         public virtual void FinishedSinging()
         {

VocaluxeLib/PartyModes/CPartyModeNone.cs

@@ -20,7 +20,7 @@ namespace VocaluxeLib.PartyModes
             _ScreenSongOptions.Sorting.DuetOptions = EDuetOptions.All;
         }
 
-        public override ScreenSongOptions GetScreenSongOptions()
+        public override SScreenSongOptions GetScreenSongOptions()
         {
             _ScreenSongOptions.Sorting.SongSorting = CBase.Config.GetSongSorting();
             _ScreenSongOptions.Sorting.Tabs = CBase.Config.GetTabs();
@@ -33,10 +33,10 @@ namespace VocaluxeLib.PartyModes
             return _ScreenSongOptions;
         }
 
-        public override void SetSearchString(string SearchString, bool Visible)
+        public override void SetSearchString(string searchString, bool visible)
         {
-            _ScreenSongOptions.Sorting.SearchString = SearchString;
-            _ScreenSongOptions.Sorting.SearchActive = Visible;
+            _ScreenSongOptions.Sorting.SearchString = searchString;
+            _ScreenSongOptions.Sorting.SearchActive = visible;
         }
     }
 }

VocaluxeLib/PartyModes/CScreenPartyDummy.cs

@@ -10,23 +10,23 @@ namespace VocaluxeLib.PartyModes
         {
             get { return 1; }
         }
-        private CText Warning;
+        private CText _Warning;
 
-        public override void LoadTheme(string XmlPath)
+        public override void LoadTheme(string xmlPath)
         {
-            Warning = GetNewText();
-            Warning.Height = 100f;
-            Warning.X = 150;
-            Warning.Y = 300;
-            Warning.Font = "Normal";
-            Warning.Style = EStyle.Normal;
-            Warning.Color = new SColorF(1f, 0f, 0f, 1f);
-            Warning.SelColor = new SColorF(1f, 0f, 0f, 1f);
-            Warning.Text = "SOMETHING WENT WRONG!";
-            AddText(Warning);
+            _Warning = GetNewText();
+            _Warning.Height = 100f;
+            _Warning.X = 150;
+            _Warning.Y = 300;
+            _Warning.Font = "Normal";
+            _Warning.Style = EStyle.Normal;
+            _Warning.Color = new SColorF(1f, 0f, 0f, 1f);
+            _Warning.SelColor = new SColorF(1f, 0f, 0f, 1f);
+            _Warning.Text = "SOMETHING WENT WRONG!";
+            AddText(_Warning);
         }
 
-        public override void ReloadTheme(string XmlPath) {}
+        public override void ReloadTheme(string xmlPath) {}
 
         public override void ReloadTextures() {}
 
@@ -34,7 +34,7 @@ namespace VocaluxeLib.PartyModes
 
         public override void UnloadTextures() {}
 
-        public override bool HandleInput(KeyEvent keyEvent)
+        public override bool HandleInput(SKeyEvent keyEvent)
         {
             base.HandleInput(keyEvent);
 
@@ -45,21 +45,21 @@ namespace VocaluxeLib.PartyModes
                 {
                     case Keys.Back:
                     case Keys.Escape:
-                        FadeTo(EScreens.ScreenParty);
+                        _FadeTo(EScreens.ScreenParty);
                         break;
                 }
             }
             return true;
         }
 
-        public override bool HandleMouse(MouseEvent mouseEvent)
+        public override bool HandleMouse(SMouseEvent mouseEvent)
         {
             base.HandleMouse(mouseEvent);
 
             if (mouseEvent.LB && IsMouseOver(mouseEvent)) {}
 
             if (mouseEvent.RB)
-                FadeTo(EScreens.ScreenParty);
+                _FadeTo(EScreens.ScreenParty);
 
             return true;
         }

VocaluxeLib/PartyModes/IPartyMode.cs

@@ -5,13 +5,13 @@ namespace VocaluxeLib.PartyModes
 {
 
     #region Structs
-    public struct ScreenSongOptions
+    public struct SScreenSongOptions
     {
-        public SortingOptions Sorting;
-        public SelectionOptions Selection;
+        public SSortingOptions Sorting;
+        public SSelectionOptions Selection;
     }
 
-    public struct SortingOptions
+    public struct SSortingOptions
     {
         public ESongSorting SongSorting;
         public EOffOn Tabs;
@@ -24,7 +24,7 @@ namespace VocaluxeLib.PartyModes
     /// <summary>
     ///     Configuration of song selection options
     /// </summary>
-    public struct SelectionOptions
+    public struct SSelectionOptions
     {
         /// <summary>
         ///     If != -1, the SongMenu should set the song selection on the provided song index (visible index) if possible
@@ -67,18 +67,18 @@ namespace VocaluxeLib.PartyModes
     {
         bool Init();
         void Initialize();
-        void AddScreen(CMenuParty Screen, string ScreenName);
-        void DataFromScreen(string ScreenName, Object Data);
+        void AddScreen(CMenuParty screen, string screenName);
+        void DataFromScreen(string screenName, Object data);
 
         void UpdateGame();
 
-        CMenuParty GetNextPartyScreen(out EScreens AlternativeScreen);
+        CMenuParty GetNextPartyScreen(out EScreens alternativeScreen);
         EScreens GetStartScreen();
         EScreens GetMainScreen();
-        ScreenSongOptions GetScreenSongOptions();
+        SScreenSongOptions GetScreenSongOptions();
 
-        void OnSongChange(int SongIndex, ref ScreenSongOptions ScreenSongOptions);
-        void OnCategoryChange(int CategoryIndex, ref ScreenSongOptions ScreenSongOptions);
+        void OnSongChange(int songIndex, ref SScreenSongOptions screenSongOptions);
+        void OnCategoryChange(int categoryIndex, ref SScreenSongOptions screenSongOptions);
 
         int GetMaxPlayer();
         int GetMinPlayer();
@@ -86,10 +86,10 @@ namespace VocaluxeLib.PartyModes
         int GetMinTeams();
         int GetMaxNumRounds();
 
-        void SetSearchString(string SearchString, bool Visible);
+        void SetSearchString(string searchString, bool visible);
 
-        void JokerUsed(int TeamNr);
-        void SongSelected(int SongID);
+        void JokerUsed(int teamNr);
+        void SongSelected(int songID);
         void FinishedSinging();
         void LeavingScore();
         void LeavingHighscore();