Added screen for screen-adjustments.
This commit is contained in:
1 parent
47006e7d8f
commit
9f6618c77e
9 files changed
+447
-10
No files matched your search
@@ -207,6 +207,13 @@
|
|||||||
<string name="TR_SCREENO_VIDEO_VIDEOSTOBACKGROUND">Display current backgroundmusic video</string>
|
<string name="TR_SCREENO_VIDEO_VIDEOSTOBACKGROUND">Display current backgroundmusic video</string>
|
||||||
<string name="TR_SCREENO_VIDEO_WEBCAMDEVICES">Webcams</string>
|
<string name="TR_SCREENO_VIDEO_WEBCAMDEVICES">Webcams</string>
|
||||||
<string name="TR_SCREENO_VIDEO_WEBCAMCAPABILITIES">Webcamcapabilities</string>
|
<string name="TR_SCREENO_VIDEO_WEBCAMCAPABILITIES">Webcamcapabilities</string>
|
||||||
|
<string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Screen adjustments</string>
|
||||||
|
<string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Press CTR + ALT + SHIFT + Arrows to adjust screen</string>
|
||||||
|
<string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">CTR + ALT + SHIFT + 0 to reset</string>
|
||||||
|
<string name="TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT">Top left</string>
|
||||||
|
<string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Top right</string>
|
||||||
|
<string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMLEFT">Bottom left</string>
|
||||||
|
<string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMRIGHT">Bottom right</string>
|
||||||
<string name="TR_SCREENPVOLUMECONTROL_VOLUME">Volume</string>
|
<string name="TR_SCREENPVOLUMECONTROL_VOLUME">Volume</string>
|
||||||
<string name="TR_SCREENPSERVERQR_ADDRESS">Server address</string>
|
<string name="TR_SCREENPSERVERQR_ADDRESS">Server address</string>
|
||||||
</resources>
|
</resources>
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<root>
|
<root>
|
||||||
<ScreenOptionsVideo>
|
<ScreenOptionsVideo>
|
||||||
<ScreenVersion>3</ScreenVersion>
|
<ScreenVersion>4</ScreenVersion>
|
||||||
<Background1>
|
<Background1>
|
||||||
<!--<Type>: Background type: None, Color, Texture, Video-->
|
<!--<Type>: Background type: None, Color, Texture, Video-->
|
||||||
<Type>Video</Type>
|
<Type>Video</Type>
|
||||||
@@ -81,7 +81,7 @@
|
|||||||
<!--<Skin>: Texture name-->
|
<!--<Skin>: Texture name-->
|
||||||
<Skin>Invisible</Skin>
|
<Skin>Invisible</Skin>
|
||||||
<!--<X>, <Y>, <Z>, <W>, <H>: Static position, width and height-->
|
<!--<X>, <Y>, <Z>, <W>, <H>: Static position, width and height-->
|
||||||
<X>500</X>
|
<X>550</X>
|
||||||
<Y>460</Y>
|
<Y>460</Y>
|
||||||
<Z>0,00</Z>
|
<Z>0,00</Z>
|
||||||
<W>320</W>
|
<W>320</W>
|
||||||
@@ -353,6 +353,63 @@
|
|||||||
<Height>26</Height>
|
<Height>26</Height>
|
||||||
</SReflection>
|
</SReflection>
|
||||||
</ButtonExit>
|
</ButtonExit>
|
||||||
|
<ButtonScreenAdjustments>
|
||||||
|
<!--<Skin>: Texture name-->
|
||||||
|
<Skin>Button</Skin>
|
||||||
|
<!--<SkinSelected>: Texture name for selected button-->
|
||||||
|
<SkinSelected>Button</SkinSelected>
|
||||||
|
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
|
||||||
|
<X>300</X>
|
||||||
|
<Y>600</Y>
|
||||||
|
<Z>0,00</Z>
|
||||||
|
<W>150</W>
|
||||||
|
<H>50</H>
|
||||||
|
<!--<Color>: Button color from ColorScheme (high priority)-->
|
||||||
|
<!--or <R>, <G>, <B>, <A> (lower priority)-->
|
||||||
|
<Color>ButtonColor</Color>
|
||||||
|
<!--<SColor>: Selected button color from ColorScheme (high priority)-->
|
||||||
|
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
|
||||||
|
<SColor>ButtonSColor</SColor>
|
||||||
|
<Text>
|
||||||
|
<!--<X>, <Y>: Text position-->
|
||||||
|
<X>75</X>
|
||||||
|
<Y>12</Y>
|
||||||
|
<!--<H>: Text height-->
|
||||||
|
<H>27</H>
|
||||||
|
<!--<MaxW>: Maximum text width (if exists)-->
|
||||||
|
<MaxW>142</MaxW>
|
||||||
|
<!--<Color>: Text color from ColorScheme (high priority)-->
|
||||||
|
<!--or <R>, <G>, <B>, <A> (lower priority)-->
|
||||||
|
<Color>ButtonTextColor</Color>
|
||||||
|
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
|
||||||
|
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
|
||||||
|
<SColor>ButtonTextSColor</SColor>
|
||||||
|
<!--<Align>: Text align horizontal: Left, Center, Right-->
|
||||||
|
<Align>Center</Align>
|
||||||
|
<!--<ResizeAlign>: 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_SCREENOVIDEO_BUTTON_ADJUSTMENTS</Text>
|
||||||
|
</Text>
|
||||||
|
<!--<Reflection> If exists:-->
|
||||||
|
<!-- <Space>: Reflection Space-->
|
||||||
|
<!-- <Height>: Reflection Height-->
|
||||||
|
<Reflection>
|
||||||
|
<Space>10</Space>
|
||||||
|
<Height>26</Height>
|
||||||
|
</Reflection>
|
||||||
|
<!--<SReflection> If exists:-->
|
||||||
|
<!-- <Space>: Reflection Space of selected button-->
|
||||||
|
<!-- <Height>: Reflection Height of selected button-->
|
||||||
|
<SReflection>
|
||||||
|
<Space>10</Space>
|
||||||
|
<Height>26</Height>
|
||||||
|
</SReflection>
|
||||||
|
</ButtonScreenAdjustments>
|
||||||
<SelectSlideVideoBackgrounds>
|
<SelectSlideVideoBackgrounds>
|
||||||
<!--<Skin>: Texture name-->
|
<!--<Skin>: Texture name-->
|
||||||
<Skin>Invisible</Skin>
|
<Skin>Invisible</Skin>
|
||||||
|
|||||||
@@ -0,0 +1,251 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<root>
|
||||||
|
<ScreenOptionsVideoAdjustments>
|
||||||
|
<ScreenVersion>1</ScreenVersion>
|
||||||
|
<Background1>
|
||||||
|
<!--<Type>: Background type: None, Color, Texture, Video-->
|
||||||
|
<Type>Color</Type>
|
||||||
|
<!--<Video>: Background video name-->
|
||||||
|
<Video>BG_Video</Video>
|
||||||
|
<!--<Skin>: Background Texture name-->
|
||||||
|
<Skin>BG_Options</Skin>
|
||||||
|
<!--<Color>: Background color for type "Color" from ColorScheme (high priority)-->
|
||||||
|
<!--or <R>, <G>, <B>, <A> (lower priority)-->
|
||||||
|
<R>1,00</R>
|
||||||
|
<G>1,00</G>
|
||||||
|
<B>1,00</B>
|
||||||
|
<A>1,00</A>
|
||||||
|
</Background1>
|
||||||
|
<Text1>
|
||||||
|
<!--<X>, <Y>: Text position-->
|
||||||
|
<X>0</X>
|
||||||
|
<Y>0</Y>
|
||||||
|
<!--<Z>: Text position-->
|
||||||
|
<Z>0,00</Z>
|
||||||
|
<!--<H>: Text height-->
|
||||||
|
<H>27</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>
|
||||||
|
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
|
||||||
|
<HAlign>Top</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_SCREENOVIDEOADJUSTMENTS_TOPLEFT</Text>
|
||||||
|
<!--<Reflection> If exists:-->
|
||||||
|
<!-- <Space>: Reflection Space-->
|
||||||
|
<!-- <Height>: Reflection Height-->
|
||||||
|
</Text1>
|
||||||
|
<Text2>
|
||||||
|
<!--<X>, <Y>: Text position-->
|
||||||
|
<X>1280</X>
|
||||||
|
<Y>0</Y>
|
||||||
|
<!--<Z>: Text position-->
|
||||||
|
<Z>0,00</Z>
|
||||||
|
<!--<H>: Text height-->
|
||||||
|
<H>27</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>Right</Align>
|
||||||
|
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
|
||||||
|
<HAlign>Top</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_SCREENOVIDEOADJUSTMENTS_TOPRIGHT</Text>
|
||||||
|
<!--<Reflection> If exists:-->
|
||||||
|
<!-- <Space>: Reflection Space-->
|
||||||
|
<!-- <Height>: Reflection Height-->
|
||||||
|
</Text2>
|
||||||
|
<Text3>
|
||||||
|
<!--<X>, <Y>: Text position-->
|
||||||
|
<X>0</X>
|
||||||
|
<Y>693</Y>
|
||||||
|
<!--<Z>: Text position-->
|
||||||
|
<Z>0,00</Z>
|
||||||
|
<!--<H>: Text height-->
|
||||||
|
<H>27</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>
|
||||||
|
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
|
||||||
|
<HAlign>Bottom</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_SCREENOVIDEOADJUSTMENTS_BOTTOMLEFT</Text>
|
||||||
|
<!--<Reflection> If exists:-->
|
||||||
|
<!-- <Space>: Reflection Space-->
|
||||||
|
<!-- <Height>: Reflection Height-->
|
||||||
|
</Text3>
|
||||||
|
<Text4>
|
||||||
|
<!--<X>, <Y>: Text position-->
|
||||||
|
<X>1280</X>
|
||||||
|
<Y>693</Y>
|
||||||
|
<!--<Z>: Text position-->
|
||||||
|
<Z>0,00</Z>
|
||||||
|
<!--<H>: Text height-->
|
||||||
|
<H>27</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>Right</Align>
|
||||||
|
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
|
||||||
|
<HAlign>Bottom</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_SCREENOVIDEOADJUSTMENTS_BOTTOMRIGHT</Text>
|
||||||
|
<!--<Reflection> If exists:-->
|
||||||
|
<!-- <Space>: Reflection Space-->
|
||||||
|
<!-- <Height>: Reflection Height-->
|
||||||
|
</Text4>
|
||||||
|
<Text5>
|
||||||
|
<!--<X>, <Y>: Text position-->
|
||||||
|
<X>640</X>
|
||||||
|
<Y>320</Y>
|
||||||
|
<!--<Z>: Text position-->
|
||||||
|
<Z>0,00</Z>
|
||||||
|
<!--<H>: Text height-->
|
||||||
|
<H>35</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>Center</Align>
|
||||||
|
<!--<ResizeAlign>: 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_SCREENOVIDEOADJUSTMENTS_NOTES</Text>
|
||||||
|
<!--<Reflection> If exists:-->
|
||||||
|
<!-- <Space>: Reflection Space-->
|
||||||
|
<!-- <Height>: Reflection Height-->
|
||||||
|
</Text5>
|
||||||
|
<Text6>
|
||||||
|
<!--<X>, <Y>: Text position-->
|
||||||
|
<X>640</X>
|
||||||
|
<Y>360</Y>
|
||||||
|
<!--<Z>: Text position-->
|
||||||
|
<Z>0,00</Z>
|
||||||
|
<!--<H>: Text height-->
|
||||||
|
<H>35</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>Center</Align>
|
||||||
|
<!--<ResizeAlign>: 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_SCREENOVIDEOADJUSTMENTS_NOTESRESET</Text>
|
||||||
|
<!--<Reflection> If exists:-->
|
||||||
|
<!-- <Space>: Reflection Space-->
|
||||||
|
<!-- <Height>: Reflection Height-->
|
||||||
|
</Text6>
|
||||||
|
<ButtonExit>
|
||||||
|
<!--<Skin>: Texture name-->
|
||||||
|
<Skin>Button</Skin>
|
||||||
|
<!--<SkinSelected>: Texture name for selected button-->
|
||||||
|
<SkinSelected>Button</SkinSelected>
|
||||||
|
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
|
||||||
|
<X>145</X>
|
||||||
|
<Y>600</Y>
|
||||||
|
<Z>0,00</Z>
|
||||||
|
<W>150</W>
|
||||||
|
<H>50</H>
|
||||||
|
<!--<Color>: Button color from ColorScheme (high priority)-->
|
||||||
|
<!--or <R>, <G>, <B>, <A> (lower priority)-->
|
||||||
|
<Color>ButtonColor</Color>
|
||||||
|
<!--<SColor>: Selected button color from ColorScheme (high priority)-->
|
||||||
|
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
|
||||||
|
<SColor>ButtonSColor</SColor>
|
||||||
|
<Text>
|
||||||
|
<!--<X>, <Y>: Text position-->
|
||||||
|
<X>75</X>
|
||||||
|
<Y>12</Y>
|
||||||
|
<!--<H>: Text height-->
|
||||||
|
<H>27</H>
|
||||||
|
<!--<MaxW>: Maximum text width (if exists)-->
|
||||||
|
<MaxW>142</MaxW>
|
||||||
|
<!--<Color>: Text color from ColorScheme (high priority)-->
|
||||||
|
<!--or <R>, <G>, <B>, <A> (lower priority)-->
|
||||||
|
<Color>ButtonTextColor</Color>
|
||||||
|
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
|
||||||
|
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
|
||||||
|
<SColor>ButtonTextSColor</SColor>
|
||||||
|
<!--<Align>: Text align horizontal: Left, Center, Right-->
|
||||||
|
<Align>Center</Align>
|
||||||
|
<!--<ResizeAlign>: 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_BUTTON_BACK</Text>
|
||||||
|
</Text>
|
||||||
|
<!--<Reflection> If exists:-->
|
||||||
|
<!-- <Space>: Reflection Space-->
|
||||||
|
<!-- <Height>: Reflection Height-->
|
||||||
|
<Reflection>
|
||||||
|
<Space>10</Space>
|
||||||
|
<Height>26</Height>
|
||||||
|
</Reflection>
|
||||||
|
<!--<SReflection> If exists:-->
|
||||||
|
<!-- <Space>: Reflection Space of selected button-->
|
||||||
|
<!-- <Height>: Reflection Height of selected button-->
|
||||||
|
<SReflection>
|
||||||
|
<Space>10</Space>
|
||||||
|
<Height>26</Height>
|
||||||
|
</SReflection>
|
||||||
|
</ButtonExit>
|
||||||
|
</ScreenOptionsVideoAdjustments>
|
||||||
|
</root>
|
||||||
@@ -1,5 +1,11 @@
|
|||||||
ScreenOptionsTheme
|
ScreenOptionsTheme
|
||||||
|
|
||||||
|
++++++++++
|
||||||
|
Version 4:
|
||||||
|
|
||||||
|
Add:
|
||||||
|
<ButtonScreenAdjustments>
|
||||||
|
|
||||||
++++++++++
|
++++++++++
|
||||||
Version 3:
|
Version 3:
|
||||||
|
|
||||||
|
|||||||
@@ -81,6 +81,7 @@ namespace Vocaluxe.Base
|
|||||||
_Screens.Add(new CScreenOptionsSound());
|
_Screens.Add(new CScreenOptionsSound());
|
||||||
_Screens.Add(new CScreenOptionsRecord());
|
_Screens.Add(new CScreenOptionsRecord());
|
||||||
_Screens.Add(new CScreenOptionsVideo());
|
_Screens.Add(new CScreenOptionsVideo());
|
||||||
|
_Screens.Add(new CScreenOptionsVideoAdjustments());
|
||||||
_Screens.Add(new CScreenOptionsLyrics());
|
_Screens.Add(new CScreenOptionsLyrics());
|
||||||
_Screens.Add(new CScreenOptionsTheme());
|
_Screens.Add(new CScreenOptionsTheme());
|
||||||
_Screens.Add(new CScreenNames());
|
_Screens.Add(new CScreenNames());
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ namespace Vocaluxe.Screens
|
|||||||
// 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!
|
||||||
protected override int _ScreenVersion
|
protected override int _ScreenVersion
|
||||||
{
|
{
|
||||||
get { return 3; }
|
get { return 4; }
|
||||||
}
|
}
|
||||||
|
|
||||||
private const string _SelectSlideVideoBackgrounds = "SelectSlideVideoBackgrounds";
|
private const string _SelectSlideVideoBackgrounds = "SelectSlideVideoBackgrounds";
|
||||||
@@ -42,6 +42,7 @@ namespace Vocaluxe.Screens
|
|||||||
|
|
||||||
private const string _StaticWebcamOutput = "StaticWebcamOutput";
|
private const string _StaticWebcamOutput = "StaticWebcamOutput";
|
||||||
|
|
||||||
|
private const string _ButtonScreenAdjustments = "ButtonScreenAdjustments";
|
||||||
private const string _ButtonExit = "ButtonExit";
|
private const string _ButtonExit = "ButtonExit";
|
||||||
|
|
||||||
private SWebcamConfig _Config;
|
private SWebcamConfig _Config;
|
||||||
@@ -54,7 +55,7 @@ namespace Vocaluxe.Screens
|
|||||||
base.Init();
|
base.Init();
|
||||||
|
|
||||||
_ThemeStatics = new string[] {_StaticWebcamOutput};
|
_ThemeStatics = new string[] {_StaticWebcamOutput};
|
||||||
_ThemeButtons = new string[] {_ButtonExit};
|
_ThemeButtons = new string[] {_ButtonExit, _ButtonScreenAdjustments};
|
||||||
_ThemeSelectSlides = new string[]
|
_ThemeSelectSlides = new string[]
|
||||||
{
|
{
|
||||||
_SelectSlideVideoBackgrounds, _SelectSlideVideoPreview, _SelectSlideVideosInSongs, _SelectSlideVideosToBackground, _SelectSlideWebcamDevices,
|
_SelectSlideVideoBackgrounds, _SelectSlideVideoPreview, _SelectSlideVideosInSongs, _SelectSlideVideosToBackground, _SelectSlideWebcamDevices,
|
||||||
@@ -98,6 +99,11 @@ namespace Vocaluxe.Screens
|
|||||||
_SaveConfig();
|
_SaveConfig();
|
||||||
CGraphics.FadeTo(EScreens.ScreenOptions);
|
CGraphics.FadeTo(EScreens.ScreenOptions);
|
||||||
}
|
}
|
||||||
|
else if (_Buttons[_ButtonScreenAdjustments].Selected)
|
||||||
|
{
|
||||||
|
_SaveConfig();
|
||||||
|
CGraphics.FadeTo(EScreens.ScreenOptionsVideoAdjustments);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case Keys.Left:
|
case Keys.Left:
|
||||||
@@ -139,6 +145,8 @@ namespace Vocaluxe.Screens
|
|||||||
_SaveConfig();
|
_SaveConfig();
|
||||||
if (_Buttons[_ButtonExit].Selected)
|
if (_Buttons[_ButtonExit].Selected)
|
||||||
CGraphics.FadeTo(EScreens.ScreenOptions);
|
CGraphics.FadeTo(EScreens.ScreenOptions);
|
||||||
|
if(_Buttons[_ButtonScreenAdjustments].Selected)
|
||||||
|
CGraphics.FadeTo(EScreens.ScreenOptionsVideoAdjustments);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,105 @@
|
|||||||
|
#region license
|
||||||
|
// This file is part of Vocaluxe.
|
||||||
|
//
|
||||||
|
// Vocaluxe is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// Vocaluxe is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Windows.Forms;
|
||||||
|
using Vocaluxe.Base;
|
||||||
|
using VocaluxeLib;
|
||||||
|
using VocaluxeLib.Menu;
|
||||||
|
using VocaluxeLib.Draw;
|
||||||
|
|
||||||
|
namespace Vocaluxe.Screens
|
||||||
|
{
|
||||||
|
class CScreenOptionsVideoAdjustments : CMenu
|
||||||
|
{
|
||||||
|
// Version number for theme files. Increment it, if you've changed something on the theme files!
|
||||||
|
protected override int _ScreenVersion
|
||||||
|
{
|
||||||
|
get { return 1; }
|
||||||
|
}
|
||||||
|
|
||||||
|
private const string _ButtonExit = "ButtonExit";
|
||||||
|
|
||||||
|
public override void Init()
|
||||||
|
{
|
||||||
|
base.Init();
|
||||||
|
|
||||||
|
_ThemeButtons = new string[] { _ButtonExit };
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool HandleInput(SKeyEvent keyEvent)
|
||||||
|
{
|
||||||
|
base.HandleInput(keyEvent);
|
||||||
|
|
||||||
|
if (keyEvent.KeyPressed) { }
|
||||||
|
else
|
||||||
|
{
|
||||||
|
switch (keyEvent.Key)
|
||||||
|
{
|
||||||
|
case Keys.Escape:
|
||||||
|
case Keys.Back:
|
||||||
|
_SaveConfig();
|
||||||
|
CGraphics.FadeTo(EScreens.ScreenOptionsVideo);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case Keys.S:
|
||||||
|
CParty.SetNormalGameMode();
|
||||||
|
CGraphics.FadeTo(EScreens.ScreenSong);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case Keys.Enter:
|
||||||
|
if (_Buttons[_ButtonExit].Selected)
|
||||||
|
{
|
||||||
|
_SaveConfig();
|
||||||
|
CGraphics.FadeTo(EScreens.ScreenOptionsVideo);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool HandleMouse(SMouseEvent mouseEvent)
|
||||||
|
{
|
||||||
|
base.HandleMouse(mouseEvent);
|
||||||
|
|
||||||
|
if (mouseEvent.RB)
|
||||||
|
{
|
||||||
|
_SaveConfig();
|
||||||
|
CGraphics.FadeTo(EScreens.ScreenOptionsVideo);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mouseEvent.LB && _IsMouseOver(mouseEvent))
|
||||||
|
{
|
||||||
|
_SaveConfig();
|
||||||
|
if (_Buttons[_ButtonExit].Selected)
|
||||||
|
CGraphics.FadeTo(EScreens.ScreenOptionsVideo);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool UpdateGame()
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void _SaveConfig()
|
||||||
|
{
|
||||||
|
CConfig.SaveConfig();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -253,6 +253,7 @@
|
|||||||
<Compile Include="Lib\Video\Acinerella\CDecoder.cs" />
|
<Compile Include="Lib\Video\Acinerella\CDecoder.cs" />
|
||||||
<Compile Include="Lib\Video\Acinerella\CFramebuffer.cs" />
|
<Compile Include="Lib\Video\Acinerella\CFramebuffer.cs" />
|
||||||
<Compile Include="Screens\CPopupScreenServerQR.cs" />
|
<Compile Include="Screens\CPopupScreenServerQR.cs" />
|
||||||
|
<Compile Include="Screens\CScreenOptionsVideoAdjustments.cs" />
|
||||||
<Compile Include="SongQueue\CSongQueue.cs" />
|
<Compile Include="SongQueue\CSongQueue.cs" />
|
||||||
<Compile Include="GameModes\IGameMode.cs" />
|
<Compile Include="GameModes\IGameMode.cs" />
|
||||||
<Compile Include="SongQueue\ISongQueue.cs" />
|
<Compile Include="SongQueue\ISongQueue.cs" />
|
||||||
|
|||||||
@@ -331,13 +331,14 @@ namespace VocaluxeLib
|
|||||||
ScreenOptionsSound = 10,
|
ScreenOptionsSound = 10,
|
||||||
ScreenOptionsRecord = 11,
|
ScreenOptionsRecord = 11,
|
||||||
ScreenOptionsVideo = 12,
|
ScreenOptionsVideo = 12,
|
||||||
ScreenOptionsLyrics = 13,
|
ScreenOptionsVideoAdjustments = 13,
|
||||||
ScreenOptionsTheme = 14,
|
ScreenOptionsLyrics = 14,
|
||||||
|
ScreenOptionsTheme = 15,
|
||||||
|
|
||||||
ScreenNames = 15,
|
ScreenNames = 16,
|
||||||
ScreenCredits = 16,
|
ScreenCredits = 17,
|
||||||
ScreenParty = 17,
|
ScreenParty = 18,
|
||||||
ScreenPartyDummy = 18,
|
ScreenPartyDummy = 19,
|
||||||
|
|
||||||
ScreenNull = -1
|
ScreenNull = -1
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user