Added option to fade out player-info.
This commit is contained in:
1 parent
c004d68a69
commit
6e59020113
6 files changed
+150
-4
No files matched your search
@@ -88,6 +88,10 @@
|
|||||||
<TR_CONFIG_OWN_MUSIC>Eigene Musik und Hintergrundmusik</TR_CONFIG_OWN_MUSIC>
|
<TR_CONFIG_OWN_MUSIC>Eigene Musik und Hintergrundmusik</TR_CONFIG_OWN_MUSIC>
|
||||||
<TR_CONFIG_NO_OWN_MUSIC>Keine eigene Musik</TR_CONFIG_NO_OWN_MUSIC>
|
<TR_CONFIG_NO_OWN_MUSIC>Keine eigene Musik</TR_CONFIG_NO_OWN_MUSIC>
|
||||||
<TR_CONFIG_ONLY_OWN_MUSIC>Nur eigene Musik</TR_CONFIG_ONLY_OWN_MUSIC>
|
<TR_CONFIG_ONLY_OWN_MUSIC>Nur eigene Musik</TR_CONFIG_ONLY_OWN_MUSIC>
|
||||||
|
<!--Config: FadePlayerInfo-->
|
||||||
|
<TR_CONFIG_FADEPLAYERINFO_ALL>Alle</TR_CONFIG_FADEPLAYERINFO_ALL>
|
||||||
|
<TR_CONFIG_FADEPLAYERINFO_INFO>Nur Namen und Avatar</TR_CONFIG_FADEPLAYERINFO_INFO>
|
||||||
|
<TR_CONFIG_FADEPLAYERINFO_OFF>Keine</TR_CONFIG_FADEPLAYERINFO_OFF>
|
||||||
<!--Screens-->
|
<!--Screens-->
|
||||||
<!--ScreenLoad-->
|
<!--ScreenLoad-->
|
||||||
<TR_SCREENLOAD_LOADING>Laden</TR_SCREENLOAD_LOADING>
|
<TR_SCREENLOAD_LOADING>Laden</TR_SCREENLOAD_LOADING>
|
||||||
@@ -180,6 +184,7 @@
|
|||||||
<TR_SCREENOTHEME_NOTELINES>Noten-Linien anzeigen</TR_SCREENOTHEME_NOTELINES>
|
<TR_SCREENOTHEME_NOTELINES>Noten-Linien anzeigen</TR_SCREENOTHEME_NOTELINES>
|
||||||
<TR_SCREENOTHEME_TONEHELPER>Ton-Helfer anzeigen</TR_SCREENOTHEME_TONEHELPER>
|
<TR_SCREENOTHEME_TONEHELPER>Ton-Helfer anzeigen</TR_SCREENOTHEME_TONEHELPER>
|
||||||
<TR_SCREENOTHEME_TIMERLOOK>Aussehen des Timers</TR_SCREENOTHEME_TIMERLOOK>
|
<TR_SCREENOTHEME_TIMERLOOK>Aussehen des Timers</TR_SCREENOTHEME_TIMERLOOK>
|
||||||
|
<TR_SCREENOTHEME_FADEINFO>Spieler-Infos ein/ausblenden</TR_SCREENOTHEME_FADEINFO>
|
||||||
<TR_SCREENOTHEME_COVERLOADING>Cover Ladeverhalten</TR_SCREENOTHEME_COVERLOADING>
|
<TR_SCREENOTHEME_COVERLOADING>Cover Ladeverhalten</TR_SCREENOTHEME_COVERLOADING>
|
||||||
<!--ScreenOptionsVideo-->
|
<!--ScreenOptionsVideo-->
|
||||||
<TR_SCREENOVIDEO_OPTIONS>Videoeinstellungen</TR_SCREENOVIDEO_OPTIONS>
|
<TR_SCREENOVIDEO_OPTIONS>Videoeinstellungen</TR_SCREENOVIDEO_OPTIONS>
|
||||||
|
|||||||
@@ -88,6 +88,10 @@
|
|||||||
<TR_CONFIG_OWN_MUSIC>Own Music and Background Music</TR_CONFIG_OWN_MUSIC>
|
<TR_CONFIG_OWN_MUSIC>Own Music and Background Music</TR_CONFIG_OWN_MUSIC>
|
||||||
<TR_CONFIG_NO_OWN_MUSIC>No own Music</TR_CONFIG_NO_OWN_MUSIC>
|
<TR_CONFIG_NO_OWN_MUSIC>No own Music</TR_CONFIG_NO_OWN_MUSIC>
|
||||||
<TR_CONFIG_ONLY_OWN_MUSIC>Only own Music</TR_CONFIG_ONLY_OWN_MUSIC>
|
<TR_CONFIG_ONLY_OWN_MUSIC>Only own Music</TR_CONFIG_ONLY_OWN_MUSIC>
|
||||||
|
<!--Config: FadePlayerInfo-->
|
||||||
|
<TR_CONFIG_FADEPLAYERINFO_ALL>All</TR_CONFIG_FADEPLAYERINFO_ALL>
|
||||||
|
<TR_CONFIG_FADEPLAYERINFO_INFO>Only names and avatars</TR_CONFIG_FADEPLAYERINFO_INFO>
|
||||||
|
<TR_CONFIG_FADEPLAYERINFO_OFF>Nothing</TR_CONFIG_FADEPLAYERINFO_OFF>
|
||||||
<!--Screens-->
|
<!--Screens-->
|
||||||
<!--ScreenLoad-->
|
<!--ScreenLoad-->
|
||||||
<TR_SCREENLOAD_LOADING>Loading</TR_SCREENLOAD_LOADING>
|
<TR_SCREENLOAD_LOADING>Loading</TR_SCREENLOAD_LOADING>
|
||||||
@@ -180,6 +184,7 @@
|
|||||||
<TR_SCREENOTHEME_NOTELINES>Show Note-Lines</TR_SCREENOTHEME_NOTELINES>
|
<TR_SCREENOTHEME_NOTELINES>Show Note-Lines</TR_SCREENOTHEME_NOTELINES>
|
||||||
<TR_SCREENOTHEME_TONEHELPER>Show Tone-Helper</TR_SCREENOTHEME_TONEHELPER>
|
<TR_SCREENOTHEME_TONEHELPER>Show Tone-Helper</TR_SCREENOTHEME_TONEHELPER>
|
||||||
<TR_SCREENOTHEME_TIMERLOOK>Timer-Look</TR_SCREENOTHEME_TIMERLOOK>
|
<TR_SCREENOTHEME_TIMERLOOK>Timer-Look</TR_SCREENOTHEME_TIMERLOOK>
|
||||||
|
<TR_SCREENOTHEME_FADEINFO>Fade player-info</TR_SCREENOTHEME_FADEINFO>
|
||||||
<TR_SCREENOTHEME_COVERLOADING>Cover Loading Behavior</TR_SCREENOTHEME_COVERLOADING>
|
<TR_SCREENOTHEME_COVERLOADING>Cover Loading Behavior</TR_SCREENOTHEME_COVERLOADING>
|
||||||
<!--ScreenOptionsVideo-->
|
<!--ScreenOptionsVideo-->
|
||||||
<TR_SCREENOVIDEO_OPTIONS>Video Options</TR_SCREENOVIDEO_OPTIONS>
|
<TR_SCREENOVIDEO_OPTIONS>Video Options</TR_SCREENOVIDEO_OPTIONS>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<root>
|
<root>
|
||||||
<ScreenOptionsTheme>
|
<ScreenOptionsTheme>
|
||||||
<ScreenVersion>2</ScreenVersion>
|
<ScreenVersion>3</ScreenVersion>
|
||||||
<Background1>
|
<Background1>
|
||||||
<!--<Type>: Background type: None, Color, Texture, Video-->
|
<!--<Type>: Background type: None, Color, Texture, Video-->
|
||||||
<Type>Video</Type>
|
<Type>Video</Type>
|
||||||
@@ -141,6 +141,22 @@
|
|||||||
<!-- <Space>: Reflection Space-->
|
<!-- <Space>: Reflection Space-->
|
||||||
<!-- <Height>: Reflection Height-->
|
<!-- <Height>: Reflection Height-->
|
||||||
</Static8>
|
</Static8>
|
||||||
|
<Static9>
|
||||||
|
<!--<Skin>: Texture name-->
|
||||||
|
<Skin>Invisible</Skin>
|
||||||
|
<!--<X>, <Y>, <Z>, <W>, <H>: Static position, width and height-->
|
||||||
|
<X>50</X>
|
||||||
|
<Y>520</Y>
|
||||||
|
<Z>0,00</Z>
|
||||||
|
<W>460</W>
|
||||||
|
<H>50</H>
|
||||||
|
<!--<Color>: Static color from ColorScheme (high priority)-->
|
||||||
|
<!--or <R>, <G>, <B>, <A> (lower priority)-->
|
||||||
|
<Color>StaticColor</Color>
|
||||||
|
<!--<Reflection> If exists:-->
|
||||||
|
<!-- <Space>: Reflection Space-->
|
||||||
|
<!-- <Height>: Reflection Height-->
|
||||||
|
</Static9>
|
||||||
<Text1>
|
<Text1>
|
||||||
<!--<X>, <Y>: Text position-->
|
<!--<X>, <Y>: Text position-->
|
||||||
<X>640</X>
|
<X>640</X>
|
||||||
@@ -352,11 +368,38 @@
|
|||||||
<!--<Font>: Text font name-->
|
<!--<Font>: Text font name-->
|
||||||
<Font>Outline</Font>
|
<Font>Outline</Font>
|
||||||
<!--<Text>: Text or translation tag-->
|
<!--<Text>: Text or translation tag-->
|
||||||
<Text>TR_SCREENOTHEME_COVERLOADING</Text>
|
<Text>TR_SCREENOTHEME_FADEINFO</Text>
|
||||||
<!--<Reflection> If exists:-->
|
<!--<Reflection> If exists:-->
|
||||||
<!-- <Space>: Reflection Space-->
|
<!-- <Space>: Reflection Space-->
|
||||||
<!-- <Height>: Reflection Height-->
|
<!-- <Height>: Reflection Height-->
|
||||||
</Text8>
|
</Text8>
|
||||||
|
<Text9>
|
||||||
|
<!--<X>, <Y>: Text position-->
|
||||||
|
<X>75</X>
|
||||||
|
<Y>525</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: Left, Center, Right-->
|
||||||
|
<Align>Left</Align>
|
||||||
|
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
|
||||||
|
<Style>Bold</Style>
|
||||||
|
<!--<Font>: Text font name-->
|
||||||
|
<Font>Outline</Font>
|
||||||
|
<!--<Text>: Text or translation tag-->
|
||||||
|
<Text>TR_SCREENOTHEME_COVERLOADING</Text>
|
||||||
|
<!--<Reflection> If exists:-->
|
||||||
|
<!-- <Space>: Reflection Space-->
|
||||||
|
<!-- <Height>: Reflection Height-->
|
||||||
|
</Text9>
|
||||||
<ButtonExit>
|
<ButtonExit>
|
||||||
<!--<Skin>: Texture name-->
|
<!--<Skin>: Texture name-->
|
||||||
<Skin>Button</Skin>
|
<Skin>Button</Skin>
|
||||||
@@ -802,7 +845,7 @@
|
|||||||
<!--<NumVisible>: Number of visible elements in the slide-->
|
<!--<NumVisible>: Number of visible elements in the slide-->
|
||||||
<NumVisible>2</NumVisible>
|
<NumVisible>2</NumVisible>
|
||||||
</SelectSlideTimerLook>
|
</SelectSlideTimerLook>
|
||||||
<SelectSlideCoverLoading>
|
<SelectSlideFadeInfo>
|
||||||
<!--<Skin>: Texture name-->
|
<!--<Skin>: Texture name-->
|
||||||
<Skin>Invisible</Skin>
|
<Skin>Invisible</Skin>
|
||||||
<!--<SkinArrowLeft>: Texture name of left arrow-->
|
<!--<SkinArrowLeft>: Texture name of left arrow-->
|
||||||
@@ -865,6 +908,71 @@
|
|||||||
<!--<TextStyle>: Text style: Normal, Italic, Bold, BoldItalic-->
|
<!--<TextStyle>: Text style: Normal, Italic, Bold, BoldItalic-->
|
||||||
<TextStyle>Bold</TextStyle>
|
<TextStyle>Bold</TextStyle>
|
||||||
<!--<NumVisible>: Number of visible elements in the slide-->
|
<!--<NumVisible>: Number of visible elements in the slide-->
|
||||||
|
<NumVisible>2</NumVisible>
|
||||||
|
</SelectSlideFadeInfo>
|
||||||
|
<SelectSlideCoverLoading>
|
||||||
|
<!--<Skin>: Texture name-->
|
||||||
|
<Skin>Invisible</Skin>
|
||||||
|
<!--<SkinArrowLeft>: Texture name of left arrow-->
|
||||||
|
<SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
|
||||||
|
<!--<SkinArrowRight>: Texture name of right arrow-->
|
||||||
|
<SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
|
||||||
|
<!--<SkinSelected>: Texture name for selected SelectSlide-->
|
||||||
|
<SkinSelected>SelectSlide</SkinSelected>
|
||||||
|
<!--<SkinArrowLeftSelected>: Texture name of selected left arrow-->
|
||||||
|
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
|
||||||
|
<!--<SkinArrowRightSelected>: Texture name of selected right arrow-->
|
||||||
|
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
|
||||||
|
<!--<SkinHighlighted>: Texture name for highlighted SelectSlide-->
|
||||||
|
<SkinHighlighted>SelectSlide</SkinHighlighted>
|
||||||
|
<!--<X>, <Y>, <Z>, <W>, <H>: SelectSlide position, width and height-->
|
||||||
|
<X>500</X>
|
||||||
|
<Y>520</Y>
|
||||||
|
<Z>0,00</Z>
|
||||||
|
<W>700</W>
|
||||||
|
<H>50</H>
|
||||||
|
<!--<ArrowLeftX>, <ArrowLeftY>, <ArrowLeftZ>, <ArrowLeftW>, <ArrowLeftH>: Left arrow position, width and height-->
|
||||||
|
<ArrowLeftX>505</ArrowLeftX>
|
||||||
|
<ArrowLeftY>525</ArrowLeftY>
|
||||||
|
<ArrowLeftZ>0,00</ArrowLeftZ>
|
||||||
|
<ArrowLeftW>40</ArrowLeftW>
|
||||||
|
<ArrowLeftH>40</ArrowLeftH>
|
||||||
|
<!--<ArrowRightX>, <ArrowRightY>, <ArrowRightZ>, <ArrowRightW>, <ArrowRightH>: Right arrow position, width and height-->
|
||||||
|
<ArrowRightX>1170</ArrowRightX>
|
||||||
|
<ArrowRightY>525</ArrowRightY>
|
||||||
|
<ArrowRightZ>0,00</ArrowRightZ>
|
||||||
|
<ArrowRightW>40</ArrowRightW>
|
||||||
|
<ArrowRightH>40</ArrowRightH>
|
||||||
|
<!--<Color>: SelectSlide color from ColorScheme (high priority)-->
|
||||||
|
<!--or <R>, <G>, <B>, <A> (lower priority)-->
|
||||||
|
<Color>SelectSlideColor</Color>
|
||||||
|
<!--<SColor>: Selected SelectSlide color from ColorScheme (high priority)-->
|
||||||
|
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
|
||||||
|
<SColor>SelectSlideSColor</SColor>
|
||||||
|
<!--<HColor>: Highlighted SelectSlide color from ColorScheme (high priority)-->
|
||||||
|
<!--or <HR>, <HG>, <HB>, <HA> (lower priority)-->
|
||||||
|
<HColor>SelectSlideHColor</HColor>
|
||||||
|
<!--<ArrowColor>: Arrow color from ColorScheme (high priority)-->
|
||||||
|
<!--or <ArrowR>, <ArrowG>, <ArrowB>, <ArrowA> (lower priority)-->
|
||||||
|
<ArrowColor>ArrowColor</ArrowColor>
|
||||||
|
<!--<ArrowSColor>: Selected arrow color from ColorScheme (high priority)-->
|
||||||
|
<!--or <ArrowSR>, <ArrowSG>, <ArrowSB>, <ArrowSA> (lower priority)-->
|
||||||
|
<ArrowSColor>ArrowSColor</ArrowSColor>
|
||||||
|
<!--<TextColor>: Text color from ColorScheme (high priority)-->
|
||||||
|
<!--or <TextR>, <TextG>, <TextB>, <TextA> (lower priority)-->
|
||||||
|
<TextColor>TextColor</TextColor>
|
||||||
|
<!--<TextSColor>: Selected text color from ColorScheme (high priority)-->
|
||||||
|
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
|
||||||
|
<TextSColor>TextSColor</TextSColor>
|
||||||
|
<!--<TextH>: Text height-->
|
||||||
|
<TextH>32,00</TextH>
|
||||||
|
<!--<TextMaxW>: Maximum text width (if exists)-->
|
||||||
|
<TextMaxW>616,00</TextMaxW>
|
||||||
|
<!--<TextFont>: Text font name-->
|
||||||
|
<TextFont>Outline</TextFont>
|
||||||
|
<!--<TextStyle>: Text style: Normal, Italic, Bold, BoldItalic-->
|
||||||
|
<TextStyle>Bold</TextStyle>
|
||||||
|
<!--<NumVisible>: Number of visible elements in the slide-->
|
||||||
<NumVisible>1</NumVisible>
|
<NumVisible>1</NumVisible>
|
||||||
</SelectSlideCoverLoading>
|
</SelectSlideCoverLoading>
|
||||||
</ScreenOptionsTheme>
|
</ScreenOptionsTheme>
|
||||||
|
|||||||
@@ -160,6 +160,13 @@ namespace Vocaluxe.Base
|
|||||||
TR_CONFIG_PLAYERINFO_OFF
|
TR_CONFIG_PLAYERINFO_OFF
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public enum EFadePlayerInfo
|
||||||
|
{
|
||||||
|
TR_CONFIG_FADEPLAYERINFO_ALL,
|
||||||
|
TR_CONFIG_FADEPLAYERINFO_INFO,
|
||||||
|
TR_CONFIG_FADEPLAYERINFO_OFF
|
||||||
|
}
|
||||||
|
|
||||||
#endregion Enums
|
#endregion Enums
|
||||||
|
|
||||||
static class CConfig
|
static class CConfig
|
||||||
@@ -194,6 +201,7 @@ namespace Vocaluxe.Base
|
|||||||
public static EOffOn DrawToneHelper = EOffOn.TR_CONFIG_ON;
|
public static EOffOn DrawToneHelper = EOffOn.TR_CONFIG_ON;
|
||||||
public static ETimerLook TimerLook = ETimerLook.TR_CONFIG_TIMERLOOK_EXPANDED;
|
public static ETimerLook TimerLook = ETimerLook.TR_CONFIG_TIMERLOOK_EXPANDED;
|
||||||
public static EPlayerInfo PlayerInfo = EPlayerInfo.TR_CONFIG_PLAYERINFO_BOTH;
|
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;
|
public static ECoverLoading CoverLoading = ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART;
|
||||||
|
|
||||||
// Sound
|
// Sound
|
||||||
@@ -311,6 +319,7 @@ namespace Vocaluxe.Base
|
|||||||
CHelper.TryGetEnumValueFromXML("//root/Theme/DrawToneHelper", navigator, ref DrawToneHelper);
|
CHelper.TryGetEnumValueFromXML("//root/Theme/DrawToneHelper", navigator, ref DrawToneHelper);
|
||||||
CHelper.TryGetEnumValueFromXML("//root/Theme/TimerLook", navigator, ref TimerLook);
|
CHelper.TryGetEnumValueFromXML("//root/Theme/TimerLook", navigator, ref TimerLook);
|
||||||
CHelper.TryGetEnumValueFromXML("//root/Theme/PlayerInfo", navigator, ref PlayerInfo);
|
CHelper.TryGetEnumValueFromXML("//root/Theme/PlayerInfo", navigator, ref PlayerInfo);
|
||||||
|
CHelper.TryGetEnumValueFromXML("//root/Theme/FadePlayerInfo", navigator, ref FadePlayerInfo);
|
||||||
CHelper.TryGetEnumValueFromXML("//root/Theme/CoverLoading", navigator, ref CoverLoading);
|
CHelper.TryGetEnumValueFromXML("//root/Theme/CoverLoading", navigator, ref CoverLoading);
|
||||||
#endregion Theme
|
#endregion Theme
|
||||||
|
|
||||||
@@ -516,6 +525,9 @@ namespace Vocaluxe.Base
|
|||||||
writer.WriteComment("Information about players on SingScreen:" + ListStrings(Enum.GetNames(typeof(EPlayerInfo))));
|
writer.WriteComment("Information about players on SingScreen:" + ListStrings(Enum.GetNames(typeof(EPlayerInfo))));
|
||||||
writer.WriteElementString("PlayerInfo", Enum.GetName(typeof(EPlayerInfo), PlayerInfo));
|
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.WriteComment("Cover Loading:" + ListStrings(Enum.GetNames(typeof(ECoverLoading))));
|
||||||
writer.WriteElementString("CoverLoading", Enum.GetName(typeof(ECoverLoading), CoverLoading));
|
writer.WriteElementString("CoverLoading", Enum.GetName(typeof(ECoverLoading), CoverLoading));
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ namespace Vocaluxe.Screens
|
|||||||
class CScreenOptionsTheme : CMenu
|
class CScreenOptionsTheme : CMenu
|
||||||
{
|
{
|
||||||
// Version number for theme files. Increment it, if you've changed something on the theme files!
|
// 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 SelectSlideTheme = "SelectSlideTheme";
|
||||||
private const string SelectSlideSkin = "SelectSlideSkin";
|
private const string SelectSlideSkin = "SelectSlideSkin";
|
||||||
@@ -20,6 +20,7 @@ namespace Vocaluxe.Screens
|
|||||||
private const string SelectSlideNoteLines = "SelectSlideNoteLines";
|
private const string SelectSlideNoteLines = "SelectSlideNoteLines";
|
||||||
private const string SelectSlideToneHelper = "SelectSlideToneHelper";
|
private const string SelectSlideToneHelper = "SelectSlideToneHelper";
|
||||||
private const string SelectSlideTimerLook = "SelectSlideTimerLook";
|
private const string SelectSlideTimerLook = "SelectSlideTimerLook";
|
||||||
|
private const string SelectSlideFadeInfo = "SelectSlideFadeInfo";
|
||||||
private const string SelectSlideCoverLoading = "SelectSlideCoverLoading";
|
private const string SelectSlideCoverLoading = "SelectSlideCoverLoading";
|
||||||
|
|
||||||
private const string ButtonExit = "ButtonExit";
|
private const string ButtonExit = "ButtonExit";
|
||||||
@@ -49,6 +50,7 @@ namespace Vocaluxe.Screens
|
|||||||
SelectSlideNoteLines,
|
SelectSlideNoteLines,
|
||||||
SelectSlideToneHelper,
|
SelectSlideToneHelper,
|
||||||
SelectSlideTimerLook,
|
SelectSlideTimerLook,
|
||||||
|
SelectSlideFadeInfo,
|
||||||
SelectSlideCoverLoading
|
SelectSlideCoverLoading
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -68,6 +70,7 @@ namespace Vocaluxe.Screens
|
|||||||
SelectSlides[htSelectSlides(SelectSlideNoteLines)].SetValues<EOffOn>((int)CConfig.DrawNoteLines);
|
SelectSlides[htSelectSlides(SelectSlideNoteLines)].SetValues<EOffOn>((int)CConfig.DrawNoteLines);
|
||||||
SelectSlides[htSelectSlides(SelectSlideToneHelper)].SetValues<EOffOn>((int)CConfig.DrawToneHelper);
|
SelectSlides[htSelectSlides(SelectSlideToneHelper)].SetValues<EOffOn>((int)CConfig.DrawToneHelper);
|
||||||
SelectSlides[htSelectSlides(SelectSlideTimerLook)].SetValues<ETimerLook>((int)CConfig.TimerLook);
|
SelectSlides[htSelectSlides(SelectSlideTimerLook)].SetValues<ETimerLook>((int)CConfig.TimerLook);
|
||||||
|
SelectSlides[htSelectSlides(SelectSlideFadeInfo)].SetValues<EFadePlayerInfo>((int)CConfig.FadePlayerInfo);
|
||||||
SelectSlides[htSelectSlides(SelectSlideCoverLoading)].SetValues<ECoverLoading>((int)CConfig.CoverLoading);
|
SelectSlides[htSelectSlides(SelectSlideCoverLoading)].SetValues<ECoverLoading>((int)CConfig.CoverLoading);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -163,6 +166,7 @@ namespace Vocaluxe.Screens
|
|||||||
CConfig.DrawNoteLines = (EOffOn)SelectSlides[htSelectSlides(SelectSlideNoteLines)].Selection;
|
CConfig.DrawNoteLines = (EOffOn)SelectSlides[htSelectSlides(SelectSlideNoteLines)].Selection;
|
||||||
CConfig.DrawToneHelper = (EOffOn)SelectSlides[htSelectSlides(SelectSlideToneHelper)].Selection;
|
CConfig.DrawToneHelper = (EOffOn)SelectSlides[htSelectSlides(SelectSlideToneHelper)].Selection;
|
||||||
CConfig.TimerLook = (ETimerLook)SelectSlides[htSelectSlides(SelectSlideTimerLook)].Selection;
|
CConfig.TimerLook = (ETimerLook)SelectSlides[htSelectSlides(SelectSlideTimerLook)].Selection;
|
||||||
|
CConfig.FadePlayerInfo = (EFadePlayerInfo)SelectSlides[htSelectSlides(SelectSlideFadeInfo)].Selection;
|
||||||
CConfig.CoverLoading = (ECoverLoading)SelectSlides[htSelectSlides(SelectSlideCoverLoading)].Selection;
|
CConfig.CoverLoading = (ECoverLoading)SelectSlides[htSelectSlides(SelectSlideCoverLoading)].Selection;
|
||||||
|
|
||||||
CConfig.SaveConfig();
|
CConfig.SaveConfig();
|
||||||
|
|||||||
@@ -284,6 +284,18 @@ namespace Vocaluxe.Screens
|
|||||||
for (int p = 0; p < CGame.NumPlayer; p++)
|
for (int p = 0; p < CGame.NumPlayer; p++)
|
||||||
{
|
{
|
||||||
SingNotes[htSingNotes(SingBars)].SetAlpha(NoteLines[p], Alpha[CGame.Player[p].LineNr * 2]);
|
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)
|
if (Alpha.Length > 2)
|
||||||
|
|||||||
Reference in new issue
Block a user