From 68c9ad83d8c0d3bec78f6485f31ad3ca405c2a95 Mon Sep 17 00:00:00 2001 From: Alexander Eckart Date: Mon, 31 Dec 2012 12:45:02 +0100 Subject: [PATCH 1/2] fixed party mode text translations for select slides --- VocaluxeLib/Menu/CSelectSlide.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/VocaluxeLib/Menu/CSelectSlide.cs b/VocaluxeLib/Menu/CSelectSlide.cs index 397decbf..3ed200ae 100644 --- a/VocaluxeLib/Menu/CSelectSlide.cs +++ b/VocaluxeLib/Menu/CSelectSlide.cs @@ -545,7 +545,7 @@ namespace Vocaluxe.Menu public void AddValue(string value) { - AddValue(value, new STexture(-1)); + AddValue(value, new STexture(-1), _PartyModeID); } public void AddValue(string value, int PartyModeID) @@ -555,12 +555,12 @@ namespace Vocaluxe.Menu public void AddValue(string value, STexture texture) { - AddValue(value, texture, _ValueIndexes.Count); + AddValue(value, texture, _ValueIndexes.Count, _PartyModeID); } public void AddValue(string value, STexture texture, int valueIndex) { - AddValue(value, texture, valueIndex, -1); + AddValue(value, texture, valueIndex, _PartyModeID); } public void AddValue(string value, STexture texture, int valueIndex, int PartyModeID) @@ -580,7 +580,7 @@ namespace Vocaluxe.Menu { foreach (string value in values) { - AddValue(value, new STexture(-1)); + AddValue(value, new STexture(-1), _PartyModeID); } _ValueBounds.Clear(); From b46371428f89982a177bc111f2d63712369e3dae Mon Sep 17 00:00:00 2001 From: Alexander Eckart Date: Mon, 31 Dec 2012 13:06:34 +0100 Subject: [PATCH 2/2] fixed ESC and BACK key handling in song screen (leaving screen) --- Vocaluxe/Screens/CScreenSong.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Vocaluxe/Screens/CScreenSong.cs b/Vocaluxe/Screens/CScreenSong.cs index dfebbfd5..65f9fc18 100644 --- a/Vocaluxe/Screens/CScreenSong.cs +++ b/Vocaluxe/Screens/CScreenSong.cs @@ -84,6 +84,7 @@ namespace Vocaluxe.Screens { base.Init(); + ButtonsJoker.Clear(); for (int i = 0; i < _Base.Settings.GetMaxNumPlayer(); i++) { ButtonsJoker.Add("ButtonJoker" + (i + 1)); @@ -103,6 +104,7 @@ namespace Vocaluxe.Screens blist.Add(ButtonOptionsRandomMedley); blist.Add(ButtonOptionsStartMedley); + TextsPlayer.Clear(); for (int i = 0; i < _Base.Settings.GetMaxNumPlayer(); i++) { TextsPlayer.Add("TextPlayer" + (i + 1)); @@ -203,7 +205,7 @@ namespace Vocaluxe.Screens switch (KeyEvent.Key) { case Keys.Escape: - if ((CSongs.Category < 0 || !(_sso.Sorting.Tabs == EOffOn.TR_CONFIG_OFF)) && !_sso.Selection.PartyMode) + if ((CSongs.Category < 0 || _sso.Sorting.Tabs == EOffOn.TR_CONFIG_OFF) && !_sso.Selection.PartyMode && !_SearchActive) CGraphics.FadeTo(EScreens.ScreenMain); break; @@ -251,7 +253,7 @@ namespace Vocaluxe.Screens ApplyNewSearchFilter(_SearchText.Remove(_SearchText.Length - 1)); } - if (!_SearchActive && (CSongs.Category < 0) && !_sso.Selection.PartyMode) + if ((CSongs.Category < 0 || _sso.Sorting.Tabs == EOffOn.TR_CONFIG_OFF) && !_sso.Selection.PartyMode && !_SearchActive) { CGraphics.FadeTo(EScreens.ScreenMain); }