From 72a6c415ae0a07429b476104546f161d9c807e65 Mon Sep 17 00:00:00 2001
From: Stephan Sundermann <stephansundermann@gmail.com>
Date: Fri, 16 Mar 2012 12:49:42 +0100
Subject: [PATCH] Added jumpTo in songscreen

---
 Vocaluxe/Screens/CScreenSong.cs | 75 +++++++++++++++++++++------------
 1 file changed, 49 insertions(+), 26 deletions(-)

diff --git a/Vocaluxe/Screens/CScreenSong.cs b/Vocaluxe/Screens/CScreenSong.cs
index abc609de..68865476 100644
--- a/Vocaluxe/Screens/CScreenSong.cs
+++ b/Vocaluxe/Screens/CScreenSong.cs
@@ -65,13 +65,19 @@ namespace Vocaluxe.Screens
                 if (KeyEvent.Handled)
                     return true;
 
+                if (!Char.IsControl(KeyEvent.Unicode))
+                {
+                    JumpTo(KeyEvent.Unicode);
+                    return true;
+                }
+
                 switch (KeyEvent.Key)
                 {
                     case Keys.Escape:
                         if (CSongs.Category < 0 || CConfig.Tabs == EOffOn.TR_CONFIG_OFF)
                             CGraphics.FadeTo(EScreens.ScreenMain);
                         break;
-                        
+
                     case Keys.Enter:
                         if (CSongs.NumVisibleSongs > 0)
                             StartSong(SongMenus[htSongMenus(SongMenu)].GetSelectedSong());
@@ -101,34 +107,34 @@ namespace Vocaluxe.Screens
                         }
                         break;
 
-                    case Keys.A:
-                        if (!_SearchActive && KeyEvent.Mod == Modifier.None)
-                        {
-                            StartRandomAllSongs();
-                        }
-                        if (KeyEvent.Mod == Modifier.Ctrl)
-                        {
-                            StartRandomVisibleSongs();
-                        }
-                        break;
+                    //case Keys.A:
+                    //    if (!_SearchActive && KeyEvent.Mod == Modifier.None)
+                    //    {
+                    //        StartRandomAllSongs();
+                    //    }
+                    //    if (KeyEvent.Mod == Modifier.Ctrl)
+                    //    {
+                    //        StartRandomVisibleSongs();
+                    //    }
+                    //    break;
 
-                    case Keys.F:
-                        if (KeyEvent.Mod == Modifier.Ctrl){
-                            if (_SearchActive)
-                            {
-                                _SearchActive = false;
-                                _SearchText = String.Empty;
-                                ApplyNewSearchFilter(_SearchText);
-                            }
-                            else
-                            {
-                                _SearchActive = true;
-                            }
-                        }
-                        break;
+                    //case Keys.F:
+                    //    if (KeyEvent.Mod == Modifier.Ctrl){
+                    //        if (_SearchActive)
+                    //        {
+                    //            _SearchActive = false;
+                    //            _SearchText = String.Empty;
+                    //            ApplyNewSearchFilter(_SearchText);
+                    //        }
+                    //        else
+                    //        {
+                    //            _SearchActive = true;
+                    //        }
+                    //    }
+                    //    break;
 
                     case Keys.R:
-                        if (CSongs.Category != -1)
+                        if (CSongs.Category != -1 && KeyEvent.Mod == Modifier.Ctrl)
                         {
                             SongMenus[htSongMenus(SongMenu)].SetSelectedSong(CSongs.GetRandomSong());
                         }
@@ -288,6 +294,23 @@ namespace Vocaluxe.Screens
                 CGraphics.FadeTo(EScreens.ScreenNames);
         }
 
+        private void JumpTo(char Letter)
+        {
+            int song = SongMenus[htSongMenus(SongMenu)].GetSelectedSong();
+            int id = -1;
+            if (song > -1 && song < CSongs.NumVisibleSongs)
+            {
+                id = CSongs.VisibleSongs[song].ID;
+            }
+
+            Vocaluxe.Lib.Song.CSong s = Array.Find<Vocaluxe.Lib.Song.CSong>(CSongs.VisibleSongs, element => element.Artist.StartsWith(Letter.ToString(), StringComparison.OrdinalIgnoreCase));
+            if (s != null && s.ID > -1)
+            {
+                id = s.ID;
+                SongMenus[htSongMenus(SongMenu)].SetSelectedSong(id);
+            }
+        }
+
         private void ApplyNewSearchFilter(string NewFilterString)
         {
             int song = SongMenus[htSongMenus(SongMenu)].GetSelectedSong();