Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added targetaudience, number of players/teams to party-screen.

Browse Source
This commit is contained in:
Florian Kuepper committed 2012-12-15 20:01:48 +01:00
1 parent 06d0a636d9
commit 3d072d7477
6 files changed
+225 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Languages/Deutsch.xml
+5 -1
View File
@@ -112,7 +112,11 @@
<TR_SCREENPARTY_DESCRIPTION>Beschreibung</TR_SCREENPARTY_DESCRIPTION> <TR_SCREENPARTY_DESCRIPTION>Beschreibung</TR_SCREENPARTY_DESCRIPTION>
<TR_SCREENPARTY_AUTHOR>Autor</TR_SCREENPARTY_AUTHOR> <TR_SCREENPARTY_AUTHOR>Autor</TR_SCREENPARTY_AUTHOR>
<TR_SCREENPARTY_VERSION>Version</TR_SCREENPARTY_VERSION> <TR_SCREENPARTY_VERSION>Version</TR_SCREENPARTY_VERSION>
<TR_SCREENPARTY_ERROR>Dieser Party-Modus konnte nicht geladen werden.</TR_SCREENPARTY_ERROR> <TR_SCREENPARTY_ERROR>Dieser Party-Modus konnte nicht geladen werden.</TR_SCREENPARTY_ERROR>
<TR_SCREENPARTY_TARGETAUDIENCE>Zielgruppe</TR_SCREENPARTY_TARGETAUDIENCE>
<TR_SCREENPARTY_NOTEAMS>Keine Teams</TR_SCREENPARTY_NOTEAMS>
<TR_SCREENPARTY_NUMTEAMS>Anzahl der Teams</TR_SCREENPARTY_NUMTEAMS>
<TR_SCREENPARTY_NUMPLAYERS>Anzahl der Spieler</TR_SCREENPARTY_NUMPLAYERS>
<!--ScreenNames--> <!--ScreenNames-->
<TR_SCREENNAMES_MENU>Spielerauswahl</TR_SCREENNAMES_MENU> <TR_SCREENNAMES_MENU>Spielerauswahl</TR_SCREENNAMES_MENU>
<TR_SCREENNAMES_PLAYER>Spieler</TR_SCREENNAMES_PLAYER> <TR_SCREENNAMES_PLAYER>Spieler</TR_SCREENNAMES_PLAYER>
Output/Languages/English.xml
+5 -1
View File
@@ -112,7 +112,11 @@
<TR_SCREENPARTY_DESCRIPTION>Description</TR_SCREENPARTY_DESCRIPTION> <TR_SCREENPARTY_DESCRIPTION>Description</TR_SCREENPARTY_DESCRIPTION>
<TR_SCREENPARTY_AUTHOR>Author</TR_SCREENPARTY_AUTHOR> <TR_SCREENPARTY_AUTHOR>Author</TR_SCREENPARTY_AUTHOR>
<TR_SCREENPARTY_VERSION>Version</TR_SCREENPARTY_VERSION> <TR_SCREENPARTY_VERSION>Version</TR_SCREENPARTY_VERSION>
<TR_SCREENPARTY_ERROR>Can't load this party-mode.</TR_SCREENPARTY_ERROR> <TR_SCREENPARTY_ERROR>Can't load this party-mode.</TR_SCREENPARTY_ERROR>
<TR_SCREENPARTY_TARGETAUDIENCE>Target audience</TR_SCREENPARTY_TARGETAUDIENCE>
<TR_SCREENPARTY_NOTEAMS>No teams</TR_SCREENPARTY_NOTEAMS>
<TR_SCREENPARTY_NUMTEAMS>Number of teams</TR_SCREENPARTY_NUMTEAMS>
<TR_SCREENPARTY_NUMPLAYERS>Number of players</TR_SCREENPARTY_NUMPLAYERS>
<!--ScreenNames--> <!--ScreenNames-->
<TR_SCREENNAMES_MENU>Player Selection</TR_SCREENNAMES_MENU> <TR_SCREENNAMES_MENU>Player Selection</TR_SCREENNAMES_MENU>
<TR_SCREENNAMES_PLAYER>Player</TR_SCREENNAMES_PLAYER> <TR_SCREENNAMES_PLAYER>Player</TR_SCREENNAMES_PLAYER>
Output/Languages/French.xml
+5 -1
View File
@@ -112,7 +112,11 @@
<TR_SCREENPARTY_DESCRIPTION>TODO: Description</TR_SCREENPARTY_DESCRIPTION> <TR_SCREENPARTY_DESCRIPTION>TODO: Description</TR_SCREENPARTY_DESCRIPTION>
<TR_SCREENPARTY_AUTHOR>TODO: Author</TR_SCREENPARTY_AUTHOR> <TR_SCREENPARTY_AUTHOR>TODO: Author</TR_SCREENPARTY_AUTHOR>
<TR_SCREENPARTY_VERSION>TODO: Version</TR_SCREENPARTY_VERSION> <TR_SCREENPARTY_VERSION>TODO: Version</TR_SCREENPARTY_VERSION>
<TR_SCREENPARTY_ERROR>TODO: Can't load this party-mode.</TR_SCREENPARTY_ERROR> <TR_SCREENPARTY_ERROR>TODO: Can't load this party-mode.</TR_SCREENPARTY_ERROR>
<TR_SCREENPARTY_TARGETAUDIENCE>TODO: Target audience</TR_SCREENPARTY_TARGETAUDIENCE>
<TR_SCREENPARTY_NOTEAMS>TODO: No Teams</TR_SCREENPARTY_NOTEAMS>
<TR_SCREENPARTY_NUMTEAMS>TODO: Number of teams</TR_SCREENPARTY_NUMTEAMS>
<TR_SCREENPARTY_NUMPLAYERS>TODO: Number of players</TR_SCREENPARTY_NUMPLAYERS>
<!--ScreenNames--> <!--ScreenNames-->
<TR_SCREENNAMES_MENU>Sélection des joueurs</TR_SCREENNAMES_MENU> <TR_SCREENNAMES_MENU>Sélection des joueurs</TR_SCREENNAMES_MENU>
<TR_SCREENNAMES_PLAYER>Joueur</TR_SCREENNAMES_PLAYER> <TR_SCREENNAMES_PLAYER>Joueur</TR_SCREENNAMES_PLAYER>
Output/Languages/Spanish.xml
+5 -1
View File
@@ -106,7 +106,11 @@
<TR_SCREENPARTY_DESCRIPTION>TODO: Description</TR_SCREENPARTY_DESCRIPTION> <TR_SCREENPARTY_DESCRIPTION>TODO: Description</TR_SCREENPARTY_DESCRIPTION>
<TR_SCREENPARTY_AUTHOR>TODO: Author</TR_SCREENPARTY_AUTHOR> <TR_SCREENPARTY_AUTHOR>TODO: Author</TR_SCREENPARTY_AUTHOR>
<TR_SCREENPARTY_VERSION>TODO: Version</TR_SCREENPARTY_VERSION> <TR_SCREENPARTY_VERSION>TODO: Version</TR_SCREENPARTY_VERSION>
<TR_SCREENPARTY_ERROR>TODO: Can't load this party-mode.</TR_SCREENPARTY_ERROR> <TR_SCREENPARTY_ERROR>TODO: Can't load this party-mode.</TR_SCREENPARTY_ERROR>
<TR_SCREENPARTY_TARGETAUDIENCE>TODO: Target audience</TR_SCREENPARTY_TARGETAUDIENCE>
<TR_SCREENPARTY_NOTEAMS>TODO: No Teams</TR_SCREENPARTY_NOTEAMS>
<TR_SCREENPARTY_NUMTEAMS>TODO: Number of teams</TR_SCREENPARTY_NUMTEAMS>
<TR_SCREENPARTY_NUMPLAYERS>TODO: Number of players</TR_SCREENPARTY_NUMPLAYERS>
<!--ScreenNames--> <!--ScreenNames-->
<TR_SCREENNAMES_MENU>Selección de Jugadores</TR_SCREENNAMES_MENU> <TR_SCREENNAMES_MENU>Selección de Jugadores</TR_SCREENNAMES_MENU>
<TR_SCREENNAMES_PLAYER>Jugador</TR_SCREENNAMES_PLAYER> <TR_SCREENNAMES_PLAYER>Jugador</TR_SCREENNAMES_PLAYER>
Output/Themes/Ambient/Screens/ScreenParty.xml
+182 -5
View File
@@ -140,7 +140,7 @@
<!--<Font>: Text font name--> <!--<Font>: Text font name-->
<Font>Outline</Font> <Font>Outline</Font>
<!--<Text>: Nothing or translation tag--> <!--<Text>: Nothing or translation tag-->
<Text>TR_SCREENPARTY_AUTHOR</Text> <Text>TR_SCREENPARTY_TARGETAUDIENCE</Text>
<!--<Reflection> If exists:--> <!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space--> <!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height--> <!-- <Height>: Reflection Height-->
@@ -169,11 +169,98 @@
<!--<Font>: Text font name--> <!--<Font>: Text font name-->
<Font>Outline</Font> <Font>Outline</Font>
<!--<Text>: Nothing or translation tag--> <!--<Text>: Nothing or translation tag-->
<Text>TR_SCREENPARTY_VERSION</Text> <Text>TR_SCREENPARTY_NUMTEAMS</Text>
<!--<Reflection> If exists:--> <!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space--> <!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height--> <!-- <Height>: Reflection Height-->
</Text5> </Text5>
<Text6>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>345</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Nothing or translation tag-->
<Text>TR_SCREENPARTY_NUMPLAYERS</Text>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</Text6>
<Text7>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>405</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Nothing or translation tag-->
<Text>TR_SCREENPARTY_AUTHOR</Text>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</Text7>
<Text8>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>465</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Nothing or translation tag-->
<Text>TR_SCREENPARTY_VERSION</Text>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</Text8>
<TextDescription> <TextDescription>
<!--<X>, <Y>: Text position--> <!--<X>, <Y>: Text position-->
<X>850</X> <X>850</X>
@@ -204,7 +291,7 @@
<!-- <Space>: Reflection Space--> <!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height--> <!-- <Height>: Reflection Height-->
</TextDescription> </TextDescription>
<TextAuthor> <TextTargetAudience>
<!--<X>, <Y>: Text position--> <!--<X>, <Y>: Text position-->
<X>850</X> <X>850</X>
<Y>225</Y> <Y>225</Y>
@@ -233,11 +320,101 @@
<!--<Reflection> If exists:--> <!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space--> <!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height--> <!-- <Height>: Reflection Height-->
</TextTargetAudience>
<TextNumTeams>
<!--<X>, <Y>: Text position-->
<X>850</X>
<Y>285</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>600</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Nothing or translation tag-->
<Text></Text>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</TextNumTeams>
<TextNumPlayers>
<!--<X>, <Y>: Text position-->
<X>850</X>
<Y>345</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>600</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Nothing or translation tag-->
<Text></Text>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</TextNumPlayers>
<TextAuthor>
<!--<X>, <Y>: Text position-->
<X>850</X>
<Y>405</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>600</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Nothing or translation tag-->
<Text></Text>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</TextAuthor> </TextAuthor>
<TextVersion> <TextVersion>
<!--<X>, <Y>: Text position--> <!--<X>, <Y>: Text position-->
<X>850</X> <X>850</X>
<Y>285</Y> <Y>465</Y>
<!--<Z>: Text position--> <!--<Z>: Text position-->
<Z>0,00</Z> <Z>0,00</Z>
<!--<H>: Text height--> <!--<H>: Text height-->
@@ -267,7 +444,7 @@
<TextError> <TextError>
<!--<X>, <Y>: Text position--> <!--<X>, <Y>: Text position-->
<X>850</X> <X>850</X>
<Y>345</Y> <Y>525</Y>
<!--<Z>: Text position--> <!--<Z>: Text position-->
<Z>0,00</Z> <Z>0,00</Z>
<!--<H>: Text height--> <!--<H>: Text height-->
Vocaluxe/Screens/CScreenParty.cs
+23 -2
View File
@@ -14,6 +14,9 @@ namespace Vocaluxe.Screens
const int ScreenVersion = 1; const int ScreenVersion = 1;
const string TextDescription = "TextDescription"; const string TextDescription = "TextDescription";
const string TextTargetAudience = "TextTargetAudience";
const string TextNumTeams = "TextNumTeams";
const string TextNumPlayers = "TextNumPlayers";
const string TextAuthor = "TextAuthor"; const string TextAuthor = "TextAuthor";
const string TextVersion = "TextVersion"; const string TextVersion = "TextVersion";
const string TextError = "TextError"; const string TextError = "TextError";
@@ -33,7 +36,7 @@ namespace Vocaluxe.Screens
_ThemeName = "ScreenParty"; _ThemeName = "ScreenParty";
_ScreenVersion = ScreenVersion; _ScreenVersion = ScreenVersion;
_ThemeTexts = new string[] { TextDescription, TextAuthor, TextVersion, TextError }; _ThemeTexts = new string[] { TextDescription, TextTargetAudience, TextNumTeams, TextNumPlayers, TextAuthor, TextVersion, TextError };
_ThemeButtons = new string[] { ButtonStart, ButtonExit }; _ThemeButtons = new string[] { ButtonStart, ButtonExit };
_ThemeSelectSlides = new string[] { SelectSlideModes }; _ThemeSelectSlides = new string[] { SelectSlideModes };
} }
@@ -143,11 +146,29 @@ namespace Vocaluxe.Screens
if (index >= _PartyModeInfos.Count) if (index >= _PartyModeInfos.Count)
return; return;
//Description
Texts[htTexts(TextDescription)].PartyModeID = _PartyModeInfos[index].PartyModeID; Texts[htTexts(TextDescription)].PartyModeID = _PartyModeInfos[index].PartyModeID;
Texts[htTexts(TextDescription)].Text = _PartyModeInfos[index].Description; 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)].Text = _PartyModeInfos[index].Author;
Texts[htTexts(TextAuthor)].PartyModeID = _PartyModeInfos[index].PartyModeID; 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; Texts[htTexts(TextVersion)].PartyModeID = _PartyModeInfos[index].PartyModeID;
if (!_PartyModeInfos[index].Playable) if (!_PartyModeInfos[index].Playable)