From 3884632772aaa390859814c46669b88ecb640053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Mon, 29 Apr 2013 08:45:42 +0200 Subject: [PATCH] Added message for no-mics-error on party-screen. Please add "TR_SCREENPARTY_ERROR_MICS" to TRANSIFEX refs #2 --- Output/Themes/Ambient/Screens/ScreenParty.xml | 32 ++++++++++++++++++- Vocaluxe/Screens/CScreenParty.cs | 19 ++++------- 2 files changed, 38 insertions(+), 13 deletions(-) diff --git a/Output/Themes/Ambient/Screens/ScreenParty.xml b/Output/Themes/Ambient/Screens/ScreenParty.xml index 86df74ac..c6779b60 100644 --- a/Output/Themes/Ambient/Screens/ScreenParty.xml +++ b/Output/Themes/Ambient/Screens/ScreenParty.xml @@ -471,6 +471,36 @@ + + + 850 + 560 + + 0,00 + + 32 + + 600 + + + TextWarningColor + + + TextSColor + + Center + + Center + + + + Outline + + TR_SCREENPARTY_ERROR_MICS + + + + Button @@ -653,4 +683,4 @@ 1 - \ No newline at end of file + diff --git a/Vocaluxe/Screens/CScreenParty.cs b/Vocaluxe/Screens/CScreenParty.cs index f6e37116..d81e0fec 100644 --- a/Vocaluxe/Screens/CScreenParty.cs +++ b/Vocaluxe/Screens/CScreenParty.cs @@ -39,6 +39,7 @@ namespace Vocaluxe.Screens private const string _TextAuthor = "TextAuthor"; private const string _TextVersion = "TextVersion"; private const string _TextError = "TextError"; + private const string _TextErrorMics = "TextErrorMics"; private const string _ButtonStart = "ButtonStart"; private const string _ButtonExit = "ButtonExit"; private const string _SelectSlideModes = "SelectSlideModes"; @@ -49,7 +50,7 @@ namespace Vocaluxe.Screens { base.Init(); - _ThemeTexts = new string[] {_TextDescription, _TextTargetAudience, _TextNumTeams, _TextNumPlayers, _TextAuthor, _TextVersion, _TextError}; + _ThemeTexts = new string[] {_TextDescription, _TextTargetAudience, _TextNumTeams, _TextNumPlayers, _TextAuthor, _TextVersion, _TextError, _TextErrorMics}; _ThemeButtons = new string[] {_ButtonStart, _ButtonExit}; _ThemeSelectSlides = new string[] {_SelectSlideModes}; } @@ -120,6 +121,8 @@ namespace Vocaluxe.Screens _SelectSlides[_SelectSlideModes].Selection = 0; _UpdateSelection(); + _Texts[_TextErrorMics].Visible = CConfig.GetMaxNumMics() == 0; + _SetInteractionToSelectSlide(_SelectSlides[_SelectSlideModes]); } @@ -174,16 +177,8 @@ namespace Vocaluxe.Screens _Texts[_TextVersion].Text = _PartyModeInfos[index].VersionMajor + "." + _PartyModeInfos[index].VersionMinor; _Texts[_TextVersion].TranslationID = _PartyModeInfos[index].PartyModeID; - if (!_PartyModeInfos[index].Playable) - { - _Buttons[_ButtonStart].Visible = false; - _Texts[_TextError].Visible = true; - } - else - { - _Buttons[_ButtonStart].Visible = true; - _Texts[_TextError].Visible = false; - } + _Buttons[_ButtonStart].Visible = _PartyModeInfos[index].Playable && CConfig.GetMaxNumMics() > 0; + _Texts[_TextError].Visible = !_PartyModeInfos[index].Playable; } private void _StartPartyMode() @@ -196,7 +191,7 @@ namespace Vocaluxe.Screens return; if (CConfig.GetMaxNumMics() == 0) - return; //TODO: Add message! + return; CParty.SetPartyMode(_PartyModeInfos[index].PartyModeID); CGraphics.FadeTo(EScreens.ScreenPartyDummy);