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-01-03 17:05:00 +01:00
2 parents b7e1ad2127 ca7c4e8bf8
commit d33d6359d4
33 files changed
+934 -786
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/PartyModes/Challenge/Textures/Skin.xml
+1 -1
View File
@@ -152,4 +152,4 @@
<Videos>
<BG_Video>[Blue]BG_Video.mp4</BG_Video>
</Videos>
</root>
</root>
Output/PartyModes/ChallengeMedley/Textures/Skin.xml
+1 -1
View File
@@ -152,4 +152,4 @@
<Videos>
<BG_Video>[Blue]BG_Video.mp4</BG_Video>
</Videos>
</root>
</root>
Output/PartyModes/TicTacToe/Textures/Skin.xml
+3 -3
View File
@@ -217,8 +217,8 @@
<SelectSlideArrowLeft>SelectSlideArrowLeft.png</SelectSlideArrowLeft>
<SelectSlideArrowRight>SelectSlideArrowRight.png</SelectSlideArrowRight>
<PopupBG>Popup.png</PopupBG>
<RepeatIcon>RepeatIcon.png</RepeatIcon>
<Random>Random.png</Random>
<RepeatIcon>RepeatIcon.png</RepeatIcon>
<Random>Random.png</Random>
<ScrollUp>ScrollUp.png</ScrollUp>
<ScrollDown>ScrollDown.png</ScrollDown>
<Invisible>Invisible.png</Invisible>
@@ -226,4 +226,4 @@
<Videos>
<BG_Video>[Blue]BG_Video.mp4</BG_Video>
</Videos>
</root>
</root>
Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml
+7 -5
View File
@@ -48,7 +48,7 @@
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</Text1>
<SelectSlideVolume>
<SelectSlideVolume>
<!--<Skin>: Texture name-->
<Skin>Invisible</Skin>
<!--<SkinArrowLeft>: Texture name of left arrow-->
@@ -104,16 +104,18 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<TextRelativeX>-15,00</TextRelativeX>
<!--<TextRelativeY>: Text relative y-position-->
<TextRelativeY>-8,00</TextRelativeY>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>500,00</TextMaxW>
<!--<TextFont>: Text font name-->
<TextFont>Outline</TextFont>
<!--<TextStyle>: Text style: Normal, Italic, Bold, BoldItalic-->
<TextStyle>Bold</TextStyle>
<TextRelativeX>-15,0</TextRelativeX>
<TextRelativeY>-8,0</TextRelativeY>
<!--<NumVisible>: Number of visible elements in the slide-->
<NumVisible>1</NumVisible>
</SelectSlideVolume>
</SelectSlideVolume>
</PopupScreenVolumeControl>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenHighscore.xml
+1 -1
View File
@@ -1483,4 +1483,4 @@
<MaxNumber>250</MaxNumber>
</ParticleEffectNew10>
</ScreenHighscore>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenMain.xml
+1 -1
View File
@@ -86,7 +86,7 @@
<Height>26</Height>
</SReflection>
</ButtonSing>
<ButtonParty>
<ButtonParty>
<!--<Skin>: Texture name-->
<Skin>Button</Skin>
<!--<SkinSelected>: Texture name for selected button-->
Output/Themes/Ambient/Screens/ScreenNames.xml
+14
View File
@@ -686,6 +686,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>186,00</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -751,6 +753,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>20,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>86,00</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -816,6 +820,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>20,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>86,00</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -881,6 +887,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>20,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>86,00</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -946,6 +954,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>20,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>86,00</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -1011,6 +1021,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>20,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>86,00</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -1076,6 +1088,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>20,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>86,00</TextMaxW>
<!--<TextFont>: Text font name-->
Output/Themes/Ambient/Screens/ScreenOptions.xml
+1 -1
View File
@@ -401,4 +401,4 @@
</SReflection>
</ButtonOptionsTheme>
</ScreenOptions>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenOptionsGame.xml
+12
View File
@@ -441,6 +441,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -506,6 +508,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -571,6 +575,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -636,6 +642,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -701,6 +709,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>308,00</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -766,6 +776,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml
+4
View File
@@ -229,6 +229,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -294,6 +296,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
+10
View File
@@ -589,6 +589,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>616,00</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -654,6 +656,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>616,00</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -719,6 +723,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>154,00</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -784,6 +790,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>154,00</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -849,6 +857,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>123,20</TextMaxW>
<!--<TextFont>: Text font name-->
Output/Themes/Ambient/Screens/ScreenOptionsSound.xml
+11 -1
View File
@@ -316,6 +316,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -381,6 +383,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -446,6 +450,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>500,00</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -511,6 +517,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>500,00</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -576,6 +584,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>500,00</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -586,4 +596,4 @@
<NumVisible>3</NumVisible>
</SelectSlideGameMusicVolume>
</ScreenOptionsSound>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml
+16
View File
@@ -531,6 +531,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>616,00</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -596,6 +598,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>616,00</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -661,6 +665,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>308,00</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -726,6 +732,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>308,00</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -791,6 +799,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>308,00</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -856,6 +866,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>308,00</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -921,6 +933,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>616,00</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -986,6 +1000,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>616,00</TextMaxW>
<!--<TextFont>: Text font name-->
Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
+35 -23
View File
@@ -77,6 +77,22 @@
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</Static4>
<StaticWebcamOutput>
<!--<Skin>: Texture name-->
<Skin>CoverBackground</Skin>
<!--<X>, <Y>, <Z>, <W>, <H>: Static position, width and height-->
<X>75</X>
<Y>460</Y>
<Z>0,00</Z>
<W>320</W>
<H>240</H>
<!--<Color>: Static color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>Visible</Color>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</StaticWebcamOutput>
<Text1>
<!--<X>, <Y>: Text position-->
<X>640</X>
@@ -222,7 +238,7 @@
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</Text5>
<Text6>
<Text6>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>345</Y>
@@ -245,13 +261,13 @@
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Text or translation tag-->
<!--<Text>: Nothing or translation tag-->
<Text>TR_SCREENO_VIDEO_WEBCAMDEVICES</Text>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</Text6>
<Text7>
<Text7>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>405</Y>
@@ -274,7 +290,7 @@
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Text or translation tag-->
<!--<Text>: Nothing or translation tag-->
<Text>TR_SCREENO_VIDEO_WEBCAMCAPABILITIES</Text>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
@@ -393,6 +409,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -458,6 +476,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -523,6 +543,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -588,6 +610,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -597,7 +621,7 @@
<!--<NumVisible>: Number of visible elements in the slide-->
<NumVisible>3</NumVisible>
</SelectSlideVideosToBackground>
<SelectSlideWebcamDevices>
<SelectSlideWebcamDevices>
<!--<Skin>: Texture name-->
<Skin>Invisible</Skin>
<!--<SkinArrowLeft>: Texture name of left arrow-->
@@ -653,6 +677,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -662,7 +688,7 @@
<!--<NumVisible>: Number of visible elements in the slide-->
<NumVisible>3</NumVisible>
</SelectSlideWebcamDevices>
<SelectSlideWebcamCapabilities>
<SelectSlideWebcamCapabilities>
<!--<Skin>: Texture name-->
<Skin>Invisible</Skin>
<!--<SkinArrowLeft>: Texture name of left arrow-->
@@ -718,6 +744,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>150,00</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -727,21 +755,5 @@
<!--<NumVisible>: Number of visible elements in the slide-->
<NumVisible>3</NumVisible>
</SelectSlideWebcamCapabilities>
<StaticWebcamOutput>
<!--<Skin>: Texture name-->
<Skin>CoverBackground</Skin>
<!--<X>, <Y>, <Z>, <W>, <H>: Static position, width and height-->
<X>75</X>
<Y>460</Y>
<Z>0,00</Z>
<W>320</W>
<H>240</H>
<!--<Color>: Static color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>Visible</Color>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</StaticWebcamOutput>
</ScreenOptionsVideo>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenParty.xml
+98 -96
View File
@@ -29,7 +29,7 @@
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</Static1>
<Text1>
<Text1>
<!--<X>, <Y>: Text position-->
<X>640</X>
<Y>48</Y>
@@ -58,7 +58,7 @@
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</Text1>
<Text2>
<Text2>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>105</Y>
@@ -87,7 +87,7 @@
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</Text2>
<Text3>
<Text3>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>165</Y>
@@ -116,7 +116,7 @@
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</Text3>
<Text4>
<Text4>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>225</Y>
@@ -145,7 +145,7 @@
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</Text4>
<Text5>
<Text5>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>285</Y>
@@ -174,7 +174,7 @@
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</Text5>
<Text6>
<Text6>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>345</Y>
@@ -203,7 +203,7 @@
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</Text6>
<Text7>
<Text7>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>405</Y>
@@ -232,7 +232,7 @@
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</Text7>
<Text8>
<Text8>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>465</Y>
@@ -261,7 +261,7 @@
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</Text8>
<TextDescription>
<TextDescription>
<!--<X>, <Y>: Text position-->
<X>850</X>
<Y>165</Y>
@@ -270,7 +270,7 @@
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>600</MaxW>
<MaxW>600</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
@@ -286,12 +286,12 @@
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Nothing or translation tag-->
<Text></Text>
<Text />
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</TextDescription>
<TextTargetAudience>
<TextTargetAudience>
<!--<X>, <Y>: Text position-->
<X>850</X>
<Y>225</Y>
@@ -300,7 +300,7 @@
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>600</MaxW>
<MaxW>600</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
@@ -316,12 +316,12 @@
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Nothing or translation tag-->
<Text></Text>
<Text />
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</TextTargetAudience>
<TextNumTeams>
<TextNumTeams>
<!--<X>, <Y>: Text position-->
<X>850</X>
<Y>285</Y>
@@ -330,7 +330,7 @@
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>600</MaxW>
<MaxW>600</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
@@ -346,12 +346,12 @@
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Nothing or translation tag-->
<Text></Text>
<Text />
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</TextNumTeams>
<TextNumPlayers>
<TextNumPlayers>
<!--<X>, <Y>: Text position-->
<X>850</X>
<Y>345</Y>
@@ -360,7 +360,7 @@
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>600</MaxW>
<MaxW>600</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
@@ -376,12 +376,12 @@
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Nothing or translation tag-->
<Text></Text>
<Text />
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</TextNumPlayers>
<TextAuthor>
<TextAuthor>
<!--<X>, <Y>: Text position-->
<X>850</X>
<Y>405</Y>
@@ -390,7 +390,7 @@
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>600</MaxW>
<MaxW>600</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
@@ -406,12 +406,12 @@
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Nothing or translation tag-->
<Text></Text>
<Text />
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</TextAuthor>
<TextVersion>
<TextVersion>
<!--<X>, <Y>: Text position-->
<X>850</X>
<Y>465</Y>
@@ -420,7 +420,7 @@
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>600</MaxW>
<MaxW>600</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
@@ -436,12 +436,12 @@
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Nothing or translation tag-->
<Text></Text>
<Text />
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</TextVersion>
<TextError>
<TextError>
<!--<X>, <Y>: Text position-->
<X>850</X>
<Y>525</Y>
@@ -450,7 +450,7 @@
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>600</MaxW>
<MaxW>600</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>TextWarningColor</Color>
@@ -471,72 +471,7 @@
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</TextError>
<SelectSlideModes>
<!--<Skin>: Texture name-->
<Skin>Invisible</Skin>
<!--<SkinArrowLeft>: Texture name of left arrow-->
<SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
<!--<SkinArrowRight>: Texture name of right arrow-->
<SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
<!--<SkinSelected>: Texture name for selected SelectSlide-->
<SkinSelected>SelectSlide</SkinSelected>
<!--<SkinArrowLeftSelected>: Texture name of selected left arrow-->
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<!--<SkinArrowRightSelected>: Texture name of selected right arrow-->
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<!--<SkinHighlighted>: Texture name for highlighted SelectSlide-->
<SkinHighlighted>SelectSlide</SkinHighlighted>
<!--<X>, <Y>, <Z>, <W>, <H>: SelectSlide position, width and height-->
<X>500</X>
<Y>100</Y>
<Z>0,00</Z>
<W>700</W>
<H>50</H>
<!--<ArrowLeftX>, <ArrowLeftY>, <ArrowLeftZ>, <ArrowLeftW>, <ArrowLeftH>: Left arrow position, width and height-->
<ArrowLeftX>505</ArrowLeftX>
<ArrowLeftY>105</ArrowLeftY>
<ArrowLeftZ>0,00</ArrowLeftZ>
<ArrowLeftW>40</ArrowLeftW>
<ArrowLeftH>40</ArrowLeftH>
<!--<ArrowRightX>, <ArrowRightY>, <ArrowRightZ>, <ArrowRightW>, <ArrowRightH>: Right arrow position, width and height-->
<ArrowRightX>1170</ArrowRightX>
<ArrowRightY>105</ArrowRightY>
<ArrowRightZ>0,00</ArrowRightZ>
<ArrowRightW>40</ArrowRightW>
<ArrowRightH>40</ArrowRightH>
<!--<Color>: SelectSlide color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>SelectSlideColor</Color>
<!--<SColor>: Selected SelectSlide color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>SelectSlideSColor</SColor>
<!--<HColor>: Highlighted SelectSlide color from ColorScheme (high priority)-->
<!--or <HR>, <HG>, <HB>, <HA> (lower priority)-->
<HColor>SelectSlideHColor</HColor>
<!--<ArrowColor>: Arrow color from ColorScheme (high priority)-->
<!--or <ArrowR>, <ArrowG>, <ArrowB>, <ArrowA> (lower priority)-->
<ArrowColor>ArrowColor</ArrowColor>
<!--<ArrowSColor>: Selected arrow color from ColorScheme (high priority)-->
<!--or <ArrowSR>, <ArrowSG>, <ArrowSB>, <ArrowSA> (lower priority)-->
<ArrowSColor>ArrowSColor</ArrowSColor>
<!--<TextColor>: Text color from ColorScheme (high priority)-->
<!--or <TextR>, <TextG>, <TextB>, <TextA> (lower priority)-->
<TextColor>TextColor</TextColor>
<!--<TextSColor>: Selected text color from ColorScheme (high priority)-->
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>600</TextMaxW>
<!--<TextFont>: Text font name-->
<TextFont>Outline</TextFont>
<!--<TextStyle>: Text style: Normal, Italic, Bold, BoldItalic-->
<TextStyle>Bold</TextStyle>
<!--<NumVisible>: Number of visible elements in the slide-->
<NumVisible>1</NumVisible>
</SelectSlideModes>
<ButtonStart>
<ButtonStart>
<!--<Skin>: Texture name-->
<Skin>Button</Skin>
<!--<SkinSelected>: Texture name for selected button-->
@@ -593,7 +528,7 @@
<Height>26</Height>
</SReflection>
</ButtonStart>
<ButtonExit>
<ButtonExit>
<!--<Skin>: Texture name-->
<Skin>Button</Skin>
<!--<SkinSelected>: Texture name for selected button-->
@@ -650,5 +585,72 @@
<Height>26</Height>
</SReflection>
</ButtonExit>
<SelectSlideModes>
<!--<Skin>: Texture name-->
<Skin>Invisible</Skin>
<!--<SkinArrowLeft>: Texture name of left arrow-->
<SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
<!--<SkinArrowRight>: Texture name of right arrow-->
<SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
<!--<SkinSelected>: Texture name for selected SelectSlide-->
<SkinSelected>SelectSlide</SkinSelected>
<!--<SkinArrowLeftSelected>: Texture name of selected left arrow-->
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<!--<SkinArrowRightSelected>: Texture name of selected right arrow-->
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<!--<SkinHighlighted>: Texture name for highlighted SelectSlide-->
<SkinHighlighted>SelectSlide</SkinHighlighted>
<!--<X>, <Y>, <Z>, <W>, <H>: SelectSlide position, width and height-->
<X>500</X>
<Y>100</Y>
<Z>0,00</Z>
<W>700</W>
<H>50</H>
<!--<ArrowLeftX>, <ArrowLeftY>, <ArrowLeftZ>, <ArrowLeftW>, <ArrowLeftH>: Left arrow position, width and height-->
<ArrowLeftX>505</ArrowLeftX>
<ArrowLeftY>105</ArrowLeftY>
<ArrowLeftZ>0,00</ArrowLeftZ>
<ArrowLeftW>40</ArrowLeftW>
<ArrowLeftH>40</ArrowLeftH>
<!--<ArrowRightX>, <ArrowRightY>, <ArrowRightZ>, <ArrowRightW>, <ArrowRightH>: Right arrow position, width and height-->
<ArrowRightX>1170</ArrowRightX>
<ArrowRightY>105</ArrowRightY>
<ArrowRightZ>0,00</ArrowRightZ>
<ArrowRightW>40</ArrowRightW>
<ArrowRightH>40</ArrowRightH>
<!--<Color>: SelectSlide color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>SelectSlideColor</Color>
<!--<SColor>: Selected SelectSlide color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>SelectSlideSColor</SColor>
<!--<HColor>: Highlighted SelectSlide color from ColorScheme (high priority)-->
<!--or <HR>, <HG>, <HB>, <HA> (lower priority)-->
<HColor>SelectSlideHColor</HColor>
<!--<ArrowColor>: Arrow color from ColorScheme (high priority)-->
<!--or <ArrowR>, <ArrowG>, <ArrowB>, <ArrowA> (lower priority)-->
<ArrowColor>ArrowColor</ArrowColor>
<!--<ArrowSColor>: Selected arrow color from ColorScheme (high priority)-->
<!--or <ArrowSR>, <ArrowSG>, <ArrowSB>, <ArrowSA> (lower priority)-->
<ArrowSColor>ArrowSColor</ArrowSColor>
<!--<TextColor>: Text color from ColorScheme (high priority)-->
<!--or <TextR>, <TextG>, <TextB>, <TextA> (lower priority)-->
<TextColor>TextColor</TextColor>
<!--<TextSColor>: Selected text color from ColorScheme (high priority)-->
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>600,00</TextMaxW>
<!--<TextFont>: Text font name-->
<TextFont>Outline</TextFont>
<!--<TextStyle>: Text style: Normal, Italic, Bold, BoldItalic-->
<TextStyle>Bold</TextStyle>
<!--<NumVisible>: Number of visible elements in the slide-->
<NumVisible>1</NumVisible>
</SelectSlideModes>
</ScreenParty>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenProfiles.xml
+68 -58
View File
@@ -576,63 +576,6 @@
<Height>26</Height>
</SReflection>
</ButtonDelete>
<ButtonTakeSnapshot>
<!--<Skin>: Texture name-->
<Skin>Button</Skin>
<!--<SkinSelected>: Texture name for selected button-->
<SkinSelected>Button</SkinSelected>
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
<X>985</X>
<Y>600</Y>
<Z>0,00</Z>
<W>150</W>
<H>50</H>
<!--<Color>: Button color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>ButtonColor</Color>
<!--<SColor>: Selected button color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>ButtonSColor</SColor>
<Text>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>ButtonTextColor</Color>
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<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>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Nothing or translation tag-->
<Text>TR_SCREENPROFILES_BUTTON_TAKESNAPSHOT</Text>
</Text>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
<Reflection>
<Space>10</Space>
<Height>26</Height>
</Reflection>
<!--<SReflection> If exists:-->
<!-- <Space>: Reflection Space of selected button-->
<!-- <Height>: Reflection Height of selected button-->
<SReflection>
<Space>10</Space>
<Height>26</Height>
</SReflection>
</ButtonTakeSnapshot>
<ButtonWebcam>
<!--<Skin>: Texture name-->
<Skin>Button</Skin>
@@ -788,6 +731,63 @@
<!-- <Space>: Reflection Space of selected button-->
<!-- <Height>: Reflection Height of selected button-->
</ButtonDiscardSnapshot>
<ButtonTakeSnapshot>
<!--<Skin>: Texture name-->
<Skin>Button</Skin>
<!--<SkinSelected>: Texture name for selected button-->
<SkinSelected>Button</SkinSelected>
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
<X>985</X>
<Y>600</Y>
<Z>0,00</Z>
<W>150</W>
<H>50</H>
<!--<Color>: Button color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>ButtonColor</Color>
<!--<SColor>: Selected button color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>ButtonSColor</SColor>
<Text>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>ButtonTextColor</Color>
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<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>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Nothing or translation tag-->
<Text>TR_SCREENPROFILES_BUTTON_TAKESNAPSHOT</Text>
</Text>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
<Reflection>
<Space>10</Space>
<Height>26</Height>
</Reflection>
<!--<SReflection> If exists:-->
<!-- <Space>: Reflection Space of selected button-->
<!-- <Height>: Reflection Height of selected button-->
<SReflection>
<Space>10</Space>
<Height>26</Height>
</SReflection>
</ButtonTakeSnapshot>
<SelectSlideProfiles>
<!--<Skin>: Texture name-->
<Skin>Invisible</Skin>
@@ -844,6 +844,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>219,20</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -909,6 +911,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>208,67</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -974,6 +978,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>208,67</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -1039,6 +1045,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>313,00</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -1104,6 +1112,8 @@
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextRelativeX>: Text relative x-position-->
<!--<TextRelativeY>: Text relative y-position-->
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>313,00</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -1114,4 +1124,4 @@
<NumVisible>2</NumVisible>
</SelectSlideActive>
</ScreenProfiles>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenScore.xml
+17 -9
View File
@@ -3746,20 +3746,28 @@
<!-- <Height>: Reflection Height-->
</TextDifficultyP6N6>
<ScreenSettingShortScore>
<Type>Int</Type>
<Value>7</Value>
<!--<Type>: Type of theme-setting-value: Int, String, Color, Texture-->
<Type>Int</Type>
<!--<Value>: Value of theme-setting-->
<Value>7</Value>
</ScreenSettingShortScore>
<ScreenSettingShortRating>
<Type>Int</Type>
<Value>4</Value>
<!--<Type>: Type of theme-setting-value: Int, String, Color, Texture-->
<Type>Int</Type>
<!--<Value>: Value of theme-setting-->
<Value>4</Value>
</ScreenSettingShortRating>
<ScreenSettingShortDifficulty>
<Type>Int</Type>
<Value>4</Value>
<!--<Type>: Type of theme-setting-value: Int, String, Color, Texture-->
<Type>Int</Type>
<!--<Value>: Value of theme-setting-->
<Value>4</Value>
</ScreenSettingShortDifficulty>
<ScreenSettingAnimationDirection>
<Type>String</Type>
<Value>Horizontal</Value>
<!--<Type>: Type of theme-setting-value: Int, String, Color, Texture-->
<Type>String</Type>
<!--<Value>: Value of theme-setting-->
<Value>Horizontal</Value>
</ScreenSettingAnimationDirection>
</ScreenScore>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenSing.xml
+1 -1
View File
@@ -2771,4 +2771,4 @@
</BarPositions>
</SingBars>
</ScreenSing>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenSong.xml
+567 -558
View File
File diff suppressed because it is too large. Load diff
Output/Themes/Ambient/Skin Blue.xml
+2 -2
View File
@@ -338,7 +338,7 @@
<Random>Random.png</Random>
<PopupBG>Popup.png</PopupBG>
<ScrollUp>ScrollUp.png</ScrollUp>
<ScrollDown>ScrollDown.png</ScrollDown>
<ScrollDown>ScrollDown.png</ScrollDown>
</Skins>
<Videos>
<BG_Video>[Blue]BG_Video.mp4</BG_Video>
@@ -346,4 +346,4 @@
<IntroMid>[Blue]IntroMid.mp4</IntroMid>
<IntroOut>[Blue]IntroOut.mp4</IntroOut>
</Videos>
</root>
</root>
Output/Themes/Ambient/Skin Green.xml
+4 -4
View File
@@ -328,10 +328,10 @@
<SaveIcon>Save.png</SaveIcon>
<SingIcon>Sing.png</SingIcon>
<Minus>Minus.png</Minus>
<Plus>Plus.png</Plus>
<Plus>Plus.png</Plus>
<Random>Random.png</Random>
<PopupBG>Popup.png</PopupBG>
<ScrollUp>ScrollUp.png</ScrollUp>
<PopupBG>Popup.png</PopupBG>
<ScrollUp>ScrollUp.png</ScrollUp>
<ScrollDown>ScrollDown.png</ScrollDown>
</Skins>
<Videos>
@@ -340,4 +340,4 @@
<IntroMid>[Green]IntroMid.mp4</IntroMid>
<IntroOut>[Green]IntroOut.mp4</IntroOut>
</Videos>
</root>
</root>
Output/Themes/Ambient/Skin Red.xml
+2 -2
View File
@@ -328,7 +328,7 @@
<SaveIcon>Save.png</SaveIcon>
<SingIcon>Sing.png</SingIcon>
<Minus>Minus.png</Minus>
<Plus>Plus.png</Plus>
<Plus>Plus.png</Plus>
<Random>Random.png</Random>
<PopupBG>Popup.png</PopupBG>
<ScrollUp>ScrollUp.png</ScrollUp>
@@ -340,4 +340,4 @@
<IntroMid>[Red]IntroMid.mp4</IntroMid>
<IntroOut>[Red]IntroOut.mp4</IntroOut>
</Videos>
</root>
</root>
Output/Themes/Ambient/Skin Yellow.xml
+3 -3
View File
@@ -328,11 +328,11 @@
<SaveIcon>Save.png</SaveIcon>
<SingIcon>Sing.png</SingIcon>
<Minus>Minus.png</Minus>
<Plus>Plus.png</Plus>
<Plus>Plus.png</Plus>
<Random>Random.png</Random>
<PopupBG>Popup.png</PopupBG>
<ScrollUp>ScrollUp.png</ScrollUp>
<ScrollDown>ScrollDown.png</ScrollDown>
<ScrollDown>ScrollDown.png</ScrollDown>
</Skins>
<Videos>
<BG_Video>[Yellow]BG_Video.mp4</BG_Video>
@@ -340,4 +340,4 @@
<IntroMid>[Yellow]IntroMid.mp4</IntroMid>
<IntroOut>[Yellow]IntroOut.mp4</IntroOut>
</Videos>
</root>
</root>
Vocaluxe/Base/CFont.cs
+1 -1
View File
@@ -608,7 +608,7 @@ namespace Vocaluxe.Base
public static RectangleF GetTextBounds(CText text, float height)
{
Height = height;
return new RectangleF(text.X, text.Y, GetTextWidth(CLanguage.Translate(text.Text, text.PartyModeID)), GetTextHeight(CLanguage.Translate(text.Text, text.PartyModeID)));
return new RectangleF(text.X, text.Y, GetTextWidth(CLanguage.Translate(text.Text, text.TranslationID)), GetTextHeight(CLanguage.Translate(text.Text, text.TranslationID)));
}
public static float GetTextWidth(string text)
Vocaluxe/Base/CGraphics.cs
+15 -2
View File
@@ -268,12 +268,12 @@ namespace Vocaluxe.Base
ReloadCursor();
for (int i = 0; i < _Screens.Count; i++)
{
_Screens[i].ReloadTheme();
_Screens[i].ReloadTheme(CTheme.GetThemeScreensPath(-1));
}
for (int i = 0; i < _PopupScreens.Count; i++)
{
_PopupScreens[i].ReloadTheme();
_PopupScreens[i].ReloadTheme(CTheme.GetThemeScreensPath(-1));
}
}
@@ -403,6 +403,7 @@ namespace Vocaluxe.Base
else
{
_Screens[(int)_CurrentScreen].OnClose();
GC.Collect();
_CurrentScreen = _NextScreen;
_NextScreen = EScreens.ScreenNull;
if(CBackgroundMusic.Playing)
@@ -786,6 +787,18 @@ namespace Vocaluxe.Base
dy += rect.Height;
}
if (CConfig.DebugLevel >= EDebugLevel.TR_CONFIG_LEVEL1)
{
long memory = GC.GetTotalMemory(false);
txt = (memory / 1000000L).ToString(CLanguage.Translate("TR_DEBUG_MEMORY") + ": 00000 MB");
RectangleF rect = new RectangleF(CSettings.iRenderW - CFonts.GetTextWidth(txt), dy, CFonts.GetTextWidth(txt), CFonts.GetTextHeight(txt));
CDraw.DrawColor(Gray, new SRectF(rect.X, rect.Top, rect.Width, rect.Height, CSettings.zNear));
CFonts.DrawText(txt, rect.X, rect.Y, CSettings.zNear);
dy += rect.Height;
}
if (CConfig.DebugLevel >= EDebugLevel.TR_CONFIG_LEVEL2)
{
txt = CSound.RecordGetToneAbs(0).ToString(CLanguage.Translate("TR_DEBUG_TONE_ABS") + " P1: 00");
Vocaluxe/Base/CSongs.cs
+1
View File
@@ -1055,6 +1055,7 @@ namespace Vocaluxe.Base
CLog.StopBenchmark(2, "Load Cover");
}
CLog.StopBenchmark(1, "Load Songs ");
GC.Collect();
}
public static void LoadCover(long WaitTime, int NumLoads)
Vocaluxe/Screens/CScreenCredits.cs
+1 -1
View File
@@ -174,7 +174,7 @@ namespace Vocaluxe.Screens
}
public override void ReloadTheme() { }
public override void ReloadTheme(string XmlPath) { }
public override void SaveTheme() { }
Vocaluxe/Screens/CScreenParty.cs
+11 -6
View File
@@ -43,7 +43,7 @@ namespace Vocaluxe.Screens
public override void LoadTheme(string XmlPath)
{
base.LoadTheme(XmlPath);
base.LoadTheme(XmlPath);
}
public override bool HandleInput(KeyEvent KeyEvent)
@@ -146,12 +146,14 @@ namespace Vocaluxe.Screens
if (index >= _PartyModeInfos.Count)
return;
//Description
Texts[htTexts(TextDescription)].PartyModeID = _PartyModeInfos[index].PartyModeID;
//Description
Texts[htTexts(TextDescription)].Text = _PartyModeInfos[index].Description;
Texts[htTexts(TextDescription)].TranslationID = _PartyModeInfos[index].PartyModeID;
//TargetAudience
Texts[htTexts(TextTargetAudience)].PartyModeID = _PartyModeInfos[index].PartyModeID;
Texts[htTexts(TextTargetAudience)].TranslationID = _PartyModeInfos[index].PartyModeID;
Texts[htTexts(TextTargetAudience)].Text = _PartyModeInfos[index].TargetAudience;
//NumTeams
if (_PartyModeInfos[index].MaxTeams == 0)
Texts[htTexts(TextNumTeams)].Text = "TR_SCREENPARTY_NOTEAMS";
@@ -159,17 +161,20 @@ namespace Vocaluxe.Screens
Texts[htTexts(TextNumTeams)].Text = _PartyModeInfos[index].MaxTeams.ToString();
else if (_PartyModeInfos[index].MaxTeams > _PartyModeInfos[index].MinTeams)
Texts[htTexts(TextNumTeams)].Text = _PartyModeInfos[index].MinTeams + " - " + _PartyModeInfos[index].MaxTeams;
//NumPlayers
if (_PartyModeInfos[index].MaxPlayers == _PartyModeInfos[index].MinPlayers)
Texts[htTexts(TextNumPlayers)].Text = _PartyModeInfos[index].MaxTeams.ToString();
else if (_PartyModeInfos[index].MaxPlayers > _PartyModeInfos[index].MinPlayers)
Texts[htTexts(TextNumPlayers)].Text = _PartyModeInfos[index].MinPlayers + " - " + _PartyModeInfos[index].MaxPlayers;
//Author
Texts[htTexts(TextAuthor)].Text = _PartyModeInfos[index].Author;
Texts[htTexts(TextAuthor)].PartyModeID = _PartyModeInfos[index].PartyModeID;
Texts[htTexts(TextAuthor)].TranslationID = _PartyModeInfos[index].PartyModeID;
//Version
Texts[htTexts(TextVersion)].Text = _PartyModeInfos[index].VersionMajor + "." + _PartyModeInfos[index].VersionMinor;
Texts[htTexts(TextVersion)].PartyModeID = _PartyModeInfos[index].PartyModeID;
Texts[htTexts(TextVersion)].TranslationID = _PartyModeInfos[index].PartyModeID;
if (!_PartyModeInfos[index].Playable)
{
Vocaluxe/Screens/CScreenSing.cs
+1
View File
@@ -569,6 +569,7 @@ namespace Vocaluxe.Screens
Texts[htTexts(TextSongName)].Text = String.Empty;
Texts[htTexts(TextDuetName1)].Text = String.Empty;
Texts[htTexts(TextDuetName2)].Text = String.Empty;
GC.Collect();
}
private void LoadNextSong()
VocaluxeLib/Menu/CMenu.cs
+3 -3
View File
@@ -663,14 +663,14 @@ namespace Vocaluxe.Menu
}
}
public virtual void ReloadTheme()
public virtual void ReloadTheme(string XmlPath)
{
if (_ThemePath == String.Empty)
return;
UnloadTextures();
Init();
LoadTheme(_ThemePath);
Init();
LoadTheme(XmlPath);
}
#endregion ThemeHandler
VocaluxeLib/Menu/CText.cs
+20 -1
View File
@@ -40,6 +40,7 @@ namespace Vocaluxe.Menu
private SThemeText _Theme;
private bool _ThemeLoaded;
private int _PartyModeID;
private int _TranslationID;
public string GetThemeName()
{
@@ -209,7 +210,7 @@ namespace Vocaluxe.Menu
get { return _Theme.Text; }
set
{
string translation = _Base.Language.Translate(value, _PartyModeID);
string translation = _Base.Language.Translate(value, _TranslationID);
if (_Theme.Text != value || translation != _Text)
{
_Theme.Text = value;
@@ -227,6 +228,18 @@ namespace Vocaluxe.Menu
_Text = _Base.Language.Translate(_Text, value);
_PositionNeedsUpdate = true;
_PartyModeID = value;
_TranslationID = value;
}
}
public int TranslationID
{
get { return _TranslationID; }
set
{
_Text = _Base.Language.Translate(_Text, value);
_PositionNeedsUpdate = true;
_TranslationID = value;
}
}
@@ -243,6 +256,7 @@ namespace Vocaluxe.Menu
_ThemeLoaded = false;
_ButtonText = false;
_PartyModeID = PartyModeID;
_TranslationID = _PartyModeID;
X = 0f;
Y = 0f;
@@ -274,6 +288,7 @@ namespace Vocaluxe.Menu
_ThemeLoaded = false;
_ButtonText = false;
_PartyModeID = text._PartyModeID;
_TranslationID = text._TranslationID;
X = text._X;
Y = text._Y;
@@ -307,6 +322,7 @@ namespace Vocaluxe.Menu
_ThemeLoaded = false;
_ButtonText = false;
_PartyModeID = -1;
_TranslationID = -1;
X = x;
Y = y;
@@ -346,6 +362,7 @@ namespace Vocaluxe.Menu
_ThemeLoaded = false;
_ButtonText = false;
_PartyModeID = -1;
_TranslationID = -1;
X = x;
Y = y;
@@ -383,6 +400,7 @@ namespace Vocaluxe.Menu
_ThemeLoaded = false;
_ButtonText = false;
_PartyModeID = -1;
_TranslationID = -1;
X = x;
Y = y;
@@ -422,6 +440,7 @@ namespace Vocaluxe.Menu
_ThemeLoaded = false;
_ButtonText = false;
_PartyModeID = -1;
_TranslationID = -1;
X = x;
Y = y;
VocaluxeLib/Menu/IMenu.cs
+1 -1
View File
@@ -18,7 +18,7 @@ namespace Vocaluxe.Menu
void SaveTheme();
void ReloadTextures();
void UnloadTextures();
void ReloadTheme();
void ReloadTheme(string XmlPath);
bool HandleInput(KeyEvent KeyEvent);
bool HandleMouse(MouseEvent MouseEvent);
VocaluxeLib/PartyModes/CScreenPartyDummy.cs
+1 -1
View File
@@ -39,7 +39,7 @@ namespace Vocaluxe.PartyModes
AddText(Warning);
}
public override void ReloadTheme()
public override void ReloadTheme(string XmlPath)
{
}