Hide webcam labels if none available

This commit is contained in:
Flamefire committed 2014-04-30 22:48:44 +02:00
1 parent 3bfc789b36
commit 6e4ccb39c0
3 files changed
+17 -7

No files matched your search

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<ScreenOptionsVideo> <ScreenOptionsVideo>
<ScreenVersion>4</ScreenVersion> <ScreenVersion>5</ScreenVersion>
<Background1> <Background1>
<!--<Type>: Background type: None, Color, Texture, Video--> <!--<Type>: Background type: None, Color, Texture, Video-->
<Type>Video</Type> <Type>Video</Type>
@@ -238,7 +238,7 @@
<!-- <Space>: Reflection Space--> <!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height--> <!-- <Height>: Reflection Height-->
</Text5> </Text5>
<Text6> <TextWebcams>
<!--<X>, <Y>: Text position--> <!--<X>, <Y>: Text position-->
<X>75</X> <X>75</X>
<Y>347</Y> <Y>347</Y>
@@ -266,8 +266,8 @@
<!--<Reflection> If exists:--> <!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space--> <!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height--> <!-- <Height>: Reflection Height-->
</Text6> </TextWebcams>
<Text7> <TextWebcamResolution>
<!--<X>, <Y>: Text position--> <!--<X>, <Y>: Text position-->
<X>75</X> <X>75</X>
<Y>407</Y> <Y>407</Y>
@@ -295,7 +295,7 @@
<!--<Reflection> If exists:--> <!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space--> <!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height--> <!-- <Height>: Reflection Height-->
</Text7> </TextWebcamResolution>
<ButtonExit> <ButtonExit>
<!--<Skin>: Texture name--> <!--<Skin>: Texture name-->
<Skin>Button</Skin> <Skin>Button</Skin>
@@ -1,4 +1,8 @@
ScreenOptionsTheme ++++++++++
Version 5:
Rename:
Text5/6 to TextWebcam/TextWebcamResolution
++++++++++ ++++++++++
Version 4: Version 4:
+7 -1
View File
@@ -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 4; } get { return 5; }
} }
private const string _SelectSlideVideoBackgrounds = "SelectSlideVideoBackgrounds"; private const string _SelectSlideVideoBackgrounds = "SelectSlideVideoBackgrounds";
@@ -45,6 +45,9 @@ namespace Vocaluxe.Screens
private const string _ButtonScreenAdjustments = "ButtonScreenAdjustments"; private const string _ButtonScreenAdjustments = "ButtonScreenAdjustments";
private const string _ButtonExit = "ButtonExit"; private const string _ButtonExit = "ButtonExit";
private const string _TextWebcams = "TextWebcams";
private const string _TextWebcamResolution = "TextWebcamResolution";
private SWebcamConfig _Config; private SWebcamConfig _Config;
private CTexture _WebcamTexture; private CTexture _WebcamTexture;
private int _DeviceNr; private int _DeviceNr;
@@ -61,6 +64,7 @@ namespace Vocaluxe.Screens
_SelectSlideVideoBackgrounds, _SelectSlideVideoPreview, _SelectSlideVideosInSongs, _SelectSlideVideosToBackground, _SelectSlideWebcamDevices, _SelectSlideVideoBackgrounds, _SelectSlideVideoPreview, _SelectSlideVideosInSongs, _SelectSlideVideosToBackground, _SelectSlideWebcamDevices,
_SelectSlideWebcamCapabilities _SelectSlideWebcamCapabilities
}; };
_ThemeTexts = new string[] {_TextWebcams, _TextWebcamResolution};
} }
public override void LoadTheme(string xmlPath) public override void LoadTheme(string xmlPath)
@@ -213,6 +217,8 @@ namespace Vocaluxe.Screens
_SelectSlides[_SelectSlideWebcamDevices].Visible = ssVisible; _SelectSlides[_SelectSlideWebcamDevices].Visible = ssVisible;
_SelectSlides[_SelectSlideWebcamCapabilities].Visible = ssVisible; _SelectSlides[_SelectSlideWebcamCapabilities].Visible = ssVisible;
_Statics[_StaticWebcamOutput].Visible = ssVisible; _Statics[_StaticWebcamOutput].Visible = ssVisible;
_Texts[_TextWebcams].Visible = ssVisible;
_Texts[_TextWebcamResolution].Visible = ssVisible;
} }
private void _SaveConfig() private void _SaveConfig()