diff --git a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeConfig.xml b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeConfig.xml
index 7fdcd72c..af2d6be3 100644
--- a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeConfig.xml
+++ b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeConfig.xml
@@ -117,7 +117,6 @@
TR_BUTTON_NEXT
- false
26
10
@@ -154,7 +153,6 @@
TR_BUTTON_BACK
- false
26
10
diff --git a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml
index 0a93a7c7..6cb9ebe8 100644
--- a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml
+++ b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml
@@ -306,7 +306,6 @@
TR_BUTTON_NEXT_ROUND
- false
26
10
@@ -343,7 +342,6 @@
TR_BUTTON_BACK
- false
26
10
@@ -380,7 +378,6 @@
TR_BUTTON_EXIT
- false
26
10
@@ -417,7 +414,6 @@
TR_BUTTON_YES
- false
26
10
@@ -454,7 +450,6 @@
TR_BUTTON_NO
- false
26
10
@@ -491,7 +486,6 @@
- false
@@ -522,7 +516,6 @@
- false
@@ -553,7 +546,6 @@
- false
@@ -584,7 +576,6 @@
- false
diff --git a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeNames.xml b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeNames.xml
index af1ac70a..44b425e6 100644
--- a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeNames.xml
+++ b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeNames.xml
@@ -72,7 +72,6 @@
TR_BUTTON_BACK
- false
26
10
@@ -109,7 +108,6 @@
TR_BUTTON_NEXT
- false
26
10
@@ -146,7 +144,6 @@
TR_SCREENNAMES_BUTTON_RANDOM
- false
26
10
@@ -183,7 +180,6 @@
- false
@@ -214,7 +210,6 @@
- false
@@ -245,7 +240,6 @@
- false
@@ -276,7 +270,6 @@
- false
diff --git a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyConfig.xml b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyConfig.xml
index 93fd13f8..496d39c8 100644
--- a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyConfig.xml
+++ b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyConfig.xml
@@ -117,7 +117,6 @@
TR_BUTTON_NEXT
- false
26
10
@@ -154,7 +153,6 @@
TR_BUTTON_BACK
- false
26
10
diff --git a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml
index f0794c38..3748849d 100644
--- a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml
+++ b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml
@@ -306,7 +306,6 @@
TR_BUTTON_NEXT_ROUND
- false
26
10
@@ -343,7 +342,6 @@
TR_BUTTON_BACK
- false
26
10
@@ -380,7 +378,6 @@
TR_BUTTON_EXIT
- false
26
10
@@ -417,7 +414,6 @@
TR_BUTTON_YES
- false
26
10
@@ -454,7 +450,6 @@
TR_BUTTON_NO
- false
26
10
@@ -491,7 +486,6 @@
- false
@@ -522,7 +516,6 @@
- false
@@ -553,7 +546,6 @@
- false
@@ -584,7 +576,6 @@
- false
diff --git a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyNames.xml b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyNames.xml
index bf2e1edc..6933efc6 100644
--- a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyNames.xml
+++ b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyNames.xml
@@ -72,7 +72,6 @@
TR_BUTTON_BACK
- false
26
10
@@ -109,7 +108,6 @@
TR_BUTTON_NEXT
- false
26
10
@@ -146,7 +144,6 @@
TR_SCREENNAMES_BUTTON_RANDOM
- false
26
10
@@ -183,7 +180,6 @@
- false
@@ -214,7 +210,6 @@
- false
@@ -245,7 +240,6 @@
- false
@@ -276,7 +270,6 @@
- false
diff --git a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeConfig.xml b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeConfig.xml
index 57fd1627..002f4beb 100644
--- a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeConfig.xml
+++ b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeConfig.xml
@@ -117,7 +117,6 @@
TR_BUTTON_NEXT
- false
26
10
@@ -154,7 +153,6 @@
TR_BUTTON_BACK
- false
26
10
diff --git a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeMain.xml b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeMain.xml
index b69deadb..ed3d1caa 100644
--- a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeMain.xml
+++ b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeMain.xml
@@ -213,7 +213,6 @@
TR_BUTTON_NEXT_ROUND
- false
26
10
@@ -250,7 +249,6 @@
TR_BUTTON_BACK
- false
26
10
@@ -287,7 +285,6 @@
TR_BUTTON_EXIT
- false
26
10
@@ -324,7 +321,6 @@
TR_BUTTON_YES
- false
26
10
@@ -361,7 +357,6 @@
TR_BUTTON_NO
- false
26
10
@@ -398,7 +393,6 @@
- false
@@ -429,7 +423,6 @@
- false
@@ -460,7 +453,6 @@
- false
@@ -491,7 +483,6 @@
- false
@@ -522,7 +513,6 @@
- false
diff --git a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeNames.xml b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeNames.xml
index 438f1cc9..8f00bb0b 100644
--- a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeNames.xml
+++ b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeNames.xml
@@ -72,7 +72,6 @@
TR_BUTTON_BACK
- false
26
10
@@ -109,7 +108,6 @@
TR_BUTTON_NEXT
- false
26
10
@@ -146,7 +144,6 @@
TR_SCREENNAMES_BUTTON_RANDOM
- false
26
10
@@ -183,7 +180,6 @@
- false
@@ -214,7 +210,6 @@
- false
@@ -245,7 +240,6 @@
- false
@@ -276,7 +270,6 @@
- false
diff --git a/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml b/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml
index 4f181dd4..27d29361 100644
--- a/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml
+++ b/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml
@@ -76,7 +76,6 @@
- false
@@ -107,7 +106,6 @@
- false
@@ -138,7 +136,6 @@
- false
@@ -169,7 +166,6 @@
- false
@@ -200,7 +196,6 @@
- false
@@ -231,7 +226,6 @@
- false
@@ -262,7 +256,6 @@
- false
@@ -293,7 +286,6 @@
- false
diff --git a/Output/Themes/Ambient/Screens/ScreenMain.xml b/Output/Themes/Ambient/Screens/ScreenMain.xml
index 748ec1bd..dd9f5988 100644
--- a/Output/Themes/Ambient/Screens/ScreenMain.xml
+++ b/Output/Themes/Ambient/Screens/ScreenMain.xml
@@ -99,7 +99,6 @@
TR_SCREENMAIN_BUTTON_SING
- false
26
10
@@ -136,7 +135,6 @@
TR_SCREENMAIN_BUTTON_PARTY
- false
26
10
@@ -173,7 +171,6 @@
TR_SCREENMAIN_BUTTON_OPTIONS
- false
26
10
@@ -210,7 +207,6 @@
TR_SCREENMAIN_BUTTON_PROFILES
- false
26
10
@@ -247,7 +243,6 @@
TR_BUTTON_EXIT
- false
26
10
diff --git a/Output/Themes/Ambient/Screens/ScreenNames.xml b/Output/Themes/Ambient/Screens/ScreenNames.xml
index d287a8e8..5d9ef96e 100644
--- a/Output/Themes/Ambient/Screens/ScreenNames.xml
+++ b/Output/Themes/Ambient/Screens/ScreenNames.xml
@@ -360,7 +360,6 @@
TR_BUTTON_BACK
- false
26
10
@@ -397,7 +396,6 @@
TR_BUTTON_START
- false
26
10
diff --git a/Output/Themes/Ambient/Screens/ScreenOptions.xml b/Output/Themes/Ambient/Screens/ScreenOptions.xml
index d9a9352b..d0a8ecd2 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptions.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptions.xml
@@ -72,7 +72,6 @@
TR_SCREENO_BUTTON_GAME
- false
26
10
@@ -109,7 +108,6 @@
TR_SCREENO_BUTTON_SOUND
- false
26
10
@@ -146,7 +144,6 @@
TR_SCREENO_BUTTON_RECORD
- false
26
10
@@ -183,7 +180,6 @@
TR_SCREENO_BUTTON_VIDEO
- false
26
10
@@ -220,7 +216,6 @@
TR_SCREENO_BUTTON_LYRICS
- false
26
10
@@ -257,7 +252,6 @@
TR_SCREENO_BUTTON_THEME
- false
26
10
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml b/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml
index f86fc47f..b8d069fd 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml
@@ -234,7 +234,6 @@
TR_BUTTON_BACK
- false
26
10
@@ -271,7 +270,6 @@
TR_SCREENOGAME_BUTTON_SERVER
- false
26
10
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml b/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml
index 46d80615..6e42e488 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml
@@ -102,7 +102,6 @@
TR_BUTTON_BACK
- false
26
10
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
index 1606a069..0306236e 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
@@ -273,7 +273,6 @@
TR_BUTTON_BACK
- false
26
10
@@ -310,7 +309,6 @@
TR_SCREENORECORD_BUTTON_DELAYTEST
- false
26
10
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml b/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml
index 4c373577..fec1272a 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml
@@ -147,7 +147,6 @@
TR_BUTTON_BACK
- false
26
10
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml b/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml
index f35cea42..f54f095c 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml
@@ -288,7 +288,6 @@
TR_BUTTON_BACK
- false
26
10
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
index bc356434..349cf753 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
@@ -210,7 +210,6 @@
TR_BUTTON_BACK
- false
26
10
@@ -247,7 +246,6 @@
TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS
- false
26
10
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml b/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml
index ec82cf21..6085afd6 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml
@@ -139,7 +139,6 @@
TR_BUTTON_BACK
- false
26
10
diff --git a/Output/Themes/Ambient/Screens/ScreenParty.xml b/Output/Themes/Ambient/Screens/ScreenParty.xml
index 183417f6..c9bcaaaa 100644
--- a/Output/Themes/Ambient/Screens/ScreenParty.xml
+++ b/Output/Themes/Ambient/Screens/ScreenParty.xml
@@ -282,7 +282,6 @@
TR_BUTTON_START
- false
26
10
@@ -319,7 +318,6 @@
TR_BUTTON_BACK
- false
26
10
diff --git a/Output/Themes/Ambient/Screens/ScreenProfiles.xml b/Output/Themes/Ambient/Screens/ScreenProfiles.xml
index ee4fcfba..11ded393 100644
--- a/Output/Themes/Ambient/Screens/ScreenProfiles.xml
+++ b/Output/Themes/Ambient/Screens/ScreenProfiles.xml
@@ -219,7 +219,6 @@
- false
@@ -250,7 +249,6 @@
TR_BUTTON_BACK
- false
26
10
@@ -287,7 +285,6 @@
TR_BUTTON_SAVE
- false
26
10
@@ -324,7 +321,6 @@
TR_SCREENPROFILES_BUTTON_NEW
- false
26
10
@@ -361,7 +357,6 @@
TR_SCREENPROFILES_BUTTON_DELETE
- false
26
10
@@ -398,7 +393,6 @@
TR_SCREENPROFILES_BUTTON_WEBCAM
- false
26
10
@@ -435,7 +429,6 @@
TR_SCREENPROFILES_BUTTON_SAVESNAPSHOT
- false
@@ -466,7 +459,6 @@
TR_SCREENPROFILES_BUTTON_DISCARDSNAPSHOT
- false
@@ -497,7 +489,6 @@
TR_SCREENPROFILES_BUTTON_TAKESNAPSHOT
- false
26
10
diff --git a/Output/Themes/Ambient/Screens/ScreenSing.xml b/Output/Themes/Ambient/Screens/ScreenSing.xml
index 074b2fe2..13dcb761 100644
--- a/Output/Themes/Ambient/Screens/ScreenSing.xml
+++ b/Output/Themes/Ambient/Screens/ScreenSing.xml
@@ -1645,7 +1645,6 @@
TR_SCREENSING_BUTTON_CANCEL
- false
26
10
@@ -1682,7 +1681,6 @@
TR_SCREENSING_BUTTON_CONTINUE
- false
26
10
@@ -1719,7 +1717,6 @@
TR_SCREENSING_BUTTON_SKIP
- false
26
10
diff --git a/Output/Themes/Ambient/Screens/ScreenSong.xml b/Output/Themes/Ambient/Screens/ScreenSong.xml
index 5910114d..da197de6 100644
--- a/Output/Themes/Ambient/Screens/ScreenSong.xml
+++ b/Output/Themes/Ambient/Screens/ScreenSong.xml
@@ -258,7 +258,6 @@
- false
@@ -289,7 +288,6 @@
- false
@@ -320,7 +318,6 @@
- false
@@ -351,7 +348,6 @@
- false
@@ -382,7 +378,6 @@
- false
@@ -413,7 +408,6 @@
- false
@@ -444,7 +438,6 @@
TR_SCREENSONG_BUTTON_CANCEL
- false
@@ -475,7 +468,6 @@
TR_SCREENSONG_BUTTON_PLAYLIST
- false
@@ -506,7 +498,6 @@
TR_SCREENSONG_BUTTON_SING
- false
@@ -537,7 +528,6 @@
TR_SCREENSONG_BUTTON_RANDOM
- false
@@ -568,7 +558,6 @@
TR_SCREENSONG_BUTTON_RANDOMCAT
- false
@@ -599,7 +588,6 @@
TR_SCREENSONG_BUTTON_SINGALL
- false
@@ -630,7 +618,6 @@
TR_SCREENSONG_BUTTON_SINGALLVISIBLE
- false
@@ -661,7 +648,6 @@
TR_SCREENSONG_BUTTON_OPEN_SELECTED_ITEM
- false
@@ -692,7 +678,6 @@
- false
@@ -723,7 +708,6 @@
TR_BUTTON_START
- false
26
10
@@ -760,7 +744,6 @@
TR_SCREENSONG_BUTTON_RANDOMMEDLEY
- false
@@ -791,7 +774,6 @@
TR_SCREENSONG_BUTTON_STARTMEDLEY
- false
@@ -1217,8 +1199,7 @@
- false
-
+
@@ -1248,8 +1229,7 @@
- false
-
+
@@ -1279,8 +1259,7 @@
- false
-
+
@@ -1310,8 +1289,7 @@
- false
-
+
@@ -1341,8 +1319,7 @@
- false
-
+
diff --git a/VocaluxeLib/Menu/CButton.cs b/VocaluxeLib/Menu/CButton.cs
index 3371d85e..d01a42bc 100644
--- a/VocaluxeLib/Menu/CButton.cs
+++ b/VocaluxeLib/Menu/CButton.cs
@@ -34,7 +34,7 @@ namespace VocaluxeLib.Menu
public SThemeColor SelColor;
public SThemeText Text;
public SThemeText SText;
- public bool STextSpecified;
+ [XmlIgnore] public bool STextSpecified;
public SReflection Reflection;
public SReflection SelReflection;
}
@@ -267,7 +267,7 @@ namespace VocaluxeLib.Menu
}
else if (!_Theme.STextSpecified)
{
- texture = Texture ?? CBase.Themes.GetSkinTexture(_Theme.SkinSelected, _PartyModeID);
+ texture = SelTexture ?? CBase.Themes.GetSkinTexture(_Theme.SkinSelected, _PartyModeID);
CBase.Drawing.DrawTexture(texture, Rect, SelColor);