From 3d072d7477048e396f40853352bb1d0dcbcfee95 Mon Sep 17 00:00:00 2001 From: Florian Kuepper Date: Sat, 15 Dec 2012 20:01:48 +0100 Subject: [PATCH] Added targetaudience, number of players/teams to party-screen. --- Output/Languages/Deutsch.xml | 6 +- Output/Languages/English.xml | 6 +- Output/Languages/French.xml | 6 +- Output/Languages/Spanish.xml | 6 +- Output/Themes/Ambient/Screens/ScreenParty.xml | 187 +++++++++++++++++- Vocaluxe/Screens/CScreenParty.cs | 25 ++- 6 files changed, 225 insertions(+), 11 deletions(-) diff --git a/Output/Languages/Deutsch.xml b/Output/Languages/Deutsch.xml index bc25796f..c58a0c02 100644 --- a/Output/Languages/Deutsch.xml +++ b/Output/Languages/Deutsch.xml @@ -112,7 +112,11 @@ Beschreibung Autor Version - Dieser Party-Modus konnte nicht geladen werden. + Dieser Party-Modus konnte nicht geladen werden. + Zielgruppe + Keine Teams + Anzahl der Teams + Anzahl der Spieler Spielerauswahl Spieler diff --git a/Output/Languages/English.xml b/Output/Languages/English.xml index 38c545d9..c84f1331 100644 --- a/Output/Languages/English.xml +++ b/Output/Languages/English.xml @@ -112,7 +112,11 @@ Description Author Version - Can't load this party-mode. + Can't load this party-mode. + Target audience + No teams + Number of teams + Number of players Player Selection Player diff --git a/Output/Languages/French.xml b/Output/Languages/French.xml index 35ecad41..ff41874d 100644 --- a/Output/Languages/French.xml +++ b/Output/Languages/French.xml @@ -112,7 +112,11 @@ TODO: Description TODO: Author TODO: Version - TODO: Can't load this party-mode. + TODO: Can't load this party-mode. + TODO: Target audience + TODO: No Teams + TODO: Number of teams + TODO: Number of players Sélection des joueurs Joueur diff --git a/Output/Languages/Spanish.xml b/Output/Languages/Spanish.xml index c5a18bcf..20ad318c 100644 --- a/Output/Languages/Spanish.xml +++ b/Output/Languages/Spanish.xml @@ -106,7 +106,11 @@ TODO: Description TODO: Author TODO: Version - TODO: Can't load this party-mode. + TODO: Can't load this party-mode. + TODO: Target audience + TODO: No Teams + TODO: Number of teams + TODO: Number of players Selección de Jugadores Jugador diff --git a/Output/Themes/Ambient/Screens/ScreenParty.xml b/Output/Themes/Ambient/Screens/ScreenParty.xml index 48703d26..6361977d 100644 --- a/Output/Themes/Ambient/Screens/ScreenParty.xml +++ b/Output/Themes/Ambient/Screens/ScreenParty.xml @@ -140,7 +140,7 @@ Outline - TR_SCREENPARTY_AUTHOR + TR_SCREENPARTY_TARGETAUDIENCE @@ -169,11 +169,98 @@ Outline - TR_SCREENPARTY_VERSION + TR_SCREENPARTY_NUMTEAMS + + + 75 + 345 + + 0,00 + + 32 + + + + StaticColor + + + TextSColor + + Left + + Center + + + + Outline + + TR_SCREENPARTY_NUMPLAYERS + + + + + + + 75 + 405 + + 0,00 + + 32 + + + + StaticColor + + + TextSColor + + Left + + Center + + + + Outline + + TR_SCREENPARTY_AUTHOR + + + + + + + 75 + 465 + + 0,00 + + 32 + + + + StaticColor + + + TextSColor + + Left + + Center + + + + Outline + + TR_SCREENPARTY_VERSION + + + + 850 @@ -204,7 +291,7 @@ - + 850 225 @@ -233,11 +320,101 @@ + + + + 850 + 285 + + 0,00 + + 32 + + 600 + + + StaticColor + + + TextSColor + + Center + + Center + + + + Outline + + + + + + + + + 850 + 345 + + 0,00 + + 32 + + 600 + + + StaticColor + + + TextSColor + + Center + + Center + + + + Outline + + + + + + + + + 850 + 405 + + 0,00 + + 32 + + 600 + + + StaticColor + + + TextSColor + + Center + + Center + + + + Outline + + + + + 850 - 285 + 465 0,00 @@ -267,7 +444,7 @@ 850 - 345 + 525 0,00 diff --git a/Vocaluxe/Screens/CScreenParty.cs b/Vocaluxe/Screens/CScreenParty.cs index 291ae1da..ead52905 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 TextTargetAudience = "TextTargetAudience"; + const string TextNumTeams = "TextNumTeams"; + const string TextNumPlayers = "TextNumPlayers"; const string TextAuthor = "TextAuthor"; const string TextVersion = "TextVersion"; const string TextError = "TextError"; @@ -33,7 +36,7 @@ namespace Vocaluxe.Screens _ThemeName = "ScreenParty"; _ScreenVersion = ScreenVersion; - _ThemeTexts = new string[] { TextDescription, TextAuthor, TextVersion, TextError }; + _ThemeTexts = new string[] { TextDescription, TextTargetAudience, TextNumTeams, TextNumPlayers, TextAuthor, TextVersion, TextError }; _ThemeButtons = new string[] { ButtonStart, ButtonExit }; _ThemeSelectSlides = new string[] { SelectSlideModes }; } @@ -143,11 +146,29 @@ namespace Vocaluxe.Screens if (index >= _PartyModeInfos.Count) return; + //Description Texts[htTexts(TextDescription)].PartyModeID = _PartyModeInfos[index].PartyModeID; Texts[htTexts(TextDescription)].Text = _PartyModeInfos[index].Description; + //TargetAudience + Texts[htTexts(TextTargetAudience)].PartyModeID = _PartyModeInfos[index].PartyModeID; + Texts[htTexts(TextTargetAudience)].Text = _PartyModeInfos[index].Description; + //NumTeams + if (_PartyModeInfos[index].MaxNumTeams == 0) + Texts[htTexts(TextNumTeams)].Text = "TR_SCREENPARTY_NOTEAMS"; + else if (_PartyModeInfos[index].MaxNumTeams == _PartyModeInfos[index].MinNumTeams) + Texts[htTexts(TextNumTeams)].Text = _PartyModeInfos[index].MaxNumTeams.ToString(); + else if (_PartyModeInfos[index].MaxNumTeams > _PartyModeInfos[index].MinNumTeams) + Texts[htTexts(TextNumTeams)].Text = _PartyModeInfos[index].MinNumTeams + " - " + _PartyModeInfos[index].MaxNumTeams; + //NumPlayers + if (_PartyModeInfos[index].MaxNumPlayers == _PartyModeInfos[index].MinNumPlayers) + Texts[htTexts(TextNumPlayers)].Text = _PartyModeInfos[index].MaxNumTeams.ToString(); + else if (_PartyModeInfos[index].MaxNumPlayers > _PartyModeInfos[index].MinNumPlayers) + Texts[htTexts(TextNumPlayers)].Text = _PartyModeInfos[index].MinNumPlayers + " - " + _PartyModeInfos[index].MaxNumPlayers; + //Author Texts[htTexts(TextAuthor)].Text = _PartyModeInfos[index].Author; Texts[htTexts(TextAuthor)].PartyModeID = _PartyModeInfos[index].PartyModeID; - //Texts[htTexts(TextVersion)].Text = _PartyModeInfos[index]. + //Version + Texts[htTexts(TextVersion)].Text = _PartyModeInfos[index].VersionMajor + "." + _PartyModeInfos[index].VersionMinor; Texts[htTexts(TextVersion)].PartyModeID = _PartyModeInfos[index].PartyModeID; if (!_PartyModeInfos[index].Playable)