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

Merge branch 'develop' into KeyFilterToPlaylist

Browse Source
This commit is contained in:
Stefan authored and GitHub committed 2020-02-02 18:21:34 +01:00
2 parents b0658c1f67 632e97f6e4
commit 4d43ac465e
2 files changed
+11 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Vocaluxe/Screens/CScreenSong.cs
+5 -5
View File
@@ -376,7 +376,7 @@ namespace Vocaluxe.Screens
switch (keyEvent.Key) switch (keyEvent.Key)
{ {
case Keys.Space: case Keys.Space:
if (!_Sso.Selection.PartyMode) if (!_Sso.Selection.PartyMode && !_Playlist.isPlaylistNameEditMode())
_ToggleSongOptions(ESongOptionsView.General); _ToggleSongOptions(ESongOptionsView.General);
break; break;
@@ -1206,7 +1206,7 @@ namespace Vocaluxe.Screens
{ {
case ESongSorting.TR_CONFIG_ARTIST: case ESongSorting.TR_CONFIG_ARTIST:
case ESongSorting.TR_CONFIG_ARTIST_LETTER: case ESongSorting.TR_CONFIG_ARTIST_LETTER:
visibleID = _FindIndex(songs, start, element => element.Artist.StartsWith(searchString, StringComparison.OrdinalIgnoreCase)); visibleID = _FindIndex(songs, start, element => (_Sso.Sorting.IgnoreArticles == EOffOn.TR_CONFIG_ON ? element.ArtistSorting.StartsWith(searchString, StringComparison.OrdinalIgnoreCase) : element.Artist.StartsWith(searchString, StringComparison.OrdinalIgnoreCase)));
break; break;
case ESongSorting.TR_CONFIG_YEAR: case ESongSorting.TR_CONFIG_YEAR:
@@ -1215,7 +1215,7 @@ namespace Vocaluxe.Screens
break; break;
case ESongSorting.TR_CONFIG_TITLE_LETTER: case ESongSorting.TR_CONFIG_TITLE_LETTER:
visibleID = _FindIndex(songs, start, element => element.Title.StartsWith(searchString, StringComparison.OrdinalIgnoreCase)); visibleID = _FindIndex(songs, start, element => (_Sso.Sorting.IgnoreArticles == EOffOn.TR_CONFIG_ON ? element.TitleSorting.StartsWith(searchString, StringComparison.OrdinalIgnoreCase) : element.Title.StartsWith(searchString, StringComparison.OrdinalIgnoreCase)));
break; break;
case ESongSorting.TR_CONFIG_FOLDER: case ESongSorting.TR_CONFIG_FOLDER:
@@ -1233,12 +1233,12 @@ namespace Vocaluxe.Screens
{ {
case ESongSorting.TR_CONFIG_FOLDER: case ESongSorting.TR_CONFIG_FOLDER:
case ESongSorting.TR_CONFIG_TITLE_LETTER: case ESongSorting.TR_CONFIG_TITLE_LETTER:
visibleID = _FindIndex(songs, start, element => element.Artist.StartsWith(searchString, StringComparison.OrdinalIgnoreCase)); visibleID = _FindIndex(songs, start, element => (_Sso.Sorting.IgnoreArticles == EOffOn.TR_CONFIG_ON ? element.ArtistSorting.StartsWith(searchString, StringComparison.OrdinalIgnoreCase) : element.Artist.StartsWith(searchString, StringComparison.OrdinalIgnoreCase)));
break; break;
case ESongSorting.TR_CONFIG_ARTIST: case ESongSorting.TR_CONFIG_ARTIST:
case ESongSorting.TR_CONFIG_ARTIST_LETTER: case ESongSorting.TR_CONFIG_ARTIST_LETTER:
visibleID = _FindIndex(songs, start, element => element.Title.StartsWith(searchString, StringComparison.OrdinalIgnoreCase)); visibleID = _FindIndex(songs, start, element => (_Sso.Sorting.IgnoreArticles == EOffOn.TR_CONFIG_ON ? element.TitleSorting.StartsWith(searchString, StringComparison.OrdinalIgnoreCase) : element.Title.StartsWith(searchString, StringComparison.OrdinalIgnoreCase)));
break; break;
} }
if (visibleID > -1) if (visibleID > -1)
VocaluxeLib/Menu/CPlaylist.cs
+6 -1
View File
@@ -972,6 +972,11 @@ namespace VocaluxeLib.Menu
return false; return false;
} }
public bool isPlaylistNameEditMode()
{
return _EditMode == EEditMode.PlaylistName;
}
private void _PrepareList() private void _PrepareList()
{ {
_PlaylistElements.Clear(); _PlaylistElements.Clear();
@@ -1197,4 +1202,4 @@ namespace VocaluxeLib.Menu
} }
#endregion ThemeEdit #endregion ThemeEdit
} }
} }