Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added jumpTo in songscreen

Browse Source
This commit is contained in:
Stephan Sundermann committed 2012-03-16 12:49:42 +01:00
1 parent f08e72bd70
commit 72a6c415ae
1 file changed
+49 -26
Download Patch File Download Diff File Expand all files Collapse all files
Vocaluxe/Screens/CScreenSong.cs
+49 -26
View File
@@ -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();