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

deactivated JumpTo (it has a bug and should be for version 0.2)

Browse Source
This commit is contained in:
Alexander Eckart committed 2012-03-16 22:00:23 +01:00
1 parent aca6087488
commit 3520545138
1 file changed
+34 -32
Download Patch File Download Diff File Expand all files Collapse all files
Vocaluxe/Screens/CScreenSong.cs
+34 -32
View File
@@ -54,9 +54,16 @@ namespace Vocaluxe.Screens
{
base.HandleInput(KeyEvent);
if (KeyEvent.KeyPressed && !Char.IsControl(KeyEvent.Unicode) && _SearchActive)
if (KeyEvent.KeyPressed && !Char.IsControl(KeyEvent.Unicode))
{
ApplyNewSearchFilter(_SearchText + KeyEvent.Unicode);
if (_SearchActive)
ApplyNewSearchFilter(_SearchText + KeyEvent.Unicode);
/*
else if (!Char.IsControl(KeyEvent.Unicode))
{
JumpTo(KeyEvent.Unicode);
return true;
}*/
}
else
{
@@ -65,12 +72,6 @@ namespace Vocaluxe.Screens
if (KeyEvent.Handled)
return true;
if (!Char.IsControl(KeyEvent.Unicode))
{
JumpTo(KeyEvent.Unicode);
return true;
}
switch (KeyEvent.Key)
{
case Keys.Escape:
@@ -107,31 +108,31 @@ 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 && KeyEvent.Mod == Modifier.Ctrl)
@@ -303,6 +304,7 @@ namespace Vocaluxe.Screens
id = CSongs.VisibleSongs[song].ID;
}
// here is a fault: SetSelectedSong should point to the visible index
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)
{