From 30439659b9960cf3aaa2b0ac569043f7eea8d99e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Fri, 19 Sep 2014 11:16:34 +0200 Subject: [PATCH] Some fixes. --- .../Screens/PartyScreenChallengeNames.xml | 9 +- .../PartyScreenChallengeMedleyNames.xml | 9 +- .../Screens/PartyScreenTicTacToeNames.xml | 9 +- .../Ambient/Screens/PopupScreenServerQR.xml | 17 +- .../Ambient/Screens/ScreenHighscore.xml | 2 +- Output/Themes/Ambient/Screens/ScreenNames.xml | 9 +- .../Screens/ScreenOptionsVideoAdjustments.xml | 9 +- Output/Themes/Ambient/Screens/ScreenScore.xml | 200 ++++++++- Output/Themes/Ambient/Screens/ScreenSing.xml | 398 ++++++++++++++++-- Output/Themes/Ambient/Screens/ScreenSong.xml | 26 +- Output/Themes/Ambient/Screens/ScreenTest.xml | 17 +- VocaluxeLib/Structs.cs | 4 +- 12 files changed, 616 insertions(+), 93 deletions(-) diff --git a/Output/PartyModes/Challenge/Screens/PartyScreenChallengeNames.xml b/Output/PartyModes/Challenge/Screens/PartyScreenChallengeNames.xml index c313e501..d5a7e4b1 100644 --- a/Output/PartyModes/Challenge/Screens/PartyScreenChallengeNames.xml +++ b/Output/PartyModes/Challenge/Screens/PartyScreenChallengeNames.xml @@ -476,7 +476,14 @@ 0 CoverTile - + + + 1 + 1 + 1 + 0.2 + + PlayerSelector 100 diff --git a/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyNames.xml b/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyNames.xml index d915c146..1373bf23 100644 --- a/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyNames.xml +++ b/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyNames.xml @@ -476,7 +476,14 @@ 0 CoverTile - + + + 1 + 1 + 1 + 0.2 + + PlayerSelector 100 diff --git a/Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeNames.xml b/Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeNames.xml index 66533730..f3f7d2f1 100644 --- a/Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeNames.xml +++ b/Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeNames.xml @@ -476,7 +476,14 @@ 0 CoverTile - + + + 1 + 1 + 1 + 0.2 + + PlayerSelector 100 diff --git a/Output/Themes/Ambient/Screens/PopupScreenServerQR.xml b/Output/Themes/Ambient/Screens/PopupScreenServerQR.xml index 79364004..441542da 100644 --- a/Output/Themes/Ambient/Screens/PopupScreenServerQR.xml +++ b/Output/Themes/Ambient/Screens/PopupScreenServerQR.xml @@ -8,7 +8,14 @@ SongMenuBG - + + + 1 + 1 + 1 + 0.8 + + 0 0 @@ -125,7 +132,7 @@ Center Outline - + Android @@ -144,7 +151,7 @@ Center Outline - + Symbian @@ -163,7 +170,7 @@ Center Outline - + WebOS @@ -182,7 +189,7 @@ Center Outline - + Windows Phone diff --git a/Output/Themes/Ambient/Screens/ScreenHighscore.xml b/Output/Themes/Ambient/Screens/ScreenHighscore.xml index 41d2d61c..cff7c62a 100644 --- a/Output/Themes/Ambient/Screens/ScreenHighscore.xml +++ b/Output/Themes/Ambient/Screens/ScreenHighscore.xml @@ -100,7 +100,7 @@ Center Outline - TR_GAMEMODE_NORMAL + diff --git a/Output/Themes/Ambient/Screens/ScreenNames.xml b/Output/Themes/Ambient/Screens/ScreenNames.xml index b2820751..d4767290 100644 --- a/Output/Themes/Ambient/Screens/ScreenNames.xml +++ b/Output/Themes/Ambient/Screens/ScreenNames.xml @@ -913,7 +913,14 @@ 0 CoverTile - + + + 1 + 1 + 1 + 0.2 + + PlayerSelector 100 diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml b/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml index 861abcb1..bbef2844 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml @@ -10,7 +10,14 @@ BG_Options - + + + 1 + 1 + 1 + 1 + + diff --git a/Output/Themes/Ambient/Screens/ScreenScore.xml b/Output/Themes/Ambient/Screens/ScreenScore.xml index b329a4cf..5e80539f 100644 --- a/Output/Themes/Ambient/Screens/ScreenScore.xml +++ b/Output/Themes/Ambient/Screens/ScreenScore.xml @@ -32,7 +32,14 @@ TextBG - + + + 0 + 0 + 0 + 0 + + 50 90 @@ -44,7 +51,14 @@ PointsBarBG - + + + 0 + 0 + 1 + 0.75 + + 560 180 @@ -61,7 +75,7 @@ 560 - 400 + 180 160 0 0 @@ -87,7 +101,14 @@ PointsBarBG - + + + 0 + 0 + 1 + 0.75 + + 352 180 @@ -130,7 +151,14 @@ PointsBarBG - + + + 1 + 0 + 0 + 0.75 + + 768 180 @@ -173,7 +201,14 @@ PointsBarBG - + + + 0 + 0 + 1 + 0.75 + + 238 180 @@ -216,7 +251,14 @@ PointsBarBG - + + + 1 + 0 + 0 + 0.75 + + 560 180 @@ -259,7 +301,14 @@ PointsBarBG - + + + 0 + 1 + 0 + 0.75 + + 882 180 @@ -302,7 +351,14 @@ PointsBarBG - + + + 0 + 0 + 1 + 0.75 + + 190 180 @@ -345,7 +401,14 @@ PointsBarBG - + + + 1 + 0 + 0 + 0.75 + + 422 180 @@ -388,7 +451,14 @@ PointsBarBG - + + + 0 + 1 + 0 + 0.75 + + 654 180 @@ -431,7 +501,14 @@ PointsBarBG - + + + 0.5 + 0 + 1 + 0.75 + + 886 180 @@ -474,7 +551,14 @@ PointsBarBG - + + + 0 + 0 + 1 + 0.75 + + 144 180 @@ -517,7 +601,14 @@ PointsBarBG - + + + 1 + 0 + 0 + 0.75 + + 352 180 @@ -560,7 +651,14 @@ PointsBarBG - + + + 0 + 1 + 0 + 0.75 + + 560 180 @@ -603,7 +701,14 @@ PointsBarBG - + + + 0.5 + 0 + 1 + 0.75 + + 768 180 @@ -646,7 +751,14 @@ PointsBarBG - + + + 1 + 0.8 + 0 + 0.75 + + 976 180 @@ -689,7 +801,14 @@ PointsBarBG - + + + 0 + 0 + 1 + 0.75 + + 45 180 @@ -732,7 +851,14 @@ PointsBarBG - + + + 1 + 0 + 0 + 0.75 + + 253 180 @@ -775,7 +901,14 @@ PointsBarBG - + + + 0 + 1 + 0 + 0.75 + + 461 180 @@ -818,7 +951,14 @@ PointsBarBG - + + + 0.5 + 0 + 1 + 0.75 + + 669 180 @@ -861,7 +1001,14 @@ PointsBarBG - + + + 1 + 0.8 + 0 + 0.75 + + 877 180 @@ -904,7 +1051,14 @@ PointsBarBG - + + + 1 + 0 + 0.5 + 0.75 + + 1085 180 diff --git a/Output/Themes/Ambient/Screens/ScreenSing.xml b/Output/Themes/Ambient/Screens/ScreenSing.xml index 26c34e8e..1eb6b73e 100644 --- a/Output/Themes/Ambient/Screens/ScreenSing.xml +++ b/Output/Themes/Ambient/Screens/ScreenSing.xml @@ -10,7 +10,14 @@ Pointer - + + + 0 + 0 + 0 + 1 + + - 49 + 44 702 2 10 @@ -210,7 +224,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 360 @@ -236,7 +257,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 160 @@ -262,7 +290,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 360 @@ -288,7 +323,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 111 @@ -314,7 +356,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 274 @@ -340,7 +389,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 442 @@ -366,7 +422,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 160 @@ -392,7 +455,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 360 @@ -418,7 +488,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 1103 160 @@ -444,7 +521,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 1103 360 @@ -470,7 +554,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 111 @@ -496,7 +587,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 274 @@ -522,7 +620,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 442 @@ -548,7 +653,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 1103 160 @@ -574,7 +686,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 1103 360 @@ -600,7 +719,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 111 @@ -626,7 +752,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 274 @@ -652,7 +785,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 40 442 @@ -678,7 +818,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 1103 111 @@ -704,7 +851,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 1103 274 @@ -730,7 +884,14 @@ Invisible - + + + 1 + 1 + 1 + 0.4 + + 1103 442 @@ -881,7 +1042,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + TextSColor @@ -917,7 +1085,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player1 @@ -953,7 +1128,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player2 @@ -989,7 +1171,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player1 @@ -1025,7 +1214,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player2 @@ -1061,7 +1257,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player3 @@ -1097,7 +1300,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player1 @@ -1133,7 +1343,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player2 @@ -1169,7 +1386,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player3 @@ -1205,7 +1429,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player4 @@ -1241,7 +1472,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player1 @@ -1277,7 +1515,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player2 @@ -1313,7 +1558,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player3 @@ -1349,7 +1601,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player4 @@ -1385,7 +1644,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player5 @@ -1421,7 +1687,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player1 @@ -1457,7 +1730,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player2 @@ -1493,7 +1773,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player3 @@ -1529,7 +1816,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player4 @@ -1565,7 +1859,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player5 @@ -1601,7 +1902,14 @@ -1 28 0 - + + + 1 + 1 + 1 + 0.4 + + Player6 diff --git a/Output/Themes/Ambient/Screens/ScreenSong.xml b/Output/Themes/Ambient/Screens/ScreenSong.xml index 6fc88650..056977e5 100644 --- a/Output/Themes/Ambient/Screens/ScreenSong.xml +++ b/Output/Themes/Ambient/Screens/ScreenSong.xml @@ -52,7 +52,14 @@ SongMenuBG - + + + 1 + 1 + 1 + 1 + + 40 40 @@ -998,7 +1005,14 @@ VideoIcon MedleyCalcIcon MedleyTagIcon - + + + 1 + 1 + 1 + 0.2 + + 6 4 @@ -1033,7 +1047,7 @@ TextSColor Center - Center + Top Outline @@ -1052,7 +1066,7 @@ TextSColor Center - Center + Top Outline @@ -1071,7 +1085,7 @@ TextSColor Center - Center + Top Outline @@ -1716,4 +1730,4 @@ - + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenTest.xml b/Output/Themes/Ambient/Screens/ScreenTest.xml index 5e3c37a6..1f3ecc85 100644 --- a/Output/Themes/Ambient/Screens/ScreenTest.xml +++ b/Output/Themes/Ambient/Screens/ScreenTest.xml @@ -1,17 +1,22 @@  - ScreenSong - 5 + ScreenTest + 1 - Video + None - - BG_Default + diff --git a/VocaluxeLib/Structs.cs b/VocaluxeLib/Structs.cs index e31047e5..aeb49246 100644 --- a/VocaluxeLib/Structs.cs +++ b/VocaluxeLib/Structs.cs @@ -69,8 +69,8 @@ namespace VocaluxeLib public string Name; //Needed for serialization - public bool ColorSpecified { get { return Name == ""; } } - public bool NameSpecified { get { return Name != ""; } } + public bool ColorSpecified { get { return String.IsNullOrEmpty(Name); } } + public bool NameSpecified { get { return !String.IsNullOrEmpty(Name); } } public SThemeColor(SThemeColor theme) {