diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml index e8a60c00..cabb55d9 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml @@ -1,7 +1,7 @@  - 4 + 5 Video @@ -238,7 +238,7 @@ - + 75 347 @@ -266,8 +266,8 @@ - - + + 75 407 @@ -295,7 +295,7 @@ - + Button diff --git a/Output/Themes/Changelog/Changelog_ScreenOptionsVideo.txt b/Output/Themes/Changelog/Changelog_ScreenOptionsVideo.txt index dea01208..9e8d37df 100644 --- a/Output/Themes/Changelog/Changelog_ScreenOptionsVideo.txt +++ b/Output/Themes/Changelog/Changelog_ScreenOptionsVideo.txt @@ -1,4 +1,8 @@ -ScreenOptionsTheme +++++++++++ +Version 5: + +Rename: +Text5/6 to TextWebcam/TextWebcamResolution ++++++++++ Version 4: diff --git a/Vocaluxe/Screens/CScreenOptionsVideo.cs b/Vocaluxe/Screens/CScreenOptionsVideo.cs index a4cd2268..a2bf330d 100644 --- a/Vocaluxe/Screens/CScreenOptionsVideo.cs +++ b/Vocaluxe/Screens/CScreenOptionsVideo.cs @@ -30,7 +30,7 @@ namespace Vocaluxe.Screens // Version number for theme files. Increment it, if you've changed something on the theme files! protected override int _ScreenVersion { - get { return 4; } + get { return 5; } } private const string _SelectSlideVideoBackgrounds = "SelectSlideVideoBackgrounds"; @@ -45,6 +45,9 @@ namespace Vocaluxe.Screens private const string _ButtonScreenAdjustments = "ButtonScreenAdjustments"; private const string _ButtonExit = "ButtonExit"; + private const string _TextWebcams = "TextWebcams"; + private const string _TextWebcamResolution = "TextWebcamResolution"; + private SWebcamConfig _Config; private CTexture _WebcamTexture; private int _DeviceNr; @@ -61,6 +64,7 @@ namespace Vocaluxe.Screens _SelectSlideVideoBackgrounds, _SelectSlideVideoPreview, _SelectSlideVideosInSongs, _SelectSlideVideosToBackground, _SelectSlideWebcamDevices, _SelectSlideWebcamCapabilities }; + _ThemeTexts = new string[] {_TextWebcams, _TextWebcamResolution}; } public override void LoadTheme(string xmlPath) @@ -213,6 +217,8 @@ namespace Vocaluxe.Screens _SelectSlides[_SelectSlideWebcamDevices].Visible = ssVisible; _SelectSlides[_SelectSlideWebcamCapabilities].Visible = ssVisible; _Statics[_StaticWebcamOutput].Visible = ssVisible; + _Texts[_TextWebcams].Visible = ssVisible; + _Texts[_TextWebcamResolution].Visible = ssVisible; } private void _SaveConfig()