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

More improvements for objectinteractions

Browse Source 
Also removes highlight textures and colors
This commit is contained in:
Flamefire committed 2014-10-22 13:46:34 +02:00
1 parent d910b944ea
commit 8c3a50c18f
40 files changed
+450 -842
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/PartyModes/Challenge/Themes/Default/Blue.xml
-6
View File
@@ -68,12 +68,6 @@
<B>0,969</B>
<A>0,500</A>
</SelectSlideColorAlpha>
<SelectSlideHColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<A>1,000</A>
</SelectSlideHColor>
<SelectSlideSColor>
<R>0,675</R>
<G>0,890</G>
Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeConfig.xml
-6
View File
@@ -175,7 +175,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>100</Y>
@@ -199,7 +198,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -219,7 +217,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>160</Y>
@@ -243,7 +240,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -263,7 +259,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>220</Y>
@@ -287,7 +282,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeNames.xml
-4
View File
@@ -291,7 +291,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>40</X>
<Y>100</Y>
@@ -315,7 +314,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -335,7 +333,6 @@
<SkinSelected>SelectSlidePlayer</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlidePlayer</SkinHighlighted>
<Rect>
<X>40</X>
<Y>160</Y>
@@ -359,7 +356,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
Output/PartyModes/ChallengeMedley/Themes/Default/Blue.xml
-6
View File
@@ -68,12 +68,6 @@
<B>0,969</B>
<A>0,500</A>
</SelectSlideColorAlpha>
<SelectSlideHColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<A>1,000</A>
</SelectSlideHColor>
<SelectSlideSColor>
<R>0,675</R>
<G>0,890</G>
Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyConfig.xml
-6
View File
@@ -175,7 +175,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>100</Y>
@@ -199,7 +198,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -219,7 +217,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>160</Y>
@@ -243,7 +240,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -263,7 +259,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>220</Y>
@@ -287,7 +282,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyNames.xml
-4
View File
@@ -291,7 +291,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>40</X>
<Y>100</Y>
@@ -315,7 +314,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -335,7 +333,6 @@
<SkinSelected>SelectSlidePlayer</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlidePlayer</SkinHighlighted>
<Rect>
<X>40</X>
<Y>160</Y>
@@ -359,7 +356,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
Output/PartyModes/TicTacToe/Themes/Default/Blue.xml
-6
View File
@@ -68,12 +68,6 @@
<B>0,969</B>
<A>0,500</A>
</SelectSlideColorAlpha>
<SelectSlideHColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<A>1,000</A>
</SelectSlideHColor>
<SelectSlideSColor>
<R>0,675</R>
<G>0,890</G>
Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeConfig.xml
-10
View File
@@ -175,7 +175,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>100</Y>
@@ -199,7 +198,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -219,7 +217,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>160</Y>
@@ -243,7 +240,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -263,7 +259,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>220</Y>
@@ -287,7 +282,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -307,7 +301,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>220</Y>
@@ -331,7 +324,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -351,7 +343,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>280</Y>
@@ -375,7 +366,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeNames.xml
-4
View File
@@ -291,7 +291,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>40</X>
<Y>100</Y>
@@ -315,7 +314,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -335,7 +333,6 @@
<SkinSelected>SelectSlidePlayer</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlidePlayer</SkinHighlighted>
<Rect>
<X>40</X>
<Y>160</Y>
@@ -359,7 +356,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
Output/RequiredSkinElements.xml
-1
View File
@@ -35,7 +35,6 @@
ButtonTextColor
ButtonTextSColor
SelectSlideColor
SelectSlideHColor
SelectSlideSColor
ArrowColor
ArrowSColor
Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml
-2
View File
@@ -47,7 +47,6 @@
<SkinSelected />
<SkinArrowLeftSelected>Minus</SkinArrowLeftSelected>
<SkinArrowRightSelected>Plus</SkinArrowRightSelected>
<SkinHighlighted />
<Rect>
<X>1090</X>
<Y>680</Y>
@@ -71,7 +70,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
Output/Themes/Ambient/Screens/ScreenNames.xml
-14
View File
@@ -418,7 +418,6 @@
<SkinSelected>SelectSlidePlayer</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlidePlayer</SkinHighlighted>
<Rect>
<X>70</X>
<Y>548</Y>
@@ -442,7 +441,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -462,7 +460,6 @@
<SkinSelected>Button</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>Button</SkinHighlighted>
<Rect>
<X>41</X>
<Y>105</Y>
@@ -486,7 +483,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -506,7 +502,6 @@
<SkinSelected>Button</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>Button</SkinHighlighted>
<Rect>
<X>41</X>
<Y>260</Y>
@@ -530,7 +525,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -550,7 +544,6 @@
<SkinSelected>Button</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>Button</SkinHighlighted>
<Rect>
<X>41</X>
<Y>415</Y>
@@ -574,7 +567,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -594,7 +586,6 @@
<SkinSelected>Button</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>Button</SkinHighlighted>
<Rect>
<X>1152</X>
<Y>105</Y>
@@ -618,7 +609,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -638,7 +628,6 @@
<SkinSelected>Button</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>Button</SkinHighlighted>
<Rect>
<X>1152</X>
<Y>260</Y>
@@ -662,7 +651,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -682,7 +670,6 @@
<SkinSelected>Button</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>Button</SkinHighlighted>
<Rect>
<X>1152</X>
<Y>415</Y>
@@ -706,7 +693,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
Output/Themes/Ambient/Screens/ScreenOptionsGame.xml
-12
View File
@@ -292,7 +292,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>100</Y>
@@ -316,7 +315,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -336,7 +334,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>160</Y>
@@ -360,7 +357,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -380,7 +376,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>220</Y>
@@ -404,7 +399,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -424,7 +418,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>280</Y>
@@ -448,7 +441,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -468,7 +460,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>340</Y>
@@ -492,7 +483,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -512,7 +502,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>400</Y>
@@ -536,7 +525,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml
-4
View File
@@ -123,7 +123,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>100</Y>
@@ -147,7 +146,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -167,7 +165,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>160</Y>
@@ -191,7 +188,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
-8
View File
@@ -331,7 +331,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>100</Y>
@@ -355,7 +354,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -375,7 +373,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>220</Y>
@@ -399,7 +396,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -419,7 +415,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>280</Y>
@@ -443,7 +438,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -463,7 +457,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>340</Y>
@@ -487,7 +480,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
Output/Themes/Ambient/Screens/ScreenOptionsSound.xml
-10
View File
@@ -168,7 +168,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>100</Y>
@@ -192,7 +191,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -212,7 +210,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>160</Y>
@@ -236,7 +233,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -256,7 +252,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>220</Y>
@@ -280,7 +275,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -300,7 +294,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>280</Y>
@@ -324,7 +317,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -344,7 +336,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>340</Y>
@@ -368,7 +359,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml
-16
View File
@@ -309,7 +309,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>100</Y>
@@ -333,7 +332,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -353,7 +351,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>160</Y>
@@ -377,7 +374,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -397,7 +393,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>220</Y>
@@ -421,7 +416,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -441,7 +435,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>280</Y>
@@ -465,7 +458,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -485,7 +477,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>340</Y>
@@ -509,7 +500,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -529,7 +519,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>400</Y>
@@ -553,7 +542,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -573,7 +561,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>460</Y>
@@ -597,7 +584,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -617,7 +603,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>520</Y>
@@ -641,7 +626,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
-12
View File
@@ -268,7 +268,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>100</Y>
@@ -292,7 +291,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -312,7 +310,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>160</Y>
@@ -336,7 +333,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -356,7 +352,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>220</Y>
@@ -380,7 +375,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -400,7 +394,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>280</Y>
@@ -424,7 +417,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -444,7 +436,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>340</Y>
@@ -468,7 +459,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -488,7 +478,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>400</Y>
@@ -512,7 +501,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
Output/Themes/Ambient/Screens/ScreenParty.xml
-2
View File
@@ -340,7 +340,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>100</Y>
@@ -364,7 +363,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
Output/Themes/Ambient/Screens/ScreenProfiles.xml
-10
View File
@@ -518,7 +518,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>160</Y>
@@ -542,7 +541,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -562,7 +560,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>340</Y>
@@ -586,7 +583,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -606,7 +602,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>400</Y>
@@ -630,7 +625,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -650,7 +644,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>460</Y>
@@ -674,7 +667,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -694,7 +686,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>500</X>
<Y>520</Y>
@@ -718,7 +709,6 @@
</RectArrowRight>
<Color Name="SelectSlideColor" />
<SColor Name="SelectSlideSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
Output/Themes/Ambient/Screens/ScreenSing.xml
+6 -6
View File
@@ -1741,7 +1741,7 @@
<Z>-1</Z>
</Rect>
<Color Name="LyricMainColor" />
<SColor Name="LyricHighlight" />
<SColor Name="LyricSelColor" />
</Lyric>
<Lyric Name="LyricSub">
<Rect>
@@ -1752,7 +1752,7 @@
<Z>-1</Z>
</Rect>
<Color Name="LyricSubColor" />
<SColor Name="LyricHighlight" />
<SColor Name="LyricSelColor" />
</Lyric>
<Lyric Name="LyricMainDuet">
<Rect>
@@ -1763,7 +1763,7 @@
<Z>-1</Z>
</Rect>
<Color Name="LyricMainColor" />
<SColor Name="LyricHighlight" />
<SColor Name="LyricSelColor" />
</Lyric>
<Lyric Name="LyricSubDuet">
<Rect>
@@ -1774,7 +1774,7 @@
<Z>-1</Z>
</Rect>
<Color Name="LyricSubColor" />
<SColor Name="LyricHighlight" />
<SColor Name="LyricSelColor" />
</Lyric>
<Lyric Name="LyricMainTop">
<Rect>
@@ -1785,7 +1785,7 @@
<Z>-1</Z>
</Rect>
<Color Name="LyricMainColor" />
<SColor Name="LyricHighlight" />
<SColor Name="LyricSelColor" />
</Lyric>
<Lyric Name="LyricSubTop">
<Rect>
@@ -1796,7 +1796,7 @@
<Z>-1</Z>
</Rect>
<Color Name="LyricSubColor" />
<SColor Name="LyricHighlight" />
<SColor Name="LyricSelColor" />
</Lyric>
</Lyrics>
<SelectSlides />
Output/Themes/Ambient/Screens/ScreenSong.xml
+1 -11
View File
@@ -960,7 +960,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>40</X>
<Y>135</Y>
@@ -984,7 +983,6 @@
</RectArrowRight>
<Color Name="ButtonColor" />
<SColor Name="ButtonSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -1004,7 +1002,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>40</X>
<Y>190</Y>
@@ -1028,7 +1025,6 @@
</RectArrowRight>
<Color Name="ButtonColor" />
<SColor Name="ButtonSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -1048,7 +1044,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>40</X>
<Y>180</Y>
@@ -1072,7 +1067,6 @@
</RectArrowRight>
<Color Name="ButtonColor" />
<SColor Name="ButtonSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -1092,7 +1086,6 @@
<SkinSelected>SelectSlide</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted>SelectSlide</SkinHighlighted>
<Rect>
<X>40</X>
<Y>90</Y>
@@ -1116,7 +1109,6 @@
</RectArrowRight>
<Color Name="ButtonColor" />
<SColor Name="ButtonSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
@@ -1360,7 +1352,6 @@
<SkinSelected />
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<SkinHighlighted />
<Rect>
<X>0</X>
<Y>28</Y>
@@ -1384,8 +1375,7 @@
</RectArrowRight>
<Color Name="ButtonColor" />
<SColor Name="ButtonSColor" />
<HColor Name="SelectSlideHColor" />
<ArrowColor Name="ArrowColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSColor Name="ArrowSColor" />
<TextColor Name="TextColor" />
<TextSColor Name="TextSColor" />
Output/Themes/Ambient/Skin Blue.xml
+2 -8
View File
@@ -104,12 +104,6 @@
<B>0,969</B>
<A>0,500</A>
</SelectSlideColorAlpha>
<SelectSlideHColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<A>1,000</A>
</SelectSlideHColor>
<SelectSlideSColor>
<R>0,675</R>
<G>0,890</G>
@@ -170,12 +164,12 @@
<B>1,000</B>
<A>0,000</A>
</Invisible>
<LyricHighlight>
<LyricSelColor>
<R>0,000</R>
<G>0,000</G>
<B>1,000</B>
<A>1,000</A>
</LyricHighlight>
</LyricSelColor>
<LyricMainColor>
<R>0,000</R>
<G>0,000</G>
Output/Themes/Ambient/Skin Green.xml
+2 -8
View File
@@ -98,12 +98,6 @@
<B>0,674</B>
<A>1,000</A>
</SelectSlideColor>
<SelectSlideHColor>
<R>0,709</R>
<G>0,968</G>
<B>0,674</B>
<A>1,000</A>
</SelectSlideHColor>
<SelectSlideSColor>
<R>0,709</R>
<G>0,968</G>
@@ -164,12 +158,12 @@
<B>1,000</B>
<A>0,000</A>
</Invisible>
<LyricHighlight>
<LyricSelColor>
<R>0,000</R>
<G>1,000</G>
<B>0,000</B>
<A>1,000</A>
</LyricHighlight>
</LyricSelColor>
<LyricMainColor>
<R>0,000</R>
<G>0,000</G>
Output/Themes/Ambient/Skin Red.xml
+2 -8
View File
@@ -98,12 +98,6 @@
<B>0,674</B>
<A>1,000</A>
</SelectSlideColor>
<SelectSlideHColor>
<R>0,968</R>
<G>0,674</G>
<B>0,674</B>
<A>1,000</A>
</SelectSlideHColor>
<SelectSlideSColor>
<R>0,968</R>
<G>0,674</G>
@@ -164,12 +158,12 @@
<B>1,000</B>
<A>0,000</A>
</Invisible>
<LyricHighlight>
<LyricSelColor>
<R>1,000</R>
<G>0,000</G>
<B>0,000</B>
<A>1,000</A>
</LyricHighlight>
</LyricSelColor>
<LyricMainColor>
<R>0,000</R>
<G>0,000</G>
Output/Themes/Ambient/Skin Yellow.xml
+2 -8
View File
@@ -98,12 +98,6 @@
<B>0,674</B>
<A>1,000</A>
</SelectSlideColor>
<SelectSlideHColor>
<R>0,968</R>
<G>0,956</G>
<B>0,674</B>
<A>1,000</A>
</SelectSlideHColor>
<SelectSlideSColor>
<R>0,968</R>
<G>0,956</G>
@@ -164,12 +158,12 @@
<B>1,000</B>
<A>0,000</A>
</Invisible>
<LyricHighlight>
<LyricSelColor>
<R>1,000</R>
<G>1,000</G>
<B>0,000</B>
<A>1,000</A>
</LyricHighlight>
</LyricSelColor>
<LyricMainColor>
<R>0,000</R>
<G>0,000</G>
PartyModes/PartyModeChallenge/CPartyScreenChallengeMain.cs
+3 -3
View File
@@ -291,7 +291,7 @@ namespace VocaluxeLib.PartyModes.Challenge
_Buttons[_ButtonNextRound].Visible = true;
_Texts[_TextFinishMessage].Visible = false;
_Texts[_TextFinishPlayerWin].Visible = false;
_SetInteractionToButton(_Buttons[_ButtonNextRound]);
_SelectElement(_Buttons[_ButtonNextRound]);
}
else
{
@@ -299,7 +299,7 @@ namespace VocaluxeLib.PartyModes.Challenge
_Texts[_TextFinishMessage].Visible = true;
_Texts[_TextFinishPlayerWin].Visible = true;
_Texts[_TextFinishPlayerWin].Text = _GetPlayerWinString();
_SetInteractionToButton(_Buttons[_ButtonExit]);
_SelectElement(_Buttons[_ButtonExit]);
}
_ShowPopup(false);
@@ -332,7 +332,7 @@ namespace VocaluxeLib.PartyModes.Challenge
_Buttons[_ButtonPopupNo].Visible = _ExitPopupVisible;
if (_ExitPopupVisible)
_SetInteractionToButton(_Buttons[_ButtonPopupNo]);
_SelectElement(_Buttons[_ButtonPopupNo]);
}
private void _Back()
PartyModes/PartyModeChallengeMedley/CPartyScreenChallengeMedleyMain.cs
+3 -3
View File
@@ -291,7 +291,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
_Buttons[_ButtonNextRound].Visible = true;
_Texts[_TextFinishMessage].Visible = false;
_Texts[_TextFinishPlayerWin].Visible = false;
_SetInteractionToButton(_Buttons[_ButtonNextRound]);
_SelectElement(_Buttons[_ButtonNextRound]);
}
else
{
@@ -299,7 +299,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
_Texts[_TextFinishMessage].Visible = true;
_Texts[_TextFinishPlayerWin].Visible = true;
_Texts[_TextFinishPlayerWin].Text = _GetPlayerWinString();
_SetInteractionToButton(_Buttons[_ButtonExit]);
_SelectElement(_Buttons[_ButtonExit]);
}
_ShowPopup(false);
@@ -332,7 +332,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
_Buttons[_ButtonPopupNo].Visible = _ExitPopupVisible;
if (_ExitPopupVisible)
_SetInteractionToButton(_Buttons[_ButtonPopupNo]);
_SelectElement(_Buttons[_ButtonPopupNo]);
}
private void _Back()
PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeMain.cs
+6 -6
View File
@@ -310,13 +310,13 @@ namespace VocaluxeLib.PartyModes.TicTacToe
_SelectedField = -1;
_Buttons[_ButtonBack].Visible = true;
_Buttons[_ButtonExit].Visible = false;
_SetInteractionToButton(_Buttons[_ButtonBack]);
_SelectElement(_Buttons[_ButtonBack]);
}
else
{
_Buttons[_ButtonBack].Visible = false;
_Buttons[_ButtonExit].Visible = true;
_SetInteractionToButton(_Buttons[_ButtonExit]);
_SelectElement(_Buttons[_ButtonExit]);
}
_Status = EStatus.FieldChoosing;
@@ -358,7 +358,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
_Texts[_TextFinishMessage].Color = new SColorF(1, 1, 1, 1);
_Texts[_TextFinishMessage].Text = CBase.Language.Translate("TR_SCREENMAIN_NOWINNER", PartyModeID);
}
_SetInteractionToButton(_Buttons[_ButtonExit]);
_SelectElement(_Buttons[_ButtonExit]);
}
_ShowPopup(false);
@@ -512,7 +512,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
_Buttons[_ButtonExit].Visible = true;
_Buttons[_ButtonBack].Visible = false;
_SetInteractionToButton(_Buttons[_ButtonNextRound]);
_SelectElement(_Buttons[_ButtonNextRound]);
}
private void _FieldSelectedAgain()
@@ -541,7 +541,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
_Buttons[_ButtonExit].Visible = true;
_Buttons[_ButtonBack].Visible = false;
_SetInteractionToButton(_Buttons[_ButtonNextRound]);
_SelectElement(_Buttons[_ButtonNextRound]);
}
private void _UpdatePlayerInformation()
@@ -648,7 +648,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
_Buttons[_ButtonPopupNo].Visible = _ExitPopupVisible;
if (_ExitPopupVisible)
_SetInteractionToButton(_Buttons[_ButtonPopupNo]);
_SelectElement(_Buttons[_ButtonPopupNo]);
}
private void _Back()
Vocaluxe/Base/CGraphics.cs
+1 -1
View File
@@ -585,7 +585,7 @@ namespace Vocaluxe.Base
if (keyEvent.ModShift && (keyEvent.Key == Keys.F1))
{
CSettings.ProgramState = EProgramState.Normal;
_Screens[(int)_CurrentScreen].NextInteraction();
_Screens[(int)_CurrentScreen].NextElement();
}
else if (keyEvent.ModAlt && (keyEvent.Key == Keys.Enter))
CConfig.FullScreen = (CConfig.FullScreen == EOffOn.TR_CONFIG_ON) ? EOffOn.TR_CONFIG_OFF : EOffOn.TR_CONFIG_ON;
Vocaluxe/Screens/CScreenNames.cs
+3 -3
View File
@@ -181,7 +181,7 @@ namespace Vocaluxe.Screens
_UpdateSelectedProfile(_SelectingFastPlayerNr - 1, _SelectedProfileID);
_SetInteractionToButton(_Buttons[_ButtonStart]);
_SelectElement(_Buttons[_ButtonStart]);
}
//Started selecting with 'P'
if (_SelectingFast)
@@ -248,7 +248,7 @@ namespace Vocaluxe.Screens
_SelectingKeyboardActive = false;
_SelectingFast = false;
_NameSelections[_NameSelection].FastSelection(false, -1);
_SetInteractionToButton(_Buttons[_ButtonStart]);
_SelectElement(_Buttons[_ButtonStart]);
}
break;
}
@@ -557,7 +557,7 @@ namespace Vocaluxe.Screens
_NameSelections[_NameSelection].Init();
_LoadProfiles();
_SetInteractionToButton(_Buttons[_ButtonStart]);
_SelectElement(_Buttons[_ButtonStart]);
}
public override void OnClose()
Vocaluxe/Screens/CScreenParty.cs
+1 -1
View File
@@ -119,7 +119,7 @@ namespace Vocaluxe.Screens
_SelectSlides[_SelectSlideModes].Selection = 0;
_UpdateSelection();
_SetInteractionToSelectSlide(_SelectSlides[_SelectSlideModes]);
_SelectElement(_SelectSlides[_SelectSlideModes]);
}
public override bool UpdateGame()
Vocaluxe/Screens/CScreenProfiles.cs
+1 -1
View File
@@ -386,7 +386,7 @@ namespace Vocaluxe.Screens
CProfiles.SetAvatar(_SelectSlides[_SelectSlideProfiles].ValueIndex,
_SelectSlides[_SelectSlideAvatars].ValueIndex);
_SetInteractionToButton(_Buttons[_ButtonPlayerName]);
_SelectElement(_Buttons[_ButtonPlayerName]);
_EditMode = EEditMode.PlayerName;
}
Vocaluxe/Screens/CScreenSong.cs
+4 -4
View File
@@ -1209,7 +1209,7 @@ namespace Vocaluxe.Screens
_SelectSlides[_SelectSlideOptionsPlaylistAdd].Visible = true;
_Buttons[_ButtonOptionsSing].Visible = true;
_Buttons[_ButtonOptionsPlaylist].Visible = true;
_SetInteractionToButton(_Buttons[_ButtonOptionsSing]);
_SelectElement(_Buttons[_ButtonOptionsSing]);
_SetSelectSlidePlaylistToCurrentPlaylist();
}
@@ -1232,9 +1232,9 @@ namespace Vocaluxe.Screens
// ReSharper disable ConvertIfStatementToConditionalTernaryExpression
if (_Buttons[_ButtonOptionsRandom].Visible)
// ReSharper restore ConvertIfStatementToConditionalTernaryExpression
_SetInteractionToButton(_Buttons[_ButtonOptionsRandom]);
_SelectElement(_Buttons[_ButtonOptionsRandom]);
else
_SetInteractionToButton(_Buttons[_ButtonOptionsRandomCategory]);
_SelectElement(_Buttons[_ButtonOptionsRandomCategory]);
}
private void _ShowSongOptionsMedley()
@@ -1256,7 +1256,7 @@ namespace Vocaluxe.Screens
_SelectSlides[_SelectSlideOptionsNumMedleySongs].SetSelectionByValueIndex(4);
else
_SelectSlides[_SelectSlideOptionsNumMedleySongs].SetSelectionByValueIndex(_SelectSlides[_SelectSlideOptionsNumMedleySongs].NumValues - 1);
_SetInteractionToButton(_Buttons[_ButtonOptionsStartMedley]);
_SelectElement(_Buttons[_ButtonOptionsStartMedley]);
}
#region Playlist Actions
VocaluxeLib/Enums.cs
+9
View File
@@ -19,6 +19,13 @@ using System;
namespace VocaluxeLib
{
public enum EDirection
{
Up = 0,
Right = 1,
Down = 2,
Left = 3
}
#region Inputs
[Flags]
@@ -259,9 +266,11 @@ namespace VocaluxeLib
public enum EBackgroundMusicOffOn
{
// ReSharper disable InconsistentNaming
TR_CONFIG_OFF,
TR_CONFIG_ONLY_SONG,
TR_CONFIG_ON
// ReSharper restore InconsistentNaming
}
public enum EPlayerInfo
VocaluxeLib/Menu/CMenu.cs
+1 -1
View File
@@ -550,12 +550,12 @@ namespace VocaluxeLib.Menu
public virtual void OnShow()
{
_ResumeBG();
_Active = true;
}
public virtual void OnShowFinish()
{
_ResumeBG();
_Active = true;
}
public virtual void OnClose()
VocaluxeLib/Menu/CObjectInteractions.cs
+286 -478
View File
File diff suppressed because it is too large. Load diff
VocaluxeLib/Menu/CPlaylist.cs
+10 -7
View File
@@ -175,7 +175,11 @@ namespace VocaluxeLib.Menu
{
get { return Visible; }
}
public bool Visible { get; set; }
public bool Visible
{
get { return _Active; }
set { _Active = value; }
}
public bool Highlighted { get; set; }
public bool Selected
{
@@ -183,7 +187,6 @@ namespace VocaluxeLib.Menu
set
{
_Selected = value;
_Active = value;
_CurrentPlaylistElement = _GetSelectedElementNr();
if (!value)
@@ -462,7 +465,7 @@ namespace VocaluxeLib.Menu
case Keys.Up:
if (keyEvent.ModShift)
{
_SetInteractionToSelectSlide(_PlaylistElements[0].SelectSlide);
_SelectElement(_PlaylistElements[0].SelectSlide);
base.HandleInput(keyEvent);
_CurrentPlaylistElement = _GetSelectedElementNr();
}
@@ -493,7 +496,7 @@ namespace VocaluxeLib.Menu
{
if (_PlaylistElements[i].SelectSlide.Visible)
{
_SetInteractionToSelectSlide(_PlaylistElements[0].SelectSlide);
_SelectElement(_PlaylistElements[0].SelectSlide);
base.HandleInput(keyEvent);
_CurrentPlaylistElement = _GetSelectedElementNr();
}
@@ -532,7 +535,7 @@ namespace VocaluxeLib.Menu
_CurrentPlaylistElement = _PlaylistElementContents.Count - 1;
if (_CurrentPlaylistElement != -1)
_SetInteractionToSelectSlide(_PlaylistElements[_CurrentPlaylistElement].SelectSlide);
_SelectElement(_PlaylistElements[_CurrentPlaylistElement].SelectSlide);
break;
case Keys.Back:
@@ -802,7 +805,7 @@ namespace VocaluxeLib.Menu
{
hoverSet = true;
_CurrentPlaylistElement = i;
_SetInteractionToSelectSlide(_PlaylistElements[_CurrentPlaylistElement].SelectSlide);
_SelectElement(_PlaylistElements[_CurrentPlaylistElement].SelectSlide);
ProcessMouseMove(mouseEvent.X, mouseEvent.Y);
}
@@ -941,7 +944,7 @@ namespace VocaluxeLib.Menu
break;
case EEditMode.PlaylistName:
_SetInteractionToButton(_ButtonPlaylistName);
_SelectElement(_ButtonPlaylistName);
_CurrentPlaylistElement = -1;
if (mouseEvent.LB)
{
VocaluxeLib/Menu/CSelectSlide.cs
+103 -138
View File
@@ -37,15 +37,12 @@ namespace VocaluxeLib.Menu
public string SkinArrowLeftSelected;
public string SkinArrowRightSelected;
public string SkinHighlighted;
public SRectF Rect;
public SRectF RectArrowLeft;
public SRectF RectArrowRight;
public SThemeColor Color;
public SThemeColor SColor;
public SThemeColor HColor;
public SThemeColor ArrowColor;
public SThemeColor ArrowSColor;
@@ -83,20 +80,19 @@ namespace VocaluxeLib.Menu
public SRectF RectArrowLeft;
public SRectF RectArrowRight;
public SColorF Color;
public SColorF SelColor;
public SColorF HighlightColor;
private SColorF _Color;
private SColorF _SelColor;
public SColorF ColorArrow;
public SColorF SelColorArrow;
private SColorF _ColorArrow;
private SColorF _SelColorArrow;
public SColorF TextColor;
public SColorF SelTextColor;
private SColorF _TextColor;
private SColorF _SelTextColor;
public float TextRelativeX;
public float TextRelativeY;
public float TextH;
public float MaxW;
private float _TextRelativeX;
private float _TextRelativeY;
private float _TextH;
private float _MaxW;
public bool Selectable
{
@@ -193,6 +189,13 @@ namespace VocaluxeLib.Menu
}
private int _NumVisible = -1;
private CTextureRef _Texture;
private CTextureRef _TextureArrowLeft;
private CTextureRef _TextureArrowRight;
private CTextureRef _SelTexture;
private CTextureRef _SelTextureArrowLeft;
private CTextureRef _SelTextureArrowRight;
public int NumVisible
{
get { return _NumVisible; }
@@ -209,8 +212,8 @@ namespace VocaluxeLib.Menu
{
_PartyModeID = partyModeID;
_ThemeLoaded = false;
TextH = 1f;
MaxW = 0f;
_TextH = 1f;
_MaxW = 0f;
_Textures = new List<CTextureRef>();
_ValueIndexes = new List<int>();
@@ -221,24 +224,7 @@ namespace VocaluxeLib.Menu
public CSelectSlide(CSelectSlide slide)
{
_PartyModeID = slide._PartyModeID;
_Theme = new SThemeSelectSlide
{
SkinArrowLeft = slide._Theme.SkinArrowLeft,
SkinArrowRight = slide._Theme.SkinArrowRight,
Color = slide._Theme.Color,
SColor = slide._Theme.SColor,
HColor = slide._Theme.HColor,
ArrowColor = slide._Theme.ArrowColor,
ArrowSColor = slide._Theme.ArrowSColor,
TextColor = slide._Theme.TextColor,
TextSColor = slide._Theme.TextSColor,
SkinSelected = slide._Theme.SkinSelected,
SkinArrowLeftSelected = slide._Theme.SkinArrowLeftSelected,
SkinArrowRightSelected = slide._Theme.SkinArrowRightSelected,
SkinHighlighted = slide._Theme.SkinHighlighted,
TextFont = slide._Theme.TextFont,
TextStyle = slide._Theme.TextStyle
};
_Theme = slide._Theme;
_ThemeLoaded = false;
@@ -246,18 +232,18 @@ namespace VocaluxeLib.Menu
RectArrowLeft = slide.RectArrowLeft;
RectArrowRight = slide.RectArrowRight;
Color = slide.Color;
SelColor = slide.SelColor;
_Color = slide._Color;
_SelColor = slide._SelColor;
ColorArrow = slide.ColorArrow;
SelColorArrow = slide.SelColorArrow;
_ColorArrow = slide._ColorArrow;
_SelColorArrow = slide._SelColorArrow;
TextColor = slide.TextColor;
SelTextColor = slide.SelTextColor;
TextH = slide.TextH;
TextRelativeX = slide.TextRelativeX;
TextRelativeY = slide.TextRelativeY;
MaxW = slide.MaxW;
_TextColor = slide._TextColor;
_SelTextColor = slide._SelTextColor;
_TextH = slide._TextH;
_TextRelativeX = slide._TextRelativeX;
_TextRelativeY = slide._TextRelativeY;
_MaxW = slide._MaxW;
_Textures = new List<CTextureRef>(slide._Textures);
_ValueIndexes = new List<int>(slide._ValueIndexes);
@@ -297,8 +283,6 @@ namespace VocaluxeLib.Menu
_ThemeLoaded &= xmlReader.GetValue(item + "/SkinArrowLeftSelected", out _Theme.SkinArrowLeftSelected, String.Empty);
_ThemeLoaded &= xmlReader.GetValue(item + "/SkinArrowRightSelected", out _Theme.SkinArrowRightSelected, String.Empty);
_ThemeLoaded &= xmlReader.GetValue(item + "/SkinHighlighted", out _Theme.SkinHighlighted, String.Empty);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref _Theme.Rect.X);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref _Theme.Rect.Y);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Z", ref _Theme.Rect.Z);
@@ -306,33 +290,23 @@ namespace VocaluxeLib.Menu
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref _Theme.Rect.H);
if (xmlReader.GetValue(item + "/Color", out _Theme.Color.Name, String.Empty))
_ThemeLoaded &= _Theme.Color.Get(_PartyModeID, out Color);
_ThemeLoaded &= _Theme.Color.Get(_PartyModeID, out _Color);
else
{
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/R", ref Color.R);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/G", ref Color.G);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/B", ref Color.B);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/A", ref Color.A);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/R", ref _Color.R);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/G", ref _Color.G);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/B", ref _Color.B);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/A", ref _Color.A);
}
if (xmlReader.GetValue(item + "/SColor", out _Theme.SColor.Name, String.Empty))
_ThemeLoaded &= _Theme.SColor.Get(_PartyModeID, out SelColor);
_ThemeLoaded &= _Theme.SColor.Get(_PartyModeID, out _SelColor);
else
{
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SR", ref SelColor.R);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SG", ref SelColor.G);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SB", ref SelColor.B);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SA", ref SelColor.A);
}
if (xmlReader.GetValue(item + "/HColor", out _Theme.HColor.Name, String.Empty))
_ThemeLoaded &= _Theme.HColor.Get(_PartyModeID, out HighlightColor);
else
{
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/HR", ref HighlightColor.R);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/HG", ref HighlightColor.G);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/HB", ref HighlightColor.B);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/HA", ref HighlightColor.A);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SR", ref _SelColor.R);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SG", ref _SelColor.G);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SB", ref _SelColor.B);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SA", ref _SelColor.A);
}
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowLeftX", ref RectArrowLeft.X);
@@ -348,43 +322,43 @@ namespace VocaluxeLib.Menu
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowRightH", ref RectArrowRight.H);
if (xmlReader.GetValue(item + "/ArrowColor", out _Theme.ArrowColor.Name, String.Empty))
_ThemeLoaded &= _Theme.ArrowColor.Get(_PartyModeID, out ColorArrow);
_ThemeLoaded &= _Theme.ArrowColor.Get(_PartyModeID, out _ColorArrow);
else
{
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowR", ref ColorArrow.R);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowG", ref ColorArrow.G);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowB", ref ColorArrow.B);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowA", ref ColorArrow.A);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowR", ref _ColorArrow.R);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowG", ref _ColorArrow.G);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowB", ref _ColorArrow.B);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowA", ref _ColorArrow.A);
}
if (xmlReader.GetValue(item + "/ArrowSColor", out _Theme.ArrowSColor.Name, String.Empty))
_ThemeLoaded &= _Theme.ArrowSColor.Get(_PartyModeID, out SelColorArrow);
_ThemeLoaded &= _Theme.ArrowSColor.Get(_PartyModeID, out _SelColorArrow);
else
{
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowSR", ref SelColorArrow.R);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowSG", ref SelColorArrow.G);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowSB", ref SelColorArrow.B);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowSA", ref SelColorArrow.A);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowSR", ref _SelColorArrow.R);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowSG", ref _SelColorArrow.G);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowSB", ref _SelColorArrow.B);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowSA", ref _SelColorArrow.A);
}
if (xmlReader.GetValue(item + "/TextColor", out _Theme.TextColor.Name, String.Empty))
_ThemeLoaded &= _Theme.TextColor.Get(_PartyModeID, out TextColor);
_ThemeLoaded &= _Theme.TextColor.Get(_PartyModeID, out _TextColor);
else
{
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextR", ref TextColor.R);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextG", ref TextColor.G);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextB", ref TextColor.B);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextA", ref TextColor.A);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextR", ref _TextColor.R);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextG", ref _TextColor.G);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextB", ref _TextColor.B);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextA", ref _TextColor.A);
}
if (xmlReader.GetValue(item + "/TextSColor", out _Theme.TextSColor.Name, String.Empty))
_ThemeLoaded &= _Theme.TextSColor.Get(_PartyModeID, out SelTextColor);
_ThemeLoaded &= _Theme.TextSColor.Get(_PartyModeID, out _SelTextColor);
else
{
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextSR", ref SelTextColor.R);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextSG", ref SelTextColor.G);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextSB", ref SelTextColor.B);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextSA", ref SelTextColor.A);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextSR", ref _SelTextColor.R);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextSG", ref _SelTextColor.G);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextSB", ref _SelTextColor.B);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextSA", ref _SelTextColor.A);
}
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextH", ref _Theme.TextH);
xmlReader.TryGetFloatValue(item + "/TextRelativeX", ref _Theme.TextRelativeX);
@@ -399,15 +373,14 @@ namespace VocaluxeLib.Menu
if (_ThemeLoaded)
{
_Theme.Name = elementName;
_Theme.ArrowColor.Color = ColorArrow;
_Theme.ArrowSColor.Color = SelColorArrow;
_Theme.Color.Color = Color;
_Theme.HColor.Color = HighlightColor;
_Theme.ArrowColor.Color = _ColorArrow;
_Theme.ArrowSColor.Color = _SelColorArrow;
_Theme.Color.Color = _Color;
_Theme.RectArrowLeft = RectArrowLeft;
_Theme.RectArrowRight = RectArrowRight;
_Theme.SColor.Color = SelColor;
_Theme.TextColor.Color = TextColor;
_Theme.TextSColor.Color = SelTextColor;
_Theme.SColor.Color = _SelColor;
_Theme.TextColor.Color = _TextColor;
_Theme.TextSColor.Color = _SelTextColor;
LoadSkin();
}
return _ThemeLoaded;
@@ -500,7 +473,7 @@ namespace VocaluxeLib.Menu
return false;
}
public bool NextValue()
public bool SelectNextValue()
{
if (Selection < _ValueNames.Count - 1)
{
@@ -510,7 +483,7 @@ namespace VocaluxeLib.Menu
return false;
}
public bool PrevValue()
public bool SelectPrevValue()
{
if (Selection > 0)
{
@@ -520,13 +493,13 @@ namespace VocaluxeLib.Menu
return false;
}
public void FirstValue()
public void SelectFirstValue()
{
if (_ValueNames.Count > 0)
Selection = 0;
}
public void LastValue()
public void SelectLastValue()
{
if (_ValueNames.Count > 0)
Selection = _ValueNames.Count - 1;
@@ -573,10 +546,10 @@ namespace VocaluxeLib.Menu
ProcessMouseMove(x, y);
if (_ArrowLeftSelected)
PrevValue();
SelectPrevValue();
if (_ArrowRightSelected)
NextValue();
SelectNextValue();
for (int i = 0; i < _ValueBounds.Count; i++)
{
@@ -602,47 +575,32 @@ namespace VocaluxeLib.Menu
if (!Visible && CBase.Settings.GetProgramState() != EProgramState.EditTheme)
return;
CTextureRef texture = CBase.Themes.GetSkinTexture(_Theme.Skin, _PartyModeID);
CTextureRef textureArrowLeft = CBase.Themes.GetSkinTexture(_Theme.SkinArrowLeft, _PartyModeID);
CTextureRef textureArrowRight = CBase.Themes.GetSkinTexture(_Theme.SkinArrowRight, _PartyModeID);
CTextureRef selTexture = CBase.Themes.GetSkinTexture(_Theme.SkinSelected, _PartyModeID);
CTextureRef selTextureArrowLeft = CBase.Themes.GetSkinTexture(_Theme.SkinArrowLeftSelected, _PartyModeID);
CTextureRef selTextureArrowRight = CBase.Themes.GetSkinTexture(_Theme.SkinArrowRightSelected, _PartyModeID);
CTextureRef highlightTexture = CBase.Themes.GetSkinTexture(_Theme.SkinHighlighted, _PartyModeID);
if (Selected)
{
if (Highlighted)
CBase.Drawing.DrawTexture(highlightTexture, Rect, HighlightColor);
else
CBase.Drawing.DrawTexture(selTexture, Rect, SelColor);
}
CBase.Drawing.DrawTexture(_SelTexture, Rect, _SelColor);
else
CBase.Drawing.DrawTexture(texture, Rect, Color);
CBase.Drawing.DrawTexture(_Texture, Rect, _Color);
if (_Selection > 0 || CBase.Settings.GetProgramState() == EProgramState.EditTheme)
{
if (_ArrowLeftSelected)
CBase.Drawing.DrawTexture(selTextureArrowLeft, RectArrowLeft, SelColorArrow);
CBase.Drawing.DrawTexture(_SelTextureArrowLeft, RectArrowLeft, _SelColorArrow);
else
CBase.Drawing.DrawTexture(textureArrowLeft, RectArrowLeft, ColorArrow);
CBase.Drawing.DrawTexture(_TextureArrowLeft, RectArrowLeft, _ColorArrow);
}
if (_Selection < _ValueNames.Count - 1 || CBase.Settings.GetProgramState() == EProgramState.EditTheme)
{
if (_ArrowRightSelected)
CBase.Drawing.DrawTexture(selTextureArrowRight, RectArrowRight, SelColorArrow);
CBase.Drawing.DrawTexture(_SelTextureArrowRight, RectArrowRight, _SelColorArrow);
else
CBase.Drawing.DrawTexture(textureArrowRight, RectArrowRight, ColorArrow);
CBase.Drawing.DrawTexture(_TextureArrowRight, RectArrowRight, _ColorArrow);
}
if (_NumVisible < 1 || _ValueNames.Count == 0)
return;
float x = Rect.X + (Rect.W - TextRelativeX) * 0.1f;
float dx = (Rect.W - TextRelativeX) * 0.8f / _NumVisible;
float x = Rect.X + (Rect.W - _TextRelativeX) * 0.1f;
float dx = (Rect.W - _TextRelativeX) * 0.8f / _NumVisible;
//float y = Rect.Y + (Rect.H - TextH);
int offset = _Selection - _NumVisible / 2;
@@ -660,7 +618,7 @@ namespace VocaluxeLib.Menu
_ValueBounds.Clear();
for (int i = 0; i < numvis; i++)
{
var text = new CText(0, 0, 0, TextH, MaxW, EAlignment.Center, _Theme.TextStyle, _Theme.TextFont, TextColor, "T",
var text = new CText(0, 0, 0, _TextH, _MaxW, EAlignment.Center, _Theme.TextStyle, _Theme.TextFont, _TextColor, "T",
_ValuePartyModeIDs[i + offset]);
if (_ValueNames[i + offset] != "")
@@ -671,17 +629,17 @@ namespace VocaluxeLib.Menu
var alpha = new SColorF(1f, 1f, 1f, 0.35f);
if (i + offset == _Selection)
{
text.Color = SelTextColor;
text.Color = _SelTextColor;
alpha = new SColorF(1f, 1f, 1f, 1f);
}
RectangleF bounds = CBase.Fonts.GetTextBounds(text);
text.X = (x + dx / 2f + dx * i) + TextRelativeX;
text.X = (x + dx / 2f + dx * i) + _TextRelativeX;
if (!WithTextures)
text.Y = (int)((Rect.Y + (Rect.H - bounds.Height) / 2) + TextRelativeY);
text.Y = (int)((Rect.Y + (Rect.H - bounds.Height) / 2) + _TextRelativeY);
else
text.Y = (int)((Rect.Y + (Rect.H - bounds.Height)) + TextRelativeY);
text.Y = (int)((Rect.Y + (Rect.H - bounds.Height)) + _TextRelativeY);
text.Z = Rect.Z;
text.Draw();
@@ -707,13 +665,12 @@ namespace VocaluxeLib.Menu
public void LoadSkin()
{
_Theme.Color.Get(_PartyModeID, out Color);
_Theme.SColor.Get(_PartyModeID, out SelColor);
_Theme.HColor.Get(_PartyModeID, out HighlightColor);
_Theme.ArrowColor.Get(_PartyModeID, out ColorArrow);
_Theme.ArrowSColor.Get(_PartyModeID, out SelColorArrow);
_Theme.TextColor.Get(_PartyModeID, out TextColor);
_Theme.TextSColor.Get(_PartyModeID, out SelTextColor);
_Theme.Color.Get(_PartyModeID, out _Color);
_Theme.SColor.Get(_PartyModeID, out _SelColor);
_Theme.ArrowColor.Get(_PartyModeID, out _ColorArrow);
_Theme.ArrowSColor.Get(_PartyModeID, out _SelColorArrow);
_Theme.TextColor.Get(_PartyModeID, out _TextColor);
_Theme.TextSColor.Get(_PartyModeID, out _SelTextColor);
MaxRect = _Theme.Rect;
RectArrowLeft = _Theme.RectArrowLeft;
@@ -721,10 +678,18 @@ namespace VocaluxeLib.Menu
NumVisible = _Theme.NumVisible;
TextH = _Theme.TextH;
TextRelativeX = _Theme.TextRelativeX;
TextRelativeY = _Theme.TextRelativeY;
MaxW = _Theme.TextMaxW;
_TextH = _Theme.TextH;
_TextRelativeX = _Theme.TextRelativeX;
_TextRelativeY = _Theme.TextRelativeY;
_MaxW = _Theme.TextMaxW;
_Texture = CBase.Themes.GetSkinTexture(_Theme.Skin, _PartyModeID);
_TextureArrowLeft = CBase.Themes.GetSkinTexture(_Theme.SkinArrowLeft, _PartyModeID);
_TextureArrowRight = CBase.Themes.GetSkinTexture(_Theme.SkinArrowRight, _PartyModeID);
_SelTexture = CBase.Themes.GetSkinTexture(_Theme.SkinSelected, _PartyModeID);
_SelTextureArrowLeft = CBase.Themes.GetSkinTexture(_Theme.SkinArrowLeftSelected, _PartyModeID);
_SelTextureArrowRight = CBase.Themes.GetSkinTexture(_Theme.SkinArrowRightSelected, _PartyModeID);
}
public void ReloadSkin()
VocaluxeLib/Menu/IMenu.cs
+4 -4
View File
@@ -43,11 +43,11 @@ namespace VocaluxeLib.Menu
SRectF ScreenArea { get; }
void NextInteraction();
void PrevInteraction();
void NextElement();
void PrevElement();
bool NextElement();
bool PrevElement();
bool NextValue();
bool PrevValue();
void ProcessMouseClick(int x, int y);
void ProcessMouseMove(int x, int y);