From cbc32231141ede14303d4fc410647d4040ddd911 Mon Sep 17 00:00:00 2001 From: Flamefire Date: Sun, 10 Aug 2014 14:30:18 +0200 Subject: [PATCH 01/29] Remove loading of Covers from xml --- Vocaluxe/Base/CCover.cs | 45 ++++++----------------------------------- 1 file changed, 6 insertions(+), 39 deletions(-) diff --git a/Vocaluxe/Base/CCover.cs b/Vocaluxe/Base/CCover.cs index ac9cc10c..24e25e3e 100644 --- a/Vocaluxe/Base/CCover.cs +++ b/Vocaluxe/Base/CCover.cs @@ -177,62 +177,29 @@ namespace Vocaluxe.Base if (String.IsNullOrEmpty(coverTheme.Name)) return; - var ignoreList = new List(); - string coverPath = Path.Combine(CSettings.ProgramFolder, CSettings.FolderNameCover, coverTheme.Folder); List files = CHelper.ListImageFiles(coverPath, true, true); - CXMLReader xmlReader = CXMLReader.OpenFile(Path.Combine(CSettings.ProgramFolder, CSettings.FolderNameCover, coverTheme.File)); lock (_Covers) { - if (xmlReader != null) - { - _Covers.Clear(); - List cover = xmlReader.GetNames("//root/Cover/*"); - foreach (string coverName in cover) - { - string name; - string filePath; - xmlReader.GetValue("//root/Cover/" + coverName + "/Name", out name, String.Empty); - xmlReader.GetValue("//root/Cover/" + coverName + "/Path", out filePath, String.Empty); - string coverFilePath = Path.Combine(CSettings.ProgramFolder, CSettings.FolderNameCover, coverTheme.Folder, filePath); - if (!File.Exists(coverFilePath)) - continue; - - _AddCover(name, coverFilePath); - ignoreList.Add(Path.GetFileName(coverFilePath)); - - if (name == "NoCover") - NoCover = _Covers[name]; - } - } - - foreach (string file in files) - { - if (!ignoreList.Contains(Path.GetFileName(file))) - _AddCover(Path.GetFileNameWithoutExtension(file), file); - } + _AddCover(Path.GetFileNameWithoutExtension(file), file); + if (_CoverExists("No Cover")) + NoCover = _Covers["No Cover"]; } } /// /// Ads a cover with the given name if it does not exist yet - /// MUST HOLD _Covers lock at this point /// /// Name of the cover /// Filename of image file private static void _AddCover(string name, string file) { - CTexture texture = CDraw.AddTexture(file); - - if (!_CoverExists(name)) - _Covers.Add(name, texture); - else + lock (_Covers) { - CTexture tex = _Covers[name]; - CDraw.RemoveTexture(ref tex); - _Covers[name] = texture; + if (!_CoverExists(name)) + _Covers.Add(name, CDraw.AddTexture(file)); } } } From 8f60d5dae52702f94adc850c39309da214b8a53e Mon Sep 17 00:00:00 2001 From: Flamefire Date: Sun, 10 Aug 2014 14:35:02 +0200 Subject: [PATCH 02/29] Rename LoadCover function --- Vocaluxe/Base/CCover.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Vocaluxe/Base/CCover.cs b/Vocaluxe/Base/CCover.cs index 24e25e3e..61692ce7 100644 --- a/Vocaluxe/Base/CCover.cs +++ b/Vocaluxe/Base/CCover.cs @@ -40,7 +40,7 @@ namespace Vocaluxe.Base public static void Init() { _LoadCoverThemes(); - _LoadCover(CConfig.CoverTheme); + _LoadCovers(CConfig.CoverTheme); } public static void Close() @@ -107,7 +107,7 @@ namespace Vocaluxe.Base public static void ReloadCovers() { _UnloadCovers(); - _LoadCover(CConfig.CoverTheme); + _LoadCovers(CConfig.CoverTheme); } private static void _UnloadCovers() @@ -170,7 +170,7 @@ namespace Vocaluxe.Base /// /// Loads all cover which are defined in the cover config file. /// - private static void _LoadCover(string coverThemeName) + private static void _LoadCovers(string coverThemeName) { SCoverTheme coverTheme = _CoverTheme(coverThemeName); From 43fff7f52fe32a72ce7ba41ffb2d0dda9ea0041e Mon Sep 17 00:00:00 2001 From: Flamefire Date: Thu, 14 Aug 2014 16:03:09 +0200 Subject: [PATCH 03/29] Rename FileName to FilePath --- Vocaluxe/Base/CLanguage.cs | 2 +- VocaluxeLib/CXMLReader.cs | 27 ++++++++++++++++++++++----- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/Vocaluxe/Base/CLanguage.cs b/Vocaluxe/Base/CLanguage.cs index a86faf0f..fb452747 100644 --- a/Vocaluxe/Base/CLanguage.cs +++ b/Vocaluxe/Base/CLanguage.cs @@ -180,7 +180,7 @@ namespace Vocaluxe.Base } catch (Exception e) { - CLog.LogError("Error reading language file " + xmlReader.FileName + ": " + e.Message); + CLog.LogError("Error reading language file " + xmlReader.FilePath + ": " + e.Message); return false; } } diff --git a/VocaluxeLib/CXMLReader.cs b/VocaluxeLib/CXMLReader.cs index 1603af81..4b06b922 100644 --- a/VocaluxeLib/CXMLReader.cs +++ b/VocaluxeLib/CXMLReader.cs @@ -24,17 +24,17 @@ namespace VocaluxeLib public class CXMLReader { private readonly XPathNavigator _Navigator; - private readonly String _FileName; + private readonly String _FilePath; - public string FileName + public string FilePath { - get { return _FileName; } + get { return _FilePath; } } //Private method. Use OpenFile factory method to get an instance private CXMLReader(string uri) { - _FileName = uri; + _FilePath = uri; var xmlDoc = new XPathDocument(uri); _Navigator = xmlDoc.CreateNavigator(); } @@ -88,7 +88,24 @@ namespace VocaluxeLib return GetValue(xPath, out val, value.ToString()) && CHelper.TryParse(val, out value); } - public bool GetValue(string xPath, out string value, string defaultValue) + public bool TryGetColorFromRGBA(string xPath, ref SColorF value) + { + bool result = true; + result &= TryGetFloatValue(xPath + "/R", ref value.R); + result &= TryGetFloatValue(xPath + "/G", ref value.G); + result &= TryGetFloatValue(xPath + "/B", ref value.B); + result &= TryGetFloatValue(xPath + "/A", ref value.A); + if (result) + { + value.R = value.R.Clamp(0f, 1f); + value.G = value.G.Clamp(0f, 1f); + value.B = value.B.Clamp(0f, 1f); + value.A = value.A.Clamp(0f, 1f); + } + return result; + } + + public bool GetValue(string xPath, out string value, string defaultValue = "") { int resultCt = 0; string val = string.Empty; From d20c31ef714ad15c75155a9af817f7d8cb224420 Mon Sep 17 00:00:00 2001 From: Flamefire Date: Thu, 14 Aug 2014 16:06:43 +0200 Subject: [PATCH 04/29] Add additional logging functionality --- Vocaluxe/Base/CMain.cs | 4 ++-- VocaluxeLib/IBasic.cs | 2 +- VocaluxeLib/Menu/CStatic.cs | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Vocaluxe/Base/CMain.cs b/Vocaluxe/Base/CMain.cs index c52a77a3..5856bab5 100644 --- a/Vocaluxe/Base/CMain.cs +++ b/Vocaluxe/Base/CMain.cs @@ -434,9 +434,9 @@ namespace Vocaluxe.Base class CBlog : ILog { - public void LogError(string errorText) + public void LogError(string errorText, bool showMsg = false, bool exit = false) { - CLog.LogError(errorText); + CLog.LogError(errorText, showMsg, exit); } public void LogDebug(string text) diff --git a/VocaluxeLib/IBasic.cs b/VocaluxeLib/IBasic.cs index 404e55a2..ef14e905 100644 --- a/VocaluxeLib/IBasic.cs +++ b/VocaluxeLib/IBasic.cs @@ -152,7 +152,7 @@ namespace VocaluxeLib public interface ILog { - void LogError(string errorText); + void LogError(string errorText, bool showMsg = false, bool exit = false); void LogDebug(string text); void LogSongInfo(string text); } diff --git a/VocaluxeLib/Menu/CStatic.cs b/VocaluxeLib/Menu/CStatic.cs index 327dfc14..6d4c2e35 100644 --- a/VocaluxeLib/Menu/CStatic.cs +++ b/VocaluxeLib/Menu/CStatic.cs @@ -16,7 +16,6 @@ #endregion using System; -using System.Drawing; using System.Xml; using VocaluxeLib.Draw; From 388bd6310f143349577f3b59c1f37a71302ee2cb Mon Sep 17 00:00:00 2001 From: Flamefire Date: Thu, 14 Aug 2014 16:07:06 +0200 Subject: [PATCH 05/29] Add GetSong to Categories --- VocaluxeLib/Songs/CCategory.cs | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/VocaluxeLib/Songs/CCategory.cs b/VocaluxeLib/Songs/CCategory.cs index 43fc78fb..79f5087c 100644 --- a/VocaluxeLib/Songs/CCategory.cs +++ b/VocaluxeLib/Songs/CCategory.cs @@ -56,18 +56,11 @@ namespace VocaluxeLib.Songs return Songs.Count(sp => !sp.IsSung); } - public CCategory(string name, CTexture coverSmall, CTexture coverBig) + public CSong GetSong(int numInCategory) { - Name = name; - CoverTextureSmall = coverSmall; - CoverTextureBig = coverBig; - } - - public CCategory(CCategory cat) - { - Name = cat.Name; - CoverTextureSmall = cat.CoverTextureSmall; - CoverTextureBig = cat.CoverTextureBig; + if (numInCategory >= 0 && numInCategory < Songs.Count) + return CBase.Songs.GetSongByID(Songs[numInCategory].SongID); + return null; } } } \ No newline at end of file From 6b958527ce457168a6d1bb55c13bd88759891bb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Mon, 25 Aug 2014 17:22:13 +0200 Subject: [PATCH 06/29] First try to implement serialisation (for statics). --- VocaluxeLib/Menu/CMenu.cs | 12 ++++++++++++ VocaluxeLib/Menu/CStatic.cs | 29 +++++++++++++++++++++++++-- VocaluxeLib/Structs.cs | 39 +++++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 2 deletions(-) diff --git a/VocaluxeLib/Menu/CMenu.cs b/VocaluxeLib/Menu/CMenu.cs index 01fcb9ab..f754f487 100644 --- a/VocaluxeLib/Menu/CMenu.cs +++ b/VocaluxeLib/Menu/CMenu.cs @@ -21,6 +21,7 @@ using System.Drawing; using System.IO; using System.Windows.Forms; using System.Xml; +using System.Xml.Serialization; using VocaluxeLib.Draw; using VocaluxeLib.Menu.SingNotes; using VocaluxeLib.Menu.SongMenu; @@ -267,6 +268,17 @@ namespace VocaluxeLib.Menu writer.Flush(); } + + //This is only test-stuff and will be removed later + XmlSerializer serializer = new XmlSerializer(typeof(List)); + TextWriter textWriter = new StreamWriter(@Path.Combine(_ThemePath, ThemeName + "_test.xml")); + + List staticsThemes = new List(); + foreach (CStatic st in _Statics) + staticsThemes.Add(st.GetTheme()); + + serializer.Serialize(textWriter, staticsThemes); + textWriter.Close(); } public virtual void ReloadTextures() diff --git a/VocaluxeLib/Menu/CStatic.cs b/VocaluxeLib/Menu/CStatic.cs index 327dfc14..124c57f7 100644 --- a/VocaluxeLib/Menu/CStatic.cs +++ b/VocaluxeLib/Menu/CStatic.cs @@ -16,17 +16,24 @@ #endregion using System; -using System.Drawing; using System.Xml; +using System.Xml.Serialization; using VocaluxeLib.Draw; namespace VocaluxeLib.Menu { - struct SThemeStatic + [XmlType("Static")] + public struct SThemeStatic { + [XmlAttributeAttribute(AttributeName = "Name")] public string Name; + [XmlElement("Skin")] public string TextureName; + [XmlElement("ColorName")] public string ColorName; + public SColorF Color; + public SRectF Rect; + public SReflection Reflection; } public class CStatic : IMenuElement @@ -63,6 +70,11 @@ namespace VocaluxeLib.Menu public EAspect Aspect = EAspect.Stretch; + public CStatic() + { + + } + public CStatic(int partyModeID) { _PartyModeID = partyModeID; @@ -114,6 +126,8 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/W", ref Rect.W); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref Rect.H); + _Theme.Rect = new SRectF(Rect); + if (xmlReader.GetValue(item + "/Color", out _Theme.ColorName, String.Empty)) _ThemeLoaded &= CBase.Theme.GetColor(_Theme.ColorName, skinIndex, out Color); else @@ -124,14 +138,20 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/A", ref Color.A); } + _Theme.Color = new SColorF(Color); + if (xmlReader.ItemExists(item + "/Reflection")) { Reflection = true; _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Reflection/Space", ref ReflectionSpace); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Reflection/Height", ref ReflectionHeight); + _Theme.Reflection = new SReflection(true, ReflectionHeight, ReflectionSpace); } else + { Reflection = false; + _Theme.Reflection = new SReflection(false, 0f, 0f); + } if (_ThemeLoaded) { @@ -229,6 +249,11 @@ namespace VocaluxeLib.Menu LoadTextures(); } + public SThemeStatic GetTheme() + { + return _Theme; + } + #region ThemeEdit public void MoveElement(int stepX, int stepY) { diff --git a/VocaluxeLib/Structs.cs b/VocaluxeLib/Structs.cs index d0c73628..a0a29803 100644 --- a/VocaluxeLib/Structs.cs +++ b/VocaluxeLib/Structs.cs @@ -17,8 +17,10 @@ using System; using System.Collections.Generic; +using System.Diagnostics.Contracts; using System.Drawing; using System.Windows.Forms; +using System.Xml.Serialization; using VocaluxeLib.Songs; namespace VocaluxeLib @@ -27,9 +29,13 @@ namespace VocaluxeLib #region Drawing public struct SColorF { + [XmlElement("R")] public float R; + [XmlElement("G")] public float G; + [XmlElement("B")] public float B; + [XmlElement("A")] public float A; public SColorF(float r, float g, float b, float a) @@ -48,19 +54,27 @@ namespace VocaluxeLib A = color.A; } + [Pure] public Color AsColor() { return Color.FromArgb((int)(A * 255), (int)(R * 255), (int)(G * 255), (int)(B * 255)); } } + [XmlRoot()] public struct SRectF { + [XmlElement("X")] public float X; + [XmlElement("Y")] public float Y; + [XmlElement("W")] public float W; + [XmlElement("H")] public float H; + [XmlElement("Z")] public float Z; + [XmlIgnore] public float Rotation; //0..360° public SRectF(float x, float y, float w, float h, float z) @@ -84,6 +98,31 @@ namespace VocaluxeLib } } + [XmlRoot("Reflection")] + public struct SReflection + { + [XmlAttributeAttribute(AttributeName = "Enabled")] + public bool Enabled; + [XmlElement("Height")] + public float Height; + [XmlElement("Space")] + public float Space; + + public SReflection(bool enabled, float height, float space) + { + Enabled = enabled; + Height = height; + Space = space; + } + + public SReflection(SReflection refl) + { + Enabled = refl.Enabled; + Height = refl.Height; + Space = refl.Space; + } + } + public struct SPoint3F { public float X; From 4bbb0bfb1479fb7336c9a08b2d1d3fb62e74f027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Tue, 26 Aug 2014 09:29:39 +0200 Subject: [PATCH 07/29] Try it for background. --- VocaluxeLib/Menu/CBackground.cs | 22 +++++++++++++++++----- VocaluxeLib/Menu/CMenu.cs | 12 ++++++++++-- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/VocaluxeLib/Menu/CBackground.cs b/VocaluxeLib/Menu/CBackground.cs index 67ba0755..ecf6e971 100644 --- a/VocaluxeLib/Menu/CBackground.cs +++ b/VocaluxeLib/Menu/CBackground.cs @@ -18,6 +18,7 @@ using System; using System.Drawing; using System.Xml; +using System.Xml.Serialization; using System.Diagnostics; using System.Collections.Generic; using VocaluxeLib.Draw; @@ -33,18 +34,22 @@ namespace VocaluxeLib.Menu Video } - struct SThemeBackground + [XmlType("Background")] + public struct SThemeBackground { + [XmlAttributeAttribute(AttributeName = "Name")] public string Name; - + [XmlElement("Type")] public EBackgroundTypes Type; - + [XmlArray] public List SlideShowTextures; - + [XmlElement("Video")] public string VideoName; + [XmlElement("Skin")] public string TextureName; - + [XmlElement("ColorName")] public string ColorName; + public SColorF Color; } public class CBackground : IMenuElement @@ -101,6 +106,8 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= success; } + _Theme.Color = new SColorF(Color); + int i = 1; while (xmlReader.ItemExists(item + "/SlideShow" + i)) @@ -244,6 +251,11 @@ namespace VocaluxeLib.Menu UnloadTextures(); LoadTextures(); } + + public SThemeBackground GetTheme() + { + return _Theme; + } #endregion public #region internal diff --git a/VocaluxeLib/Menu/CMenu.cs b/VocaluxeLib/Menu/CMenu.cs index f754f487..5088f6ae 100644 --- a/VocaluxeLib/Menu/CMenu.cs +++ b/VocaluxeLib/Menu/CMenu.cs @@ -270,14 +270,22 @@ namespace VocaluxeLib.Menu } //This is only test-stuff and will be removed later - XmlSerializer serializer = new XmlSerializer(typeof(List)); TextWriter textWriter = new StreamWriter(@Path.Combine(_ThemePath, ThemeName + "_test.xml")); + //Backgrounds + XmlSerializer serializer = new XmlSerializer(typeof(List)); + List backgroundThemes = new List(); + foreach (CBackground bg in _Backgrounds) + backgroundThemes.Add(bg.GetTheme()); + serializer.Serialize(textWriter, backgroundThemes); + + //Statics + serializer = new XmlSerializer(typeof(List)); List staticsThemes = new List(); foreach (CStatic st in _Statics) staticsThemes.Add(st.GetTheme()); - serializer.Serialize(textWriter, staticsThemes); + textWriter.Close(); } From b2102b11d910ac6ed1eca2ba53bd3dc2a6f6a5f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Tue, 26 Aug 2014 16:48:30 +0200 Subject: [PATCH 08/29] Add serialization for all theme-elements. --- VocaluxeLib/CHelper.cs | 5 + VocaluxeLib/Menu/CBackground.cs | 4 + VocaluxeLib/Menu/CButton.cs | 56 +++++++- VocaluxeLib/Menu/CEqualizer.cs | 57 +++++++- VocaluxeLib/Menu/CLyric.cs | 30 ++++- VocaluxeLib/Menu/CMenu.cs | 94 ++++++++++++- VocaluxeLib/Menu/CNameSelection.cs | 124 +++++++++++++----- VocaluxeLib/Menu/CParticle.cs | 39 +++++- VocaluxeLib/Menu/CPlaylist.cs | 79 ++++++++++- VocaluxeLib/Menu/CScreenSetting.cs | 19 ++- VocaluxeLib/Menu/CSelectSlide.cs | 98 +++++++++++++- VocaluxeLib/Menu/CStatic.cs | 5 + VocaluxeLib/Menu/CText.cs | 60 ++++++++- VocaluxeLib/Menu/SingNotes/CSingNotes.cs | 40 +++++- VocaluxeLib/Menu/SongMenu/CSongMenu.cs | 10 ++ .../Menu/SongMenu/CSongMenuFramework.cs | 78 ++++++++++- VocaluxeLib/Menu/SongMenu/ISongMenu.cs | 3 + 17 files changed, 740 insertions(+), 61 deletions(-) diff --git a/VocaluxeLib/CHelper.cs b/VocaluxeLib/CHelper.cs index 411d39ec..c1c10d5e 100644 --- a/VocaluxeLib/CHelper.cs +++ b/VocaluxeLib/CHelper.cs @@ -302,6 +302,11 @@ namespace VocaluxeLib filename = Path.Combine(path, filename); return filename + ext; } + + public static int Sum(int n) + { + return (n * n + n) / 2; + } } static class CEncoding diff --git a/VocaluxeLib/Menu/CBackground.cs b/VocaluxeLib/Menu/CBackground.cs index ecf6e971..cb353fbe 100644 --- a/VocaluxeLib/Menu/CBackground.cs +++ b/VocaluxeLib/Menu/CBackground.cs @@ -63,6 +63,10 @@ namespace VocaluxeLib.Menu private readonly List _SlideShowTextures = new List(); public SColorF Color; + public bool ThemeLoaded + { + get { return _ThemeLoaded; } + } public string GetThemeName() { diff --git a/VocaluxeLib/Menu/CButton.cs b/VocaluxeLib/Menu/CButton.cs index 1a9a8a49..697f7c18 100644 --- a/VocaluxeLib/Menu/CButton.cs +++ b/VocaluxeLib/Menu/CButton.cs @@ -17,19 +17,36 @@ using System; using System.Xml; +using System.Xml.Serialization; using VocaluxeLib.Draw; namespace VocaluxeLib.Menu { - struct SThemeButton + [XmlType("Button")] + public struct SThemeButton { + [XmlAttributeAttribute(AttributeName = "Name")] public string Name; - public string ColorName; - public string SelColorName; - + [XmlElement("Skin")] public string TextureName; + [XmlElement("SkinSelected")] public string SelTextureName; + public SRectF Rect; + [XmlElement("ColorName")] + public string ColorName; + [XmlElement("Color")] + public SColorF Color; + [XmlElement("SelColorName")] + public string SelColorName; + [XmlElement("SelColor")] + public SColorF SelColor; + [XmlElement("Text")] + public SThemeText Text; + [XmlElement("Reflection")] + public SReflection Reflection; + [XmlElement("SelReflection")] + public SReflection SelReflection; } public class CButton : IMenuElement @@ -86,6 +103,11 @@ namespace VocaluxeLib.Menu return _Theme.Name; } + public bool ThemeLoaded + { + get { return _ThemeLoaded; } + } + public CButton(int partyModeID) { _PartyModeID = partyModeID; @@ -177,22 +199,37 @@ namespace VocaluxeLib.Menu _Reflection = true; _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Reflection/Space", ref _ReflectionSpace); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Reflection/Height", ref _ReflectionHeight); + + _Theme.Reflection = new SReflection(true, _ReflectionHeight, _ReflectionSpace); } else + { _Reflection = false; + _Theme.Reflection = new SReflection(false, 0f, 0f); + } if (xmlReader.ItemExists(item + "/SReflection")) { _SelReflection = true; _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SReflection/Space", ref _SelReflectionSpace); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SReflection/Height", ref _SelReflectionHeight); + + _Theme.SelReflection = new SReflection(true, _SelReflectionHeight, _SelReflectionSpace); } else + { _SelReflection = false; + _Theme.SelReflection = new SReflection(false, 0f, 0f); + } if (_ThemeLoaded) { _Theme.Name = elementName; + _Theme.Rect = new SRectF(Rect); + _Theme.Color = new SColorF(Color); + _Theme.SelColor = new SColorF(SelColor); + _Theme.Text = Text.GetTheme(); + LoadTextures(); } return _ThemeLoaded; @@ -352,11 +389,19 @@ namespace VocaluxeLib.Menu LoadTextures(); } + public SThemeButton GetTheme() + { + return _Theme; + } + #region ThemeEdit public void MoveElement(int stepX, int stepY) { Rect.X += stepX; Rect.Y += stepY; + + _Theme.Rect.X += stepX; + _Theme.Rect.Y += stepY; } public void ResizeElement(int stepW, int stepH) @@ -368,6 +413,9 @@ namespace VocaluxeLib.Menu Rect.H += stepH; if (Rect.H <= 0) Rect.H = 1; + + _Theme.Rect.W = Rect.W; + _Theme.Rect.H = Rect.H; } #endregion ThemeEdit } diff --git a/VocaluxeLib/Menu/CEqualizer.cs b/VocaluxeLib/Menu/CEqualizer.cs index 83bb74c0..0809ef85 100644 --- a/VocaluxeLib/Menu/CEqualizer.cs +++ b/VocaluxeLib/Menu/CEqualizer.cs @@ -17,26 +17,46 @@ using System; using System.Xml; +using System.Xml.Serialization; namespace VocaluxeLib.Menu { - enum EEqualizerStyle + public enum EEqualizerStyle { Columns } - struct SThemeEqualizer + [XmlType("Equalizer")] + public struct SThemeEqualizer { + [XmlAttributeAttribute(AttributeName = "Name")] public string Name; - public string ColorName; - public string MaxColorName; + [XmlElement("Skin")] public string TextureName; - public int NumBars; + [XmlElement("Rect")] + public SRectF Rect; + [XmlElement("NumBars")] + public int NumBars; + [XmlElement("Space")] + public float Space; + [XmlElement("Style")] public EEqualizerStyle Style; + [XmlElement("DrawNegative")] public EOffOn DrawNegative; + + [XmlElement("ColorName")] + public string ColorName; + [XmlElement("Color")] + public SColorF Color; + [XmlElement("MaxColorName")] + public string MaxColorName; + [XmlElement("MaxColor")] + public SColorF MaxColor; + [XmlElement("Reflection")] + public SReflection Reflection; } public class CEqualizer : IMenuElement @@ -63,6 +83,11 @@ namespace VocaluxeLib.Menu return _Theme.Name; } + public bool ThemeLoaded + { + get { return _ThemeLoaded; } + } + private float[] _Bars; private int _MaxBar; private float _MaxVolume; @@ -133,13 +158,23 @@ namespace VocaluxeLib.Menu Reflection = true; _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Reflection/Space", ref ReflectionSpace); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Reflection/Height", ref ReflectionHeight); + + _Theme.Reflection = new SReflection(true, ReflectionHeight, ReflectionSpace); } else + { Reflection = false; + _Theme.Reflection = new SReflection(false, 0f, 0f); + } if (_ThemeLoaded) { _Theme.Name = elementName; + _Theme.Space = Space; + _Theme.Color = new SColorF(Color); + _Theme.MaxColor = new SColorF(MaxColor); + _Theme.Rect = Rect; + _Bars = new float[_Theme.NumBars]; for (int i = 0; i < _Bars.Length; i++) _Bars[i] = 0f; @@ -299,11 +334,19 @@ namespace VocaluxeLib.Menu LoadTextures(); } + public SThemeEqualizer GetTheme() + { + return _Theme; + } + #region ThemeEdit public void MoveElement(int stepX, int stepY) { Rect.X += stepX; Rect.Y += stepY; + + _Theme.Rect.X += stepX; + _Theme.Rect.Y += stepY; } public void ResizeElement(int stepW, int stepH) @@ -312,9 +355,13 @@ namespace VocaluxeLib.Menu if (Rect.W <= 0) Rect.W = 1; + _Theme.Rect.W = Rect.W; + Rect.H += stepH; if (Rect.H <= 0) Rect.H = 1; + + _Theme.Rect.H = Rect.H; } #endregion ThemeEdit } diff --git a/VocaluxeLib/Menu/CLyric.cs b/VocaluxeLib/Menu/CLyric.cs index 68b26136..97a54f5d 100644 --- a/VocaluxeLib/Menu/CLyric.cs +++ b/VocaluxeLib/Menu/CLyric.cs @@ -17,16 +17,28 @@ using System; using System.Xml; +using System.Xml.Serialization; using VocaluxeLib.Songs; namespace VocaluxeLib.Menu { - struct SThemeLyrics + [XmlType("Lyric")] + public struct SThemeLyrics { + [XmlAttributeAttribute(AttributeName = "Name")] public string Name; + [XmlElement("Rect")] + public SRectF Rect; + + [XmlElement("ColorName")] public string ColorName; + [XmlElement("Color")] + public SColorF Color; + [XmlElement("SColorName")] public string SelColorName; + [XmlElement("SColor")] + public SColorF SColor; } public class CLyric : IMenuElement @@ -56,6 +68,11 @@ namespace VocaluxeLib.Menu return _Theme.Name; } + public bool ThemeLoaded + { + get { return _ThemeLoaded; } + } + public SRectF Rect { get { return new SRectF(_X, _Y, _MaxW, _H, _Z); } @@ -141,6 +158,10 @@ namespace VocaluxeLib.Menu if (_ThemeLoaded) { _Theme.Name = elementName; + _Theme.Color = new SColorF(_Color); + _Theme.SColor = new SColorF(_ColorProcessed); + _Theme.Rect = new SRectF(Rect); + LoadTextures(); _Text = new CText(_X, _Y, _Z, _H, _MaxW, EAlignment.Left, EStyle.Bold, "Normal", _Color, String.Empty); } @@ -480,6 +501,11 @@ namespace VocaluxeLib.Menu LoadTextures(); } + public SThemeLyrics GetTheme() + { + return _Theme; + } + #region ThemeEdit public void MoveElement(int stepX, int stepY) { @@ -487,6 +513,7 @@ namespace VocaluxeLib.Menu rect.X += stepX; rect.Y += stepY; Rect = rect; + _Theme.Rect = rect; } public void ResizeElement(int stepW, int stepH) @@ -501,6 +528,7 @@ namespace VocaluxeLib.Menu rect.H = 1; Rect = rect; + _Theme.Rect = rect; } #endregion ThemeEdit } diff --git a/VocaluxeLib/Menu/CMenu.cs b/VocaluxeLib/Menu/CMenu.cs index 5088f6ae..c23507cb 100644 --- a/VocaluxeLib/Menu/CMenu.cs +++ b/VocaluxeLib/Menu/CMenu.cs @@ -276,16 +276,106 @@ namespace VocaluxeLib.Menu XmlSerializer serializer = new XmlSerializer(typeof(List)); List backgroundThemes = new List(); foreach (CBackground bg in _Backgrounds) - backgroundThemes.Add(bg.GetTheme()); + if(bg.ThemeLoaded) + backgroundThemes.Add(bg.GetTheme()); serializer.Serialize(textWriter, backgroundThemes); //Statics serializer = new XmlSerializer(typeof(List)); List staticsThemes = new List(); foreach (CStatic st in _Statics) - staticsThemes.Add(st.GetTheme()); + if(st.ThemeLoaded) + staticsThemes.Add(st.GetTheme()); serializer.Serialize(textWriter, staticsThemes); + //Texts + serializer = new XmlSerializer(typeof(List)); + List textsThemes = new List(); + foreach (CText txt in _Texts) + if(txt.ThemeLoaded) + textsThemes.Add(txt.GetTheme()); + serializer.Serialize(textWriter, textsThemes); + + //Buttons + serializer = new XmlSerializer(typeof(List)); + List buttonsThemes = new List(); + foreach (CButton btn in _Buttons) + if (btn.ThemeLoaded) + buttonsThemes.Add(btn.GetTheme()); + serializer.Serialize(textWriter, buttonsThemes); + + //SelectSlides + serializer = new XmlSerializer(typeof(List)); + List selslidesThemes = new List(); + foreach (CSelectSlide ss in _SelectSlides) + if (ss.ThemeLoaded) + selslidesThemes.Add(ss.GetTheme()); + serializer.Serialize(textWriter, selslidesThemes); + + //SongMenu + serializer = new XmlSerializer(typeof(List)); + List smThemes = new List(); + foreach (CSongMenu sm in _SongMenus) + if (sm.ThemeLoaded) + smThemes.Add(sm.GetTheme()); + serializer.Serialize(textWriter, smThemes); + + //Lyrics + serializer = new XmlSerializer(typeof(List)); + List lyThemes = new List(); + foreach (CLyric ly in _Lyrics) + if (ly.ThemeLoaded) + lyThemes.Add(ly.GetTheme()); + serializer.Serialize(textWriter, lyThemes); + + //Singbars + serializer = new XmlSerializer(typeof(List)); + List snThemes = new List(); + foreach (CSingNotes sn in _SingNotes) + if (sn.ThemeLoaded) + snThemes.Add(sn.GetTheme()); + serializer.Serialize(textWriter, snThemes); + + //NameSelections + serializer = new XmlSerializer(typeof(List)); + List nsThemes = new List(); + foreach (CNameSelection ns in _NameSelections) + if (ns.ThemeLoaded) + nsThemes.Add(ns.GetTheme()); + serializer.Serialize(textWriter, nsThemes); + + //Equalizers + serializer = new XmlSerializer(typeof(List)); + List eqThemes = new List(); + foreach (CEqualizer eq in _Equalizers) + if (eq.ThemeLoaded) + eqThemes.Add(eq.GetTheme()); + serializer.Serialize(textWriter, eqThemes); + + //Playlists + serializer = new XmlSerializer(typeof(List)); + List plThemes = new List(); + foreach (CPlaylist pl in _Playlists) + if (pl.ThemeLoaded) + plThemes.Add(pl.GetTheme()); + serializer.Serialize(textWriter, plThemes); + + //ParticleEffects + serializer = new XmlSerializer(typeof(List)); + List peThemes = new List(); + foreach (CParticleEffect pe in _ParticleEffects) + if (pe.ThemeLoaded) + peThemes.Add(pe.GetTheme()); + serializer.Serialize(textWriter, peThemes); + + //ScreenSettings + serializer = new XmlSerializer(typeof(List)); + List seThemes = new List(); + foreach (CScreenSetting se in _ScreenSettings) + if (se.ThemeLoaded) + seThemes.Add(se.GetTheme()); + serializer.Serialize(textWriter, seThemes); + textWriter.Close(); } diff --git a/VocaluxeLib/Menu/CNameSelection.cs b/VocaluxeLib/Menu/CNameSelection.cs index 3fd10b95..3eab70a6 100644 --- a/VocaluxeLib/Menu/CNameSelection.cs +++ b/VocaluxeLib/Menu/CNameSelection.cs @@ -19,23 +19,59 @@ using System; using System.Collections.Generic; using System.Windows.Forms; using System.Xml; +using System.Xml.Serialization; using VocaluxeLib.Draw; using VocaluxeLib.Profile; namespace VocaluxeLib.Menu { - struct SThemeNameSelection + [XmlType("NameSelection")] + public struct SThemeNameSelection { + [XmlAttributeAttribute(AttributeName = "Name")] public string Name; + [XmlElement("Rect")] + public SRectF Rect; + [XmlElement("SkinEmptyTile")] public string TextureEmptyTileName; + [XmlElement("ColorNameEmptyTile")] public string ColorEmptyTileName; + [XmlElement("ColorEmptyTile")] + public SColorF ColorEmptyTile; + [XmlElement("SkinTileSelected")] public string TextureTileSelectedName; - public float NameSpace; - public float NameHeight; - public string NameFont; - public EStyle NameStyle; - public SColorF NameColor; - public string NameColorName; + [XmlElement("Tiles")] + public SThemeNameSelectionTiles Tiles; + } + + public struct SThemeNameSelectionTiles + { + [XmlElement("W")] + public int W; + [XmlElement("H")] + public int H; + [XmlElement("NumW")] + public int NumW; + [XmlElement("NumH")] + public int NumH; + [XmlElement("Name")] + public SThemeNameSelectionName Name; + } + + public struct SThemeNameSelectionName + { + [XmlElement("Space")] + public float Space; + [XmlElement("H")] + public float Height; + [XmlElement("Font")] + public string Font; + [XmlElement("Style")] + public EStyle Style; + [XmlElement("ColorName")] + public string ColorName; + [XmlElement("Color")] + public SColorF Color; } public class CNameSelection : IMenuElement @@ -63,6 +99,11 @@ namespace VocaluxeLib.Menu return _Theme.Name; } + public bool ThemeLoaded + { + get { return _ThemeLoaded; } + } + public bool Selected; public bool Visible = true; @@ -102,6 +143,8 @@ namespace VocaluxeLib.Menu { _PartyModeID = partyModeID; _Theme = new SThemeNameSelection(); + _Theme.Tiles = new SThemeNameSelectionTiles(); + _Theme.Tiles.Name = new SThemeNameSelectionName(); _Tiles = new List(); _VisibleProfiles = new List(); @@ -155,19 +198,19 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= xmlReader.TryGetIntValue(item + "/Tiles/NumH", ref _NumH); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/SpaceW", ref _SpaceW); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/SpaceH", ref _SpaceH); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/Space", ref _Theme.NameSpace); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/H", ref _Theme.NameHeight); - _ThemeLoaded &= xmlReader.GetValue(item + "/Tiles/Name/Font", out _Theme.NameFont, "Normal"); - _ThemeLoaded &= xmlReader.TryGetEnumValue(item + "/Tiles/Name/Style", ref _Theme.NameStyle); - if (xmlReader.GetValue(item + "/Tiles/Name/Color", out _Theme.NameColorName, String.Empty)) - _ThemeLoaded &= CBase.Theme.GetColor(_Theme.NameColorName, skinIndex, out _Theme.NameColor); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/Space", ref _Theme.Tiles.Name.Space); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/H", ref _Theme.Tiles.Name.Height); + _ThemeLoaded &= xmlReader.GetValue(item + "/Tiles/Name/Font", out _Theme.Tiles.Name.Font, "Normal"); + _ThemeLoaded &= xmlReader.TryGetEnumValue(item + "/Tiles/Name/Style", ref _Theme.Tiles.Name.Style); + if (xmlReader.GetValue(item + "/Tiles/Name/Color", out _Theme.Tiles.Name.ColorName, String.Empty)) + _ThemeLoaded &= CBase.Theme.GetColor(_Theme.Tiles.Name.ColorName, skinIndex, out _Theme.Tiles.Name.Color); else { - if (xmlReader.TryGetFloatValue(item + "/Tiles/Name/R", ref _Theme.NameColor.R)) + if (xmlReader.TryGetFloatValue(item + "/Tiles/Name/R", ref _Theme.Tiles.Name.Color.R)) { - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/G", ref _Theme.NameColor.G); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/B", ref _Theme.NameColor.B); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/A", ref _Theme.NameColor.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/G", ref _Theme.Tiles.Name.Color.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/B", ref _Theme.Tiles.Name.Color.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/A", ref _Theme.Tiles.Name.Color.A); } } @@ -175,6 +218,14 @@ namespace VocaluxeLib.Menu if (_ThemeLoaded) { _Theme.Name = elementName; + + _Theme.Rect = new SRectF(Rect); + _Theme.Tiles.H = _TileH; + _Theme.Tiles.W = _TileW; + _Theme.Tiles.NumH = _NumH; + _Theme.Tiles.NumW = _NumW; + _Theme.ColorEmptyTile = new SColorF(ColorEmptyTile); + LoadTextures(); } return _ThemeLoaded; @@ -225,23 +276,23 @@ namespace VocaluxeLib.Menu writer.WriteComment(": Options for player-name"); writer.WriteStartElement("Name"); writer.WriteComment(": Space between name and tile"); - writer.WriteElementString("Space", _Theme.NameSpace.ToString("#0.0")); + writer.WriteElementString("Space", _Theme.Tiles.Name.Space.ToString("#0.0")); writer.WriteComment(": Text font name"); - writer.WriteElementString("Font", _Theme.NameFont); + writer.WriteElementString("Font", _Theme.Tiles.Name.Font); writer.WriteComment(": Text color from ColorScheme (high priority)"); - if (!String.IsNullOrEmpty(_Theme.NameColorName)) - writer.WriteElementString("Color", _Theme.NameColorName); + if (!String.IsNullOrEmpty(_Theme.Tiles.Name.ColorName)) + writer.WriteElementString("Color", _Theme.Tiles.Name.ColorName); else { - writer.WriteElementString("R", _Theme.NameColor.R.ToString("#0.00")); - writer.WriteElementString("G", _Theme.NameColor.G.ToString("#0.00")); - writer.WriteElementString("B", _Theme.NameColor.B.ToString("#0.00")); - writer.WriteElementString("A", _Theme.NameColor.A.ToString("#0.00")); + writer.WriteElementString("R", _Theme.Tiles.Name.Color.R.ToString("#0.00")); + writer.WriteElementString("G", _Theme.Tiles.Name.Color.G.ToString("#0.00")); + writer.WriteElementString("B", _Theme.Tiles.Name.Color.B.ToString("#0.00")); + writer.WriteElementString("A", _Theme.Tiles.Name.Color.A.ToString("#0.00")); } writer.WriteComment(" + + Normal + + + + + + + + + TextBG + + 150 + 610 + -1,90 + 355 + 30 + + + StaticWarningColor + + + + + + + 320 + 612 + + -2,00 + + 27 + + 355 + + + TextWarningColor + + + TextWarningColor + + Center + + Center + + + + Outline + + TR_SCREENMAIN_TEXT_NOPROFILES + + + + diff --git a/Output/Themes/Changelog/Changelog_ScreenMain.txt b/Output/Themes/Changelog/Changelog_ScreenMain.txt new file mode 100644 index 00000000..b3eb3bb7 --- /dev/null +++ b/Output/Themes/Changelog/Changelog_ScreenMain.txt @@ -0,0 +1,10 @@ +SceenMain + +++++++++++ +Version 2: + +Add: + + + + diff --git a/Vocaluxe/Screens/CScreenMain.cs b/Vocaluxe/Screens/CScreenMain.cs index 6cd878bc..cc4e3c4c 100644 --- a/Vocaluxe/Screens/CScreenMain.cs +++ b/Vocaluxe/Screens/CScreenMain.cs @@ -27,7 +27,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 1; } + get { return 2; } } private const string _ButtonSing = "ButtonSing"; @@ -35,23 +35,30 @@ namespace Vocaluxe.Screens private const string _ButtonOptions = "ButtonOptions"; private const string _ButtonProfiles = "ButtonProfiles"; private const string _ButtonExit = "ButtonExit"; - - private CText _ReleaseText; + private const string _StaticWarningProfiles = "StaticWarningProfiles"; + private const string _TextWarningProfiles = "TextWarningProfiles"; + private const string _TextRelease = "TextRelease"; //CParticleEffect Snowflakes; public override void Init() { base.Init(); - _ThemeStatics = new string[] {"StaticMenuBar"}; + _ThemeStatics = new string[] {"StaticMenuBar", _StaticWarningProfiles}; _ThemeButtons = new string[] {_ButtonSing, _ButtonParty, _ButtonOptions, _ButtonProfiles, _ButtonExit}; + _ThemeTexts = new string[] {_TextRelease, _TextWarningProfiles}; } public override void LoadTheme(string xmlPath) { base.LoadTheme(xmlPath); - _ReleaseText = GetNewText(10, 690, -1, 15, -1, EAlignment.Left, EStyle.Normal, "Normal", new SColorF(1f, 1f, 1f, 1f), CSettings.GetFullVersionText()); + _Texts[_TextRelease].Text = CSettings.GetFullVersionText(); + // ReSharper disable ConditionIsAlwaysTrueOrFalse + _Texts[_TextRelease].Visible = CSettings.VersionRevision != ERevision.Release; + // ReSharper restore ConditionIsAlwaysTrueOrFalse + _Statics[_StaticWarningProfiles].Visible = false; + _Texts[_TextWarningProfiles].Visible = false; } public override bool HandleInput(SKeyEvent keyEvent) @@ -68,7 +75,8 @@ namespace Vocaluxe.Screens break; case Keys.S: - CGraphics.FadeTo(EScreens.ScreenSong); + if (CProfiles.NumProfiles > 0) + CGraphics.FadeTo(EScreens.ScreenSong); break; case Keys.C: @@ -145,6 +153,11 @@ namespace Vocaluxe.Screens public override bool UpdateGame() { + bool profileOK = CProfiles.NumProfiles > 0; + _Statics[_StaticWarningProfiles].Visible = !profileOK; + _Texts[_TextWarningProfiles].Visible = !profileOK; + _Buttons[_ButtonSing].Enabled = profileOK; + _Buttons[_ButtonParty].Enabled = profileOK; return true; } @@ -159,11 +172,6 @@ namespace Vocaluxe.Screens //Snowflakes.Draw(); _DrawFG(); - // ReSharper disable ConditionIsAlwaysTrueOrFalse - if (CSettings.VersionRevision != ERevision.Release) - // ReSharper restore ConditionIsAlwaysTrueOrFalse - _ReleaseText.Draw(); - return true; } From 96e50f7723095c6c99771be6cb5ab3f49605a1fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Tue, 9 Sep 2014 21:32:07 +0200 Subject: [PATCH 15/29] Changed theme-color-handling. --- VocaluxeLib/Menu/CBackground.cs | 18 ++-- VocaluxeLib/Menu/CButton.cs | 38 ++++---- VocaluxeLib/Menu/CEqualizer.cs | 36 ++++---- VocaluxeLib/Menu/CLyric.cs | 36 ++++---- VocaluxeLib/Menu/CNameSelection.cs | 52 +++++------ VocaluxeLib/Menu/CParticle.cs | 18 ++-- VocaluxeLib/Menu/CPlaylist.cs | 36 ++++---- VocaluxeLib/Menu/CSelectSlide.cs | 140 +++++++++++++---------------- VocaluxeLib/Menu/CStatic.cs | 18 ++-- VocaluxeLib/Menu/CText.cs | 36 ++++---- VocaluxeLib/Structs.cs | 25 ++++-- 11 files changed, 208 insertions(+), 245 deletions(-) diff --git a/VocaluxeLib/Menu/CBackground.cs b/VocaluxeLib/Menu/CBackground.cs index cb353fbe..0aed7bea 100644 --- a/VocaluxeLib/Menu/CBackground.cs +++ b/VocaluxeLib/Menu/CBackground.cs @@ -47,9 +47,7 @@ namespace VocaluxeLib.Menu public string VideoName; [XmlElement("Skin")] public string TextureName; - [XmlElement("ColorName")] - public string ColorName; - public SColorF Color; + public SThemeColor Color; } public class CBackground : IMenuElement @@ -96,8 +94,8 @@ namespace VocaluxeLib.Menu bool tex = xmlReader.GetValue(item + "/Skin", out _Theme.TextureName, String.Empty); _ThemeLoaded &= vid || tex || _Theme.Type == EBackgroundTypes.None; - if (xmlReader.GetValue(item + "/Color", out _Theme.ColorName, String.Empty)) - _ThemeLoaded &= CBase.Theme.GetColor(_Theme.ColorName, skinIndex, out Color); + if (xmlReader.GetValue(item + "/Color", out _Theme.Color.Name, String.Empty)) + _ThemeLoaded &= CBase.Theme.GetColor(_Theme.Color.Name, skinIndex, out Color); else { bool success = true; @@ -110,7 +108,7 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= success; } - _Theme.Color = new SColorF(Color); + _Theme.Color.Color = new SColorF(Color); int i = 1; @@ -152,8 +150,8 @@ namespace VocaluxeLib.Menu writer.WriteComment(": Background color for type \"Color\" from ColorScheme (high priority)"); writer.WriteComment("or , , , (lower priority)"); - if (!String.IsNullOrEmpty(_Theme.ColorName)) - writer.WriteElementString("Color", _Theme.ColorName); + if (!String.IsNullOrEmpty(_Theme.Color.Name)) + writer.WriteElementString("Color", _Theme.Color.Name); else { if (_Theme.Type != EBackgroundTypes.None) @@ -222,8 +220,8 @@ namespace VocaluxeLib.Menu public void LoadTextures() { - if (!String.IsNullOrEmpty(_Theme.ColorName)) - Color = CBase.Theme.GetColor(_Theme.ColorName, _PartyModeID); + if (!String.IsNullOrEmpty(_Theme.Color.Name)) + Color = CBase.Theme.GetColor(_Theme.Color.Name, _PartyModeID); foreach (string s in _Theme.SlideShowTextures) _SlideShowTextures.Add(CBase.Theme.GetSkinTexture(s, _PartyModeID)); diff --git a/VocaluxeLib/Menu/CButton.cs b/VocaluxeLib/Menu/CButton.cs index ff2e3537..a4a00b2b 100644 --- a/VocaluxeLib/Menu/CButton.cs +++ b/VocaluxeLib/Menu/CButton.cs @@ -33,14 +33,10 @@ namespace VocaluxeLib.Menu [XmlElement("SkinSelected")] public string SelTextureName; public SRectF Rect; - [XmlElement("ColorName")] - public string ColorName; [XmlElement("Color")] - public SColorF Color; - [XmlElement("SelColorName")] - public string SelColorName; + public SThemeColor Color; [XmlElement("SelColor")] - public SColorF SelColor; + public SThemeColor SelColor; [XmlElement("Text")] public SThemeText Text; [XmlElement("Reflection")] @@ -133,8 +129,6 @@ namespace VocaluxeLib.Menu _PartyModeID = button._PartyModeID; _Theme = new SThemeButton { - ColorName = button._Theme.ColorName, - SelColorName = button._Theme.SelColorName, TextureName = button._Theme.TextureName, SelTextureName = button._Theme.SelTextureName }; @@ -174,8 +168,8 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/W", ref Rect.W); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref Rect.H); - if (xmlReader.GetValue(item + "/Color", out _Theme.ColorName, String.Empty)) - _ThemeLoaded &= CBase.Theme.GetColor(_Theme.ColorName, skinIndex, out Color); + if (xmlReader.GetValue(item + "/Color", out _Theme.Color.Name, String.Empty)) + _ThemeLoaded &= CBase.Theme.GetColor(_Theme.Color.Name, skinIndex, out Color); else { _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/R", ref Color.R); @@ -184,8 +178,8 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/A", ref Color.A); } - if (xmlReader.GetValue(item + "/SColor", out _Theme.SelColorName, String.Empty)) - _ThemeLoaded &= CBase.Theme.GetColor(_Theme.SelColorName, skinIndex, out SelColor); + if (xmlReader.GetValue(item + "/SColor", out _Theme.SelColor.Name, String.Empty)) + _ThemeLoaded &= CBase.Theme.GetColor(_Theme.SelColor.Name, skinIndex, out SelColor); else { _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SR", ref SelColor.R); @@ -237,8 +231,8 @@ namespace VocaluxeLib.Menu { _Theme.Name = elementName; _Theme.Rect = new SRectF(Rect); - _Theme.Color = new SColorF(Color); - _Theme.SelColor = new SColorF(SelColor); + _Theme.Color.Color = new SColorF(Color); + _Theme.SelColor.Color = new SColorF(SelColor); _Theme.Text = Text.GetTheme(); LoadTextures(); @@ -267,8 +261,8 @@ namespace VocaluxeLib.Menu writer.WriteComment(": Button color from ColorScheme (high priority)"); writer.WriteComment("or , , , (lower priority)"); - if (!String.IsNullOrEmpty(_Theme.ColorName)) - writer.WriteElementString("Color", _Theme.ColorName); + if (!String.IsNullOrEmpty(_Theme.Color.Name)) + writer.WriteElementString("Color", _Theme.Color.Name); else { writer.WriteElementString("R", Color.R.ToString("#0.00")); @@ -279,8 +273,8 @@ namespace VocaluxeLib.Menu writer.WriteComment(": Selected button color from ColorScheme (high priority)"); writer.WriteComment("or , , , (lower priority)"); - if (!String.IsNullOrEmpty(_Theme.SelColorName)) - writer.WriteElementString("SColor", _Theme.SelColorName); + if (!String.IsNullOrEmpty(_Theme.SelColor.Name)) + writer.WriteElementString("SColor", _Theme.SelColor.Name); else { writer.WriteElementString("SR", SelColor.R.ToString("#0.00")); @@ -387,11 +381,11 @@ namespace VocaluxeLib.Menu { Text.LoadTextures(); - if (!String.IsNullOrEmpty(_Theme.ColorName)) - Color = CBase.Theme.GetColor(_Theme.ColorName, _PartyModeID); + if (!String.IsNullOrEmpty(_Theme.Color.Name)) + Color = CBase.Theme.GetColor(_Theme.Color.Name, _PartyModeID); - if (!String.IsNullOrEmpty(_Theme.SelColorName)) - SelColor = CBase.Theme.GetColor(_Theme.SelColorName, _PartyModeID); + if (!String.IsNullOrEmpty(_Theme.SelColor.Name)) + SelColor = CBase.Theme.GetColor(_Theme.SelColor.Name, _PartyModeID); } public void ReloadTextures() diff --git a/VocaluxeLib/Menu/CEqualizer.cs b/VocaluxeLib/Menu/CEqualizer.cs index 0809ef85..d0fe220b 100644 --- a/VocaluxeLib/Menu/CEqualizer.cs +++ b/VocaluxeLib/Menu/CEqualizer.cs @@ -47,14 +47,10 @@ namespace VocaluxeLib.Menu [XmlElement("DrawNegative")] public EOffOn DrawNegative; - [XmlElement("ColorName")] - public string ColorName; [XmlElement("Color")] - public SColorF Color; - [XmlElement("MaxColorName")] - public string MaxColorName; + public SThemeColor Color; [XmlElement("MaxColor")] - public SColorF MaxColor; + public SThemeColor MaxColor; [XmlElement("Reflection")] public SReflection Reflection; } @@ -132,8 +128,8 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= xmlReader.TryGetEnumValue(item + "/DrawNegative", ref _Theme.DrawNegative); - if (xmlReader.GetValue(item + "/Color", out _Theme.ColorName, String.Empty)) - _ThemeLoaded &= CBase.Theme.GetColor(_Theme.ColorName, skinIndex, out Color); + if (xmlReader.GetValue(item + "/Color", out _Theme.Color.Name, String.Empty)) + _ThemeLoaded &= CBase.Theme.GetColor(_Theme.Color.Name, skinIndex, out Color); else { _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/R", ref Color.R); @@ -142,8 +138,8 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/A", ref Color.A); } - if (xmlReader.GetValue(item + "/MaxColor", out _Theme.MaxColorName, String.Empty)) - _ThemeLoaded &= CBase.Theme.GetColor(_Theme.ColorName, skinIndex, out Color); + if (xmlReader.GetValue(item + "/MaxColor", out _Theme.MaxColor.Name, String.Empty)) + _ThemeLoaded &= CBase.Theme.GetColor(_Theme.MaxColor.Name, skinIndex, out Color); else { _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/MaxR", ref MaxColor.R); @@ -171,8 +167,8 @@ namespace VocaluxeLib.Menu { _Theme.Name = elementName; _Theme.Space = Space; - _Theme.Color = new SColorF(Color); - _Theme.MaxColor = new SColorF(MaxColor); + _Theme.Color.Color = new SColorF(Color); + _Theme.MaxColor.Color = new SColorF(MaxColor); _Theme.Rect = Rect; _Bars = new float[_Theme.NumBars]; @@ -210,8 +206,8 @@ namespace VocaluxeLib.Menu writer.WriteComment(": Equalizer color from ColorScheme (high priority)"); writer.WriteComment("or , , , (lower priority)"); - if (!String.IsNullOrEmpty(_Theme.ColorName)) - writer.WriteElementString("Color", _Theme.ColorName); + if (!String.IsNullOrEmpty(_Theme.Color.Name)) + writer.WriteElementString("Color", _Theme.Color.Name); else { writer.WriteElementString("R", Color.R.ToString("#0.00")); @@ -221,8 +217,8 @@ namespace VocaluxeLib.Menu } writer.WriteComment(": Equalizer color for maximal volume from ColorScheme (high priority)"); writer.WriteComment("or , , , (lower priority)"); - if (!String.IsNullOrEmpty(_Theme.ColorName)) - writer.WriteElementString("MaxColor", _Theme.ColorName); + if (!String.IsNullOrEmpty(_Theme.MaxColor.Name)) + writer.WriteElementString("MaxColor", _Theme.MaxColor.Name); else { writer.WriteElementString("MaxR", Color.R.ToString("#0.00")); @@ -321,11 +317,11 @@ namespace VocaluxeLib.Menu public void LoadTextures() { - if (!String.IsNullOrEmpty(_Theme.ColorName)) - Color = CBase.Theme.GetColor(_Theme.ColorName, _PartyModeID); + if (!String.IsNullOrEmpty(_Theme.Color.Name)) + Color = CBase.Theme.GetColor(_Theme.Color.Name, _PartyModeID); - if (!String.IsNullOrEmpty(_Theme.MaxColorName)) - MaxColor = CBase.Theme.GetColor(_Theme.MaxColorName, _PartyModeID); + if (!String.IsNullOrEmpty(_Theme.MaxColor.Name)) + MaxColor = CBase.Theme.GetColor(_Theme.MaxColor.Name, _PartyModeID); } public void ReloadTextures() diff --git a/VocaluxeLib/Menu/CLyric.cs b/VocaluxeLib/Menu/CLyric.cs index 97a54f5d..8117f912 100644 --- a/VocaluxeLib/Menu/CLyric.cs +++ b/VocaluxeLib/Menu/CLyric.cs @@ -31,14 +31,10 @@ namespace VocaluxeLib.Menu [XmlElement("Rect")] public SRectF Rect; - [XmlElement("ColorName")] - public string ColorName; [XmlElement("Color")] - public SColorF Color; - [XmlElement("SColorName")] - public string SelColorName; + public SThemeColor Color; [XmlElement("SColor")] - public SColorF SColor; + public SThemeColor SColor; } public class CLyric : IMenuElement @@ -135,8 +131,8 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/W", ref _MaxW); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref _H); - if (xmlReader.GetValue(item + "/Color", out _Theme.ColorName, String.Empty)) - _ThemeLoaded &= CBase.Theme.GetColor(_Theme.ColorName, skinIndex, out _Color); + if (xmlReader.GetValue(item + "/Color", out _Theme.Color.Name, String.Empty)) + _ThemeLoaded &= CBase.Theme.GetColor(_Theme.Color.Name, skinIndex, out _Color); else { _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/R", ref _Color.R); @@ -145,8 +141,8 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/A", ref _Color.A); } - if (xmlReader.GetValue(item + "/SColor", out _Theme.SelColorName, String.Empty)) - _ThemeLoaded &= CBase.Theme.GetColor(_Theme.SelColorName, skinIndex, out _ColorProcessed); + if (xmlReader.GetValue(item + "/SColor", out _Theme.SColor.Name, String.Empty)) + _ThemeLoaded &= CBase.Theme.GetColor(_Theme.SColor.Name, skinIndex, out _ColorProcessed); else { _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SR", ref _ColorProcessed.R); @@ -158,8 +154,8 @@ namespace VocaluxeLib.Menu if (_ThemeLoaded) { _Theme.Name = elementName; - _Theme.Color = new SColorF(_Color); - _Theme.SColor = new SColorF(_ColorProcessed); + _Theme.Color.Color = new SColorF(_Color); + _Theme.SColor.Color = new SColorF(_ColorProcessed); _Theme.Rect = new SRectF(Rect); LoadTextures(); @@ -183,8 +179,8 @@ namespace VocaluxeLib.Menu writer.WriteComment(": Lyric text color from ColorScheme (high priority)"); writer.WriteComment("or , , , (lower priority)"); - if (!String.IsNullOrEmpty(_Theme.ColorName)) - writer.WriteElementString("Color", _Theme.ColorName); + if (!String.IsNullOrEmpty(_Theme.Color.Name)) + writer.WriteElementString("Color", _Theme.Color.Name); else { writer.WriteElementString("R", _Color.R.ToString("#0.00")); @@ -195,8 +191,8 @@ namespace VocaluxeLib.Menu writer.WriteComment(": Highlighted lyric color from ColorScheme (high priority)"); writer.WriteComment("or , , , (lower priority)"); - if (!String.IsNullOrEmpty(_Theme.SelColorName)) - writer.WriteElementString("SColor", _Theme.SelColorName); + if (!String.IsNullOrEmpty(_Theme.SColor.Name)) + writer.WriteElementString("SColor", _Theme.SColor.Name); else { writer.WriteElementString("SR", _ColorProcessed.R.ToString("#0.00")); @@ -488,11 +484,11 @@ namespace VocaluxeLib.Menu public void LoadTextures() { - if (!String.IsNullOrEmpty(_Theme.ColorName)) - _Color = CBase.Theme.GetColor(_Theme.ColorName, _PartyModeID); + if (!String.IsNullOrEmpty(_Theme.Color.Name)) + _Color = CBase.Theme.GetColor(_Theme.Color.Name, _PartyModeID); - if (!String.IsNullOrEmpty(_Theme.SelColorName)) - _ColorProcessed = CBase.Theme.GetColor(_Theme.SelColorName, _PartyModeID); + if (!String.IsNullOrEmpty(_Theme.SColor.Name)) + _ColorProcessed = CBase.Theme.GetColor(_Theme.SColor.Name, _PartyModeID); } public void ReloadTextures() diff --git a/VocaluxeLib/Menu/CNameSelection.cs b/VocaluxeLib/Menu/CNameSelection.cs index 3eab70a6..ab7f1a45 100644 --- a/VocaluxeLib/Menu/CNameSelection.cs +++ b/VocaluxeLib/Menu/CNameSelection.cs @@ -34,10 +34,8 @@ namespace VocaluxeLib.Menu public SRectF Rect; [XmlElement("SkinEmptyTile")] public string TextureEmptyTileName; - [XmlElement("ColorNameEmptyTile")] - public string ColorEmptyTileName; [XmlElement("ColorEmptyTile")] - public SColorF ColorEmptyTile; + public SThemeColor ColorEmptyTile; [XmlElement("SkinTileSelected")] public string TextureTileSelectedName; [XmlElement("Tiles")] @@ -68,10 +66,8 @@ namespace VocaluxeLib.Menu public string Font; [XmlElement("Style")] public EStyle Style; - [XmlElement("ColorName")] - public string ColorName; [XmlElement("Color")] - public SColorF Color; + public SThemeColor Color; } public class CNameSelection : IMenuElement @@ -180,8 +176,8 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= xmlReader.GetValue(item + "/SkinEmptyTile", out _Theme.TextureEmptyTileName, String.Empty); - if (xmlReader.GetValue(item + "/ColorEmptyTile", out _Theme.ColorEmptyTileName, String.Empty)) - _ThemeLoaded &= CBase.Theme.GetColor(_Theme.ColorEmptyTileName, skinIndex, out ColorEmptyTile); + if (xmlReader.GetValue(item + "/ColorEmptyTile", out _Theme.ColorEmptyTile.Name, String.Empty)) + _ThemeLoaded &= CBase.Theme.GetColor(_Theme.ColorEmptyTile.Name, skinIndex, out ColorEmptyTile); else { _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/R", ref ColorEmptyTile.R); @@ -202,15 +198,15 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/H", ref _Theme.Tiles.Name.Height); _ThemeLoaded &= xmlReader.GetValue(item + "/Tiles/Name/Font", out _Theme.Tiles.Name.Font, "Normal"); _ThemeLoaded &= xmlReader.TryGetEnumValue(item + "/Tiles/Name/Style", ref _Theme.Tiles.Name.Style); - if (xmlReader.GetValue(item + "/Tiles/Name/Color", out _Theme.Tiles.Name.ColorName, String.Empty)) - _ThemeLoaded &= CBase.Theme.GetColor(_Theme.Tiles.Name.ColorName, skinIndex, out _Theme.Tiles.Name.Color); + if (xmlReader.GetValue(item + "/Tiles/Name/Color", out _Theme.Tiles.Name.Color.Name, String.Empty)) + _ThemeLoaded &= CBase.Theme.GetColor(_Theme.Tiles.Name.Color.Name, skinIndex, out _Theme.Tiles.Name.Color.Color); else { - if (xmlReader.TryGetFloatValue(item + "/Tiles/Name/R", ref _Theme.Tiles.Name.Color.R)) + if (xmlReader.TryGetFloatValue(item + "/Tiles/Name/R", ref _Theme.Tiles.Name.Color.Color.R)) { - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/G", ref _Theme.Tiles.Name.Color.G); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/B", ref _Theme.Tiles.Name.Color.B); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/A", ref _Theme.Tiles.Name.Color.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/G", ref _Theme.Tiles.Name.Color.Color.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/B", ref _Theme.Tiles.Name.Color.Color.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/A", ref _Theme.Tiles.Name.Color.Color.A); } } @@ -224,7 +220,7 @@ namespace VocaluxeLib.Menu _Theme.Tiles.W = _TileW; _Theme.Tiles.NumH = _NumH; _Theme.Tiles.NumW = _NumW; - _Theme.ColorEmptyTile = new SColorF(ColorEmptyTile); + _Theme.ColorEmptyTile.Color = new SColorF(ColorEmptyTile); LoadTextures(); } @@ -249,8 +245,8 @@ namespace VocaluxeLib.Menu writer.WriteComment(": Static color from ColorScheme (high priority)"); writer.WriteComment("or , , , (lower priority)"); - if (!String.IsNullOrEmpty(_Theme.ColorEmptyTileName)) - writer.WriteElementString("ColorEmptyTile", _Theme.ColorEmptyTileName); + if (!String.IsNullOrEmpty(_Theme.ColorEmptyTile.Name)) + writer.WriteElementString("ColorEmptyTile", _Theme.ColorEmptyTile.Name); else { writer.WriteElementString("R", ColorEmptyTile.R.ToString("#0.00")); @@ -280,14 +276,14 @@ namespace VocaluxeLib.Menu writer.WriteComment(": Text font name"); writer.WriteElementString("Font", _Theme.Tiles.Name.Font); writer.WriteComment(": Text color from ColorScheme (high priority)"); - if (!String.IsNullOrEmpty(_Theme.Tiles.Name.ColorName)) - writer.WriteElementString("Color", _Theme.Tiles.Name.ColorName); + if (!String.IsNullOrEmpty(_Theme.Tiles.Name.Color.Name)) + writer.WriteElementString("Color", _Theme.Tiles.Name.Color.Name); else { - writer.WriteElementString("R", _Theme.Tiles.Name.Color.R.ToString("#0.00")); - writer.WriteElementString("G", _Theme.Tiles.Name.Color.G.ToString("#0.00")); - writer.WriteElementString("B", _Theme.Tiles.Name.Color.B.ToString("#0.00")); - writer.WriteElementString("A", _Theme.Tiles.Name.Color.A.ToString("#0.00")); + writer.WriteElementString("R", _Theme.Tiles.Name.Color.Color.R.ToString("#0.00")); + writer.WriteElementString("G", _Theme.Tiles.Name.Color.Color.G.ToString("#0.00")); + writer.WriteElementString("B", _Theme.Tiles.Name.Color.Color.B.ToString("#0.00")); + writer.WriteElementString("A", _Theme.Tiles.Name.Color.Color.A.ToString("#0.00")); } writer.WriteComment(" @@ -98,7 +98,7 @@ Center - Center + Center @@ -147,7 +147,7 @@ Center - Center + Center @@ -196,7 +196,7 @@ Center - Center + Center @@ -245,7 +245,7 @@ Center - Center + Center @@ -294,7 +294,7 @@ Center - Center + Center @@ -343,7 +343,7 @@ Center - Center + Center @@ -392,7 +392,7 @@ Center - Center + Center @@ -441,7 +441,7 @@ Center - Center + Center @@ -457,4 +457,4 @@ - + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/PopupScreenServerQR.xml b/Output/Themes/Ambient/Screens/PopupScreenServerQR.xml index 6bf09478..cc082e9c 100644 --- a/Output/Themes/Ambient/Screens/PopupScreenServerQR.xml +++ b/Output/Themes/Ambient/Screens/PopupScreenServerQR.xml @@ -101,66 +101,6 @@ - - - 640 - 515 - - -2,00 - - 35 - - 300 - - - StaticColor - - - TextSColor - - Center - - Center - - - - Outline - - - - - - - - - 640 - 265 - - -2,00 - - 45 - - 600 - - - StaticColor - - - TextSColor - - Center - - Center - - - - Outline - - TR_SCREENPSERVERQR_NOTRUNNING - - - - 640 @@ -180,7 +120,7 @@ Center - Center + Center @@ -210,13 +150,13 @@ Center - Center + Center Outline - Android + @@ -240,13 +180,13 @@ Center - Center + Center Outline - Symbian + @@ -270,13 +210,13 @@ Center - Center + Center Outline - WebOS + @@ -300,16 +240,76 @@ Center - Center + Center Outline - Windows Phone + + + + 640 + 515 + + -2,00 + + 35 + + 300 + + + StaticColor + + + TextSColor + + Center + + Center + + + + Outline + + + + + + + + + 640 + 265 + + -2,00 + + 45 + + 600 + + + StaticColor + + + TextSColor + + Center + + Center + + + + Outline + + TR_SCREENPSERVERQR_NOTRUNNING + + + + - + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml b/Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml index 80b47b72..5457c45b 100644 --- a/Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml +++ b/Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml @@ -37,7 +37,7 @@ Left - Center + Center diff --git a/Output/Themes/Ambient/Screens/ScreenHighscore.xml b/Output/Themes/Ambient/Screens/ScreenHighscore.xml index 2af500cc..7a23fa79 100644 --- a/Output/Themes/Ambient/Screens/ScreenHighscore.xml +++ b/Output/Themes/Ambient/Screens/ScreenHighscore.xml @@ -3,12 +3,13 @@ 2 - + Video BG_Default + BackgroundColor @@ -63,7 +64,7 @@ Left - Center + Center @@ -92,7 +93,7 @@ Center - Center + Center @@ -121,13 +122,13 @@ Right - Center + Center Outline - + TR_GAMEMODE_NORMAL @@ -150,7 +151,7 @@ Right - Center + Center @@ -179,7 +180,7 @@ Right - Center + Center @@ -208,7 +209,7 @@ Right - Center + Center @@ -237,7 +238,7 @@ Right - Center + Center @@ -266,7 +267,7 @@ Right - Center + Center @@ -295,7 +296,7 @@ Right - Center + Center @@ -324,7 +325,7 @@ Right - Center + Center @@ -353,7 +354,7 @@ Right - Center + Center @@ -382,7 +383,7 @@ Right - Center + Center @@ -411,7 +412,7 @@ Right - Center + Center @@ -440,7 +441,7 @@ Left - Center + Center @@ -469,7 +470,7 @@ Left - Center + Center @@ -498,7 +499,7 @@ Left - Center + Center @@ -527,7 +528,7 @@ Left - Center + Center @@ -556,7 +557,7 @@ Left - Center + Center @@ -585,7 +586,7 @@ Left - Center + Center @@ -614,7 +615,7 @@ Left - Center + Center @@ -643,7 +644,7 @@ Left - Center + Center @@ -672,7 +673,7 @@ Left - Center + Center @@ -701,7 +702,7 @@ Left - Center + Center @@ -730,7 +731,7 @@ Left - Center + Center @@ -759,7 +760,7 @@ Left - Center + Center @@ -788,7 +789,7 @@ Left - Center + Center @@ -817,7 +818,7 @@ Left - Center + Center @@ -846,7 +847,7 @@ Left - Center + Center @@ -875,7 +876,7 @@ Left - Center + Center @@ -904,7 +905,7 @@ Left - Center + Center @@ -933,7 +934,7 @@ Left - Center + Center @@ -962,7 +963,7 @@ Left - Center + Center @@ -991,7 +992,7 @@ Left - Center + Center @@ -1020,7 +1021,7 @@ Left - Center + Center @@ -1049,7 +1050,7 @@ Left - Center + Center @@ -1078,7 +1079,7 @@ Left - Center + Center @@ -1107,7 +1108,7 @@ Left - Center + Center @@ -1136,7 +1137,7 @@ Left - Center + Center @@ -1165,7 +1166,7 @@ Left - Center + Center @@ -1194,7 +1195,7 @@ Left - Center + Center @@ -1223,7 +1224,7 @@ Left - Center + Center @@ -1252,7 +1253,7 @@ Left - Center + Center @@ -1281,7 +1282,7 @@ Left - Center + Center diff --git a/Output/Themes/Ambient/Screens/ScreenLoad.xml b/Output/Themes/Ambient/Screens/ScreenLoad.xml index 36041ea4..a3733f8e 100644 --- a/Output/Themes/Ambient/Screens/ScreenLoad.xml +++ b/Output/Themes/Ambient/Screens/ScreenLoad.xml @@ -3,12 +3,13 @@ 2 - + Texture BG_Default + BackgroundColor @@ -58,35 +59,6 @@ - - - 640 - 305 - - 0,00 - - 101 - - - - StaticColor - - - TextSColor - - Center - - Center - - - - Outline - - TR_PROGRAM_NAME - - - - 240 @@ -116,5 +88,34 @@ + + + 640 + 305 + + 0,00 + + 101 + + + + StaticColor + + + TextSColor + + Center + + Center + + + + Outline + + TR_PROGRAM_NAME + + + + - + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenMain.xml b/Output/Themes/Ambient/Screens/ScreenMain.xml index 50e3a04c..096e9162 100644 --- a/Output/Themes/Ambient/Screens/ScreenMain.xml +++ b/Output/Themes/Ambient/Screens/ScreenMain.xml @@ -3,12 +3,13 @@ 2 - + Video BG_Default + BackgroundColor @@ -29,6 +30,81 @@ + + + TextBG + + 150 + 610 + -1,90 + 355 + 30 + + + StaticWarningColor + + + + + + + 10 + 690 + + -1,00 + + 15 + + + + TextWhite + + + TextWhite + + Left + + Center + + + + Normal + + + + + + + + + 320 + 612 + + -2,00 + + 27 + + 355 + + + TextWarningColor + + + TextWarningColor + + Center + + Center + + + + Outline + + TR_SCREENMAIN_TEXT_NOPROFILES + + + + Button @@ -314,79 +390,5 @@ 26 - - - 10 - 690 - - -1 - - 15 - - - TextWhite - - - TextWhite - - Left - - Center - - - - Normal - - - - - - - - - TextBG - - 150 - 610 - -1,90 - 355 - 30 - - - StaticWarningColor - - - - - - - 320 - 612 - - -2,00 - - 27 - - 355 - - - TextWarningColor - - - TextWarningColor - - Center - - Center - - - - Outline - - TR_SCREENMAIN_TEXT_NOPROFILES - - - - - + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenNames.xml b/Output/Themes/Ambient/Screens/ScreenNames.xml index 5d17ebe2..7b8f6b31 100644 --- a/Output/Themes/Ambient/Screens/ScreenNames.xml +++ b/Output/Themes/Ambient/Screens/ScreenNames.xml @@ -3,12 +3,13 @@ 3 - + Video BG_Options + BackgroundColor @@ -271,7 +272,7 @@ Center - Center + Center @@ -301,7 +302,7 @@ Center - Center + Center @@ -331,7 +332,7 @@ Center - Center + Center @@ -360,7 +361,7 @@ Center - Center + Center @@ -389,7 +390,7 @@ Center - Center + Center @@ -418,7 +419,7 @@ Center - Center + Center @@ -447,7 +448,7 @@ Center - Center + Center @@ -476,7 +477,7 @@ Center - Center + Center @@ -505,7 +506,7 @@ Center - Center + Center @@ -550,7 +551,7 @@ Center - Center + Center @@ -607,7 +608,7 @@ Center - Center + Center diff --git a/Output/Themes/Ambient/Screens/ScreenOptions.xml b/Output/Themes/Ambient/Screens/ScreenOptions.xml index de798ca2..ab89cbad 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptions.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptions.xml @@ -3,12 +3,13 @@ 1 - + Video BG_Default + BackgroundColor @@ -47,7 +48,7 @@ Left - Center + Center @@ -92,7 +93,7 @@ Center - Center + Center @@ -149,7 +150,7 @@ Center - Center + Center @@ -206,7 +207,7 @@ Center - Center + Center @@ -263,7 +264,7 @@ Center - Center + Center @@ -320,7 +321,7 @@ Center - Center + Center @@ -377,7 +378,7 @@ Center - Center + Center diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml b/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml index 49c9551a..bdae10fb 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml @@ -3,12 +3,13 @@ 2 - + Video BG_Options + BackgroundColor @@ -143,7 +144,7 @@ Center - Center + Center @@ -172,7 +173,7 @@ Left - Center + Center @@ -201,7 +202,7 @@ Left - Center + Center @@ -230,7 +231,7 @@ Left - Center + Center @@ -259,7 +260,7 @@ Left - Center + Center @@ -288,7 +289,7 @@ Left - Center + Center @@ -317,7 +318,7 @@ Left - Center + Center @@ -362,7 +363,7 @@ Center - Center + Center @@ -419,7 +420,7 @@ Center - Center + Center @@ -845,4 +846,4 @@ 3 - + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml b/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml index 2fa9d49b..09511f0c 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml @@ -3,12 +3,13 @@ 2 - + Video BG_Options + BackgroundColor @@ -47,7 +48,7 @@ Center - Center + Center @@ -76,7 +77,7 @@ Left - Center + Center @@ -105,7 +106,7 @@ Left - Center + Center @@ -150,7 +151,7 @@ Center - Center + Center diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml index 77c04934..8d231ea2 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml @@ -3,12 +3,13 @@ 4 - + Video BG_Options + BackgroundColor @@ -175,7 +176,7 @@ Center - Center + Center @@ -204,7 +205,7 @@ Left - Center + Center @@ -233,7 +234,7 @@ Left - Center + Center @@ -244,6 +245,36 @@ + + + 640 + 537 + + 0,00 + + 27 + + 970 + + + TextWarningColor + + + TextWarningColor + + Center + + Center + + + + Outline + + TR_SCREENORECORD_MIC_WARNING + + + + 75 @@ -262,7 +293,7 @@ Left - Center + Center @@ -291,7 +322,7 @@ Left - Center + Center @@ -302,36 +333,6 @@ - - - 640 - 537 - - 0,00 - - 27 - - 970 - - - TextWarningColor - - - TextWarningColor - - Center - - Center - - - - Outline - - TR_SCREENORECORD_MIC_WARNING - - - - 330 @@ -350,7 +351,7 @@ Right - Center + Center @@ -379,7 +380,7 @@ Right - Center + Center @@ -424,7 +425,7 @@ Center - Center + Center @@ -481,7 +482,7 @@ Center - Center + Center @@ -835,4 +836,4 @@ - + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml b/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml index 3472b1ab..23ee2358 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml @@ -3,12 +3,13 @@ 3 - + Video BG_Options + BackgroundColor @@ -47,7 +48,7 @@ Center - Center + Center @@ -76,7 +77,7 @@ Left - Center + Center @@ -105,7 +106,7 @@ Left - Center + Center @@ -134,7 +135,7 @@ Left - Center + Center @@ -163,7 +164,7 @@ Left - Center + Center @@ -192,7 +193,7 @@ Left - Center + Center @@ -237,7 +238,7 @@ Center - Center + Center diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml b/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml index a66566e2..874aabb7 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml @@ -3,12 +3,13 @@ 3 - + Video BG_Options + BackgroundColor @@ -175,7 +176,7 @@ Center - Center + Center @@ -204,7 +205,7 @@ Left - Center + Center @@ -233,7 +234,7 @@ Left - Center + Center @@ -262,7 +263,7 @@ Left - Center + Center @@ -291,7 +292,7 @@ Left - Center + Center @@ -320,7 +321,7 @@ Left - Center + Center @@ -349,7 +350,7 @@ Left - Center + Center @@ -378,7 +379,7 @@ Left - Center + Center @@ -407,7 +408,7 @@ Left - Center + Center @@ -452,7 +453,7 @@ Center - Center + Center diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml index cabb55d9..cfdb992b 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml @@ -3,12 +3,13 @@ 5 - + Video BG_Options + BackgroundColor @@ -111,7 +112,7 @@ Center - Center + Center @@ -140,7 +141,7 @@ Left - Center + Center @@ -169,7 +170,7 @@ Left - Center + Center @@ -198,7 +199,7 @@ Left - Center + Center @@ -227,7 +228,7 @@ Left - Center + Center @@ -256,7 +257,7 @@ Left - Center + Center @@ -285,7 +286,7 @@ Left - Center + Center @@ -330,7 +331,7 @@ Center - Center + Center @@ -387,7 +388,7 @@ Center - Center + Center @@ -813,4 +814,4 @@ 3 - + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml b/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml index e9ffb2eb..e99c0fcb 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml @@ -3,12 +3,13 @@ 1 - + Color BG_Options + 1,00 @@ -34,7 +35,7 @@ Left - Top + Center @@ -63,7 +64,7 @@ Right - Top + Center @@ -92,7 +93,7 @@ Left - Bottom + Center @@ -121,7 +122,7 @@ Right - Bottom + Center @@ -150,7 +151,7 @@ Center - Center + Center @@ -179,7 +180,7 @@ Center - Center + Center @@ -224,7 +225,7 @@ Center - Center + Center @@ -248,4 +249,4 @@ - + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenParty.xml b/Output/Themes/Ambient/Screens/ScreenParty.xml index d725b993..585954f3 100644 --- a/Output/Themes/Ambient/Screens/ScreenParty.xml +++ b/Output/Themes/Ambient/Screens/ScreenParty.xml @@ -3,12 +3,13 @@ 1 - + Video BG_Default + BackgroundColor @@ -47,7 +48,7 @@ Center - Center + Center @@ -76,7 +77,7 @@ Left - Center + Center @@ -105,7 +106,7 @@ Left - Center + Center @@ -134,7 +135,7 @@ Left - Center + Center @@ -163,7 +164,7 @@ Left - Center + Center @@ -192,7 +193,7 @@ Left - Center + Center @@ -221,7 +222,7 @@ Left - Center + Center @@ -250,7 +251,7 @@ Left - Center + Center @@ -280,7 +281,7 @@ Center - Center + Center @@ -310,7 +311,7 @@ Center - Center + Center @@ -340,7 +341,7 @@ Center - Center + Center @@ -370,7 +371,7 @@ Center - Center + Center @@ -400,7 +401,7 @@ Center - Center + Center @@ -430,7 +431,7 @@ Center - Center + Center @@ -460,7 +461,7 @@ Center - Center + Center @@ -505,7 +506,7 @@ Center - Center + Center @@ -562,7 +563,7 @@ Center - Center + Center @@ -653,4 +654,4 @@ 1 - + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenProfiles.xml b/Output/Themes/Ambient/Screens/ScreenProfiles.xml index 1fb4ce6f..18777ed1 100644 --- a/Output/Themes/Ambient/Screens/ScreenProfiles.xml +++ b/Output/Themes/Ambient/Screens/ScreenProfiles.xml @@ -3,12 +3,13 @@ 3 - + Video BG_Options + BackgroundColor @@ -143,7 +144,7 @@ Center - Center + Center @@ -172,7 +173,7 @@ Left - Center + Center @@ -201,7 +202,7 @@ Left - Center + Center @@ -230,7 +231,7 @@ Left - Center + Center @@ -259,7 +260,7 @@ Left - Center + Center @@ -288,7 +289,7 @@ Left - Center + Center @@ -333,7 +334,7 @@ Center - Center + Center @@ -382,7 +383,7 @@ Center - Center + Center @@ -439,7 +440,7 @@ Center - Center + Center @@ -496,7 +497,7 @@ Center - Center + Center @@ -553,7 +554,7 @@ Center - Center + Center @@ -610,7 +611,7 @@ Center - Center + Center @@ -667,7 +668,7 @@ Center - Center + Center @@ -716,7 +717,7 @@ Center - Center + Center @@ -765,7 +766,7 @@ Center - Center + Center @@ -1124,4 +1125,4 @@ 2 - + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenScore.xml b/Output/Themes/Ambient/Screens/ScreenScore.xml index a07f386c..af0da59d 100644 --- a/Output/Themes/Ambient/Screens/ScreenScore.xml +++ b/Output/Themes/Ambient/Screens/ScreenScore.xml @@ -3,12 +3,13 @@ 3 - + Video BG_Default + BackgroundColor @@ -72,7 +73,7 @@ PointsBar 560 - 180 + 400 0,00 160 0 @@ -1221,7 +1222,7 @@ Left - Center + Center @@ -1250,7 +1251,7 @@ Center - Center + Center @@ -1279,7 +1280,7 @@ Center - Center + Center @@ -1308,7 +1309,7 @@ Center - Center + Center @@ -1337,7 +1338,7 @@ Center - Center + Center @@ -1366,7 +1367,7 @@ Center - Center + Center @@ -1395,7 +1396,7 @@ Center - Center + Center @@ -1424,7 +1425,7 @@ Center - Center + Center @@ -1453,7 +1454,7 @@ Center - Center + Center @@ -1482,7 +1483,7 @@ Center - Center + Center @@ -1511,7 +1512,7 @@ Center - Center + Center @@ -1540,7 +1541,7 @@ Center - Center + Center @@ -1569,7 +1570,7 @@ Center - Center + Center @@ -1598,7 +1599,7 @@ Center - Center + Center @@ -1627,7 +1628,7 @@ Center - Center + Center @@ -1656,7 +1657,7 @@ Center - Center + Center @@ -1685,7 +1686,7 @@ Center - Center + Center @@ -1714,7 +1715,7 @@ Center - Center + Center @@ -1743,7 +1744,7 @@ Center - Center + Center @@ -1772,7 +1773,7 @@ Center - Center + Center @@ -1801,7 +1802,7 @@ Center - Center + Center @@ -1830,7 +1831,7 @@ Center - Center + Center @@ -1859,7 +1860,7 @@ Center - Center + Center @@ -1888,7 +1889,7 @@ Center - Center + Center @@ -1917,7 +1918,7 @@ Center - Center + Center @@ -1946,7 +1947,7 @@ Center - Center + Center @@ -1975,7 +1976,7 @@ Center - Center + Center @@ -2004,7 +2005,7 @@ Center - Center + Center @@ -2034,7 +2035,7 @@ Center - Center + Center @@ -2063,7 +2064,7 @@ Center - Center + Center @@ -2092,7 +2093,7 @@ Center - Center + Center @@ -2121,7 +2122,7 @@ Center - Center + Center @@ -2151,7 +2152,7 @@ Center - Center + Center @@ -2180,7 +2181,7 @@ Center - Center + Center @@ -2209,7 +2210,7 @@ Center - Center + Center @@ -2238,7 +2239,7 @@ Center - Center + Center @@ -2268,7 +2269,7 @@ Center - Center + Center @@ -2297,7 +2298,7 @@ Center - Center + Center @@ -2326,7 +2327,7 @@ Center - Center + Center @@ -2355,7 +2356,7 @@ Center - Center + Center @@ -2385,7 +2386,7 @@ Center - Center + Center @@ -2414,7 +2415,7 @@ Center - Center + Center @@ -2444,7 +2445,7 @@ Center - Center + Center @@ -2474,7 +2475,7 @@ Center - Center + Center @@ -2504,7 +2505,7 @@ Center - Center + Center @@ -2534,7 +2535,7 @@ Center - Center + Center @@ -2564,7 +2565,7 @@ Center - Center + Center @@ -2594,7 +2595,7 @@ Center - Center + Center @@ -2624,7 +2625,7 @@ Center - Center + Center @@ -2654,7 +2655,7 @@ Center - Center + Center @@ -2684,7 +2685,7 @@ Center - Center + Center @@ -2714,7 +2715,7 @@ Center - Center + Center @@ -2744,7 +2745,7 @@ Center - Center + Center @@ -2774,7 +2775,7 @@ Center - Center + Center @@ -2804,7 +2805,7 @@ Center - Center + Center @@ -2834,7 +2835,7 @@ Center - Center + Center @@ -2864,7 +2865,7 @@ Center - Center + Center @@ -2894,7 +2895,7 @@ Center - Center + Center @@ -2924,7 +2925,7 @@ Center - Center + Center @@ -2954,7 +2955,7 @@ Center - Center + Center @@ -2984,7 +2985,7 @@ Center - Center + Center @@ -3014,7 +3015,7 @@ Center - Center + Center @@ -3044,7 +3045,7 @@ Center - Center + Center @@ -3074,7 +3075,7 @@ Center - Center + Center @@ -3104,7 +3105,7 @@ Center - Center + Center @@ -3134,7 +3135,7 @@ Center - Center + Center @@ -3164,7 +3165,7 @@ Center - Center + Center @@ -3194,7 +3195,7 @@ Center - Center + Center @@ -3224,7 +3225,7 @@ Center - Center + Center @@ -3254,7 +3255,7 @@ Center - Center + Center @@ -3284,7 +3285,7 @@ Center - Center + Center @@ -3314,7 +3315,7 @@ Center - Center + Center @@ -3344,7 +3345,7 @@ Center - Center + Center @@ -3374,7 +3375,7 @@ Center - Center + Center @@ -3404,7 +3405,7 @@ Center - Center + Center @@ -3434,7 +3435,7 @@ Center - Center + Center @@ -3464,7 +3465,7 @@ Center - Center + Center @@ -3494,7 +3495,7 @@ Center - Center + Center @@ -3524,7 +3525,7 @@ Center - Center + Center @@ -3554,7 +3555,7 @@ Center - Center + Center @@ -3584,7 +3585,7 @@ Center - Center + Center @@ -3614,7 +3615,7 @@ Center - Center + Center @@ -3644,7 +3645,7 @@ Center - Center + Center @@ -3674,7 +3675,7 @@ Center - Center + Center @@ -3704,7 +3705,7 @@ Center - Center + Center @@ -3734,7 +3735,7 @@ Center - Center + Center diff --git a/Output/Themes/Ambient/Screens/ScreenSing.xml b/Output/Themes/Ambient/Screens/ScreenSing.xml index 22342fca..d0fb5eb1 100644 --- a/Output/Themes/Ambient/Screens/ScreenSing.xml +++ b/Output/Themes/Ambient/Screens/ScreenSing.xml @@ -3,12 +3,13 @@ 7 - + None @@ -144,7 +145,7 @@ Pointer - 44 + 49 702 -1,25 2 @@ -977,7 +978,7 @@ Center - Center + Center @@ -1006,7 +1007,7 @@ Right - Center + Center @@ -1035,7 +1036,7 @@ Center - Center + Center @@ -1064,7 +1065,7 @@ Left - Center + Center @@ -1093,7 +1094,7 @@ Left - Center + Center @@ -1122,7 +1123,7 @@ Left - Center + Center @@ -1151,7 +1152,7 @@ Right - Center + Center @@ -1183,7 +1184,7 @@ Center - Center + Center @@ -1212,7 +1213,7 @@ Right - Center + Center @@ -1244,7 +1245,7 @@ Center - Center + Center @@ -1273,7 +1274,7 @@ Right - Center + Center @@ -1305,7 +1306,7 @@ Center - Center + Center @@ -1334,7 +1335,7 @@ Right - Center + Center @@ -1366,7 +1367,7 @@ Center - Center + Center @@ -1395,7 +1396,7 @@ Right - Center + Center @@ -1427,7 +1428,7 @@ Center - Center + Center @@ -1456,7 +1457,7 @@ Right - Center + Center @@ -1488,7 +1489,7 @@ Center - Center + Center @@ -1517,7 +1518,7 @@ Center - Center + Center @@ -1549,7 +1550,7 @@ Center - Center + Center @@ -1578,7 +1579,7 @@ Center - Center + Center @@ -1610,7 +1611,7 @@ Center - Center + Center @@ -1639,7 +1640,7 @@ Center - Center + Center @@ -1671,7 +1672,7 @@ Center - Center + Center @@ -1700,7 +1701,7 @@ Center - Center + Center @@ -1732,7 +1733,7 @@ Center - Center + Center @@ -1761,7 +1762,7 @@ Center - Center + Center @@ -1793,7 +1794,7 @@ Center - Center + Center @@ -1822,7 +1823,7 @@ Center - Center + Center @@ -1854,7 +1855,7 @@ Center - Center + Center @@ -1883,7 +1884,7 @@ Center - Center + Center @@ -1915,7 +1916,7 @@ Center - Center + Center @@ -1944,7 +1945,7 @@ Center - Center + Center @@ -1976,7 +1977,7 @@ Center - Center + Center @@ -2005,7 +2006,7 @@ Center - Center + Center @@ -2037,7 +2038,7 @@ Center - Center + Center @@ -2066,7 +2067,7 @@ Center - Center + Center @@ -2098,7 +2099,7 @@ Center - Center + Center @@ -2127,7 +2128,7 @@ Center - Center + Center @@ -2159,7 +2160,7 @@ Center - Center + Center @@ -2188,7 +2189,7 @@ Center - Center + Center @@ -2220,7 +2221,7 @@ Center - Center + Center @@ -2249,7 +2250,7 @@ Center - Center + Center @@ -2281,7 +2282,7 @@ Center - Center + Center @@ -2310,7 +2311,7 @@ Center - Center + Center @@ -2342,7 +2343,7 @@ Center - Center + Center @@ -2371,7 +2372,7 @@ Center - Center + Center @@ -2403,7 +2404,7 @@ Center - Center + Center @@ -2448,7 +2449,7 @@ Center - Center + Center @@ -2505,7 +2506,7 @@ Center - Center + Center @@ -2562,7 +2563,7 @@ Center - Center + Center diff --git a/Output/Themes/Ambient/Screens/ScreenSong.xml b/Output/Themes/Ambient/Screens/ScreenSong.xml index b23661d3..328b65d3 100644 --- a/Output/Themes/Ambient/Screens/ScreenSong.xml +++ b/Output/Themes/Ambient/Screens/ScreenSong.xml @@ -3,12 +3,13 @@ 5 - + Video BG_Default + BackgroundColor @@ -91,7 +92,7 @@ Left - Center + Center @@ -121,7 +122,7 @@ Left - Center + Center @@ -151,7 +152,7 @@ Left - Center + Center @@ -181,7 +182,7 @@ Left - Center + Center @@ -211,7 +212,7 @@ Left - Center + Center @@ -241,7 +242,7 @@ Left - Center + Center @@ -271,7 +272,7 @@ Center - Center + Center @@ -305,7 +306,7 @@ Center - Center + Center @@ -338,7 +339,7 @@ Right - Center + Center @@ -367,7 +368,7 @@ Left - Center + Center @@ -397,7 +398,7 @@ Center - Center + Center @@ -442,7 +443,7 @@ Center - Center + Center @@ -491,7 +492,7 @@ Center - Center + Center @@ -540,7 +541,7 @@ Center - Center + Center @@ -589,7 +590,7 @@ Center - Center + Center @@ -638,7 +639,7 @@ Center - Center + Center @@ -687,7 +688,7 @@ Center - Center + Center @@ -736,7 +737,7 @@ Center - Center + Center @@ -785,7 +786,7 @@ Center - Center + Center @@ -834,7 +835,7 @@ Center - Center + Center @@ -883,7 +884,7 @@ Center - Center + Center @@ -932,7 +933,7 @@ Center - Center + Center @@ -981,7 +982,7 @@ Center - Center + Center @@ -1030,7 +1031,7 @@ Center - Center + Center @@ -1079,7 +1080,7 @@ Center - Center + Center @@ -1128,7 +1129,7 @@ Center - Center + Center @@ -1177,7 +1178,7 @@ Center - Center + Center @@ -1234,7 +1235,7 @@ Center - Center + Center @@ -1283,7 +1284,7 @@ Center - Center + Center @@ -1630,7 +1631,7 @@ Center - Center + Center @@ -1660,7 +1661,7 @@ Center - Center + Center @@ -1690,7 +1691,7 @@ Center - Center + Center @@ -1838,7 +1839,7 @@ Left - Center + Center @@ -1999,7 +2000,7 @@ Left - Center + Center @@ -2048,7 +2049,7 @@ Center - Center + Center @@ -2097,7 +2098,7 @@ Center - Center + Center @@ -2146,7 +2147,7 @@ Center - Center + Center @@ -2195,7 +2196,7 @@ Center - Center + Center From e936fe4126a01dc805594d748e1a6b5e442deabf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Wed, 10 Sep 2014 20:44:39 +0200 Subject: [PATCH 20/29] Added constructors with STheme*-structs, LoadTextures() will be LoadTheme later and set all needed values from theme-struct to object. --- VocaluxeLib/Menu/CBackground.cs | 8 ++++++++ VocaluxeLib/Menu/CButton.cs | 11 +++++++++++ VocaluxeLib/Menu/CEqualizer.cs | 11 +++++++++++ VocaluxeLib/Menu/CLyric.cs | 13 +++++++++++++ VocaluxeLib/Menu/CNameSelection.cs | 12 ++++++++++++ VocaluxeLib/Menu/CParticle.cs | 14 ++++++++++++++ VocaluxeLib/Menu/CPlaylist.cs | 18 ++++++++++++++++++ VocaluxeLib/Menu/CScreenSetting.cs | 6 ++++++ VocaluxeLib/Menu/CSelectSlide.cs | 14 ++++++++++++++ VocaluxeLib/Menu/CStatic.cs | 8 ++++++++ VocaluxeLib/Menu/CText.cs | 8 ++++++++ .../Menu/SongMenu/CSongMenuFramework.cs | 9 +++++++++ 12 files changed, 132 insertions(+) diff --git a/VocaluxeLib/Menu/CBackground.cs b/VocaluxeLib/Menu/CBackground.cs index eabf5758..08659da7 100644 --- a/VocaluxeLib/Menu/CBackground.cs +++ b/VocaluxeLib/Menu/CBackground.cs @@ -90,6 +90,14 @@ namespace VocaluxeLib.Menu Color = new SColorF(0f, 0f, 0f, 1f); } + + public CBackground(SThemeBackground theme, int partyModeID) + { + _Theme = new SThemeBackground(theme); + _PartyModeID = partyModeID; + + LoadTextures(); + } #endregion Constructors #region public diff --git a/VocaluxeLib/Menu/CButton.cs b/VocaluxeLib/Menu/CButton.cs index f3a8d837..82f0970a 100644 --- a/VocaluxeLib/Menu/CButton.cs +++ b/VocaluxeLib/Menu/CButton.cs @@ -137,6 +137,17 @@ namespace VocaluxeLib.Menu EditMode = false; } + public CButton(SThemeButton theme, int partyModeID) + { + _PartyModeID = partyModeID; + _Theme = new SThemeButton(theme); + + Selected = false; + EditMode = false; + + LoadTextures(); + } + public CButton(CButton button) { _PartyModeID = button._PartyModeID; diff --git a/VocaluxeLib/Menu/CEqualizer.cs b/VocaluxeLib/Menu/CEqualizer.cs index ae35dfb3..958db155 100644 --- a/VocaluxeLib/Menu/CEqualizer.cs +++ b/VocaluxeLib/Menu/CEqualizer.cs @@ -121,6 +121,17 @@ namespace VocaluxeLib.Menu ReflectionHeight = 0f; } + public CEqualizer(SThemeEqualizer theme, int partyModeID) + { + _PartyModeID = partyModeID; + _Theme = new SThemeEqualizer(theme); + + Visible = true; + ScreenHandles = false; + + LoadTextures(); + } + public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader, int skinIndex) { string item = xmlPath + "/" + elementName; diff --git a/VocaluxeLib/Menu/CLyric.cs b/VocaluxeLib/Menu/CLyric.cs index f215e588..bc2418b1 100644 --- a/VocaluxeLib/Menu/CLyric.cs +++ b/VocaluxeLib/Menu/CLyric.cs @@ -128,6 +128,19 @@ namespace VocaluxeLib.Menu LyricStyle = ELyricStyle.Fill; } + public CLyric(SThemeLyrics theme, int partyModeID) + { + _PartyModeID = partyModeID; + _Theme = new SThemeLyrics(theme); + + _Line = new CSongLine(); + _Text = new CText(_PartyModeID); + + LyricStyle = ELyricStyle.Fill; + + LoadTextures(); + } + public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader, int skinIndex) { string item = xmlPath + "/" + elementName; diff --git a/VocaluxeLib/Menu/CNameSelection.cs b/VocaluxeLib/Menu/CNameSelection.cs index 7e2fcbbd..a8d93e17 100644 --- a/VocaluxeLib/Menu/CNameSelection.cs +++ b/VocaluxeLib/Menu/CNameSelection.cs @@ -175,6 +175,18 @@ namespace VocaluxeLib.Menu _UsedProfiles = new List(); } + public CNameSelection(SThemeNameSelection theme, int partyModeID) + { + _PartyModeID = partyModeID; + _Theme = new SThemeNameSelection(theme); + + _Tiles = new List(); + _VisibleProfiles = new List(); + _UsedProfiles = new List(); + + LoadTextures(); + } + public void Init() { _PrepareTiles(); diff --git a/VocaluxeLib/Menu/CParticle.cs b/VocaluxeLib/Menu/CParticle.cs index 6be85739..7f6aec9a 100644 --- a/VocaluxeLib/Menu/CParticle.cs +++ b/VocaluxeLib/Menu/CParticle.cs @@ -170,6 +170,8 @@ namespace VocaluxeLib.Menu _MaxAge = maxage; _Rotation = (float)(CBase.Game.GetRandomDouble() * 360.0); } + + #endregion Constructors public void Update() @@ -399,6 +401,18 @@ namespace VocaluxeLib.Menu Visible = true; } + public CParticleEffect(SThemeParticleEffect theme, int partyModeID) + { + _PartyModeID = partyModeID; + _Theme = new SThemeParticleEffect(theme); + _Stars = new List(); + _SpawnTimer = new Stopwatch(); + _NextSpawnTime = 0f; + Visible = true; + + LoadTextures(); + } + public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader, int skinIndex) { string item = xmlPath + "/" + elementName; diff --git a/VocaluxeLib/Menu/CPlaylist.cs b/VocaluxeLib/Menu/CPlaylist.cs index d8972b32..e625d539 100644 --- a/VocaluxeLib/Menu/CPlaylist.cs +++ b/VocaluxeLib/Menu/CPlaylist.cs @@ -307,6 +307,24 @@ namespace VocaluxeLib.Menu Selected = false; } + public CPlaylist(SThemePlaylist theme, int partyModeID) + { + _PartyModeID = partyModeID; + _Theme = new SThemePlaylist(theme); + + CompleteRect = new SRectF(); + _PlaylistElements = new List(); + _PlaylistElementContents = new List(); + + _Interactions = new CObjectInteractions(); + _ChangeOrderElement = new CPlaylistElement(); + + Visible = false; + Selected = false; + + LoadTextures(); + } + public void Init() { _Interactions.Clear(); diff --git a/VocaluxeLib/Menu/CScreenSetting.cs b/VocaluxeLib/Menu/CScreenSetting.cs index 4adea9f2..2f4e1bf5 100644 --- a/VocaluxeLib/Menu/CScreenSetting.cs +++ b/VocaluxeLib/Menu/CScreenSetting.cs @@ -75,6 +75,12 @@ namespace VocaluxeLib.Menu _ThemeLoaded = false; } + public CScreenSetting(SScreenSetting theme, int partyModeID) + { + _PartyModeID = partyModeID; + _Theme = new SScreenSetting(theme); + } + public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader, int skinIndex) { string item = xmlPath + "/" + elementName; diff --git a/VocaluxeLib/Menu/CSelectSlide.cs b/VocaluxeLib/Menu/CSelectSlide.cs index 20d96052..4a621ade 100644 --- a/VocaluxeLib/Menu/CSelectSlide.cs +++ b/VocaluxeLib/Menu/CSelectSlide.cs @@ -311,6 +311,20 @@ namespace VocaluxeLib.Menu Visible = slide.Visible; } + public CSelectSlide(SThemeSelectSlide theme, int partyModeID) + { + _PartyModeID = partyModeID; + _Theme = new SThemeSelectSlide(theme); + + _Selected = false; + _Textures = new List(); + _ValueIndexes = new List(); + _ValueNames = new List(); + _ValuePartyModeIDs = new List(); + + LoadTextures(); + } + public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader, int skinIndex) { string item = xmlPath + "/" + elementName; diff --git a/VocaluxeLib/Menu/CStatic.cs b/VocaluxeLib/Menu/CStatic.cs index f9ee10f5..08cee0b9 100644 --- a/VocaluxeLib/Menu/CStatic.cs +++ b/VocaluxeLib/Menu/CStatic.cs @@ -125,6 +125,14 @@ namespace VocaluxeLib.Menu Rect = rect; } + public CStatic(SThemeStatic theme, int partyModeID) + { + _PartyModeID = partyModeID; + _Theme = new SThemeStatic(theme); + + LoadTextures(); + } + public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader, int skinIndex) { string item = xmlPath + "/" + elementName; diff --git a/VocaluxeLib/Menu/CText.cs b/VocaluxeLib/Menu/CText.cs index cf58092d..1a126d61 100644 --- a/VocaluxeLib/Menu/CText.cs +++ b/VocaluxeLib/Menu/CText.cs @@ -350,6 +350,14 @@ namespace VocaluxeLib.Menu ReflectionHeight = rheight; } + public CText(SThemeText theme, int partyModeID) + { + _PartyModeID = partyModeID; + _Theme = new SThemeText(theme); + + LoadTextures(); + } + public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader, int skinIndex) { return LoadTheme(xmlPath, elementName, xmlReader, skinIndex, false); diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs index 98648ed3..05b36cf7 100644 --- a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs +++ b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs @@ -266,6 +266,15 @@ namespace VocaluxeLib.Menu.SongMenu }; } + protected CSongMenuFramework(SThemeSongMenu theme, int partyModeID) + { + Visible = true; + _PartyModeID = partyModeID; + _Theme = new SThemeSongMenu(theme); + + LoadTextures(); + } + #region Theme public string GetThemeName() { From d248292fa3ab6110769c85a5c1b03b9e0380fed2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Fri, 12 Sep 2014 09:34:55 +0200 Subject: [PATCH 21/29] Update LoadTextures for some elements. --- VocaluxeLib/Menu/CPlaylist.cs | 364 ++++++++++++++----------------- VocaluxeLib/Menu/CSelectSlide.cs | 26 +++ VocaluxeLib/Menu/CStatic.cs | 10 + VocaluxeLib/Menu/CText.cs | 27 +++ 4 files changed, 230 insertions(+), 197 deletions(-) diff --git a/VocaluxeLib/Menu/CPlaylist.cs b/VocaluxeLib/Menu/CPlaylist.cs index e625d539..9deddea3 100644 --- a/VocaluxeLib/Menu/CPlaylist.cs +++ b/VocaluxeLib/Menu/CPlaylist.cs @@ -78,78 +78,27 @@ namespace VocaluxeLib.Menu [XmlElement("Text1")] public SThemeText SText1; - [XmlIgnore] - public CText Text1; [XmlElement("StaticCover")] public SThemeStatic SStaticCover; - [XmlIgnore] - public CStatic StaticCover; [XmlElement("StaticPlaylistHeader")] public SThemeStatic SStaticPlaylistHeader; - [XmlIgnore] - public CStatic StaticPlaylistHeader; [XmlElement("StaticPlaylistFooter")] public SThemeStatic SStaticPlaylistFooter; - [XmlIgnore] - public CStatic StaticPlaylistFooter; [XmlElement("ButtonPlaylistName")] public SThemeButton SButtonPlaylistName; - [XmlIgnore] - public CButton ButtonPlaylistName; [XmlElement("ButtonPlaylistClose")] public SThemeButton SButtonPlaylistClose; - [XmlIgnore] - public CButton ButtonPlaylistClose; [XmlElement("ButtonPlaylistSave")] - public SThemeButton SButtonPlaylistSave; - [XmlIgnore] - public CButton ButtonPlaylistSave; + public SThemeButton SButtonPlaylistSave; [XmlElement("ButtonPlaylistDelete")] public SThemeButton SButtonPlaylistDelete; - [XmlIgnore] - public CButton ButtonPlaylistDelete; [XmlElement("ButtonPlaylistSing")] public SThemeButton SButtonPlaylistSing; - [XmlIgnore] - public CButton ButtonPlaylistSing; [XmlElement("SelectSlideGameMode")] public SThemeSelectSlide SSelectSlideGameMode; - [XmlIgnore] - public CSelectSlide SelectSlideGameMode; - - public SThemePlaylist(SThemePlaylist theme) - { - Name = theme.Name; - Rect = theme.Rect; - EntryHeight = theme.EntryHeight; - TextureBackgroundName = theme.TextureBackgroundName; - SelTextureBackgroundName = theme.SelTextureBackgroundName; - ColorBackground = new SThemeColor(theme.ColorBackground); - SelColorBackground = new SThemeColor(theme.SelColorBackground); - SText1 = new SThemeText(theme.SText1); - Text1 = new CText(theme.Text1); - SStaticCover = new SThemeStatic(theme.SStaticCover); - StaticCover = new CStatic(theme.StaticCover); - SStaticPlaylistHeader = new SThemeStatic(theme.SStaticPlaylistHeader); - StaticPlaylistHeader = new CStatic(theme.StaticPlaylistHeader); - SStaticPlaylistFooter = new SThemeStatic(theme.SStaticPlaylistFooter); - StaticPlaylistFooter = new CStatic(theme.StaticPlaylistFooter); - SButtonPlaylistName = new SThemeButton(theme.SButtonPlaylistName); - ButtonPlaylistName = new CButton(theme.ButtonPlaylistName); - SButtonPlaylistClose = new SThemeButton(theme.SButtonPlaylistClose); - ButtonPlaylistClose = new CButton(theme.ButtonPlaylistClose); - SButtonPlaylistSave = new SThemeButton(theme.SButtonPlaylistSave); - ButtonPlaylistSave = new CButton(theme.ButtonPlaylistSave); - SButtonPlaylistDelete = new SThemeButton(theme.SButtonPlaylistDelete); - ButtonPlaylistDelete = new CButton(theme.ButtonPlaylistDelete); - SButtonPlaylistSing = new SThemeButton(theme.SButtonPlaylistSing); - ButtonPlaylistSing = new CButton(theme.ButtonPlaylistSing); - SSelectSlideGameMode = new SThemeSelectSlide(theme.SSelectSlideGameMode); - SelectSlideGameMode = new CSelectSlide(theme.SelectSlideGameMode); - } } public class CPlaylist : IMenuElement @@ -237,6 +186,17 @@ namespace VocaluxeLib.Menu public SColorF BackgroundColor; public SColorF BackgroundSelColor; + public CButton ButtonPlaylistName; + public CButton ButtonPlaylistClose; + public CButton ButtonPlaylistSave; + public CButton ButtonPlaylistDelete; + public CButton ButtonPlaylistSing; + public CText Text1; + public CSelectSlide SelectSlideGameMode; + public CStatic StaticCover; + public CStatic StaticPlaylistHeader; + public CStatic StaticPlaylistFooter; + public bool Visible; private bool _Selected; @@ -278,19 +238,17 @@ namespace VocaluxeLib.Menu public CPlaylist(int partyModeID) { _PartyModeID = partyModeID; - _Theme = new SThemePlaylist - { - Text1 = new CText(_PartyModeID), - StaticCover = new CStatic(_PartyModeID), - StaticPlaylistFooter = new CStatic(_PartyModeID), - StaticPlaylistHeader = new CStatic(_PartyModeID), - ButtonPlaylistName = new CButton(_PartyModeID), - ButtonPlaylistClose = new CButton(_PartyModeID), - ButtonPlaylistDelete = new CButton(_PartyModeID), - ButtonPlaylistSave = new CButton(_PartyModeID), - ButtonPlaylistSing = new CButton(_PartyModeID), - SelectSlideGameMode = new CSelectSlide(_PartyModeID) - }; + + Text1 = new CText(_PartyModeID); + StaticCover = new CStatic(_PartyModeID); + StaticPlaylistFooter = new CStatic(_PartyModeID); + StaticPlaylistHeader = new CStatic(_PartyModeID); + ButtonPlaylistName = new CButton(_PartyModeID); + ButtonPlaylistClose = new CButton(_PartyModeID); + ButtonPlaylistDelete = new CButton(_PartyModeID); + ButtonPlaylistSave = new CButton(_PartyModeID); + ButtonPlaylistSing = new CButton(_PartyModeID); + SelectSlideGameMode = new CSelectSlide(_PartyModeID); CompleteRect = new SRectF(); Rect = new SRectF(); @@ -310,7 +268,7 @@ namespace VocaluxeLib.Menu public CPlaylist(SThemePlaylist theme, int partyModeID) { _PartyModeID = partyModeID; - _Theme = new SThemePlaylist(theme); + _Theme = theme; CompleteRect = new SRectF(); _PlaylistElements = new List(); @@ -319,6 +277,18 @@ namespace VocaluxeLib.Menu _Interactions = new CObjectInteractions(); _ChangeOrderElement = new CPlaylistElement(); + Text1 = new CText(_Theme.SText1, _PartyModeID); + StaticCover = new CStatic(_Theme.SStaticCover, _PartyModeID); + StaticPlaylistFooter = new CStatic(_Theme.SStaticPlaylistFooter, _PartyModeID); + StaticPlaylistHeader = new CStatic(_Theme.SStaticPlaylistHeader, _PartyModeID); + ButtonPlaylistName = new CButton(_Theme.SButtonPlaylistName, _PartyModeID); + ButtonPlaylistClose = new CButton(_Theme.SButtonPlaylistClose, _PartyModeID); + ButtonPlaylistDelete = new CButton(_Theme.SButtonPlaylistDelete, _PartyModeID); + ButtonPlaylistSave = new CButton(_Theme.SButtonPlaylistSave, _PartyModeID); + ButtonPlaylistSing = new CButton(_Theme.SButtonPlaylistSing, _PartyModeID); + SelectSlideGameMode = new CSelectSlide(_Theme.SSelectSlideGameMode, _PartyModeID); + + Visible = false; Selected = false; @@ -329,14 +299,14 @@ namespace VocaluxeLib.Menu { _Interactions.Clear(); _PrepareList(); - _Interactions.AddStatic(_Theme.StaticCover); - _Interactions.AddStatic(_Theme.StaticPlaylistFooter); - _Interactions.AddStatic(_Theme.StaticPlaylistHeader); - _Interactions.AddButton(_Theme.ButtonPlaylistName); - _Interactions.AddButton(_Theme.ButtonPlaylistClose); - _Interactions.AddButton(_Theme.ButtonPlaylistDelete); - _Interactions.AddButton(_Theme.ButtonPlaylistSave); - _Interactions.AddButton(_Theme.ButtonPlaylistSing); + _Interactions.AddStatic(StaticCover); + _Interactions.AddStatic(StaticPlaylistFooter); + _Interactions.AddStatic(StaticPlaylistHeader); + _Interactions.AddButton(ButtonPlaylistName); + _Interactions.AddButton(ButtonPlaylistClose); + _Interactions.AddButton(ButtonPlaylistDelete); + _Interactions.AddButton(ButtonPlaylistSave); + _Interactions.AddButton(ButtonPlaylistSing); } public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader, int skinIndex) @@ -371,19 +341,19 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SBackgroundA", ref BackgroundSelColor.A); } - _ThemeLoaded &= _Theme.Text1.LoadTheme(item, "TextPart1", xmlReader, skinIndex); + _ThemeLoaded &= Text1.LoadTheme(item, "TextPart1", xmlReader, skinIndex); - _ThemeLoaded &= _Theme.StaticCover.LoadTheme(item, "StaticCover", xmlReader, skinIndex); - _ThemeLoaded &= _Theme.StaticPlaylistHeader.LoadTheme(item, "StaticPlaylistHeader", xmlReader, skinIndex); - _ThemeLoaded &= _Theme.StaticPlaylistFooter.LoadTheme(item, "StaticPlaylistFooter", xmlReader, skinIndex); + _ThemeLoaded &= StaticCover.LoadTheme(item, "StaticCover", xmlReader, skinIndex); + _ThemeLoaded &= StaticPlaylistHeader.LoadTheme(item, "StaticPlaylistHeader", xmlReader, skinIndex); + _ThemeLoaded &= StaticPlaylistFooter.LoadTheme(item, "StaticPlaylistFooter", xmlReader, skinIndex); - _ThemeLoaded &= _Theme.ButtonPlaylistName.LoadTheme(item, "ButtonPlaylistName", xmlReader, skinIndex); - _ThemeLoaded &= _Theme.ButtonPlaylistSing.LoadTheme(item, "ButtonPlaylistSing", xmlReader, skinIndex); - _ThemeLoaded &= _Theme.ButtonPlaylistClose.LoadTheme(item, "ButtonPlaylistClose", xmlReader, skinIndex); - _ThemeLoaded &= _Theme.ButtonPlaylistSave.LoadTheme(item, "ButtonPlaylistSave", xmlReader, skinIndex); - _ThemeLoaded &= _Theme.ButtonPlaylistDelete.LoadTheme(item, "ButtonPlaylistDelete", xmlReader, skinIndex); + _ThemeLoaded &= ButtonPlaylistName.LoadTheme(item, "ButtonPlaylistName", xmlReader, skinIndex); + _ThemeLoaded &= ButtonPlaylistSing.LoadTheme(item, "ButtonPlaylistSing", xmlReader, skinIndex); + _ThemeLoaded &= ButtonPlaylistClose.LoadTheme(item, "ButtonPlaylistClose", xmlReader, skinIndex); + _ThemeLoaded &= ButtonPlaylistSave.LoadTheme(item, "ButtonPlaylistSave", xmlReader, skinIndex); + _ThemeLoaded &= ButtonPlaylistDelete.LoadTheme(item, "ButtonPlaylistDelete", xmlReader, skinIndex); - _ThemeLoaded &= _Theme.SelectSlideGameMode.LoadTheme(item, "SelectSlideGameMode", xmlReader, skinIndex); + _ThemeLoaded &=SelectSlideGameMode.LoadTheme(item, "SelectSlideGameMode", xmlReader, skinIndex); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/EntryHeight", ref _Theme.EntryHeight); if (_ThemeLoaded) @@ -392,63 +362,63 @@ namespace VocaluxeLib.Menu _Theme.Rect = Rect; _Theme.ColorBackground.Color = BackgroundColor; _Theme.SelColorBackground.Color = BackgroundSelColor; - _Theme.SText1 = _Theme.Text1.GetTheme(); - _Theme.SStaticCover = _Theme.StaticCover.GetTheme(); - _Theme.SStaticPlaylistFooter = _Theme.StaticPlaylistFooter.GetTheme(); - _Theme.SStaticPlaylistHeader = _Theme.StaticPlaylistHeader.GetTheme(); - _Theme.SButtonPlaylistName = _Theme.ButtonPlaylistName.GetTheme(); - _Theme.SButtonPlaylistSing = _Theme.ButtonPlaylistSing.GetTheme(); - _Theme.SButtonPlaylistClose = _Theme.ButtonPlaylistClose.GetTheme(); - _Theme.SButtonPlaylistSave = _Theme.ButtonPlaylistSave.GetTheme(); - _Theme.SButtonPlaylistDelete = _Theme.ButtonPlaylistDelete.GetTheme(); + _Theme.SText1 = Text1.GetTheme(); + _Theme.SStaticCover = StaticCover.GetTheme(); + _Theme.SStaticPlaylistFooter = StaticPlaylistFooter.GetTheme(); + _Theme.SStaticPlaylistHeader = StaticPlaylistHeader.GetTheme(); + _Theme.SButtonPlaylistName =ButtonPlaylistName.GetTheme(); + _Theme.SButtonPlaylistSing =ButtonPlaylistSing.GetTheme(); + _Theme.SButtonPlaylistClose =ButtonPlaylistClose.GetTheme(); + _Theme.SButtonPlaylistSave =ButtonPlaylistSave.GetTheme(); + _Theme.SButtonPlaylistDelete =ButtonPlaylistDelete.GetTheme(); //Check for highest x/y-coords CompleteRect = Rect; //ButtonPlaylistClose - if (_Theme.ButtonPlaylistClose.Rect.X < CompleteRect.X) - CompleteRect.X = _Theme.ButtonPlaylistClose.Rect.X; - if (_Theme.ButtonPlaylistClose.Rect.Y < CompleteRect.Y) - CompleteRect.Y = _Theme.ButtonPlaylistClose.Rect.Y; - if (_Theme.ButtonPlaylistClose.Rect.W + _Theme.ButtonPlaylistClose.Rect.X > CompleteRect.W + CompleteRect.X) - CompleteRect.W = _Theme.ButtonPlaylistClose.Rect.W + _Theme.ButtonPlaylistClose.Rect.X - CompleteRect.X; - if (_Theme.ButtonPlaylistClose.Rect.Y + _Theme.ButtonPlaylistClose.Rect.H > CompleteRect.Y + CompleteRect.H) - CompleteRect.H = _Theme.ButtonPlaylistClose.Rect.H + _Theme.ButtonPlaylistClose.Rect.Y - CompleteRect.Y; + if (ButtonPlaylistClose.Rect.X < CompleteRect.X) + CompleteRect.X = ButtonPlaylistClose.Rect.X; + if (ButtonPlaylistClose.Rect.Y < CompleteRect.Y) + CompleteRect.Y = ButtonPlaylistClose.Rect.Y; + if (ButtonPlaylistClose.Rect.W + ButtonPlaylistClose.Rect.X > CompleteRect.W + CompleteRect.X) + CompleteRect.W = ButtonPlaylistClose.Rect.W + ButtonPlaylistClose.Rect.X - CompleteRect.X; + if (ButtonPlaylistClose.Rect.Y + ButtonPlaylistClose.Rect.H > CompleteRect.Y + CompleteRect.H) + CompleteRect.H = ButtonPlaylistClose.Rect.H + ButtonPlaylistClose.Rect.Y - CompleteRect.Y; //ButtonPlaylistName - if (_Theme.ButtonPlaylistName.Rect.X < CompleteRect.X) - CompleteRect.X = _Theme.ButtonPlaylistName.Rect.X; - if (_Theme.ButtonPlaylistName.Rect.Y < CompleteRect.Y) - CompleteRect.Y = _Theme.ButtonPlaylistName.Rect.Y; - if (_Theme.ButtonPlaylistName.Rect.W + _Theme.ButtonPlaylistName.Rect.X > CompleteRect.W + CompleteRect.X) - CompleteRect.W = _Theme.ButtonPlaylistName.Rect.W + _Theme.ButtonPlaylistName.Rect.X - CompleteRect.X; - if (_Theme.ButtonPlaylistName.Rect.Y + _Theme.ButtonPlaylistName.Rect.H > CompleteRect.Y + CompleteRect.H) - CompleteRect.H = _Theme.ButtonPlaylistName.Rect.H + _Theme.ButtonPlaylistName.Rect.Y - CompleteRect.Y; + if (ButtonPlaylistName.Rect.X < CompleteRect.X) + CompleteRect.X = ButtonPlaylistName.Rect.X; + if (ButtonPlaylistName.Rect.Y < CompleteRect.Y) + CompleteRect.Y = ButtonPlaylistName.Rect.Y; + if (ButtonPlaylistName.Rect.W + ButtonPlaylistName.Rect.X > CompleteRect.W + CompleteRect.X) + CompleteRect.W = ButtonPlaylistName.Rect.W + ButtonPlaylistName.Rect.X - CompleteRect.X; + if (ButtonPlaylistName.Rect.Y + ButtonPlaylistName.Rect.H > CompleteRect.Y + CompleteRect.H) + CompleteRect.H = ButtonPlaylistName.Rect.H + ButtonPlaylistName.Rect.Y - CompleteRect.Y; //ButtonPlaylistSing - if (_Theme.ButtonPlaylistSing.Rect.X < CompleteRect.X) - CompleteRect.X = _Theme.ButtonPlaylistSing.Rect.X; - if (_Theme.ButtonPlaylistSing.Rect.Y < CompleteRect.Y) - CompleteRect.Y = _Theme.ButtonPlaylistSing.Rect.Y; - if (_Theme.ButtonPlaylistSing.Rect.W + _Theme.ButtonPlaylistSing.Rect.X > CompleteRect.W + CompleteRect.X) - CompleteRect.W = _Theme.ButtonPlaylistSing.Rect.W + _Theme.ButtonPlaylistSing.Rect.X - CompleteRect.X; - if (_Theme.ButtonPlaylistSing.Rect.Y + _Theme.ButtonPlaylistSing.Rect.H > CompleteRect.Y + CompleteRect.H) - CompleteRect.H = _Theme.ButtonPlaylistSing.Rect.H + _Theme.ButtonPlaylistSing.Rect.Y - CompleteRect.Y; + if (ButtonPlaylistSing.Rect.X < CompleteRect.X) + CompleteRect.X = ButtonPlaylistSing.Rect.X; + if (ButtonPlaylistSing.Rect.Y < CompleteRect.Y) + CompleteRect.Y = ButtonPlaylistSing.Rect.Y; + if (ButtonPlaylistSing.Rect.W + ButtonPlaylistSing.Rect.X > CompleteRect.W + CompleteRect.X) + CompleteRect.W = ButtonPlaylistSing.Rect.W + ButtonPlaylistSing.Rect.X - CompleteRect.X; + if (ButtonPlaylistSing.Rect.Y + ButtonPlaylistSing.Rect.H > CompleteRect.Y + CompleteRect.H) + CompleteRect.H = ButtonPlaylistSing.Rect.H + ButtonPlaylistSing.Rect.Y - CompleteRect.Y; //ButtonPlaylistSave - if (_Theme.ButtonPlaylistSave.Rect.X < CompleteRect.X) - CompleteRect.X = _Theme.ButtonPlaylistSave.Rect.X; - if (_Theme.ButtonPlaylistSave.Rect.Y < CompleteRect.Y) - CompleteRect.Y = _Theme.ButtonPlaylistSave.Rect.Y; - if (_Theme.ButtonPlaylistSave.Rect.W + _Theme.ButtonPlaylistSave.Rect.X > CompleteRect.W + CompleteRect.X) - CompleteRect.W = _Theme.ButtonPlaylistSave.Rect.W + _Theme.ButtonPlaylistSave.Rect.X - CompleteRect.X; - if (_Theme.ButtonPlaylistSave.Rect.Y + _Theme.ButtonPlaylistSave.Rect.H > CompleteRect.Y + CompleteRect.H) - CompleteRect.H = _Theme.ButtonPlaylistSave.Rect.H + _Theme.ButtonPlaylistSave.Rect.Y - CompleteRect.Y; + if (ButtonPlaylistSave.Rect.X < CompleteRect.X) + CompleteRect.X = ButtonPlaylistSave.Rect.X; + if (ButtonPlaylistSave.Rect.Y < CompleteRect.Y) + CompleteRect.Y = ButtonPlaylistSave.Rect.Y; + if (ButtonPlaylistSave.Rect.W + ButtonPlaylistSave.Rect.X > CompleteRect.W + CompleteRect.X) + CompleteRect.W = ButtonPlaylistSave.Rect.W + ButtonPlaylistSave.Rect.X - CompleteRect.X; + if (ButtonPlaylistSave.Rect.Y + ButtonPlaylistSave.Rect.H > CompleteRect.Y + CompleteRect.H) + CompleteRect.H = ButtonPlaylistSave.Rect.H + ButtonPlaylistSave.Rect.Y - CompleteRect.Y; //ButtonPlaylistDelete - if (_Theme.ButtonPlaylistDelete.Rect.X < CompleteRect.X) - CompleteRect.X = _Theme.ButtonPlaylistDelete.Rect.X; - if (_Theme.ButtonPlaylistDelete.Rect.Y < CompleteRect.Y) - CompleteRect.Y = _Theme.ButtonPlaylistDelete.Rect.Y; - if (_Theme.ButtonPlaylistDelete.Rect.W + _Theme.ButtonPlaylistDelete.Rect.X > CompleteRect.W + CompleteRect.X) - CompleteRect.W = _Theme.ButtonPlaylistDelete.Rect.W + _Theme.ButtonPlaylistDelete.Rect.X - CompleteRect.X; - if (_Theme.ButtonPlaylistDelete.Rect.Y + _Theme.ButtonPlaylistDelete.Rect.H > CompleteRect.Y + CompleteRect.H) - CompleteRect.H = _Theme.ButtonPlaylistDelete.Rect.H + _Theme.ButtonPlaylistDelete.Rect.Y - CompleteRect.Y; + if (ButtonPlaylistDelete.Rect.X < CompleteRect.X) + CompleteRect.X = ButtonPlaylistDelete.Rect.X; + if (ButtonPlaylistDelete.Rect.Y < CompleteRect.Y) + CompleteRect.Y = ButtonPlaylistDelete.Rect.Y; + if (ButtonPlaylistDelete.Rect.W + ButtonPlaylistDelete.Rect.X > CompleteRect.W + CompleteRect.X) + CompleteRect.W = ButtonPlaylistDelete.Rect.W + ButtonPlaylistDelete.Rect.X - CompleteRect.X; + if (ButtonPlaylistDelete.Rect.Y + ButtonPlaylistDelete.Rect.H > CompleteRect.Y + CompleteRect.H) + CompleteRect.H = ButtonPlaylistDelete.Rect.H + ButtonPlaylistDelete.Rect.Y - CompleteRect.Y; LoadTextures(); } return _ThemeLoaded; @@ -501,16 +471,16 @@ namespace VocaluxeLib.Menu writer.WriteComment("Positions of , , , and are relative to playlist-entry!"); writer.WriteComment("Use placeholders for Text of , and : %t, %a, %l"); - _Theme.Text1.SaveTheme(writer); - _Theme.StaticPlaylistFooter.SaveTheme(writer); - _Theme.StaticPlaylistHeader.SaveTheme(writer); - _Theme.StaticCover.SaveTheme(writer); - _Theme.SelectSlideGameMode.SaveTheme(writer); - _Theme.ButtonPlaylistName.SaveTheme(writer); - _Theme.ButtonPlaylistClose.SaveTheme(writer); - _Theme.ButtonPlaylistDelete.SaveTheme(writer); - _Theme.ButtonPlaylistSave.SaveTheme(writer); - _Theme.ButtonPlaylistSing.SaveTheme(writer); + Text1.SaveTheme(writer); + StaticPlaylistFooter.SaveTheme(writer); + StaticPlaylistHeader.SaveTheme(writer); + StaticCover.SaveTheme(writer); + SelectSlideGameMode.SaveTheme(writer); + ButtonPlaylistName.SaveTheme(writer); + ButtonPlaylistClose.SaveTheme(writer); + ButtonPlaylistDelete.SaveTheme(writer); + ButtonPlaylistSave.SaveTheme(writer); + ButtonPlaylistSing.SaveTheme(writer); writer.WriteEndElement(); @@ -552,18 +522,18 @@ namespace VocaluxeLib.Menu public void UnloadTextures() { - _Theme.Text1.UnloadTextures(); - _Theme.ButtonPlaylistClose.UnloadTextures(); - _Theme.ButtonPlaylistDelete.UnloadTextures(); - _Theme.ButtonPlaylistName.UnloadTextures(); - _Theme.ButtonPlaylistSave.UnloadTextures(); - _Theme.ButtonPlaylistSing.UnloadTextures(); + Text1.UnloadTextures(); + ButtonPlaylistClose.UnloadTextures(); + ButtonPlaylistDelete.UnloadTextures(); + ButtonPlaylistName.UnloadTextures(); + ButtonPlaylistSave.UnloadTextures(); + ButtonPlaylistSing.UnloadTextures(); - _Theme.StaticCover.UnloadTextures(); - _Theme.StaticPlaylistFooter.UnloadTextures(); - _Theme.StaticPlaylistHeader.UnloadTextures(); + StaticCover.UnloadTextures(); + StaticPlaylistFooter.UnloadTextures(); + StaticPlaylistHeader.UnloadTextures(); - _Theme.SelectSlideGameMode.UnloadTextures(); + SelectSlideGameMode.UnloadTextures(); } public void LoadTextures() @@ -574,18 +544,18 @@ namespace VocaluxeLib.Menu if (!String.IsNullOrEmpty(_Theme.SelColorBackground.Name)) BackgroundSelColor = CBase.Theme.GetColor(_Theme.SelColorBackground.Name, _PartyModeID); - _Theme.Text1.LoadTextures(); - _Theme.ButtonPlaylistClose.LoadTextures(); - _Theme.ButtonPlaylistDelete.LoadTextures(); - _Theme.ButtonPlaylistName.LoadTextures(); - _Theme.ButtonPlaylistSave.LoadTextures(); - _Theme.ButtonPlaylistSing.LoadTextures(); + Text1.LoadTextures(); + ButtonPlaylistClose.LoadTextures(); + ButtonPlaylistDelete.LoadTextures(); + ButtonPlaylistName.LoadTextures(); + ButtonPlaylistSave.LoadTextures(); + ButtonPlaylistSing.LoadTextures(); - _Theme.StaticCover.LoadTextures(); - _Theme.StaticPlaylistFooter.LoadTextures(); - _Theme.StaticPlaylistHeader.LoadTextures(); + StaticCover.LoadTextures(); + StaticPlaylistFooter.LoadTextures(); + StaticPlaylistHeader.LoadTextures(); - _Theme.SelectSlideGameMode.LoadTextures(); + SelectSlideGameMode.LoadTextures(); Init(); } @@ -604,26 +574,26 @@ namespace VocaluxeLib.Menu if (EditMode == EEditMode.PlaylistName) { if (keyEvent.KeyPressed && !Char.IsControl(keyEvent.Unicode)) - _Theme.ButtonPlaylistName.Text.Text = _Theme.ButtonPlaylistName.Text.Text + keyEvent.Unicode; + ButtonPlaylistName.Text.Text = ButtonPlaylistName.Text.Text + keyEvent.Unicode; else { switch (keyEvent.Key) { case Keys.Enter: - CBase.Playlist.SetName(ActivePlaylistID, _Theme.ButtonPlaylistName.Text.Text); + CBase.Playlist.SetName(ActivePlaylistID, ButtonPlaylistName.Text.Text); CBase.Playlist.Save(ActivePlaylistID); EditMode = EEditMode.None; - _Theme.ButtonPlaylistName.EditMode = false; + ButtonPlaylistName.EditMode = false; break; case Keys.Escape: - _Theme.ButtonPlaylistName.Text.Text = CBase.Playlist.GetName(ActivePlaylistID); + ButtonPlaylistName.Text.Text = CBase.Playlist.GetName(ActivePlaylistID); EditMode = EEditMode.None; - _Theme.ButtonPlaylistName.EditMode = false; + ButtonPlaylistName.EditMode = false; break; case Keys.Delete: case Keys.Back: - if (!String.IsNullOrEmpty(_Theme.ButtonPlaylistName.Text.Text)) - _Theme.ButtonPlaylistName.Text.Text = _Theme.ButtonPlaylistName.Text.Text.Remove(_Theme.ButtonPlaylistName.Text.Text.Length - 1); + if (!String.IsNullOrEmpty(ButtonPlaylistName.Text.Text)) + ButtonPlaylistName.Text.Text = ButtonPlaylistName.Text.Text.Remove(ButtonPlaylistName.Text.Text.Length - 1); break; } } @@ -856,38 +826,38 @@ namespace VocaluxeLib.Menu switch (keyEvent.Key) { case Keys.Back: - if (_Theme.ButtonPlaylistName.Selected) + if (ButtonPlaylistName.Selected) { EditMode = EEditMode.PlaylistName; - _Theme.ButtonPlaylistName.EditMode = true; + ButtonPlaylistName.EditMode = true; } else ClosePlaylist(); break; case Keys.Enter: - if (_Theme.ButtonPlaylistClose.Selected) + if (ButtonPlaylistClose.Selected) ClosePlaylist(); - else if (_Theme.ButtonPlaylistSing.Selected) + else if (ButtonPlaylistSing.Selected) _StartPlaylistSongs(); - else if (_Theme.ButtonPlaylistSave.Selected) + else if (ButtonPlaylistSave.Selected) CBase.Playlist.Save(ActivePlaylistID); - else if (_Theme.ButtonPlaylistDelete.Selected) + else if (ButtonPlaylistDelete.Selected) { CBase.Playlist.Delete(ActivePlaylistID); ClosePlaylist(); } - else if (_Theme.ButtonPlaylistName.Selected) + else if (ButtonPlaylistName.Selected) { if (EditMode != EEditMode.PlaylistName) { EditMode = EEditMode.PlaylistName; - _Theme.ButtonPlaylistName.EditMode = true; + ButtonPlaylistName.EditMode = true; } else { EditMode = EEditMode.None; - _Theme.ButtonPlaylistName.EditMode = false; + ButtonPlaylistName.EditMode = false; } } break; @@ -1017,31 +987,31 @@ namespace VocaluxeLib.Menu _PlaylistElementContents[CurrentPlaylistElement + Offset].Modes[_PlaylistElements[CurrentPlaylistElement].SelectSlide.Selection]; UpdatePlaylist(); } - if (_Theme.ButtonPlaylistClose.Selected) + if (ButtonPlaylistClose.Selected) { ClosePlaylist(); return true; } - if (_Theme.ButtonPlaylistSing.Selected) + if (ButtonPlaylistSing.Selected) { _StartPlaylistSongs(); return true; } - if (_Theme.ButtonPlaylistSave.Selected) + if (ButtonPlaylistSave.Selected) { CBase.Playlist.Save(ActivePlaylistID); return true; } - if (_Theme.ButtonPlaylistDelete.Selected) + if (ButtonPlaylistDelete.Selected) { CBase.Playlist.Delete(ActivePlaylistID); ClosePlaylist(); return true; } - if (_Theme.ButtonPlaylistName.Selected) + if (ButtonPlaylistName.Selected) { EditMode = EEditMode.PlaylistName; - _Theme.ButtonPlaylistName.EditMode = true; + ButtonPlaylistName.EditMode = true; return true; } } @@ -1129,13 +1099,13 @@ namespace VocaluxeLib.Menu break; case EEditMode.PlaylistName: - _Interactions.SetInteractionToButton(_Theme.ButtonPlaylistName); + _Interactions.SetInteractionToButton(ButtonPlaylistName); CurrentPlaylistElement = -1; if (mouseEvent.LB) { - if (_Theme.ButtonPlaylistName.Selected) + if (ButtonPlaylistName.Selected) { - CBase.Playlist.SetName(ActivePlaylistID, _Theme.ButtonPlaylistName.Text.Text); + CBase.Playlist.SetName(ActivePlaylistID, ButtonPlaylistName.Text.Text); CBase.Playlist.Save(ActivePlaylistID); EditMode = EEditMode.None; return true; @@ -1143,11 +1113,11 @@ namespace VocaluxeLib.Menu } else if (mouseEvent.RB) { - if (_Theme.ButtonPlaylistName.Selected) + if (ButtonPlaylistName.Selected) { - _Theme.ButtonPlaylistName.Text.Text = CBase.Playlist.GetName(ActivePlaylistID); + ButtonPlaylistName.Text.Text = CBase.Playlist.GetName(ActivePlaylistID); EditMode = EEditMode.None; - _Theme.ButtonPlaylistName.EditMode = false; + ButtonPlaylistName.EditMode = false; return true; } } @@ -1211,17 +1181,17 @@ namespace VocaluxeLib.Menu { Background = new CStatic(_PartyModeID, _Theme.TextureBackgroundName, BackgroundColor, new SRectF(Rect.X, Rect.Y + (i * _Theme.EntryHeight), Rect.W, _Theme.EntryHeight, Rect.Z)), - Cover = new CStatic(_Theme.StaticCover) + Cover = new CStatic(StaticCover) }; en.Cover.Rect.Y += Rect.Y + (i * _Theme.EntryHeight); en.Cover.Rect.X += Rect.X; - en.Text1 = new CText(_Theme.Text1); + en.Text1 = new CText(Text1); en.Text1.X += Rect.X; en.Text1.Y += Rect.Y + (i * _Theme.EntryHeight); - en.SelectSlide = new CSelectSlide(_Theme.SelectSlideGameMode); + en.SelectSlide = new CSelectSlide(SelectSlideGameMode); en.SelectSlide.Rect.X += Rect.X; en.SelectSlide.Rect.Y += Rect.Y + (i * _Theme.EntryHeight); en.SelectSlide.RectArrowLeft.X += Rect.X; @@ -1244,7 +1214,7 @@ namespace VocaluxeLib.Menu if (!CBase.Playlist.Exists(playlistID)) return false; ActivePlaylistID = playlistID; - _Theme.ButtonPlaylistName.Text.Text = CBase.Playlist.GetName(ActivePlaylistID); + ButtonPlaylistName.Text.Text = CBase.Playlist.GetName(ActivePlaylistID); _PlaylistElementContents.Clear(); for (int i = 0; i < CBase.Playlist.GetSongCount(ActivePlaylistID); i++) { @@ -1322,7 +1292,7 @@ namespace VocaluxeLib.Menu CPlaylistElementContent pec = _PlaylistElementContents[Offset + i]; CSong song = CBase.Songs.GetSongByID(pec.SongID); _PlaylistElements[i].Cover.Texture = song.CoverTextureSmall; - string t1 = CBase.Language.Translate(_Theme.Text1.Text).Replace("%a", song.Artist).Replace("%t", song.Title); + string t1 = CBase.Language.Translate(Text1.Text).Replace("%a", song.Artist).Replace("%t", song.Title); _PlaylistElements[i].Text1.Text = /*(Offset + i + 1) + ") " + */ t1; //TODO: Add text field for the number _PlaylistElements[i].SelectSlide.Clear(); for (int g = 0; g < pec.Modes.Count; g++) @@ -1346,7 +1316,7 @@ namespace VocaluxeLib.Menu public SThemePlaylist GetTheme() { - return new SThemePlaylist(_Theme); + return _Theme; } #region ThemeEdit diff --git a/VocaluxeLib/Menu/CSelectSlide.cs b/VocaluxeLib/Menu/CSelectSlide.cs index 4a621ade..9cd95b96 100644 --- a/VocaluxeLib/Menu/CSelectSlide.cs +++ b/VocaluxeLib/Menu/CSelectSlide.cs @@ -922,24 +922,50 @@ namespace VocaluxeLib.Menu { if (!String.IsNullOrEmpty(_Theme.Color.Name)) Color = CBase.Theme.GetColor(_Theme.Color.Name, _PartyModeID); + else + Color = _Theme.Color.Color; if (!String.IsNullOrEmpty(_Theme.SColor.Name)) SelColor = CBase.Theme.GetColor(_Theme.SColor.Name, _PartyModeID); + else + SelColor = _Theme.SColor.Color; if (!String.IsNullOrEmpty(_Theme.HColor.Name)) HighlightColor = CBase.Theme.GetColor(_Theme.HColor.Name, _PartyModeID); + else + HighlightColor = _Theme.HColor.Color; if (!String.IsNullOrEmpty(_Theme.ArrowColor.Name)) ColorArrow = CBase.Theme.GetColor(_Theme.ArrowColor.Name, _PartyModeID); + else + ColorArrow = _Theme.ArrowColor.Color; if (!String.IsNullOrEmpty(_Theme.ArrowSColor.Name)) SelColorArrow = CBase.Theme.GetColor(_Theme.ArrowSColor.Name, _PartyModeID); + else + SelColorArrow = _Theme.ArrowSColor.Color; if (!String.IsNullOrEmpty(_Theme.TextColor.Name)) TextColor = CBase.Theme.GetColor(_Theme.TextColor.Name, _PartyModeID); + else + TextColor = _Theme.TextColor.Color; if (!String.IsNullOrEmpty(_Theme.TextSColor.Name)) SelTextColor = CBase.Theme.GetColor(_Theme.TextSColor.Name, _PartyModeID); + else + SelTextColor = _Theme.TextSColor.Color; + + Rect = _Theme.Rect; + RectArrowLeft = _Theme.RectArrowLeft; + RectArrowRight = _Theme.RectArrowRight; + + NumVisible = _Theme.NumVisible; + + TextH = _Theme.TextH; + TextRelativeX = _Theme.TextRelativeX; + TextRelativeY = _Theme.TextRelativeY; + MaxW = _Theme.TextMaxW; + } public void ReloadTextures() diff --git a/VocaluxeLib/Menu/CStatic.cs b/VocaluxeLib/Menu/CStatic.cs index 08cee0b9..a7f89336 100644 --- a/VocaluxeLib/Menu/CStatic.cs +++ b/VocaluxeLib/Menu/CStatic.cs @@ -261,6 +261,16 @@ namespace VocaluxeLib.Menu { if (!String.IsNullOrEmpty(_Theme.Color.Name)) Color = CBase.Theme.GetColor(_Theme.Color.Name, _PartyModeID); + else + Color = _Theme.Color.Color; + + Rect = new SRectF(_Theme.Rect); + Reflection = _Theme.Reflection.Enabled; + if (Reflection) + { + ReflectionSpace = _Theme.Reflection.Height; + ReflectionHeight = _Theme.Reflection.Space; + } } public void ReloadTextures() diff --git a/VocaluxeLib/Menu/CText.cs b/VocaluxeLib/Menu/CText.cs index 1a126d61..06777092 100644 --- a/VocaluxeLib/Menu/CText.cs +++ b/VocaluxeLib/Menu/CText.cs @@ -36,6 +36,8 @@ namespace VocaluxeLib.Menu public float Z; [XmlElement("H")] public float Height; + [XmlElement("MaxW")] + public float MaxWidth; public SThemeColor Color; public SThemeColor SColor; //for Buttons [XmlElement("Align")] @@ -57,6 +59,7 @@ namespace VocaluxeLib.Menu Y = theme.Y; Z = theme.Z; Height = theme.Height; + MaxWidth = theme.MaxWidth; Color = new SThemeColor(theme.Color); SColor = new SThemeColor(theme.SColor); Align = theme.Align; @@ -423,6 +426,7 @@ namespace VocaluxeLib.Menu _Theme.ResizeAlign = _ResizeAlign; _Theme.SColor.Color = SelColor; _Theme.Style = _Style; + _Theme.MaxWidth = _MaxWidth; _Theme.X = _X; _Theme.Y = _Y; _Theme.Z = _Z; @@ -588,9 +592,32 @@ namespace VocaluxeLib.Menu { if (!String.IsNullOrEmpty(_Theme.Color.Name)) Color = CBase.Theme.GetColor(_Theme.Color.Name, _PartyModeID); + else + Color = new SColorF(_Theme.Color.Color); if (!String.IsNullOrEmpty(_Theme.SColor.Name)) SelColor = CBase.Theme.GetColor(_Theme.SColor.Name, _PartyModeID); + else + SelColor = new SColorF(_Theme.SColor.Color); + + _X = _Theme.X; + _Y = _Theme.Y; + _Z = _Theme.Z; + _Height = _Theme.Height; + _MaxWidth = _Theme.MaxWidth; + _Align = _Theme.Align; + _ResizeAlign = _Theme.ResizeAlign; + _Style = _Theme.Style; + _Font = _Theme.Font; + + if (_Theme.Reflection.Enabled) + { + ReflectionSpace = _Theme.Reflection.Space; + ReflectionHeight = _Theme.Reflection.Height; + } + + Text = _Theme.Text; + Selected = false; } public void ReloadTextures() From 9ab0ea5f34554636bce578a886a8828705a3e970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Mon, 15 Sep 2014 19:35:00 +0200 Subject: [PATCH 22/29] Update more LoadTextures-methods. Some changes are a bit ugly, but will removed later. --- VocaluxeLib/Menu/CButton.cs | 46 +++++- VocaluxeLib/Menu/CEqualizer.cs | 13 ++ VocaluxeLib/Menu/CLyric.cs | 6 + VocaluxeLib/Menu/CNameSelection.cs | 68 +++++---- VocaluxeLib/Menu/CParticle.cs | 59 ++++---- VocaluxeLib/Menu/CPlaylist.cs | 106 ++++++++------ .../Menu/SongMenu/CSongMenuFramework.cs | 134 ++--------------- .../Menu/SongMenu/CSongMenuTileBoard.cs | 136 ++++++++++++++---- 8 files changed, 298 insertions(+), 270 deletions(-) diff --git a/VocaluxeLib/Menu/CButton.cs b/VocaluxeLib/Menu/CButton.cs index 82f0970a..8d88f7f7 100644 --- a/VocaluxeLib/Menu/CButton.cs +++ b/VocaluxeLib/Menu/CButton.cs @@ -39,6 +39,9 @@ namespace VocaluxeLib.Menu public SThemeColor SelColor; [XmlElement("Text")] public SThemeText Text; + [XmlElement("SText")] + public SThemeText SText; + public bool STextSpecified; [XmlElement("Reflection")] public SReflection Reflection; [XmlElement("SelReflection")] @@ -53,8 +56,10 @@ namespace VocaluxeLib.Menu Color = new SThemeColor(theme.Color); SelColor = new SThemeColor(theme.SelColor); Text = new SThemeText(theme.Text); + SText = new SThemeText(theme.SText); Reflection = new SReflection(theme.Reflection); SelReflection = new SReflection(theme.SelReflection); + STextSpecified = theme.STextSpecified; } } @@ -70,9 +75,8 @@ namespace VocaluxeLib.Menu public SColorF Color; public SColorF SelColor; - private bool _IsSelText; - public readonly CText Text; - private readonly CText _SelText; + public CText Text; + private CText _SelText; private bool _Reflection; private float _ReflectionSpace; @@ -216,7 +220,7 @@ namespace VocaluxeLib.Menu Text.Z = Rect.Z; if (xmlReader.ItemExists(item + "/SText")) { - _IsSelText = true; + _Theme.STextSpecified = true; _ThemeLoaded &= _SelText.LoadTheme(item, "SText", xmlReader, skinIndex, true); _SelText.Z = Rect.Z; } @@ -258,6 +262,7 @@ namespace VocaluxeLib.Menu _Theme.Color.Color = new SColorF(Color); _Theme.SelColor.Color = new SColorF(SelColor); _Theme.Text = Text.GetTheme(); + _Theme.SText = _SelText.GetTheme(); LoadTextures(); } @@ -308,7 +313,7 @@ namespace VocaluxeLib.Menu } Text.SaveTheme(writer); - if (_IsSelText) + if (_Theme.STextSpecified) _SelText.SaveTheme(writer); writer.WriteComment(" If exists:"); @@ -361,7 +366,7 @@ namespace VocaluxeLib.Menu else Text.DrawRelative(Rect.X, Rect.Y); } - else if (!_IsSelText) + else if (!_Theme.STextSpecified) { texture = Texture ?? CBase.Theme.GetSkinTexture(_Theme.SelTextureName, _PartyModeID); @@ -375,7 +380,7 @@ namespace VocaluxeLib.Menu else Text.DrawRelative(Rect.X, Rect.Y); } - else if (_IsSelText) + else if (_Theme.STextSpecified) { texture = SelTexture ?? CBase.Theme.GetSkinTexture(_Theme.SelTextureName, _PartyModeID); @@ -403,13 +408,40 @@ namespace VocaluxeLib.Menu public void LoadTextures() { + Text = new CText(_Theme.Text, _PartyModeID); Text.LoadTextures(); + if (_Theme.STextSpecified) + { + _SelText = new CText(_Theme.SText, _PartyModeID); + _SelText.LoadTextures(); + } + if (!String.IsNullOrEmpty(_Theme.Color.Name)) Color = CBase.Theme.GetColor(_Theme.Color.Name, _PartyModeID); + else + Color = _Theme.Color.Color; if (!String.IsNullOrEmpty(_Theme.SelColor.Name)) SelColor = CBase.Theme.GetColor(_Theme.SelColor.Name, _PartyModeID); + else + SelColor = _Theme.SelColor.Color; + + Rect = _Theme.Rect; + + _Reflection = _Theme.Reflection.Enabled; + if (_Reflection) + { + _ReflectionHeight = _Theme.Reflection.Height; + _ReflectionSpace = _Theme.Reflection.Space; + } + + _SelReflection = _Theme.Reflection.Enabled; + if (_SelReflection) + { + _SelReflectionHeight = _Theme.SelReflection.Height; + _SelReflectionSpace = _Theme.SelReflection.Space; + } } public void ReloadTextures() diff --git a/VocaluxeLib/Menu/CEqualizer.cs b/VocaluxeLib/Menu/CEqualizer.cs index 958db155..1f533e7e 100644 --- a/VocaluxeLib/Menu/CEqualizer.cs +++ b/VocaluxeLib/Menu/CEqualizer.cs @@ -344,9 +344,22 @@ namespace VocaluxeLib.Menu { if (!String.IsNullOrEmpty(_Theme.Color.Name)) Color = CBase.Theme.GetColor(_Theme.Color.Name, _PartyModeID); + else + Color = _Theme.Color.Color; if (!String.IsNullOrEmpty(_Theme.MaxColor.Name)) MaxColor = CBase.Theme.GetColor(_Theme.MaxColor.Name, _PartyModeID); + else + MaxColor = _Theme.MaxColor.Color; + + Rect = _Theme.Rect; + Space = _Theme.Space; + Reflection = _Theme.Reflection.Enabled; + if(Reflection) + { + ReflectionHeight = _Theme.Reflection.Height; + ReflectionSpace = _Theme.Reflection.Space; + } } public void ReloadTextures() diff --git a/VocaluxeLib/Menu/CLyric.cs b/VocaluxeLib/Menu/CLyric.cs index bc2418b1..c7e20105 100644 --- a/VocaluxeLib/Menu/CLyric.cs +++ b/VocaluxeLib/Menu/CLyric.cs @@ -507,9 +507,15 @@ namespace VocaluxeLib.Menu { if (!String.IsNullOrEmpty(_Theme.Color.Name)) _Color = CBase.Theme.GetColor(_Theme.Color.Name, _PartyModeID); + else + _Color = _Theme.Color.Color; if (!String.IsNullOrEmpty(_Theme.SColor.Name)) _ColorProcessed = CBase.Theme.GetColor(_Theme.SColor.Name, _PartyModeID); + else + _ColorProcessed = _Theme.SColor.Color; + + Rect = _Theme.Rect; } public void ReloadTextures() diff --git a/VocaluxeLib/Menu/CNameSelection.cs b/VocaluxeLib/Menu/CNameSelection.cs index a8d93e17..1e061cf4 100644 --- a/VocaluxeLib/Menu/CNameSelection.cs +++ b/VocaluxeLib/Menu/CNameSelection.cs @@ -62,6 +62,10 @@ namespace VocaluxeLib.Menu public int NumW; [XmlElement("NumH")] public int NumH; + [XmlElement("SpaceW")] + public float SpaceW; + [XmlElement("SpaceH")] + public float SpaceH; [XmlElement("Name")] public SThemeNameSelectionName Name; @@ -71,6 +75,8 @@ namespace VocaluxeLib.Menu H = theme.H; NumW = theme.NumW; NumH = theme.NumH; + SpaceW = theme.SpaceW; + SpaceH = theme.SpaceH; Name = new SThemeNameSelectionName(theme.Name); } } @@ -143,14 +149,6 @@ namespace VocaluxeLib.Menu public SColorF ColorEmptyTile; - private int _NumW; - private int _NumH; - - private float _SpaceW; - private float _SpaceH; - - private int _TileW; - private int _TileH; public int Offset; private int _ActualSelection = -1; @@ -194,7 +192,7 @@ namespace VocaluxeLib.Menu _PlayerSelector = new CStatic(_PartyModeID) { Texture = _TextureTileSelected, - Rect = new SRectF(0, 0, _TileW + 6, _TileH + 6, Rect.Z - 0.5f), + Rect = new SRectF(0, 0, _Theme.Tiles.W + 6, _Theme.Tiles.H + 6, Rect.Z - 0.5f), Visible = false }; @@ -228,12 +226,12 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= xmlReader.GetValue(item + "/SkinTileSelected", out _Theme.TextureTileSelectedName, String.Empty); - _ThemeLoaded &= xmlReader.TryGetIntValue(item + "/Tiles/W", ref _TileW); - _ThemeLoaded &= xmlReader.TryGetIntValue(item + "/Tiles/H", ref _TileH); - _ThemeLoaded &= xmlReader.TryGetIntValue(item + "/Tiles/NumW", ref _NumW); - _ThemeLoaded &= xmlReader.TryGetIntValue(item + "/Tiles/NumH", ref _NumH); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/SpaceW", ref _SpaceW); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/SpaceH", ref _SpaceH); + _ThemeLoaded &= xmlReader.TryGetIntValue(item + "/Tiles/W", ref _Theme.Tiles.W); + _ThemeLoaded &= xmlReader.TryGetIntValue(item + "/Tiles/H", ref _Theme.Tiles.H); + _ThemeLoaded &= xmlReader.TryGetIntValue(item + "/Tiles/NumW", ref _Theme.Tiles.NumW); + _ThemeLoaded &= xmlReader.TryGetIntValue(item + "/Tiles/NumH", ref _Theme.Tiles.NumH); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/SpaceW", ref _Theme.Tiles.SpaceW); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/SpaceH", ref _Theme.Tiles.SpaceH); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/Space", ref _Theme.Tiles.Name.Space); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/H", ref _Theme.Tiles.Name.Height); _ThemeLoaded &= xmlReader.GetValue(item + "/Tiles/Name/Font", out _Theme.Tiles.Name.Font, "Normal"); @@ -256,10 +254,6 @@ namespace VocaluxeLib.Menu _Theme.Name = elementName; _Theme.Rect = new SRectF(Rect); - _Theme.Tiles.H = _TileH; - _Theme.Tiles.W = _TileW; - _Theme.Tiles.NumH = _NumH; - _Theme.Tiles.NumW = _NumW; _Theme.ColorEmptyTile.Color = new SColorF(ColorEmptyTile); LoadTextures(); @@ -301,14 +295,14 @@ namespace VocaluxeLib.Menu writer.WriteComment(": Options for tiles"); writer.WriteStartElement("Tiles"); writer.WriteComment(", : Width and height of tile"); - writer.WriteElementString("W", _TileW.ToString()); - writer.WriteElementString("H", _TileH.ToString()); + writer.WriteElementString("W", _Theme.Tiles.W.ToString()); + writer.WriteElementString("H", _Theme.Tiles.H.ToString()); writer.WriteComment(", : Number of tiles"); - writer.WriteElementString("NumW", _NumW.ToString()); - writer.WriteElementString("NumH", _NumH.ToString()); + writer.WriteElementString("NumW", _Theme.Tiles.NumW.ToString()); + writer.WriteElementString("NumH", _Theme.Tiles.NumH.ToString()); writer.WriteComment(", : Space between tiles"); - writer.WriteElementString("SpaceW", _SpaceW.ToString("#0.00")); - writer.WriteElementString("SpaceH", _SpaceH.ToString("#0.00")); + writer.WriteElementString("SpaceW", _Theme.Tiles.SpaceW.ToString("#0.00")); + writer.WriteElementString("SpaceH", _Theme.Tiles.SpaceH.ToString("#0.00")); writer.WriteComment(": Options for player-name"); writer.WriteStartElement("Name"); writer.WriteComment(": Space between name and tile"); @@ -395,20 +389,20 @@ namespace VocaluxeLib.Menu break; case Keys.Up: - if (_ActualSelection - _NumW > -1) - _ActualSelection -= _NumW; + if (_ActualSelection - _Theme.Tiles.NumW > -1) + _ActualSelection -= _Theme.Tiles.NumW; else if (Offset > 0) { UpdateList(Offset - 1); - _ActualSelection += _Tiles.Count - _NumW; + _ActualSelection += _Tiles.Count - _Theme.Tiles.NumW; } break; case Keys.Down: - if (_ActualSelection + _NumW < _Tiles.Count) + if (_ActualSelection + _Theme.Tiles.NumW < _Tiles.Count) { - if (_Tiles[_ActualSelection + _NumW].ProfileID != -1) - _ActualSelection += _NumW; + if (_Tiles[_ActualSelection + _Theme.Tiles.NumW].ProfileID != -1) + _ActualSelection += _Theme.Tiles.NumW; } else { @@ -416,7 +410,7 @@ namespace VocaluxeLib.Menu UpdateList(Offset + 1); if (offset != Offset) { - _ActualSelection = _ActualSelection - _Tiles.Count + _NumW; + _ActualSelection = _ActualSelection - _Tiles.Count + _Theme.Tiles.NumW; if (_Tiles[_ActualSelection].ProfileID == -1) { for (int i = _Tiles.Count - 1; i >= 0; i--) @@ -558,9 +552,13 @@ namespace VocaluxeLib.Menu if (!String.IsNullOrEmpty(_Theme.ColorEmptyTile.Name)) ColorEmptyTile = CBase.Theme.GetColor(_Theme.ColorEmptyTile.Name, _PartyModeID); + else + ColorEmptyTile = _Theme.ColorEmptyTile.Color; if (!String.IsNullOrEmpty(_Theme.Tiles.Name.Color.Name)) _Theme.Tiles.Name.Color.Color = CBase.Theme.GetColor(_Theme.Tiles.Name.Color.Name, _PartyModeID); + + Rect = _Theme.Rect; } public void ReloadTextures() @@ -616,11 +614,11 @@ namespace VocaluxeLib.Menu private void _PrepareTiles() { _Tiles.Clear(); - for (int i = 0; i < _NumH; i++) + for (int i = 0; i < _Theme.Tiles.NumH; i++) { - for (int j = 0; j < _NumW; j++) + for (int j = 0; j < _Theme.Tiles.NumW; j++) { - var rect = new SRectF(Rect.X + j * (_TileW + _SpaceW), Rect.Y + i * (_TileH + _SpaceH), _TileW, _TileH, Rect.Z); + var rect = new SRectF(Rect.X + j * (_Theme.Tiles.W + _Theme.Tiles.SpaceW), Rect.Y + i * (_Theme.Tiles.H + _Theme.Tiles.SpaceH), _Theme.Tiles.W, _Theme.Tiles.H, Rect.Z); var tileStatic = new CStatic(_PartyModeID, _TextureEmptyTile, ColorEmptyTile, rect) {Aspect = EAspect.Crop}; var tileText = new CText(rect.X + rect.W / 2, rect.Y + rect.H + _Theme.Tiles.Name.Space, rect.Z, _Theme.Tiles.Name.Height, rect.W, EAlignment.Center, _Theme.Tiles.Name.Style, _Theme.Tiles.Name.Font, _Theme.Tiles.Name.Color.Color, ""); diff --git a/VocaluxeLib/Menu/CParticle.cs b/VocaluxeLib/Menu/CParticle.cs index 7f6aec9a..7dc321de 100644 --- a/VocaluxeLib/Menu/CParticle.cs +++ b/VocaluxeLib/Menu/CParticle.cs @@ -335,9 +335,6 @@ namespace VocaluxeLib.Menu public bool Visible; private readonly List _Stars; - private int _MaxNumber; - private float _Size; - private EParticleType _Type; private readonly Stopwatch _SpawnTimer; private float _NextSpawnTime; @@ -376,9 +373,9 @@ namespace VocaluxeLib.Menu Rect = rect; Color = color; _Theme.TextureName = textureName; - _MaxNumber = maxNumber; - _Size = size; - _Type = type; + _Theme.MaxNumber = maxNumber; + _Theme.Size = size; + _Theme.Type = type; _SpawnTimer = new Stopwatch(); _NextSpawnTime = 0f; Visible = true; @@ -393,9 +390,9 @@ namespace VocaluxeLib.Menu Color = color; _Theme.TextureName = String.Empty; Texture = texture; - _MaxNumber = maxNumber; - _Size = size; - _Type = type; + _Theme.MaxNumber = maxNumber; + _Theme.Size = size; + _Theme.Type = type; _SpawnTimer = new Stopwatch(); _NextSpawnTime = 0f; Visible = true; @@ -436,18 +433,15 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/A", ref Color.A); } - _ThemeLoaded &= xmlReader.TryGetEnumValue(item + "/Type", ref _Type); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Size", ref _Size); - _ThemeLoaded &= xmlReader.TryGetIntValue(item + "/MaxNumber", ref _MaxNumber); + _ThemeLoaded &= xmlReader.TryGetEnumValue(item + "/Type", ref _Theme.Type); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Size", ref _Theme.Size); + _ThemeLoaded &= xmlReader.TryGetIntValue(item + "/MaxNumber", ref _Theme.MaxNumber); if (_ThemeLoaded) { _Theme.Name = elementName; _Theme.Rect = new SRectF(Rect); _Theme.Color.Color = new SColorF(Color); - _Theme.Type = _Type; - _Theme.Size = _Size; - _Theme.MaxNumber = _MaxNumber; LoadTextures(); } return _ThemeLoaded; @@ -482,11 +476,11 @@ namespace VocaluxeLib.Menu } writer.WriteComment(": Type of ParticleEffect: " + CHelper.ListStrings(Enum.GetNames(typeof(EParticleType)))); - writer.WriteElementString("Type", Enum.GetName(typeof(EParticleType), _Type)); + writer.WriteElementString("Type", Enum.GetName(typeof(EParticleType), _Theme.Type)); writer.WriteComment(": Size of particle"); - writer.WriteElementString("Size", _Size.ToString("#0.00")); + writer.WriteElementString("Size", _Theme.Size.ToString("#0.00")); writer.WriteComment(": Max number of drawn particles"); - writer.WriteElementString("MaxNumber", _MaxNumber.ToString("#0")); + writer.WriteElementString("MaxNumber", _Theme.MaxNumber.ToString("#0")); writer.WriteEndElement(); return true; @@ -511,9 +505,9 @@ namespace VocaluxeLib.Menu _SpawnTimer.Start(); } - while (_Stars.Count < _MaxNumber && doSpawn) + while (_Stars.Count < _Theme.MaxNumber && doSpawn) { - float size = CBase.Game.GetRandom((int)_Size / 2) + _Size / 2; + float size = CBase.Game.GetRandom((int)_Theme.Size / 2) + _Theme.Size / 2; float lifetime = 0f; float vx = 0f; float vy = 0f; @@ -521,10 +515,10 @@ namespace VocaluxeLib.Menu float vsize = 0f; _NextSpawnTime = 0f; - switch (_Type) + switch (_Theme.Type) { case EParticleType.Twinkle: - size = CBase.Game.GetRandom((int)_Size / 2) + _Size / 2; + size = CBase.Game.GetRandom((int)_Theme.Size / 2) + _Theme.Size / 2; lifetime = CBase.Game.GetRandom(500) / 1000f + 0.5f; vx = -CBase.Game.GetRandom(10000) / 50f + 100f; vy = -CBase.Game.GetRandom(10000) / 50f + 100f; @@ -533,7 +527,7 @@ namespace VocaluxeLib.Menu break; case EParticleType.Star: - size = CBase.Game.GetRandom((int)_Size / 2) + _Size / 2; + size = CBase.Game.GetRandom((int)_Theme.Size / 2) + _Theme.Size / 2; lifetime = CBase.Game.GetRandom(1000) / 500f + 0.2f; vx = -CBase.Game.GetRandom(1000) / 50f + 10f; vy = -CBase.Game.GetRandom(1000) / 50f + 10f; @@ -542,19 +536,19 @@ namespace VocaluxeLib.Menu break; case EParticleType.Snow: - size = CBase.Game.GetRandom((int)_Size / 2) + _Size / 2; + size = CBase.Game.GetRandom((int)_Theme.Size / 2) + _Theme.Size / 2; lifetime = CBase.Game.GetRandom(5000) / 50f + 10f; vx = -CBase.Game.GetRandom(1000) / 50f + 10f; vy = CBase.Game.GetRandom(1000) / 50f + Math.Abs(vx) + 10f; vr = -CBase.Game.GetRandom(200) / 50f + 2f; vsize = lifetime * 2f; - _NextSpawnTime = lifetime / _MaxNumber; + _NextSpawnTime = lifetime / _Theme.MaxNumber; doSpawn = false; break; case EParticleType.Flare: - size = CBase.Game.GetRandom((int)_Size / 2) + _Size / 2; + size = CBase.Game.GetRandom((int)_Theme.Size / 2) + _Theme.Size / 2; lifetime = CBase.Game.GetRandom(500) / 1000f + 0.1f; vx = -CBase.Game.GetRandom(2000) / 50f; vy = -CBase.Game.GetRandom(2000) / 50f + 20f; @@ -563,7 +557,7 @@ namespace VocaluxeLib.Menu break; case EParticleType.PerfNoteStar: - size = CBase.Game.GetRandom((int)_Size / 2) + _Size / 2; + size = CBase.Game.GetRandom((int)_Theme.Size / 2) + _Theme.Size / 2; lifetime = CBase.Game.GetRandom(1000) / 500f + 1.2f; vx = 0f; vy = 0f; @@ -587,20 +581,20 @@ namespace VocaluxeLib.Menu star = new CParticle(_PartyModeID, _Theme.TextureName, Color, CBase.Game.GetRandom(w) + Rect.X - size / 4f, CBase.Game.GetRandom(h) + Rect.Y - size / 4f, - size, lifetime, Rect.Z, vx, vy, vr, vsize, _Type); + size, lifetime, Rect.Z, vx, vy, vr, vsize, _Theme.Type); } else { star = new CParticle(_PartyModeID, Texture, Color, CBase.Game.GetRandom(w) + Rect.X - size / 4f, CBase.Game.GetRandom(h) + Rect.Y - size / 4f, - size, lifetime, Rect.Z, vx, vy, vr, vsize, _Type); + size, lifetime, Rect.Z, vx, vy, vr, vsize, _Theme.Type); } _Stars.Add(star); } - if (_Type == EParticleType.Flare || _Type == EParticleType.PerfNoteStar || _Type == EParticleType.Twinkle) + if (_Theme.Type == EParticleType.Flare || _Theme.Type == EParticleType.PerfNoteStar || _Theme.Type == EParticleType.Twinkle) _NextSpawnTime = -1f; int i = 0; @@ -645,8 +639,13 @@ namespace VocaluxeLib.Menu { if (!String.IsNullOrEmpty(_Theme.Color.Name)) Color = CBase.Theme.GetColor(_Theme.Color.Name, _PartyModeID); + else + Color = _Theme.Color.Color; + if (!String.IsNullOrEmpty(_Theme.TextureName)) Texture = CBase.Theme.GetSkinTexture(_Theme.TextureName, _PartyModeID); + + Rect = _Theme.Rect; } public void ReloadTextures() diff --git a/VocaluxeLib/Menu/CPlaylist.cs b/VocaluxeLib/Menu/CPlaylist.cs index 9deddea3..84d77420 100644 --- a/VocaluxeLib/Menu/CPlaylist.cs +++ b/VocaluxeLib/Menu/CPlaylist.cs @@ -372,53 +372,6 @@ namespace VocaluxeLib.Menu _Theme.SButtonPlaylistSave =ButtonPlaylistSave.GetTheme(); _Theme.SButtonPlaylistDelete =ButtonPlaylistDelete.GetTheme(); - //Check for highest x/y-coords - CompleteRect = Rect; - //ButtonPlaylistClose - if (ButtonPlaylistClose.Rect.X < CompleteRect.X) - CompleteRect.X = ButtonPlaylistClose.Rect.X; - if (ButtonPlaylistClose.Rect.Y < CompleteRect.Y) - CompleteRect.Y = ButtonPlaylistClose.Rect.Y; - if (ButtonPlaylistClose.Rect.W + ButtonPlaylistClose.Rect.X > CompleteRect.W + CompleteRect.X) - CompleteRect.W = ButtonPlaylistClose.Rect.W + ButtonPlaylistClose.Rect.X - CompleteRect.X; - if (ButtonPlaylistClose.Rect.Y + ButtonPlaylistClose.Rect.H > CompleteRect.Y + CompleteRect.H) - CompleteRect.H = ButtonPlaylistClose.Rect.H + ButtonPlaylistClose.Rect.Y - CompleteRect.Y; - //ButtonPlaylistName - if (ButtonPlaylistName.Rect.X < CompleteRect.X) - CompleteRect.X = ButtonPlaylistName.Rect.X; - if (ButtonPlaylistName.Rect.Y < CompleteRect.Y) - CompleteRect.Y = ButtonPlaylistName.Rect.Y; - if (ButtonPlaylistName.Rect.W + ButtonPlaylistName.Rect.X > CompleteRect.W + CompleteRect.X) - CompleteRect.W = ButtonPlaylistName.Rect.W + ButtonPlaylistName.Rect.X - CompleteRect.X; - if (ButtonPlaylistName.Rect.Y + ButtonPlaylistName.Rect.H > CompleteRect.Y + CompleteRect.H) - CompleteRect.H = ButtonPlaylistName.Rect.H + ButtonPlaylistName.Rect.Y - CompleteRect.Y; - //ButtonPlaylistSing - if (ButtonPlaylistSing.Rect.X < CompleteRect.X) - CompleteRect.X = ButtonPlaylistSing.Rect.X; - if (ButtonPlaylistSing.Rect.Y < CompleteRect.Y) - CompleteRect.Y = ButtonPlaylistSing.Rect.Y; - if (ButtonPlaylistSing.Rect.W + ButtonPlaylistSing.Rect.X > CompleteRect.W + CompleteRect.X) - CompleteRect.W = ButtonPlaylistSing.Rect.W + ButtonPlaylistSing.Rect.X - CompleteRect.X; - if (ButtonPlaylistSing.Rect.Y + ButtonPlaylistSing.Rect.H > CompleteRect.Y + CompleteRect.H) - CompleteRect.H = ButtonPlaylistSing.Rect.H + ButtonPlaylistSing.Rect.Y - CompleteRect.Y; - //ButtonPlaylistSave - if (ButtonPlaylistSave.Rect.X < CompleteRect.X) - CompleteRect.X = ButtonPlaylistSave.Rect.X; - if (ButtonPlaylistSave.Rect.Y < CompleteRect.Y) - CompleteRect.Y = ButtonPlaylistSave.Rect.Y; - if (ButtonPlaylistSave.Rect.W + ButtonPlaylistSave.Rect.X > CompleteRect.W + CompleteRect.X) - CompleteRect.W = ButtonPlaylistSave.Rect.W + ButtonPlaylistSave.Rect.X - CompleteRect.X; - if (ButtonPlaylistSave.Rect.Y + ButtonPlaylistSave.Rect.H > CompleteRect.Y + CompleteRect.H) - CompleteRect.H = ButtonPlaylistSave.Rect.H + ButtonPlaylistSave.Rect.Y - CompleteRect.Y; - //ButtonPlaylistDelete - if (ButtonPlaylistDelete.Rect.X < CompleteRect.X) - CompleteRect.X = ButtonPlaylistDelete.Rect.X; - if (ButtonPlaylistDelete.Rect.Y < CompleteRect.Y) - CompleteRect.Y = ButtonPlaylistDelete.Rect.Y; - if (ButtonPlaylistDelete.Rect.W + ButtonPlaylistDelete.Rect.X > CompleteRect.W + CompleteRect.X) - CompleteRect.W = ButtonPlaylistDelete.Rect.W + ButtonPlaylistDelete.Rect.X - CompleteRect.X; - if (ButtonPlaylistDelete.Rect.Y + ButtonPlaylistDelete.Rect.H > CompleteRect.Y + CompleteRect.H) - CompleteRect.H = ButtonPlaylistDelete.Rect.H + ButtonPlaylistDelete.Rect.Y - CompleteRect.Y; LoadTextures(); } return _ThemeLoaded; @@ -540,9 +493,15 @@ namespace VocaluxeLib.Menu { if (!String.IsNullOrEmpty(_Theme.ColorBackground.Name)) BackgroundColor = CBase.Theme.GetColor(_Theme.ColorBackground.Name, _PartyModeID); + else + BackgroundColor = _Theme.ColorBackground.Color; if (!String.IsNullOrEmpty(_Theme.SelColorBackground.Name)) BackgroundSelColor = CBase.Theme.GetColor(_Theme.SelColorBackground.Name, _PartyModeID); + else + BackgroundSelColor = _Theme.SelColorBackground.Color; + + Rect = _Theme.Rect; Text1.LoadTextures(); ButtonPlaylistClose.LoadTextures(); @@ -557,6 +516,8 @@ namespace VocaluxeLib.Menu SelectSlideGameMode.LoadTextures(); + _UpdateRect(); + Init(); } @@ -1319,6 +1280,57 @@ namespace VocaluxeLib.Menu return _Theme; } + private void _UpdateRect() + { + //Check for highest x/y-coords + CompleteRect = Rect; + //ButtonPlaylistClose + if (ButtonPlaylistClose.Rect.X < CompleteRect.X) + CompleteRect.X = ButtonPlaylistClose.Rect.X; + if (ButtonPlaylistClose.Rect.Y < CompleteRect.Y) + CompleteRect.Y = ButtonPlaylistClose.Rect.Y; + if (ButtonPlaylistClose.Rect.W + ButtonPlaylistClose.Rect.X > CompleteRect.W + CompleteRect.X) + CompleteRect.W = ButtonPlaylistClose.Rect.W + ButtonPlaylistClose.Rect.X - CompleteRect.X; + if (ButtonPlaylistClose.Rect.Y + ButtonPlaylistClose.Rect.H > CompleteRect.Y + CompleteRect.H) + CompleteRect.H = ButtonPlaylistClose.Rect.H + ButtonPlaylistClose.Rect.Y - CompleteRect.Y; + //ButtonPlaylistName + if (ButtonPlaylistName.Rect.X < CompleteRect.X) + CompleteRect.X = ButtonPlaylistName.Rect.X; + if (ButtonPlaylistName.Rect.Y < CompleteRect.Y) + CompleteRect.Y = ButtonPlaylistName.Rect.Y; + if (ButtonPlaylistName.Rect.W + ButtonPlaylistName.Rect.X > CompleteRect.W + CompleteRect.X) + CompleteRect.W = ButtonPlaylistName.Rect.W + ButtonPlaylistName.Rect.X - CompleteRect.X; + if (ButtonPlaylistName.Rect.Y + ButtonPlaylistName.Rect.H > CompleteRect.Y + CompleteRect.H) + CompleteRect.H = ButtonPlaylistName.Rect.H + ButtonPlaylistName.Rect.Y - CompleteRect.Y; + //ButtonPlaylistSing + if (ButtonPlaylistSing.Rect.X < CompleteRect.X) + CompleteRect.X = ButtonPlaylistSing.Rect.X; + if (ButtonPlaylistSing.Rect.Y < CompleteRect.Y) + CompleteRect.Y = ButtonPlaylistSing.Rect.Y; + if (ButtonPlaylistSing.Rect.W + ButtonPlaylistSing.Rect.X > CompleteRect.W + CompleteRect.X) + CompleteRect.W = ButtonPlaylistSing.Rect.W + ButtonPlaylistSing.Rect.X - CompleteRect.X; + if (ButtonPlaylistSing.Rect.Y + ButtonPlaylistSing.Rect.H > CompleteRect.Y + CompleteRect.H) + CompleteRect.H = ButtonPlaylistSing.Rect.H + ButtonPlaylistSing.Rect.Y - CompleteRect.Y; + //ButtonPlaylistSave + if (ButtonPlaylistSave.Rect.X < CompleteRect.X) + CompleteRect.X = ButtonPlaylistSave.Rect.X; + if (ButtonPlaylistSave.Rect.Y < CompleteRect.Y) + CompleteRect.Y = ButtonPlaylistSave.Rect.Y; + if (ButtonPlaylistSave.Rect.W + ButtonPlaylistSave.Rect.X > CompleteRect.W + CompleteRect.X) + CompleteRect.W = ButtonPlaylistSave.Rect.W + ButtonPlaylistSave.Rect.X - CompleteRect.X; + if (ButtonPlaylistSave.Rect.Y + ButtonPlaylistSave.Rect.H > CompleteRect.Y + CompleteRect.H) + CompleteRect.H = ButtonPlaylistSave.Rect.H + ButtonPlaylistSave.Rect.Y - CompleteRect.Y; + //ButtonPlaylistDelete + if (ButtonPlaylistDelete.Rect.X < CompleteRect.X) + CompleteRect.X = ButtonPlaylistDelete.Rect.X; + if (ButtonPlaylistDelete.Rect.Y < CompleteRect.Y) + CompleteRect.Y = ButtonPlaylistDelete.Rect.Y; + if (ButtonPlaylistDelete.Rect.W + ButtonPlaylistDelete.Rect.X > CompleteRect.W + CompleteRect.X) + CompleteRect.W = ButtonPlaylistDelete.Rect.W + ButtonPlaylistDelete.Rect.X - CompleteRect.X; + if (ButtonPlaylistDelete.Rect.Y + ButtonPlaylistDelete.Rect.H > CompleteRect.Y + CompleteRect.H) + CompleteRect.H = ButtonPlaylistDelete.Rect.H + ButtonPlaylistDelete.Rect.Y - CompleteRect.Y; + } + #region ThemeEdit public void MoveElement(int stepX, int stepY) { diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs index 05b36cf7..d30ff70b 100644 --- a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs +++ b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs @@ -112,41 +112,23 @@ namespace VocaluxeLib.Menu.SongMenu [XmlElement("TextArtist")] public SThemeText STextArtist; - [XmlIgnore] - public CText TextArtist; [XmlElement("TextTitle")] public SThemeText STextTitle; - [XmlIgnore] - public CText TextTitle; [XmlElement("TextSongLength")] public SThemeText STextSongLength; - [XmlIgnore] - public CText TextSongLength; [XmlElement("StaticCoverBig")] public SThemeStatic SStaticCoverBig; - [XmlIgnore] - public CStatic StaticCoverBig; [XmlElement("StaticTextBG")] public SThemeStatic SStaticTextBG; - [XmlIgnore] - public CStatic StaticTextBG; [XmlElement("StaticDuetIcon")] public SThemeStatic SStaticDuetIcon; - [XmlIgnore] - public CStatic StaticDuetIcon; [XmlElement("StaticVideoIcon")] public SThemeStatic SStaticVideoIcon; - [XmlIgnore] - public CStatic StaticVideoIcon; [XmlElement("StaticMedleyCalcIcon")] public SThemeStatic SStaticMedleyCalcIcon; - [XmlIgnore] - public CStatic StaticMedleyCalcIcon; [XmlElement("StaticMedleyTagIcon")] public SThemeStatic SStaticMedleyTagIcon; - [XmlIgnore] - public CStatic StaticMedleyTagIcon; public SThemeSongMenuTileBoard(SThemeSongMenuTileBoard theme) { @@ -159,23 +141,14 @@ namespace VocaluxeLib.Menu.SongMenu TileRect = new SRectF(theme.TileRect); TileRectSmall = new SRectF(theme.TileRectSmall); STextArtist = new SThemeText(theme.STextArtist); - TextArtist = new CText(theme.TextArtist); - STextTitle = new SThemeText(theme.STextTitle); - TextTitle = new CText(theme.TextTitle); - STextSongLength = new SThemeText(theme.STextSongLength); - TextSongLength = new CText(theme.TextSongLength); - SStaticCoverBig = new SThemeStatic(theme.SStaticCoverBig); - StaticCoverBig = new CStatic(theme.StaticCoverBig); - SStaticTextBG = new SThemeStatic(theme.SStaticTextBG); - StaticTextBG = new CStatic(theme.StaticTextBG); - SStaticDuetIcon = new SThemeStatic(theme.SStaticDuetIcon); - StaticDuetIcon = new CStatic(theme.StaticDuetIcon); - SStaticVideoIcon = new SThemeStatic(theme.SStaticVideoIcon); - StaticVideoIcon = new CStatic(theme.StaticVideoIcon); - SStaticMedleyCalcIcon = new SThemeStatic(theme.SStaticMedleyCalcIcon); - StaticMedleyCalcIcon = new CStatic(theme.StaticMedleyCalcIcon); + STextTitle = new SThemeText(theme.STextTitle); + STextSongLength = new SThemeText(theme.STextSongLength); + SStaticCoverBig = new SThemeStatic(theme.SStaticCoverBig); + SStaticTextBG = new SThemeStatic(theme.SStaticTextBG); + SStaticDuetIcon = new SThemeStatic(theme.SStaticDuetIcon); + SStaticVideoIcon = new SThemeStatic(theme.SStaticVideoIcon); + SStaticMedleyCalcIcon = new SThemeStatic(theme.SStaticMedleyCalcIcon); SStaticMedleyTagIcon = new SThemeStatic(theme.SStaticMedleyTagIcon); - StaticMedleyTagIcon = new CStatic(theme.StaticMedleyTagIcon); } } @@ -249,21 +222,6 @@ namespace VocaluxeLib.Menu.SongMenu { Visible = true; _PartyModeID = partyModeID; - _Theme = new SThemeSongMenu - { - SongMenuTileBoard = - { - TextArtist = new CText(_PartyModeID), - TextTitle = new CText(_PartyModeID), - TextSongLength = new CText(_PartyModeID), - StaticCoverBig = new CStatic(_PartyModeID), - StaticTextBG = new CStatic(_PartyModeID), - StaticDuetIcon = new CStatic(_PartyModeID), - StaticVideoIcon = new CStatic(_PartyModeID), - StaticMedleyCalcIcon = new CStatic(_PartyModeID), - StaticMedleyTagIcon = new CStatic(_PartyModeID) - } - }; } protected CSongMenuFramework(SThemeSongMenu theme, int partyModeID) @@ -286,7 +244,7 @@ namespace VocaluxeLib.Menu.SongMenu return new SThemeSongMenu(_Theme); } - public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader, int skinIndex) + public virtual bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader, int skinIndex) { string item = xmlPath + "/" + elementName; _ThemeLoaded = true; @@ -318,17 +276,6 @@ namespace VocaluxeLib.Menu.SongMenu _ThemeLoaded &= xmlReader.TryGetIntValue(item + "/SongMenuTileBoard/NumWsmall", ref _Theme.SongMenuTileBoard.NumWsmall); _ThemeLoaded &= xmlReader.TryGetIntValue(item + "/SongMenuTileBoard/NumHsmall", ref _Theme.SongMenuTileBoard.NumHsmall); - _ThemeLoaded &= _Theme.SongMenuTileBoard.TextArtist.LoadTheme(item + "/SongMenuTileBoard", "TextArtist", xmlReader, skinIndex); - _ThemeLoaded &= _Theme.SongMenuTileBoard.TextTitle.LoadTheme(item + "/SongMenuTileBoard", "TextTitle", xmlReader, skinIndex); - _ThemeLoaded &= _Theme.SongMenuTileBoard.TextSongLength.LoadTheme(item + "/SongMenuTileBoard", "TextSongLength", xmlReader, skinIndex); - - _ThemeLoaded &= _Theme.SongMenuTileBoard.StaticCoverBig.LoadTheme(item + "/SongMenuTileBoard", "StaticCoverBig", xmlReader, skinIndex); - _ThemeLoaded &= _Theme.SongMenuTileBoard.StaticTextBG.LoadTheme(item + "/SongMenuTileBoard", "StaticTextBG", xmlReader, skinIndex); - _ThemeLoaded &= _Theme.SongMenuTileBoard.StaticDuetIcon.LoadTheme(item + "/SongMenuTileBoard", "StaticDuetIcon", xmlReader, skinIndex); - _ThemeLoaded &= _Theme.SongMenuTileBoard.StaticVideoIcon.LoadTheme(item + "/SongMenuTileBoard", "StaticVideoIcon", xmlReader, skinIndex); - _ThemeLoaded &= _Theme.SongMenuTileBoard.StaticMedleyCalcIcon.LoadTheme(item + "/SongMenuTileBoard", "StaticMedleyCalcIcon", xmlReader, skinIndex); - _ThemeLoaded &= _Theme.SongMenuTileBoard.StaticMedleyTagIcon.LoadTheme(item + "/SongMenuTileBoard", "StaticMedleyTagIcon", xmlReader, skinIndex); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuTileBoard/TileRectX", ref _Theme.SongMenuTileBoard.TileRect.X); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuTileBoard/TileRectY", ref _Theme.SongMenuTileBoard.TileRect.Y); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SongMenuTileBoard/TileRectZ", ref _Theme.SongMenuTileBoard.TileRect.Z); @@ -346,16 +293,6 @@ namespace VocaluxeLib.Menu.SongMenu { _Theme.Name = elementName; - _Theme.SongMenuTileBoard.STextArtist = _Theme.SongMenuTileBoard.TextArtist.GetTheme(); - _Theme.SongMenuTileBoard.STextSongLength = _Theme.SongMenuTileBoard.TextSongLength.GetTheme(); - _Theme.SongMenuTileBoard.STextTitle = _Theme.SongMenuTileBoard.TextTitle.GetTheme(); - _Theme.SongMenuTileBoard.SStaticCoverBig = _Theme.SongMenuTileBoard.StaticCoverBig.GetTheme(); - _Theme.SongMenuTileBoard.SStaticDuetIcon = _Theme.SongMenuTileBoard.StaticDuetIcon.GetTheme(); - _Theme.SongMenuTileBoard.SStaticMedleyCalcIcon = _Theme.SongMenuTileBoard.StaticMedleyCalcIcon.GetTheme(); - _Theme.SongMenuTileBoard.SStaticMedleyTagIcon = _Theme.SongMenuTileBoard.StaticMedleyTagIcon.GetTheme(); - _Theme.SongMenuTileBoard.SStaticTextBG = _Theme.SongMenuTileBoard.StaticTextBG.GetTheme(); - _Theme.SongMenuTileBoard.SStaticVideoIcon = _Theme.SongMenuTileBoard.StaticVideoIcon.GetTheme(); - LoadTextures(); Init(); } @@ -363,7 +300,7 @@ namespace VocaluxeLib.Menu.SongMenu return _ThemeLoaded; } - public bool SaveTheme(XmlWriter writer) + public virtual bool SaveTheme(XmlWriter writer) { if (_ThemeLoaded) { @@ -399,56 +336,6 @@ namespace VocaluxeLib.Menu.SongMenu writer.WriteElementString("A", _Color.A.ToString("#0.00")); } - #region SongMenuTileBoard - writer.WriteComment(": Config for TileBoard view"); - writer.WriteStartElement("SongMenuTileBoard"); - - writer.WriteComment(": Number of tiles horizontal"); - writer.WriteElementString("NumW", _Theme.SongMenuTileBoard.NumW.ToString()); - - writer.WriteComment(": Number of tiles vertical"); - writer.WriteElementString("NumH", _Theme.SongMenuTileBoard.NumH.ToString()); - - writer.WriteComment(": Space between tiles horizontal"); - writer.WriteElementString("SpaceW", _Theme.SongMenuTileBoard.SpaceW.ToString("#0.00")); - - writer.WriteComment(": Space between tiles vertical"); - writer.WriteElementString("SpaceH", _Theme.SongMenuTileBoard.SpaceH.ToString("#0.00")); - - writer.WriteComment(": Number of tiles horizontal in small-mode"); - writer.WriteElementString("NumWsmall", _Theme.SongMenuTileBoard.NumWsmall.ToString()); - - writer.WriteComment(": Number of tiles vertical in small-mode"); - writer.WriteElementString("NumHsmall", _Theme.SongMenuTileBoard.NumHsmall.ToString()); - - writer.WriteComment(", , , , : SongMenu position, width and height"); - writer.WriteElementString("TileRectX", _Theme.SongMenuTileBoard.TileRect.X.ToString("#0")); - writer.WriteElementString("TileRectY", _Theme.SongMenuTileBoard.TileRect.Y.ToString("#0")); - writer.WriteElementString("TileRectZ", _Theme.SongMenuTileBoard.TileRect.Z.ToString("#0.00")); - writer.WriteElementString("TileRectW", _Theme.SongMenuTileBoard.TileRect.W.ToString("#0")); - writer.WriteElementString("TileRectH", _Theme.SongMenuTileBoard.TileRect.H.ToString("#0")); - - writer.WriteComment(", , , , : SongMenu position, width and height in small-mode"); - writer.WriteElementString("TileRectSmallX", _Theme.SongMenuTileBoard.TileRectSmall.X.ToString("#0")); - writer.WriteElementString("TileRectSmallY", _Theme.SongMenuTileBoard.TileRectSmall.Y.ToString("#0")); - writer.WriteElementString("TileRectSmallZ", _Theme.SongMenuTileBoard.TileRectSmall.Z.ToString("#0.00")); - writer.WriteElementString("TileRectSmallW", _Theme.SongMenuTileBoard.TileRectSmall.W.ToString("#0")); - writer.WriteElementString("TileRectSmallH", _Theme.SongMenuTileBoard.TileRectSmall.H.ToString("#0")); - - _Theme.SongMenuTileBoard.TextArtist.SaveTheme(writer); - _Theme.SongMenuTileBoard.TextTitle.SaveTheme(writer); - _Theme.SongMenuTileBoard.TextSongLength.SaveTheme(writer); - - _Theme.SongMenuTileBoard.StaticCoverBig.SaveTheme(writer); - _Theme.SongMenuTileBoard.StaticTextBG.SaveTheme(writer); - _Theme.SongMenuTileBoard.StaticDuetIcon.SaveTheme(writer); - _Theme.SongMenuTileBoard.StaticVideoIcon.SaveTheme(writer); - _Theme.SongMenuTileBoard.StaticMedleyCalcIcon.SaveTheme(writer); - _Theme.SongMenuTileBoard.StaticMedleyTagIcon.SaveTheme(writer); - - writer.WriteEndElement(); - #endregion SongMenuTileBoard - writer.WriteEndElement(); return true; @@ -547,6 +434,9 @@ namespace VocaluxeLib.Menu.SongMenu if (!String.IsNullOrEmpty(_Theme.Color.Name)) _ColorInternal = CBase.Theme.GetColor(_Theme.Color.Name, _PartyModeID); + else + _ColorInternal = _Theme.Color.Color; + } public void ReloadTextures() diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs index b33a1d16..71d57dc9 100644 --- a/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs +++ b/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs @@ -20,6 +20,7 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; using System.Windows.Forms; +using System.Xml; using VocaluxeLib.Draw; using VocaluxeLib.PartyModes; using VocaluxeLib.Songs; @@ -47,9 +48,6 @@ namespace VocaluxeLib.Menu.SongMenu private int _NumW; private int _NumH; - private float _SpaceW; - private float _SpaceH; - private int _TileW; private int _TileH; @@ -120,24 +118,103 @@ namespace VocaluxeLib.Menu.SongMenu } } + public override bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader, int skinIndex) + { + string item = xmlPath + "/" + elementName; + + bool themeLoaded = true; + themeLoaded &= base.LoadTheme(xmlPath, elementName, xmlReader, skinIndex); + + + themeLoaded &= _Artist.LoadTheme(item + "/SongMenuTileBoard", "TextArtist", xmlReader, skinIndex); + themeLoaded &= _Title.LoadTheme(item + "/SongMenuTileBoard", "TextTitle", xmlReader, skinIndex); + themeLoaded &= _SongLength.LoadTheme(item + "/SongMenuTileBoard", "TextSongLength", xmlReader, skinIndex); + + themeLoaded &= _CoverBig.LoadTheme(item + "/SongMenuTileBoard", "StaticCoverBig", xmlReader, skinIndex); + themeLoaded &= _TextBG.LoadTheme(item + "/SongMenuTileBoard", "StaticTextBG", xmlReader, skinIndex); + themeLoaded &= _DuetIcon.LoadTheme(item + "/SongMenuTileBoard", "StaticDuetIcon", xmlReader, skinIndex); + themeLoaded &= _VideoIcon.LoadTheme(item + "/SongMenuTileBoard", "StaticVideoIcon", xmlReader, skinIndex); + themeLoaded &= _MedleyCalcIcon.LoadTheme(item + "/SongMenuTileBoard", "StaticMedleyCalcIcon", xmlReader, skinIndex); + themeLoaded &= _MedleyTagIcon.LoadTheme(item + "/SongMenuTileBoard", "StaticMedleyTagIcon", xmlReader, skinIndex); + + if (themeLoaded) + { + _Theme.Name = elementName; + + _Theme.SongMenuTileBoard.STextArtist = _Artist.GetTheme(); + _Theme.SongMenuTileBoard.STextSongLength = _SongLength.GetTheme(); + _Theme.SongMenuTileBoard.STextTitle = _Title.GetTheme(); + _Theme.SongMenuTileBoard.SStaticCoverBig = _CoverBig.GetTheme(); + _Theme.SongMenuTileBoard.SStaticDuetIcon = _DuetIcon.GetTheme(); + _Theme.SongMenuTileBoard.SStaticMedleyCalcIcon = _MedleyCalcIcon.GetTheme(); + _Theme.SongMenuTileBoard.SStaticMedleyTagIcon = _MedleyTagIcon.GetTheme(); + _Theme.SongMenuTileBoard.SStaticTextBG = _TextBG.GetTheme(); + _Theme.SongMenuTileBoard.SStaticVideoIcon = _VideoIcon.GetTheme(); + + LoadTextures(); + Init(); + } + + return themeLoaded; + } + + public override bool SaveTheme(XmlWriter writer) + { + writer.WriteComment(": Config for TileBoard view"); + writer.WriteStartElement("SongMenuTileBoard"); + + writer.WriteComment(": Number of tiles horizontal"); + writer.WriteElementString("NumW", _Theme.SongMenuTileBoard.NumW.ToString()); + + writer.WriteComment(": Number of tiles vertical"); + writer.WriteElementString("NumH", _Theme.SongMenuTileBoard.NumH.ToString()); + + writer.WriteComment(": Space between tiles horizontal"); + writer.WriteElementString("SpaceW", _Theme.SongMenuTileBoard.SpaceW.ToString("#0.00")); + + writer.WriteComment(": Space between tiles vertical"); + writer.WriteElementString("SpaceH", _Theme.SongMenuTileBoard.SpaceH.ToString("#0.00")); + + writer.WriteComment(": Number of tiles horizontal in small-mode"); + writer.WriteElementString("NumWsmall", _Theme.SongMenuTileBoard.NumWsmall.ToString()); + + writer.WriteComment(": Number of tiles vertical in small-mode"); + writer.WriteElementString("NumHsmall", _Theme.SongMenuTileBoard.NumHsmall.ToString()); + + writer.WriteComment(", , , , : SongMenu position, width and height"); + writer.WriteElementString("TileRectX", _Theme.SongMenuTileBoard.TileRect.X.ToString("#0")); + writer.WriteElementString("TileRectY", _Theme.SongMenuTileBoard.TileRect.Y.ToString("#0")); + writer.WriteElementString("TileRectZ", _Theme.SongMenuTileBoard.TileRect.Z.ToString("#0.00")); + writer.WriteElementString("TileRectW", _Theme.SongMenuTileBoard.TileRect.W.ToString("#0")); + writer.WriteElementString("TileRectH", _Theme.SongMenuTileBoard.TileRect.H.ToString("#0")); + + writer.WriteComment(", , , , : SongMenu position, width and height in small-mode"); + writer.WriteElementString("TileRectSmallX", _Theme.SongMenuTileBoard.TileRectSmall.X.ToString("#0")); + writer.WriteElementString("TileRectSmallY", _Theme.SongMenuTileBoard.TileRectSmall.Y.ToString("#0")); + writer.WriteElementString("TileRectSmallZ", _Theme.SongMenuTileBoard.TileRectSmall.Z.ToString("#0.00")); + writer.WriteElementString("TileRectSmallW", _Theme.SongMenuTileBoard.TileRectSmall.W.ToString("#0")); + writer.WriteElementString("TileRectSmallH", _Theme.SongMenuTileBoard.TileRectSmall.H.ToString("#0")); + + _Artist.SaveTheme(writer); + _Title.SaveTheme(writer); + _SongLength.SaveTheme(writer); + + _CoverBig.SaveTheme(writer); + _TextBG.SaveTheme(writer); + _DuetIcon.SaveTheme(writer); + _VideoIcon.SaveTheme(writer); + _MedleyCalcIcon.SaveTheme(writer); + _MedleyTagIcon.SaveTheme(writer); + + writer.WriteEndElement(); + + return true; + } + public override void Init() { base.Init(); - _SpaceW = _Theme.SongMenuTileBoard.SpaceW; - _SpaceH = _Theme.SongMenuTileBoard.SpaceH; - - _CoverBig = _Theme.SongMenuTileBoard.StaticCoverBig; - _TextBG = _Theme.SongMenuTileBoard.StaticTextBG; - _DuetIcon = _Theme.SongMenuTileBoard.StaticDuetIcon; - _VideoIcon = _Theme.SongMenuTileBoard.StaticVideoIcon; - _MedleyCalcIcon = _Theme.SongMenuTileBoard.StaticMedleyCalcIcon; - _MedleyTagIcon = _Theme.SongMenuTileBoard.StaticMedleyTagIcon; - - _Artist = _Theme.SongMenuTileBoard.TextArtist; - _Title = _Theme.SongMenuTileBoard.TextTitle; - _SongLength = _Theme.SongMenuTileBoard.TextSongLength; - _PreviewNr = -1; _InitTiles(); } @@ -157,8 +234,8 @@ namespace VocaluxeLib.Menu.SongMenu Rect = _Theme.SongMenuTileBoard.TileRect; } - _TileW = (int)((Rect.W - _SpaceW * (_NumW - 1)) / _NumW); - _TileH = (int)((Rect.H - _SpaceH * (_NumH - 1)) / _NumH); + _TileW = (int)((Rect.W - _Theme.SongMenuTileBoard.SpaceW * (_NumW - 1)) / _NumW); + _TileH = (int)((Rect.H - _Theme.SongMenuTileBoard.SpaceH * (_NumH - 1)) / _NumH); _CoverBGTexture = CBase.Theme.GetSkinTexture(_Theme.CoverBackgroundName, _PartyModeID); _CoverBigBGTexture = CBase.Theme.GetSkinTexture(_Theme.CoverBigBackgroundName, _PartyModeID); @@ -168,7 +245,7 @@ namespace VocaluxeLib.Menu.SongMenu { for (int j = 0; j < _NumW; j++) { - var rect = new SRectF(Rect.X + j * (_TileW + _SpaceW), Rect.Y + i * (_TileH + _SpaceH), _TileW, _TileH, Rect.Z); + var rect = new SRectF(Rect.X + j * (_TileW + _Theme.SongMenuTileBoard.SpaceW), Rect.Y + i * (_TileH + _Theme.SongMenuTileBoard.SpaceH), _TileW, _TileH, Rect.Z); var tile = new CStatic(_PartyModeID, _CoverBGTexture, _Color, rect); _Tiles.Add(tile); } @@ -593,16 +670,17 @@ namespace VocaluxeLib.Menu.SongMenu { base.LoadTextures(); - _Theme.SongMenuTileBoard.StaticCoverBig.ReloadTextures(); - _Theme.SongMenuTileBoard.StaticTextBG.ReloadTextures(); - _Theme.SongMenuTileBoard.StaticDuetIcon.ReloadTextures(); - _Theme.SongMenuTileBoard.StaticVideoIcon.ReloadTextures(); - _Theme.SongMenuTileBoard.StaticMedleyCalcIcon.ReloadTextures(); - _Theme.SongMenuTileBoard.StaticMedleyTagIcon.ReloadTextures(); + _Artist = new CText(_Theme.SongMenuTileBoard.STextArtist, _PartyModeID); + _Title = new CText(_Theme.SongMenuTileBoard.STextTitle, _PartyModeID); + _SongLength = new CText(_Theme.SongMenuTileBoard.STextSongLength, _PartyModeID); + _CoverBig = new CStatic(_Theme.SongMenuTileBoard.SStaticCoverBig, _PartyModeID); + _TextBG = new CStatic(_Theme.SongMenuTileBoard.SStaticTextBG, _PartyModeID); + _DuetIcon = new CStatic(_Theme.SongMenuTileBoard.SStaticDuetIcon, _PartyModeID); + _VideoIcon = new CStatic(_Theme.SongMenuTileBoard.SStaticVideoIcon, _PartyModeID); + _MedleyCalcIcon = new CStatic(_Theme.SongMenuTileBoard.SStaticMedleyCalcIcon, _PartyModeID); + _MedleyTagIcon = new CStatic(_Theme.SongMenuTileBoard.SStaticMedleyTagIcon, _PartyModeID); - _Theme.SongMenuTileBoard.TextArtist.ReloadTextures(); - _Theme.SongMenuTileBoard.TextTitle.ReloadTextures(); - _Theme.SongMenuTileBoard.TextSongLength.ReloadTextures(); + Init(); } } } \ No newline at end of file From 4f8c4826459ed0356479bafa554ef141b6a15032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Mon, 15 Sep 2014 19:44:19 +0200 Subject: [PATCH 23/29] Remove unneeded constructors. --- VocaluxeLib/Menu/CBackground.cs | 14 +------ VocaluxeLib/Menu/CButton.cs | 19 +-------- VocaluxeLib/Menu/CEqualizer.cs | 18 +------- VocaluxeLib/Menu/CLyric.cs | 12 +----- VocaluxeLib/Menu/CNameSelection.cs | 34 +-------------- VocaluxeLib/Menu/CParticle.cs | 15 +------ VocaluxeLib/Menu/CScreenSetting.cs | 11 +---- VocaluxeLib/Menu/CSelectSlide.cs | 33 +-------------- VocaluxeLib/Menu/CStatic.cs | 13 +----- VocaluxeLib/Menu/CText.cs | 22 +--------- .../Menu/SongMenu/CSongMenuFramework.cs | 41 +++++-------------- .../Menu/SongMenu/CSongMenuTileBoard.cs | 36 ++++++++-------- 12 files changed, 48 insertions(+), 220 deletions(-) diff --git a/VocaluxeLib/Menu/CBackground.cs b/VocaluxeLib/Menu/CBackground.cs index 08659da7..8a752512 100644 --- a/VocaluxeLib/Menu/CBackground.cs +++ b/VocaluxeLib/Menu/CBackground.cs @@ -48,16 +48,6 @@ namespace VocaluxeLib.Menu [XmlElement("Skin")] public string TextureName; public SThemeColor Color; - - public SThemeBackground(SThemeBackground theme) - { - Name = theme.Name; - Type = theme.Type; - SlideShowTextures = theme.SlideShowTextures; - VideoName = theme.VideoName; - TextureName = theme.TextureName; - Color = new SThemeColor(theme.Color); - } } public class CBackground : IMenuElement @@ -93,7 +83,7 @@ namespace VocaluxeLib.Menu public CBackground(SThemeBackground theme, int partyModeID) { - _Theme = new SThemeBackground(theme); + _Theme = theme; _PartyModeID = partyModeID; LoadTextures(); @@ -274,7 +264,7 @@ namespace VocaluxeLib.Menu public SThemeBackground GetTheme() { - return new SThemeBackground(_Theme); + return _Theme; } #endregion public diff --git a/VocaluxeLib/Menu/CButton.cs b/VocaluxeLib/Menu/CButton.cs index 8d88f7f7..44383244 100644 --- a/VocaluxeLib/Menu/CButton.cs +++ b/VocaluxeLib/Menu/CButton.cs @@ -46,21 +46,6 @@ namespace VocaluxeLib.Menu public SReflection Reflection; [XmlElement("SelReflection")] public SReflection SelReflection; - - public SThemeButton(SThemeButton theme) - { - Name = theme.Name; - TextureName = theme.TextureName; - SelTextureName = theme.SelTextureName; - Rect = new SRectF(theme.Rect); - Color = new SThemeColor(theme.Color); - SelColor = new SThemeColor(theme.SelColor); - Text = new SThemeText(theme.Text); - SText = new SThemeText(theme.SText); - Reflection = new SReflection(theme.Reflection); - SelReflection = new SReflection(theme.SelReflection); - STextSpecified = theme.STextSpecified; - } } public class CButton : IMenuElement @@ -144,7 +129,7 @@ namespace VocaluxeLib.Menu public CButton(SThemeButton theme, int partyModeID) { _PartyModeID = partyModeID; - _Theme = new SThemeButton(theme); + _Theme = theme; Selected = false; EditMode = false; @@ -452,7 +437,7 @@ namespace VocaluxeLib.Menu public SThemeButton GetTheme() { - return new SThemeButton(_Theme); + return _Theme; } #region ThemeEdit diff --git a/VocaluxeLib/Menu/CEqualizer.cs b/VocaluxeLib/Menu/CEqualizer.cs index 1f533e7e..8e8e934a 100644 --- a/VocaluxeLib/Menu/CEqualizer.cs +++ b/VocaluxeLib/Menu/CEqualizer.cs @@ -53,20 +53,6 @@ namespace VocaluxeLib.Menu public SThemeColor MaxColor; [XmlElement("Reflection")] public SReflection Reflection; - - public SThemeEqualizer(SThemeEqualizer theme) - { - Name = theme.Name; - TextureName = theme.TextureName; - Rect = new SRectF(theme.Rect); - NumBars = theme.NumBars; - Space = theme.Space; - Style = theme.Style; - DrawNegative = theme.DrawNegative; - Color = new SThemeColor(theme.Color); - MaxColor = new SThemeColor(theme.MaxColor); - Reflection = new SReflection(theme.Reflection); - } } public class CEqualizer : IMenuElement @@ -124,7 +110,7 @@ namespace VocaluxeLib.Menu public CEqualizer(SThemeEqualizer theme, int partyModeID) { _PartyModeID = partyModeID; - _Theme = new SThemeEqualizer(theme); + _Theme = theme; Visible = true; ScreenHandles = false; @@ -370,7 +356,7 @@ namespace VocaluxeLib.Menu public SThemeEqualizer GetTheme() { - return new SThemeEqualizer(_Theme); + return _Theme; } #region ThemeEdit diff --git a/VocaluxeLib/Menu/CLyric.cs b/VocaluxeLib/Menu/CLyric.cs index c7e20105..8719cb87 100644 --- a/VocaluxeLib/Menu/CLyric.cs +++ b/VocaluxeLib/Menu/CLyric.cs @@ -35,14 +35,6 @@ namespace VocaluxeLib.Menu public SThemeColor Color; [XmlElement("SColor")] public SThemeColor SColor; - - public SThemeLyrics(SThemeLyrics theme) - { - Name = theme.Name; - Rect = new SRectF(theme.Rect); - Color = new SThemeColor(theme.Color); - SColor = new SThemeColor(theme.SColor); - } } public class CLyric : IMenuElement @@ -131,7 +123,7 @@ namespace VocaluxeLib.Menu public CLyric(SThemeLyrics theme, int partyModeID) { _PartyModeID = partyModeID; - _Theme = new SThemeLyrics(theme); + _Theme = theme; _Line = new CSongLine(); _Text = new CText(_PartyModeID); @@ -526,7 +518,7 @@ namespace VocaluxeLib.Menu public SThemeLyrics GetTheme() { - return new SThemeLyrics(_Theme); + return _Theme; } #region ThemeEdit diff --git a/VocaluxeLib/Menu/CNameSelection.cs b/VocaluxeLib/Menu/CNameSelection.cs index 1e061cf4..f396fc60 100644 --- a/VocaluxeLib/Menu/CNameSelection.cs +++ b/VocaluxeLib/Menu/CNameSelection.cs @@ -40,16 +40,6 @@ namespace VocaluxeLib.Menu public string TextureTileSelectedName; [XmlElement("Tiles")] public SThemeNameSelectionTiles Tiles; - - public SThemeNameSelection(SThemeNameSelection theme) - { - Name = theme.Name; - Rect = new SRectF(theme.Rect); - TextureEmptyTileName = theme.TextureEmptyTileName; - ColorEmptyTile = new SThemeColor(theme.ColorEmptyTile); - TextureTileSelectedName = theme.TextureTileSelectedName; - Tiles = new SThemeNameSelectionTiles(theme.Tiles); - } } public struct SThemeNameSelectionTiles @@ -68,17 +58,6 @@ namespace VocaluxeLib.Menu public float SpaceH; [XmlElement("Name")] public SThemeNameSelectionName Name; - - public SThemeNameSelectionTiles(SThemeNameSelectionTiles theme) - { - W = theme.W; - H = theme.H; - NumW = theme.NumW; - NumH = theme.NumH; - SpaceW = theme.SpaceW; - SpaceH = theme.SpaceH; - Name = new SThemeNameSelectionName(theme.Name); - } } public struct SThemeNameSelectionName @@ -93,15 +72,6 @@ namespace VocaluxeLib.Menu public EStyle Style; [XmlElement("Color")] public SThemeColor Color; - - public SThemeNameSelectionName(SThemeNameSelectionName theme) - { - Space = theme.Space; - Height = theme.Height; - Font = theme.Font; - Style = theme.Style; - Color = new SThemeColor(theme.Color); - } } public class CNameSelection : IMenuElement @@ -176,7 +146,7 @@ namespace VocaluxeLib.Menu public CNameSelection(SThemeNameSelection theme, int partyModeID) { _PartyModeID = partyModeID; - _Theme = new SThemeNameSelection(theme); + _Theme = theme; _Tiles = new List(); _VisibleProfiles = new List(); @@ -647,7 +617,7 @@ namespace VocaluxeLib.Menu public SThemeNameSelection GetTheme() { - return new SThemeNameSelection(_Theme); + return _Theme; } #region ThemeEdit diff --git a/VocaluxeLib/Menu/CParticle.cs b/VocaluxeLib/Menu/CParticle.cs index 7dc321de..1f9b2bd9 100644 --- a/VocaluxeLib/Menu/CParticle.cs +++ b/VocaluxeLib/Menu/CParticle.cs @@ -42,17 +42,6 @@ namespace VocaluxeLib.Menu public float Size; [XmlElement("MaxNumber")] public int MaxNumber; - - public SThemeParticleEffect(SThemeParticleEffect theme) - { - Name = theme.Name; - TextureName = theme.TextureName; - Rect = new SRectF(theme.Rect); - Color = new SThemeColor(theme.Color); - Type = theme.Type; - Size = theme.Size; - MaxNumber = theme.MaxNumber; - } } public enum EParticleType @@ -401,7 +390,7 @@ namespace VocaluxeLib.Menu public CParticleEffect(SThemeParticleEffect theme, int partyModeID) { _PartyModeID = partyModeID; - _Theme = new SThemeParticleEffect(theme); + _Theme = theme; _Stars = new List(); _SpawnTimer = new Stopwatch(); _NextSpawnTime = 0f; @@ -656,7 +645,7 @@ namespace VocaluxeLib.Menu public SThemeParticleEffect GetTheme() { - return new SThemeParticleEffect(_Theme); + return _Theme; } #region ThemeEdit diff --git a/VocaluxeLib/Menu/CScreenSetting.cs b/VocaluxeLib/Menu/CScreenSetting.cs index 2f4e1bf5..ea6c7bd9 100644 --- a/VocaluxeLib/Menu/CScreenSetting.cs +++ b/VocaluxeLib/Menu/CScreenSetting.cs @@ -39,13 +39,6 @@ namespace VocaluxeLib.Menu public string Value; [XmlElement("Type")] public ESettingType Type; - - public SScreenSetting(SScreenSetting theme) - { - Name = theme.Name; - Value = theme.Value; - Type = theme.Type; - } } // ReSharper disable ClassNeverInstantiated.Global @@ -78,7 +71,7 @@ namespace VocaluxeLib.Menu public CScreenSetting(SScreenSetting theme, int partyModeID) { _PartyModeID = partyModeID; - _Theme = new SScreenSetting(theme); + _Theme = theme; } public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader, int skinIndex) @@ -138,7 +131,7 @@ namespace VocaluxeLib.Menu public SScreenSetting GetTheme() { - return new SScreenSetting(_Theme); + return _Theme; } #region Private diff --git a/VocaluxeLib/Menu/CSelectSlide.cs b/VocaluxeLib/Menu/CSelectSlide.cs index 9cd95b96..f44fa0d8 100644 --- a/VocaluxeLib/Menu/CSelectSlide.cs +++ b/VocaluxeLib/Menu/CSelectSlide.cs @@ -87,35 +87,6 @@ namespace VocaluxeLib.Menu [XmlElement("NumVisible")] public int NumVisible; - - public SThemeSelectSlide(SThemeSelectSlide theme) - { - Name = theme.Name; - TextureName = theme.TextureName; - TextureArrowLeftName = theme.TextureArrowLeftName; - TextureArrowRightName = theme.TextureArrowRightName; - SelTextureName = theme.SelTextureName; - SelTextureArrowLeftName = theme.SelTextureArrowLeftName; - SelTextureArrowRightName = theme.SelTextureArrowRightName; - HighlightTextureName = theme.HighlightTextureName; - Rect = new SRectF(theme.Rect); - RectArrowLeft = new SRectF(theme.RectArrowLeft); - RectArrowRight = new SRectF(theme.RectArrowRight); - Color = new SThemeColor(theme.Color); - SColor = new SThemeColor(theme.SColor); - HColor = new SThemeColor(theme.HColor); - ArrowColor = new SThemeColor(theme.ArrowColor); - ArrowSColor = new SThemeColor(theme.ArrowSColor); - TextColor = new SThemeColor(theme.TextColor); - TextSColor = new SThemeColor(theme.TextSColor); - TextH = theme.TextH; - TextRelativeX = theme.TextRelativeX; - TextRelativeY = theme.TextRelativeY; - TextMaxW = theme.TextMaxW; - TextFont = theme.TextFont; - TextStyle = theme.TextStyle; - NumVisible = theme.NumVisible; - } } public class CSelectSlide : IMenuElement, ICloneable @@ -314,7 +285,7 @@ namespace VocaluxeLib.Menu public CSelectSlide(SThemeSelectSlide theme, int partyModeID) { _PartyModeID = partyModeID; - _Theme = new SThemeSelectSlide(theme); + _Theme = theme; _Selected = false; _Textures = new List(); @@ -913,7 +884,7 @@ namespace VocaluxeLib.Menu public SThemeSelectSlide GetTheme() { - return new SThemeSelectSlide(_Theme); + return _Theme; } public void UnloadTextures() {} diff --git a/VocaluxeLib/Menu/CStatic.cs b/VocaluxeLib/Menu/CStatic.cs index a7f89336..046f9ebe 100644 --- a/VocaluxeLib/Menu/CStatic.cs +++ b/VocaluxeLib/Menu/CStatic.cs @@ -32,15 +32,6 @@ namespace VocaluxeLib.Menu public SThemeColor Color; public SRectF Rect; public SReflection Reflection; - - public SThemeStatic(SThemeStatic theme) - { - Name = theme.Name; - TextureName = theme.TextureName; - Color = new SThemeColor(theme.Color); - Rect = new SRectF(theme.Rect); - Reflection = new SReflection(theme.Reflection); - } } public class CStatic : IMenuElement @@ -128,7 +119,7 @@ namespace VocaluxeLib.Menu public CStatic(SThemeStatic theme, int partyModeID) { _PartyModeID = partyModeID; - _Theme = new SThemeStatic(theme); + _Theme = theme; LoadTextures(); } @@ -281,7 +272,7 @@ namespace VocaluxeLib.Menu public SThemeStatic GetTheme() { - return new SThemeStatic(_Theme); + return _Theme; } #region ThemeEdit diff --git a/VocaluxeLib/Menu/CText.cs b/VocaluxeLib/Menu/CText.cs index 06777092..35c07bf7 100644 --- a/VocaluxeLib/Menu/CText.cs +++ b/VocaluxeLib/Menu/CText.cs @@ -51,24 +51,6 @@ namespace VocaluxeLib.Menu [XmlElement("Text")] public string Text; public SReflection Reflection; - - public SThemeText(SThemeText theme) - { - Name = theme.Name; - X = theme.X; - Y = theme.Y; - Z = theme.Z; - Height = theme.Height; - MaxWidth = theme.MaxWidth; - Color = new SThemeColor(theme.Color); - SColor = new SThemeColor(theme.SColor); - Align = theme.Align; - ResizeAlign = theme.ResizeAlign; - Style = theme.Style; - Font = theme.Font; - Text = theme.Text; - Reflection = new SReflection(theme.Reflection); - } } public class CText : IMenuElement @@ -356,7 +338,7 @@ namespace VocaluxeLib.Menu public CText(SThemeText theme, int partyModeID) { _PartyModeID = partyModeID; - _Theme = new SThemeText(theme); + _Theme = theme; LoadTextures(); } @@ -628,7 +610,7 @@ namespace VocaluxeLib.Menu public SThemeText GetTheme() { - return new SThemeText(_Theme); + return _Theme; } #region ThemeEdit diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs index d30ff70b..e6d57109 100644 --- a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs +++ b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs @@ -63,7 +63,7 @@ namespace VocaluxeLib.Menu.SongMenu MedleyCalcIcon = theme.MedleyCalcIcon; MedleyTagIcon = theme.MedleyTagIcon; Color = new SThemeColor(theme.Color); - SongMenuTileBoard = new SThemeSongMenuTileBoard(theme.SongMenuTileBoard); + SongMenuTileBoard = theme.SongMenuTileBoard; } } @@ -111,45 +111,24 @@ namespace VocaluxeLib.Menu.SongMenu public SRectF TileRectSmall; [XmlElement("TextArtist")] - public SThemeText STextArtist; + public SThemeText TextArtist; [XmlElement("TextTitle")] - public SThemeText STextTitle; + public SThemeText TextTitle; [XmlElement("TextSongLength")] - public SThemeText STextSongLength; + public SThemeText TextSongLength; [XmlElement("StaticCoverBig")] - public SThemeStatic SStaticCoverBig; + public SThemeStatic StaticCoverBig; [XmlElement("StaticTextBG")] - public SThemeStatic SStaticTextBG; + public SThemeStatic StaticTextBG; [XmlElement("StaticDuetIcon")] - public SThemeStatic SStaticDuetIcon; + public SThemeStatic StaticDuetIcon; [XmlElement("StaticVideoIcon")] - public SThemeStatic SStaticVideoIcon; + public SThemeStatic StaticVideoIcon; [XmlElement("StaticMedleyCalcIcon")] - public SThemeStatic SStaticMedleyCalcIcon; + public SThemeStatic StaticMedleyCalcIcon; [XmlElement("StaticMedleyTagIcon")] - public SThemeStatic SStaticMedleyTagIcon; - - public SThemeSongMenuTileBoard(SThemeSongMenuTileBoard theme) - { - NumW = theme.NumW; - NumH = theme.NumH; - NumWsmall = theme.NumWsmall; - NumHsmall = theme.NumHsmall; - SpaceW = theme.SpaceW; - SpaceH = theme.SpaceH; - TileRect = new SRectF(theme.TileRect); - TileRectSmall = new SRectF(theme.TileRectSmall); - STextArtist = new SThemeText(theme.STextArtist); - STextTitle = new SThemeText(theme.STextTitle); - STextSongLength = new SThemeText(theme.STextSongLength); - SStaticCoverBig = new SThemeStatic(theme.SStaticCoverBig); - SStaticTextBG = new SThemeStatic(theme.SStaticTextBG); - SStaticDuetIcon = new SThemeStatic(theme.SStaticDuetIcon); - SStaticVideoIcon = new SThemeStatic(theme.SStaticVideoIcon); - SStaticMedleyCalcIcon = new SThemeStatic(theme.SStaticMedleyCalcIcon); - SStaticMedleyTagIcon = new SThemeStatic(theme.SStaticMedleyTagIcon); - } + public SThemeStatic StaticMedleyTagIcon; } abstract class CSongMenuFramework : ISongMenu diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs index 71d57dc9..3818d35d 100644 --- a/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs +++ b/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs @@ -141,15 +141,15 @@ namespace VocaluxeLib.Menu.SongMenu { _Theme.Name = elementName; - _Theme.SongMenuTileBoard.STextArtist = _Artist.GetTheme(); - _Theme.SongMenuTileBoard.STextSongLength = _SongLength.GetTheme(); - _Theme.SongMenuTileBoard.STextTitle = _Title.GetTheme(); - _Theme.SongMenuTileBoard.SStaticCoverBig = _CoverBig.GetTheme(); - _Theme.SongMenuTileBoard.SStaticDuetIcon = _DuetIcon.GetTheme(); - _Theme.SongMenuTileBoard.SStaticMedleyCalcIcon = _MedleyCalcIcon.GetTheme(); - _Theme.SongMenuTileBoard.SStaticMedleyTagIcon = _MedleyTagIcon.GetTheme(); - _Theme.SongMenuTileBoard.SStaticTextBG = _TextBG.GetTheme(); - _Theme.SongMenuTileBoard.SStaticVideoIcon = _VideoIcon.GetTheme(); + _Theme.SongMenuTileBoard.TextArtist = _Artist.GetTheme(); + _Theme.SongMenuTileBoard.TextSongLength = _SongLength.GetTheme(); + _Theme.SongMenuTileBoard.TextTitle = _Title.GetTheme(); + _Theme.SongMenuTileBoard.StaticCoverBig = _CoverBig.GetTheme(); + _Theme.SongMenuTileBoard.StaticDuetIcon = _DuetIcon.GetTheme(); + _Theme.SongMenuTileBoard.StaticMedleyCalcIcon = _MedleyCalcIcon.GetTheme(); + _Theme.SongMenuTileBoard.StaticMedleyTagIcon = _MedleyTagIcon.GetTheme(); + _Theme.SongMenuTileBoard.StaticTextBG = _TextBG.GetTheme(); + _Theme.SongMenuTileBoard.StaticVideoIcon = _VideoIcon.GetTheme(); LoadTextures(); Init(); @@ -670,15 +670,15 @@ namespace VocaluxeLib.Menu.SongMenu { base.LoadTextures(); - _Artist = new CText(_Theme.SongMenuTileBoard.STextArtist, _PartyModeID); - _Title = new CText(_Theme.SongMenuTileBoard.STextTitle, _PartyModeID); - _SongLength = new CText(_Theme.SongMenuTileBoard.STextSongLength, _PartyModeID); - _CoverBig = new CStatic(_Theme.SongMenuTileBoard.SStaticCoverBig, _PartyModeID); - _TextBG = new CStatic(_Theme.SongMenuTileBoard.SStaticTextBG, _PartyModeID); - _DuetIcon = new CStatic(_Theme.SongMenuTileBoard.SStaticDuetIcon, _PartyModeID); - _VideoIcon = new CStatic(_Theme.SongMenuTileBoard.SStaticVideoIcon, _PartyModeID); - _MedleyCalcIcon = new CStatic(_Theme.SongMenuTileBoard.SStaticMedleyCalcIcon, _PartyModeID); - _MedleyTagIcon = new CStatic(_Theme.SongMenuTileBoard.SStaticMedleyTagIcon, _PartyModeID); + _Artist = new CText(_Theme.SongMenuTileBoard.TextArtist, _PartyModeID); + _Title = new CText(_Theme.SongMenuTileBoard.TextTitle, _PartyModeID); + _SongLength = new CText(_Theme.SongMenuTileBoard.TextSongLength, _PartyModeID); + _CoverBig = new CStatic(_Theme.SongMenuTileBoard.StaticCoverBig, _PartyModeID); + _TextBG = new CStatic(_Theme.SongMenuTileBoard.StaticTextBG, _PartyModeID); + _DuetIcon = new CStatic(_Theme.SongMenuTileBoard.StaticDuetIcon, _PartyModeID); + _VideoIcon = new CStatic(_Theme.SongMenuTileBoard.StaticVideoIcon, _PartyModeID); + _MedleyCalcIcon = new CStatic(_Theme.SongMenuTileBoard.StaticMedleyCalcIcon, _PartyModeID); + _MedleyTagIcon = new CStatic(_Theme.SongMenuTileBoard.StaticMedleyTagIcon, _PartyModeID); Init(); } From c07441bc63e613768f80cdbd44e2329790ef035b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Thu, 18 Sep 2014 15:35:52 +0200 Subject: [PATCH 24/29] Load complete theme-date with de-serialization. --- .../Screens/PartyScreenChallengeConfig.xml | 662 ++- .../Screens/PartyScreenChallengeMain.xml | 3422 +++++++++--- .../Screens/PartyScreenChallengeNames.xml | 879 ++-- .../PartyScreenChallengeMedleyConfig.xml | 662 ++- .../PartyScreenChallengeMedleyMain.xml | 3422 +++++++++--- .../PartyScreenChallengeMedleyNames.xml | 879 ++-- .../Screens/PartyScreenTicTacToeConfig.xml | 868 ++- .../Screens/PartyScreenTicTacToeMain.xml | 2020 ++++--- .../Screens/PartyScreenTicTacToeNames.xml | 879 ++-- .../Screens/PopupScreenPlayerControl.xml | 626 +-- .../Ambient/Screens/PopupScreenServerQR.xml | 412 +- .../Screens/PopupScreenVolumeControl.xml | 193 +- .../Ambient/Screens/ScreenHighscore.xml | 1765 +++---- Output/Themes/Ambient/Screens/ScreenLoad.xml | 168 +- Output/Themes/Ambient/Screens/ScreenMain.xml | 524 +- Output/Themes/Ambient/Screens/ScreenNames.xml | 1919 +++---- .../Themes/Ambient/Screens/ScreenOptions.xml | 535 +- .../Ambient/Screens/ScreenOptionsGame.xml | 1238 ++--- .../Ambient/Screens/ScreenOptionsLyrics.xml | 450 +- .../Ambient/Screens/ScreenOptionsRecord.xml | 1202 ++--- .../Ambient/Screens/ScreenOptionsSound.xml | 861 ++- .../Ambient/Screens/ScreenOptionsTheme.xml | 1496 +++--- .../Ambient/Screens/ScreenOptionsVideo.xml | 1182 ++--- .../Screens/ScreenOptionsVideoAdjustments.xml | 307 +- Output/Themes/Ambient/Screens/ScreenParty.xml | 794 ++- .../Themes/Ambient/Screens/ScreenProfiles.xml | 1581 +++--- Output/Themes/Ambient/Screens/ScreenScore.xml | 4680 +++++++---------- Output/Themes/Ambient/Screens/ScreenSing.xml | 3862 ++++++-------- Output/Themes/Ambient/Screens/ScreenSong.xml | 3039 +++++------ Output/Themes/Ambient/Screens/ScreenTest.xml | 27 +- Vocaluxe/Base/CConfig.cs | 1 + Vocaluxe/Base/CGraphics.cs | 2 + Vocaluxe/Base/CMain.cs | 5 + Vocaluxe/Base/CParty.cs | 7 + VocaluxeLib/IBasic.cs | 2 + VocaluxeLib/Menu/CBackground.cs | 40 - VocaluxeLib/Menu/CButton.cs | 85 +- VocaluxeLib/Menu/CEqualizer.cs | 72 +- VocaluxeLib/Menu/CLyric.cs | 46 +- VocaluxeLib/Menu/CMenu.cs | 225 +- VocaluxeLib/Menu/CNameSelection.cs | 71 - VocaluxeLib/Menu/CParticle.cs | 41 - VocaluxeLib/Menu/CPlaylist.cs | 65 - VocaluxeLib/Menu/CScreenSetting.cs | 16 - VocaluxeLib/Menu/CSelectSlide.cs | 163 - VocaluxeLib/Menu/CStatic.cs | 45 - VocaluxeLib/Menu/CText.cs | 89 +- VocaluxeLib/Menu/IMenuElement.cs | 1 - VocaluxeLib/Menu/SingNotes/CSingNotes.cs | 85 +- .../Menu/SingNotes/CSingNotesClassic.cs | 3 + VocaluxeLib/Menu/SongMenu/CSongMenu.cs | 17 +- .../Menu/SongMenu/CSongMenuFramework.cs | 42 - .../Menu/SongMenu/CSongMenuTileBoard.cs | 56 +- VocaluxeLib/PartyModes/CPartyMode.cs | 6 + VocaluxeLib/PartyModes/IPartyMode.cs | 1 + 55 files changed, 19978 insertions(+), 21762 deletions(-) diff --git a/Output/PartyModes/Challenge/Screens/PartyScreenChallengeConfig.xml b/Output/PartyModes/Challenge/Screens/PartyScreenChallengeConfig.xml index 1623eba7..a05153de 100644 --- a/Output/PartyModes/Challenge/Screens/PartyScreenChallengeConfig.xml +++ b/Output/PartyModes/Challenge/Screens/PartyScreenChallengeConfig.xml @@ -1,458 +1,388 @@ - - + + + PartyScreenChallengeConfig 1 - - + + + Video - + - BG_Default - - - BackgroundColor - - - + + BackgroundColor + + + + + Menu - - 40 - 40 - 0,00 - 1200 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 40 + 40 + 1200 + 50 + 0 + + + + + + 640 48 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - - Center - + Center - Outline - TR_SCREENCONFIG_TITLE - - - - - - + + + 75 105 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - - Center - + Center - Outline - TR_SCREENCONFIG_NUMPLAYERS - - - - - - + + + 75 165 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - - Center - + Center - Outline - TR_SCREENCONFIG_NUMMICS - - - - - - + + + 75 225 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - - Center - + Center - Outline - TR_SCREENCONFIG_NUMROUNDS - - - - - - + + + + + + + + + + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 100 - 0,00 - 700 - 50 - - 505 - 105 - 0,00 - 40 - 40 - - 1170 - 105 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - 205,33 - + + 500 + 100 + 700 + 50 + 0 + + + 505 + 105 + 40 + 40 + 0 + + + 1170 + 105 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 9 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 160 - 0,00 - 700 - 50 - - 505 - 165 - 0,00 - 40 - 40 - - 1170 - 165 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - 205,33 - + + 500 + 160 + 700 + 50 + 0 + + + 505 + 165 + 40 + 40 + 0 + + + 1170 + 165 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 2 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 220 - 0,00 - 700 - 50 - - 505 - 225 - 0,00 - 40 - 40 - - 1170 - 225 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - 205,33 - + + 500 + 220 + 700 + 50 + 0 + + + 505 + 225 + 40 + 40 + 0 + + + 1170 + 225 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 10 - - - + + + + + + + + + \ No newline at end of file diff --git a/Output/PartyModes/Challenge/Screens/PartyScreenChallengeMain.xml b/Output/PartyModes/Challenge/Screens/PartyScreenChallengeMain.xml index 45a1eed7..61ef56e8 100644 --- a/Output/PartyModes/Challenge/Screens/PartyScreenChallengeMain.xml +++ b/Output/PartyModes/Challenge/Screens/PartyScreenChallengeMain.xml @@ -1,985 +1,2791 @@ - - + + + PartyScreenChallengeMain 1 - - + + + Video - + - BG_Default - - - BackgroundColor - - - + + BackgroundColor + + + + + Menu - - 40 - 40 - 0,00 - 1200 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 40 + 40 + 1200 + 50 + 0 + + + + PopupBG - - 0 - 0 - -1,00 - 1280 - 720 - - - StaticColor - - - - - - + + StaticColor + + + 0 + 0 + 1280 + 720 + -1 + + + + Invisible - - 0 - 0 - 0,00 - 100 - 100 - - - StaticColor - - - - - - + + StaticColor + + + 0 + 0 + 100 + 100 + 0 + + + + + + + 0 + 0 + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 0 + + + + + + 640 48 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - - Center - + Center - Outline - TR_SCREENMAIN_TITLE - - - - - - - 640 - 515 - - 0,00 - - 27 - - - - StaticColor - - - TextSColor - - Center - - Center - - - - Outline - - TR_SCREENMAIN_NEXT_PLAYER - - - - - - - 640 - 520 - - 0,00 - - 44 - - - - StaticColor - - - TextSColor - - Center - - Center - - - - Outline - - TR_SCREENMAIN_FINISH - - - - - - - 640 - 575 - - 0,00 - - 31 - - 770 - - - StaticColor - - - TextSColor - - Center - - Center - - - - Outline - - - - - - - - + + + 40 102 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Right - - Center - + Center - Outline - TR_SCREENMAIN_TABLE_POS - - - - - - + + + 50 102 - - 0,00 - + 0 27 - 130 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Left - - Center - + Center - Outline - TR_SCREENMAIN_TABLE_PLAYERNAME - - - - - - + + + 260 102 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Right - - Center - + Center - Outline - TR_SCREENMAIN_TABLE_NUMPLAYED - - - - - - + + + 340 102 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Right - - Center - + Center - Outline - TR_SCREENMAIN_TABLE_WON - - - - - - + + + 490 102 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Right - - Center - + Center - Outline - TR_SCREENMAIN_TABLE_SINGPOINTS - - - - - - + + + 590 102 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Right - - Center - + Center - Outline - TR_SCREENMAIN_TABLE_GAMEPOINTS - - - - - - + + + 0 0 - - 0,00 - + 0 27 - 100 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - - Center - + Center - Outline - - - - - - - - 0 - 0 - - 0,00 - - 27 - - - - StaticColor - - - TextSColor - - Center - - Center - - - - Outline - - - - - - - - - 660 - 102 - - 0,00 - - 27 - - - - StaticColor - - - TextSColor - - Right - - Center - - - - Outline - - - - - - - - - 0 - 0 - - 0,00 - - 27 - - - - StaticColor - - - TextSColor - - Center - - Center - - - - Outline - - - - - - - - + + + 640 265 - - -1,01 - + -1.01 27 - 380 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - - Center - + Center - Outline - TR_SCREENMAIN_POPUP_REALLYEXIT - - - - - - + + + + 660 + 102 + 0 + 27 + 0 + + StaticColor + + + TextSColor + + Right + Center + + Outline + + + + + 0 + 0 + 0 + 27 + 0 + + StaticColor + + + TextSColor + + Center + Center + + Outline + + + + + 0 + 0 + 0 + 27 + 0 + + StaticColor + + + TextSColor + + Center + Center + + Outline + + + + + 640 + 520 + 0 + 44 + 0 + + StaticColor + + + TextSColor + + Center + Center + + Outline + TR_SCREENMAIN_FINISH + + + + 640 + 575 + 0 + 31 + 770 + + StaticColor + + + TextSColor + + Center + Center + + Outline + + + + + 640 + 515 + 0 + 27 + 0 + + StaticColor + + + TextSColor + + Center + Center + + Outline + TR_SCREENMAIN_NEXT_PLAYER + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + 1. + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_PLAYERNAME + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_NUMPLAYED + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_WON + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_SINGPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_GAMEPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + 2. + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_PLAYERNAME + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_NUMPLAYED + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_WON + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_SINGPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_GAMEPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + 3. + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_PLAYERNAME + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_NUMPLAYED + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_WON + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_SINGPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_GAMEPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + 4. + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_PLAYERNAME + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_NUMPLAYED + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_WON + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_SINGPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_GAMEPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + 5. + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_PLAYERNAME + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_NUMPLAYED + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_WON + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_SINGPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_GAMEPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + 6. + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_PLAYERNAME + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_NUMPLAYED + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_WON + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_SINGPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_GAMEPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + 7. + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_PLAYERNAME + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_NUMPLAYED + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_WON + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_SINGPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_GAMEPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + 8. + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_PLAYERNAME + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_NUMPLAYED + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_WON + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_SINGPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_GAMEPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + 9. + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_PLAYERNAME + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_NUMPLAYED + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_WON + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_SINGPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_GAMEPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + 10. + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_PLAYERNAME + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_NUMPLAYED + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_WON + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_SINGPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_GAMEPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Output/PartyModes/Challenge/Screens/PartyScreenChallengeNames.xml b/Output/PartyModes/Challenge/Screens/PartyScreenChallengeNames.xml index 1715fc94..c313e501 100644 --- a/Output/PartyModes/Challenge/Screens/PartyScreenChallengeNames.xml +++ b/Output/PartyModes/Challenge/Screens/PartyScreenChallengeNames.xml @@ -1,607 +1,504 @@ - - + + + PartyScreenChallengeNames 1 - - + + + Video - + - BG_Default - - - BackgroundColor - - - + + BackgroundColor + + + + + Menu - - 40 - 40 - 0,00 - 1200 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 40 + 40 + 1200 + 50 + 0 + + + + + + 640 48 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - - Center - + Center - Outline - TR_SCREENNAMES_TITLE - - - - - - + + + + + + + + + + + + + + + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 40 - 100 - 0,00 - 1200 - 50 - - 45 - 105 - 0,00 - 40 - 40 - - 1170 - 105 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 205,33 - + + 40 + 100 + 1200 + 50 + 0 + + + 45 + 105 + 40 + 40 + 0 + + + 1170 + 105 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 2 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlidePlayer - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlidePlayer - - 40 - 160 - 0,00 - 1200 - 150 - - 45 - 210 - 0,00 - 40 - 40 - - 1170 - 210 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - -5,00 - - 205,33 - + + 40 + 160 + 1200 + 150 + 0 + + + 45 + 210 + 40 + 40 + 0 + + + 1170 + 210 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + -5 + 205.33 Outline - Bold - 8 - - - - 42 - 327 - 0,00 - 1200 - 393 - + + + + + + + 42 + 327 + 1200 + 393 + 0 + CoverTile - - - 1,00 - 1,00 - 1,00 - 0,20 - + PlayerSelector - - 100 100 - 10 2 - - 20,71 - 30,00 - + 20.71 + 30 - - 2,0 - - Outline - - TextColor - - - + 2 17 + Outline + + + TextColor + - - + + + + + + \ No newline at end of file diff --git a/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyConfig.xml b/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyConfig.xml index 31c764e5..b189de6e 100644 --- a/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyConfig.xml +++ b/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyConfig.xml @@ -1,458 +1,388 @@ - - + + + PartyScreenChallengeMedleyConfig 1 - - + + + Video - + - BG_Default - - - BackgroundColor - - - + + BackgroundColor + + + + + Menu - - 40 - 40 - 0,00 - 1200 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 40 + 40 + 1200 + 50 + 0 + + + + + + 640 48 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - - Center - + Center - Outline - TR_SCREENCONFIG_TITLE - - - - - - + + + 75 105 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - - Center - + Center - Outline - TR_SCREENCONFIG_NUMPLAYERS - - - - - - + + + 75 165 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - - Center - + Center - Outline - TR_SCREENCONFIG_NUMMICS - - - - - - + + + 75 225 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - - Center - + Center - Outline - TR_SCREENCONFIG_NUMROUNDS - - - - - - + + + + + + + + + + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 100 - 0,00 - 700 - 50 - - 505 - 105 - 0,00 - 40 - 40 - - 1170 - 105 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - 205,33 - + + 500 + 100 + 700 + 50 + 0 + + + 505 + 105 + 40 + 40 + 0 + + + 1170 + 105 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 9 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 160 - 0,00 - 700 - 50 - - 505 - 165 - 0,00 - 40 - 40 - - 1170 - 165 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - 205,33 - + + 500 + 160 + 700 + 50 + 0 + + + 505 + 165 + 40 + 40 + 0 + + + 1170 + 165 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 2 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 220 - 0,00 - 700 - 50 - - 505 - 225 - 0,00 - 40 - 40 - - 1170 - 225 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - 205,33 - + + 500 + 220 + 700 + 50 + 0 + + + 505 + 225 + 40 + 40 + 0 + + + 1170 + 225 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 10 - - - + + + + + + + + + \ No newline at end of file diff --git a/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyMain.xml b/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyMain.xml index ca6ca079..6b73bf10 100644 --- a/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyMain.xml +++ b/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyMain.xml @@ -1,985 +1,2791 @@ - - + + + PartyScreenChallengeMedleyMain 1 - - + + + Video - + - BG_Default - - - BackgroundColor - - - + + BackgroundColor + + + + + Menu - - 40 - 40 - 0,00 - 1200 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 40 + 40 + 1200 + 50 + 0 + + + + PopupBG - - 0 - 0 - -1,00 - 1280 - 720 - - - StaticColor - - - - - - + + StaticColor + + + 0 + 0 + 1280 + 720 + -1 + + + + Invisible - - 0 - 0 - 0,00 - 100 - 100 - - - StaticColor - - - - - - + + StaticColor + + + 0 + 0 + 100 + 100 + 0 + + + + + + + 0 + 0 + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 0 + + + + + + 640 48 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - - Center - + Center - Outline - TR_SCREENMAIN_TITLE - - - - - - - 640 - 515 - - 0,00 - - 27 - - - - StaticColor - - - TextSColor - - Center - - Center - - - - Outline - - TR_SCREENMAIN_NEXT_PLAYER - - - - - - - 640 - 520 - - 0,00 - - 44 - - - - StaticColor - - - TextSColor - - Center - - Center - - - - Outline - - TR_SCREENMAIN_FINISH - - - - - - - 640 - 575 - - 0,00 - - 31 - - 770 - - - StaticColor - - - TextSColor - - Center - - Center - - - - Outline - - - - - - - - + + + 40 102 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Right - - Center - + Center - Outline - TR_SCREENMAIN_TABLE_POS - - - - - - + + + 50 102 - - 0,00 - + 0 27 - 130 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Left - - Center - + Center - Outline - TR_SCREENMAIN_TABLE_PLAYERNAME - - - - - - + + + 260 102 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Right - - Center - + Center - Outline - TR_SCREENMAIN_TABLE_NUMPLAYED - - - - - - + + + 340 102 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Right - - Center - + Center - Outline - TR_SCREENMAIN_TABLE_WON - - - - - - + + + 490 102 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Right - - Center - + Center - Outline - TR_SCREENMAIN_TABLE_SINGPOINTS - - - - - - + + + 590 102 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Right - - Center - + Center - Outline - TR_SCREENMAIN_TABLE_GAMEPOINTS - - - - - - + + + 0 0 - - 0,00 - + 0 27 - 100 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - - Center - + Center - Outline - - - - - - - - 0 - 0 - - 0,00 - - 27 - - - - StaticColor - - - TextSColor - - Center - - Center - - - - Outline - - - - - - - - - 660 - 102 - - 0,00 - - 27 - - - - StaticColor - - - TextSColor - - Right - - Center - - - - Outline - - - - - - - - - 0 - 0 - - 0,00 - - 27 - - - - StaticColor - - - TextSColor - - Center - - Center - - - - Outline - - - - - - - - + + + 640 265 - - -1,01 - + -1.01 27 - 380 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - - Center - + Center - Outline - TR_SCREENMAIN_POPUP_REALLYEXIT - - - - - - + + + + 660 + 102 + 0 + 27 + 0 + + StaticColor + + + TextSColor + + Right + Center + + Outline + + + + + 0 + 0 + 0 + 27 + 0 + + StaticColor + + + TextSColor + + Center + Center + + Outline + + + + + 0 + 0 + 0 + 27 + 0 + + StaticColor + + + TextSColor + + Center + Center + + Outline + + + + + 640 + 520 + 0 + 44 + 0 + + StaticColor + + + TextSColor + + Center + Center + + Outline + TR_SCREENMAIN_FINISH + + + + 640 + 575 + 0 + 31 + 770 + + StaticColor + + + TextSColor + + Center + Center + + Outline + + + + + 640 + 515 + 0 + 27 + 0 + + StaticColor + + + TextSColor + + Center + Center + + Outline + TR_SCREENMAIN_NEXT_PLAYER + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + 1. + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_PLAYERNAME + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_NUMPLAYED + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_WON + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_SINGPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_GAMEPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + 2. + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_PLAYERNAME + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_NUMPLAYED + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_WON + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_SINGPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_GAMEPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + 3. + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_PLAYERNAME + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_NUMPLAYED + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_WON + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_SINGPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_GAMEPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + 4. + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_PLAYERNAME + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_NUMPLAYED + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_WON + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_SINGPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_GAMEPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + 5. + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_PLAYERNAME + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_NUMPLAYED + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_WON + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_SINGPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_GAMEPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + 6. + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_PLAYERNAME + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_NUMPLAYED + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_WON + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_SINGPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_GAMEPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + 7. + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_PLAYERNAME + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_NUMPLAYED + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_WON + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_SINGPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_GAMEPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + 8. + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_PLAYERNAME + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_NUMPLAYED + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_WON + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_SINGPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_GAMEPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + 9. + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_PLAYERNAME + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_NUMPLAYED + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_WON + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_SINGPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_GAMEPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + 10. + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_PLAYERNAME + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_NUMPLAYED + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_WON + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_SINGPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + TR_SCREENMAIN_TABLE_GAMEPOINTS + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + 0 + 0 + 0 + 0 + 0 + + + Left + Top + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyNames.xml b/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyNames.xml index e6236e97..d915c146 100644 --- a/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyNames.xml +++ b/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyNames.xml @@ -1,607 +1,504 @@ - - + + + PartyScreenChallengeMedleyNames 1 - - + + + Video - + - BG_Default - - - BackgroundColor - - - + + BackgroundColor + + + + + Menu - - 40 - 40 - 0,00 - 1200 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 40 + 40 + 1200 + 50 + 0 + + + + + + 640 48 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - - Center - + Center - Outline - TR_SCREENNAMES_TITLE - - - - - - + + + + + + + + + + + + + + + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 40 - 100 - 0,00 - 1200 - 50 - - 45 - 105 - 0,00 - 40 - 40 - - 1170 - 105 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 205,33 - + + 40 + 100 + 1200 + 50 + 0 + + + 45 + 105 + 40 + 40 + 0 + + + 1170 + 105 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 2 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlidePlayer - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlidePlayer - - 40 - 160 - 0,00 - 1200 - 150 - - 45 - 210 - 0,00 - 40 - 40 - - 1170 - 210 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - -5,00 - - 205,33 - + + 40 + 160 + 1200 + 150 + 0 + + + 45 + 210 + 40 + 40 + 0 + + + 1170 + 210 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + -5 + 205.33 Outline - Bold - 8 - - - - 42 - 327 - 0,00 - 1200 - 393 - + + + + + + + 42 + 327 + 1200 + 393 + 0 + CoverTile - - - 1,00 - 1,00 - 1,00 - 0,20 - + PlayerSelector - - 100 100 - 10 2 - - 20,71 - 30,00 - + 20.71 + 30 - - 2,0 - - Outline - - TextColor - - - + 2 17 + Outline + + + TextColor + - - + + + + + + \ No newline at end of file diff --git a/Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeConfig.xml b/Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeConfig.xml index ab0ac65f..fbcd05f5 100644 --- a/Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeConfig.xml +++ b/Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeConfig.xml @@ -1,588 +1,504 @@ - - + + + PartyScreenTicTacToeConfig 1 - - + + + Video - + - BG_Default - - - BackgroundColor - - - + + BackgroundColor + + + + + Menu - - 40 - 40 - 0,00 - 1200 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 40 + 40 + 1200 + 50 + 0 + + + + + + 640 48 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - - Center - + Center - Outline - TR_SCREENCONFIG_TITLE - - - - - - + + + 75 105 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - - Center - + Center - Outline - TR_SCREENCONFIG_NUMFIELDS - - - - - - + + + 75 165 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - - Center - + Center - Outline - TR_SCREENCONFIG_SONGSOURCE - - - - - - + + + 75 285 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - - Center - + Center - Outline - TR_SCREENCONFIG_GAMEMODE - - - - - - + + + + + + + + + + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 100 - 0,00 - 700 - 50 - - 505 - 105 - 0,00 - 40 - 40 - - 1170 - 105 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - 205,33 - + + 500 + 100 + 700 + 50 + 0 + + + 505 + 105 + 40 + 40 + 0 + + + 1170 + 105 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 3 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 160 - 0,00 - 700 - 50 - - 505 - 165 - 0,00 - 40 - 40 - - 1170 - 165 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - 205,33 - + + 500 + 160 + 700 + 50 + 0 + + + 505 + 165 + 40 + 40 + 0 + + + 1170 + 165 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 3 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 220 - 0,00 - 700 - 50 - - 505 - 225 - 0,00 - 40 - 40 - - 1170 - 225 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - 205,33 - + + 500 + 220 + 700 + 50 + 0 + + + 505 + 225 + 40 + 40 + 0 + + + 1170 + 225 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 1 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 220 - 0,00 - 700 - 50 - - 505 - 225 - 0,00 - 40 - 40 - - 1170 - 225 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - 205,33 - + + 500 + 220 + 700 + 50 + 0 + + + 505 + 225 + 40 + 40 + 0 + + + 1170 + 225 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 1 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 280 - 0,00 - 700 - 50 - - 505 - 285 - 0,00 - 40 - 40 - - 1170 - 285 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - 205,33 - + + 500 + 280 + 700 + 50 + 0 + + + 505 + 285 + 40 + 40 + 0 + + + 1170 + 285 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 1 - - - + + + + + + + + + \ No newline at end of file diff --git a/Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeMain.xml b/Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeMain.xml index 61e5e3a3..3dd79eae 100644 --- a/Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeMain.xml +++ b/Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeMain.xml @@ -1,844 +1,1386 @@ - - + + + PartyScreenTicTacToeMain 1 - - + + + Video - + - BG_Default - - - BackgroundColor - - - + + BackgroundColor + + + + + Menu - - 40 - 40 - 0,00 - 1200 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 40 + 40 + 1200 + 50 + 0 + + + + PopupBG - - 0 - 0 - -2,00 - 1280 - 720 - - - StaticColor - - - - - - + + StaticColor + + + 0 + 0 + 1280 + 720 + -2 + + + + PopupBG - - 10 - 200 - -1,00 - 100 - 100 - - - StaticColor - - - - - - + + StaticColor + + + 10 + 200 + 100 + 100 + -1 + + + + PopupBG - - 1170 - 200 - -1,00 - 100 - 100 - - - StaticColor - - - - - - + + StaticColor + + + 1170 + 200 + 100 + 100 + -1 + + + + + + 640 48 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - - Center - + Center - Outline - TR_SCREENMAIN_TITLE - - - - - - - 160 - 150 - - 0,00 - - 35 - - - - Player1 - - - TextSColor - - Center - - Center - - - - Outline - - TR_SCREENMAIN_NEXT_PLAYER - - - - - - - 1120 - 150 - - 0,00 - - 35 - - - - Player2 - - - TextSColor - - Center - - Center - - - - Outline - - TR_SCREENMAIN_NEXT_PLAYER - - - - - - - 120 - 230 - - 0,00 - - 35 - - - - Player1 - - - TextSColor - - Left - - Center - - - - Outline - - - - - - - - - 1160 - 230 - - 0,00 - - 40 - - - - Player2 - - - TextSColor - - Right - - Center - - - - Outline - - - - - - - - - 640 - 90 - - 0,00 - - 35 - - - - StaticColor - - - TextSColor - - Center - - Center - - - - Outline - - - - - - - - - 640 - 90 - - 0,00 - - 35 - - - - StaticColor - - - TextSColor - - Center - - Center - - - - Outline - - - - - - - - + + + 640 265 - - -2,01 - + -2.01 27 - 380 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - - Center - + Center - Outline - TR_SCREENMAIN_POPUP_REALLYEXIT - - - - - - - Random - - Random - - 10 - 320 - 0,00 - 100 - 100 - - - Player1Dim - - - Player1 - - - 50 - 25 - - 50 - - 50 - - - ButtonTextColor - - - ButtonTextSColor - - Center - - Center - - - - Outline - - - - - - - - - - - - - Random - - Random - - 1170 - 320 - 0,00 - 100 - 100 - - - Player2Dim - - - Player2 - - - 50 - 25 - - 50 - - 50 - - - ButtonTextColor - - - ButtonTextSColor - - Center - - Center - - - - Outline - - - - - - - - - - - - - RepeatIcon - - RepeatIcon - - 110 - 320 - 0,00 - 100 - 100 - - - Player1Dim - - - Player1 - - - 48 - 25 - - 50 - - 50 - - - ButtonTextColor - - - ButtonTextSColor - - Center - - Center - - - - Outline - - - - - - - - - - - - - RepeatIcon - - RepeatIcon - - 1070 - 320 - 0,00 - 100 - 100 - - - Player2Dim - - - Player2 - - - 48 - 25 - - 50 - - 50 - - - ButtonTextColor - - - ButtonTextSColor - - Center - - Center - - - - Outline - - - - - - - - - - - - + + + + 640 + 90 + 0 + 35 + 0 + + StaticColor + + + TextSColor + + Center + Center + + Outline + + + + + 640 + 90 + 0 + 35 + 0 + + StaticColor + + + TextSColor + + Center + Center + + Outline + + + + + 160 + 150 + 0 + 35 + 0 + + Player1 + + + TextSColor + + Center + Center + + Outline + TR_SCREENMAIN_NEXT_PLAYER + + + + 1120 + 150 + 0 + 35 + 0 + + Player2 + + + TextSColor + + Center + Center + + Outline + TR_SCREENMAIN_NEXT_PLAYER + + + + 120 + 230 + 0 + 35 + 0 + + Player1 + + + TextSColor + + Left + Center + + Outline + + + + + 1160 + 230 + 0 + 40 + 0 + + Player2 + + + TextSColor + + Right + Center + + Outline + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeNames.xml b/Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeNames.xml index a968b115..66533730 100644 --- a/Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeNames.xml +++ b/Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeNames.xml @@ -1,607 +1,504 @@ - - + + + PartyScreenTicTacToeNames 1 - - + + + Video - + - BG_Default - - - BackgroundColor - - - + + BackgroundColor + + + + + Menu - - 40 - 40 - 0,00 - 1200 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 40 + 40 + 1200 + 50 + 0 + + + + + + 640 48 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - - Center - + Center - Outline - TR_SCREENNAMES_TITLE - - - - - - + + + + + + + + + + + + + + + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 40 - 100 - 0,00 - 1100 - 50 - - 45 - 105 - 0,00 - 40 - 40 - - 1050 - 105 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 205,33 - + + 40 + 100 + 1100 + 50 + 0 + + + 45 + 105 + 40 + 40 + 0 + + + 1050 + 105 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 2 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlidePlayer - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlidePlayer - - 40 - 160 - 0,00 - 1100 - 150 - - 45 - 210 - 0,00 - 40 - 40 - - 1050 - 210 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - -5,00 - - 205,33 - + + 40 + 160 + 1100 + 150 + 0 + + + 45 + 210 + 40 + 40 + 0 + + + 1050 + 210 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + -5 + 205.33 Outline - Bold - 8 - - - - 42 - 327 - 0,00 - 1200 - 393 - + + + + + + + 42 + 327 + 1200 + 393 + 0 + CoverTile - - - 1,00 - 1,00 - 1,00 - 0,20 - + PlayerSelector - - 100 100 - 10 2 - - 20,71 - 30,00 - + 20.71 + 30 - - 2,0 - - Outline - - TextColor - - - + 2 17 + Outline + + + TextColor + - - + + + + + + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml b/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml index 316d8257..e8125613 100644 --- a/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml +++ b/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml @@ -1,460 +1,382 @@ - - - + + + + PopupScreenPlayerControl 1 - - + + + + Menu - - 49 - 0 - 0,00 - 1181 - 42 - - - StaticColor - - - - - - + + StaticColor + + + 49 + 0 + 1181 + 42 + 0 + + + + CoverBackground - - 55 - 2 - 0,00 - 38 - 38 - - - Visible - - - - - - + + Visible + + + 55 + 2 + 38 + 38 + 0 + + + + + + 410 8 - - 0,00 - + 0 27 - 769 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/PopupScreenServerQR.xml b/Output/Themes/Ambient/Screens/PopupScreenServerQR.xml index cc082e9c..79364004 100644 --- a/Output/Themes/Ambient/Screens/PopupScreenServerQR.xml +++ b/Output/Themes/Ambient/Screens/PopupScreenServerQR.xml @@ -1,315 +1,237 @@ - - - + + + + PopupScreenServerQR 1 - - + + + + SongMenuBG - - 0 - 0 - -1,99 - 1280 - 720 - - - 1,00 - 1,00 - 1,00 - 0,80 - - - - - - + + + 0 + 0 + 1280 + 720 + -1.99 + + + + Menu - - 490 - 210 - -2,00 - 300 - 300 - - - Visible - - - - - - + + Visible + + + 490 + 210 + 300 + 300 + -2 + + + + Menu - - 25 - 25 - -2,00 - 200 - 200 - - - Visible - - - - - - + + Visible + + + 25 + 25 + 200 + 200 + -2 + + + + Menu - - 1055 - 25 - -2,00 - 200 - 200 - - - Visible - - - - - - + + Visible + + + 1055 + 25 + 200 + 200 + -2 + + + + Menu - - 25 - 495 - -2,00 - 200 - 200 - - - Visible - - - - - - + + Visible + + + 25 + 495 + 200 + 200 + -2 + + + + Menu - - 1055 - 495 - -2,00 - 200 - 200 - - - Visible - - - - - - + + Visible + + + 1055 + 495 + 200 + 200 + -2 + + + + + + 640 180 - - -2,00 - + -2 35 - 300 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - TR_SCREENPSERVERQR_ADDRESS - - - - - - + + + 125 230 - - -2,00 - + -2 27 - 200 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 1155 230 - - -2,00 - + -2 27 - 200 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 125 460 - - -2,00 - + -2 27 - 200 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 1155 460 - - -2,00 - + -2 27 - 200 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 640 515 - - -2,00 - + -2 35 - 300 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 640 265 - - -2,00 - + -2 45 - 600 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - TR_SCREENPSERVERQR_NOTRUNNING - - - - - - \ No newline at end of file + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml b/Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml index 5457c45b..cf00cb9c 100644 --- a/Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml +++ b/Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml @@ -1,121 +1,114 @@ - - - + + + + PopupScreenVolumeControl 1 - - + + + + Menu - - 1065 - 672 - -2,00 - 225 - 48 - - - StaticColor - - - - - - + + StaticColor + + + 1065 + 672 + 225 + 48 + -2 + + + + + + 1067 682 - - -2,00 - + -2 27 - 80 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENPVOLUMECONTROL_VOLUME - - - - - - + + + + + + + + Invisible - Minus - Plus - Invisible - Minus - Plus - Invisible - - 1090 - 680 - -2,00 - 200 - 50 - - 1195 - 682 - -2,00 - 30 - 30 - - 1240 - 682 - -2,00 - 30 - 30 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - -15,00 - - -8,00 - - 500,00 - + + 1090 + 680 + 200 + 50 + -2 + + + 1195 + 682 + 30 + 30 + -2 + + + 1240 + 682 + 30 + 30 + -2 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + -15 + -8 + 500 Outline - Bold - 1 - - - \ No newline at end of file + + + + + + + + + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenHighscore.xml b/Output/Themes/Ambient/Screens/ScreenHighscore.xml index 7a23fa79..41d2d61c 100644 --- a/Output/Themes/Ambient/Screens/ScreenHighscore.xml +++ b/Output/Themes/Ambient/Screens/ScreenHighscore.xml @@ -1,1487 +1,1038 @@ - - - + + + + ScreenHighscore 2 - - + + + Video - + - BG_Default - - - - BackgroundColor - - - + + BackgroundColor + + + + + Menu - - 40 - 40 - 0,00 - 1200 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 40 + 40 + 1200 + 50 + 0 + + + + TextBG - - 50 - 90 - 0,00 - 1180 - 610 - - - Invisible - - - - - - + + Invisible + + + 50 + 90 + 1180 + 610 + 0 + + + + + + 60 50 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENHIGHSCORE_HIGHSCORE - - - - - - + + + 640 50 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 1220 50 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Right - Center - - Outline - TR_GAMEMODE_NORMAL - - - - - - + + + 120 103 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Right - Center - - Outline - - - - - - - + + + 120 160 - - 0,00 - + 0 42 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Right - Center - - Outline - - - - - - - + + + 120 223 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Right - Center - - Outline - - - - - - - + + + 120 283 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Right - Center - - Outline - - - - - - - + + + 120 343 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Right - Center - - Outline - - - - - - - + + + 120 403 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Right - Center - - Outline - - - - - - - + + + 120 463 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Right - Center - - Outline - - - - - - - + + + 120 523 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Right - Center - - Outline - - - - - - - + + + 120 583 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Right - Center - - Outline - - - - - - - + + + 120 643 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Right - Center - - Outline - - - - - - - + + + 200 103 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 200 163 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 200 223 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 200 283 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 200 343 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 200 403 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 200 463 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 200 523 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 200 583 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 200 643 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 800 103 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 800 163 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 800 223 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 800 283 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 800 343 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 800 403 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 800 463 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 800 523 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 800 583 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 800 643 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 1000 103 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 1000 163 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 1000 223 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 1000 283 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 1000 343 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 1000 403 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 1000 463 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 1000 523 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 1000 583 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 1000 643 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + + + + + + + + + + + Star - - 80 - 100 - 1,00 - 1080 - 35 - - - StaticColor - + + 80 + 100 + 1080 + 35 + 1 + + + StaticColor + Star - - 25,00 - + 25 250 - - - + + Star - - 80 - 160 - 1,00 - 1080 - 35 - - - StaticColor - + + 80 + 160 + 1080 + 35 + 1 + + + StaticColor + Star - - 25,00 - + 25 250 - - - + + Star - - 80 - 220 - 1,00 - 1080 - 35 - - - StaticColor - + + 80 + 220 + 1080 + 35 + 1 + + + StaticColor + Star - - 25,00 - + 25 250 - - - + + Star - - 80 - 280 - 1,00 - 1080 - 35 - - - StaticColor - + + 80 + 280 + 1080 + 35 + 1 + + + StaticColor + Star - - 25,00 - + 25 250 - - - + + Star - - 80 - 340 - 1,00 - 1080 - 35 - - - StaticColor - + + 80 + 340 + 1080 + 35 + 1 + + + StaticColor + Star - - 25,00 - + 25 250 - - - + + Star - - 80 - 400 - 1,00 - 1080 - 35 - - - StaticColor - + + 80 + 400 + 1080 + 35 + 1 + + + StaticColor + Star - - 25,00 - + 25 250 - - - + + Star - - 80 - 460 - 1,00 - 1080 - 35 - - - StaticColor - + + 80 + 460 + 1080 + 35 + 1 + + + StaticColor + Star - - 25,00 - + 25 250 - - - + + Star - - 80 - 520 - 1,00 - 1080 - 35 - - - StaticColor - + + 80 + 520 + 1080 + 35 + 1 + + + StaticColor + Star - - 25,00 - + 25 250 - - - + + Star - - 80 - 580 - 1,00 - 1080 - 35 - - - StaticColor - + + 80 + 580 + 1080 + 35 + 1 + + + StaticColor + Star - - 25,00 - + 25 250 - - - + + Star - - 80 - 640 - 1,00 - 1080 - 35 - - - StaticColor - + + 80 + 640 + 1080 + 35 + 1 + + + StaticColor + Star - - 25,00 - + 25 250 - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenLoad.xml b/Output/Themes/Ambient/Screens/ScreenLoad.xml index a3733f8e..7d31a98a 100644 --- a/Output/Themes/Ambient/Screens/ScreenLoad.xml +++ b/Output/Themes/Ambient/Screens/ScreenLoad.xml @@ -1,121 +1,103 @@ - - - + + + + ScreenLoad 2 - - + + + Texture - + - BG_Default - - - - BackgroundColor - - - + + BackgroundColor + + + + + Menu - - 50 - 644 - 0,00 - 1195 - 50 - - - Invisible - - - - - - + + Invisible + + + 50 + 644 + 1195 + 50 + 0 + + + + + + 60 655 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENLOAD_LOADING - - - - - - + + + 240 655 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - - + Gesamt: 168 Lieder (168 geladen) + + + 640 305 - - 0,00 - + 0 101 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - TR_PROGRAM_NAME - - - - - - \ No newline at end of file + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenMain.xml b/Output/Themes/Ambient/Screens/ScreenMain.xml index 096e9162..f1701971 100644 --- a/Output/Themes/Ambient/Screens/ScreenMain.xml +++ b/Output/Themes/Ambient/Screens/ScreenMain.xml @@ -1,394 +1,324 @@ - - - + + + + ScreenMain 2 - - + + + Video - + - BG_Default - - - - BackgroundColor - - - + + BackgroundColor + + + + + Menu - - 49 - 32 - 0,00 - 1181 - 50 - - - Invisible - - - - - - + + Invisible + + + 49 + 32 + 1181 + 50 + 0 + + + + TextBG - - 150 - 610 - -1,90 - 355 - 30 - - - StaticWarningColor - - - - - - + + StaticWarningColor + + + 150 + 610 + 355 + 30 + -1.9 + + + + + + 10 690 - - -1,00 - + -1 15 - - - - TextWhite - - - TextWhite - + 0 + + TextWhite + + + TextWhite + Left - Center - - Normal - - - - - - - - + Vocaluxe "Shining Heaven" v0.3.0 (x64) Beta (0083) + + + 320 612 - - -2,00 - + -2 27 - 355 - - - TextWarningColor - - - TextWarningColor - + + TextWarningColor + + + TextWarningColor + Center - Center - - Outline - TR_SCREENMAIN_TEXT_NOPROFILES - - - - - - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenNames.xml b/Output/Themes/Ambient/Screens/ScreenNames.xml index 7b8f6b31..b2820751 100644 --- a/Output/Themes/Ambient/Screens/ScreenNames.xml +++ b/Output/Themes/Ambient/Screens/ScreenNames.xml @@ -1,1309 +1,1068 @@ - - - + + + + ScreenNames 3 - - + + + Video - + - BG_Options - - - - BackgroundColor - - - + + BackgroundColor + + + + + Menu - - 40 - 40 - 0,00 - 1200 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 40 + 40 + 1200 + 50 + 0 + + + + Invisible - - 20 - 105 - -3,00 - 108 - 108 - - - Visible - - - - - - + + Visible + + + 20 + 105 + 108 + 108 + -3 + + + + Invisible - - 20 - 260 - -3,00 - 108 - 108 - - - Visible - - - - - - + + Visible + + + 20 + 260 + 108 + 108 + -3 + + + + Invisible - - 20 - 415 - -3,00 - 108 - 108 - - - Visible - - - - - - + + Visible + + + 20 + 415 + 108 + 108 + -3 + + + + Invisible - - 1152 - 105 - -3,00 - 108 - 108 - - - Visible - - - - - - + + Visible + + + 1152 + 105 + 108 + 108 + -3 + + + + Invisible - - 1152 - 260 - -3,00 - 108 - 108 - - - Visible - - - - - - + + Visible + + + 1152 + 260 + 108 + 108 + -3 + + + + Invisible - - 1152 - 415 - -3,00 - 108 - 108 - - - Visible - - - - - - + + Visible + + + 1152 + 415 + 108 + 108 + -3 + + + + PlayerSelector - - 15 - 100 - -2,00 - 118 - 118 - - - Player1 - - - - - - + + Player1 + + + 15 + 100 + 118 + 118 + -2 + + + + PlayerSelector - - 15 - 255 - -2,00 - 118 - 118 - - - Player2 - - - - - - + + Player2 + + + 15 + 255 + 118 + 118 + -2 + + + + PlayerSelector - - 15 - 410 - -2,00 - 118 - 118 - - - Player3 - - - - - - + + Player3 + + + 15 + 410 + 118 + 118 + -2 + + + + PlayerSelector - - 1147 - 100 - -2,00 - 118 - 118 - - - Player4 - - - - - - + + Player4 + + + 1147 + 100 + 118 + 118 + -2 + + + + PlayerSelector - - 1147 - 255 - -2,00 - 118 - 118 - - - Player5 - - - - - - + + Player5 + + + 1147 + 255 + 118 + 118 + -2 + + + + PlayerSelector - - 1147 - 410 - -2,00 - 118 - 118 - - - Player6 - - - - - - + + Player6 + + + 1147 + 410 + 118 + 118 + -2 + + + + Invisible - - 145 - 663 - 0,00 - 990 - 50 - - - StaticWarningColor - - - - - - + + StaticWarningColor + + + 145 + 663 + 990 + 50 + 0 + + + + Invisible - - 145 - 715 - 0,00 - 990 - 50 - - - StaticWarningColor - - - - - - + + StaticWarningColor + + + 145 + 715 + 990 + 50 + 0 + + + + + + 640 50 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - TR_SCREENNAMES_MENU - - - - - - + + + 640 617 - - 0,00 - + 0 27 - 970 - - - TextWarningColor - - - TextWarningColor - + + TextWarningColor + + + TextWarningColor + Center - Center - - Outline - - - - - - - + + + 640 652 - - 0,00 - + 0 27 - 970 - - - TextWarningColor - - - TextWarningColor - + + TextWarningColor + + + TextWarningColor + Center - Center - - Outline - - - - - - - + + + 74 219 - - 0,00 - + 0 20 - - - - Player1 - - - TextSColor - + 0 + + Player1 + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 74 374 - - 0,00 - + 0 20 - - - - Player2 - - - TextSColor - + 0 + + Player2 + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 74 529 - - 0,00 - + 0 20 - - - - Player3 - - - TextSColor - + 0 + + Player3 + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 1206 219 - - 0,00 - + 0 20 - - - - Player4 - - - TextSColor - + 0 + + Player4 + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 1206 374 - - 0,00 - + 0 20 - - - - Player5 - - - TextSColor - + 0 + + Player5 + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 1206 529 - - 0,00 - + 0 20 - - - - Player6 - - - TextSColor - + 0 + + Player6 + + + TextSColor + Center - Center - - Outline - - - - - - - + + + + + + + + + + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlidePlayer - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlidePlayer - - 70 - 548 - 0,00 - 1140 - 45 - - 75 - 553 - 0,00 - 40 - 40 - - 1170 - 553 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 186,00 - + + 70 + 548 + 1140 + 45 + 0 + + + 75 + 553 + 40 + 40 + 0 + + + 1170 + 553 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 186 Outline - Bold - 6 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - Button - SelectSlideArrowLeft - SelectSlideArrowRight - Button - - 41 - 105 - -4,00 - 88 - 20 - - 20 - 105 - -4,01 - 20 - 20 - - 20 - 105 - -4,01 - 20 - 20 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 20,00 - - - - 86,00 - + + 41 + 105 + 88 + 20 + -4 + + + 20 + 105 + 20 + 20 + -4.01 + + + 20 + 105 + 20 + 20 + -4.01 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 20 + 0 + 0 + 86 Outline - Bold - 1 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - Button - SelectSlideArrowLeft - SelectSlideArrowRight - Button - - 41 - 260 - -4,00 - 88 - 20 - - 20 - 260 - -4,01 - 20 - 20 - - 20 - 260 - -4,01 - 20 - 20 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 20,00 - - - - 86,00 - + + 41 + 260 + 88 + 20 + -4 + + + 20 + 260 + 20 + 20 + -4.01 + + + 20 + 260 + 20 + 20 + -4.01 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 20 + 0 + 0 + 86 Outline - Bold - 1 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - Button - SelectSlideArrowLeft - SelectSlideArrowRight - Button - - 41 - 415 - -4,00 - 88 - 20 - - 20 - 415 - -4,01 - 20 - 20 - - 20 - 415 - -4,01 - 20 - 20 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 20,00 - - - - 86,00 - + + 41 + 415 + 88 + 20 + -4 + + + 20 + 415 + 20 + 20 + -4.01 + + + 20 + 415 + 20 + 20 + -4.01 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 20 + 0 + 0 + 86 Outline - Bold - 1 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - Button - SelectSlideArrowLeft - SelectSlideArrowRight - Button - - 1152 - 105 - -4,00 - 88 - 20 - - 1240 - 105 - -4,01 - 20 - 20 - - 1240 - 105 - -4,01 - 20 - 20 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 20,00 - - - - 86,00 - + + 1152 + 105 + 88 + 20 + -4 + + + 1240 + 105 + 20 + 20 + -4.01 + + + 1240 + 105 + 20 + 20 + -4.01 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 20 + 0 + 0 + 86 Outline - Bold - 1 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - Button - SelectSlideArrowLeft - SelectSlideArrowRight - Button - - 1152 - 260 - -4,00 - 88 - 20 - - 1240 - 260 - -4,01 - 20 - 20 - - 1240 - 260 - -4,01 - 20 - 20 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 20,00 - - - - 86,00 - + + 1152 + 260 + 88 + 20 + -4 + + + 1240 + 260 + 20 + 20 + -4.01 + + + 1240 + 260 + 20 + 20 + -4.01 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 20 + 0 + 0 + 86 Outline - Bold - 1 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - Button - SelectSlideArrowLeft - SelectSlideArrowRight - Button - - 1152 - 415 - -4,00 - 88 - 20 - - 1240 - 415 - -4,01 - 20 - 20 - - 1240 - 415 - -4,01 - 20 - 20 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 20,00 - - - - 86,00 - + + 1152 + 415 + 88 + 20 + -4 + + + 1240 + 415 + 20 + 20 + -4.01 + + + 1240 + 415 + 20 + 20 + -4.01 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 20 + 0 + 0 + 86 Outline - Bold - 1 - - - - 172 - 127 - 0,00 - 945 - 393 - + + + + + + + 172 + 127 + 945 + 393 + 0 + CoverTile - - - 1,00 - 1,00 - 1,00 - 0,20 - + PlayerSelector - - 100 100 - 8 3 - - 20,71 - 30,00 - + 20.71 + 30 - - 2,0 - - Outline - - TextColor - - - + 2 17 + Outline + + + TextColor + - - + + + Invisible - - 21 - 152 - -4,00 - 108 - 60 - + + 21 + 152 + 108 + 60 + -4 + 8 - - 2,00 - + 2 - TR_CONFIG_OFF - - - Player1Dim2 - - - Player1Dim2 - - - - - - + + Player1Dim2 + + + Player1Dim2 + + + + Invisible - - 21 - 307 - -4,00 - 108 - 60 - + + 21 + 307 + 108 + 60 + -4 + 8 - - 2,00 - + 2 - TR_CONFIG_OFF - - - Player2Dim2 - - - Player2Dim2 - - - - - - + + Player2Dim2 + + + Player2Dim2 + + + + Invisible - - 21 - 467 - -4,00 - 108 - 60 - + + 21 + 467 + 108 + 60 + -4 + 8 - - 2,00 - + 2 - TR_CONFIG_OFF - - - Player3Dim2 - - - Player3Dim2 - - - - - - + + Player3Dim2 + + + Player3Dim2 + + + + Invisible - - 1153 - 152 - -4,00 - 108 - 60 - + + 1153 + 152 + 108 + 60 + -4 + 8 - - 2,00 - + 2 - TR_CONFIG_OFF - - - Player4Dim2 - - - Player4Dim2 - - - - - - + + Player4Dim2 + + + Player4Dim2 + + + + Invisible - - 1153 - 307 - -4,00 - 108 - 60 - + + 1153 + 307 + 108 + 60 + -4 + 8 - - 2,00 - + 2 - TR_CONFIG_OFF - - - Player5Dim2 - - - Player5Dim2 - - - - - - + + Player5Dim2 + + + Player5Dim2 + + + + Invisible - - 1153 - 467 - -4,00 - 108 - 60 - + + 1153 + 467 + 108 + 60 + -4 + 8 - - 2,00 - + 2 - TR_CONFIG_OFF - - - Player6Dim2 - - - Player6Dim2 - - - - - - \ No newline at end of file + + Player6Dim2 + + + Player6Dim2 + + + + + + + + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenOptions.xml b/Output/Themes/Ambient/Screens/ScreenOptions.xml index ab89cbad..120be893 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptions.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptions.xml @@ -1,405 +1,336 @@ - - - + + + + ScreenOptions 1 - - + + + Video - + - BG_Default - - - - BackgroundColor - - - + + BackgroundColor + + + + + Menu - - 50 - 32 - 0,00 - 1180 - 50 - - - Invisible - - - - - - + + Invisible + + + 50 + 32 + 1180 + 50 + 0 + + + + + + 60 43 - - 0,00 - + 0 27 - - - - Invisible - - - Invisible - + 0 + + Invisible + + + Invisible + Left - Center - - Outline - TR_SCREENO_OPTIONS - - - - - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml b/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml index bdae10fb..b3aebc79 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml @@ -1,849 +1,703 @@ - - - + + + + ScreenOptionsGame 2 - - + + + Video - + - BG_Options - - - - BackgroundColor - - - + + BackgroundColor + + + + + Menu - - 40 - 40 - 0,00 - 1200 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 40 + 40 + 1200 + 50 + 0 + + + + Invisible - - 50 - 100 - 0,00 - 460 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 50 + 100 + 460 + 50 + 0 + + + + Invisible - - 50 - 160 - 0,00 - 460 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 50 + 160 + 460 + 50 + 0 + + + + Invisible - - 50 - 220 - 0,00 - 460 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 50 + 220 + 460 + 50 + 0 + + + + Invisible - - 50 - 280 - 0,00 - 460 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 50 + 280 + 460 + 50 + 0 + + + + Invisible - - 50 - 340 - 0,00 - 460 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 50 + 340 + 460 + 50 + 0 + + + + Invisible - - 50 - 400 - 0,00 - 460 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 50 + 400 + 460 + 50 + 0 + + + + + + 640 50 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - TR_SCREENOGAME_OPTIONS - - - - - - + + + 75 107 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOGAME_LANGUAGE - - - - - - + + + 75 167 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOGAME_DEBUGLEVEL - - - - - - + + + 75 227 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOGAME_SONGMENU - - - - - - + + + 75 287 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOGAME_SONGSORTING - - - - - - + + + 75 347 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOGAME_TABS - - - - - - + + + 75 407 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOGAME_TIMERMODE - - - - - - + + + + + + + + + + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 100 - 0,00 - 700 - 50 - - 505 - 105 - 0,00 - 40 - 40 - - 1170 - 105 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 205,33 - + + 500 + 100 + 700 + 50 + 0 + + + 505 + 105 + 40 + 40 + 0 + + + 1170 + 105 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 3 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 160 - 0,00 - 700 - 50 - - 505 - 165 - 0,00 - 40 - 40 - - 1170 - 165 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 205,33 - + + 500 + 160 + 700 + 50 + 0 + + + 505 + 165 + 40 + 40 + 0 + + + 1170 + 165 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 3 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 220 - 0,00 - 700 - 50 - - 505 - 225 - 0,00 - 40 - 40 - - 1170 - 225 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 205,33 - + + 500 + 220 + 700 + 50 + 0 + + + 505 + 225 + 40 + 40 + 0 + + + 1170 + 225 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 3 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 280 - 0,00 - 700 - 50 - - 505 - 285 - 0,00 - 40 - 40 - - 1170 - 285 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 205,33 - + + 500 + 280 + 700 + 50 + 0 + + + 505 + 285 + 40 + 40 + 0 + + + 1170 + 285 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 3 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 340 - 0,00 - 700 - 50 - - 505 - 345 - 0,00 - 40 - 40 - - 1170 - 345 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 308,00 - + + 500 + 340 + 700 + 50 + 0 + + + 505 + 345 + 40 + 40 + 0 + + + 1170 + 345 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 308 Outline - Bold - 2 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 400 - 0,00 - 700 - 50 - - 505 - 405 - 0,00 - 40 - 40 - - 1170 - 405 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 205,33 - + + 500 + 400 + 700 + 50 + 0 + + + 505 + 405 + 40 + 40 + 0 + + + 1170 + 405 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 3 - - - \ No newline at end of file + + + + + + + + + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml b/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml index 09511f0c..4f80e6fc 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml @@ -1,312 +1,266 @@ - - - + + + + ScreenOptionsLyrics 2 - - + + + Video - + - BG_Options - - - - BackgroundColor - - - + + BackgroundColor + + + + + Menu - - 40 - 40 - 0,00 - 1200 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 40 + 40 + 1200 + 50 + 0 + + + + + + 640 50 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - TR_SCREENOLYRICS_OPTIONS - - - - - - + + + 75 107 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOLYRICS_STYLE - - - - - - + + + 75 167 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOLYRICS_POSITION - - - - - - + + + + + + + + + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 100 - 0,00 - 700 - 50 - - 505 - 105 - 0,00 - 40 - 40 - - 1170 - 105 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 205,33 - + + 500 + 100 + 700 + 50 + 0 + + + 505 + 105 + 40 + 40 + 0 + + + 1170 + 105 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 4 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 160 - 0,00 - 700 - 50 - - 505 - 165 - 0,00 - 40 - 40 - - 1170 - 165 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 205,33 - + + 500 + 160 + 700 + 50 + 0 + + + 505 + 165 + 40 + 40 + 0 + + + 1170 + 165 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 2 - - - \ No newline at end of file + + + + + + + + + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml index 8d231ea2..9fc3c7fd 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml @@ -1,839 +1,683 @@ - - - + + + + ScreenOptionsRecord 4 - - + + + Video - + - BG_Options - - - - BackgroundColor - - - + + BackgroundColor + + + + + Menu - - 40 - 40 - 0,00 - 1200 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 40 + 40 + 1200 + 50 + 0 + + + + Invisible - - 50 - 100 - 0,00 - 460 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 50 + 100 + 460 + 50 + 0 + + + + Invisible - - 50 - 160 - 0,00 - 460 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 50 + 160 + 460 + 50 + 0 + + + + Invisible - - 50 - 220 - 0,00 - 460 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 50 + 220 + 460 + 50 + 0 + + + + Invisible - - 50 - 280 - 0,00 - 460 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 50 + 280 + 460 + 50 + 0 + + + + Invisible - - 50 - 340 - 0,00 - 460 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 50 + 340 + 460 + 50 + 0 + + + + Invisible - - 145 - 530 - 0,00 - 990 - 50 - - - StaticWarningColor - - - - - - + + StaticWarningColor + + + 145 + 530 + 990 + 50 + 0 + + + + EnergyBeam - - 390 - 234 - 0,00 - 100 - 16 - - - Visible - - - - - - + + Visible + + + 390 + 234 + 100 + 16 + 0 + + + + EnergyBeam - - 390 - 296 - 0,00 - 100 - 16 - - - Visible - - - - - - + + Visible + + + 390 + 296 + 100 + 16 + 0 + + + + + + 640 55 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - TR_SCREENORECORD_OPTIONS - - - - - - + + + 75 106 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENORECORD_DEVICE - - - - - - + + + 75 347 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENORECORD_MIC_DELAY - - - - - - + + + 640 537 - - 0,00 - + 0 27 - 970 - - - TextWarningColor - - - TextWarningColor - + + TextWarningColor + + + TextWarningColor + Center - Center - - Outline - TR_SCREENORECORD_MIC_WARNING - - - - - - + + + 75 227 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENORECORD_CHANNEL_1 - - - - - - + + + 75 287 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENORECORD_CHANNEL_2 - - - - - - + + + 330 227 - - -1,00 - + -1 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Right - Center - - Outline - - - - - - - + + + 330 287 - - -1,00 - + -1 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Right - Center - - Outline - - - - - - - + + + + + + + + + + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 100 - 0,00 - 700 - 50 - - 505 - 105 - 0,00 - 40 - 40 - - 1170 - 105 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 616,00 - + + 500 + 100 + 700 + 50 + 0 + + + 505 + 105 + 40 + 40 + 0 + + + 1170 + 105 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 616 Outline - Bold - 1 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 220 - 0,00 - 700 - 50 - - 505 - 225 - 0,00 - 40 - 40 - - 1170 - 225 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 154,00 - + + 500 + 220 + 700 + 50 + 0 + + + 505 + 225 + 40 + 40 + 0 + + + 1170 + 225 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 154 Outline - Bold - 7 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 280 - 0,00 - 700 - 50 - - 505 - 285 - 0,00 - 40 - 40 - - 1170 - 285 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 154,00 - + + 500 + 280 + 700 + 50 + 0 + + + 505 + 285 + 40 + 40 + 0 + + + 1170 + 285 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 154 Outline - Bold - 7 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 340 - 0,00 - 700 - 50 - - 505 - 345 - 0,00 - 40 - 40 - - 1170 - 345 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 123,20 - + + 500 + 340 + 700 + 50 + 0 + + + 505 + 345 + 40 + 40 + 0 + + + 1170 + 345 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 123.2 Outline - Bold - 5 - - - + + + + + + Invisible - - 50 - 400 - -1,00 - 230 - 150 - + + 50 + 400 + 230 + 150 + -1 + 12 - - 2,00 - + 2 - TR_CONFIG_OFF - - - ButtonColor - - - ButtonTextColor - - - - - 10 + + ButtonColor + + + ButtonTextColor + + 26 + 10 - - - + + Invisible - - 400 - 400 - -1,00 - 230 - 150 - + + 400 + 400 + 230 + 150 + -1 + 12 - - 2,00 - + 2 - TR_CONFIG_OFF - - - ButtonColor - - - ButtonTextColor - - - - - 10 + + ButtonColor + + + ButtonTextColor + + 26 + 10 - - - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml b/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml index 23ee2358..5cb85711 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml @@ -1,600 +1,497 @@ - - - + + + + ScreenOptionsSound 3 - - + + + Video - + - BG_Options - - - - BackgroundColor - - - + + BackgroundColor + + + + + Menu - - 40 - 40 - 0,00 - 1200 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 40 + 40 + 1200 + 50 + 0 + + + + + + 640 50 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - TR_SCREENOSOUND_OPTIONS - - - - - - + + + 75 107 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOSOUND_BACKGROUNDMUSIC - - - - - - + + + 75 167 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOSOUND_BACKGROUNDMUSICVOLUME - - - - - - + + + 75 227 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE - - - - - - + + + 75 287 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOSOUND_PREVIEWMUSICVOLUME - - - - - - + + + 75 347 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOSOUND_GAMEMUSICVOLUME - - - - - - + + + + + + + + + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 100 - 0,00 - 700 - 50 - - 505 - 105 - 0,00 - 40 - 40 - - 1170 - 105 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 205,33 - + + 500 + 100 + 700 + 50 + 0 + + + 505 + 105 + 40 + 40 + 0 + + + 1170 + 105 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 3 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 160 - 0,00 - 700 - 50 - - 505 - 165 - 0,00 - 40 - 40 - - 1170 - 165 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 205,33 - + + 500 + 160 + 700 + 50 + 0 + + + 505 + 165 + 40 + 40 + 0 + + + 1170 + 165 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 3 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 220 - 0,00 - 700 - 50 - - 505 - 225 - 0,00 - 40 - 40 - - 1170 - 225 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 500,00 - + + 500 + 220 + 700 + 50 + 0 + + + 505 + 225 + 40 + 40 + 0 + + + 1170 + 225 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 500 Outline - Bold - 1 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 280 - 0,00 - 700 - 50 - - 505 - 285 - 0,00 - 40 - 40 - - 1170 - 285 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 500,00 - + + 500 + 280 + 700 + 50 + 0 + + + 505 + 285 + 40 + 40 + 0 + + + 1170 + 285 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 500 Outline - Bold - 3 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 340 - 0,00 - 700 - 50 - - 505 - 345 - 0,00 - 40 - 40 - - 1170 - 345 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 500,00 - + + 500 + 340 + 700 + 50 + 0 + + + 505 + 345 + 40 + 40 + 0 + + + 1170 + 345 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 500 Outline - Bold - 3 - - - \ No newline at end of file + + + + + + + + + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml b/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml index 874aabb7..ef17078d 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml @@ -1,1016 +1,840 @@ - - - + + + + ScreenOptionsTheme 3 - - + + + Video - + - BG_Options - - - - BackgroundColor - - - + + BackgroundColor + + + + + Menu - - 40 - 40 - 0,00 - 1200 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 40 + 40 + 1200 + 50 + 0 + + + + Invisible - - 50 - 100 - 0,00 - 460 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 50 + 100 + 460 + 50 + 0 + + + + Invisible - - 50 - 160 - 0,00 - 460 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 50 + 160 + 460 + 50 + 0 + + + + Invisible - - 50 - 220 - 0,00 - 460 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 50 + 220 + 460 + 50 + 0 + + + + Invisible - - 50 - 280 - 0,00 - 460 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 50 + 280 + 460 + 50 + 0 + + + + Invisible - - 50 - 340 - 0,00 - 460 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 50 + 340 + 460 + 50 + 0 + + + + Invisible - - 50 - 400 - 0,00 - 460 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 50 + 400 + 460 + 50 + 0 + + + + Invisible - - 50 - 460 - 0,00 - 460 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 50 + 460 + 460 + 50 + 0 + + + + Invisible - - 50 - 520 - 0,00 - 460 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 50 + 520 + 460 + 50 + 0 + + + + + + 640 50 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - TR_SCREENOTHEME_OPTIONS - - - - - - + + + 75 107 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOTHEME_THEME - - - - - - + + + 75 167 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOTHEME_SKIN - - - - - - + + + 75 227 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOTHEME_COVERTHEME - - - - - - + + + 75 287 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOTHEME_NOTELINES - - - - - - + + + 75 347 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOTHEME_TONEHELPER - - - - - - + + + 75 407 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOTHEME_TIMERLOOK - - - - - - + + + 75 467 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOTHEME_FADEINFO - - - - - - + + + 75 527 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOTHEME_COVERLOADING - - - - - - + + + + + + + + + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 100 - 0,00 - 700 - 50 - - 505 - 105 - 0,00 - 40 - 40 - - 1170 - 105 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 616,00 - + + 500 + 100 + 700 + 50 + 0 + + + 505 + 105 + 40 + 40 + 0 + + + 1170 + 105 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 616 Outline - Bold - 1 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 160 - 0,00 - 700 - 50 - - 505 - 165 - 0,00 - 40 - 40 - - 1170 - 165 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 616,00 - + + 500 + 160 + 700 + 50 + 0 + + + 505 + 165 + 40 + 40 + 0 + + + 1170 + 165 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 616 Outline - Bold - 1 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 220 - 0,00 - 700 - 50 - - 505 - 225 - 0,00 - 40 - 40 - - 1170 - 225 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 308,00 - + + 500 + 220 + 700 + 50 + 0 + + + 505 + 225 + 40 + 40 + 0 + + + 1170 + 225 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 308 Outline - Bold - 2 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 280 - 0,00 - 700 - 50 - - 505 - 285 - 0,00 - 40 - 40 - - 1170 - 285 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 308,00 - + + 500 + 280 + 700 + 50 + 0 + + + 505 + 285 + 40 + 40 + 0 + + + 1170 + 285 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 308 Outline - Bold - 2 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 340 - 0,00 - 700 - 50 - - 505 - 345 - 0,00 - 40 - 40 - - 1170 - 345 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 308,00 - + + 500 + 340 + 700 + 50 + 0 + + + 505 + 345 + 40 + 40 + 0 + + + 1170 + 345 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 308 Outline - Bold - 2 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 400 - 0,00 - 700 - 50 - - 505 - 405 - 0,00 - 40 - 40 - - 1170 - 405 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 308,00 - + + 500 + 400 + 700 + 50 + 0 + + + 505 + 405 + 40 + 40 + 0 + + + 1170 + 405 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 308 Outline - Bold - 2 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 460 - 0,00 - 700 - 50 - - 505 - 465 - 0,00 - 40 - 40 - - 1170 - 465 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 616,00 - + + 500 + 460 + 700 + 50 + 0 + + + 505 + 465 + 40 + 40 + 0 + + + 1170 + 465 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 616 Outline - Bold - 2 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 520 - 0,00 - 700 - 50 - - 505 - 525 - 0,00 - 40 - 40 - - 1170 - 525 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 616,00 - + + 500 + 520 + 700 + 50 + 0 + + + 505 + 525 + 40 + 40 + 0 + + + 1170 + 525 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 616 Outline - Bold - 1 - - - \ No newline at end of file + + + + + + + + + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml index cfdb992b..889d2e5f 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml @@ -1,817 +1,675 @@ - - - + + + + ScreenOptionsVideo 5 - - + + + Video - + - BG_Options - - - - BackgroundColor - - - + + BackgroundColor + + + + + Menu - - 40 - 40 - 0,00 - 1200 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 40 + 40 + 1200 + 50 + 0 + + + + Invisible - - 50 - 100 - 0,00 - 460 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 50 + 100 + 460 + 50 + 0 + + + + Invisible - - 50 - 160 - 0,00 - 460 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 50 + 160 + 460 + 50 + 0 + + + + Invisible - - 50 - 220 - 0,00 - 460 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 50 + 220 + 460 + 50 + 0 + + + + Invisible - - 550 - 460 - 0,00 - 320 - 240 - - - Visible - - - - - - + + Visible + + + 550 + 460 + 320 + 240 + 0 + + + + + + 640 50 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - TR_SCREENOVIDEO_OPTIONS - - - - - - + + + 75 107 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOVIDEO_VIDEOBACKGROUNDS - - - - - - + + + 75 167 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOVIDEO_VIDEOPREVIEW - - - - - - + + + 75 227 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOVIDEO_VIDEOINSONGS - - - - - - + + + 75 287 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOVIDEO_VIDEOSTOBACKGROUND - - - - - - + + + 75 347 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOVIDEO_WEBCAMDEVICES - - - - - - + + + 75 407 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOVIDEO_WEBCAMRESOLUTION - - - - - - + + + + + + + + + + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 100 - 0,00 - 700 - 50 - - 505 - 105 - 0,00 - 40 - 40 - - 1170 - 105 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 205,33 - + + 500 + 100 + 700 + 50 + 0 + + + 505 + 105 + 40 + 40 + 0 + + + 1170 + 105 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 3 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 160 - 0,00 - 700 - 50 - - 505 - 165 - 0,00 - 40 - 40 - - 1170 - 165 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 205,33 - + + 500 + 160 + 700 + 50 + 0 + + + 505 + 165 + 40 + 40 + 0 + + + 1170 + 165 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 3 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 220 - 0,00 - 700 - 50 - - 505 - 225 - 0,00 - 40 - 40 - - 1170 - 225 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 205,33 - + + 500 + 220 + 700 + 50 + 0 + + + 505 + 225 + 40 + 40 + 0 + + + 1170 + 225 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 3 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 280 - 0,00 - 700 - 50 - - 505 - 285 - 0,00 - 40 - 40 - - 1170 - 285 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 205,33 - + + 500 + 280 + 700 + 50 + 0 + + + 505 + 285 + 40 + 40 + 0 + + + 1170 + 285 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 3 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 340 - 0,00 - 700 - 50 - - 505 - 345 - 0,00 - 40 - 40 - - 1170 - 345 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 205,33 - + + 500 + 340 + 700 + 50 + 0 + + + 505 + 345 + 40 + 40 + 0 + + + 1170 + 345 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 205.33 Outline - Bold - 3 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 400 - 0,00 - 700 - 50 - - 505 - 405 - 0,00 - 40 - 40 - - 1170 - 405 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 150,00 - + + 500 + 400 + 700 + 50 + 0 + + + 505 + 405 + 40 + 40 + 0 + + + 1170 + 405 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 150 Outline - Bold - 3 - - - \ No newline at end of file + + + + + + + + + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml b/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml index e99c0fcb..861abcb1 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml @@ -1,252 +1,189 @@ - - - + + + + ScreenOptionsVideoAdjustments 1 - - + + + Color - + - BG_Options - - - - 1,00 - 1,00 - 1,00 - 1,00 - - - + + + + + + 0 0 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT - - - - - - + + + 1280 0 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Right - Center - - Outline - TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT - - - - - - + + + 0 693 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENOVIDEOADJUSTMENTS_BOTTOMLEFT - - - - - - + + + 1280 693 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Right - Center - - Outline - TR_SCREENOVIDEOADJUSTMENTS_BOTTOMRIGHT - - - - - - + + + 640 320 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - TR_SCREENOVIDEOADJUSTMENTS_NOTES - - - - - - + + + 640 360 - - 0,00 - + 0 35 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenParty.xml b/Output/Themes/Ambient/Screens/ScreenParty.xml index 585954f3..eef66bfd 100644 --- a/Output/Themes/Ambient/Screens/ScreenParty.xml +++ b/Output/Themes/Ambient/Screens/ScreenParty.xml @@ -1,657 +1,481 @@ - - - + + + + ScreenParty 1 - - + + + Video - + - BG_Default - - - - BackgroundColor - - - + + BackgroundColor + + + + + Menu - - 40 - 40 - 0,00 - 1200 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 40 + 40 + 1200 + 50 + 0 + + + + + + 640 50 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - TR_SCREENPARTY_TITLE - - - - - - + + + 75 107 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENPARTY_MODES - - - - - - + + + 75 167 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENPARTY_DESCRIPTION - - - - - - + + + 75 227 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENPARTY_TARGETAUDIENCE - - - - - - + + + 75 287 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENPARTY_NUMTEAMS - - - - - - + + + 75 347 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENPARTY_NUMPLAYERS - - - - - - + + + 75 407 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENPARTY_AUTHOR - - - - - - + + + 75 467 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENPARTY_VERSION - - - - - - + + + 850 167 - - 0,00 - + 0 27 - 600 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 850 227 - - 0,00 - + 0 27 - 600 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 850 287 - - 0,00 - + 0 27 - 600 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 850 347 - - 0,00 - + 0 27 - 600 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 850 407 - - 0,00 - + 0 27 - 600 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 850 467 - - 0,00 - + 0 27 - 600 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 850 527 - - 0,00 - + 0 27 - 600 - - - TextWarningColor - - - TextSColor - + + TextWarningColor + + + TextSColor + Center - Center - - Outline - TR_SCREENPARTY_ERROR - - - - - - + + + + + + + + + + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 100 - 0,00 - 700 - 50 - - 505 - 105 - 0,00 - 40 - 40 - - 1170 - 105 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 600,00 - + + 500 + 100 + 700 + 50 + 0 + + + 505 + 105 + 40 + 40 + 0 + + + 1170 + 105 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 600 Outline - Bold - 1 - - - \ No newline at end of file + + + + + + + + + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenProfiles.xml b/Output/Themes/Ambient/Screens/ScreenProfiles.xml index 18777ed1..16d02be5 100644 --- a/Output/Themes/Ambient/Screens/ScreenProfiles.xml +++ b/Output/Themes/Ambient/Screens/ScreenProfiles.xml @@ -1,1128 +1,923 @@ - - - + + + + ScreenProfiles 3 - - + + + Video - + - BG_Options - - - - BackgroundColor - - - + + BackgroundColor + + + + + Menu - - 40 - 40 - 0,00 - 1200 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 40 + 40 + 1200 + 50 + 0 + + + + Invisible - - 50 - 160 - 0,00 - 460 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 50 + 160 + 460 + 50 + 0 + + + + Invisible - - 50 - 220 - 0,00 - 460 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 50 + 220 + 460 + 50 + 0 + + + + Invisible - - 50 - 280 - 0,00 - 460 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 50 + 280 + 460 + 50 + 0 + + + + Invisible - - 50 - 340 - 0,00 - 460 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 50 + 340 + 460 + 50 + 0 + + + + Invisible - - 50 - 400 - 0,00 - 460 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 50 + 400 + 460 + 50 + 0 + + + + - - 85 - 110 - 0,00 - 160 - 160 - - - Visible - - - - - - + + Visible + + + 85 + 110 + 160 + 160 + 0 + + + + + + 640 50 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - TR_SCREENPROFILES_PROFILES - - - - - - + + + 75 287 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENPROFILES_PLAYERNAME - - - - - - + + + 75 347 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENPROFILES_GAMEDIFFICULTY - - - - - - + + + 75 407 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENPROFILES_AVATAR - - - - - - + + + 75 467 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENPROFILES_USERROLE - - - - - - + + + 75 527 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENPROFILES_ACTIVE - - - - - - + + + + + + + + + + + + + + + + + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 160 - 0,00 - 710 - 50 - - 505 - 165 - 0,00 - 40 - 40 - - 1170 - 165 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 219,20 - + + 500 + 160 + 710 + 50 + 0 + + + 505 + 165 + 40 + 40 + 0 + + + 1170 + 165 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 219.2 Outline - Bold - 3 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 340 - 0,00 - 710 - 50 - - 505 - 345 - 0,00 - 40 - 40 - - 1170 - 345 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 208,67 - + + 500 + 340 + 710 + 50 + 0 + + + 505 + 345 + 40 + 40 + 0 + + + 1170 + 345 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 208.67 Outline - Bold - 3 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 400 - 0,00 - 710 - 50 - - 505 - 405 - 0,00 - 40 - 40 - - 1170 - 405 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 208,67 - + + 500 + 400 + 710 + 50 + 0 + + + 505 + 405 + 40 + 40 + 0 + + + 1170 + 405 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 208.67 Outline - Bold - 3 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 460 - 0,00 - 710 - 50 - - 505 - 465 - 0,00 - 40 - 40 - - 1170 - 465 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 313,00 - + + 500 + 460 + 710 + 50 + 0 + + + 505 + 465 + 40 + 40 + 0 + + + 1170 + 465 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 313 Outline - Bold - 2 - - - + + Invisible - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - SelectSlideArrowLeft - SelectSlideArrowRight - SelectSlide - - 500 - 520 - 0,00 - 710 - 50 - - 505 - 525 - 0,00 - 40 - 40 - - 1170 - 525 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 27,00 - - - - 313,00 - + + 500 + 520 + 710 + 50 + 0 + + + 505 + 525 + 40 + 40 + 0 + + + 1170 + 525 + 40 + 40 + 0 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 27 + 0 + 0 + 313 Outline - Bold - 2 - - - \ No newline at end of file + + + + + + + + + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenScore.xml b/Output/Themes/Ambient/Screens/ScreenScore.xml index af0da59d..b329a4cf 100644 --- a/Output/Themes/Ambient/Screens/ScreenScore.xml +++ b/Output/Themes/Ambient/Screens/ScreenScore.xml @@ -1,3774 +1,2612 @@ - - - + + + + ScreenScore 3 - - + + + Video - + - BG_Default - - - - BackgroundColor - - - + + BackgroundColor + + + + + Menu - - 40 - 40 - 0,00 - 1200 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 40 + 40 + 1200 + 50 + 0 + + + + TextBG - - 50 - 90 - 0,00 - 1180 - 610 - - - 0,00 - 0,00 - 0,00 - 0,00 - - - - - - + + + 50 + 90 + 1180 + 610 + 0 + + + + PointsBarBG - - 560 - 180 - 0,00 - 160 - 220 - - - 0,00 - 0,00 - 1,00 - 0,75 - - - - - - + + + 560 + 180 + 160 + 220 + 0 + + + + PointsBar - - 560 - 400 - 0,00 - 160 - 0 - - - Player1 - - - - - - + + Player1 + + + 560 + 400 + 160 + 0 + 0 + + + + - - 560 - 410 - 0,00 - 160 - 160 - - - Visible - - - - - 15 + + Visible + + + 560 + 410 + 160 + 160 + 0 + + 40 + 15 - - - + + PointsBarBG - - 352 - 180 - 0,00 - 160 - 220 - - - 0,00 - 0,00 - 1,00 - 0,75 - - - - - - + + + 352 + 180 + 160 + 220 + 0 + + + + PointsBar - - 352 - 180 - 0,00 - 160 - 0 - - - Player1 - - - - - - + + Player1 + + + 352 + 180 + 160 + 0 + 0 + + + + - - 352 - 410 - 0,00 - 160 - 160 - - - Visible - - - - - 15 + + Visible + + + 352 + 410 + 160 + 160 + 0 + + 40 + 15 - - - + + PointsBarBG - - 768 - 180 - 0,00 - 160 - 220 - - - 1,00 - 0,00 - 0,00 - 0,75 - - - - - - + + + 768 + 180 + 160 + 220 + 0 + + + + PointsBar - - 768 - 180 - 0,00 - 160 - 0 - - - Player2 - - - - - - + + Player2 + + + 768 + 180 + 160 + 0 + 0 + + + + - - 768 - 410 - 0,00 - 160 - 160 - - - Visible - - - - - 15 + + Visible + + + 768 + 410 + 160 + 160 + 0 + + 40 + 15 - - - + + PointsBarBG - - 238 - 180 - 0,00 - 160 - 220 - - - 0,00 - 0,00 - 1,00 - 0,75 - - - - - - + + + 238 + 180 + 160 + 220 + 0 + + + + PointsBar - - 238 - 180 - 0,00 - 160 - 0 - - - Player1 - - - - - - + + Player1 + + + 238 + 180 + 160 + 0 + 0 + + + + - - 238 - 410 - 0,00 - 160 - 160 - - - Visible - - - - - 15 + + Visible + + + 238 + 410 + 160 + 160 + 0 + + 40 + 15 - - - + + PointsBarBG - - 560 - 180 - 0,00 - 160 - 220 - - - 1,00 - 0,00 - 0,00 - 0,75 - - - - - - + + + 560 + 180 + 160 + 220 + 0 + + + + PointsBar - - 560 - 180 - 0,00 - 160 - 0 - - - Player2 - - - - - - + + Player2 + + + 560 + 180 + 160 + 0 + 0 + + + + - - 560 - 410 - 0,00 - 160 - 160 - - - Visible - - - - - 15 + + Visible + + + 560 + 410 + 160 + 160 + 0 + + 40 + 15 - - - + + PointsBarBG - - 882 - 180 - 0,00 - 160 - 220 - - - 0,00 - 1,00 - 0,00 - 0,75 - - - - - - + + + 882 + 180 + 160 + 220 + 0 + + + + PointsBar - - 882 - 180 - 0,00 - 160 - 0 - - - Player3 - - - - - - + + Player3 + + + 882 + 180 + 160 + 0 + 0 + + + + - - 882 - 410 - 0,00 - 160 - 160 - - - Visible - - - - - 15 + + Visible + + + 882 + 410 + 160 + 160 + 0 + + 40 + 15 - - - + + PointsBarBG - - 190 - 180 - 0,00 - 160 - 220 - - - 0,00 - 0,00 - 1,00 - 0,75 - - - - - - + + + 190 + 180 + 160 + 220 + 0 + + + + PointsBar - - 190 - 180 - 0,00 - 160 - 0 - - - Player1 - - - - - - + + Player1 + + + 190 + 180 + 160 + 0 + 0 + + + + - - 190 - 410 - 0,00 - 160 - 160 - - - Visible - - - - - 15 + + Visible + + + 190 + 410 + 160 + 160 + 0 + + 40 + 15 - - - + + PointsBarBG - - 422 - 180 - 0,00 - 160 - 220 - - - 1,00 - 0,00 - 0,00 - 0,75 - - - - - - + + + 422 + 180 + 160 + 220 + 0 + + + + PointsBar - - 422 - 180 - 0,00 - 160 - 0 - - - Player2 - - - - - - + + Player2 + + + 422 + 180 + 160 + 0 + 0 + + + + - - 422 - 410 - 0,00 - 160 - 160 - - - Visible - - - - - 15 + + Visible + + + 422 + 410 + 160 + 160 + 0 + + 40 + 15 - - - + + PointsBarBG - - 654 - 180 - 0,00 - 160 - 220 - - - 0,00 - 1,00 - 0,00 - 0,75 - - - - - - + + + 654 + 180 + 160 + 220 + 0 + + + + PointsBar - - 654 - 180 - 0,00 - 160 - 0 - - - Player3 - - - - - - + + Player3 + + + 654 + 180 + 160 + 0 + 0 + + + + - - 654 - 410 - 0,00 - 160 - 160 - - - Visible - - - - - 15 + + Visible + + + 654 + 410 + 160 + 160 + 0 + + 40 + 15 - - - + + PointsBarBG - - 886 - 180 - 0,00 - 160 - 220 - - - 0,50 - 0,00 - 1,00 - 0,75 - - - - - - + + + 886 + 180 + 160 + 220 + 0 + + + + PointsBar - - 886 - 180 - 0,00 - 160 - 0 - - - Player4 - - - - - - + + Player4 + + + 886 + 180 + 160 + 0 + 0 + + + + - - 886 - 410 - 0,00 - 160 - 160 - - - Visible - - - - - 15 + + Visible + + + 886 + 410 + 160 + 160 + 0 + + 40 + 15 - - - + + PointsBarBG - - 144 - 180 - 0,00 - 160 - 220 - - - 0,00 - 0,00 - 1,00 - 0,75 - - - - - - + + + 144 + 180 + 160 + 220 + 0 + + + + PointsBar - - 144 - 180 - 0,00 - 160 - 0 - - - Player1 - - - - - - + + Player1 + + + 144 + 180 + 160 + 0 + 0 + + + + - - 144 - 410 - 0,00 - 160 - 160 - - - Visible - - - - - 15 + + Visible + + + 144 + 410 + 160 + 160 + 0 + + 40 + 15 - - - + + PointsBarBG - - 352 - 180 - 0,00 - 160 - 220 - - - 1,00 - 0,00 - 0,00 - 0,75 - - - - - - + + + 352 + 180 + 160 + 220 + 0 + + + + PointsBar - - 352 - 180 - 0,00 - 160 - 0 - - - Player2 - - - - - - + + Player2 + + + 352 + 180 + 160 + 0 + 0 + + + + - - 352 - 410 - 0,00 - 160 - 160 - - - Visible - - - - - 15 + + Visible + + + 352 + 410 + 160 + 160 + 0 + + 40 + 15 - - - + + PointsBarBG - - 560 - 180 - 0,00 - 160 - 220 - - - 0,00 - 1,00 - 0,00 - 0,75 - - - - - - + + + 560 + 180 + 160 + 220 + 0 + + + + PointsBar - - 560 - 180 - 0,00 - 160 - 0 - - - Player3 - - - - - - + + Player3 + + + 560 + 180 + 160 + 0 + 0 + + + + - - 560 - 410 - 0,00 - 160 - 160 - - - Visible - - - - - 15 + + Visible + + + 560 + 410 + 160 + 160 + 0 + + 40 + 15 - - - + + PointsBarBG - - 768 - 180 - 0,00 - 160 - 220 - - - 0,50 - 0,00 - 1,00 - 0,75 - - - - - - + + + 768 + 180 + 160 + 220 + 0 + + + + PointsBar - - 768 - 180 - 0,00 - 160 - 0 - - - Player4 - - - - - - + + Player4 + + + 768 + 180 + 160 + 0 + 0 + + + + - - 768 - 410 - 0,00 - 160 - 160 - - - Visible - - - - - 15 + + Visible + + + 768 + 410 + 160 + 160 + 0 + + 40 + 15 - - - + + PointsBarBG - - 976 - 180 - 0,00 - 160 - 220 - - - 1,00 - 0,80 - 0,00 - 0,75 - - - - - - + + + 976 + 180 + 160 + 220 + 0 + + + + PointsBar - - 976 - 180 - 0,00 - 160 - 0 - - - Player5 - - - - - - + + Player5 + + + 976 + 180 + 160 + 0 + 0 + + + + - - 976 - 410 - 0,00 - 160 - 160 - - - Visible - - - - - 15 + + Visible + + + 976 + 410 + 160 + 160 + 0 + + 40 + 15 - - - + + PointsBarBG - - 45 - 180 - 0,00 - 160 - 220 - - - 0,00 - 0,00 - 1,00 - 0,75 - - - - - - + + + 45 + 180 + 160 + 220 + 0 + + + + PointsBar - - 45 - 180 - 0,00 - 160 - 0 - - - Player1 - - - - - - + + Player1 + + + 45 + 180 + 160 + 0 + 0 + + + + - - 45 - 410 - 0,00 - 160 - 160 - - - Visible - - - - - 15 + + Visible + + + 45 + 410 + 160 + 160 + 0 + + 40 + 15 - - - + + PointsBarBG - - 253 - 180 - 0,00 - 160 - 220 - - - 1,00 - 0,00 - 0,00 - 0,75 - - - - - - + + + 253 + 180 + 160 + 220 + 0 + + + + PointsBar - - 253 - 180 - 0,00 - 160 - 0 - - - Player2 - - - - - - + + Player2 + + + 253 + 180 + 160 + 0 + 0 + + + + - - 253 - 410 - 0,00 - 160 - 160 - - - Visible - - - - - 15 + + Visible + + + 253 + 410 + 160 + 160 + 0 + + 40 + 15 - - - + + PointsBarBG - - 461 - 180 - 0,00 - 160 - 220 - - - 0,00 - 1,00 - 0,00 - 0,75 - - - - - - + + + 461 + 180 + 160 + 220 + 0 + + + + PointsBar - - 461 - 180 - 0,00 - 160 - 0 - - - Player3 - - - - - - + + Player3 + + + 461 + 180 + 160 + 0 + 0 + + + + - - 461 - 410 - 0,00 - 160 - 160 - - - Visible - - - - - 15 + + Visible + + + 461 + 410 + 160 + 160 + 0 + + 40 + 15 - - - + + PointsBarBG - - 669 - 180 - 0,00 - 160 - 220 - - - 0,50 - 0,00 - 1,00 - 0,75 - - - - - - + + + 669 + 180 + 160 + 220 + 0 + + + + PointsBar - - 669 - 180 - 0,00 - 160 - 0 - - - Player4 - - - - - - + + Player4 + + + 669 + 180 + 160 + 0 + 0 + + + + - - 669 - 410 - 0,00 - 160 - 160 - - - Visible - - - - - 15 + + Visible + + + 669 + 410 + 160 + 160 + 0 + + 40 + 15 - - - + + PointsBarBG - - 877 - 180 - 0,00 - 160 - 220 - - - 1,00 - 0,80 - 0,00 - 0,75 - - - - - - + + + 877 + 180 + 160 + 220 + 0 + + + + PointsBar - - 877 - 180 - 0,00 - 160 - 0 - - - Player5 - - - - - - + + Player5 + + + 877 + 180 + 160 + 0 + 0 + + + + - - 877 - 410 - 0,00 - 160 - 160 - - - Visible - - - - - 15 + + Visible + + + 877 + 410 + 160 + 160 + 0 + + 40 + 15 - - - + + PointsBarBG - - 1085 - 180 - 0,00 - 160 - 220 - - - 1,00 - 0,00 - 0,50 - 0,75 - - - - - - + + + 1085 + 180 + 160 + 220 + 0 + + + + PointsBar - - 1085 - 180 - 0,00 - 160 - 0 - - - Player6 - - - - - - + + Player6 + + + 1085 + 180 + 160 + 0 + 0 + + + + - - 1085 - 410 - 0,00 - 160 - 160 - - - Visible - - - - - 15 + + Visible + + + 1085 + 410 + 160 + 160 + 0 + + 40 + 15 - - - + + + + 60 50 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENSCORE_SCORES - - - - - - + + + 640 50 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 640 630 - - 0,00 - + 0 44 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 640 142 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 640 107 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 640 670 - - 0,00 - + 0 28 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 432 630 - - 0,00 - + 0 44 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 432 142 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 432 107 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 432 670 - - 0,00 - + 0 28 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 848 630 - - 0,00 - + 0 44 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 848 142 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 848 107 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 858 670 - - 0,00 - + 0 28 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 318 630 - - 0,00 - + 0 44 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 318 142 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 318 107 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 318 670 - - 0,00 - + 0 28 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 640 630 - - 0,00 - + 0 44 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 640 142 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 640 107 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 640 670 - - 0,00 - + 0 28 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 962 630 - - 0,00 - + 0 44 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 962 142 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 962 107 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 962 670 - - 0,00 - + 0 28 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 270 630 - - 0,00 - + 0 44 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 270 142 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 270 107 - - 0,00 - + 0 27 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 270 670 - - 0,00 - + 0 28 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 502 630 - - 0,00 - + 0 44 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 502 142 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 502 107 - - 0,00 - + 0 27 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 502 670 - - 0,00 - + 0 28 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 734 630 - - 0,00 - + 0 44 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 734 142 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 734 107 - - 0,00 - + 0 27 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 734 670 - - 0,00 - + 0 28 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 966 630 - - 0,00 - + 0 44 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 966 142 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 966 107 - - 0,00 - + 0 27 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 966 670 - - 0,00 - + 0 28 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 224 630 - - 0,00 - + 0 44 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 224 142 - - 0,00 - + 0 27 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 224 107 - - 0,00 - + 0 27 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 224 670 - - 0,00 - + 0 28 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 432 630 - - 0,00 - + 0 44 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 432 142 - - 0,00 - + 0 27 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 432 107 - - 0,00 - + 0 27 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 432 670 - - 0,00 - + 0 28 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 640 630 - - 0,00 - + 0 44 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 640 142 - - 0,00 - + 0 27 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 640 107 - - 0,00 - + 0 27 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 640 670 - - 0,00 - + 0 28 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 848 630 - - 0,00 - + 0 44 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 848 142 - - 0,00 - + 0 27 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 848 107 - - 0,00 - + 0 27 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 848 670 - - 0,00 - + 0 28 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 1056 630 - - 0,00 - + 0 44 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 1056 142 - - 0,00 - + 0 27 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 1056 107 - - 0,00 - + 0 27 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 1056 670 - - 0,00 - + 0 28 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 125 630 - - 0,00 - + 0 44 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 125 142 - - 0,00 - + 0 27 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 125 107 - - 0,00 - + 0 27 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 125 670 - - 0,00 - + 0 28 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 333 630 - - 0,00 - + 0 44 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 333 142 - - 0,00 - + 0 27 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 333 107 - - 0,00 - + 0 27 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 333 670 - - 0,00 - + 0 28 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 541 630 - - 0,00 - + 0 44 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 541 142 - - 0,00 - + 0 27 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 541 107 - - 0,00 - + 0 27 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 541 670 - - 0,00 - + 0 28 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 749 630 - - 0,00 - + 0 44 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 749 142 - - 0,00 - + 0 27 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 749 107 - - 0,00 - + 0 27 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 749 670 - - 0,00 - + 0 28 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 957 630 - - 0,00 - + 0 44 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 957 142 - - 0,00 - + 0 27 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 957 107 - - 0,00 - + 0 27 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 957 670 - - 0,00 - + 0 28 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 1165 630 - - 0,00 - + 0 44 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 1165 142 - - 0,00 - + 0 27 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 1165 107 - - 0,00 - + 0 27 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 1165 670 - - 0,00 - + 0 28 - 160 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - - - Int - + + + + + + + + + + + + + + 7 - - - Int - + + 4 - - - Int - + + 4 - - - - String - + Int + + Horizontal - - - \ No newline at end of file + String + + + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenSing.xml b/Output/Themes/Ambient/Screens/ScreenSing.xml index d0fb5eb1..26c34e8e 100644 --- a/Output/Themes/Ambient/Screens/ScreenSing.xml +++ b/Output/Themes/Ambient/Screens/ScreenSing.xml @@ -1,2804 +1,2056 @@ - - - + + + + ScreenSing 7 - - + + + None - + + + + Score - - 190 - 10 - -1,00 - 900 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 190 + 10 + 900 + 50 + -1 + + + + Lyrics - - 40 - 600 - -0,75 - 1200 - 90 - - - StaticColor - - - - - - + + StaticColor + + + 40 + 600 + 1200 + 90 + -0.75 + + + + Lyrics - - 40 - 7 - -0,75 - 1200 - 93 - - - StaticColor - - - - - - + + StaticColor + + + 40 + 7 + 1200 + 93 + -0.75 + + + + Lyrics - - 40 - 7 - -0,75 - 1200 - 93 - - - StaticColor - - - - - - + + StaticColor + + + 40 + 7 + 1200 + 93 + -0.75 + + + + TimeBar - - 40 - 696 - -0,75 - 1200 - 21 - - - StaticColor - - - - - - + + StaticColor + + + 40 + 696 + 1200 + 21 + -0.75 + + + + TimeLine - - 44 - 702 - -1,00 - 1090 - 10 - - - StaticColor - - - - - - + + StaticColor + + + 44 + 702 + 1090 + 10 + -1 + + + + TimeLine - - 44 - 696 - -1,00 - 1090 - 9 - - - TimeBar - - - - - - + + TimeBar + + + 44 + 696 + 1090 + 9 + -1 + + + + TimeLine - - 44 - 696 - -1,00 - 1090 - 9 - - - TimeBarSentence - - - - - - + + TimeBarSentence + + + 44 + 696 + 1090 + 9 + -1 + + + + Pointer - - 49 - 702 - -1,25 - 2 - 10 - - - 0,00 - 0,00 - 0,00 - 1,00 - - - - - - + + + 49 + 702 + 2 + 10 + -1.25 + + + + LyricHelper - - 40 - 600 - -1,00 - 45 - 45 - - - LyricHelper - - - - - - + + LyricHelper + + + 40 + 600 + 45 + 45 + -1 + + + + LyricHelper - - 40 - 12 - -1,00 - 45 - 45 - - - LyricHelper - - - - - - + + LyricHelper + + + 40 + 12 + 45 + 45 + -1 + + + + LyricHelper - - 40 - 12 - -1,00 - 45 - 45 - - - LyricHelper - - - - - - + + LyricHelper + + + 40 + 12 + 45 + 45 + -1 + + + + PauseBG - - 0 - 0 - -2,10 - 1280 - 720 - - - Visible - - - - - - + + Visible + + + 0 + 0 + 1280 + 720 + -2.1 + + + + Invisible - - 1150 - 350 - -0,75 - 100 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 1150 + 350 + 100 + 50 + -0.75 + + + + Invisible - - 40 - 360 - -0,75 - 190 - 190 - - - 1,00 - 1,00 - 1,00 - 0,40 - - - - - - + + + 40 + 360 + 190 + 190 + -0.75 + + + + Invisible - - 1150 - 150 - -0,75 - 100 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 1150 + 150 + 100 + 50 + -0.75 + + + + Invisible - - 40 - 160 - -0,75 - 165 - 165 - - - 1,00 - 1,00 - 1,00 - 0,40 - - - - - - + + + 40 + 160 + 165 + 165 + -0.75 + + + + Invisible - - 1150 - 350 - -0,75 - 100 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 1150 + 350 + 100 + 50 + -0.75 + + + + Invisible - - 40 - 360 - -0,75 - 165 - 165 - - - 1,00 - 1,00 - 1,00 - 0,40 - - - - - - + + + 40 + 360 + 165 + 165 + -0.75 + + + + Invisible - - 1150 - 10 - -0,75 - 100 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 1150 + 10 + 100 + 50 + -0.75 + + + + Invisible - - 40 - 111 - -0,75 - 140 - 140 - - - 1,00 - 1,00 - 1,00 - 0,40 - - - - - - + + + 40 + 111 + 140 + 140 + -0.75 + + + + Invisible - - 1150 - 210 - -0,75 - 100 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 1150 + 210 + 100 + 50 + -0.75 + + + + Invisible - - 40 - 274 - -0,75 - 140 - 140 - - - 1,00 - 1,00 - 1,00 - 0,40 - - - - - - + + + 40 + 274 + 140 + 140 + -0.75 + + + + Invisible - - 1150 - 410 - -0,75 - 100 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 1150 + 410 + 100 + 50 + -0.75 + + + + Invisible - - 40 - 442 - -0,75 - 140 - 140 - - - 1,00 - 1,00 - 1,00 - 0,40 - - - - - - + + + 40 + 442 + 140 + 140 + -0.75 + + + + Invisible - - 528 - 150 - -0,75 - 100 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 528 + 150 + 100 + 50 + -0.75 + + + + Invisible - - 40 - 160 - -0,75 - 165 - 165 - - - 1,00 - 1,00 - 1,00 - 0,40 - - - - - - + + + 40 + 160 + 165 + 165 + -0.75 + + + + Invisible - - 528 - 350 - -0,75 - 100 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 528 + 350 + 100 + 50 + -0.75 + + + + Invisible - - 40 - 360 - -0,75 - 165 - 165 - - - 1,00 - 1,00 - 1,00 - 0,40 - - - - - - + + + 40 + 360 + 165 + 165 + -0.75 + + + + Invisible - - 1150 - 150 - -0,75 - 100 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 1150 + 150 + 100 + 50 + -0.75 + + + + Invisible - - 1103 - 160 - -0,75 - 165 - 165 - - - 1,00 - 1,00 - 1,00 - 0,40 - - - - - - + + + 1103 + 160 + 165 + 165 + -0.75 + + + + Invisible - - 1150 - 350 - -0,75 - 100 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 1150 + 350 + 100 + 50 + -0.75 + + + + Invisible - - 1103 - 360 - -0,75 - 165 - 165 - - - 1,00 - 1,00 - 1,00 - 0,40 - - - - - - + + + 1103 + 360 + 165 + 165 + -0.75 + + + + Invisible - - 528 - 10 - -0,75 - 100 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 528 + 10 + 100 + 50 + -0.75 + + + + Invisible - - 40 - 111 - -0,75 - 140 - 140 - - - 1,00 - 1,00 - 1,00 - 0,40 - - - - - - + + + 40 + 111 + 140 + 140 + -0.75 + + + + Invisible - - 528 - 210 - -0,75 - 100 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 528 + 210 + 100 + 50 + -0.75 + + + + Invisible - - 40 - 274 - -0,75 - 140 - 140 - - - 1,00 - 1,00 - 1,00 - 0,40 - - - - - - + + + 40 + 274 + 140 + 140 + -0.75 + + + + Invisible - - 528 - 410 - -0,75 - 100 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 528 + 410 + 100 + 50 + -0.75 + + + + Invisible - - 40 - 442 - -0,75 - 140 - 140 - - - 1,00 - 1,00 - 1,00 - 0,40 - - - - - - + + + 40 + 442 + 140 + 140 + -0.75 + + + + Invisible - - 1150 - 150 - -0,75 - 100 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 1150 + 150 + 100 + 50 + -0.75 + + + + Invisible - - 1103 - 160 - -0,75 - 165 - 165 - - - 1,00 - 1,00 - 1,00 - 0,40 - - - - - - + + + 1103 + 160 + 165 + 165 + -0.75 + + + + Invisible - - 1150 - 350 - -0,75 - 100 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 1150 + 350 + 100 + 50 + -0.75 + + + + Invisible - - 1103 - 360 - -0,75 - 165 - 165 - - - 1,00 - 1,00 - 1,00 - 0,40 - - - - - - + + + 1103 + 360 + 165 + 165 + -0.75 + + + + Invisible - - 528 - 10 - -0,75 - 100 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 528 + 10 + 100 + 50 + -0.75 + + + + Invisible - - 40 - 111 - -0,75 - 140 - 140 - - - 1,00 - 1,00 - 1,00 - 0,40 - - - - - - + + + 40 + 111 + 140 + 140 + -0.75 + + + + Invisible - - 528 - 210 - -0,75 - 100 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 528 + 210 + 100 + 50 + -0.75 + + + + Invisible - - 40 - 274 - -0,75 - 140 - 140 - - - 1,00 - 1,00 - 1,00 - 0,40 - - - - - - + + + 40 + 274 + 140 + 140 + -0.75 + + + + Invisible - - 528 - 410 - -0,75 - 100 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 528 + 410 + 100 + 50 + -0.75 + + + + Invisible - - 40 - 442 - -0,75 - 140 - 140 - - - 1,00 - 1,00 - 1,00 - 0,40 - - - - - - + + + 40 + 442 + 140 + 140 + -0.75 + + + + Invisible - - 1150 - 10 - -0,75 - 100 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 1150 + 10 + 100 + 50 + -0.75 + + + + Invisible - - 1103 - 111 - -0,75 - 140 - 140 - - - 1,00 - 1,00 - 1,00 - 0,40 - - - - - - + + + 1103 + 111 + 140 + 140 + -0.75 + + + + Invisible - - 1150 - 210 - -0,75 - 100 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 1150 + 210 + 100 + 50 + -0.75 + + + + Invisible - - 1103 - 274 - -0,75 - 140 - 140 - - - 1,00 - 1,00 - 1,00 - 0,40 - - - - - - + + + 1103 + 274 + 140 + 140 + -0.75 + + + + Invisible - - 1150 - 410 - -0,75 - 100 - 50 - - - StaticColor - - - - - - + + StaticColor + + + 1150 + 410 + 100 + 50 + -0.75 + + + + Invisible - - 1103 - 442 - -0,75 - 140 - 140 - - - 1,00 - 1,00 - 1,00 - 0,40 - - - - - - + + + 1103 + 442 + 140 + 140 + -0.75 + + + + + + 640 20 - - -1,00 - + -1 27 - 880 - - - TextBlack - - - TextBlack - + + TextBlack + + + TextBlack + Center - Center - - Normal - - - - - - - + + + 1214 697 - - -1,00 - + -1 20 - - - - TextWhite - - - TextWhite - + 0 + + TextWhite + + + TextWhite + Right - Center - - Normal - - - - - - - + + + 640 170 - - -2,11 - + -2.11 90 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Center - Center - - Normal - TR_SCREENSING_PAUSE - - - - - - + + + 40 80 - - -1,00 - + -1 30 - - - - TextSColor - - - TextSColor - + 0 + + TextSColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 40 585 - - -1,00 - + -1 30 - - - - TextSColor - - - TextSColor - + 0 + + TextSColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 640 20 - - -1,00 - + -1 27 - - - - TextColor - - - TextSColor - + 0 + + TextColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 1240 355 - - -1,00 - + -1 198 - - - - Player1Dim2 - - - TextSColor - + 0 + + Player1Dim2 + + + TextSColor + Right - Center - - Normal - - - - - - - + + + 110 513 - - -1,00 - + -1 28 - - - - 1,00 - 1,00 - 1,00 - 0,40 - - - TextSColor - + 0 + + + TextSColor + Center - Center - - Outline - - - - - - - + + + 1240 155 - - -1,00 - + -1 173 - - - - Player1Dim2 - - - Player1 - + 0 + + Player1Dim2 + + + Player1 + Right - Center - - Normal - - - - - - - + + + 110 288 - - -1,00 - + -1 28 - - - - 1,00 - 1,00 - 1,00 - 0,40 - - - Player1 - + 0 + + + Player1 + Center - Center - - Outline - - - - - - - + + + 1240 355 - - -1,00 - + -1 173 - - - - Player2Dim2 - - - Player2 - + 0 + + Player2Dim2 + + + Player2 + Right - Center - - Normal - - - - - - - + + + 110 488 - - -1,00 - + -1 28 - - - - 1,00 - 1,00 - 1,00 - 0,40 - - - Player2 - + 0 + + + Player2 + Center - Center - - Outline - - - - - - - + + + 1240 106 - - -1,00 - + -1 148 - - - - Player1Dim2 - - - Player1 - + 0 + + Player1Dim2 + + + Player1 + Right - Center - - Normal - - - - - - - + + + 110 219 - - -1,00 - + -1 28 - - - - 1,00 - 1,00 - 1,00 - 0,40 - - - Player1 - + 0 + + + Player1 + Center - Center - - Outline - - - - - - - + + + 1240 269 - - -1,00 - + -1 148 - - - - Player2Dim2 - - - Player2 - + 0 + + Player2Dim2 + + + Player2 + Right - Center - - Normal - - - - - - - + + + 110 382 - - -1,00 - + -1 28 - - - - 1,00 - 1,00 - 1,00 - 0,40 - - - Player2 - + 0 + + + Player2 + Center - Center - - Outline - - - - - - - + + + 1240 437 - - -1,00 - + -1 148 - - - - Player3Dim2 - - - Player3 - + 0 + + Player3Dim2 + + + Player3 + Right - Center - - Normal - - - - - - - + + + 110 550 - - -1,00 - + -1 28 - - - - 1,00 - 1,00 - 1,00 - 0,40 - - - Player3 - + 0 + + + Player3 + Center - Center - - Outline - - - - - - - + + + 324 155 - - -1,00 - + -1 173 - - - - Player1Dim2 - - - Player1 - + 0 + + Player1Dim2 + + + Player1 + Center - Center - - Normal - - - - - - - + + + 110 288 - - -1,00 - + -1 28 - - - - 1,00 - 1,00 - 1,00 - 0,40 - - - Player1 - + 0 + + + Player1 + Center - Center - - Outline - - - - - - - + + + 324 355 - - -1,00 - + -1 173 - - - - Player2Dim2 - - - Player2 - + 0 + + Player2Dim2 + + + Player2 + Center - Center - - Normal - - - - - - - + + + 110 488 - - -1,00 - + -1 28 - - - - 1,00 - 1,00 - 1,00 - 0,40 - - - Player2 - + 0 + + + Player2 + Center - Center - - Outline - - - - - - - + + + 967 155 - - -1,00 - + -1 173 - - - - Player3Dim2 - - - Player3 - + 0 + + Player3Dim2 + + + Player3 + Center - Center - - Normal - - - - - - - + + + 1173 288 - - -1,00 - + -1 28 - - - - 1,00 - 1,00 - 1,00 - 0,40 - - - Player3 - + 0 + + + Player3 + Center - Center - - Outline - - - - - - - + + + 967 355 - - -1,00 - + -1 173 - - - - Player4Dim2 - - - Player4 - + 0 + + Player4Dim2 + + + Player4 + Center - Center - - Normal - - - - - - - + + + 1173 488 - - -1,00 - + -1 28 - - - - 1,00 - 1,00 - 1,00 - 0,40 - - - Player4 - + 0 + + + Player4 + Center - Center - - Outline - - - - - - - + + + 324 106 - - -1,00 - + -1 148 - - - - Player1Dim2 - - - Player1 - + 0 + + Player1Dim2 + + + Player1 + Center - Center - - Normal - - - - - - - + + + 110 219 - - -1,00 - + -1 28 - - - - 1,00 - 1,00 - 1,00 - 0,40 - - - Player1 - + 0 + + + Player1 + Center - Center - - Outline - - - - - - - + + + 324 269 - - -1,00 - + -1 148 - - - - Player2Dim2 - - - Player2 - + 0 + + Player2Dim2 + + + Player2 + Center - Center - - Normal - - - - - - - + + + 110 382 - - -1,00 - + -1 28 - - - - 1,00 - 1,00 - 1,00 - 0,40 - - - Player2 - + 0 + + + Player2 + Center - Center - - Outline - - - - - - - + + + 324 437 - - -1,00 - + -1 148 - - - - Player3Dim2 - - - Player3 - + 0 + + Player3Dim2 + + + Player3 + Center - Center - - Normal - - - - - - - + + + 110 550 - - -1,00 - + -1 28 - - - - 1,00 - 1,00 - 1,00 - 0,40 - - - Player3 - + 0 + + + Player3 + Center - Center - - Outline - - - - - - - + + + 967 155 - - -1,00 - + -1 173 - - - - Player4Dim2 - - - Player4 - + 0 + + Player4Dim2 + + + Player4 + Center - Center - - Normal - - - - - - - + + + 1173 288 - - -1,00 - + -1 28 - - - - 1,00 - 1,00 - 1,00 - 0,40 - - - Player4 - + 0 + + + Player4 + Center - Center - - Outline - - - - - - - + + + 967 355 - - -1,00 - + -1 173 - - - - Player5Dim2 - - - Player5 - + 0 + + Player5Dim2 + + + Player5 + Center - Center - - Normal - - - - - - - + + + 1173 488 - - -1,00 - + -1 28 - - - - 1,00 - 1,00 - 1,00 - 0,40 - - - Player5 - + 0 + + + Player5 + Center - Center - - Outline - - - - - - - + + + 324 106 - - -1,00 - + -1 148 - - - - Player1Dim2 - - - Player1 - + 0 + + Player1Dim2 + + + Player1 + Center - Center - - Normal - - - - - - - + + + 110 219 - - -1,00 - + -1 28 - - - - 1,00 - 1,00 - 1,00 - 0,40 - - - Player1 - + 0 + + + Player1 + Center - Center - - Outline - - - - - - - + + + 324 269 - - -1,00 - + -1 148 - - - - Player2Dim2 - - - Player2 - + 0 + + Player2Dim2 + + + Player2 + Center - Center - - Normal - - - - - - - + + + 110 382 - - -1,00 - + -1 28 - - - - 1,00 - 1,00 - 1,00 - 0,40 - - - Player2 - + 0 + + + Player2 + Center - Center - - Outline - - - - - - - + + + 324 437 - - -1,00 - + -1 148 - - - - Player3Dim2 - - - Player3 - + 0 + + Player3Dim2 + + + Player3 + Center - Center - - Normal - - - - - - - + + + 110 550 - - -1,00 - + -1 28 - - - - 1,00 - 1,00 - 1,00 - 0,40 - - - Player3 - + 0 + + + Player3 + Center - Center - - Outline - - - - - - - + + + 967 106 - - -1,00 - + -1 148 - - - - Player4Dim2 - - - Player4 - + 0 + + Player4Dim2 + + + Player4 + Center - Center - - Normal - - - - - - - + + + 1173 219 - - -1,00 - + -1 28 - - - - 1,00 - 1,00 - 1,00 - 0,40 - - - Player4 - + 0 + + + Player4 + Center - Center - - Outline - - - - - - - + + + 967 269 - - -1,00 - + -1 148 - - - - Player5Dim2 - - - Player5 - + 0 + + Player5Dim2 + + + Player5 + Center - Center - - Normal - - - - - - - + + + 1173 382 - - -1,00 - + -1 28 - - - - 1,00 - 1,00 - 1,00 - 0,40 - - - Player5 - + 0 + + + Player5 + Center - Center - - Outline - - - - - - - + + + 967 437 - - -1,00 - + -1 148 - - - - Player6Dim2 - - - Player6 - + 0 + + Player6Dim2 + + + Player6 + Center - Center - - Normal - - - - - - - + + + 1173 550 - - -1,00 - + -1 28 - - - - 1,00 - 1,00 - 1,00 - 0,40 - - - Player6 - + 0 + + + Player6 + Center - Center - - Outline - - - - - - - + + + + + + + + + + + + + 637 + 600 + 1200 + 42 + -1 + + + LyricMainColor + + + LyricHighlight + + + + + 637 + 642 + 1200 + 38 + -1 + + + LyricSubColor + + + LyricHighlight + + + + + 637 + 12 + 1200 + 42 + -1 + + + LyricMainColor + + + LyricHighlight + + + + + 637 + 54 + 1200 + 38 + -1 + + + LyricSubColor + + + LyricHighlight + + + + + 637 + 12 + 1200 + 42 + -1 + + + LyricMainColor + + + LyricHighlight + + + + + 637 + 54 + 1200 + 38 + -1 + + + LyricSubColor + + + LyricHighlight + + + + + + NoteLeft - NoteMiddle - NoteRight - NoteBackgroundLeft - NoteBackgroundMiddle - NoteBackgroundRight - Star - ToneHelper - - PerfectNoteStar - - - + PerfectNoteStar - 35 - 350 - -1,50 - 1210 - 200 - 35 - 150 - -1,50 - 1210 - 175 - 35 - 350 - -1,50 - 1210 - 175 - 35 - 105 - -1,50 - 1210 - 150 - 35 - 268 - -1,50 - 1210 - 150 - 35 - 436 - -1,50 - 1210 - 150 - 35 - 150 - -1,50 - 578 - 175 - 35 - 350 - -1,50 - 578 - 175 - 678 - 150 - -1,50 - 578 - 175 - 678 - 350 - -1,50 - 578 - 175 - 35 - 105 - -1,50 - 578 - 150 - 35 - 268 - -1,50 - 578 - 150 - 35 - 436 - -1,50 - 578 - 150 - 678 - 150 - -1,50 - 578 - 175 - 678 - 350 - -1,50 - 578 - 175 - 35 - 105 - -1,50 - 578 - 150 - 35 - 268 - -1,50 - 578 - 150 - 35 - 436 - -1,50 - 578 - 150 - 678 - 105 - -1,50 - 578 - 150 - 678 - 268 - -1,50 - 578 - 150 - 678 - 436 - -1,50 - 578 - 150 + + + 35 + 350 + 1210 + 200 + -1.5 + + + + + 35 + 150 + 1210 + 175 + -1.5 + + + + + 35 + 350 + 1210 + 175 + -1.5 + + + + + 35 + 105 + 1210 + 150 + -1.5 + + + + + 35 + 268 + 1210 + 150 + -1.5 + + + + + 35 + 436 + 1210 + 150 + -1.5 + + + + + 35 + 150 + 578 + 175 + -1.5 + + + + + 35 + 350 + 578 + 175 + -1.5 + + + + + 678 + 150 + 578 + 175 + -1.5 + + + + + 678 + 350 + 578 + 175 + -1.5 + + + + + 35 + 105 + 578 + 150 + -1.5 + + + + + 35 + 268 + 578 + 150 + -1.5 + + + + + 35 + 436 + 578 + 150 + -1.5 + + + + + 678 + 150 + 578 + 175 + -1.5 + + + + + 678 + 350 + 578 + 175 + -1.5 + + + + + 35 + 105 + 578 + 150 + -1.5 + + + + + 35 + 268 + 578 + 150 + -1.5 + + + + + 35 + 436 + 578 + 150 + -1.5 + + + + + 678 + 105 + 578 + 150 + -1.5 + + + + + 678 + 268 + 578 + 150 + -1.5 + + + + + 678 + 436 + 578 + 150 + -1.5 + + - - - \ No newline at end of file + + + + + + + + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenSong.xml b/Output/Themes/Ambient/Screens/ScreenSong.xml index 328b65d3..05193703 100644 --- a/Output/Themes/Ambient/Screens/ScreenSong.xml +++ b/Output/Themes/Ambient/Screens/ScreenSong.xml @@ -1,2216 +1,1719 @@ - - - + + + + ScreenSong 5 - - + + + Video - + - BG_Default - - - - BackgroundColor - - - + + BackgroundColor + + + + + SongMenu - - 40 - 600 - 0,00 - 1200 - 50 - - - StaticColor - - - - - 10 + + StaticColor + + + 40 + 600 + 1200 + 50 + 0 + + 26 + 10 - - - + + Menu - - 40 - 600 - 0,00 - 1200 - 50 - - - StaticColor - - - - - 10 + + StaticColor + + + 40 + 600 + 1200 + 50 + 0 + + 26 + 10 - - - + + SongMenuBG - - 40 - 40 - -2,10 - 360 - 360 - - - 1,00 - 1,00 - 1,00 - 1,00 - - - - - - + + + 40 + 40 + 360 + 360 + -2.1 + + + + + + 1070 65 - - -2,11 - + -2.11 42 - 350 - - - Player1 - - - Player1 - + + Player1 + + + Player1 + Left - Center - - Outline - - - - - - - + + + 1070 135 - - -2,11 - + -2.11 42 - 350 - - - Player2 - - - Player2 - + + Player2 + + + Player2 + Left - Center - - Outline - - - - - - - + + + 1070 205 - - -2,11 - + -2.11 42 - 350 - - - Player3 - - - Player3 - + + Player3 + + + Player3 + Left - Center - - Outline - - - - - - - + + + 1070 275 - - -2,11 - + -2.11 42 - 350 - - - Player4 - - - Player4 - + + Player4 + + + Player4 + Left - Center - - Outline - - - - - - - + + + 1070 345 - - -2,11 - + -2.11 42 - 350 - - - Player5 - - - Player5 - + + Player5 + + + Player5 + Left - Center - - Outline - - - - - - - + + + 1070 415 - - -2,11 - + -2.11 42 - 350 - - - Player6 - - - Player6 - + + Player6 + + + Player6 + Left - Center - - Outline - - - - - - - + + + 220 612 - - 0,00 - + 0 27 - 340 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - 24 - 26 + + 24 + 26 - - - + + 825 612 - - 0,00 - + 0 27 - 830 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - - - 24 - 26 + + 24 + 26 - - - + + 400 612 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Right - Center - - Outline - TR_SCREENSONG_SEARCH - - - - - - + + + 410 612 - - 0,00 - + 0 27 - - - - StaticColor - - - TextSColor - + 0 + + StaticColor + + + TextSColor + Left - Center - - Outline - - - - - - - + + + 220 47 - - -2,11 - + -2.11 34 - 350 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - TR_SCREENSONG_SONGOPTIONS - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + CoverTile - CoverBackground - DuetIcon - VideoIcon - MedleyCalcIcon - MedleyTagIcon - - - 1,00 - 1,00 - 1,00 - 0,20 - + - 6 - 4 - - 10,00 - - 10,00 - 4 - 4 - - 410 - 40 - -1,00 - 830 - 550 - - 410 - 40 - -1,00 - 550 - 550 - - + 10 + 10 + + 410 + 40 + 830 + 550 + -1 + + + 410 + 40 + 550 + 550 + -1 + + 222 416 - - -1,01 - + -1.01 39 - 340 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - + - - + 222 456 - - -1,01 - + -1.01 32 - 340 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - + - - + 222 490 - - -1,01 - + -1.01 28 - 340 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Center - Center - - Outline - - - - + - - + CoverBackground - - 40 - 40 - -1,00 - 360 - 360 - - - Visible - - - + + Visible + + + 40 + 40 + 360 + 360 + -1 + + - - + CoverBackground - - 40 - 40 - -1,00 - 360 - 550 - - - StaticColor - - - + + StaticColor + + + 40 + 40 + 360 + 550 + -1 + + - - + DuetIcon - - 200 - 530 - -1,00 - 40 - 40 - - - StaticColor - - - + + StaticColor + + + 200 + 530 + 40 + 40 + -1 + + - - + VideoIcon - - 120 - 530 - -1,00 - 40 - 40 - - - StaticColor - - - + + StaticColor + + + 120 + 530 + 40 + 40 + -1 + + - - + MedleyCalcIcon - - 280 - 530 - -1,00 - 40 - 40 - - - StaticColor - - - + + StaticColor + + + 280 + 530 + 40 + 40 + -1 + + - - + MedleyTagIcon - - 280 - 530 - -1,00 - 40 - 40 - - - StaticColor - - - + + StaticColor + + + 280 + 530 + 40 + 40 + -1 + + - - - 970 - 80 - -0,90 - 295 - 460 - 50,00 - + + + + + Button + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + + 40 + 135 + 360 + 40 + -2.11 + + + 45 + 140 + 30 + 30 + -2.12 + + + 365 + 140 + 30 + 30 + -2.12 + + + ButtonColor + + + ButtonSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 25 + 0 + 0 + 280 + Outline + Bold + 1 + + + Button + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + + 40 + 190 + 360 + 40 + -2.11 + + + 45 + 195 + 30 + 30 + -2.12 + + + 365 + 195 + 30 + 30 + -2.12 + + + ButtonColor + + + ButtonSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 25 + 0 + 0 + 280 + Outline + Bold + 1 + + + Button + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + + 40 + 180 + 360 + 40 + -2.11 + + + 45 + 190 + 30 + 30 + -2.12 + + + 365 + 190 + 30 + 30 + -2.12 + + + ButtonColor + + + ButtonSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 25 + 0 + 0 + 280 + Outline + Bold + 1 + + + Button + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + SelectSlideArrowLeft + SelectSlideArrowRight + SelectSlide + + 40 + 90 + 360 + 40 + -2.11 + + + 45 + 100 + 30 + 30 + -2.12 + + + 365 + 100 + 30 + 30 + -2.12 + + + ButtonColor + + + ButtonSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 25 + 0 + 0 + 280 + Outline + Bold + 3 + + + + + + + + + 970 + 80 + 295 + 460 + -0.9 + + 50 CoverTile - CoverTile - - - StaticColorAlpha - - - StaticColor - - - - + + StaticColorAlpha + + + StaticColor + + 54 5 - - -1,01 - + -1.01 22 - 235 - - - StaticColor - - - TextSColor - + + StaticColor + + + TextSColor + Left - Center - - Outline - TR_SCREENSONG_ARTIST_TITLE - - - - - - - Menu - - 970 - 550 - -1,00 - 295 - 40 - - - StaticColor - - - - - - - Menu - - 970 - 40 - -1,00 - 295 - 40 - - - StaticColor - - - - - - + + + - - 4 - 2 - -1,00 - 46 - 46 - - - Visible - - - + + Visible + + + 4 + 2 + 46 + 46 + -1 + + - - - Button - - SelectSlideArrowLeft - - SelectSlideArrowRight - - - - SelectSlideArrowLeft - - SelectSlideArrowRight - - - - 0 - 28 - -1,01 - 293 - 24 - - 54 - 30 - -1,02 - 20 - 20 - - 271 - 30 - -1,02 - 20 - 20 - - - ButtonColor - - - ButtonSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 22,00 - - 25,00 - - - 230,00 - - Outline - - Bold - - 1 - - - + + Menu + + StaticColor + + + 970 + 40 + 295 + 40 + -1 + + + + + Menu + + StaticColor + + + 970 + 550 + 295 + 40 + -1 + + + + Invisible - Invisible - - 975 - 45 - -1,01 - 220 - 25 - - - ButtonColor - - - ButtonSColor - - + + 975 + 45 + 220 + 25 + -1.01 + + + ButtonColor + + + ButtonSColor + + 0 0 - + 0 25 - 220 - - - ButtonTextColor - - - ButtonTextSColor - + + ButtonTextColor + + + ButtonTextSColor + Left - Center - - Outline - + - - - - - - + false + + - - + CloseIcon - CloseIcon - - 1215 - 42 - -1,01 - 35 - 35 - - - ButtonColor - - - ButtonSColor - - + + 1215 + 42 + 35 + 35 + -1.01 + + + ButtonColor + + + ButtonSColor + + 180 7 - + 0 25 - 350 - - - ButtonTextColor - - - ButtonTextSColor - + + ButtonTextColor + + + ButtonTextSColor + Center - Center - - Outline - + - - - - - - + false + + - - - DeleteIcon - - DeleteIcon - - 1215 - 553 - -1,01 - 35 - 35 - - - ButtonColor - - - ButtonSColor - - - 180 - 5 - - 25 - - 350 - - - ButtonTextColor - - - ButtonTextSColor - - Center - - Center - - - - Outline - - - - - - - - - - - - + SaveIcon - SaveIcon - - 1175 - 553 - -1,01 - 35 - 35 - - - ButtonColor - - - ButtonSColor - - + + 1175 + 553 + 35 + 35 + -1.01 + + + ButtonColor + + + ButtonSColor + + 180 5 - + 0 25 - 350 - - - ButtonTextColor - - - ButtonTextSColor - + + ButtonTextColor + + + ButtonTextSColor + Center - Center - - Outline - + - - - - - - + false + + - - - SingIcon - - SingIcon - - 975 - 553 - -1,01 - 35 - 35 - - - ButtonColor - - - ButtonSColor - - + + DeleteIcon + DeleteIcon + + 1215 + 553 + 35 + 35 + -1.01 + + + ButtonColor + + + ButtonSColor + + 180 5 - + 0 25 - 350 - - - ButtonTextColor - - - ButtonTextSColor - + + ButtonTextColor + + + ButtonTextSColor + Center - Center - - Outline - + - - - - - - + false + + + + + SingIcon + SingIcon + + 975 + 553 + 35 + 35 + -1.01 + + + ButtonColor + + + ButtonSColor + + + 180 + 5 + 0 + 25 + 350 + + ButtonTextColor + + + ButtonTextSColor + + Center + Center + + Outline + + + + false + + + + + 0 + 0 + 0 + 0 + 0 + + + 0 + 0 + 0 + 0 + 0 + + + 0 + 0 + 0 + 0 + 0 + + + + + + + + + 0 + 0 + 0 + 0 + Normal + 0 + - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenTest.xml b/Output/Themes/Ambient/Screens/ScreenTest.xml index 2137eab8..5e3c37a6 100644 --- a/Output/Themes/Ambient/Screens/ScreenTest.xml +++ b/Output/Themes/Ambient/Screens/ScreenTest.xml @@ -1,17 +1,18 @@  - - - 1 - - + + + ScreenSong + 5 + + + Video - + - BG_Default - - - BackgroundColor - - - \ No newline at end of file + + BackgroundColor + + + + diff --git a/Vocaluxe/Base/CConfig.cs b/Vocaluxe/Base/CConfig.cs index d7aee117..ff240aee 100644 --- a/Vocaluxe/Base/CConfig.cs +++ b/Vocaluxe/Base/CConfig.cs @@ -91,6 +91,7 @@ namespace Vocaluxe.Base public static EFadePlayerInfo FadePlayerInfo = EFadePlayerInfo.TR_CONFIG_FADEPLAYERINFO_OFF; public static ECoverLoading CoverLoading = ECoverLoading.TR_CONFIG_COVERLOADING_DYNAMIC; public static ELyricStyle LyricStyle = ELyricStyle.Slide; + public static bool LoadOldThemeFiles = false; // Sound public static EPlaybackLib PlayBackLib = EPlaybackLib.GstreamerSharp; diff --git a/Vocaluxe/Base/CGraphics.cs b/Vocaluxe/Base/CGraphics.cs index 564bdb22..fa427bef 100644 --- a/Vocaluxe/Base/CGraphics.cs +++ b/Vocaluxe/Base/CGraphics.cs @@ -172,6 +172,8 @@ namespace Vocaluxe.Base foreach (IMenu popup in _PopupScreens) popup.SaveTheme(); + + CParty.SaveThemes(); } public static void InitFirstScreen() diff --git a/Vocaluxe/Base/CMain.cs b/Vocaluxe/Base/CMain.cs index cf99c472..2af43f68 100644 --- a/Vocaluxe/Base/CMain.cs +++ b/Vocaluxe/Base/CMain.cs @@ -155,6 +155,11 @@ namespace Vocaluxe.Base { return CConfig.XMLSettings; } + + public bool GetLoadOldThemeFiles() + { + return CConfig.LoadOldThemeFiles; + } } class CBsettings : ISettings diff --git a/Vocaluxe/Base/CParty.cs b/Vocaluxe/Base/CParty.cs index 22bc3b33..469e8af9 100644 --- a/Vocaluxe/Base/CParty.cs +++ b/Vocaluxe/Base/CParty.cs @@ -93,6 +93,13 @@ namespace Vocaluxe.Base get { return _PartyModes.Count; } } + public static void SaveThemes() + { + foreach (KeyValuePair pair in _PartyModes) + pair.Value.PartyMode.SaveScreens(); + } + + public static List GetPartyModeInfos() { var infos = new List(); diff --git a/VocaluxeLib/IBasic.cs b/VocaluxeLib/IBasic.cs index 0583e189..e461c22b 100644 --- a/VocaluxeLib/IBasic.cs +++ b/VocaluxeLib/IBasic.cs @@ -62,6 +62,8 @@ namespace VocaluxeLib /// Get the uniform settings for writing XML files. ALWAYS use this! /// XmlWriterSettings GetXMLSettings(); + + bool GetLoadOldThemeFiles(); } public interface ISettings diff --git a/VocaluxeLib/Menu/CBackground.cs b/VocaluxeLib/Menu/CBackground.cs index 8a752512..9e9c8317 100644 --- a/VocaluxeLib/Menu/CBackground.cs +++ b/VocaluxeLib/Menu/CBackground.cs @@ -137,46 +137,6 @@ namespace VocaluxeLib.Menu return _ThemeLoaded; } - public bool SaveTheme(XmlWriter writer) - { - if (_ThemeLoaded) - { - writer.WriteStartElement(_Theme.Name); - - writer.WriteComment(": Background type: " + CHelper.ListStrings(Enum.GetNames(typeof(EBackgroundTypes)))); - writer.WriteElementString("Type", Enum.GetName(typeof(EBackgroundTypes), _Theme.Type)); - - writer.WriteComment(" PlayerSelector 100 diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml b/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml index 861abcb1..bbef2844 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml @@ -10,7 +10,14 @@ BG_Options - + + + 1 + 1 + 1 + 1 + + diff --git a/Output/Themes/Ambient/Screens/ScreenScore.xml b/Output/Themes/Ambient/Screens/ScreenScore.xml index b329a4cf..5e80539f 100644 --- a/Output/Themes/Ambient/Screens/ScreenScore.xml +++ b/Output/Themes/Ambient/Screens/ScreenScore.xml @@ -32,7 +32,14 @@ TextBG - + + + 0 + 0 + 0 + 0 + + 50 90 @@ -44,7 +51,14 @@ PointsBarBG - + + + 0 + 0 + 1 + 0.75 + + 560 180 @@ -61,7 +75,7 @@ 560 - 400 + 180 160 0 0 @@ -87,7 +101,14 @@ PointsBarBG - + + + 0 + 0 + 1 + 0.75 + + 352 180 @@ -130,7 +151,14 @@ PointsBarBG - + + + 1 + 0 + 0 + 0.75 + + 768 180 @@ -173,7 +201,14 @@ PointsBarBG - + + + 0 + 0 + 1 + 0.75 + + 238 180 @@ -216,7 +251,14 @@ PointsBarBG - + + + 1 + 0 + 0 + 0.75 + + 560 180 @@ -259,7 +301,14 @@ PointsBarBG - + + + 0 + 1 + 0 + 0.75 + + 882 180 @@ -302,7 +351,14 @@ PointsBarBG - + + + 0 + 0 + 1 + 0.75 + + 190 180 @@ -345,7 +401,14 @@ PointsBarBG - + + + 1 + 0 + 0 + 0.75 + + 422 180 @@ -388,7 +451,14 @@ PointsBarBG - + + + 0 + 1 + 0 + 0.75 + + 654 180 @@ -431,7 +501,14 @@ PointsBarBG - + + + 0.5 + 0 + 1 + 0.75 + + 886 180 @@ -474,7 +551,14 @@ PointsBarBG - + + + 0 + 0 + 1 + 0.75 + + 144 180 @@ -517,7 +601,14 @@ PointsBarBG - + + + 1 + 0 + 0 + 0.75 + + 352 180 @@ -560,7 +651,14 @@ PointsBarBG - + + + 0 + 1 + 0 + 0.75 + + 560 180 @@ -603,7 +701,14 @@ PointsBarBG - + + + 0.5 + 0 + 1 + 0.75 + + 768 180 @@ -646,7 +751,14 @@ PointsBarBG - + + + 1 + 0.8 + 0 + 0.75 + + 976 180 @@ -689,7 +801,14 @@ PointsBarBG - + + + 0 + 0 + 1 + 0.75 + + 45 180 @@ -732,7 +851,14 @@ PointsBarBG - + + + 1 + 0 + 0 + 0.75 + + 253 180 @@ -775,7 +901,14 @@ PointsBarBG - + + + 0 + 1 + 0 + 0.75 + + 461 180 @@ -818,7 +951,14 @@ PointsBarBG - + + + 0.5 + 0 + 1 + 0.75 + + 669 180 @@ -861,7 +1001,14 @@ PointsBarBG - + + + 1 + 0.8 + 0 + 0.75 + + 877 180 @@ -904,7 +1051,14 @@ PointsBarBG - + + + 1 + 0 + 0.5 + 0.75 + + 1085 180 diff --git a/Output/Themes/Ambient/Screens/ScreenSing.xml b/Output/Themes/Ambient/Screens/ScreenSing.xml index 26c34e8e..1eb6b73e 100644 --- a/Output/Themes/Ambient/Screens/ScreenSing.xml +++ b/Output/Themes/Ambient/Screens/ScreenSing.xml @@ -10,7 +10,14 @@ Pointer - + + + 0 + 0 + 0 + 1 + + - 49 + 44 702 2 10 @@ -210,7 +224,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 360 @@ -236,7 +257,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 160 @@ -262,7 +290,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 360 @@ -288,7 +323,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 111 @@ -314,7 +356,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 274 @@ -340,7 +389,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 442 @@ -366,7 +422,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 160 @@ -392,7 +455,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 360 @@ -418,7 +488,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 1103 160 @@ -444,7 +521,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 1103 360 @@ -470,7 +554,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 111 @@ -496,7 +587,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 274 @@ -522,7 +620,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 442 @@ -548,7 +653,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 1103 160 @@ -574,7 +686,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 1103 360 @@ -600,7 +719,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 111 @@ -626,7 +752,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 274 @@ -652,7 +785,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 442 @@ -678,7 +818,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 1103 111 @@ -704,7 +851,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 1103 274 @@ -730,7 +884,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 1103 442 @@ -881,7 +1042,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + TextSColor @@ -917,7 +1085,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player1 @@ -953,7 +1128,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player2 @@ -989,7 +1171,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player1 @@ -1025,7 +1214,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player2 @@ -1061,7 +1257,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player3 @@ -1097,7 +1300,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player1 @@ -1133,7 +1343,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player2 @@ -1169,7 +1386,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player3 @@ -1205,7 +1429,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player4 @@ -1241,7 +1472,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player1 @@ -1277,7 +1515,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player2 @@ -1313,7 +1558,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player3 @@ -1349,7 +1601,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player4 @@ -1385,7 +1644,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player5 @@ -1421,7 +1687,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player1 @@ -1457,7 +1730,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player2 @@ -1493,7 +1773,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player3 @@ -1529,7 +1816,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player4 @@ -1565,7 +1859,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player5 @@ -1601,7 +1902,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player6 diff --git a/Output/Themes/Ambient/Screens/ScreenSong.xml b/Output/Themes/Ambient/Screens/ScreenSong.xml index 6fc88650..056977e5 100644 --- a/Output/Themes/Ambient/Screens/ScreenSong.xml +++ b/Output/Themes/Ambient/Screens/ScreenSong.xml @@ -52,7 +52,14 @@ SongMenuBG - + + + 1 + 1 + 1 + 1 + + 40 40 @@ -998,7 +1005,14 @@ VideoIcon MedleyCalcIcon MedleyTagIcon - + + + 1 + 1 + 1 + 0.2 + + 6 4 @@ -1033,7 +1047,7 @@ TextSColor Center - Center + Top Outline @@ -1052,7 +1066,7 @@ TextSColor Center - Center + Top Outline @@ -1071,7 +1085,7 @@ TextSColor Center - Center + Top Outline @@ -1716,4 +1730,4 @@ - + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenTest.xml b/Output/Themes/Ambient/Screens/ScreenTest.xml index 5e3c37a6..1f3ecc85 100644 --- a/Output/Themes/Ambient/Screens/ScreenTest.xml +++ b/Output/Themes/Ambient/Screens/ScreenTest.xml @@ -1,17 +1,22 @@  - ScreenSong - 5 + ScreenTest + 1 - Video + None - - BG_Default + diff --git a/VocaluxeLib/Structs.cs b/VocaluxeLib/Structs.cs index e31047e5..aeb49246 100644 --- a/VocaluxeLib/Structs.cs +++ b/VocaluxeLib/Structs.cs @@ -69,8 +69,8 @@ namespace VocaluxeLib public string Name; //Needed for serialization - public bool ColorSpecified { get { return Name == ""; } } - public bool NameSpecified { get { return Name != ""; } } + public bool ColorSpecified { get { return String.IsNullOrEmpty(Name); } } + public bool NameSpecified { get { return !String.IsNullOrEmpty(Name); } } public SThemeColor(SThemeColor theme) { From fef075eeb8581f5caa2a0eb6aeab2ae551168cea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Fri, 19 Sep 2014 11:51:29 +0200 Subject: [PATCH 29/29] Fixed reflections. --- VocaluxeLib/Menu/CStatic.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VocaluxeLib/Menu/CStatic.cs b/VocaluxeLib/Menu/CStatic.cs index 68f4f107..b8012f4b 100644 --- a/VocaluxeLib/Menu/CStatic.cs +++ b/VocaluxeLib/Menu/CStatic.cs @@ -214,8 +214,8 @@ namespace VocaluxeLib.Menu Reflection = _Theme.Reflection.Enabled; if (Reflection) { - ReflectionSpace = _Theme.Reflection.Height; - ReflectionHeight = _Theme.Reflection.Space; + ReflectionSpace = _Theme.Reflection.Space; + ReflectionHeight = _Theme.Reflection.Height; } }