Merge pull request #498 from Vocaluxe/InfoTextNoMedley
Info text for CTRL+S if Medley is not possible for selected song
This commit is contained in:
3 files changed
+11
-1
No files matched your search
@@ -156,6 +156,7 @@
|
||||
<string name="TR_SCREENSONG_HELPMESSAGESEARCH">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</string>
|
||||
<string name="TR_SCREENSONG_HELPMESSAGEPARTY">1-6 = Press your team number to use a random song joker</string>
|
||||
<string name="TR_SCREENSONG_SORTING">Sorting: %s</string>
|
||||
<string name="TR_SCREENSONG_NOMEDLEY">No Medley for this song!</string>
|
||||
<string name="TR_SCREENSING_PAUSE">Pause</string>
|
||||
<string name="TR_SCREENSING_BUTTON_CANCEL">Stop singing</string>
|
||||
<string name="TR_SCREENSING_BUTTON_CONTINUE">Continue</string>
|
||||
|
||||
@@ -151,6 +151,7 @@
|
||||
<string name="TR_SCREENSONG_HELPMESSAGESEARCH">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</string>
|
||||
<string name="TR_SCREENSONG_HELPMESSAGEPARTY">1-6 = Drücke die Teamnummer um einen Zufallssong Joker zu verwenden</string>
|
||||
<string name="TR_SCREENSONG_SORTING">Sortierung: %s</string>
|
||||
<string name="TR_SCREENSONG_NOMEDLEY">Kein Medley für diesen Song!</string>
|
||||
<string name="TR_SCREENSING_PAUSE">Pause</string>
|
||||
<string name="TR_SCREENSING_BUTTON_CANCEL">Lied beenden</string>
|
||||
<string name="TR_SCREENSING_BUTTON_CONTINUE">Fortfahren</string>
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in new issue
Block a user