From 7bf41a20921d8670c00c42c39ebb78f06bb63fa7 Mon Sep 17 00:00:00 2001 From: Florian Kuepper Date: Sat, 8 Dec 2012 14:26:52 +0100 Subject: [PATCH 1/6] Theme-fixes on ScreenOptionsVideo. --- .../Ambient/Screens/ScreenOptionsVideo.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml index 80d1ac13..683194b0 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml @@ -215,7 +215,7 @@ - Normal + Outline TR_SCREENO_VIDEO_VIDEOSTOBACKGROUND @@ -244,7 +244,7 @@ - Normal + Outline TR_SCREENO_VIDEO_WEBCAMDEVICES @@ -273,7 +273,7 @@ - Normal + Outline TR_SCREENO_VIDEO_WEBCAMCAPABILITIES @@ -591,7 +591,7 @@ 205,33 - Normal + Outline Bold @@ -656,7 +656,7 @@ 205,33 - Normal + Outline Bold @@ -719,9 +719,9 @@ 32,00 - 205,33 + 150,00 - Normal + Outline Bold @@ -744,4 +744,4 @@ - \ No newline at end of file + From f005ba137625c70b175ac3082ed4efec5ca1bbb0 Mon Sep 17 00:00:00 2001 From: Florian Kuepper Date: Sat, 8 Dec 2012 14:30:26 +0100 Subject: [PATCH 2/6] Fix for debug-drawing. --- Output/Languages/Deutsch.xml | 1 + Output/Languages/English.xml | 1 + Vocaluxe/Menu/CGraphics.cs | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Output/Languages/Deutsch.xml b/Output/Languages/Deutsch.xml index a0d3db84..049ce2b3 100644 --- a/Output/Languages/Deutsch.xml +++ b/Output/Languages/Deutsch.xml @@ -18,6 +18,7 @@ Textures ToneAbs Max. Volume + Geladene Songs Maus Normal diff --git a/Output/Languages/English.xml b/Output/Languages/English.xml index c6859e32..39a1a327 100644 --- a/Output/Languages/English.xml +++ b/Output/Languages/English.xml @@ -18,6 +18,7 @@ Textures ToneAbs Max Volume + Loaded songs Mouse Normal diff --git a/Vocaluxe/Menu/CGraphics.cs b/Vocaluxe/Menu/CGraphics.cs index 4aa62249..a6725f56 100644 --- a/Vocaluxe/Menu/CGraphics.cs +++ b/Vocaluxe/Menu/CGraphics.cs @@ -732,7 +732,7 @@ namespace Vocaluxe.Menu dy += rect.Height; } - if (CConfig.DebugLevel >= EDebugLevel.TR_CONFIG_LEVEL2) + if (CConfig.DebugLevel >= EDebugLevel.TR_CONFIG_LEVEL3) { txt = CSongs.NumSongsWithCoverLoaded.ToString(CLanguage.Translate("TR_DEBUG_SONGS") + ": 00000"); @@ -743,7 +743,7 @@ namespace Vocaluxe.Menu dy += rect.Height; } - if (CConfig.DebugLevel >= EDebugLevel.TR_CONFIG_LEVEL2) + if (CConfig.DebugLevel >= EDebugLevel.TR_CONFIG_LEVEL_MAX) { txt = _Cursor.X.ToString(CLanguage.Translate("TR_DEBUG_MOUSE") + " : (0000/") + _Cursor.Y.ToString("0000)"); From d6d29d533444f4617dc148ce848dc1acfb7e8ba2 Mon Sep 17 00:00:00 2001 From: Florian Kuepper Date: Sat, 8 Dec 2012 15:08:02 +0100 Subject: [PATCH 3/6] Fix for profile-screen. --- .../Themes/Ambient/Screens/ScreenProfiles.xml | 22 +++---------------- Vocaluxe/Screens/CScreenProfiles.cs | 9 ++++++++ 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/Output/Themes/Ambient/Screens/ScreenProfiles.xml b/Output/Themes/Ambient/Screens/ScreenProfiles.xml index 06cf67ca..9e161ea7 100644 --- a/Output/Themes/Ambient/Screens/ScreenProfiles.xml +++ b/Output/Themes/Ambient/Screens/ScreenProfiles.xml @@ -697,7 +697,7 @@ Button 300 - 210 + 205 0,00 150 50 @@ -735,17 +735,9 @@ - - 10 - 26 - - - 10 - 26 - @@ -754,7 +746,7 @@ Button 300 - 110 + 125 0,00 150 50 @@ -792,17 +784,9 @@ - - 10 - 26 - - - 10 - 26 - @@ -1130,4 +1114,4 @@ 2 - \ No newline at end of file + diff --git a/Vocaluxe/Screens/CScreenProfiles.cs b/Vocaluxe/Screens/CScreenProfiles.cs index 822ebc5f..ba280fd0 100644 --- a/Vocaluxe/Screens/CScreenProfiles.cs +++ b/Vocaluxe/Screens/CScreenProfiles.cs @@ -206,6 +206,8 @@ namespace Vocaluxe.Screens { CProfiles.SetAvatar(SelectSlides[htSelectSlides(SelectSlideProfiles)].Selection, SelectSlides[htSelectSlides(SelectSlideAvatars)].Selection); + if (CWebcam.GetDevices().Length > 0 && _WebcamTexture.index > 0) + OnDiscardSnapshot(); } else if (SelectSlides[htSelectSlides(SelectSlideGuestProfile)].Selected) { CProfiles.SetGuestProfile(SelectSlides[htSelectSlides(SelectSlideProfiles)].Selection, @@ -339,6 +341,13 @@ namespace Vocaluxe.Screens UpdateGame(); } + public override void OnClose() + { + base.OnClose(); + + OnDiscardSnapshot(); + } + public override bool Draw() { return base.Draw(); From efd182544fb0d406fd782ec61f94bde513d75876 Mon Sep 17 00:00:00 2001 From: Florian Kuepper Date: Sat, 8 Dec 2012 16:26:22 +0100 Subject: [PATCH 4/6] Update screen-version. --- Output/Themes/Ambient/Screens/ScreenSing.xml | 4 ++-- Output/Themes/Changelog/Changelog_ScreenSing.txt | 2 +- Vocaluxe/Screens/CScreenSing.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Output/Themes/Ambient/Screens/ScreenSing.xml b/Output/Themes/Ambient/Screens/ScreenSing.xml index 21d12061..f4708b96 100644 --- a/Output/Themes/Ambient/Screens/ScreenSing.xml +++ b/Output/Themes/Ambient/Screens/ScreenSing.xml @@ -1,7 +1,7 @@  - 5 + 6 None @@ -2771,4 +2771,4 @@ - \ No newline at end of file + diff --git a/Output/Themes/Changelog/Changelog_ScreenSing.txt b/Output/Themes/Changelog/Changelog_ScreenSing.txt index 9027a30c..85b859da 100644 --- a/Output/Themes/Changelog/Changelog_ScreenSing.txt +++ b/Output/Themes/Changelog/Changelog_ScreenSing.txt @@ -1,7 +1,7 @@ ScreenSing +++++++++ -Version 5 +Version 6 Add: and (only showed when sining duet) diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs index 25cea953..decdf754 100644 --- a/Vocaluxe/Screens/CScreenSing.cs +++ b/Vocaluxe/Screens/CScreenSing.cs @@ -17,7 +17,7 @@ namespace Vocaluxe.Screens class CScreenSing : CMenu { // Version number for theme files. Increment it, if you've changed something on the theme files! - const int ScreenVersion = 5; + const int ScreenVersion = 6; struct TimeRect { From 088343203fe8618c7e5dab5c8b8855a6dbb9a7d1 Mon Sep 17 00:00:00 2001 From: Florian Kuepper Date: Sat, 8 Dec 2012 16:57:05 +0100 Subject: [PATCH 5/6] Update theme-changelogs. --- Output/Themes/Changelog/Changelog_ScreenOptionsVideo.txt | 9 +++++++++ output/Themes/Changelog/Changelog_ScreenProfiles.txt | 7 +++++++ 2 files changed, 16 insertions(+) create mode 100644 output/Themes/Changelog/Changelog_ScreenProfiles.txt diff --git a/Output/Themes/Changelog/Changelog_ScreenOptionsVideo.txt b/Output/Themes/Changelog/Changelog_ScreenOptionsVideo.txt index a6898ab5..790413d4 100644 --- a/Output/Themes/Changelog/Changelog_ScreenOptionsVideo.txt +++ b/Output/Themes/Changelog/Changelog_ScreenOptionsVideo.txt @@ -1,5 +1,14 @@ ScreenOptionsTheme +++++++++++ +Version 3: + +Add: +, , + +and some texts and static for description (Text6, Text7) +"TR_SCREENO_VIDEO_WEBCAMDEVICES", "TR_SCREENO_VIDEO_WEBCAMCAPABILITIES" + ++++++++++ Version 2: diff --git a/output/Themes/Changelog/Changelog_ScreenProfiles.txt b/output/Themes/Changelog/Changelog_ScreenProfiles.txt new file mode 100644 index 00000000..65dae6e8 --- /dev/null +++ b/output/Themes/Changelog/Changelog_ScreenProfiles.txt @@ -0,0 +1,7 @@ +ScreenProfiles + +++++++++++ +Version 2: + +Add: , , , +++++++++++ \ No newline at end of file From 9db2d63026ba7b84e92c01439b59f2cc3243ba18 Mon Sep 17 00:00:00 2001 From: Florian Kuepper Date: Sat, 8 Dec 2012 16:57:16 +0100 Subject: [PATCH 6/6] Fix for profiles-screen. --- Vocaluxe/Screens/CScreenProfiles.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Vocaluxe/Screens/CScreenProfiles.cs b/Vocaluxe/Screens/CScreenProfiles.cs index ba280fd0..ec94f1e5 100644 --- a/Vocaluxe/Screens/CScreenProfiles.cs +++ b/Vocaluxe/Screens/CScreenProfiles.cs @@ -71,6 +71,8 @@ namespace Vocaluxe.Screens Buttons[htButtons(ButtonTakeSnapshot)].Visible = false; if (CWebcam.GetDevices().Length > 0) Buttons[htButtons(ButtonWebcam)].Visible = true; + else + Buttons[htButtons(ButtonWebcam)].Visible = false; SelectSlides[htSelectSlides(SelectSlideDifficulty)].SetValues(0); SelectSlides[htSelectSlides(SelectSlideGuestProfile)].SetValues(0); SelectSlides[htSelectSlides(SelectSlideActive)].SetValues(0);