diff --git a/Output/PartyModes/Challenge/Textures/Skin.xml b/Output/PartyModes/Challenge/Textures/Skin.xml index e347758a..4912e998 100644 --- a/Output/PartyModes/Challenge/Textures/Skin.xml +++ b/Output/PartyModes/Challenge/Textures/Skin.xml @@ -152,4 +152,4 @@ [Blue]BG_Video.mp4 - + \ No newline at end of file diff --git a/Output/PartyModes/ChallengeMedley/Textures/Skin.xml b/Output/PartyModes/ChallengeMedley/Textures/Skin.xml index e347758a..4912e998 100644 --- a/Output/PartyModes/ChallengeMedley/Textures/Skin.xml +++ b/Output/PartyModes/ChallengeMedley/Textures/Skin.xml @@ -152,4 +152,4 @@ [Blue]BG_Video.mp4 - + \ No newline at end of file diff --git a/Output/PartyModes/TicTacToe/Textures/Skin.xml b/Output/PartyModes/TicTacToe/Textures/Skin.xml index 6e1d8b3c..4965d2eb 100644 --- a/Output/PartyModes/TicTacToe/Textures/Skin.xml +++ b/Output/PartyModes/TicTacToe/Textures/Skin.xml @@ -217,8 +217,8 @@ SelectSlideArrowLeft.png SelectSlideArrowRight.png Popup.png - RepeatIcon.png - Random.png + RepeatIcon.png + Random.png ScrollUp.png ScrollDown.png Invisible.png @@ -226,4 +226,4 @@ [Blue]BG_Video.mp4 - + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml b/Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml index 4fd2de9f..df32989f 100644 --- a/Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml +++ b/Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml @@ -48,7 +48,7 @@ - + Invisible @@ -104,16 +104,18 @@ TextSColor 32,00 + + -15,00 + + -8,00 500,00 Outline Bold - -15,0 - -8,0 1 - + - + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenHighscore.xml b/Output/Themes/Ambient/Screens/ScreenHighscore.xml index 77427a6f..356d2b0f 100644 --- a/Output/Themes/Ambient/Screens/ScreenHighscore.xml +++ b/Output/Themes/Ambient/Screens/ScreenHighscore.xml @@ -1483,4 +1483,4 @@ 250 - + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenMain.xml b/Output/Themes/Ambient/Screens/ScreenMain.xml index cff309a2..a54a9d5a 100644 --- a/Output/Themes/Ambient/Screens/ScreenMain.xml +++ b/Output/Themes/Ambient/Screens/ScreenMain.xml @@ -86,7 +86,7 @@ 26 - + Button diff --git a/Output/Themes/Ambient/Screens/ScreenNames.xml b/Output/Themes/Ambient/Screens/ScreenNames.xml index 86d907e3..af45b2f7 100644 --- a/Output/Themes/Ambient/Screens/ScreenNames.xml +++ b/Output/Themes/Ambient/Screens/ScreenNames.xml @@ -686,6 +686,8 @@ TextSColor 32,00 + + 186,00 @@ -751,6 +753,8 @@ TextSColor 20,00 + + 86,00 @@ -816,6 +820,8 @@ TextSColor 20,00 + + 86,00 @@ -881,6 +887,8 @@ TextSColor 20,00 + + 86,00 @@ -946,6 +954,8 @@ TextSColor 20,00 + + 86,00 @@ -1011,6 +1021,8 @@ TextSColor 20,00 + + 86,00 @@ -1076,6 +1088,8 @@ TextSColor 20,00 + + 86,00 diff --git a/Output/Themes/Ambient/Screens/ScreenOptions.xml b/Output/Themes/Ambient/Screens/ScreenOptions.xml index 39a927f9..9b991dc8 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptions.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptions.xml @@ -401,4 +401,4 @@ - + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml b/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml index bdd2f750..a2a8d7d6 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml @@ -441,6 +441,8 @@ TextSColor 32,00 + + 205,33 @@ -506,6 +508,8 @@ TextSColor 32,00 + + 205,33 @@ -571,6 +575,8 @@ TextSColor 32,00 + + 205,33 @@ -636,6 +642,8 @@ TextSColor 32,00 + + 205,33 @@ -701,6 +709,8 @@ TextSColor 32,00 + + 308,00 @@ -766,6 +776,8 @@ TextSColor 32,00 + + 205,33 diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml b/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml index d544a49f..72cd3bdb 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml @@ -229,6 +229,8 @@ TextSColor 32,00 + + 205,33 @@ -294,6 +296,8 @@ TextSColor 32,00 + + 205,33 diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml index 2100c33e..4692b664 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml @@ -589,6 +589,8 @@ TextSColor 32,00 + + 616,00 @@ -654,6 +656,8 @@ TextSColor 32,00 + + 616,00 @@ -719,6 +723,8 @@ TextSColor 32,00 + + 154,00 @@ -784,6 +790,8 @@ TextSColor 32,00 + + 154,00 @@ -849,6 +857,8 @@ TextSColor 32,00 + + 123,20 diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml b/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml index 1433aa5a..0f6bc2f8 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml @@ -316,6 +316,8 @@ TextSColor 32,00 + + 205,33 @@ -381,6 +383,8 @@ TextSColor 32,00 + + 205,33 @@ -446,6 +450,8 @@ TextSColor 32,00 + + 500,00 @@ -511,6 +517,8 @@ TextSColor 32,00 + + 500,00 @@ -576,6 +584,8 @@ TextSColor 32,00 + + 500,00 @@ -586,4 +596,4 @@ 3 - + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml b/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml index 15c6492b..8e031a75 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml @@ -531,6 +531,8 @@ TextSColor 32,00 + + 616,00 @@ -596,6 +598,8 @@ TextSColor 32,00 + + 616,00 @@ -661,6 +665,8 @@ TextSColor 32,00 + + 308,00 @@ -726,6 +732,8 @@ TextSColor 32,00 + + 308,00 @@ -791,6 +799,8 @@ TextSColor 32,00 + + 308,00 @@ -856,6 +866,8 @@ TextSColor 32,00 + + 308,00 @@ -921,6 +933,8 @@ TextSColor 32,00 + + 616,00 @@ -986,6 +1000,8 @@ TextSColor 32,00 + + 616,00 diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml index 683194b0..b9374f8d 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml @@ -77,6 +77,22 @@ + + + CoverBackground + + 75 + 460 + 0,00 + 320 + 240 + + + Visible + + + + 640 @@ -222,7 +238,7 @@ - + 75 345 @@ -245,13 +261,13 @@ Outline - + TR_SCREENO_VIDEO_WEBCAMDEVICES - + 75 405 @@ -274,7 +290,7 @@ Outline - + TR_SCREENO_VIDEO_WEBCAMCAPABILITIES @@ -393,6 +409,8 @@ TextSColor 32,00 + + 205,33 @@ -458,6 +476,8 @@ TextSColor 32,00 + + 205,33 @@ -523,6 +543,8 @@ TextSColor 32,00 + + 205,33 @@ -588,6 +610,8 @@ TextSColor 32,00 + + 205,33 @@ -597,7 +621,7 @@ 3 - + Invisible @@ -653,6 +677,8 @@ TextSColor 32,00 + + 205,33 @@ -662,7 +688,7 @@ 3 - + Invisible @@ -718,6 +744,8 @@ TextSColor 32,00 + + 150,00 @@ -727,21 +755,5 @@ 3 - - - CoverBackground - - 75 - 460 - 0,00 - 320 - 240 - - - Visible - - - - - + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenParty.xml b/Output/Themes/Ambient/Screens/ScreenParty.xml index 6361977d..86df74ac 100644 --- a/Output/Themes/Ambient/Screens/ScreenParty.xml +++ b/Output/Themes/Ambient/Screens/ScreenParty.xml @@ -29,7 +29,7 @@ - + 640 48 @@ -58,7 +58,7 @@ - + 75 105 @@ -87,7 +87,7 @@ - + 75 165 @@ -116,7 +116,7 @@ - + 75 225 @@ -145,7 +145,7 @@ - + 75 285 @@ -174,7 +174,7 @@ - + 75 345 @@ -203,7 +203,7 @@ - + 75 405 @@ -232,7 +232,7 @@ - + 75 465 @@ -261,7 +261,7 @@ - + 850 165 @@ -270,7 +270,7 @@ 32 - 600 + 600 StaticColor @@ -286,12 +286,12 @@ Outline - + - + 850 225 @@ -300,7 +300,7 @@ 32 - 600 + 600 StaticColor @@ -316,12 +316,12 @@ Outline - + - + 850 285 @@ -330,7 +330,7 @@ 32 - 600 + 600 StaticColor @@ -346,12 +346,12 @@ Outline - + - + 850 345 @@ -360,7 +360,7 @@ 32 - 600 + 600 StaticColor @@ -376,12 +376,12 @@ Outline - + - + 850 405 @@ -390,7 +390,7 @@ 32 - 600 + 600 StaticColor @@ -406,12 +406,12 @@ Outline - + - + 850 465 @@ -420,7 +420,7 @@ 32 - 600 + 600 StaticColor @@ -436,12 +436,12 @@ Outline - + - + 850 525 @@ -450,7 +450,7 @@ 32 - 600 + 600 TextWarningColor @@ -471,72 +471,7 @@ - - - Invisible - - SelectSlideArrowLeft - - SelectSlideArrowRight - - SelectSlide - - SelectSlideArrowLeft - - SelectSlideArrowRight - - SelectSlide - - 500 - 100 - 0,00 - 700 - 50 - - 505 - 105 - 0,00 - 40 - 40 - - 1170 - 105 - 0,00 - 40 - 40 - - - SelectSlideColor - - - SelectSlideSColor - - - SelectSlideHColor - - - ArrowColor - - - ArrowSColor - - - TextColor - - - TextSColor - - 32,00 - - 600 - - Outline - - Bold - - 1 - - + Button @@ -593,7 +528,7 @@ 26 - + Button @@ -650,5 +585,72 @@ 26 + + + Invisible + + SelectSlideArrowLeft + + SelectSlideArrowRight + + SelectSlide + + SelectSlideArrowLeft + + SelectSlideArrowRight + + SelectSlide + + 500 + 100 + 0,00 + 700 + 50 + + 505 + 105 + 0,00 + 40 + 40 + + 1170 + 105 + 0,00 + 40 + 40 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 32,00 + + + + 600,00 + + Outline + + Bold + + 1 + - + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenProfiles.xml b/Output/Themes/Ambient/Screens/ScreenProfiles.xml index 9e161ea7..8977f56f 100644 --- a/Output/Themes/Ambient/Screens/ScreenProfiles.xml +++ b/Output/Themes/Ambient/Screens/ScreenProfiles.xml @@ -576,63 +576,6 @@ 26 - - - Button - - Button - - 985 - 600 - 0,00 - 150 - 50 - - - ButtonColor - - - ButtonSColor - - - 75 - 10 - - 32 - - 142 - - - ButtonTextColor - - - ButtonTextSColor - - Center - - Center - - - - Outline - - TR_SCREENPROFILES_BUTTON_TAKESNAPSHOT - - - - - - 10 - 26 - - - - - - 10 - 26 - - Button @@ -788,6 +731,63 @@ + + + Button + + Button + + 985 + 600 + 0,00 + 150 + 50 + + + ButtonColor + + + ButtonSColor + + + 75 + 10 + + 32 + + 142 + + + ButtonTextColor + + + ButtonTextSColor + + Center + + Center + + + + Outline + + TR_SCREENPROFILES_BUTTON_TAKESNAPSHOT + + + + + + 10 + 26 + + + + + + 10 + 26 + + Invisible @@ -844,6 +844,8 @@ TextSColor 32,00 + + 219,20 @@ -909,6 +911,8 @@ TextSColor 32,00 + + 208,67 @@ -974,6 +978,8 @@ TextSColor 32,00 + + 208,67 @@ -1039,6 +1045,8 @@ TextSColor 32,00 + + 313,00 @@ -1104,6 +1112,8 @@ TextSColor 32,00 + + 313,00 @@ -1114,4 +1124,4 @@ 2 - + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenScore.xml b/Output/Themes/Ambient/Screens/ScreenScore.xml index 1fa35bda..34e5e35f 100644 --- a/Output/Themes/Ambient/Screens/ScreenScore.xml +++ b/Output/Themes/Ambient/Screens/ScreenScore.xml @@ -3746,20 +3746,28 @@ - Int - 7 + + Int + + 7 - Int - 4 + + Int + + 4 - Int - 4 + + Int + + 4 - String - Horizontal + + String + + Horizontal - + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenSing.xml b/Output/Themes/Ambient/Screens/ScreenSing.xml index f4708b96..e5c7c0bf 100644 --- a/Output/Themes/Ambient/Screens/ScreenSing.xml +++ b/Output/Themes/Ambient/Screens/ScreenSing.xml @@ -2771,4 +2771,4 @@ - + \ No newline at end of file diff --git a/Output/Themes/Ambient/Screens/ScreenSong.xml b/Output/Themes/Ambient/Screens/ScreenSong.xml index 3aa6c785..5135f622 100644 --- a/Output/Themes/Ambient/Screens/ScreenSong.xml +++ b/Output/Themes/Ambient/Screens/ScreenSong.xml @@ -72,162 +72,6 @@ - - - 220 - 610 - - 0,00 - - 32 - - 340 - - - StaticColor - - - TextSColor - - Center - - Center - - - - Outline - - - - - - - 24 - 26 - - - - - 825 - 610 - - 0,00 - - 32 - - 830 - - - StaticColor - - - TextSColor - - Center - - Center - - - - Outline - - - - - - - 24 - 26 - - - - - 400 - 610 - - 0,00 - - 32 - - - - StaticColor - - - TextSColor - - Right - - Center - - - - Outline - - TR_SCREENSONG_SEARCH - - - - - - - 410 - 610 - - 0,00 - - 32 - - - - StaticColor - - - TextSColor - - Left - - Center - - - - Outline - - - - - - - - - 220 - 45 - - -2,11 - - 40 - - 350 - - - StaticColor - - - TextSColor - - Center - - Center - - - - Outline - - TR_SCREENSONG_SONGOPTIONS - - - - 1070 @@ -408,6 +252,456 @@ + + + 220 + 610 + + 0,00 + + 32 + + 340 + + + StaticColor + + + TextSColor + + Center + + Center + + + + Outline + + + + + + + 24 + 26 + + + + + 825 + 610 + + 0,00 + + 32 + + 830 + + + StaticColor + + + TextSColor + + Center + + Center + + + + Outline + + + + + + + 24 + 26 + + + + + 400 + 610 + + 0,00 + + 32 + + + + StaticColor + + + TextSColor + + Right + + Center + + + + Outline + + TR_SCREENSONG_SEARCH + + + + + + + 410 + 610 + + 0,00 + + 32 + + + + StaticColor + + + TextSColor + + Left + + Center + + + + Outline + + + + + + + + + 220 + 45 + + -2,11 + + 40 + + 350 + + + StaticColor + + + TextSColor + + Center + + Center + + + + Outline + + TR_SCREENSONG_SONGOPTIONS + + + + + + + Random + + Random + + 980 + 50 + -1,01 + 80 + 80 + + + Player1Dim + + + Player1 + + + 40 + 20 + + 40 + + 60 + + + ButtonTextColor + + + ButtonTextSColor + + Center + + Center + + + + Outline + + + + + + + + + + + + + Random + + Random + + 980 + 120 + -1,01 + 80 + 80 + + + Player2Dim + + + Player2 + + + 40 + 20 + + 40 + + 60 + + + ButtonTextColor + + + ButtonTextSColor + + Center + + Center + + + + Outline + + + + + + + + + + + + + Random + + Random + + 980 + 190 + -1,01 + 80 + 80 + + + Player3Dim + + + Player3 + + + 40 + 20 + + 40 + + 60 + + + ButtonTextColor + + + ButtonTextSColor + + Center + + Center + + + + Outline + + + + + + + + + + + + + Random + + Random + + 980 + 260 + -1,01 + 80 + 80 + + + Player4Dim + + + Player4 + + + 40 + 20 + + 40 + + 60 + + + ButtonTextColor + + + ButtonTextSColor + + Center + + Center + + + + Outline + + + + + + + + + + + + + Random + + Random + + 980 + 330 + -1,01 + 80 + 80 + + + Player5Dim + + + Player5 + + + 40 + 20 + + 40 + + 60 + + + ButtonTextColor + + + ButtonTextSColor + + Center + + Center + + + + Outline + + + + + + + + + + + + + Random + + Random + + 980 + 400 + -1,01 + 80 + 80 + + + Player6Dim + + + Player6 + + + 40 + 20 + + 40 + + 60 + + + ButtonTextColor + + + ButtonTextSColor + + Center + + Center + + + + Outline + + + + + + + + + + Button @@ -800,6 +1094,112 @@ + + + Invisible + + Invisible + + 40 + 40 + -1,01 + 360 + 360 + + + Invisible + + + Invisible + + + 180 + 5 + + 30 + + 350 + + + ButtonTextColor + + + ButtonTextSColor + + Center + + Center + + + + Outline + + + + + + + + + + + + + Button + + Button + + 985 + 500 + 0,00 + 150 + 50 + + + ButtonColor + + + ButtonSColor + + + 75 + 10 + + 32 + + 142 + + + ButtonTextColor + + + ButtonTextSColor + + Center + + Center + + + + Outline + + TR_BUTTON_START + + + + + + 10 + 26 + + + + + + 10 + 26 + + Button @@ -897,407 +1297,7 @@ - - - - Invisible - - Invisible - - 40 - 40 - -1,01 - 360 - 360 - - - Invisible - - - Invisible - - - 180 - 5 - - 30 - - 350 - - - ButtonTextColor - - - ButtonTextSColor - - Center - - Center - - - - Outline - - - - - - - - - - - - - Random - - Random - - 980 - 50 - -1,01 - 80 - 80 - - - Player1Dim - - - Player1 - - - 40 - 20 - - 40 - - 60 - - - ButtonTextColor - - - ButtonTextSColor - - Center - - Center - - - - Outline - - - - - - - - - - - - - Random - - Random - - 980 - 120 - -1,01 - 80 - 80 - - - Player2Dim - - - Player2 - - - 40 - 20 - - 40 - - 60 - - - ButtonTextColor - - - ButtonTextSColor - - Center - - Center - - - - Outline - - - - - - - - - - - - - Random - - Random - - 980 - 190 - -1,01 - 80 - 80 - - - Player3Dim - - - Player3 - - - 40 - 20 - - 40 - - 60 - - - ButtonTextColor - - - ButtonTextSColor - - Center - - Center - - - - Outline - - - - - - - - - - - - - Random - - Random - - 980 - 260 - -1,01 - 80 - 80 - - - Player4Dim - - - Player4 - - - 40 - 20 - - 40 - - 60 - - - ButtonTextColor - - - ButtonTextSColor - - Center - - Center - - - - Outline - - - - - - - - - - - - - Random - - Random - - 980 - 330 - -1,01 - 80 - 80 - - - Player5Dim - - - Player5 - - - 40 - 20 - - 40 - - 60 - - - ButtonTextColor - - - ButtonTextSColor - - Center - - Center - - - - Outline - - - - - - - - - - - - - Random - - Random - - 980 - 400 - -1,01 - 80 - 80 - - - Player6Dim - - - Player6 - - - 40 - 20 - - 40 - - 60 - - - ButtonTextColor - - - ButtonTextSColor - - Center - - Center - - - - Outline - - - - - - - - - - - - - Button - - Button - - 985 - 500 - 0,00 - 150 - 50 - - - ButtonColor - - - ButtonSColor - - - 75 - 10 - - 32 - - 142 - - - ButtonTextColor - - - ButtonTextSColor - - Center - - Center - - - - Outline - - TR_BUTTON_START - - - - - - 10 - 26 - - - - - - 10 - 26 - - + Button @@ -1354,6 +1354,8 @@ TextSColor 30,00 + + 280,00 @@ -1419,6 +1421,8 @@ TextSColor 30,00 + + 280,00 @@ -1484,6 +1488,8 @@ TextSColor 30,00 + + 280,00 @@ -1549,6 +1555,8 @@ TextSColor 30,00 + + 280,00 @@ -1947,6 +1955,7 @@ 24,00 25,00 + 230,00 @@ -2203,4 +2212,4 @@ - + \ No newline at end of file diff --git a/Output/Themes/Ambient/Skin Blue.xml b/Output/Themes/Ambient/Skin Blue.xml index 48fd16f5..34cff336 100644 --- a/Output/Themes/Ambient/Skin Blue.xml +++ b/Output/Themes/Ambient/Skin Blue.xml @@ -338,7 +338,7 @@ Random.png Popup.png ScrollUp.png - ScrollDown.png + ScrollDown.png [Blue]BG_Video.mp4 @@ -346,4 +346,4 @@ [Blue]IntroMid.mp4 [Blue]IntroOut.mp4 - + \ No newline at end of file diff --git a/Output/Themes/Ambient/Skin Green.xml b/Output/Themes/Ambient/Skin Green.xml index f36533bf..868a0b0f 100644 --- a/Output/Themes/Ambient/Skin Green.xml +++ b/Output/Themes/Ambient/Skin Green.xml @@ -328,10 +328,10 @@ Save.png Sing.png Minus.png - Plus.png + Plus.png Random.png - Popup.png - ScrollUp.png + Popup.png + ScrollUp.png ScrollDown.png @@ -340,4 +340,4 @@ [Green]IntroMid.mp4 [Green]IntroOut.mp4 - + \ No newline at end of file diff --git a/Output/Themes/Ambient/Skin Red.xml b/Output/Themes/Ambient/Skin Red.xml index cf2302fd..a0929c67 100644 --- a/Output/Themes/Ambient/Skin Red.xml +++ b/Output/Themes/Ambient/Skin Red.xml @@ -328,7 +328,7 @@ Save.png Sing.png Minus.png - Plus.png + Plus.png Random.png Popup.png ScrollUp.png @@ -340,4 +340,4 @@ [Red]IntroMid.mp4 [Red]IntroOut.mp4 - + \ No newline at end of file diff --git a/Output/Themes/Ambient/Skin Yellow.xml b/Output/Themes/Ambient/Skin Yellow.xml index 7e00ad8e..141050a2 100644 --- a/Output/Themes/Ambient/Skin Yellow.xml +++ b/Output/Themes/Ambient/Skin Yellow.xml @@ -328,11 +328,11 @@ Save.png Sing.png Minus.png - Plus.png + Plus.png Random.png Popup.png ScrollUp.png - ScrollDown.png + ScrollDown.png [Yellow]BG_Video.mp4 @@ -340,4 +340,4 @@ [Yellow]IntroMid.mp4 [Yellow]IntroOut.mp4 - + \ No newline at end of file diff --git a/Vocaluxe/Base/CFont.cs b/Vocaluxe/Base/CFont.cs index 28b3d2f7..79120eb4 100644 --- a/Vocaluxe/Base/CFont.cs +++ b/Vocaluxe/Base/CFont.cs @@ -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) diff --git a/Vocaluxe/Base/CGraphics.cs b/Vocaluxe/Base/CGraphics.cs index af0ec07e..b1edd7f5 100644 --- a/Vocaluxe/Base/CGraphics.cs +++ b/Vocaluxe/Base/CGraphics.cs @@ -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"); diff --git a/Vocaluxe/Base/CSongs.cs b/Vocaluxe/Base/CSongs.cs index 4bb2e2ed..09d23ab5 100644 --- a/Vocaluxe/Base/CSongs.cs +++ b/Vocaluxe/Base/CSongs.cs @@ -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) diff --git a/Vocaluxe/Screens/CScreenCredits.cs b/Vocaluxe/Screens/CScreenCredits.cs index ed312d59..fb241f53 100644 --- a/Vocaluxe/Screens/CScreenCredits.cs +++ b/Vocaluxe/Screens/CScreenCredits.cs @@ -174,7 +174,7 @@ namespace Vocaluxe.Screens } - public override void ReloadTheme() { } + public override void ReloadTheme(string XmlPath) { } public override void SaveTheme() { } diff --git a/Vocaluxe/Screens/CScreenParty.cs b/Vocaluxe/Screens/CScreenParty.cs index acb2d899..452dd271 100644 --- a/Vocaluxe/Screens/CScreenParty.cs +++ b/Vocaluxe/Screens/CScreenParty.cs @@ -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) { diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs index 13afb5a5..b1775d87 100644 --- a/Vocaluxe/Screens/CScreenSing.cs +++ b/Vocaluxe/Screens/CScreenSing.cs @@ -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() diff --git a/VocaluxeLib/Menu/CMenu.cs b/VocaluxeLib/Menu/CMenu.cs index 009dc463..adfbb690 100644 --- a/VocaluxeLib/Menu/CMenu.cs +++ b/VocaluxeLib/Menu/CMenu.cs @@ -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 diff --git a/VocaluxeLib/Menu/CText.cs b/VocaluxeLib/Menu/CText.cs index 6b2ac347..42bf4b12 100644 --- a/VocaluxeLib/Menu/CText.cs +++ b/VocaluxeLib/Menu/CText.cs @@ -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; diff --git a/VocaluxeLib/Menu/IMenu.cs b/VocaluxeLib/Menu/IMenu.cs index d87ac265..6155acb1 100644 --- a/VocaluxeLib/Menu/IMenu.cs +++ b/VocaluxeLib/Menu/IMenu.cs @@ -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); diff --git a/VocaluxeLib/PartyModes/CScreenPartyDummy.cs b/VocaluxeLib/PartyModes/CScreenPartyDummy.cs index ceefffa0..445a4c3a 100644 --- a/VocaluxeLib/PartyModes/CScreenPartyDummy.cs +++ b/VocaluxeLib/PartyModes/CScreenPartyDummy.cs @@ -39,7 +39,7 @@ namespace Vocaluxe.PartyModes AddText(Warning); } - public override void ReloadTheme() + public override void ReloadTheme(string XmlPath) { }