From 8f91d602707ea15d440b5e6960433fe59df5a176 Mon Sep 17 00:00:00 2001
From: Florian Kuepper <florian.kuepper@googlemail.com>
Date: Sat, 31 Mar 2012 15:46:13 +0200
Subject: [PATCH] Some clean-up.

---
 Vocaluxe/Menu/CNameSelection.cs  |  2 +-
 Vocaluxe/Screens/CScreenNames.cs | 20 +++++++-------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/Vocaluxe/Menu/CNameSelection.cs b/Vocaluxe/Menu/CNameSelection.cs
index aa81b3cf..b02c2f61 100644
--- a/Vocaluxe/Menu/CNameSelection.cs
+++ b/Vocaluxe/Menu/CNameSelection.cs
@@ -92,7 +92,7 @@ namespace Vocaluxe.Menu
                 {
                     SRectF rect = new SRectF(Rect.X + j * (_TileW + _SpaceW), Rect.Y + i * (_TileH + _SpaceH), _TileW, _TileH, Rect.Z);
                     CStatic tileStatic = new CStatic(_TextureEmptyTile, ColorEmptyTile, rect);
-                    CText tileText = new CText(rect.X + rect.W / 2, rect.Y + rect.H + _Theme.NameSpace, rect.Z, _Theme.NameHeight, rect.W, EAlignment.Center, _Theme.NameStyle, _Theme.NameFont, _Theme.NameColor, "Name");
+                    CText tileText = new CText(rect.X + rect.W / 2, rect.Y + rect.H + _Theme.NameSpace, rect.Z, _Theme.NameHeight, rect.W, EAlignment.Center, _Theme.NameStyle, _Theme.NameFont, _Theme.NameColor, "");
                     _Tiles.Add(new CTile(tileStatic, tileText, -1));
                 }
             }
diff --git a/Vocaluxe/Screens/CScreenNames.cs b/Vocaluxe/Screens/CScreenNames.cs
index 42463664..88c2fad1 100644
--- a/Vocaluxe/Screens/CScreenNames.cs
+++ b/Vocaluxe/Screens/CScreenNames.cs
@@ -92,12 +92,15 @@ namespace Vocaluxe.Screens
 
         public override bool HandleInput(KeyEvent KeyEvent)
         {
+            //Check if selecting with keyboard is active
             if (selectingKeyboardActive)
             {
+                //Handle left/right/up/down
                 NameSelections[htNameSelections(NameSelection)].HandleInput(KeyEvent);
                 switch (KeyEvent.Key)
                 {
                     case Keys.Enter:
+                        //Check, if a player is selected
                         if (NameSelections[htNameSelections(NameSelection)].Selection > -1)
                         {
                             SelectedPlayerNr = NameSelections[htNameSelections(NameSelection)].Selection;
@@ -109,18 +112,21 @@ namespace Vocaluxe.Screens
                             Statics[htStatics(StaticPlayer[selectingKeyboardPlayerNr-1])].Texture = NameSelections[htNameSelections(NameSelection)].TilePlayerAvatar(SelectedPlayerNr).Texture;
                             Texts[htTexts(TextPlayer[selectingKeyboardPlayerNr-1])].Text = CProfiles.Profiles[SelectedPlayerNr].PlayerName;
                         }
+                        //Reset all values
                         selectingKeyboardPlayerNr = 0;
                         selectingKeyboardActive = false;
                         NameSelections[htNameSelections(NameSelection)].KeyboardSelection(false, -1);
                         break;
 
                     case Keys.Escape:
+                        //Reset all values
                         selectingKeyboardPlayerNr = 0;
                         selectingKeyboardActive = false;
                         NameSelections[htNameSelections(NameSelection)].KeyboardSelection(false, -1);
                         break;
                 }
             }
+            //Normal Keyboard handling
             else
             {
                 base.HandleInput(KeyEvent);
@@ -288,6 +294,7 @@ namespace Vocaluxe.Screens
                 CGraphics.FadeTo(EScreens.ScreenSong);
             }
 
+            //Check mouse-wheel for scrolling
             if (MouseEvent.Wheel != 0)
             {
                 if (CHelper.IsInBounds(NameSelections[htNameSelections(NameSelection)].Rect, MouseEvent))
@@ -361,14 +368,6 @@ namespace Vocaluxe.Screens
             SelectSlides[htSelectSlides(SelectSlidePlayerNumber)].Selection = CConfig.NumPlayer - 1;
         }
 
-        private void UpdateSelection()
-        {
-            for (int i = 0; i < _PlayerNr.Length; i++)
-            {
-
-            }
-        }
-
         private void UpdatePlayerNumber()
         {
             CConfig.NumPlayer = (int)SelectSlides[htSelectSlides(SelectSlidePlayerNumber)].Selection + 1;
@@ -390,11 +389,6 @@ namespace Vocaluxe.Screens
             CheckMics();
         }
 
-        private void UpdateVisibility()
-        {
-
-        }
-
         private void CheckMics()
         {
             List<int> _PlayerWithoutMicro = new List<int>();