diff --git a/Output/Languages/Deutsch.xml b/Output/Languages/Deutsch.xml index dafce832..bc25796f 100644 --- a/Output/Languages/Deutsch.xml +++ b/Output/Languages/Deutsch.xml @@ -110,6 +110,9 @@ Party-Modus Auswahl Party-Modus Beschreibung + Autor + Version + Dieser Party-Modus konnte nicht geladen werden. Spielerauswahl Spieler diff --git a/Output/Languages/English.xml b/Output/Languages/English.xml index be727435..38c545d9 100644 --- a/Output/Languages/English.xml +++ b/Output/Languages/English.xml @@ -110,6 +110,9 @@ Party Mode Selection Party Mode Description + Author + Version + Can't load this party-mode. Player Selection Player diff --git a/Output/Languages/French.xml b/Output/Languages/French.xml index 5ab7e031..35ecad41 100644 --- a/Output/Languages/French.xml +++ b/Output/Languages/French.xml @@ -110,6 +110,9 @@ TODO: Party Mode Selection TODO: Party Mode TODO: Description + TODO: Author + TODO: Version + TODO: Can't load this party-mode. Sélection des joueurs Joueur diff --git a/Output/Languages/Spanish.xml b/Output/Languages/Spanish.xml index 5bbc2b02..c5a18bcf 100644 --- a/Output/Languages/Spanish.xml +++ b/Output/Languages/Spanish.xml @@ -104,6 +104,9 @@ TODO: Party Mode Selection TODO: Party Mode TODO: Description + TODO: Author + TODO: Version + TODO: Can't load this party-mode. Selección de Jugadores Jugador diff --git a/Output/Themes/Ambient/Screens/ScreenParty.xml b/Output/Themes/Ambient/Screens/ScreenParty.xml index 2575bdb2..48703d26 100644 --- a/Output/Themes/Ambient/Screens/ScreenParty.xml +++ b/Output/Themes/Ambient/Screens/ScreenParty.xml @@ -116,6 +116,64 @@ + + + 75 + 225 + + 0,00 + + 32 + + + + StaticColor + + + TextSColor + + Left + + Center + + + + Outline + + TR_SCREENPARTY_AUTHOR + + + + + + + 75 + 285 + + 0,00 + + 32 + + + + StaticColor + + + TextSColor + + Left + + Center + + + + Outline + + TR_SCREENPARTY_VERSION + + + + 850 @@ -146,6 +204,96 @@ + + + 850 + 225 + + 0,00 + + 32 + + 600 + + + StaticColor + + + TextSColor + + Center + + Center + + + + Outline + + + + + + + + + 850 + 285 + + 0,00 + + 32 + + 600 + + + StaticColor + + + TextSColor + + Center + + Center + + + + Outline + + + + + + + + + 850 + 345 + + 0,00 + + 32 + + 600 + + + TextWarningColor + + + TextSColor + + Center + + Center + + + + Outline + + TR_SCREENPARTY_ERROR + + + + Invisible @@ -326,4 +474,4 @@ - \ No newline at end of file + diff --git a/Vocaluxe/Screens/CScreenParty.cs b/Vocaluxe/Screens/CScreenParty.cs index 8973478c..291ae1da 100644 --- a/Vocaluxe/Screens/CScreenParty.cs +++ b/Vocaluxe/Screens/CScreenParty.cs @@ -14,6 +14,9 @@ namespace Vocaluxe.Screens const int ScreenVersion = 1; const string TextDescription = "TextDescription"; + const string TextAuthor = "TextAuthor"; + const string TextVersion = "TextVersion"; + const string TextError = "TextError"; const string ButtonStart = "ButtonStart"; const string ButtonExit = "ButtonExit"; const string SelectSlideModes = "SelectSlideModes"; @@ -30,7 +33,7 @@ namespace Vocaluxe.Screens _ThemeName = "ScreenParty"; _ScreenVersion = ScreenVersion; - _ThemeTexts = new string[] { TextDescription }; + _ThemeTexts = new string[] { TextDescription, TextAuthor, TextVersion, TextError }; _ThemeButtons = new string[] { ButtonStart, ButtonExit }; _ThemeSelectSlides = new string[] { SelectSlideModes }; } @@ -142,6 +145,21 @@ namespace Vocaluxe.Screens Texts[htTexts(TextDescription)].PartyModeID = _PartyModeInfos[index].PartyModeID; Texts[htTexts(TextDescription)].Text = _PartyModeInfos[index].Description; + Texts[htTexts(TextAuthor)].Text = _PartyModeInfos[index].Author; + Texts[htTexts(TextAuthor)].PartyModeID = _PartyModeInfos[index].PartyModeID; + //Texts[htTexts(TextVersion)].Text = _PartyModeInfos[index]. + Texts[htTexts(TextVersion)].PartyModeID = _PartyModeInfos[index].PartyModeID; + + if (!_PartyModeInfos[index].Playable) + { + Buttons[htButtons(ButtonStart)].Visible = false; + Texts[htTexts(TextError)].Visible = true; + } + else + { + Buttons[htButtons(ButtonStart)].Visible = true; + Texts[htTexts(TextError)].Visible = false; + } } private void StartPartyMode() @@ -153,8 +171,11 @@ namespace Vocaluxe.Screens if (index >= _PartyModeInfos.Count) return; - CParty.SetPartyMode(_PartyModeInfos[index].PartyModeID); - CGraphics.FadeTo(EScreens.ScreenPartyDummy); + if (_PartyModeInfos[index].Playable) + { + CParty.SetPartyMode(_PartyModeInfos[index].PartyModeID); + CGraphics.FadeTo(EScreens.ScreenPartyDummy); + } } } }