diff --git a/Output/Languages/Deutsch.xml b/Output/Languages/Deutsch.xml
index 56978034..1593fd3b 100644
--- a/Output/Languages/Deutsch.xml
+++ b/Output/Languages/Deutsch.xml
@@ -101,6 +101,7 @@
Profile
Spielerauswahl
+ Spieler
1 Spieler
2 Spieler
3 Spieler
diff --git a/Output/Languages/English.xml b/Output/Languages/English.xml
index 0b543a31..59a81e1e 100644
--- a/Output/Languages/English.xml
+++ b/Output/Languages/English.xml
@@ -101,6 +101,7 @@
Profiles
Player Selection
+ Player
1 Player
2 Player
3 Player
diff --git a/Output/Languages/French.xml b/Output/Languages/French.xml
index 74c3e558..8021012d 100644
--- a/Output/Languages/French.xml
+++ b/Output/Languages/French.xml
@@ -101,6 +101,7 @@
Profils
Sélection des joueurs
+ Joueur
1 joueur
2 joueurs
3 joueurs
diff --git a/Output/Languages/Spanish.xml b/Output/Languages/Spanish.xml
index 3516d39d..a0600e84 100644
--- a/Output/Languages/Spanish.xml
+++ b/Output/Languages/Spanish.xml
@@ -101,6 +101,7 @@
Perfiles
Selección de Jugadores
+ Jugador
Jugador 1
Jugador 2
Jugador 3
diff --git a/Output/Themes/Ambient/PlayerSelector.png b/Output/Themes/Ambient/PlayerSelector.png
new file mode 100644
index 00000000..c57ab300
Binary files /dev/null and b/Output/Themes/Ambient/PlayerSelector.png differ
diff --git a/Output/Themes/Ambient/Screens/ScreenNames.xml b/Output/Themes/Ambient/Screens/ScreenNames.xml
index 516f554d..8b8ae42a 100644
--- a/Output/Themes/Ambient/Screens/ScreenNames.xml
+++ b/Output/Themes/Ambient/Screens/ScreenNames.xml
@@ -31,106 +31,202 @@
- Button
+ PlayerSelector
15
100
- 0,00
- 100
- 100
+ -2,00
+ 118
+ 118
- StaticColor
+ Player1
- Button
+ PlayerSelector
15
255
- 0,00
- 100
- 100
+ -2,00
+ 118
+ 118
- StaticColor
+ Player2
- Button
+ PlayerSelector
15
410
- 0,00
- 100
- 100
+ -2,00
+ 118
+ 118
- StaticColor
+ Player3
- Button
+ PlayerSelector
- 1165
+ 1147
100
- 0,00
- 100
- 100
+ -2,00
+ 118
+ 118
- StaticColor
+ Player4
- Button
+ PlayerSelector
- 1165
+ 1147
255
- 0,00
- 100
- 100
+ -2,00
+ 118
+ 118
- StaticColor
+ Player5
- Button
+ PlayerSelector
- 1165
+ 1147
410
- 0,00
- 100
- 100
+ -2,00
+ 118
+ 118
- StaticColor
+ Player6
+
+
+ Invisible
+
+ 20
+ 105
+ -3,00
+ 108
+ 108
+
+
+ Visible
+
+
+
+
+
+
+ Invisible
+
+ 20
+ 260
+ -3,00
+ 108
+ 108
+
+
+ Visible
+
+
+
+
+
+
+ Invisible
+
+ 20
+ 415
+ -3,00
+ 108
+ 108
+
+
+ Visible
+
+
+
+
+
+
+ Invisible
+
+ 1152
+ 105
+ -3,00
+ 108
+ 108
+
+
+ Visible
+
+
+
+
+
+
+ Invisible
+
+ 1152
+ 260
+ -3,00
+ 108
+ 108
+
+
+ Visible
+
+
+
+
+
+
+ Invisible
+
+ 1152
+ 415
+ -3,00
+ 108
+ 108
+
+
+ Visible
+
+
+
+
Invisible
145
- 660
+ 663
0,00
990
50
@@ -170,8 +266,8 @@
- 65
- 203
+ 74
+ 219
0,00
@@ -197,8 +293,8 @@
- 65
- 358
+ 74
+ 374
0,00
@@ -224,8 +320,8 @@
- 65
- 513
+ 74
+ 529
0,00
@@ -251,8 +347,8 @@
- 1205
- 203
+ 1206
+ 219
0,00
@@ -278,8 +374,8 @@
- 1205
- 358
+ 1206
+ 374
0,00
@@ -305,8 +401,8 @@
- 1205
- 513
+ 1206
+ 529
0,00
@@ -333,7 +429,7 @@
640
- 612
+ 615
0,00
@@ -365,7 +461,7 @@
Button
145
- 600
+ 603
0,00
150
50
@@ -420,7 +516,7 @@
Button
985
- 600
+ 603
0,00
150
50
@@ -485,19 +581,19 @@
SelectSlidePlayer
70
- 545
+ 548
0,00
1140
45
75
- 550
+ 553
0,00
40
40
1170
- 550
+ 553
0,00
40
40
@@ -534,10 +630,10 @@
6
- 150
- 100
+ 152
+ 127
0,00
- 1020
+ 970
500
Button
SelectSlideSColor
@@ -548,7 +644,7 @@
100
8
3
- 15
+ 24,28
30
2
diff --git a/Output/Themes/Ambient/Skin Blue.xml b/Output/Themes/Ambient/Skin Blue.xml
index 0e74cee0..b6666254 100644
--- a/Output/Themes/Ambient/Skin Blue.xml
+++ b/Output/Themes/Ambient/Skin Blue.xml
@@ -264,6 +264,7 @@
DuetIcon.png
VideoIcon.png
Invisible.png
+ PlayerSelector.png
[Blue]BG_Video.mp4
@@ -271,4 +272,4 @@
[Blue]IntroMid.mp4
[Blue]IntroOut.mp4
-
\ No newline at end of file
+
diff --git a/Output/Themes/Ambient/Skin Green.xml b/Output/Themes/Ambient/Skin Green.xml
index f09b623f..aad0e003 100644
--- a/Output/Themes/Ambient/Skin Green.xml
+++ b/Output/Themes/Ambient/Skin Green.xml
@@ -264,6 +264,7 @@
DuetIcon.png
VideoIcon.png
Invisible.png
+ PlayerSelector.png
[Green]BG_Video.mp4
@@ -271,4 +272,4 @@
[Green]IntroMid.mp4
[Green]IntroOut.mp4
-
\ No newline at end of file
+
diff --git a/Output/Themes/Ambient/Skin Red.xml b/Output/Themes/Ambient/Skin Red.xml
index 1ab926eb..cc4e2609 100644
--- a/Output/Themes/Ambient/Skin Red.xml
+++ b/Output/Themes/Ambient/Skin Red.xml
@@ -264,6 +264,7 @@
DuetIcon.png
VideoIcon.png
Invisible.png
+ PlayerSelector.png
[Red]BG_Video.mp4
@@ -271,4 +272,4 @@
[Red]IntroMid.mp4
[Red]IntroOut.mp4
-
\ No newline at end of file
+
diff --git a/Output/Themes/Ambient/Skin Yellow.xml b/Output/Themes/Ambient/Skin Yellow.xml
index 8871e722..e0f2737a 100644
--- a/Output/Themes/Ambient/Skin Yellow.xml
+++ b/Output/Themes/Ambient/Skin Yellow.xml
@@ -264,6 +264,7 @@
DuetIcon.png
VideoIcon.png
Invisible.png
+ PlayerSelector.png
[Yellow]BG_Video.mp4
@@ -271,4 +272,4 @@
[Yellow]IntroMid.mp4
[Yellow]IntroOut.mp4
-
\ No newline at end of file
+
diff --git a/Output/Themes/Changelog/Changelog_ScreenNames.txt b/Output/Themes/Changelog/Changelog_ScreenNames.txt
index 8db4f34f..e4613ca9 100644
--- a/Output/Themes/Changelog/Changelog_ScreenNames.txt
+++ b/Output/Themes/Changelog/Changelog_ScreenNames.txt
@@ -8,7 +8,8 @@ Add:
A new Theme-element for name-selecting.
- (One Static for eacht player): Static wich shows the selected player and is used as drop-area
+ (One Static for each player): Static wich is used as drop-area
+ (One Static for each player): Static wich shows the avatar of selected player
(One Text for each player): Text wich shows name of selected player
diff --git a/Vocaluxe/Menu/CNameSelection.cs b/Vocaluxe/Menu/CNameSelection.cs
index b02c2f61..046653d6 100644
--- a/Vocaluxe/Menu/CNameSelection.cs
+++ b/Vocaluxe/Menu/CNameSelection.cs
@@ -368,7 +368,7 @@ namespace Vocaluxe.Menu
{
_Tiles[i].Avatar.Texture = _TextureEmptyTile;
_Tiles[i].Avatar.Color = ColorEmptyTile;
- _Tiles[i].Name.Text = "Name";
+ _Tiles[i].Name.Text = "";
_Tiles[i].PlayerNr = -1;
}
}
diff --git a/Vocaluxe/Screens/CScreenNames.cs b/Vocaluxe/Screens/CScreenNames.cs
index 88c2fad1..c4abddcd 100644
--- a/Vocaluxe/Screens/CScreenNames.cs
+++ b/Vocaluxe/Screens/CScreenNames.cs
@@ -24,7 +24,8 @@ namespace Vocaluxe.Screens
private const string ButtonStart = "ButtonStart";
private const string TextWarning = "TextWarning";
private const string StaticWarning = "StaticWarning";
- private readonly string[] StaticPlayer = new string[] {"StaticPlayer1", "StaticPlayer2", "StaticPlayer3", "StaticPlayer4", "StaticPlayer5", "StaticPlayer6"};
+ private readonly string[] StaticPlayer = new string[] { "StaticPlayer1", "StaticPlayer2", "StaticPlayer3", "StaticPlayer4", "StaticPlayer5", "StaticPlayer6" };
+ private readonly string[] StaticPlayerAvatar = new string[] { "StaticPlayerAvatar1", "StaticPlayerAvatar2", "StaticPlayerAvatar3", "StaticPlayerAvatar4", "StaticPlayerAvatar5", "StaticPlayerAvatar6" };
private readonly string[] TextPlayer = new string[] { "TextPlayer1", "TextPlayer2", "TextPlayer3", "TextPlayer4", "TextPlayer5", "TextPlayer6" };
private bool selectingMouseActive = false;
@@ -51,6 +52,10 @@ namespace Vocaluxe.Screens
foreach(string text in StaticPlayer){
statics.Add(text);
}
+ foreach (string text in StaticPlayerAvatar)
+ {
+ statics.Add(text);
+ }
statics.Add(StaticWarning);
_ThemeStatics = statics.ToArray();
@@ -109,7 +114,7 @@ namespace Vocaluxe.Screens
CGame.Player[selectingKeyboardPlayerNr-1].Difficulty = CProfiles.Profiles[SelectedPlayerNr].Difficulty;
CGame.Player[selectingKeyboardPlayerNr-1].ProfileID = SelectedPlayerNr;
//Update texture and name
- Statics[htStatics(StaticPlayer[selectingKeyboardPlayerNr-1])].Texture = NameSelections[htNameSelections(NameSelection)].TilePlayerAvatar(SelectedPlayerNr).Texture;
+ Statics[htStatics(StaticPlayerAvatar[selectingKeyboardPlayerNr-1])].Texture = NameSelections[htNameSelections(NameSelection)].TilePlayerAvatar(SelectedPlayerNr).Texture;
Texts[htTexts(TextPlayer[selectingKeyboardPlayerNr-1])].Text = CProfiles.Profiles[SelectedPlayerNr].PlayerName;
}
//Reset all values
@@ -252,7 +257,7 @@ namespace Vocaluxe.Screens
CGame.Player[i].Difficulty = CProfiles.Profiles[SelectedPlayerNr].Difficulty;
CGame.Player[i].ProfileID = SelectedPlayerNr;
//Update texture and name
- Statics[htStatics(StaticPlayer[i])].Texture = chooseAvatarStatic.Texture;
+ Statics[htStatics(StaticPlayerAvatar[i])].Texture = chooseAvatarStatic.Texture;
Texts[htTexts(TextPlayer[i])].Text = CProfiles.Profiles[SelectedPlayerNr].PlayerName;
}
}
@@ -377,11 +382,14 @@ namespace Vocaluxe.Screens
if (i <= CGame.NumPlayer)
{
Statics[htStatics("StaticPlayer" + i)].Visible = true;
+ Statics[htStatics("StaticPlayerAvatar" + i)].Visible = true;
Texts[htTexts("TextPlayer" + i)].Visible = true;
+ Texts[htTexts("TextPlayer" + i)].Text = CLanguage.Translate("TR_SCREENNAMES_PLAYER") + " " + i.ToString();
}
else
{
Statics[htStatics("StaticPlayer" + i)].Visible = false;
+ Statics[htStatics("StaticPlayerAvatar" + i)].Visible = false;
Texts[htTexts("TextPlayer" + i)].Visible = false;
}
}