From f408cafca81e6ba17f9ff11bea4b295d0f0b808f Mon Sep 17 00:00:00 2001 From: Stefan Date: Tue, 11 Feb 2020 12:07:41 +0100 Subject: [PATCH 1/3] Info text for CTRL+S if Medley is not possible "No Medley for this song!" will be displayed at middle top screen border. --- Vocaluxe/Screens/CScreenSong.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Vocaluxe/Screens/CScreenSong.cs b/Vocaluxe/Screens/CScreenSong.cs index 33130398..49f09f16 100644 --- a/Vocaluxe/Screens/CScreenSong.cs +++ b/Vocaluxe/Screens/CScreenSong.cs @@ -963,7 +963,12 @@ namespace Vocaluxe.Screens _SongMenu.Update(_Sso); _SongMenu.OnShow(); - _Texts[_TextShortInfoTop].Text = CBase.Language.Translate("TR_SCREENSONG_SORTING").Replace("%s", CBase.Language.Translate(_Sso.Sorting.SongSorting.ToString())); + _ShowInfoText(CBase.Language.Translate("TR_SCREENSONG_SORTING").Replace("%s", CBase.Language.Translate(_Sso.Sorting.SongSorting.ToString()))); + } + + private void _ShowInfoText(String text) + { + _Texts[_TextShortInfoTop].Text = text; _Statics[_StaticShortInfoTop].Visible = true; _Texts[_TextShortInfoTop].Visible = true; _TimerShortInfoText.Stop(); @@ -1035,7 +1040,10 @@ namespace Vocaluxe.Screens if (CSongs.IsInCategory && (songNr >= 0)) { if (!CSongs.VisibleSongs[songNr].IsGameModeAvailable(EGameMode.TR_GAMEMODE_MEDLEY)) + { + _ShowInfoText(CBase.Language.Translate("TR_SCREENSONG_NOMEDLEY")); return; + } CGame.Reset(); CGame.ClearSongs(); From 8094967a453dd0cb8b8fba07a5140696cee5f290 Mon Sep 17 00:00:00 2001 From: Stefan Date: Tue, 11 Feb 2020 12:09:18 +0100 Subject: [PATCH 2/3] No Medley text added --- Output/Languages/English.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/Output/Languages/English.xml b/Output/Languages/English.xml index fc7a4ca2..434d4720 100644 --- a/Output/Languages/English.xml +++ b/Output/Languages/English.xml @@ -156,6 +156,7 @@ A-Z = Search artist and title, prefixes for the search → a: = artist • t: = title • c: = creator • e: = edition • g: = genre • y: = year (e.g. 1999 or 1980-1989) • l: = language • al: = album • fi: = file name • fo: = folder name 1-6 = Press your team number to use a random song joker Sorting: %s + No Medley for this song! Pause Stop singing Continue From 824efc50711d8942a2bea97361aced92123d8ef8 Mon Sep 17 00:00:00 2001 From: Stefan Date: Tue, 11 Feb 2020 12:09:47 +0100 Subject: [PATCH 3/3] No Medley text added --- Output/Languages/German.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/Output/Languages/German.xml b/Output/Languages/German.xml index dc0fc2d1..c043222f 100644 --- a/Output/Languages/German.xml +++ b/Output/Languages/German.xml @@ -151,6 +151,7 @@ A-Z = Interpreten und Titel durchsuchen, Präfixe für die Suche → a: = Interpret • t: = Titel • c: = Ersteller • e: = Edition • g: = Genre • y: = Jahr (z.B. 1999 oder 1980-1989) • l: = Sprache • al: = Album • fi: = Dateiname • fo: = Ordnername 1-6 = Drücke die Teamnummer um einen Zufallssong Joker zu verwenden Sortierung: %s + Kein Medley für diesen Song! Pause Lied beenden Fortfahren