diff --git a/Output/Languages/Deutsch.xml b/Output/Languages/Deutsch.xml
index 3a43f076..a1a1a3fe 100644
--- a/Output/Languages/Deutsch.xml
+++ b/Output/Languages/Deutsch.xml
@@ -88,6 +88,10 @@
Eigene Musik und Hintergrundmusik
Keine eigene Musik
Nur eigene Musik
+
+ Alle
+ Nur Namen und Avatar
+ Keine
Laden
@@ -180,6 +184,7 @@
Noten-Linien anzeigen
Ton-Helfer anzeigen
Aussehen des Timers
+ Spieler-Infos ein/ausblenden
Cover Ladeverhalten
Videoeinstellungen
diff --git a/Output/Languages/English.xml b/Output/Languages/English.xml
index 8c614755..d77f8593 100644
--- a/Output/Languages/English.xml
+++ b/Output/Languages/English.xml
@@ -88,6 +88,10 @@
Own Music and Background Music
No own Music
Only own Music
+
+ All
+ Only names and avatars
+ Nothing
Loading
@@ -180,6 +184,7 @@
Show Note-Lines
Show Tone-Helper
Timer-Look
+ Fade player-info
Cover Loading Behavior
Video Options
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml b/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml
index ac972646..55ed1267 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml
@@ -1,7 +1,7 @@
- 2
+ 3
Video
@@ -141,6 +141,22 @@
+
+
+ Invisible
+
+ 50
+ 520
+ 0,00
+ 460
+ 50
+
+
+ StaticColor
+
+
+
+
640
@@ -352,11 +368,38 @@
Outline
- TR_SCREENOTHEME_COVERLOADING
+ TR_SCREENOTHEME_FADEINFO
+
+
+ 75
+ 525
+
+ 0,00
+
+ 32
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Left
+
+
+
+ Outline
+
+ TR_SCREENOTHEME_COVERLOADING
+
+
+
+
Button
@@ -802,7 +845,7 @@
2
-
+
Invisible
@@ -865,7 +908,72 @@
Bold
+ 2
+
+
+
+ Invisible
+
+ SelectSlideArrowLeft
+
+ SelectSlideArrowRight
+
+ SelectSlide
+
+ SelectSlideArrowLeft
+
+ SelectSlideArrowRight
+
+ SelectSlide
+
+ 500
+ 520
+ 0,00
+ 700
+ 50
+
+ 505
+ 525
+ 0,00
+ 40
+ 40
+
+ 1170
+ 525
+ 0,00
+ 40
+ 40
+
+
+ SelectSlideColor
+
+
+ SelectSlideSColor
+
+
+ SelectSlideHColor
+
+
+ ArrowColor
+
+
+ ArrowSColor
+
+
+ TextColor
+
+
+ TextSColor
+
+ 32,00
+
+ 616,00
+
+ Outline
+
+ Bold
+
1
-
\ No newline at end of file
+
diff --git a/Vocaluxe/Base/CConfig.cs b/Vocaluxe/Base/CConfig.cs
index 081d2305..e6300f7e 100644
--- a/Vocaluxe/Base/CConfig.cs
+++ b/Vocaluxe/Base/CConfig.cs
@@ -160,6 +160,13 @@ namespace Vocaluxe.Base
TR_CONFIG_PLAYERINFO_OFF
}
+ public enum EFadePlayerInfo
+ {
+ TR_CONFIG_FADEPLAYERINFO_ALL,
+ TR_CONFIG_FADEPLAYERINFO_INFO,
+ TR_CONFIG_FADEPLAYERINFO_OFF
+ }
+
#endregion Enums
static class CConfig
@@ -194,6 +201,7 @@ namespace Vocaluxe.Base
public static EOffOn DrawToneHelper = EOffOn.TR_CONFIG_ON;
public static ETimerLook TimerLook = ETimerLook.TR_CONFIG_TIMERLOOK_EXPANDED;
public static EPlayerInfo PlayerInfo = EPlayerInfo.TR_CONFIG_PLAYERINFO_BOTH;
+ public static EFadePlayerInfo FadePlayerInfo = EFadePlayerInfo.TR_CONFIG_FADEPLAYERINFO_OFF;
public static ECoverLoading CoverLoading = ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART;
// Sound
@@ -311,6 +319,7 @@ namespace Vocaluxe.Base
CHelper.TryGetEnumValueFromXML("//root/Theme/DrawToneHelper", navigator, ref DrawToneHelper);
CHelper.TryGetEnumValueFromXML("//root/Theme/TimerLook", navigator, ref TimerLook);
CHelper.TryGetEnumValueFromXML("//root/Theme/PlayerInfo", navigator, ref PlayerInfo);
+ CHelper.TryGetEnumValueFromXML("//root/Theme/FadePlayerInfo", navigator, ref FadePlayerInfo);
CHelper.TryGetEnumValueFromXML("//root/Theme/CoverLoading", navigator, ref CoverLoading);
#endregion Theme
@@ -516,6 +525,9 @@ namespace Vocaluxe.Base
writer.WriteComment("Information about players on SingScreen:" + ListStrings(Enum.GetNames(typeof(EPlayerInfo))));
writer.WriteElementString("PlayerInfo", Enum.GetName(typeof(EPlayerInfo), PlayerInfo));
+ writer.WriteComment("Fade player-information with lyrics and notebars:" + ListStrings(Enum.GetNames(typeof(EFadePlayerInfo))));
+ writer.WriteElementString("FadePlayerInfo", Enum.GetName(typeof(EFadePlayerInfo), FadePlayerInfo));
+
writer.WriteComment("Cover Loading:" + ListStrings(Enum.GetNames(typeof(ECoverLoading))));
writer.WriteElementString("CoverLoading", Enum.GetName(typeof(ECoverLoading), CoverLoading));
diff --git a/Vocaluxe/Screens/CScreenOptionsTheme.cs b/Vocaluxe/Screens/CScreenOptionsTheme.cs
index 5e83735e..8f7369dc 100644
--- a/Vocaluxe/Screens/CScreenOptionsTheme.cs
+++ b/Vocaluxe/Screens/CScreenOptionsTheme.cs
@@ -12,7 +12,7 @@ namespace Vocaluxe.Screens
class CScreenOptionsTheme : CMenu
{
// Version number for theme files. Increment it, if you've changed something on the theme files!
- const int ScreenVersion = 2;
+ const int ScreenVersion = 3;
private const string SelectSlideTheme = "SelectSlideTheme";
private const string SelectSlideSkin = "SelectSlideSkin";
@@ -20,6 +20,7 @@ namespace Vocaluxe.Screens
private const string SelectSlideNoteLines = "SelectSlideNoteLines";
private const string SelectSlideToneHelper = "SelectSlideToneHelper";
private const string SelectSlideTimerLook = "SelectSlideTimerLook";
+ private const string SelectSlideFadeInfo = "SelectSlideFadeInfo";
private const string SelectSlideCoverLoading = "SelectSlideCoverLoading";
private const string ButtonExit = "ButtonExit";
@@ -49,6 +50,7 @@ namespace Vocaluxe.Screens
SelectSlideNoteLines,
SelectSlideToneHelper,
SelectSlideTimerLook,
+ SelectSlideFadeInfo,
SelectSlideCoverLoading
};
}
@@ -68,6 +70,7 @@ namespace Vocaluxe.Screens
SelectSlides[htSelectSlides(SelectSlideNoteLines)].SetValues((int)CConfig.DrawNoteLines);
SelectSlides[htSelectSlides(SelectSlideToneHelper)].SetValues((int)CConfig.DrawToneHelper);
SelectSlides[htSelectSlides(SelectSlideTimerLook)].SetValues((int)CConfig.TimerLook);
+ SelectSlides[htSelectSlides(SelectSlideFadeInfo)].SetValues((int)CConfig.FadePlayerInfo);
SelectSlides[htSelectSlides(SelectSlideCoverLoading)].SetValues((int)CConfig.CoverLoading);
}
@@ -163,6 +166,7 @@ namespace Vocaluxe.Screens
CConfig.DrawNoteLines = (EOffOn)SelectSlides[htSelectSlides(SelectSlideNoteLines)].Selection;
CConfig.DrawToneHelper = (EOffOn)SelectSlides[htSelectSlides(SelectSlideToneHelper)].Selection;
CConfig.TimerLook = (ETimerLook)SelectSlides[htSelectSlides(SelectSlideTimerLook)].Selection;
+ CConfig.FadePlayerInfo = (EFadePlayerInfo)SelectSlides[htSelectSlides(SelectSlideFadeInfo)].Selection;
CConfig.CoverLoading = (ECoverLoading)SelectSlides[htSelectSlides(SelectSlideCoverLoading)].Selection;
CConfig.SaveConfig();
diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs
index fd0cac43..b2db5f97 100644
--- a/Vocaluxe/Screens/CScreenSing.cs
+++ b/Vocaluxe/Screens/CScreenSing.cs
@@ -284,6 +284,18 @@ namespace Vocaluxe.Screens
for (int p = 0; p < CGame.NumPlayer; p++)
{
SingNotes[htSingNotes(SingBars)].SetAlpha(NoteLines[p], Alpha[CGame.Player[p].LineNr * 2]);
+ if (CConfig.FadePlayerInfo == EFadePlayerInfo.TR_CONFIG_FADEPLAYERINFO_INFO || CConfig.FadePlayerInfo == EFadePlayerInfo.TR_CONFIG_FADEPLAYERINFO_ALL)
+ {
+ Statics[htStatics(StaticAvatars[p,CGame.NumPlayer-1])].Alpha = Alpha[0];
+ Texts[htTexts(TextNames[p,CGame.NumPlayer-1])].Alpha = Alpha[0];
+ }
+ if (CConfig.FadePlayerInfo == EFadePlayerInfo.TR_CONFIG_FADEPLAYERINFO_ALL)
+ {
+ Statics[htStatics(StaticScores[p, CGame.NumPlayer - 1])].Alpha = Alpha[0];
+ Statics[htStatics(StaticAvatars[p, CGame.NumPlayer - 1])].Alpha = Alpha[0];
+ Texts[htTexts(TextNames[p, CGame.NumPlayer - 1])].Alpha = Alpha[0];
+ Texts[htTexts(TextScores[p, CGame.NumPlayer - 1])].Alpha = Alpha[0];
+ }
}
if (Alpha.Length > 2)