From 217bbaded03866606ec4c9fac488895cc9bb52f1 Mon Sep 17 00:00:00 2001
From: Florian Kuepper <florian.kuepper@googlemail.com>
Date: Mon, 2 Apr 2012 13:38:23 +0200
Subject: [PATCH] If name selection is active, press active player-number to
 exit selection or other player-number to select an other player...

---
 Vocaluxe/Menu/CNameSelection.cs  |  9 +++-
 Vocaluxe/Screens/CScreenNames.cs | 84 ++++++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+), 1 deletion(-)

diff --git a/Vocaluxe/Menu/CNameSelection.cs b/Vocaluxe/Menu/CNameSelection.cs
index 046653d6..34f6d247 100644
--- a/Vocaluxe/Menu/CNameSelection.cs
+++ b/Vocaluxe/Menu/CNameSelection.cs
@@ -333,12 +333,19 @@ namespace Vocaluxe.Menu
 
         public void KeyboardSelection(bool active, int player)
         {
-            if (active)
+            //Overwrite player-selection; Same profile, but other player
+            if (active && Selection != -1)
+            {
+                _player = player;
+            }
+            //Normal activation
+            else if (active)
             {
                 Selection = 0;
                 _actualSelection = 0;
                 _player = player;
             }
+            //Deactivate
             else
             {
                 Selection = -1;
diff --git a/Vocaluxe/Screens/CScreenNames.cs b/Vocaluxe/Screens/CScreenNames.cs
index a19d1966..199eb0d3 100644
--- a/Vocaluxe/Screens/CScreenNames.cs
+++ b/Vocaluxe/Screens/CScreenNames.cs
@@ -123,6 +123,90 @@ namespace Vocaluxe.Screens
                         NameSelections[htNameSelections(NameSelection)].KeyboardSelection(false, -1);
                         break;
 
+                    case Keys.D1:
+                        if (selectingKeyboardPlayerNr == 1)
+                        {
+                            //Reset all values
+                            selectingKeyboardPlayerNr = 0;
+                            selectingKeyboardActive = false;
+                            NameSelections[htNameSelections(NameSelection)].KeyboardSelection(false, -1);
+                        }
+                        else
+                        {
+                            selectingKeyboardPlayerNr = 1;
+                            NameSelections[htNameSelections(NameSelection)].KeyboardSelection(true, 1);
+                        }
+                        break;
+                    case Keys.D2:
+                        if (selectingKeyboardPlayerNr == 2)
+                        {
+                            //Reset all values
+                            selectingKeyboardPlayerNr = 0;
+                            selectingKeyboardActive = false;
+                            NameSelections[htNameSelections(NameSelection)].KeyboardSelection(false, -1);
+                        }
+                        else
+                        {
+                            selectingKeyboardPlayerNr = 2;
+                            NameSelections[htNameSelections(NameSelection)].KeyboardSelection(true, 2);
+                        }
+                        break;
+                    case Keys.D3:
+                        if (selectingKeyboardPlayerNr == 3)
+                        {
+                            //Reset all values
+                            selectingKeyboardPlayerNr = 0;
+                            selectingKeyboardActive = false;
+                            NameSelections[htNameSelections(NameSelection)].KeyboardSelection(false, -1);
+                        }
+                        else
+                        {
+                            selectingKeyboardPlayerNr = 3;
+                            NameSelections[htNameSelections(NameSelection)].KeyboardSelection(true, 3);
+                        }
+                        break;
+                    case Keys.D4:
+                        if (selectingKeyboardPlayerNr == 4)
+                        {
+                            //Reset all values
+                            selectingKeyboardPlayerNr = 0;
+                            selectingKeyboardActive = false;
+                            NameSelections[htNameSelections(NameSelection)].KeyboardSelection(false, -1);
+                        }
+                        else
+                        {
+                            selectingKeyboardPlayerNr = 4;
+                            NameSelections[htNameSelections(NameSelection)].KeyboardSelection(true, 4);
+                        }
+                        break;
+                    case Keys.D5:
+                        if (selectingKeyboardPlayerNr == 5)
+                        {
+                            //Reset all values
+                            selectingKeyboardPlayerNr = 0;
+                            selectingKeyboardActive = false;
+                            NameSelections[htNameSelections(NameSelection)].KeyboardSelection(false, -1);
+                        }
+                        else
+                        {
+                            selectingKeyboardPlayerNr = 5;
+                            NameSelections[htNameSelections(NameSelection)].KeyboardSelection(true, 5);
+                        }
+                        break;
+                    case Keys.D6:
+                        if (selectingKeyboardPlayerNr == 6)
+                        {
+                            //Reset all values
+                            selectingKeyboardPlayerNr = 0;
+                            selectingKeyboardActive = false;
+                            NameSelections[htNameSelections(NameSelection)].KeyboardSelection(false, -1);
+                        }
+                        else
+                        {
+                            selectingKeyboardPlayerNr = 6;
+                            NameSelections[htNameSelections(NameSelection)].KeyboardSelection(true, 6);
+                        }
+                        break;
                     case Keys.Escape:
                         //Reset all values
                         selectingKeyboardPlayerNr = 0;