Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop

Browse Source
This commit is contained in:
Florian Küpper committed 2013-05-11 16:29:40 +02:00
2 parents 3f46acd06e e57f6f7486
commit e2d0054ccf
61 files changed
+1823 -2155
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/ClientServerLib.dll
BIN
View File
Binary file not shown.
Output/Fonts/FreeSans/FreeSans.ttf
BIN
View File
Binary file not shown.
Output/Fonts/FreeSans/FreeSansBold.ttf
BIN
View File
Binary file not shown.
Output/Fonts/FreeSans/FreeSansBoldOblique.ttf
BIN
View File
Binary file not shown.
Output/Fonts/FreeSans/FreeSansOblique.ttf
BIN
View File
Binary file not shown.
Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml
+20 -20
View File
@@ -41,7 +41,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>769</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -52,8 +52,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -97,8 +97,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -146,8 +146,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -195,8 +195,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -244,8 +244,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -293,8 +293,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -342,8 +342,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -391,8 +391,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -440,8 +440,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -457,4 +457,4 @@
<!-- <Height>: Reflection Height of selected button-->
</ButtonToBackgroundVideo>
</PopupScreenPlayerControl>
</root>
</root>
Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml
+5 -5
View File
@@ -25,7 +25,7 @@
<!--<Z>: Text position-->
<Z>-2,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>80</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -36,8 +36,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -103,7 +103,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<TextRelativeX>-15,00</TextRelativeX>
<!--<TextRelativeY>: Text relative y-position-->
@@ -118,4 +118,4 @@
<NumVisible>1</NumVisible>
</SelectSlideVolume>
</PopupScreenVolumeControl>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenHighscore.xml
+139 -139
View File
@@ -52,7 +52,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -62,8 +62,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -81,7 +81,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -91,8 +91,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -110,7 +110,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -120,8 +120,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Right</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -139,7 +139,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -149,8 +149,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Right</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -178,8 +178,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Right</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -197,7 +197,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -207,8 +207,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Right</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -226,7 +226,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -236,8 +236,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Right</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -255,7 +255,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -265,8 +265,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Right</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -284,7 +284,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -294,8 +294,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Right</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -313,7 +313,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -323,8 +323,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Right</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -342,7 +342,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -352,8 +352,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Right</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -371,7 +371,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -381,8 +381,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Right</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -400,7 +400,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -410,8 +410,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Right</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -429,7 +429,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -439,8 +439,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -458,7 +458,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -468,8 +468,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -487,7 +487,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -497,8 +497,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -516,7 +516,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -526,8 +526,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -545,7 +545,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -555,8 +555,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -574,7 +574,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -584,8 +584,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -603,7 +603,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -613,8 +613,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -632,7 +632,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -642,8 +642,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -661,7 +661,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -671,8 +671,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -690,7 +690,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -700,8 +700,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -719,7 +719,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -729,8 +729,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -748,7 +748,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -758,8 +758,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -777,7 +777,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -787,8 +787,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -806,7 +806,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -816,8 +816,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -835,7 +835,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -845,8 +845,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -864,7 +864,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -874,8 +874,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -893,7 +893,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -903,8 +903,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -922,7 +922,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -932,8 +932,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -951,7 +951,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -961,8 +961,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -980,7 +980,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -990,8 +990,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1009,7 +1009,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -1019,8 +1019,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1038,7 +1038,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -1048,8 +1048,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1067,7 +1067,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -1077,8 +1077,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1096,7 +1096,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -1106,8 +1106,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1125,7 +1125,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -1135,8 +1135,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1154,7 +1154,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -1164,8 +1164,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1183,7 +1183,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -1193,8 +1193,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1212,7 +1212,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -1222,8 +1222,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1241,7 +1241,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -1251,8 +1251,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1270,7 +1270,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>42</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -1280,8 +1280,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1300,7 +1300,7 @@
<Y>100</Y>
<Z>1,00</Z>
<W>1080</W>
<H>42</H>
<H>35</H>
<!--<Color>: ParticleEffect color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
@@ -1319,7 +1319,7 @@
<Y>160</Y>
<Z>1,00</Z>
<W>1080</W>
<H>42</H>
<H>35</H>
<!--<Color>: ParticleEffect color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
@@ -1338,7 +1338,7 @@
<Y>220</Y>
<Z>1,00</Z>
<W>1080</W>
<H>42</H>
<H>35</H>
<!--<Color>: ParticleEffect color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
@@ -1357,7 +1357,7 @@
<Y>280</Y>
<Z>1,00</Z>
<W>1080</W>
<H>42</H>
<H>35</H>
<!--<Color>: ParticleEffect color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
@@ -1376,7 +1376,7 @@
<Y>340</Y>
<Z>1,00</Z>
<W>1080</W>
<H>42</H>
<H>35</H>
<!--<Color>: ParticleEffect color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
@@ -1395,7 +1395,7 @@
<Y>400</Y>
<Z>1,00</Z>
<W>1080</W>
<H>42</H>
<H>35</H>
<!--<Color>: ParticleEffect color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
@@ -1414,7 +1414,7 @@
<Y>460</Y>
<Z>1,00</Z>
<W>1080</W>
<H>42</H>
<H>35</H>
<!--<Color>: ParticleEffect color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
@@ -1433,7 +1433,7 @@
<Y>520</Y>
<Z>1,00</Z>
<W>1080</W>
<H>42</H>
<H>35</H>
<!--<Color>: ParticleEffect color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
@@ -1452,7 +1452,7 @@
<Y>580</Y>
<Z>1,00</Z>
<W>1080</W>
<H>42</H>
<H>35</H>
<!--<Color>: ParticleEffect color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
@@ -1471,7 +1471,7 @@
<Y>640</Y>
<Z>1,00</Z>
<W>1080</W>
<H>42</H>
<H>35</H>
<!--<Color>: ParticleEffect color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
@@ -1483,4 +1483,4 @@
<MaxNumber>250</MaxNumber>
</ParticleEffectNew10>
</ScreenHighscore>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenLoad.xml
+42 -42
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<ScreenLoad>
<ScreenVersion>1</ScreenVersion>
<ScreenVersion>2</ScreenVersion>
<Background1>
<!--<Type>: Background type: None, Color, Texture, Video-->
<Type>Texture</Type>
@@ -30,42 +30,13 @@
<!-- <Height>: Reflection Height-->
</Static1>
<Text1>
<!--<X>, <Y>: Text position-->
<X>640</X>
<Y>300</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>120</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>Invisible</Color>
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Nothing or translation tag-->
<Text>TR_PROGRAM_NAME</Text>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</Text1>
<Text2>
<!--<X>, <Y>: Text position-->
<X>60</X>
<Y>653</Y>
<Y>655</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -75,8 +46,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -86,15 +57,44 @@
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</Text2>
<TextStatus>
</Text1>
<TextProgramName>
<!--<X>, <Y>: Text position-->
<X>240</X>
<Y>653</Y>
<X>640</X>
<Y>305</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>101</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Nothing or translation tag-->
<Text>TR_PROGRAM_NAME</Text>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</TextProgramName>
<TextStatus>
<!--<X>, <Y>: Text position-->
<X>240</X>
<Y>655</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -104,8 +104,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -117,4 +117,4 @@
<!-- <Height>: Reflection Height-->
</TextStatus>
</ScreenLoad>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenMain.xml
+21 -21
View File
@@ -49,9 +49,9 @@
<Text>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>10</Y>
<Y>12</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -62,8 +62,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -106,9 +106,9 @@
<Text>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>10</Y>
<Y>12</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -119,8 +119,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -163,9 +163,9 @@
<Text>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>10</Y>
<Y>12</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -176,8 +176,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -220,9 +220,9 @@
<Text>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>10</Y>
<Y>12</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -233,8 +233,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -277,9 +277,9 @@
<Text>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>10</Y>
<Y>12</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -290,8 +290,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -315,4 +315,4 @@
</SReflection>
</ButtonExit>
</ScreenMain>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenNames.xml
+30 -30
View File
@@ -260,7 +260,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -270,8 +270,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -289,7 +289,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>970</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -300,8 +300,8 @@
<SColor>TextWarningColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -319,7 +319,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>970</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -330,8 +330,8 @@
<SColor>TextWarningColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -359,8 +359,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -388,8 +388,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -417,8 +417,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -446,8 +446,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -475,8 +475,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -504,8 +504,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -538,7 +538,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -549,8 +549,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -595,7 +595,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -606,8 +606,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -685,7 +685,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -1138,7 +1138,7 @@
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<H>: Text height-->
<H>20</H>
<H>17</H>
</Name>
</Tiles>
</NameSelection>
@@ -1305,4 +1305,4 @@
<!-- <Height>: Reflection Height-->
</EqualizerPlayer6>
</ScreenNames>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenOptions.xml
+22 -22
View File
@@ -36,7 +36,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -46,8 +46,8 @@
<SColor>Invisible</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -80,7 +80,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -91,8 +91,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -137,7 +137,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -148,8 +148,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -194,7 +194,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -205,8 +205,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -251,7 +251,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -262,8 +262,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -308,7 +308,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -319,8 +319,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -365,7 +365,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -376,8 +376,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -401,4 +401,4 @@
</SReflection>
</ButtonOptionsTheme>
</ScreenOptions>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenOptionsGame.xml
+31 -31
View File
@@ -132,7 +132,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -142,8 +142,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -161,7 +161,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -171,8 +171,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -190,7 +190,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -200,8 +200,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -219,7 +219,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -229,8 +229,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -248,7 +248,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -258,8 +258,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -277,7 +277,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -287,8 +287,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -306,7 +306,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -316,8 +316,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -350,7 +350,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -361,8 +361,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -440,7 +440,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -507,7 +507,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -574,7 +574,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -641,7 +641,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -708,7 +708,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -775,7 +775,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -788,4 +788,4 @@
<NumVisible>3</NumVisible>
</SelectSlideTimerMode>
</ScreenOptionsGame>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml
+14 -14
View File
@@ -36,7 +36,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -46,8 +46,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -65,7 +65,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -75,8 +75,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -94,7 +94,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -104,8 +104,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -138,7 +138,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -149,8 +149,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -228,7 +228,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -295,7 +295,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
+39 -39
View File
@@ -160,11 +160,11 @@
<Text1>
<!--<X>, <Y>: Text position-->
<X>640</X>
<Y>48</Y>
<Y>53</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -174,8 +174,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -189,11 +189,11 @@
<Text2>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>105</Y>
<Y>104</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -203,8 +203,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -222,7 +222,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -232,8 +232,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -251,7 +251,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -261,8 +261,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -280,7 +280,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -290,8 +290,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -309,7 +309,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>970</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -320,8 +320,8 @@
<SColor>TextWarningColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -339,7 +339,7 @@
<!--<Z>: Text position-->
<Z>-1,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -349,8 +349,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Right</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -368,7 +368,7 @@
<!--<Z>: Text position-->
<Z>-1,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -378,8 +378,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Right</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -410,9 +410,9 @@
<Text>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>10</Y>
<Y>14</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -423,8 +423,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -467,9 +467,9 @@
<Text>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>10</Y>
<Y>14</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -480,8 +480,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -559,7 +559,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -626,7 +626,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -693,7 +693,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -760,7 +760,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -835,4 +835,4 @@
</Reflection>
</EqualizerChannel2>
</ScreenOptionsRecord>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenOptionsSound.xml
+27 -27
View File
@@ -36,7 +36,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -46,8 +46,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -65,7 +65,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -75,8 +75,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -94,7 +94,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -104,8 +104,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -123,7 +123,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -133,8 +133,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -152,7 +152,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -162,8 +162,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -181,7 +181,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -191,8 +191,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -225,7 +225,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -236,8 +236,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -315,7 +315,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -382,7 +382,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -449,7 +449,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -516,7 +516,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -583,7 +583,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -596,4 +596,4 @@
<NumVisible>3</NumVisible>
</SelectSlideGameMusicVolume>
</ScreenOptionsSound>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml
+39 -39
View File
@@ -164,7 +164,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -174,8 +174,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -193,7 +193,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -203,8 +203,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -222,7 +222,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -232,8 +232,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -251,7 +251,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -261,8 +261,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -280,7 +280,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -290,8 +290,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -309,7 +309,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -319,8 +319,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -338,7 +338,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -348,8 +348,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -367,7 +367,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -377,8 +377,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -396,7 +396,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -406,8 +406,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -440,7 +440,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -451,8 +451,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -530,7 +530,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -597,7 +597,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -664,7 +664,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -731,7 +731,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -798,7 +798,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -865,7 +865,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -932,7 +932,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -999,7 +999,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -1012,4 +1012,4 @@
<NumVisible>1</NumVisible>
</SelectSlideCoverLoading>
</ScreenOptionsTheme>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
+31 -31
View File
@@ -100,7 +100,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -110,8 +110,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -129,7 +129,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -139,8 +139,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -158,7 +158,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -168,8 +168,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -187,7 +187,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -197,8 +197,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -216,7 +216,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -226,8 +226,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -245,7 +245,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -255,8 +255,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -274,7 +274,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -284,8 +284,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -318,7 +318,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -329,8 +329,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -408,7 +408,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -475,7 +475,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -542,7 +542,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -609,7 +609,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -676,7 +676,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -743,7 +743,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -756,4 +756,4 @@
<NumVisible>3</NumVisible>
</SelectSlideWebcamCapabilities>
</ScreenOptionsVideo>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenParty.xml
+53 -53
View File
@@ -36,7 +36,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -46,8 +46,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -65,7 +65,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -75,8 +75,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -94,7 +94,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -104,8 +104,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -123,7 +123,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -133,8 +133,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -152,7 +152,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -162,8 +162,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -181,7 +181,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -191,8 +191,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -210,7 +210,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -220,8 +220,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -239,7 +239,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -249,8 +249,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -268,7 +268,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>600</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -279,8 +279,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -298,7 +298,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>600</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -309,8 +309,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -328,7 +328,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>600</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -339,8 +339,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -358,7 +358,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>600</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -369,8 +369,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -388,7 +388,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>600</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -399,8 +399,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -418,7 +418,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>600</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -429,8 +429,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -448,7 +448,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>600</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -459,8 +459,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -493,7 +493,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -504,8 +504,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -550,7 +550,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -561,8 +561,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -640,7 +640,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -653,4 +653,4 @@
<NumVisible>1</NumVisible>
</SelectSlideModes>
</ScreenParty>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenProfiles.xml
+51 -51
View File
@@ -132,7 +132,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -142,8 +142,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -161,7 +161,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -171,8 +171,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -190,7 +190,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -200,8 +200,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -219,7 +219,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -229,8 +229,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -248,7 +248,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -258,8 +258,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -277,7 +277,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -287,8 +287,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -321,7 +321,7 @@
<X>355</X>
<Y>8</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>702</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -332,8 +332,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -370,7 +370,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -381,8 +381,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -427,7 +427,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -438,8 +438,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -484,7 +484,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -495,8 +495,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -541,7 +541,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -552,8 +552,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -598,7 +598,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -609,8 +609,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -655,7 +655,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -666,8 +666,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -704,7 +704,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -715,8 +715,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -753,7 +753,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -764,8 +764,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -843,7 +843,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -910,7 +910,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -977,7 +977,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -1044,7 +1044,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -1111,7 +1111,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -1124,4 +1124,4 @@
<NumVisible>2</NumVisible>
</SelectSlideActive>
</ScreenProfiles>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenScore.xml
+217 -217
View File
File diff suppressed because it is too large. Load diff
Output/Themes/Ambient/Screens/ScreenSing.xml
+116 -116
View File
@@ -965,7 +965,7 @@
<!--<Z>: Text position-->
<Z>-1,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>880</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -976,8 +976,8 @@
<SColor>TextBlack</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -995,7 +995,7 @@
<!--<Z>: Text position-->
<Z>-1,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW />
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -1006,8 +1006,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1035,8 +1035,8 @@
<SColor>TextWhite</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Right</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1054,7 +1054,7 @@
<!--<Z>: Text position-->
<Z>-2,11</Z>
<!--<H>: Text height-->
<H>100</H>
<H>90</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -1064,8 +1064,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1083,7 +1083,7 @@
<!--<Z>: Text position-->
<Z>-1,00</Z>
<!--<H>: Text height-->
<H>35</H>
<H>30</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -1093,8 +1093,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1112,7 +1112,7 @@
<!--<Z>: Text position-->
<Z>-1,00</Z>
<!--<H>: Text height-->
<H>35</H>
<H>30</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -1122,8 +1122,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1151,8 +1151,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Right</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1183,8 +1183,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1212,8 +1212,8 @@
<SColor>Player1</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Right</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1244,8 +1244,8 @@
<SColor>Player1</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1273,8 +1273,8 @@
<SColor>Player2</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Right</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1305,8 +1305,8 @@
<SColor>Player2</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1334,8 +1334,8 @@
<SColor>Player1</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Right</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1366,8 +1366,8 @@
<SColor>Player1</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1395,8 +1395,8 @@
<SColor>Player2</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Right</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1427,8 +1427,8 @@
<SColor>Player2</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1456,8 +1456,8 @@
<SColor>Player3</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Right</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1488,8 +1488,8 @@
<SColor>Player3</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1517,8 +1517,8 @@
<SColor>Player1</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1549,8 +1549,8 @@
<SColor>Player1</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1578,8 +1578,8 @@
<SColor>Player2</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1610,8 +1610,8 @@
<SColor>Player2</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1639,8 +1639,8 @@
<SColor>Player3</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1671,8 +1671,8 @@
<SColor>Player3</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1700,8 +1700,8 @@
<SColor>Player4</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1732,8 +1732,8 @@
<SColor>Player4</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1761,8 +1761,8 @@
<SColor>Player1</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1793,8 +1793,8 @@
<SColor>Player1</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1822,8 +1822,8 @@
<SColor>Player2</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1854,8 +1854,8 @@
<SColor>Player2</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1883,8 +1883,8 @@
<SColor>Player3</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1915,8 +1915,8 @@
<SColor>Player3</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1944,8 +1944,8 @@
<SColor>Player4</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1976,8 +1976,8 @@
<SColor>Player4</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -2005,8 +2005,8 @@
<SColor>Player5</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -2037,8 +2037,8 @@
<SColor>Player5</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -2066,8 +2066,8 @@
<SColor>Player1</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -2098,8 +2098,8 @@
<SColor>Player1</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -2127,8 +2127,8 @@
<SColor>Player2</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -2159,8 +2159,8 @@
<SColor>Player2</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -2188,8 +2188,8 @@
<SColor>Player3</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -2220,8 +2220,8 @@
<SColor>Player3</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -2249,8 +2249,8 @@
<SColor>Player4</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -2281,8 +2281,8 @@
<SColor>Player4</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -2310,8 +2310,8 @@
<SColor>Player5</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -2342,8 +2342,8 @@
<SColor>Player5</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -2371,8 +2371,8 @@
<SColor>Player6</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -2403,8 +2403,8 @@
<SColor>Player6</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -2437,7 +2437,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -2448,8 +2448,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -2494,7 +2494,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -2505,8 +2505,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -2551,7 +2551,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -2562,8 +2562,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -2592,7 +2592,7 @@
<Y>600</Y>
<Z>-1,00</Z>
<W>1200</W>
<H>50</H>
<H>42</H>
<!--<Color>: Lyric text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>LyricMainColor</Color>
@@ -2606,7 +2606,7 @@
<Y>642</Y>
<Z>-1,00</Z>
<W>1200</W>
<H>45</H>
<H>38</H>
<!--<Color>: Lyric text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>LyricSubColor</Color>
@@ -2620,7 +2620,7 @@
<Y>12</Y>
<Z>-1,00</Z>
<W>1200</W>
<H>50</H>
<H>42</H>
<!--<Color>: Lyric text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>LyricMainColor</Color>
@@ -2634,7 +2634,7 @@
<Y>54</Y>
<Z>-1,00</Z>
<W>1200</W>
<H>45</H>
<H>38</H>
<!--<Color>: Lyric text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>LyricSubColor</Color>
@@ -2648,7 +2648,7 @@
<Y>12</Y>
<Z>-1,00</Z>
<W>1200</W>
<H>50</H>
<H>42</H>
<!--<Color>: Lyric text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>LyricMainColor</Color>
@@ -2662,7 +2662,7 @@
<Y>54</Y>
<Z>-1,00</Z>
<W>1200</W>
<H>45</H>
<H>38</H>
<!--<Color>: Lyric text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>LyricSubColor</Color>
Output/Themes/Ambient/Screens/ScreenSong.xml
+120 -120
View File
@@ -79,7 +79,7 @@
<!--<Z>: Text position-->
<Z>-2,11</Z>
<!--<H>: Text height-->
<H>50</H>
<H>42</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>350</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -90,8 +90,8 @@
<SColor>Player1</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -109,7 +109,7 @@
<!--<Z>: Text position-->
<Z>-2,11</Z>
<!--<H>: Text height-->
<H>50</H>
<H>42</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>350</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -120,8 +120,8 @@
<SColor>Player2</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -139,7 +139,7 @@
<!--<Z>: Text position-->
<Z>-2,11</Z>
<!--<H>: Text height-->
<H>50</H>
<H>42</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>350</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -150,8 +150,8 @@
<SColor>Player3</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -169,7 +169,7 @@
<!--<Z>: Text position-->
<Z>-2,11</Z>
<!--<H>: Text height-->
<H>50</H>
<H>42</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>350</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -180,8 +180,8 @@
<SColor>Player4</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -199,7 +199,7 @@
<!--<Z>: Text position-->
<Z>-2,11</Z>
<!--<H>: Text height-->
<H>50</H>
<H>42</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>350</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -210,8 +210,8 @@
<SColor>Player5</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -229,7 +229,7 @@
<!--<Z>: Text position-->
<Z>-2,11</Z>
<!--<H>: Text height-->
<H>50</H>
<H>42</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>350</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -240,8 +240,8 @@
<SColor>Player6</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -259,7 +259,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>340</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -270,8 +270,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -293,7 +293,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>830</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -304,8 +304,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -327,7 +327,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -337,8 +337,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Right</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -356,7 +356,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -366,8 +366,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -385,7 +385,7 @@
<!--<Z>: Text position-->
<Z>-2,11</Z>
<!--<H>: Text height-->
<H>40</H>
<H>34</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>350</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -396,8 +396,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -430,7 +430,7 @@
<X>40</X>
<Y>20</Y>
<!--<H>: Text height-->
<H>40</H>
<H>34</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>60</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -441,8 +441,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -479,7 +479,7 @@
<X>40</X>
<Y>20</Y>
<!--<H>: Text height-->
<H>40</H>
<H>34</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>60</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -490,8 +490,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -528,7 +528,7 @@
<X>40</X>
<Y>20</Y>
<!--<H>: Text height-->
<H>40</H>
<H>34</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>60</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -539,8 +539,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -577,7 +577,7 @@
<X>40</X>
<Y>20</Y>
<!--<H>: Text height-->
<H>40</H>
<H>34</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>60</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -588,8 +588,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -626,7 +626,7 @@
<X>40</X>
<Y>20</Y>
<!--<H>: Text height-->
<H>40</H>
<H>34</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>60</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -637,8 +637,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -675,7 +675,7 @@
<X>40</X>
<Y>20</Y>
<!--<H>: Text height-->
<H>40</H>
<H>34</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>60</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -686,8 +686,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -724,7 +724,7 @@
<X>180</X>
<Y>5</Y>
<!--<H>: Text height-->
<H>30</H>
<H>25</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>350</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -735,8 +735,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -773,7 +773,7 @@
<X>180</X>
<Y>5</Y>
<!--<H>: Text height-->
<H>30</H>
<H>25</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>350</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -784,8 +784,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -822,7 +822,7 @@
<X>180</X>
<Y>5</Y>
<!--<H>: Text height-->
<H>30</H>
<H>25</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>350</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -833,8 +833,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -871,7 +871,7 @@
<X>180</X>
<Y>5</Y>
<!--<H>: Text height-->
<H>30</H>
<H>25</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>350</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -882,8 +882,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -920,7 +920,7 @@
<X>180</X>
<Y>5</Y>
<!--<H>: Text height-->
<H>30</H>
<H>25</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>350</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -931,8 +931,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -969,7 +969,7 @@
<X>180</X>
<Y>5</Y>
<!--<H>: Text height-->
<H>30</H>
<H>25</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>350</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -980,8 +980,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1018,7 +1018,7 @@
<X>180</X>
<Y>5</Y>
<!--<H>: Text height-->
<H>30</H>
<H>25</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>350</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -1029,8 +1029,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1067,7 +1067,7 @@
<X>180</X>
<Y>5</Y>
<!--<H>: Text height-->
<H>30</H>
<H>25</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>350</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -1078,8 +1078,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1116,7 +1116,7 @@
<X>180</X>
<Y>5</Y>
<!--<H>: Text height-->
<H>30</H>
<H>25</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>350</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -1127,8 +1127,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1165,7 +1165,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -1176,8 +1176,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1222,7 +1222,7 @@
<X>180</X>
<Y>5</Y>
<!--<H>: Text height-->
<H>30</H>
<H>25</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>350</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -1233,8 +1233,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1271,7 +1271,7 @@
<X>180</X>
<Y>5</Y>
<!--<H>: Text height-->
<H>30</H>
<H>25</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>350</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -1282,8 +1282,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1353,7 +1353,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>30,00</TextH>
<TextH>25,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -1420,7 +1420,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>30,00</TextH>
<TextH>25,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -1487,7 +1487,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>30,00</TextH>
<TextH>25,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -1554,7 +1554,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>30,00</TextH>
<TextH>25,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
@@ -1618,7 +1618,7 @@
<!--<Z>: Text position-->
<Z>-1,01</Z>
<!--<H>: Text height-->
<H>46</H>
<H>39</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>340</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -1629,8 +1629,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1648,7 +1648,7 @@
<!--<Z>: Text position-->
<Z>-1,01</Z>
<!--<H>: Text height-->
<H>38</H>
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>340</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -1659,8 +1659,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1689,8 +1689,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1826,7 +1826,7 @@
<!--<Z>: Text position-->
<Z>-1,01</Z>
<!--<H>: Text height-->
<H>24</H>
<H>22</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>235</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -1837,8 +1837,8 @@
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Top</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Top</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -1952,7 +1952,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>24,00</TextH>
<TextH>22,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<TextRelativeX>25,00</TextRelativeX>
<!--<TextRelativeY>: Text relative y-position-->
@@ -1975,7 +1975,7 @@
<Y>45</Y>
<Z>-1,01</Z>
<W>220</W>
<H>30</H>
<H>25</H>
<!--<Color>: Button color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>ButtonColor</Color>
@@ -1987,7 +1987,7 @@
<X>0</X>
<Y>0</Y>
<!--<H>: Text height-->
<H>30</H>
<H>25</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>220</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -1998,8 +1998,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -2036,7 +2036,7 @@
<X>180</X>
<Y>5</Y>
<!--<H>: Text height-->
<H>30</H>
<H>25</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>350</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -2047,8 +2047,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -2085,7 +2085,7 @@
<X>180</X>
<Y>5</Y>
<!--<H>: Text height-->
<H>30</H>
<H>25</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>350</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -2096,8 +2096,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -2134,7 +2134,7 @@
<X>180</X>
<Y>5</Y>
<!--<H>: Text height-->
<H>30</H>
<H>25</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>350</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -2145,8 +2145,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -2183,7 +2183,7 @@
<X>180</X>
<Y>5</Y>
<!--<H>: Text height-->
<H>30</H>
<H>25</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>350</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -2194,8 +2194,8 @@
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<ResizeAlign>Center</ResizeAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
@@ -2212,4 +2212,4 @@
</ButtonPlaylistSing>
</Playlist>
</ScreenSong>
</root>
</root>
Output/Themes/Changelog/Changelog_ScreenLoading.txt
+7
View File
@@ -0,0 +1,7 @@
ScreenLoading
++++++++++
Version 2:
Rename:<Text1> -> <TextProgramName>
++++++++++
Vocaluxe/Base/CBackgroundMusic.cs
+91 -92
View File
@@ -22,7 +22,6 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using Vocaluxe.Base;
using VocaluxeLib;
using VocaluxeLib.Songs;
@@ -496,138 +495,138 @@ namespace Vocaluxe.Base
}
}
}
}
class CPlaylistElement
{
private readonly CSong _Song;
private readonly int _SongID;
public int SongID
class CPlaylistElement
{
get { return _SongID; }
}
private readonly CSong _Song;
private string _MusicFilePath = String.Empty;
public string MusicFilePath
{
get
private readonly int _SongID;
public int SongID
{
if (_Song != null)
return _Song.GetMP3();
return _MusicFilePath;
get { return _SongID; }
}
set { _MusicFilePath = value; }
}
private string _MusicFilePath = String.Empty;
public string VideoFilePath
{
get
public string MusicFilePath
{
if (_Song != null)
return _Song.GetVideo();
get
{
if (_Song != null)
return _Song.GetMP3();
return string.Empty;
return _MusicFilePath;
}
set { _MusicFilePath = value; }
}
}
public string Title
{
get
public string VideoFilePath
{
if (_Song != null)
return _Song.Title;
get
{
if (_Song != null)
return _Song.GetVideo();
return "";
return string.Empty;
}
}
}
public string Artist
{
get
public string Title
{
if (_Song != null)
return _Song.Artist;
get
{
if (_Song != null)
return _Song.Title;
return "";
return "";
}
}
}
public float Start
{
get
public string Artist
{
if (_Song != null)
return _Song.Start;
get
{
if (_Song != null)
return _Song.Artist;
return 0f;
return "";
}
}
}
public float Finish
{
get
public float Start
{
if (_Song != null)
return _Song.Finish;
get
{
if (_Song != null)
return _Song.Start;
return 0f;
return 0f;
}
}
}
public STexture Cover
{
get
public float Finish
{
if (_Song != null)
return _Song.CoverTextureSmall;
get
{
if (_Song != null)
return _Song.Finish;
return CCover.NoCover;
return 0f;
}
}
}
public float VideoGap
{
get
public STexture Cover
{
if (_Song != null)
return _Song.VideoGap;
get
{
if (_Song != null)
return _Song.CoverTextureSmall;
return 0;
return CCover.NoCover;
}
}
}
public bool Duet
{
get
public float VideoGap
{
if (_Song != null)
return _Song.IsDuet;
get
{
if (_Song != null)
return _Song.VideoGap;
return false;
return 0;
}
}
}
public CPlaylistElement(CSong song)
{
MusicFilePath = string.Empty;
_SongID = song.ID;
public bool Duet
{
get
{
if (_Song != null)
return _Song.IsDuet;
_Song = song;
}
return false;
}
}
public CPlaylistElement(string filePath)
{
MusicFilePath = filePath;
_SongID = -1;
}
public CPlaylistElement(CSong song)
{
MusicFilePath = string.Empty;
_SongID = song.ID;
public CPlaylistElement()
{
MusicFilePath = string.Empty;
_SongID = -1;
_Song = song;
}
public CPlaylistElement(string filePath)
{
MusicFilePath = filePath;
_SongID = -1;
}
public CPlaylistElement()
{
MusicFilePath = string.Empty;
_SongID = -1;
}
}
}
Vocaluxe/Base/CDataBase.cs
+3 -3
View File
@@ -950,7 +950,7 @@ namespace Vocaluxe.Base
reader.Read();
byte[] data = _GetBytes(reader);
reader.Dispose();
tex = CDraw.EnqueueTexture(w, h, ref data);
tex = CDraw.EnqueueTexture(w, h, data);
return true;
}
}
@@ -1000,7 +1000,7 @@ namespace Vocaluxe.Base
origin.Dispose();
}
tex = CDraw.EnqueueTexture(w, h, ref data);
tex = CDraw.EnqueueTexture(w, h, data);
command.CommandText = "INSERT INTO Cover (Path, width, height) VALUES (@path, @w, @h)";
command.Parameters.Add("@w", DbType.Int32).Value = w;
@@ -1180,7 +1180,7 @@ namespace Vocaluxe.Base
result = true;
reader.Read();
byte[] data = _GetBytes(reader);
tex = CDraw.AddTexture(w, h, ref data);
tex = CDraw.AddTexture(w, h, data);
/*using (Bitmap bmp = new Bitmap(w, h))
{
BitmapData bmpData = bmp.LockBits(new Rectangle(0, 0, bmp.Width, bmp.Height), ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
Vocaluxe/Base/CDraw.cs
+17 -89
View File
@@ -19,8 +19,6 @@
using System;
using System.Drawing;
using System.IO;
using System.Windows.Forms;
using Vocaluxe.Lib.Draw;
using VocaluxeLib;
using VocaluxeLib.Menu;
@@ -46,11 +44,8 @@ namespace Vocaluxe.Base
}
catch (Exception e)
{
MessageBox.Show(e.Message + " - Error in initializing of OpenGL. Please check whether" +
" your graphic card drivers are up to date.");
CLog.LogError(e.Message + " - Error in initializing of OpenGL. Please check whether" +
" your graphic card drivers are up to date.");
Environment.Exit(Environment.ExitCode);
" your graphic card drivers are up to date.", true, true);
}
break;
@@ -62,14 +57,9 @@ namespace Vocaluxe.Base
}
catch (Exception e)
{
MessageBox.Show(e.Message + " - Error in initializing of Direct3D. Please check if " +
"your DirectX redistributables and graphic card drivers are up to date. You can " +
"download the DirectX runtimes at http://www.microsoft.com/download/en/details.aspx?id=8109",
CSettings.ProgramName, MessageBoxButtons.OK, MessageBoxIcon.Error);
CLog.LogError(e.Message + " - Error in initializing of Direct3D. Please check if " +
"your DirectX redistributables and graphic card drivers are up to date. You can " +
"download the DirectX runtimes at http://www.microsoft.com/download/en/details.aspx?id=8109");
Environment.Exit(Environment.ExitCode);
"download the DirectX runtimes at http://www.microsoft.com/download/en/details.aspx?id=8109", true, true);
}
break;
#endif
@@ -78,7 +68,8 @@ namespace Vocaluxe.Base
_Draw = new CDrawWinForm();
break;
}
_Draw.Init();
if (!_Draw.Init())
CLog.LogError("Could not init drawing interface!", true, true);
}
public static void MainLoop()
@@ -87,11 +78,10 @@ namespace Vocaluxe.Base
_Draw.MainLoop();
}
public static bool Unload()
public static void Unload()
{
bool result = _Draw.Unload();
_Draw.Unload();
_Draw = null;
return result;
}
public static int GetScreenWidth()
@@ -104,16 +94,6 @@ namespace Vocaluxe.Base
return _Draw.GetScreenHeight();
}
public static RectangleF GetTextBounds(CText text)
{
return _Draw.GetTextBounds(text);
}
public static RectangleF GetTextBounds(CText text, float height)
{
return _Draw.GetTextBounds(text, height);
}
public static void DrawLine(int a, int r, int g, int b, int w, int x1, int y1, int x2, int y2)
{
_Draw.DrawLine(a, r, g, b, w, x1, y1, x2, y2);
@@ -160,12 +140,6 @@ namespace Vocaluxe.Base
_Draw.MakeScreenShot();
}
// Draw Basic Text (must be deleted later)
public static void DrawText(string text, int x, int y, int h)
{
_Draw.DrawText(text, x, y, h);
}
public static STexture AddTexture(Bitmap bitmap)
{
return _Draw.AddTexture(bitmap);
@@ -176,53 +150,17 @@ namespace Vocaluxe.Base
return _Draw.AddTexture(texturePath);
}
public static STexture AddTexture(string texturePath, int maxSize)
{
if (maxSize == 0)
return _Draw.AddTexture(texturePath);
if (!File.Exists(texturePath))
return new STexture(-1);
using (Bitmap origin = new Bitmap(texturePath))
{
int w = maxSize;
int h = maxSize;
if (origin.Width >= origin.Height && origin.Width > w)
h = (int)Math.Round((float)w / origin.Width * origin.Height);
else if (origin.Height > origin.Width && origin.Height > h)
w = (int)Math.Round((float)h / origin.Height * origin.Width);
using (Bitmap bmp = new Bitmap(origin, w, h))
{
STexture tex = _Draw.AddTexture(bmp);
return tex;
}
}
}
public static STexture AddTexture(int w, int h, IntPtr data)
public static STexture AddTexture(int w, int h, byte[] data)
{
return _Draw.AddTexture(w, h, data);
}
public static STexture AddTexture(int w, int h, ref byte[] data)
public static STexture EnqueueTexture(int w, int h, byte[] data)
{
return _Draw.AddTexture(w, h, ref data);
return _Draw.EnqueueTexture(w, h, data);
}
public static STexture EnqueueTexture(int w, int h, ref byte[] data)
{
return _Draw.EnqueueTexture(w, h, ref data);
}
public static bool UpdateTexture(ref STexture texture, ref byte[] data)
{
return _Draw.UpdateTexture(ref texture, ref data);
}
public static bool UpdateTexture(ref STexture texture, IntPtr data)
public static bool UpdateTexture(ref STexture texture, byte[] data)
{
return _Draw.UpdateTexture(ref texture, data);
}
@@ -242,22 +180,12 @@ namespace Vocaluxe.Base
_Draw.DrawTexture(texture, rect);
}
public static void DrawTexture(STexture texture, SRectF rect, SColorF color)
{
_Draw.DrawTexture(texture, rect, color);
}
public static void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds)
{
_Draw.DrawTexture(texture, rect, color, bounds);
}
public static void DrawTexture(STexture texture, SRectF rect, SColorF color, bool mirrored)
public static void DrawTexture(STexture texture, SRectF rect, SColorF color, bool mirrored = false)
{
_Draw.DrawTexture(texture, rect, color, mirrored);
}
public static void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds, bool mirrored)
public static void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds, bool mirrored = false)
{
_Draw.DrawTexture(texture, rect, color, bounds, mirrored);
}
@@ -269,15 +197,15 @@ namespace Vocaluxe.Base
public static void DrawTexture(CStatic staticBounds, STexture texture, EAspect aspect)
{
if (texture.Height <= 0f)
return;
RectangleF bounds = new RectangleF(staticBounds.Rect.X, staticBounds.Rect.Y, staticBounds.Rect.W, staticBounds.Rect.H);
RectangleF rect = new RectangleF(0f, 0f, texture.Width, texture.Height);
if (rect.Height <= 0f)
return;
CHelper.SetRect(bounds, out rect, rect.Width / rect.Height, aspect);
DrawTexture(texture, new SRectF(rect.X, rect.Y, rect.Width, rect.Height, staticBounds.Rect.Z),
texture.Color, new SRectF(bounds.X, bounds.Y, bounds.Width, bounds.Height, 0f), false);
texture.Color, new SRectF(bounds.X, bounds.Y, bounds.Width, bounds.Height, 0f));
}
public static void DrawTextureReflection(STexture texture, SRectF rect, SColorF color, SRectF bounds, float space, float height)
@@ -287,7 +215,7 @@ namespace Vocaluxe.Base
public static int TextureCount()
{
return _Draw.TextureCount();
return _Draw.GetTextureCount();
}
}
}
Vocaluxe/Base/CGraphics.cs
+2 -2
View File
@@ -22,7 +22,7 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Windows.Forms;
using Vocaluxe.Base.Font;
using Vocaluxe.Base.Fonts;
using Vocaluxe.Screens;
using VocaluxeLib;
using VocaluxeLib.Menu;
@@ -772,7 +772,7 @@ namespace Vocaluxe.Base
}
CFonts.Style = EStyle.Normal;
CFonts.SetFont("Normal");
CFonts.Height = 30;
CFonts.Height = 25;
SColorF gray = new SColorF(1f, 1f, 1f, 0.5f);
float y = 0;
foreach (string txt in debugOutput)
Vocaluxe/Base/CLog.cs
+9 -3
View File
@@ -21,6 +21,7 @@ using System;
using System.Diagnostics;
using System.IO;
using System.Text;
using System.Windows.Forms;
namespace Vocaluxe.Base
{
@@ -111,12 +112,17 @@ namespace Vocaluxe.Base
}
#region LogError
public static void LogError(string errorText)
public static void LogError(string errorText, bool show = false, bool exit = false, Exception e = null)
{
_NumErrors++;
_ErrorLog.Add(_NumErrors + ") " + errorText);
if (show)
MessageBox.Show(errorText, CSettings.ProgramName, MessageBoxButtons.OK, MessageBoxIcon.Error);
if (e != null)
errorText += ": " + e;
_ErrorLog.Add(_NumErrors + ") " + errorText + "\r\n");
_ErrorLog.Add(String.Empty);
if (exit)
Environment.Exit(Environment.ExitCode);
}
#endregion LogError
Vocaluxe/Base/CMain.cs
+7 -12
View File
@@ -21,7 +21,7 @@ using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Drawing;
using Vocaluxe.Base.Font;
using Vocaluxe.Base.Fonts;
using VocaluxeLib;
using VocaluxeLib.Game;
using VocaluxeLib.Menu;
@@ -349,11 +349,6 @@ namespace Vocaluxe.Base
class CBdraw : IDrawing
{
public RectangleF GetTextBounds(CText text)
{
return CDraw.GetTextBounds(text);
}
public void DrawTexture(STexture texture, SRectF rect)
{
CDraw.DrawTexture(texture, rect);
@@ -364,12 +359,7 @@ namespace Vocaluxe.Base
CDraw.DrawTexture(texture, rect, color);
}
public void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds)
{
CDraw.DrawTexture(texture, rect, color, bounds);
}
public void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds, bool mirrored)
public void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds, bool mirrored = false)
{
CDraw.DrawTexture(texture, rect, color, bounds, mirrored);
}
@@ -443,6 +433,11 @@ namespace Vocaluxe.Base
CFonts.Style = fontStyle;
}
public RectangleF GetTextBounds(CText text)
{
return CFonts.GetTextBounds(text);
}
public RectangleF GetTextBounds(CText text, float textHeight)
{
return CFonts.GetTextBounds(text, textHeight);
Vocaluxe/Base/CTheme.cs
+1 -1
View File
@@ -23,7 +23,7 @@ using System.IO;
using System.Text;
using System.Windows.Forms;
using System.Xml;
using Vocaluxe.Base.Font;
using Vocaluxe.Base.Fonts;
using VocaluxeLib;
using VocaluxeLib.Menu;
Vocaluxe/Base/Font/CFont.cs → Vocaluxe/Base/Fonts/CFont.cs
+45 -58
View File
@@ -24,133 +24,119 @@ using System.Drawing.Text;
using VocaluxeLib;
using VocaluxeLib.Menu;
namespace Vocaluxe.Base.Font
namespace Vocaluxe.Base.Fonts
{
class CFont : IDisposable
{
private readonly Dictionary<char, CGlyph> _Glyphs;
private PrivateFontCollection _Fonts;
private FontFamily _Family;
private readonly float _Sizeh;
private readonly float _MaxGlyphHeight;
public readonly string FilePath;
private readonly string _FilePath;
private bool _Disposed;
public CFont(string file)
{
FilePath = file;
_FilePath = file;
_Glyphs = new Dictionary<char, CGlyph>();
switch (CConfig.TextureQuality)
{
case ETextureQuality.TR_CONFIG_TEXTURE_LOWEST:
_Sizeh = 25f;
_MaxGlyphHeight = 25f;
break;
case ETextureQuality.TR_CONFIG_TEXTURE_LOW:
_Sizeh = 50f;
_MaxGlyphHeight = 50f;
break;
case ETextureQuality.TR_CONFIG_TEXTURE_MEDIUM:
_Sizeh = 100f;
_MaxGlyphHeight = 100f;
break;
case ETextureQuality.TR_CONFIG_TEXTURE_HIGH:
_Sizeh = 200f;
_MaxGlyphHeight = 200f;
break;
case ETextureQuality.TR_CONFIG_TEXTURE_HIGHEST:
_Sizeh = 400f;
_MaxGlyphHeight = 400f;
break;
default:
_Sizeh = 100f;
_MaxGlyphHeight = 100f;
break;
}
_MaxGlyphHeight = 50;
}
public System.Drawing.Font GetFont()
public Font GetFont()
{
if (_Fonts == null)
{
_Fonts = new PrivateFontCollection();
try
{
_Fonts.AddFontFile(FilePath);
_Fonts.AddFontFile(_FilePath);
_Family = _Fonts.Families[0];
}
catch (Exception e)
{
CLog.LogError("Error opening font file " + FilePath + ": " + e.Message);
CLog.LogError("Error opening font file " + _FilePath + ": " + e.Message);
}
}
return new System.Drawing.Font(_Family, CFonts.Height, CFonts.GetFontStyle(), GraphicsUnit.Pixel);
return new Font(_Family, CFonts.Height, CFonts.GetFontStyle(), GraphicsUnit.Pixel);
}
public void DrawGlyph(char chr, float x, float y, float h, float z, SColorF color)
public void DrawGlyph(char chr, float x, float y, float z, SColorF color)
{
STexture texture;
SRectF rect;
_GetGlyphTextureAndRect(chr, x, y, z, h, out texture, out rect);
GetOrAddGlyph(chr).GetTextureAndRect(x, y, z, out texture, out rect);
CDraw.DrawTexture(texture, rect, color);
}
public void DrawGlyph(char chr, float x, float y, float h, float z, SColorF color, float begin, float end)
public void DrawGlyph(char chr, float x, float y, float z, SColorF color, float begin, float end)
{
STexture texture;
SRectF rect;
_GetGlyphTextureAndRect(chr, x, y, z, h, out texture, out rect);
GetOrAddGlyph(chr).GetTextureAndRect(x, y, z, out texture, out rect);
CDraw.DrawTexture(texture, rect, color, begin, end);
}
public void DrawGlyphReflection(char chr, float x, float y, float h, float z, SColorF color, float rspace, float rheight)
public void DrawGlyphReflection(char chr, float x, float y, float z, SColorF color, float rspace, float rheight)
{
STexture texture;
SRectF rect;
_GetGlyphTextureAndRect(chr, x, y, z, h, out texture, out rect);
GetOrAddGlyph(chr).GetTextureAndRect(x, y, z, out texture, out rect);
CDraw.DrawTextureReflection(texture, rect, color, rect, rspace, rheight);
}
private void _GetGlyphTextureAndRect(char chr, float x, float y, float z, float h, out STexture texture, out SRectF rect)
{
AddGlyph(chr);
CFonts.Height = h;
CGlyph glyph = _Glyphs[chr];
texture = glyph.Texture;
float factor = h / texture.Height;
float width = texture.Width * factor;
float d = glyph.Sizeh / 5f * factor;
rect = new SRectF(x - d, y, width, h, z);
}
public float GetWidth(char chr)
{
AddGlyph(chr);
CGlyph glyph = _Glyphs[chr];
float factor = CFonts.Height / glyph.Texture.Height;
return glyph.Width * factor;
return GetOrAddGlyph(chr).Width;
}
public float GetHeight(char chr)
{
return CFonts.Height;
/*WTF???
AddGlyph(chr);
CGlyph glyph = _Glyphs[chr];
float factor = CFonts.Height / glyph.Texture.height;
return glyph.Texture.height * factor;*/
return GetOrAddGlyph(chr).Height;
}
public void AddGlyph(char chr)
public CGlyph GetOrAddGlyph(char chr)
{
if (_Glyphs.ContainsKey(chr))
return;
float h = CFonts.Height;
_Glyphs.Add(chr, new CGlyph(chr, _Sizeh));
CFonts.Height = h;
CGlyph glyph;
if (!_Glyphs.TryGetValue(chr, out glyph))
{
glyph = new CGlyph(chr, _MaxGlyphHeight);
_Glyphs.Add(chr, glyph);
}
if (glyph.MaxHeight + 50 < CFonts.Height)
{
glyph.UnloadTexture();
glyph = new CGlyph(chr, (float)Math.Round(CFonts.Height / 50) * 50);
_Glyphs[chr] = glyph;
}
return glyph;
}
public void UnloadAllGlyphs()
public void UnloadGlyphs()
{
foreach (CGlyph glyph in _Glyphs.Values)
glyph.UnloadTexture();
@@ -159,11 +145,12 @@ namespace Vocaluxe.Base.Font
public void Dispose()
{
if (_Fonts != null)
if (!_Disposed)
{
_Fonts.Dispose();
_Fonts = null;
UnloadAllGlyphs();
if (_Fonts != null)
_Fonts.Dispose();
UnloadGlyphs();
_Disposed = true;
}
GC.SuppressFinalize(this);
}
Vocaluxe/Base/Font/CFonts.cs → Vocaluxe/Base/Fonts/CFonts.cs
+61 -28
View File
@@ -26,17 +26,19 @@ using System.Xml;
using VocaluxeLib;
using VocaluxeLib.Menu;
namespace Vocaluxe.Base.Font
namespace Vocaluxe.Base.Fonts
{
static class CFonts
{
private static readonly XmlWriterSettings _Settings = new XmlWriterSettings();
private static List<SFont> _Fonts;
private static readonly List<SFont> _Fonts = new List<SFont>();
private static int _CurrentFont;
private static float _Height = 1f;
// ReSharper disable MemberCanBePrivate.Global
public static int PartyModeID { get; set; }
// ReSharper restore MemberCanBePrivate.Global
public static EStyle Style = EStyle.Normal;
@@ -64,18 +66,25 @@ namespace Vocaluxe.Base.Font
_CurrentFont = 0;
PartyModeID = -1;
BuildFonts();
_BuildFonts();
}
public static void BuildFonts()
private static void _BuildFonts()
{
_Fonts = new List<SFont>();
foreach (var font in _Fonts)
{
font.Normal.Dispose();
font.Bold.Dispose();
font.Italic.Dispose();
font.BoldItalic.Dispose();
}
_Fonts.Clear();
_CurrentFont = 0;
_LoadFontList();
}
public static System.Drawing.Font GetFont()
public static Font GetFont()
{
return _GetCurrentFont().GetFont();
}
@@ -108,6 +117,15 @@ namespace Vocaluxe.Base.Font
DrawText(text, Height, x, y, z, new SColorF(0f, 0f, 0f, 1f));
}
/// <summary>
/// Draws a text string
/// </summary>
/// <param name="text">The text to be drawn</param>
/// <param name="x">The text's x-position</param>
/// <param name="y">The text's y-position</param>
/// <param name="h">The text's height</param>
/// <param name="z">The text's z-position</param>
/// <param name="color">The text color</param>
public static void DrawText(string text, float h, float x, float y, float z, SColorF color)
{
if (h <= 0f)
@@ -122,7 +140,7 @@ namespace Vocaluxe.Base.Font
float dx = x;
foreach (char chr in text)
{
font.DrawGlyph(chr, dx, y, Height, z, color);
font.DrawGlyph(chr, dx, y, z, color);
dx += font.GetWidth(chr);
}
}
@@ -141,7 +159,7 @@ namespace Vocaluxe.Base.Font
float dx = x;
foreach (char chr in text)
{
font.DrawGlyphReflection(chr, dx, y, Height, z, color, rspace, rheight);
font.DrawGlyphReflection(chr, dx, y, z, color, rspace, rheight);
dx += font.GetWidth(chr);
}
}
@@ -180,7 +198,7 @@ namespace Vocaluxe.Base.Font
{
if (e > 1f)
e = 1f;
font.DrawGlyph(chr, dx, y, Height, z, color, b, e);
font.DrawGlyph(chr, dx, y, z, color, b, e);
}
}
dx += w2;
@@ -216,16 +234,37 @@ namespace Vocaluxe.Base.Font
_CurrentFont = index;
}
/// <summary>
/// Calculates the bounds for a CText object
/// </summary>
/// <param name="text">The CText object of which the bounds should be calculated for</param>
/// <returns>RectangleF object containing the bounds</returns>
public static RectangleF GetTextBounds(CText text)
{
return GetTextBounds(text, text.Height);
}
/// <summary>
/// Calculates the bounds for a CText object
/// </summary>
/// <param name="text">The CText object of which the bounds should be calculated for</param>
/// <param name="height">The height of the CText object</param>
/// <returns>RectangleF object containing the bounds</returns>
public static RectangleF GetTextBounds(CText text, float height)
{
float oldHeight = Height;
int oldFont = _CurrentFont;
EStyle oldStyle = Style;
Height = height;
return new RectangleF(text.X, text.Y, GetTextWidth(CLanguage.Translate(text.Text, text.TranslationID)),
GetTextHeight(CLanguage.Translate(text.Text, text.TranslationID)));
SetFont(text.Font);
Style = text.Style;
var result = new RectangleF(text.X, text.Y, GetTextWidth(CLanguage.Translate(text.Text, text.TranslationID)),
GetTextHeight(CLanguage.Translate(text.Text, text.TranslationID)));
//restore old values
Height = oldHeight;
_CurrentFont = oldFont;
Style = oldStyle;
return result;
}
public static float GetTextWidth(string text)
@@ -309,16 +348,13 @@ namespace Vocaluxe.Base.Font
/// Load default fonts
/// </summary>
/// <returns></returns>
private static bool _LoadFontList()
private static void _LoadFontList()
{
CXMLReader xmlReader = CXMLReader.OpenFile(Path.Combine(CSettings.FolderFonts, CSettings.FileFonts));
if (xmlReader == null)
return false;
_Fonts.Clear();
return;
_LoadFontFiles(xmlReader, Path.Combine(Directory.GetCurrentDirectory(), CSettings.FolderFonts));
return true;
}
/// <summary>
@@ -390,18 +426,15 @@ namespace Vocaluxe.Base.Font
public static void UnloadThemeFonts(string themeName)
{
if (_Fonts.Count == 0)
return;
int index = 0;
while (index < _Fonts.Count)
{
if (_Fonts[index].IsThemeFont && _Fonts[index].ThemeName == themeName)
{
_Fonts[index].Normal.UnloadAllGlyphs();
_Fonts[index].Italic.UnloadAllGlyphs();
_Fonts[index].Bold.UnloadAllGlyphs();
_Fonts[index].BoldItalic.UnloadAllGlyphs();
_Fonts[index].Normal.UnloadGlyphs();
_Fonts[index].Italic.UnloadGlyphs();
_Fonts[index].Bold.UnloadGlyphs();
_Fonts[index].BoldItalic.UnloadGlyphs();
_Fonts.RemoveAt(index);
}
else
@@ -450,7 +483,7 @@ namespace Vocaluxe.Base.Font
private static void _BuildGlyphs()
{
const string text = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPGRSTUVWGXZ1234567890";
const string text = " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
for (int i = 0; i < _Fonts.Count; i++)
{
@@ -459,13 +492,13 @@ namespace Vocaluxe.Base.Font
foreach (char chr in text)
{
Style = EStyle.Normal;
_Fonts[_CurrentFont].Normal.AddGlyph(chr);
_Fonts[_CurrentFont].Normal.GetOrAddGlyph(chr);
Style = EStyle.Bold;
_Fonts[_CurrentFont].Bold.AddGlyph(chr);
_Fonts[_CurrentFont].Bold.GetOrAddGlyph(chr);
Style = EStyle.Italic;
_Fonts[_CurrentFont].Italic.AddGlyph(chr);
_Fonts[_CurrentFont].Italic.GetOrAddGlyph(chr);
Style = EStyle.BoldItalic;
_Fonts[_CurrentFont].BoldItalic.AddGlyph(chr);
_Fonts[_CurrentFont].BoldItalic.GetOrAddGlyph(chr);
}
}
Style = EStyle.Normal;
Vocaluxe/Base/Fonts/CGlyph.cs
+226
View File
@@ -0,0 +1,226 @@
#region license
// /*
// This file is part of Vocaluxe.
//
// Vocaluxe is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Vocaluxe is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
// */
#endregion
using System;
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Drawing.Imaging;
using System.Drawing.Text;
using System.Runtime.InteropServices;
using VocaluxeLib;
namespace Vocaluxe.Base.Fonts
{
class CGlyph
{
private STexture _Texture;
private readonly SizeF _BoundingBox;
private readonly RectangleF _DrawBounding;
public readonly float MaxHeight;
public float Width
{
get { return _BoundingBox.Width * _GetFactor(); }
}
public float Height
{
get { return _BoundingBox.Height * _GetFactor(); }
}
public CGlyph(char chr, float maxHeight)
{
MaxHeight = maxHeight;
float oldHeight = CFonts.Height;
float outline = CFonts.Outline;
float outlineSize = outline * maxHeight;
string chrString = chr.ToString();
CFonts.Height = maxHeight;
Font fo = CFonts.GetFont();
SizeF fullSize;
Size bmpSize;
using (Graphics g = Graphics.FromHwnd(IntPtr.Zero))
{
fullSize = g.MeasureString(chrString, fo);
if (chr != ' ')
{
//Gets exact height and width for drawing more than 1 char. But width is to small to draw char on bitmap as e.g. italic chars will get cropped
_BoundingBox = g.MeasureString(chrString, fo, -1, new StringFormat(StringFormat.GenericTypographic));
// ReSharper disable CompareOfFloatsByEqualityOperator
if (_BoundingBox.Height == 0)
// ReSharper restore CompareOfFloatsByEqualityOperator
_BoundingBox.Height = fullSize.Height;
_BoundingBox.Width += outlineSize / 2;
_BoundingBox.Height += outlineSize;
fullSize.Width += outlineSize;
bmpSize = new Size((int)fullSize.Width, (int)Math.Round(_BoundingBox.Height));
}
else
{
_BoundingBox = fullSize;
_BoundingBox.Height += outlineSize;
bmpSize = new Size(1, 1);
}
}
using (Bitmap bmp = new Bitmap(bmpSize.Width, bmpSize.Height, PixelFormat.Format32bppArgb))
using (Graphics g = Graphics.FromImage(bmp))
{
g.Clear(Color.Transparent);
if (chr == ' ')
{
_Texture = CDraw.AddTexture(bmp);
_DrawBounding = new RectangleF(0, 0, 0, 0);
}
else
{
g.SmoothingMode = SmoothingMode.AntiAlias;
g.InterpolationMode = InterpolationMode.HighQualityBicubic;
g.TextRenderingHint = TextRenderingHint.ClearTypeGridFit;
PointF point = new PointF(outlineSize / 2, outlineSize / 4);
using (GraphicsPath path = new GraphicsPath())
{
//Have to use size in em not pixels!
float emSize = fo.Size * fo.FontFamily.GetCellAscent(fo.Style) / fo.FontFamily.GetEmHeight(fo.Style);
path.AddString(chrString, fo.FontFamily, (int)fo.Style, emSize, point, new StringFormat());
using (Pen pen = new Pen(CFonts.OutlineColor.AsColor(), outlineSize))
{
pen.LineJoin = LineJoin.Round;
g.DrawPath(pen, path);
g.FillPath(Brushes.White, path);
}
}
_DrawBounding = _GetRealBounds(bmp);
using (Bitmap bmpCropped = bmp.Clone(_DrawBounding, PixelFormat.Format32bppArgb))
{
float dx = (fullSize.Width - _BoundingBox.Width - 1) / 2;
_DrawBounding.X -= dx;
_Texture = CDraw.AddTexture(bmpCropped);
/*_DrawBounding.X *= _Texture.Width / _DrawBounding.Width;
_DrawBounding.Y *= _Texture.Width / _DrawBounding.Width;
_DrawBounding.Width = _Texture.Width;
_DrawBounding.Height = _Texture.Height;*/
#pragma warning disable 162
if (false && Char.IsLetterOrDigit(chr))
{
if (outline > 0)
bmpCropped.Save("font_" + chr + "o" + CFonts.Style + "2.png", ImageFormat.Png);
else
bmpCropped.Save("font_" + chr + CFonts.Style + "2.png", ImageFormat.Png);
}
#pragma warning restore 162
}
}
}
CFonts.Height = oldHeight;
}
public void UnloadTexture()
{
CDraw.RemoveTexture(ref _Texture);
}
private float _GetFactor()
{
return CFonts.Height / _BoundingBox.Height;
}
public void GetTextureAndRect(float x, float y, float z, out STexture texture, out SRectF rect)
{
texture = _Texture;
float factor = _GetFactor();
x += _DrawBounding.X * factor;
y += _DrawBounding.Y * factor;
float h = _DrawBounding.Height * factor;
float w = _DrawBounding.Width * factor;
rect = new SRectF(x, y, w, h, z);
}
private static Rectangle _GetRealBounds(Bitmap bmp)
{
int minX = 0, maxX = bmp.Width - 1, minY = 0;
BitmapData bmpData = bmp.LockBits(new Rectangle(0, 0, bmp.Width, bmp.Height), ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
int values = bmpData.Width * bmp.Height;
Int32[] rgbValues = new Int32[values];
Marshal.Copy(bmpData.Scan0, rgbValues, 0, values);
int index = 0;
bool found = false;
//find from top
for (int y = 0; y < bmp.Height && !found; y++)
{
for (int x = 0; x < bmp.Width; x++)
{
if (rgbValues[index] != 0)
{
minX = x;
maxX = x;
minY = y;
found = true;
break;
}
index++;
}
}
found = false;
//find left
for (int x = 0; x < minX && !found; x++)
{
index = x + minY * bmp.Width;
for (int y = minY; y < bmp.Height; y++)
{
if (rgbValues[index] != 0)
{
found = true;
minX = x;
break;
}
index += bmp.Width;
}
}
found = false;
//find right
for (int x = bmp.Width - 1; x > maxX && !found; x--)
{
index = x + minY * bmp.Width;
for (int y = minY; y < bmp.Height; y++)
{
if (rgbValues[index] != 0)
{
found = true;
maxX = x;
break;
}
index += bmp.Width;
}
}
//Add some additional space. Textures need some extra pixel for resizing.
int d = 4;
minX = minX - d; if (minX < 0) minX = 0;
minY = minY - d; if (minY < 0) minY = 0;
maxX = maxX + d; if (maxX > bmp.Width) maxX = bmp.Width;
return new Rectangle(minX, minY, maxX - minX, bmp.Height - minY);
}
}
}
Vocaluxe/Base/Server/CVocaluxeServer.cs
+1 -1
View File
@@ -28,7 +28,7 @@ namespace Vocaluxe.Base.Server
{
_Clients = new Dictionary<int, CClientHandler>();
_Server = new CServer(RequestHandler, CConfig.ServerPort, CConfig.ServerEncryption == EOffOn.TR_CONFIG_ON);
_Discover = new CDiscover(CConfig.ServerPort, CCommands.ResponseKeyword);
_Discover = new CDiscover(CConfig.ServerPort, CCommands.BroadcastKeyword);
Controller.Init();
}
Vocaluxe/Lib/Draw/CDirect3D.cs
+40 -114
View File
@@ -31,7 +31,6 @@ using System.Runtime.InteropServices;
using System.Windows.Forms;
using SlimDX.Windows;
using Vocaluxe.Base;
using Vocaluxe.Base.Font;
using VocaluxeLib;
using VocaluxeLib.Menu;
@@ -102,11 +101,7 @@ namespace Vocaluxe.Lib.Draw
}
catch (Direct3DX9NotFoundException e)
{
MessageBox.Show("No DirectX runtimes were found, please download and install them " +
"from http://www.microsoft.com/download/en/details.aspx?id=8109",
CSettings.ProgramName, MessageBoxButtons.OK, MessageBoxIcon.Error);
CLog.LogError(e.Message + " - No DirectX runtimes were found, please download and install them from http://www.microsoft.com/download/en/details.aspx?id=8109");
Environment.Exit(Environment.ExitCode);
CLog.LogError("No DirectX runtimes were found, please download and install them from http://www.microsoft.com/download/en/details.aspx?id=8109", true, true, e);
}
Paint += _OnPaintEvent;
@@ -199,12 +194,9 @@ namespace Vocaluxe.Lib.Draw
{
if (_Device == null || _Device.Disposed)
{
MessageBox.Show("Something went wrong during device creating, please check if your DirectX redistributables " +
"and graphic card drivers are up to date. You can download the DirectX runtimes at http://www.microsoft.com/download/en/details.aspx?id=8109",
CSettings.ProgramName, MessageBoxButtons.OK, MessageBoxIcon.Error);
CLog.LogError(
"Something went wrong during device creating, please check if your DirectX redistributables and grafic card drivers are up to date. You can download the DirectX runtimes at http://www.microsoft.com/download/en/details.aspx?id=8109");
Environment.Exit(Environment.ExitCode);
"Something went wrong during device creating, please check if your DirectX redistributables and grafic card drivers are up to date. You can download the DirectX runtimes at http://www.microsoft.com/download/en/details.aspx?id=8109",
true, true);
}
}
@@ -581,7 +573,7 @@ namespace Vocaluxe.Lib.Draw
/// Unloads all Textures and other objects used by Direct3D for rendering
/// </summary>
/// <returns></returns>
public bool Unload()
public void Unload()
{
try
{
@@ -589,10 +581,10 @@ namespace Vocaluxe.Lib.Draw
}
catch {}
//Dispose all textures
foreach (KeyValuePair<int, Texture> p in _D3DTextures)
foreach (Texture texture in _D3DTextures.Values)
{
if (p.Value != null)
p.Value.Dispose();
if (texture != null)
texture.Dispose();
}
STexturedColoredVertex.GetDeclaration(_Device).Dispose();
@@ -600,7 +592,6 @@ namespace Vocaluxe.Lib.Draw
_IndexBuffer.Dispose();
_Device.Dispose();
_D3D.Dispose();
return true;
}
/// <summary>
@@ -621,30 +612,6 @@ namespace Vocaluxe.Lib.Draw
return _Device.Viewport.Height;
}
/// <summary>
/// Calculates the bounds for a CText object
/// </summary>
/// <param name="text">The CText object of which the bounds should be calculated for</param>
/// <returns>RectangleF object containing the bounds</returns>
public RectangleF GetTextBounds(CText text)
{
return GetTextBounds(text, text.Height);
}
/// <summary>
/// Calculates the bounds for a CText object
/// </summary>
/// <param name="text">The CText object of which the bounds should be calculated for</param>
/// <param name="height">The height of the CText object</param>
/// <returns>RectangleF object containing the bounds</returns>
public RectangleF GetTextBounds(CText text, float height)
{
CFonts.Height = height;
CFonts.SetFont(text.Font);
CFonts.Style = text.Style;
return new RectangleF(text.X, text.Y, CFonts.GetTextWidth(CLanguage.Translate(text.Text)), CFonts.GetTextHeight(CLanguage.Translate(text.Text)));
}
/// <summary>
/// Adds a quad a list which will be added and rendered to the vertexbuffer when calling RenderToVertexBuffer to reduce vertexbuffer calls each frame to a minimum
/// </summary>
@@ -792,21 +759,14 @@ namespace Vocaluxe.Lib.Draw
/// <param name="y2">The end y-value</param>
public void DrawLine(int a, int r, int g, int b, int w, int x1, int y1, int x2, int y2)
{
SColorF color = new SColorF((float)a / 255, (float)g / 255, (float)b / 255, (float)a / 255);
DrawTexture(_BlankTexture, new SRectF(x1, y1, x2, y2, 1), color);
}
/// <summary>
/// Draws a text string
/// </summary>
/// <param name="text">The text to be drawn</param>
/// <param name="x">The text's x-position</param>
/// <param name="y">The text's y-position</param>
/// <param name="h">The text's height</param>
/// <param name="z">The text's z-position</param>
public void DrawText(string text, int x, int y, int h, int z = 0)
{
CFonts.DrawText(text, h, x, y, z, new SColorF(1f, 1f, 1f, 1f));
var lineVector = new Vector2[] {new Vector2(x1, y1), new Vector2(x2, y2)};
using (var line = new Line(_Device))
{
line.Antialias = true;
line.Begin();
line.Draw(lineVector, new Color4((float)a / 255, (float)r / 255, (float)g / 255, (float)b / 255));
line.End();
}
}
/// <summary>
@@ -927,11 +887,15 @@ namespace Vocaluxe.Lib.Draw
{
w = newW;
h = (int)Math.Round(w / ratio);
if (h == 0)
h = 1;
}
else
{
h = newH;
w = (int)Math.Round(h * ratio);
if (w == 0)
w = 1;
}
//Create a new Bitmap with the new sizes
bmp2 = new Bitmap(w, h);
@@ -956,21 +920,14 @@ namespace Vocaluxe.Lib.Draw
bmp2.Dispose();
}
return AddTexture(w, h, ref data);
return AddTexture(w, h, data);
}
public STexture AddTexture(int w, int h, IntPtr data)
{
byte[] pointerData = new Byte[4 * w * h];
Marshal.Copy(data, pointerData, 0, pointerData.Length);
return AddTexture(w, h, ref pointerData);
}
public STexture AddTexture(int w, int h, ref byte[] data)
public STexture AddTexture(int w, int h, byte[] data)
{
STexture texture = new STexture(-1);
Texture t = _CreateTexture(w, h, ref data, ref texture);
Texture t = _CreateTexture(w, h, data, ref texture);
lock (_MutexTexture)
{
@@ -981,7 +938,7 @@ namespace Vocaluxe.Lib.Draw
return texture;
}
private Texture _CreateTexture(int w, int h, ref byte[] data, ref STexture texture)
private Texture _CreateTexture(int w, int h, byte[] data, ref STexture texture)
{
texture.Width = w;
texture.Height = h;
@@ -1020,7 +977,7 @@ namespace Vocaluxe.Lib.Draw
return t;
}
public STexture EnqueueTexture(int w, int h, ref byte[] data)
public STexture EnqueueTexture(int w, int h, byte[] data)
{
STexture texture = new STexture(-1);
STextureQueue queue = new STextureQueue {Data = data, Height = h, Width = w};
@@ -1041,27 +998,13 @@ namespace Vocaluxe.Lib.Draw
#endregion adding
#region updating
/// <summary>
/// Updates the data of a texture
/// </summary>
/// <param name="texture">The texture to update</param>
/// <param name="data">A Pointer containing the data of which the texture should be updated</param>
/// <returns>True if succeeded</returns>
public bool UpdateTexture(ref STexture texture, IntPtr data)
{
byte[] pointerData = new Byte[4 * (int)texture.Width * (int)texture.Height];
Marshal.Copy(data, pointerData, 0, pointerData.Length);
return UpdateTexture(ref texture, ref pointerData);
}
/// <summary>
/// Updates the data of a texture
/// </summary>
/// <param name="texture">The texture to update</param>
/// <param name="data">A byte array containing the new texture's data</param>
/// <returns>True if succeeded</returns>
public bool UpdateTexture(ref STexture texture, ref byte[] data)
public bool UpdateTexture(ref STexture texture, byte[] data)
{
if ((texture.Index >= 0) && (_Textures.Count > 0) && _TextureExists(ref texture))
{
@@ -1162,30 +1105,7 @@ namespace Vocaluxe.Lib.Draw
/// <param name="rect">A SRectF struct containing the destination coordinates</param>
public void DrawTexture(STexture texture, SRectF rect)
{
DrawTexture(texture, rect, texture.Color, false);
}
/// <summary>
/// Draws a texture
/// </summary>
/// <param name="texture">The texture to be drawn</param>
/// <param name="rect">A SRectF struct containing the destination coordinates</param>
/// <param name="color">A SColorF struct containing a color which the texture will be colored in</param>
public void DrawTexture(STexture texture, SRectF rect, SColorF color)
{
DrawTexture(texture, rect, color, false);
}
/// <summary>
/// Draws a texture
/// </summary>
/// <param name="texture">The texture to be drawn</param>
/// <param name="rect">A SRectF struct containing the destination coordinates</param>
/// <param name="color">A SColorF struct containing a color which the texture will be colored in</param>
/// <param name="bounds">A SRectF struct containing which part of the texture should be drawn</param>
public void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds)
{
DrawTexture(texture, rect, color, bounds, false);
DrawTexture(texture, rect, texture.Color);
}
/// <summary>
@@ -1195,7 +1115,7 @@ namespace Vocaluxe.Lib.Draw
/// <param name="rect">A SRectF struct containing the destination coordinates</param>
/// <param name="color">A SColorF struct containing a color which the texture will be colored in</param>
/// <param name="mirrored">True if the texture should be mirrored</param>
public void DrawTexture(STexture texture, SRectF rect, SColorF color, bool mirrored)
public void DrawTexture(STexture texture, SRectF rect, SColorF color, bool mirrored = false)
{
DrawTexture(texture, rect, color, new SRectF(0, 0, CSettings.RenderW, CSettings.RenderH, rect.Z), mirrored);
}
@@ -1208,7 +1128,7 @@ namespace Vocaluxe.Lib.Draw
/// <param name="color">A SColorF struct containing a color which the texture will be colored in</param>
/// <param name="bounds">A SRectF struct containing which part of the texture should be drawn</param>
/// <param name="mirrored">True if the texture should be mirrored</param>
public void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds, bool mirrored)
public void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds, bool mirrored = false)
{
if (_TextureExists(ref texture))
{
@@ -1257,6 +1177,8 @@ namespace Vocaluxe.Lib.Draw
rx2 -= 0.5f;
ry2 -= 0.5f;
color.A *= CGraphics.GlobalAlpha;
if (color.A > 1)
color.A = 1;
if (color.R > 1)
@@ -1266,7 +1188,7 @@ namespace Vocaluxe.Lib.Draw
if (color.B > 1)
color.B = 1;
Color c = Color.FromArgb((int)(color.A * 255 * CGraphics.GlobalAlpha), (int)(color.R * 255), (int)(color.G * 255), (int)(color.B * 255));
Color c = color.AsColor();
if (!mirrored)
{
@@ -1320,7 +1242,9 @@ namespace Vocaluxe.Lib.Draw
rx2 -= 0.5f;
ry2 -= 0.5f;
Color c = Color.FromArgb((int)(color.A * 255 * CGraphics.GlobalAlpha), (int)(color.R * 255), (int)(color.G * 255), (int)(color.B * 255));
color.A *= CGraphics.GlobalAlpha;
Color c = color.AsColor();
STexturedColoredVertex[] vert = new STexturedColoredVertex[4];
vert[0] = new STexturedColoredVertex(new Vector3(rx1, -ry1, rect.Z + CGraphics.ZOffset), new Vector2(x1, y1), c.ToArgb());
@@ -1402,8 +1326,10 @@ namespace Vocaluxe.Lib.Draw
rx2 -= 0.5f;
ry2 -= 0.5f;
Color c = Color.FromArgb((int)(color.A * 255 * CGraphics.GlobalAlpha), (int)(color.R * 255), (int)(color.G * 255), (int)(color.B * 255));
Color transparent = Color.FromArgb(0, (int)(color.R * 255), (int)(color.G * 255), (int)(color.B * 255));
color.A *= CGraphics.GlobalAlpha;
Color c = color.AsColor();
color.A = 0;
Color transparent = color.AsColor();
STexturedColoredVertex[] vert = new STexturedColoredVertex[4];
vert[0] = new STexturedColoredVertex(new Vector3(rx1, -ry1, rect.Z + CGraphics.ZOffset), new Vector2(x1, y2), c.ToArgb());
@@ -1429,7 +1355,7 @@ namespace Vocaluxe.Lib.Draw
else
return;
Texture t = _CreateTexture(q.Width, q.Height, ref q.Data, ref texture);
Texture t = _CreateTexture(q.Width, q.Height, q.Data, ref texture);
_D3DTextures[q.ID] = t;
_Textures[texture.Index] = texture;
@@ -1441,7 +1367,7 @@ namespace Vocaluxe.Lib.Draw
/// Gets the count of current textures
/// </summary>
/// <returns>The amount of textures</returns>
public int TextureCount()
public int GetTextureCount()
{
return _Textures.Count;
}
Vocaluxe/Lib/Draw/CDrawWinForm.cs
+10 -53
View File
@@ -27,7 +27,6 @@ using System.Runtime.InteropServices;
using System.Threading;
using System.Windows.Forms;
using Vocaluxe.Base;
using Vocaluxe.Base.Font;
using VocaluxeLib;
using VocaluxeLib.Menu;
@@ -266,7 +265,7 @@ namespace Vocaluxe.Lib.Draw
Close();
}
public bool Unload()
public void Unload()
{
try
{
@@ -274,7 +273,6 @@ namespace Vocaluxe.Lib.Draw
}
catch {}
Dispose();
return true;
}
public int GetScreenWidth()
@@ -287,19 +285,6 @@ namespace Vocaluxe.Lib.Draw
return ClientSize.Height;
}
public RectangleF GetTextBounds(CText text)
{
return GetTextBounds(text, text.Height);
}
public RectangleF GetTextBounds(CText text, float height)
{
CFonts.Height = height;
CFonts.SetFont(text.Font);
CFonts.Style = text.Style;
return new RectangleF(text.X, text.Y, CFonts.GetTextWidth(CLanguage.Translate(text.Text)), CFonts.GetTextHeight(CLanguage.Translate(text.Text)));
}
public void ClearScreen()
{
_G.Clear(_ClearColor);
@@ -352,12 +337,6 @@ namespace Vocaluxe.Lib.Draw
_G.DrawLine(new Pen(Color.FromArgb(a, r, g, b), w), new Point(x1, y1), new Point(x2, y2));
}
// Draw Basic Text
public void DrawText(string text, int x, int y, int h, int z = 0)
{
CFonts.DrawText(text, h, x, y, z, new SColorF(1, 1, 1, 1));
}
public void DrawColor(SColorF color, SRectF rect) {}
public void DrawColorReflection(SColorF color, SRectF rect, float space, float height) {}
@@ -420,17 +399,12 @@ namespace Vocaluxe.Lib.Draw
}
}
public STexture AddTexture(int w, int h, IntPtr data)
public STexture EnqueueTexture(int w, int h, byte[] data)
{
return new STexture(-1);
return AddTexture(w, h, data);
}
public STexture EnqueueTexture(int w, int h, ref byte[] data)
{
return AddTexture(w, h, ref data);
}
public STexture AddTexture(int w, int h, ref byte[] data)
public STexture AddTexture(int w, int h, byte[] data)
{
using (Bitmap bmp = new Bitmap(w, h))
{
@@ -441,12 +415,7 @@ namespace Vocaluxe.Lib.Draw
}
}
public bool UpdateTexture(ref STexture texture, IntPtr data)
{
return true;
}
public bool UpdateTexture(ref STexture texture, ref byte[] data)
public bool UpdateTexture(ref STexture texture, byte[] data)
{
if ((texture.Index >= 0) && (_Textures.Count > 0) && (_Bitmaps.Count > texture.Index))
{
@@ -470,29 +439,17 @@ namespace Vocaluxe.Lib.Draw
DrawTexture(texture, rect, texture.Color);
}
public void DrawTexture(STexture texture, SRectF rect, SColorF color)
{
if ((texture.Index >= 0) && (_Textures.Count > 0) && (_Bitmaps.Count > texture.Index))
DrawTexture(texture, rect, color, rect, false);
}
public void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds)
{
if ((texture.Index >= 0) && (_Textures.Count > 0) && (_Bitmaps.Count > texture.Index))
DrawTexture(texture, rect, color, bounds, false);
}
public void DrawTexture(STexture texture, SRectF rect, SColorF color, bool mirrored)
public void DrawTexture(STexture texture, SRectF rect, SColorF color, bool mirrored = false)
{
if ((texture.Index >= 0) && (_Textures.Count > 0) && (_Bitmaps.Count > texture.Index))
DrawTexture(texture, rect, color, rect, mirrored);
}
public void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds, bool mirrored)
public void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds, bool mirrored = false)
{
if ((texture.Index >= 0) && (_Textures.Count > 0) && (_Bitmaps.Count > texture.Index))
{
Bitmap coloredBitmap = ColorizeBitmap(_Bitmaps[texture.Index], color);
Bitmap coloredBitmap = _ColorizeBitmap(_Bitmaps[texture.Index], color);
_G.DrawImage(coloredBitmap, new RectangleF(rect.X, rect.Y, rect.W, rect.H));
coloredBitmap.Dispose();
}
@@ -502,12 +459,12 @@ namespace Vocaluxe.Lib.Draw
public void DrawTextureReflection(STexture texture, SRectF rect, SColorF color, SRectF bounds, float space, float height) {}
public int TextureCount()
public int GetTextureCount()
{
return _Textures.Count;
}
public static Bitmap ColorizeBitmap(Bitmap original, SColorF color)
private static Bitmap _ColorizeBitmap(Bitmap original, SColorF color)
{
Bitmap newBitmap = new Bitmap(original.Width, original.Height);
Vocaluxe/Lib/Draw/COpenGL.cs
+24 -152
View File
@@ -30,7 +30,6 @@ using System.IO;
using System.Runtime.InteropServices;
using System.Windows.Forms;
using Vocaluxe.Base;
using Vocaluxe.Base.Font;
using VocaluxeLib;
using VocaluxeLib.Menu;
using BeginMode = OpenTK.Graphics.OpenGL.BeginMode;
@@ -189,6 +188,7 @@ namespace Vocaluxe.Lib.Draw
return samples / 2;
}
/*
private int _CheckColorDepth(int setValue)
{
int result = 16;
@@ -214,6 +214,7 @@ namespace Vocaluxe.Lib.Draw
return result - 8;
}
*/
private void _ToggleFullScreen()
{
@@ -458,7 +459,7 @@ namespace Vocaluxe.Lib.Draw
Close();
}
public bool Unload()
public void Unload()
{
try
{
@@ -469,8 +470,6 @@ namespace Vocaluxe.Lib.Draw
_Textures.Values.CopyTo(textures, 0);
for (int i = 0; i < _Textures.Count; i++)
RemoveTexture(ref textures[i]);
return true;
}
public int GetScreenWidth()
@@ -482,19 +481,6 @@ namespace Vocaluxe.Lib.Draw
{
return _Control.Height;
}
public RectangleF GetTextBounds(CText text)
{
return GetTextBounds(text, text.Height);
}
public RectangleF GetTextBounds(CText text, float height)
{
CFonts.Height = height;
CFonts.SetFont(text.Font);
CFonts.Style = text.Style;
return new RectangleF(text.X, text.Y, CFonts.GetTextWidth(CLanguage.Translate(text.Text)), CFonts.GetTextHeight(CLanguage.Translate(text.Text)));
}
#endregion main stuff
#region Basic Draw Methods
@@ -582,12 +568,17 @@ namespace Vocaluxe.Lib.Draw
}
}
public void DrawLine(int a, int r, int g, int b, int w, int x1, int y1, int x2, int y2) {}
// Draw Basic Text (must be deleted later)
public void DrawText(string text, int x, int y, int h, int z = 0)
public void DrawLine(int a, int r, int g, int b, int w, int x1, int y1, int x2, int y2)
{
CFonts.DrawText(text, h, x, y, z, new SColorF(1, 1, 1, 1));
GL.Enable(EnableCap.Blend);
GL.Color4(r, g, b, a * CGraphics.GlobalAlpha);
GL.Begin(BeginMode.Lines);
GL.Vertex3(x1, y1, CGraphics.ZOffset);
GL.Vertex3(x2, y2, CGraphics.ZOffset);
GL.End();
GL.Disable(EnableCap.Blend);
}
public void DrawColor(SColorF color, SRectF rect)
@@ -723,12 +714,16 @@ namespace Vocaluxe.Lib.Draw
if (w > maxSize)
{
h = (int)Math.Round((float)maxSize / bmp.Width * bmp.Height);
if (h == 0)
h = 1;
w = maxSize;
}
if (h > maxSize)
{
w = (int)Math.Round((float)maxSize / bmp.Height * bmp.Width);
if (w == 0)
w = 1;
h = maxSize;
}
@@ -792,67 +787,7 @@ namespace Vocaluxe.Lib.Draw
return texture;
}
public STexture AddTexture(int w, int h, IntPtr data)
{
STexture texture = new STexture(-1);
if (_UsePBO)
{
try
{
GL.GenBuffers(1, out texture.PBO);
GL.BindBuffer(BufferTarget.PixelUnpackBuffer, texture.PBO);
GL.BufferData(BufferTarget.PixelUnpackBuffer, (IntPtr)(w * h * 4), IntPtr.Zero, BufferUsageHint.StreamDraw);
GL.BindBuffer(BufferTarget.PixelUnpackBuffer, 0);
}
catch (Exception)
{
_UsePBO = false;
}
}
int id = GL.GenTexture();
GL.BindTexture(TextureTarget.Texture2D, id);
texture.ID = id;
texture.Width = w;
texture.Height = h;
texture.W2 = MathHelper.NextPowerOfTwo(texture.Width);
texture.H2 = MathHelper.NextPowerOfTwo(texture.Height);
texture.WidthRatio = texture.Width / texture.W2;
texture.HeightRatio = texture.Height / texture.H2;
GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba, (int)texture.W2, (int)texture.H2, 0, PixelFormat.Bgra, PixelType.UnsignedByte, IntPtr.Zero);
GL.TexSubImage2D(TextureTarget.Texture2D, 0, 0, 0, w, h, PixelFormat.Bgra, PixelType.UnsignedByte, data);
//GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapS, (int)TextureParameterName.ClampToEdge);
//GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapT, (int)TextureParameterName.ClampToEdge);
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Linear);
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Linear);
//GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.LinearMipmapLinear);
//GL.GenerateMipmap(GenerateMipmapTarget.Texture2D);
//GL.Ext.GenerateMipmap(GenerateMipmapTarget.Texture2D);
GL.BindTexture(TextureTarget.Texture2D, 0);
// Add to Texture List
texture.Color = new SColorF(1f, 1f, 1f, 1f);
texture.Rect = new SRectF(0f, 0f, texture.Width, texture.Height, 0f);
texture.TexturePath = String.Empty;
lock (_MutexTexture)
{
texture.Index = _IDs.Dequeue();
_Textures[texture.Index] = texture;
}
return texture;
}
public STexture AddTexture(int w, int h, ref byte[] data)
public STexture AddTexture(int w, int h, byte[] data)
{
STexture texture = new STexture(-1);
@@ -913,7 +848,7 @@ namespace Vocaluxe.Lib.Draw
return texture;
}
public STexture EnqueueTexture(int w, int h, ref byte[] data)
public STexture EnqueueTexture(int w, int h, byte[] data)
{
STexture texture = new STexture(-1);
STextureQueue queue = new STextureQueue {Data = data, Height = h, Width = w};
@@ -934,60 +869,7 @@ namespace Vocaluxe.Lib.Draw
#endregion adding
#region updating
public bool UpdateTexture(ref STexture texture, IntPtr data)
{
if (_TextureExists(ref texture))
{
if (_UsePBO)
{
try
{
GL.BindBuffer(BufferTarget.PixelUnpackBuffer, texture.PBO);
IntPtr buffer = GL.MapBuffer(BufferTarget.PixelUnpackBuffer, BufferAccess.WriteOnly);
byte[] d = new byte[(int)texture.Height * (int)texture.Width * 4];
Marshal.Copy(data, d, 0, (int)texture.Height * (int)texture.Width * 4);
Marshal.Copy(d, 0, buffer, (int)texture.Height * (int)texture.Width * 4);
GL.UnmapBuffer(BufferTarget.PixelUnpackBuffer);
GL.BindTexture(TextureTarget.Texture2D, texture.ID);
GL.TexSubImage2D(TextureTarget.Texture2D, 0, 0, 0, (int)texture.Width, (int)texture.Height, PixelFormat.Bgra, PixelType.UnsignedByte, IntPtr.Zero);
GL.BindTexture(TextureTarget.Texture2D, 0);
GL.BindBuffer(BufferTarget.PixelUnpackBuffer, 0);
return true;
}
catch (Exception)
{
_UsePBO = false;
}
}
GL.BindTexture(TextureTarget.Texture2D, texture.ID);
GL.TexSubImage2D(TextureTarget.Texture2D, 0, 0, 0, (int)texture.Width, (int)texture.Height, PixelFormat.Bgra, PixelType.UnsignedByte, data);
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapS, (int)TextureParameterName.ClampToEdge);
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapT, (int)TextureParameterName.ClampToEdge);
//GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Linear);
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Linear);
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.LinearMipmapLinear);
//GL.GenerateMipmap(GenerateMipmapTarget.Texture2D);
GL.Ext.GenerateMipmap(GenerateMipmapTarget.Texture2D);
GL.BindTexture(TextureTarget.Texture2D, 0);
return true;
}
return false;
}
public bool UpdateTexture(ref STexture texture, ref byte[] data)
public bool UpdateTexture(ref STexture texture, byte[] data)
{
if (_TextureExists(ref texture))
{
@@ -1070,25 +952,15 @@ namespace Vocaluxe.Lib.Draw
public void DrawTexture(STexture texture, SRectF rect)
{
DrawTexture(texture, rect, texture.Color, false);
DrawTexture(texture, rect, texture.Color);
}
public void DrawTexture(STexture texture, SRectF rect, SColorF color)
{
DrawTexture(texture, rect, color, false);
}
public void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds)
{
DrawTexture(texture, rect, color, bounds, false);
}
public void DrawTexture(STexture texture, SRectF rect, SColorF color, bool mirrored)
public void DrawTexture(STexture texture, SRectF rect, SColorF color, bool mirrored = false)
{
DrawTexture(texture, rect, color, new SRectF(0, 0, CSettings.RenderW, CSettings.RenderH, rect.Z), mirrored);
}
public void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds, bool mirrored)
public void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds, bool mirrored = false)
{
if (Math.Abs(rect.W) < float.Epsilon || Math.Abs(rect.H) < float.Epsilon || Math.Abs(bounds.H) < float.Epsilon || Math.Abs(bounds.W) < float.Epsilon ||
Math.Abs(color.A) < float.Epsilon)
@@ -1324,7 +1196,7 @@ namespace Vocaluxe.Lib.Draw
}
#endregion drawing
public int TextureCount()
public int GetTextureCount()
{
return _Textures.Count;
}
Vocaluxe/Lib/Draw/IDraw.cs
+13 -24
View File
@@ -28,47 +28,36 @@ namespace Vocaluxe.Lib.Draw
{
bool Init();
void MainLoop();
bool Unload();
void Unload();
int GetScreenWidth();
int GetScreenHeight();
RectangleF GetTextBounds(CText text);
RectangleF GetTextBounds(CText text, float height);
// Basic Draw Methods
void DrawLine(int a, int r, int g, int b, int w, int x1, int y1, int x2, int y2);
void DrawColor(SColorF color, SRectF rect);
void DrawColorReflection(SColorF color, SRectF rect, float space, float height);
int GetTextureCount();
void ClearScreen();
STexture CopyScreen();
void CopyScreen(ref STexture texture);
void MakeScreenShot();
// Draw Basic Text (must be deleted later)
void DrawText(string text, int x, int y, int h, int z = 0);
STexture AddTexture(string texturePath);
STexture AddTexture(Bitmap bitmap);
STexture AddTexture(int w, int h, IntPtr data);
STexture AddTexture(int w, int h, ref byte[] data);
STexture EnqueueTexture(int w, int h, ref byte[] data);
bool UpdateTexture(ref STexture texture, ref byte[] data);
bool UpdateTexture(ref STexture texture, IntPtr data);
STexture AddTexture(int w, int h, byte[] data);
STexture EnqueueTexture(int w, int h, byte[] data);
bool UpdateTexture(ref STexture texture, byte[] data);
void RemoveTexture(ref STexture texture);
// Basic Draw Methods
void DrawLine(int a, int r, int g, int b, int w, int x1, int y1, int x2, int y2);
void DrawColor(SColorF color, SRectF rect);
void DrawColorReflection(SColorF color, SRectF rect, float space, float height);
void DrawTexture(STexture texture);
void DrawTexture(STexture texture, SRectF rect);
void DrawTexture(STexture texture, SRectF rect, SColorF color);
void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds);
void DrawTexture(STexture texture, SRectF rect, SColorF color, bool mirrored);
void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds, bool mirrored);
void DrawTexture(STexture texture, SRectF rect, SColorF color, bool mirrored = false);
void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds, bool mirrored = false);
void DrawTexture(STexture texture, SRectF rect, SColorF color, float begin, float end);
void DrawTextureReflection(STexture texture, SRectF rect, SColorF color, SRectF bounds, float space, float height);
int TextureCount();
}
}
Vocaluxe/Lib/Sound/COpenALPlay.cs
+1 -1
View File
@@ -790,7 +790,7 @@ namespace Vocaluxe.Lib.Sound
{
if (_Data.BytesNotRead >= buf.Length)
{
_Data.Read(ref buf);
_Data.Read(buf);
byte[] b = new byte[2];
Vocaluxe/Lib/Sound/CPortAudioPlay.cs
+1 -1
View File
@@ -816,7 +816,7 @@ namespace Vocaluxe.Lib.Sound
{
if (_NoMoreData || _Data.BytesNotRead >= buf.Length)
{
_Data.Read(ref buf);
_Data.Read(buf);
byte[] b = new byte[2];
for (int i = 0; i < buf.Length; i += _ByteCount)
Vocaluxe/Lib/Sound/IPlayback.cs
+1 -1
View File
@@ -103,7 +103,7 @@ namespace Vocaluxe.Lib.Sound
}
}
public void Read(ref byte[] data)
public void Read(byte[] data)
{
long read = 0L;
while (read < data.Length && _BytesNotRead > 0L)
Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs
+2 -2
View File
@@ -664,10 +664,10 @@ namespace Vocaluxe.Lib.Video
if (frame.Index == -1 || _Width != (int)frame.Width || _Height != (int)frame.Height)
{
CDraw.RemoveTexture(ref frame);
frame = CDraw.AddTexture(_Width, _Height, ref _FrameBuffer[num].Data);
frame = CDraw.AddTexture(_Width, _Height, _FrameBuffer[num].Data);
}
else
CDraw.UpdateTexture(ref frame, ref _FrameBuffer[num].Data);
CDraw.UpdateTexture(ref frame, _FrameBuffer[num].Data);
lock (_MutexSyncSignals)
{
Vocaluxe/Lib/Video/CVideoDecoderGstreamer.cs
+8 -9
View File
@@ -119,17 +119,16 @@ namespace Vocaluxe.Lib.Video
private void _UploadNewFrame(ref STexture frame, ref byte[] data, int width, int height)
{
if (data != null)
if (data == null)
return;
if (frame.Index == -1 || width != (int)frame.Width || height != (int)frame.Height || data.Length == 0)
{
if (frame.Index == -1 || width != (int)frame.Width || height != (int)frame.Height || data.Length == 0)
{
CDraw.RemoveTexture(ref frame);
frame = CDraw.AddTexture(width, height, ref data);
}
else
CDraw.UpdateTexture(ref frame, ref data);
data = null;
CDraw.RemoveTexture(ref frame);
frame = CDraw.AddTexture(width, height, data);
}
else
CDraw.UpdateTexture(ref frame, data);
data = null;
}
}
}
Vocaluxe/Lib/Webcam/CAForgeNet.cs
+2 -2
View File
@@ -59,10 +59,10 @@ namespace Vocaluxe.Lib.Webcam
if (frame.Index == -1 || _Width != (int)frame.Width || _Height != (int)frame.Height)
{
CDraw.RemoveTexture(ref frame);
frame = CDraw.AddTexture(_Width, _Height, ref _Data);
frame = CDraw.AddTexture(_Width, _Height, _Data);
}
else
CDraw.UpdateTexture(ref frame, ref _Data);
CDraw.UpdateTexture(ref frame, _Data);
}
}
return false;
Vocaluxe/Program.cs
+1 -1
View File
@@ -25,7 +25,7 @@ using System.Reflection;
using System.Windows.Forms;
using Vocaluxe.Base;
using System.Runtime.ExceptionServices;
using Vocaluxe.Base.Font;
using Vocaluxe.Base.Fonts;
using Vocaluxe.Base.Server;
namespace Vocaluxe
Vocaluxe/Screens/CScreenCredits.cs
+82 -81
View File
@@ -22,90 +22,91 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Windows.Forms;
using Vocaluxe.Base;
using Vocaluxe.Base.Fonts;
using VocaluxeLib;
using VocaluxeLib.Menu;
enum EDirection
{
Left,
Right,
Up
}
class CCreditName
{
private readonly CStatic _Image;
private readonly CStatic _ImgDot;
private readonly CParticleEffect _Particle;
private readonly int _ParticleOffsetX;
private readonly int _ParticleOffsetY;
public EDirection Direction;
public float StartTimeUp;
public bool Active;
public CCreditName(CStatic image, CStatic imgDot, CParticleEffect particle, int particleOffsetX, int particleOffsetY)
{
_Image = image;
_ImgDot = imgDot;
_Particle = particle;
_ParticleOffsetX = (int)Math.Round(particleOffsetX * image.Rect.W / image.Texture.Width - particle.Rect.W / 2);
_ParticleOffsetY = (int)Math.Round(particleOffsetY * image.Rect.H / image.Texture.Height - particle.Rect.H / 2);
Active = true;
}
public float X
{
get { return _Image.Rect.X; }
set
{
_Image.Rect.X = value;
_ImgDot.Rect.X = value + _ParticleOffsetX;
_Particle.Rect.X = value + _ParticleOffsetX;
}
}
public float Y
{
get { return _Image.Rect.Y; }
set
{
_Image.Rect.Y = value;
_ImgDot.Rect.Y = value + _ParticleOffsetY;
_Particle.Rect.Y = value + _ParticleOffsetY;
}
}
public float W
{
get { return _Image.Rect.W; }
}
public float H
{
get { return _Image.Rect.H; }
}
public float Alpha
{
get { return _Image.Alpha; }
set
{
_Image.Alpha = value;
_ImgDot.Alpha = value;
}
}
public void Draw()
{
if (Active)
{
_Image.Draw();
_ImgDot.Draw();
_Particle.Draw();
}
}
}
namespace Vocaluxe.Screens
{
enum EDirection
{
Left,
Right,
Up
}
class CCreditName
{
private readonly CStatic _Image;
private readonly CStatic _ImgDot;
private readonly CParticleEffect _Particle;
private readonly int _ParticleOffsetX;
private readonly int _ParticleOffsetY;
public EDirection Direction;
public float StartTimeUp;
public bool Active;
public CCreditName(CStatic image, CStatic imgDot, CParticleEffect particle, int particleOffsetX, int particleOffsetY)
{
_Image = image;
_ImgDot = imgDot;
_Particle = particle;
_ParticleOffsetX = (int)Math.Round(particleOffsetX * image.Rect.W / image.Texture.Width - particle.Rect.W / 2);
_ParticleOffsetY = (int)Math.Round(particleOffsetY * image.Rect.H / image.Texture.Height - particle.Rect.H / 2);
Active = true;
}
public float X
{
get { return _Image.Rect.X; }
set
{
_Image.Rect.X = value;
_ImgDot.Rect.X = value + _ParticleOffsetX;
_Particle.Rect.X = value + _ParticleOffsetX;
}
}
public float Y
{
get { return _Image.Rect.Y; }
set
{
_Image.Rect.Y = value;
_ImgDot.Rect.Y = value + _ParticleOffsetY;
_Particle.Rect.Y = value + _ParticleOffsetY;
}
}
public float W
{
get { return _Image.Rect.W; }
}
public float H
{
get { return _Image.Rect.H; }
}
public float Alpha
{
get { return _Image.Alpha; }
set
{
_Image.Alpha = value;
_ImgDot.Alpha = value;
}
}
public void Draw()
{
if (Active)
{
_Image.Draw();
_ImgDot.Draw();
_Particle.Draw();
}
}
}
class CScreenCredits : CMenu
{
// Version number for theme files. Increment it, if you've changed something on the theme files!
@@ -212,8 +213,8 @@ namespace Vocaluxe.Screens
if (paragraph[e] == null)
continue;
string newLine = " " + paragraph[e];
CText text = GetNewText(75, lastY, -2, 30, -1, EAlignment.Left, EStyle.Bold, "Outline", new SColorF(1, 1, 1, 1), line);
if (CDraw.GetTextBounds(text).Width < (CSettings.RenderW - 220))
CText text = GetNewText(75, lastY, -2, 25, -1, EAlignment.Left, EStyle.Bold, "Outline", new SColorF(1, 1, 1, 1), line);
if (CFonts.GetTextBounds(text).Width < (CSettings.RenderW - 220))
{
line += newLine;
Vocaluxe/Screens/CScreenLoad.cs
+10 -8
View File
@@ -31,10 +31,11 @@ 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 _TextStatus = "TextStatus";
private const string _TextProgramName = "TextProgramName";
private readonly string[] _IntroVideo = new string[] {"IntroIn", "IntroMid", "IntroOut"};
@@ -45,13 +46,13 @@ namespace Vocaluxe.Screens
private bool _IntroOutPlayed;
private CVideoPlayer[] _Intros;
private bool _BGMusicStartet;
private bool _BGMusicStarted;
public override void Init()
{
base.Init();
_ThemeTexts = new string[] {_TextStatus};
_ThemeTexts = new string[] {_TextStatus, _TextProgramName};
_Intros = new CVideoPlayer[_IntroVideo.Length];
for (int i = 0; i < _Intros.Length; i++)
_Intros[i] = new CVideoPlayer();
@@ -117,9 +118,10 @@ namespace Vocaluxe.Screens
{
for (int i = 0; i < _Intros.Length; i++)
_Intros[i].Load(_IntroVideo[i]);
_Texts[_TextProgramName].Visible = false;
}
_BGMusicStartet = false;
_BGMusicStarted = false;
}
public override void OnShowFinish()
@@ -138,14 +140,14 @@ namespace Vocaluxe.Screens
_Timer.Start();
if (CConfig.BackgroundMusic == EOffOn.TR_CONFIG_ON &&
CConfig.BackgroundMusicSource == EBackgroundMusicSource.TR_CONFIG_NO_OWN_MUSIC && !_BGMusicStartet)
CConfig.BackgroundMusicSource == EBackgroundMusicSource.TR_CONFIG_NO_OWN_MUSIC && !_BGMusicStarted)
{
CBackgroundMusic.AddOwnMusic();
if (!CBackgroundMusic.IsPlaying)
CBackgroundMusic.Next();
_BGMusicStartet = true;
_BGMusicStarted = true;
}
CBackgroundMusic.CanSing = false;
@@ -174,14 +176,14 @@ namespace Vocaluxe.Screens
CLanguage.Translate("TR_SCREENLOAD_LOADED") + ")";
if (CSongs.SongsLoaded && CConfig.BackgroundMusic == EOffOn.TR_CONFIG_ON &&
CConfig.BackgroundMusicSource != EBackgroundMusicSource.TR_CONFIG_NO_OWN_MUSIC && !_BGMusicStartet)
CConfig.BackgroundMusicSource != EBackgroundMusicSource.TR_CONFIG_NO_OWN_MUSIC && !_BGMusicStarted)
{
CBackgroundMusic.AddOwnMusic();
if (!CBackgroundMusic.IsPlaying)
CBackgroundMusic.Next();
_BGMusicStartet = true;
_BGMusicStarted = true;
}
return true;
Vocaluxe/Screens/CScreenMain.cs
+11 -4
View File
@@ -19,7 +19,7 @@
using System.Windows.Forms;
using Vocaluxe.Base;
using Vocaluxe.Base.Font;
using Vocaluxe.Base.Fonts;
using VocaluxeLib;
using VocaluxeLib.Menu;
@@ -39,6 +39,8 @@ namespace Vocaluxe.Screens
private const string _ButtonProfiles = "ButtonProfiles";
private const string _ButtonExit = "ButtonExit";
private CText _ReleaseText;
//CParticleEffect Snowflakes;
public override void Init()
{
@@ -48,6 +50,13 @@ namespace Vocaluxe.Screens
_ThemeButtons = new string[] {_ButtonSing, _ButtonParty, _ButtonOptions, _ButtonProfiles, _ButtonExit};
}
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());
}
public override bool HandleInput(SKeyEvent keyEvent)
{
base.HandleInput(keyEvent);
@@ -157,9 +166,7 @@ namespace Vocaluxe.Screens
if (CSettings.VersionRevision != ERevision.Release)
// ReSharper restore ConditionIsAlwaysTrueOrFalse
{
CFonts.SetFont("Normal");
CFonts.Style = EStyle.Normal;
CDraw.DrawText(CSettings.GetFullVersionText(), 10, 680, 40);
_ReleaseText.Draw();
}
return true;
Vocaluxe/Screens/CScreenOptionsTheme.cs
+1 -1
View File
@@ -19,7 +19,7 @@
using System.Windows.Forms;
using Vocaluxe.Base;
using Vocaluxe.Base.Font;
using Vocaluxe.Base.Fonts;
using VocaluxeLib;
using VocaluxeLib.Menu;
Vocaluxe/Screens/CScreenSing.cs
+1 -1
View File
@@ -25,7 +25,7 @@ using System.IO;
using System.Linq;
using System.Windows.Forms;
using Vocaluxe.Base;
using Vocaluxe.Base.Font;
using Vocaluxe.Base.Fonts;
using VocaluxeLib;
using VocaluxeLib.Menu;
using VocaluxeLib.Menu.SingNotes;
Vocaluxe/Screens/CScreenSong.cs
+1 -1
View File
@@ -1198,7 +1198,7 @@ namespace Vocaluxe.Screens
private void _OpenPlaylist(int playlistID)
{
if (CPlaylists.Playlists.Length > playlistID && playlistID >= 0 && _Playlists[_Playlist].ActivePlaylistID != playlistID)
if (CPlaylists.Playlists.Length > playlistID && playlistID >= 0)
{
_Playlists[_Playlist].LoadPlaylist(playlistID);
_SongMenus[_SongMenu].SetSmallView(true);
Vocaluxe/Screens/CScreenTest.cs
+19
View File
@@ -37,6 +37,25 @@ namespace Vocaluxe.Screens
private int _TestMusic = -1;
*/
public override void Init()
{
base.Init();
const string test = "Ö ÄÜabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPGRSTUVWGXZ1234567890";
SColorF color = new SColorF(1, 0, 0, 1);
CText text = new CText(10, 50, 1, 32, 0, EAlignment.Left, EStyle.Normal, "Normal", color, "jÄNormal Text" + test, -1, 26, 0);
_AddText(text);
text = new CText(10, 90, 1, 32, 0, EAlignment.Left, EStyle.Bold, "Normal", color, "jÄBold Text" + test, -1, 26, 0);
_AddText(text);
text = new CText(10, 130, 1, 32, 0, EAlignment.Left, EStyle.Italic, "Normal", color, "jÄItalic Text" + test, -1, 26, 0);
_AddText(text);
text = new CText(10, 170, 1, 32, 0, EAlignment.Left, EStyle.Normal, "Outline", color, "jÄNormal Text" + test, -1, 50, 0);
_AddText(text);
text = new CText(10, 210, 1, 32, 0, EAlignment.Left, EStyle.Bold, "Outline", color, "jÄBold Text" + test, -1, 100, 0);
_AddText(text);
text = new CText(10, 250, 1, 32, 0, EAlignment.Left, EStyle.Italic, "Outline", color, "jÄItalic Text" + test, -1, 150, 0);
_AddText(text);
}
public override bool HandleInput(SKeyEvent keyEvent)
{
if (keyEvent.KeyPressed && !Char.IsControl(keyEvent.Unicode)) {}
Vocaluxe/Vocaluxe.csproj
+3 -3
View File
@@ -180,7 +180,7 @@
<Compile Include="Base\CCover.cs" />
<Compile Include="Base\CDataBase.cs" />
<Compile Include="Base\CDraw.cs" />
<Compile Include="Base\Font\CFont.cs" />
<Compile Include="Base\Fonts\CFont.cs" />
<Compile Include="Base\CGame.cs" />
<Compile Include="Base\CController.cs" />
<Compile Include="Base\CLanguage.cs" />
@@ -199,8 +199,8 @@
<Compile Include="Base\CTheme.cs" />
<Compile Include="Base\CVideo.cs" />
<Compile Include="Base\CWebcam.cs" />
<Compile Include="Base\Font\CFonts.cs" />
<Compile Include="Base\Font\CGlyph.cs" />
<Compile Include="Base\Fonts\CFonts.cs" />
<Compile Include="Base\Fonts\CGlyph.cs" />
<Compile Include="Base\Server\CClientHandler.cs" />
<Compile Include="Base\Server\CVocaluxeServer.cs" />
<Compile Include="CSplashScreen.cs">
VocaluxeLib/IBasic.cs
+2 -4
View File
@@ -114,12 +114,9 @@ namespace VocaluxeLib
public interface IDrawing
{
RectangleF GetTextBounds(CText text);
void DrawTexture(STexture texture, SRectF rect);
void DrawTexture(STexture texture, SRectF rect, SColorF color);
void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds);
void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds, bool mirrored);
void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds, bool mirrored = false);
void DrawTextureReflection(STexture texture, SRectF rect, SColorF color, SRectF bounds, float reflectionSpace, float reflectionHeight);
STexture AddTexture(string fileName);
@@ -148,6 +145,7 @@ namespace VocaluxeLib
void SetFont(string fontName);
void SetStyle(EStyle fontStyle);
RectangleF GetTextBounds(CText text);
RectangleF GetTextBounds(CText text, float textHeight);
void DrawText(string text, float textHeight, float x, float y, float z, SColorF color);
VocaluxeLib/Menu/CButton.cs
+3 -3
View File
@@ -312,7 +312,7 @@ namespace VocaluxeLib.Menu
if (_Reflection)
{
CBase.Drawing.DrawTextureReflection(texture, Rect, Color, Rect, _ReflectionSpace, _ReflectionHeight);
Text.DrawRelative(Rect.X, Rect.Y, _ReflectionSpace, _ReflectionHeight, Rect.H);
Text.DrawRelative(Rect.X, Rect.Y, _ReflectionHeight, _ReflectionSpace, Rect.H);
}
else
Text.DrawRelative(Rect.X, Rect.Y);
@@ -326,7 +326,7 @@ namespace VocaluxeLib.Menu
if (_Reflection)
{
CBase.Drawing.DrawTextureReflection(texture, Rect, SelColor, Rect, _ReflectionSpace, _ReflectionHeight);
Text.DrawRelative(Rect.X, Rect.Y, _ReflectionSpace, _ReflectionHeight, Rect.H);
Text.DrawRelative(Rect.X, Rect.Y, _ReflectionHeight, _ReflectionSpace, Rect.H);
}
else
Text.DrawRelative(Rect.X, Rect.Y);
@@ -340,7 +340,7 @@ namespace VocaluxeLib.Menu
if (_Reflection)
{
CBase.Drawing.DrawTextureReflection(texture, Rect, SelColor, Rect, _ReflectionSpace, _ReflectionHeight);
_SelText.DrawRelative(Rect.X, Rect.Y, _ReflectionSpace, _ReflectionHeight, Rect.H);
_SelText.DrawRelative(Rect.X, Rect.Y, _ReflectionHeight, _ReflectionSpace, Rect.H);
}
else
_SelText.DrawRelative(Rect.X, Rect.Y);
VocaluxeLib/Menu/CLyric.cs
+7 -7
View File
@@ -216,7 +216,7 @@ namespace VocaluxeLib.Menu
if (n.Type == ENoteType.Freestyle)
_Text.Style = EStyle.BoldItalic;
RectangleF rect = CBase.Drawing.GetTextBounds(_Text);
RectangleF rect = CBase.Fonts.GetTextBounds(_Text);
_Width += rect.Width;
_Notes.Add(n);
}
@@ -267,7 +267,7 @@ namespace VocaluxeLib.Menu
_Text.X = x;
_Text.Style = EStyle.Bold;
_Text.Text = note.Text;
RectangleF rect = CBase.Drawing.GetTextBounds(_Text);
RectangleF rect = CBase.Fonts.GetTextBounds(_Text);
if (note.Type == ENoteType.Freestyle)
_Text.Style = EStyle.BoldItalic;
@@ -326,7 +326,7 @@ namespace VocaluxeLib.Menu
_Text.X = x;
_Text.Style = EStyle.Bold;
_Text.Text = _Notes[note].Text;
RectangleF rect = CBase.Drawing.GetTextBounds(_Text);
RectangleF rect = CBase.Fonts.GetTextBounds(_Text);
if (_Notes[note].Type == ENoteType.Freestyle)
_Text.Style = EStyle.BoldItalic;
@@ -374,7 +374,7 @@ namespace VocaluxeLib.Menu
if (_Notes[zoomNote].Type == ENoteType.Freestyle)
_Text.Style = EStyle.BoldItalic;
RectangleF rect = CBase.Drawing.GetTextBounds(_Text);
RectangleF rect = CBase.Fonts.GetTextBounds(_Text);
float diff = endBeat - _Notes[zoomNote].StartBeat;
if (diff <= 0f)
@@ -392,7 +392,7 @@ namespace VocaluxeLib.Menu
float tz = _Text.Z;
_Text.Height += _Text.Height * p * 0.4f;
RectangleF rectz = CBase.Drawing.GetTextBounds(_Text);
RectangleF rectz = CBase.Fonts.GetTextBounds(_Text);
_Text.X -= (rectz.Width - rect.Width) / 2f;
_Text.Y -= (rectz.Height - rect.Height) / 2f;
_Text.Z -= 0.1f;
@@ -415,7 +415,7 @@ namespace VocaluxeLib.Menu
_Text.X = x;
_Text.Style = EStyle.Bold;
_Text.Text = note.Text;
RectangleF rect = CBase.Drawing.GetTextBounds(_Text);
RectangleF rect = CBase.Fonts.GetTextBounds(_Text);
if (note.Type == ENoteType.Freestyle)
_Text.Style = EStyle.BoldItalic;
@@ -456,7 +456,7 @@ namespace VocaluxeLib.Menu
_Text.X = x;
_Text.Style = EStyle.Bold;
_Text.Text = _Notes[note].Text;
RectangleF rect = CBase.Drawing.GetTextBounds(_Text);
RectangleF rect = CBase.Fonts.GetTextBounds(_Text);
if (_Notes[note].Type == ENoteType.Freestyle)
_Text.Style = EStyle.BoldItalic;
VocaluxeLib/Menu/CMenu.cs
+23 -56
View File
@@ -999,51 +999,13 @@ namespace VocaluxeLib.Menu
private bool _IsMouseOver(int x, int y, CInteraction interact)
{
switch (interact.Type)
bool result = CHelper.IsInBounds(_GetRect(interact), x, y);
if (result)
return true;
if (interact.Type == EType.SelectSlide)
{
case EType.Button:
if (CHelper.IsInBounds(_Buttons[interact.Num].Rect, x, y))
return true;
break;
case EType.SelectSlide:
if (CHelper.IsInBounds(_SelectSlides[interact.Num].Rect, x, y) ||
CHelper.IsInBounds(_SelectSlides[interact.Num].RectArrowLeft, x, y) ||
CHelper.IsInBounds(_SelectSlides[interact.Num].RectArrowRight, x, y))
return true;
break;
case EType.Static:
if (CHelper.IsInBounds(_Statics[interact.Num].Rect, x, y))
return true;
break;
case EType.Text:
RectangleF bounds = CBase.Drawing.GetTextBounds(_Texts[interact.Num]);
if (CHelper.IsInBounds(new SRectF(_Texts[interact.Num].X, _Texts[interact.Num].Y, bounds.Width, bounds.Height, _Texts[interact.Num].Z), x, y))
return true;
break;
case EType.SongMenu:
if (CHelper.IsInBounds(_SongMenus[interact.Num].Rect, x, y))
return true;
break;
case EType.Lyric:
if (CHelper.IsInBounds(_Lyrics[interact.Num].Rect, x, y))
return true;
break;
case EType.NameSelection:
if (CHelper.IsInBounds(_NameSelections[interact.Num].Rect, x, y))
return true;
break;
case EType.Equalizer:
if (CHelper.IsInBounds(_Equalizers[interact.Num].Rect, x, y))
return true;
break;
case EType.Playlist:
if (CHelper.IsInBounds(_Playlists[interact.Num].Rect, x, y))
return true;
break;
case EType.ParticleEffect:
if (CHelper.IsInBounds(_ParticleEffects[interact.Num].Rect, x, y))
return true;
break;
return CHelper.IsInBounds(_SelectSlides[interact.Num].RectArrowLeft, x, y) ||
CHelper.IsInBounds(_SelectSlides[interact.Num].RectArrowRight, x, y);
}
return false;
}
@@ -1619,45 +1581,50 @@ namespace VocaluxeLib.Menu
return false;
}
private SRectF _GetRect(int interaction)
private SRectF _GetRect(CInteraction interaction)
{
SRectF result = new SRectF();
switch (_Interactions[interaction].Type)
switch (interaction.Type)
{
case EType.Button:
return _Buttons[_Interactions[interaction].Num].Rect;
return _Buttons[interaction.Num].Rect;
case EType.SelectSlide:
return _SelectSlides[_Interactions[interaction].Num].Rect;
return _SelectSlides[interaction.Num].Rect;
case EType.Static:
return _Statics[_Interactions[interaction].Num].Rect;
return _Statics[interaction.Num].Rect;
case EType.Text:
return _Texts[_Interactions[interaction].Num].Bounds;
return _Texts[interaction.Num].Rect;
case EType.SongMenu:
return _SongMenus[_Interactions[interaction].Num].Rect;
return _SongMenus[interaction.Num].Rect;
case EType.Lyric:
return _Lyrics[_Interactions[interaction].Num].Rect;
return _Lyrics[interaction.Num].Rect;
case EType.NameSelection:
return _NameSelections[_Interactions[interaction].Num].Rect;
return _NameSelections[interaction.Num].Rect;
case EType.Equalizer:
return _Equalizers[_Interactions[interaction].Num].Rect;
return _Equalizers[interaction.Num].Rect;
case EType.Playlist:
return _Playlists[_Interactions[interaction].Num].Rect;
return _Playlists[interaction.Num].Rect;
case EType.ParticleEffect:
return _ParticleEffects[_Interactions[interaction].Num].Rect;
return _ParticleEffects[interaction.Num].Rect;
}
return result;
}
private SRectF _GetRect(int interaction)
{
return _GetRect(_Interactions[interaction]);
}
private void _AddInteraction(int num, EType type)
{
_Interactions.Add(new CInteraction(num, type));
VocaluxeLib/Menu/CSelectSlide.cs
+1 -1
View File
@@ -764,7 +764,7 @@ namespace VocaluxeLib.Menu
alpha = new SColorF(1f, 1f, 1f, 1f);
}
RectangleF bounds = CBase.Drawing.GetTextBounds(text);
RectangleF bounds = CBase.Fonts.GetTextBounds(text);
text.X = (x + dx / 2f + dx * i) + TextRelativeX;
if (!WithTextures)
VocaluxeLib/Menu/CText.cs
+63 -319
View File
@@ -32,24 +32,6 @@ namespace VocaluxeLib.Menu
public string SelColorName; //for Buttons
}
struct STextPosition
{
public float X;
public float Y;
public float TextHeight;
public float Width;
public float Height;
public STextPosition(float initVal)
{
X = initVal;
Y = initVal;
TextHeight = initVal;
Width = initVal;
Height = initVal;
}
}
public class CText : IMenuElement
{
private SThemeText _Theme;
@@ -65,8 +47,6 @@ namespace VocaluxeLib.Menu
private bool _ButtonText;
private bool _PositionNeedsUpdate = true;
private STextPosition _DrawPosition = new STextPosition(0);
private float _X;
public float X
{
@@ -127,28 +107,6 @@ namespace VocaluxeLib.Menu
if (Math.Abs(_MaxWidth - value) > 0.01)
{
_MaxWidth = value;
// ReSharper disable ConvertIfStatementToConditionalTernaryExpression
if (_MaxWidth > 0)
// ReSharper restore ConvertIfStatementToConditionalTernaryExpression
Bounds = new SRectF(-CBase.Settings.GetRenderW(), -CBase.Settings.GetRenderH(), _MaxWidth, 3f * CBase.Settings.GetRenderH(), 0f);
else
Bounds = new SRectF(-CBase.Settings.GetRenderW(), -CBase.Settings.GetRenderH(), 3f * CBase.Settings.GetRenderW(), 3f * CBase.Settings.GetRenderH(), 0f);
_PositionNeedsUpdate = true;
}
}
}
private SRectF _Bounds;
public SRectF Bounds
{
get { return _Bounds; }
set
{
if (Math.Abs(_Bounds.X - value.X) > 0.01 || Math.Abs(_Bounds.Y - value.Y) > 0.01 || Math.Abs(_Bounds.W - value.W) > 0.01 || Math.Abs(_Bounds.H - value.H) > 0.01 ||
Math.Abs(_Bounds.Z - value.Z) > 0.01)
{
_Bounds = value;
_PositionNeedsUpdate = true;
}
}
@@ -168,15 +126,15 @@ namespace VocaluxeLib.Menu
}
}
private EHAlignment _HAlign = EHAlignment.Center;
public EHAlignment HAlign
private EHAlignment _ResizeAlign = EHAlignment.Center;
public EHAlignment ResizeAlign
{
get { return _HAlign; }
get { return _ResizeAlign; }
set
{
if (_HAlign != value)
if (_ResizeAlign != value)
{
_HAlign = value;
_ResizeAlign = value;
_PositionNeedsUpdate = true;
}
}
@@ -210,10 +168,23 @@ namespace VocaluxeLib.Menu
}
}
/// <summary>
/// Do NOT read/write this anywhere but in _UpdateTextPosition!
/// </summary>
private SRectF _Rect;
public SRectF Rect
{
get
{
if (_PositionNeedsUpdate)
_UpdateTextPosition();
return _Rect;
}
}
public SColorF Color; //normal Color
public SColorF SelColor; //selected Color for Buttons
public bool Reflection;
public float ReflectionSpace;
public float ReflectionHeight;
@@ -288,15 +259,13 @@ namespace VocaluxeLib.Menu
_Z = text._Z;
_Height = text._Height;
_MaxWidth = text._MaxWidth;
_Bounds = new SRectF(text._Bounds);
_Align = text._Align;
_HAlign = text._HAlign;
_ResizeAlign = text._ResizeAlign;
_Style = text._Style;
_Font = text._Font;
Color = new SColorF(text.Color);
SelColor = new SColorF(text.SelColor);
Reflection = text.Reflection;
ReflectionSpace = text.ReflectionSpace;
ReflectionHeight = text.ReflectionHeight;
@@ -308,117 +277,8 @@ namespace VocaluxeLib.Menu
_EditMode = text._EditMode;
}
public CText(float x, float y, float z, EAlignment align, float h, float mw, float r, float g, float b, float a, EStyle style, string font, string text, float rspace,
float rheight)
{
_Theme = new SThemeText();
_ThemeLoaded = false;
_ButtonText = false;
_PartyModeID = -1;
_TranslationID = -1;
X = x;
Y = y;
Z = z;
Height = h;
MaxWidth = mw;
Align = align;
HAlign = EHAlignment.Center;
Style = style;
Font = font;
Color = new SColorF(r, g, b, a);
SelColor = new SColorF(r, g, b, a);
Text = text;
Selected = false;
// ReSharper disable ConvertIfStatementToConditionalTernaryExpression
if (MaxWidth > 0)
// ReSharper restore ConvertIfStatementToConditionalTernaryExpression
Bounds = new SRectF(-CBase.Settings.GetRenderW(), -CBase.Settings.GetRenderH(), MaxWidth, 3f * CBase.Settings.GetRenderH(), 0f);
else
Bounds = new SRectF(-CBase.Settings.GetRenderW(), -CBase.Settings.GetRenderH(), 3f * CBase.Settings.GetRenderW(), 3f * CBase.Settings.GetRenderH(), 0f);
Reflection = true;
ReflectionSpace = rspace;
ReflectionHeight = rheight;
}
public CText(float x, float y, float z, EAlignment align, float h, float mw, float r, float g, float b, float a, EStyle style, string font, string text)
{
_Theme = new SThemeText();
_ThemeLoaded = false;
_ButtonText = false;
_PartyModeID = -1;
_TranslationID = -1;
X = x;
Y = y;
Z = z;
Height = h;
MaxWidth = mw;
Align = align;
HAlign = EHAlignment.Center;
Style = style;
Font = font;
Color = new SColorF(r, g, b, a);
SelColor = new SColorF(r, g, b, a);
Text = text;
Selected = false;
// ReSharper disable ConvertIfStatementToConditionalTernaryExpression
if (MaxWidth > 0)
// ReSharper restore ConvertIfStatementToConditionalTernaryExpression
Bounds = new SRectF(-CBase.Settings.GetRenderW(), -CBase.Settings.GetRenderH(), MaxWidth, 3f * CBase.Settings.GetRenderH(), 0f);
else
Bounds = new SRectF(-CBase.Settings.GetRenderW(), -CBase.Settings.GetRenderH(), 3f * CBase.Settings.GetRenderW(), 3f * CBase.Settings.GetRenderH(), 0f);
Reflection = false;
}
public CText(float x, float y, float z, float h, float mw, EAlignment align, EStyle style, string font, SColorF col, string text, float rspace, float rheight)
{
_Theme = new SThemeText();
_ThemeLoaded = false;
_ButtonText = false;
_PartyModeID = -1;
_TranslationID = -1;
X = x;
Y = y;
Z = z;
Height = h;
MaxWidth = mw;
Align = align;
HAlign = EHAlignment.Center;
Style = style;
Font = font;
Color = col;
SelColor = new SColorF(col);
Text = text;
Selected = false;
// ReSharper disable ConvertIfStatementToConditionalTernaryExpression
if (MaxWidth > 0)
// ReSharper restore ConvertIfStatementToConditionalTernaryExpression
Bounds = new SRectF(-CBase.Settings.GetRenderW(), -CBase.Settings.GetRenderH(), MaxWidth, 3f * CBase.Settings.GetRenderH(), 0f);
else
Bounds = new SRectF(-CBase.Settings.GetRenderW(), -CBase.Settings.GetRenderH(), 3f * CBase.Settings.GetRenderW(), 3f * CBase.Settings.GetRenderH(), 0f);
Reflection = true;
ReflectionSpace = rspace;
ReflectionHeight = rheight;
}
public CText(float x, float y, float z, float h, float mw, EAlignment align, EStyle style, string font, SColorF col, string text, int partyModeID = -1)
public CText(float x, float y, float z, float h, float mw, EAlignment align, EStyle style, string font, SColorF col, string text, int partyModeID = -1, float rheight = 0,
float rspace = 0)
{
_Theme = new SThemeText();
_ThemeLoaded = false;
@@ -432,7 +292,7 @@ namespace VocaluxeLib.Menu
Height = h;
MaxWidth = mw;
Align = align;
HAlign = EHAlignment.Center;
ResizeAlign = EHAlignment.Center;
Style = style;
Font = font;
@@ -443,14 +303,8 @@ namespace VocaluxeLib.Menu
Selected = false;
// ReSharper disable ConvertIfStatementToConditionalTernaryExpression
if (MaxWidth > 0)
// ReSharper restore ConvertIfStatementToConditionalTernaryExpression
Bounds = new SRectF(-CBase.Settings.GetRenderW(), -CBase.Settings.GetRenderH(), MaxWidth, 3f * CBase.Settings.GetRenderH(), 0f);
else
Bounds = new SRectF(-CBase.Settings.GetRenderW(), -CBase.Settings.GetRenderH(), 3f * CBase.Settings.GetRenderW(), 3f * CBase.Settings.GetRenderH(), 0f);
Reflection = false;
ReflectionSpace = rspace;
ReflectionHeight = rheight;
}
public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader, int skinIndex)
@@ -495,7 +349,7 @@ namespace VocaluxeLib.Menu
}
_ThemeLoaded &= xmlReader.TryGetEnumValue(item + "/Align", ref _Align);
xmlReader.TryGetEnumValue(item + "/HAlign", ref _HAlign);
xmlReader.TryGetEnumValue(item + "/ResizeAlign", ref _ResizeAlign);
_ThemeLoaded &= xmlReader.TryGetEnumValue(item + "/Style", ref _Style);
_ThemeLoaded &= xmlReader.GetValue(item + "/Font", out _Font, "Normal");
@@ -503,12 +357,9 @@ namespace VocaluxeLib.Menu
if (xmlReader.ItemExists(item + "/Reflection") && !buttonText)
{
Reflection = true;
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Reflection/Space", ref ReflectionSpace);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Reflection/Height", ref ReflectionHeight);
}
else
Reflection = false;
// Set values
_Theme.Name = elementName;
@@ -516,16 +367,7 @@ namespace VocaluxeLib.Menu
_PositionNeedsUpdate = true;
if (_ThemeLoaded)
{
LoadTextures();
// ReSharper disable ConvertIfStatementToConditionalTernaryExpression
if (MaxWidth > 0)
// ReSharper restore ConvertIfStatementToConditionalTernaryExpression
Bounds = new SRectF(-CBase.Settings.GetRenderW(), -CBase.Settings.GetRenderH(), MaxWidth, 3f * CBase.Settings.GetRenderH(), 0f);
else
Bounds = new SRectF(-CBase.Settings.GetRenderW(), -CBase.Settings.GetRenderH(), 3f * CBase.Settings.GetRenderW(), 3f * CBase.Settings.GetRenderH(), 0f);
}
return _ThemeLoaded;
}
@@ -579,8 +421,8 @@ namespace VocaluxeLib.Menu
writer.WriteComment("<Align>: Text align horizontal: " + CHelper.ListStrings(Enum.GetNames(typeof(EAlignment))));
writer.WriteElementString("Align", Enum.GetName(typeof(EAlignment), Align));
writer.WriteComment("<HAlign>: Text align vertical (on downsizing): " + CHelper.ListStrings(Enum.GetNames(typeof(EHAlignment))));
writer.WriteElementString("HAlign", Enum.GetName(typeof(EHAlignment), HAlign));
writer.WriteComment("<ResizeAlign>: Text align vertical (on downsizing): " + CHelper.ListStrings(Enum.GetNames(typeof(EHAlignment))));
writer.WriteElementString("HAlign", Enum.GetName(typeof(EHAlignment), ResizeAlign));
writer.WriteComment("<Style>: Text style: " + CHelper.ListStrings(Enum.GetNames(typeof(EStyle))));
writer.WriteElementString("Style", Enum.GetName(typeof(EStyle), Style));
@@ -598,7 +440,7 @@ namespace VocaluxeLib.Menu
writer.WriteComment(" <Height>: Reflection Height");
}
if (Reflection && !_ButtonText)
if (ReflectionHeight > 0 && !_ButtonText)
{
writer.WriteStartElement("Reflection");
writer.WriteElementString("Space", ReflectionSpace.ToString("#0"));
@@ -621,155 +463,58 @@ namespace VocaluxeLib.Menu
// Update Text
Text = Text;
if (_PositionNeedsUpdate)
_UpdateTextPosition();
CBase.Fonts.SetFont(Font);
CBase.Fonts.SetStyle(Style);
SColorF currentColor = new SColorF(Color);
if (Selected)
currentColor = new SColorF(SelColor);
SColorF currentColor = (Selected) ? SelColor : Color;
SColorF color = new SColorF(currentColor.R, currentColor.G, currentColor.B, currentColor.A * Alpha);
CBase.Fonts.DrawText(_Text, _DrawPosition.TextHeight, _DrawPosition.X, _DrawPosition.Y, Z, color);
CBase.Fonts.DrawText(_Text, Rect.H, Rect.X, Rect.Y, Z, color);
if (Reflection)
{
float factor = 0f;
switch (HAlign)
{
case EHAlignment.Top:
factor = (Height - _DrawPosition.TextHeight) * 1.5f;
break;
case EHAlignment.Center:
factor = (Height - _DrawPosition.TextHeight) * 1.0f;
break;
case EHAlignment.Bottom:
factor = (Height - _DrawPosition.TextHeight) * 0.5f;
break;
}
CBase.Fonts.DrawTextReflection(_Text, _DrawPosition.TextHeight, _DrawPosition.X, _DrawPosition.Y, Z, color, ReflectionSpace + factor, ReflectionHeight);
}
if (ReflectionHeight > 0)
CBase.Fonts.DrawTextReflection(_Text, Rect.H, Rect.X, Rect.Y, Z, color, ReflectionSpace, ReflectionHeight);
if (Selected && (CBase.Settings.GetGameState() == EGameState.EditTheme))
{
CBase.Drawing.DrawColor(
new SColorF(0.5f, 1f, 0.5f, 0.5f * CBase.Graphics.GetGlobalAlpha()),
new SRectF(_DrawPosition.X, _DrawPosition.Y, _DrawPosition.Width, _DrawPosition.Height, Z)
);
}
CBase.Drawing.DrawColor(new SColorF(0.5f, 1f, 0.5f, 0.5f), new SRectF(Rect.X, Rect.Y, Rect.W, Rect.H, Z));
}
public void Draw(float begin, float end)
{
RectangleF bounds = CBase.Fonts.GetTextBounds(this, Height);
float x = X;
switch (Align)
{
case EAlignment.Center:
x = X - bounds.Width / 2;
break;
case EAlignment.Right:
x = X - bounds.Width;
break;
}
SColorF currentColor = new SColorF(Color);
if (Selected)
currentColor = new SColorF(SelColor);
SColorF color = new SColorF(currentColor.R, currentColor.G, currentColor.B, currentColor.A * Alpha);
CBase.Fonts.SetFont(Font);
CBase.Fonts.SetStyle(Style);
CBase.Fonts.DrawText(Text, Height, x, Y, Z, color, begin, end);
SColorF currentColor = (Selected) ? SelColor : Color;
SColorF color = new SColorF(currentColor.R, currentColor.G, currentColor.B, currentColor.A * Alpha);
if (Reflection)
CBase.Fonts.DrawText(Text, Rect.H, Rect.X, Rect.Y, Z, color, begin, end);
if (ReflectionHeight > 0)
{
// TODO
}
if (Selected && (CBase.Settings.GetGameState() == EGameState.EditTheme))
CBase.Drawing.DrawColor(new SColorF(0.5f, 1f, 0.5f, 0.5f), new SRectF(x, Y, bounds.Width, bounds.Height, Z));
CBase.Drawing.DrawColor(new SColorF(0.5f, 1f, 0.5f, 0.5f), new SRectF(X, Y, Rect.W, Rect.H, Z));
}
public void DrawRelative(float x, float y, float reflectionSpace, float reflectionHeigth, float rectHeight)
public void DrawRelative(float rx, float ry, float reflectionHeight = 0f, float reflectionSpace = 0f, float rectHeight = 0f)
{
DrawRelative(x, y, true, reflectionSpace, reflectionHeigth, rectHeight);
}
public void DrawRelative(float rx, float ry, bool reflection = false, float reflectionSpace = 0f, float reflectionHeight = 0f, float rectHeight = 0f)
{
// Update Text
Text = Text;
float h = Height;
float x = X + rx;
float y = Y + ry;
CBase.Fonts.SetFont(Font);
CBase.Fonts.SetStyle(Style);
RectangleF bounds = CBase.Fonts.GetTextBounds(this, Height);
if (bounds.Width > Bounds.W && Bounds.W > 0f && bounds.Width > 0f)
var oldReflectionSpace = ReflectionSpace;
var oldReflectionHeight = ReflectionHeight;
if (reflectionHeight > 0)
{
float factor = Bounds.W / bounds.Width;
float step = h * (1 - factor);
h *= factor;
switch (HAlign)
{
case EHAlignment.Top:
y += step * 0.25f;
break;
case EHAlignment.Center:
y += step * 0.50f;
break;
case EHAlignment.Bottom:
y += step * 0.75f;
break;
}
bounds = CBase.Fonts.GetTextBounds(this, h);
ReflectionSpace = (rectHeight - Rect.Y - Rect.H) * 2 + reflectionSpace;
ReflectionHeight = reflectionHeight - (rectHeight - Rect.Y) + Rect.H;
}
switch (Align)
{
case EAlignment.Center:
x = x - bounds.Width / 2;
break;
case EAlignment.Right:
x = x - bounds.Width;
break;
}
SColorF currentColor = new SColorF(Color);
if (Selected)
currentColor = new SColorF(SelColor);
SColorF color = new SColorF(currentColor.R, currentColor.G, currentColor.B, currentColor.A * Alpha);
CBase.Fonts.SetFont(Font);
CBase.Fonts.SetStyle(Style);
CBase.Fonts.DrawText(_Text, h, x, y, Z, color);
if (reflection)
{
float space = (rectHeight - Y - bounds.Height) * 2f + reflectionSpace;
float height = reflectionHeight - (rectHeight - Y) + bounds.Height;
CBase.Fonts.DrawTextReflection(_Text, h, x, y, Z, color, space, height);
}
if (Selected && (CBase.Settings.GetGameState() == EGameState.EditTheme))
CBase.Drawing.DrawColor(new SColorF(0.5f, 1f, 0.5f, 0.5f * CBase.Graphics.GetGlobalAlpha()), new SRectF(x, y, bounds.Width, bounds.Height, Z));
else
ReflectionHeight = 0;
X += rx;
Y += ry;
Draw(true);
ReflectionSpace = oldReflectionSpace;
ReflectionHeight = oldReflectionHeight;
X -= rx;
Y -= ry;
}
public void UnloadTextures() {}
@@ -814,14 +559,14 @@ namespace VocaluxeLib.Menu
float h = Height;
float y = Y;
RectangleF bounds = CBase.Fonts.GetTextBounds(this, Height);
RectangleF bounds = CBase.Fonts.GetTextBounds(this);
if (bounds.Width > Bounds.W && Bounds.W > 0f && bounds.Width > 0f)
if (bounds.Width > MaxWidth && MaxWidth > 0f && bounds.Width > 0f)
{
float factor = Bounds.W / bounds.Width;
float factor = MaxWidth / bounds.Width;
float step = h * (1 - factor);
h *= factor;
switch (HAlign)
switch (ResizeAlign)
{
case EHAlignment.Top:
y += step * 0.25f;
@@ -848,11 +593,10 @@ namespace VocaluxeLib.Menu
break;
}
_DrawPosition.X = x;
_DrawPosition.Y = y;
_DrawPosition.TextHeight = h;
_DrawPosition.Width = bounds.Width;
_DrawPosition.Height = bounds.Height;
_Rect.X = x;
_Rect.Y = y;
_Rect.W = bounds.Width;
_Rect.H = bounds.Height;
_PositionNeedsUpdate = false;
}
VocaluxeLib/Structs.cs
+6
View File
@@ -19,6 +19,7 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms;
using VocaluxeLib.Songs;
@@ -48,6 +49,11 @@ namespace VocaluxeLib
B = color.B;
A = color.A;
}
public Color AsColor()
{
return Color.FromArgb((int)(A * 255), (int)(R * 255), (int)(G * 255), (int)(B * 255));
}
}
public struct SRectF