diff --git a/Output/Languages/Deutsch.xml b/Output/Languages/Deutsch.xml index 3262bf6f..ecb1c632 100644 --- a/Output/Languages/Deutsch.xml +++ b/Output/Languages/Deutsch.xml @@ -88,6 +88,10 @@ Eigene Musik und Hintergrundmusik Keine eigene Musik Nur eigene Musik + + Alle + Nur Namen und Avatar + Keine Laden @@ -101,11 +105,17 @@ Profile Spielerauswahl - 1 Spieler - 2 Spieler - 3 Spieler - Warnung: Dem Spieler %v ist kein Mikrofon zugeordnet! - Warnung: Den Spielern %v sind keine Mikrofone zugeordnet! + Spieler + 1 Spieler + 2 Spieler + 3 Spieler + 4 Spieler + 5 Spieler + 6 Spieler + Warnung: Dem Spieler %v ist kein Mikrofon zugeordnet! + Warnung: Den Spielern %v sind keine Mikrofone zugeordnet! + Warnung: Dem Spieler %v ist kein Profil zugeordnet! + Warnung: Den Spielern %v sind keine Profile zugeordnet! Songauswahl Suche: @@ -174,6 +184,7 @@ Noten-Linien anzeigen Ton-Helfer anzeigen Aussehen des Timers + Spieler-Infos ein/ausblenden Cover Ladeverhalten Videoeinstellungen diff --git a/Output/Languages/English.xml b/Output/Languages/English.xml index f0df105b..e40c62d2 100644 --- a/Output/Languages/English.xml +++ b/Output/Languages/English.xml @@ -88,6 +88,10 @@ Own Music and Background Music No own Music Only own Music + + All + Only names and avatars + Nothing Loading @@ -101,11 +105,17 @@ Profiles Player Selection - 1 Player - 2 Player - 3 Player - Warning: There is no mic assigned to player %v! - Warning: There are no mics assigned to players %v! + Player + 1 Player + 2 Player + 3 Player + 4 Player + 5 Player + 6 Player + Warning: There is no mic assigned to player %v! + Warning: There are no mics assigned to players %v! + Warning: There is no profile assigned to player %v! + Warning: There are no profiles assigned to players %v! Song Selection Search: @@ -174,6 +184,7 @@ Show Note-Lines Show Tone-Helper Timer-Look + Fade player-info Cover Loading Behavior Video Options diff --git a/Output/Languages/French.xml b/Output/Languages/French.xml index 27c5abe7..f60e82a3 100644 --- a/Output/Languages/French.xml +++ b/Output/Languages/French.xml @@ -101,11 +101,17 @@ Profils Sélection des joueurs - 1 joueur - 2 joueurs - 3 joueurs - Attention: Aucun micro n'est assigné au joueur %v! - Attention: Aucun micro n'est assigné aux joueurs %v! + Joueur + 1 joueur + 2 joueurs + 3 joueurs + 4 joueurs + 5 joueurs + 6 joueurs + Attention: Aucun micro n'est assigné au joueur %v! + Attention: Aucun micro n'est assigné aux joueurs %v! + Attention: Aucun profil n'est assigné au joueur %v! + Attention: Aucun profils n'est assigné aux joueurs %v! Choix de la chanson Rechercher: diff --git a/Output/Languages/Spanish.xml b/Output/Languages/Spanish.xml index cb106774..483e30a3 100644 --- a/Output/Languages/Spanish.xml +++ b/Output/Languages/Spanish.xml @@ -101,11 +101,17 @@ Perfiles Selección de Jugadores - Jugador 1 - Jugador 2 - Jugador 3 - Advertencia: ¡No hay micrófonos asignados al jugador %v! - Advertencia: ¡No hay micrófonos asignados a los jugadores %v! + Jugador + Jugador 1 + Jugador 2 + Jugador 3 + Jugador 4 + Jugador 5 + Jugador 6 + Advertencia: ¡No hay micrófonos asignados al jugador %v! + Advertencia: ¡No hay micrófonos asignados a los jugadores %v! + Advertencia: ¡No hay perfil asignados al jugador %v! + Advertencia: ¡No hay perfiles asignados a los jugadores %v! Selección de Canciones Buscar: diff --git a/Output/Themes/Ambient/PlayerSelector.png b/Output/Themes/Ambient/PlayerSelector.png new file mode 100644 index 00000000..c57ab300 Binary files /dev/null and b/Output/Themes/Ambient/PlayerSelector.png differ diff --git a/Output/Themes/Ambient/Screens/ScreenNames.xml b/Output/Themes/Ambient/Screens/ScreenNames.xml index 20a2026b..a16e4651 100644 --- a/Output/Themes/Ambient/Screens/ScreenNames.xml +++ b/Output/Themes/Ambient/Screens/ScreenNames.xml @@ -1,7 +1,7 @@  - 1 + 2 Video @@ -29,12 +29,204 @@ - + + + PlayerSelector + + 15 + 100 + -2,00 + 118 + 118 + + + Player1 + + + + + + + PlayerSelector + + 15 + 255 + -2,00 + 118 + 118 + + + Player2 + + + + + + + PlayerSelector + + 15 + 410 + -2,00 + 118 + 118 + + + Player3 + + + + + + + PlayerSelector + + 1147 + 100 + -2,00 + 118 + 118 + + + Player4 + + + + + + + PlayerSelector + + 1147 + 255 + -2,00 + 118 + 118 + + + Player5 + + + + + + + PlayerSelector + + 1147 + 410 + -2,00 + 118 + 118 + + + Player6 + + + + + + + Invisible + + 20 + 105 + -3,00 + 108 + 108 + + + Visible + + + + + + + Invisible + + 20 + 260 + -3,00 + 108 + 108 + + + Visible + + + + + + + Invisible + + 20 + 415 + -3,00 + 108 + 108 + + + Visible + + + + + + + Invisible + + 1152 + 105 + -3,00 + 108 + 108 + + + Visible + + + + + + + Invisible + + 1152 + 260 + -3,00 + 108 + 108 + + + Visible + + + + + + + Invisible + + 1152 + 415 + -3,00 + 108 + 108 + + + Visible + + + + + Invisible 145 - 660 + 663 0,00 990 50 @@ -44,7 +236,23 @@ - + + + + Invisible + + 145 + 715 + 0,00 + 990 + 50 + + + StaticWarningColor + + + + 640 @@ -72,10 +280,10 @@ - + 640 - 612 + 615 0,00 @@ -99,7 +307,197 @@ - + + + + 640 + 650 + + 0,00 + + 32 + + 970 + + + TextWarningColor + + + TextWarningColor + + Center + + + + Outline + + + + + + + + + 74 + 219 + + 0,00 + + 20 + + + + Player1 + + + TextSColor + + Center + + + + Outline + + + + + + + + + 74 + 374 + + 0,00 + + 20 + + + + Player2 + + + TextSColor + + Center + + + + Outline + + + + + + + + + 74 + 529 + + 0,00 + + 20 + + + + Player3 + + + TextSColor + + Center + + + + Outline + + + + + + + + + 1206 + 219 + + 0,00 + + 20 + + + + Player4 + + + TextSColor + + Center + + + + Outline + + + + + + + + + 1206 + 374 + + 0,00 + + 20 + + + + Player5 + + + TextSColor + + Center + + + + Outline + + + + + + + + + 1206 + 529 + + 0,00 + + 20 + + + + Player6 + + + TextSColor + + Center + + + + Outline + + + + + + Button @@ -107,7 +505,7 @@ Button 145 - 600 + 603 0,00 150 50 @@ -162,7 +560,7 @@ Button 985 - 600 + 603 0,00 150 50 @@ -210,148 +608,7 @@ 26 - - - Button - - Button - - 145 - 150 - 0,00 - 150 - 50 - - - ButtonColor - - - ButtonSColor - - - 75 - 10 - - 32 - - 142 - - - ButtonTextSColor - - - ButtonTextSColor - - Center - - - - Outline - - TR_SCREENNAMES_BUTTON_1PLAYER - - - - - - - - - - - Button - - Button - - 145 - 315 - 0,00 - 150 - 50 - - - ButtonColor - - - ButtonSColor - - - 75 - 10 - - 32 - - 142 - - - ButtonTextSColor - - - ButtonTextSColor - - Center - - - - Outline - - TR_SCREENNAMES_BUTTON_2PLAYER - - - - - - - - - - - Button - - Button - - 145 - 480 - 0,00 - 150 - 50 - - - ButtonColor - - - ButtonSColor - - - 75 - 10 - - 32 - - 142 - - - ButtonTextSColor - - - ButtonTextSColor - - Center - - - - Outline - - TR_SCREENNAMES_BUTTON_3PLAYER - - - - - - - - - + Invisible @@ -367,32 +624,32 @@ SelectSlidePlayer - 305 - 100 + 70 + 548 0,00 - 905 - 150 + 1140 + 45 - 305 - 155 + 75 + 553 0,00 40 40 - 1180 - 155 + 1170 + 553 0,00 40 40 - Player1Dim + SelectSlideColor - Player1Dim + SelectSlideSColor - Player1 + SelectSlideHColor ArrowColor @@ -404,7 +661,7 @@ TextColor - Player1 + TextSColor 32,00 @@ -415,136 +672,49 @@ Bold 6 - - - - Invisible - - SelectSlideArrowLeft - - SelectSlideArrowRight - - SelectSlidePlayer - - SelectSlideArrowLeft - - SelectSlideArrowRight - - SelectSlidePlayer - - 305 - 265 + + + + 172 + 127 0,00 - 905 - 150 - - 305 - 320 - 0,00 - 40 - 40 - - 1180 - 320 - 0,00 - 40 - 40 - + 945 + 393 + + CoverTile + - Player2Dim - - - Player2Dim - - - Player2 - - - ArrowColor - - - ArrowSColor - - - TextColor - - - Player2 - - 32,00 - - 186,00 - - Outline - - Bold - - 6 - - - - Invisible - - SelectSlideArrowLeft - - SelectSlideArrowRight - - SelectSlidePlayer - - SelectSlideArrowLeft - - SelectSlideArrowRight - - SelectSlidePlayer - - 305 - 430 - 0,00 - 905 - 150 - - 305 - 485 - 0,00 - 40 - 40 - - 1180 - 485 - 0,00 - 40 - 40 - - - Player3Dim - - - Player3Dim - - - Player3 - - - ArrowColor - - - ArrowSColor - - - TextColor - - - Player3 - - 32,00 - - 186,00 - - Outline - - Bold - - 6 - + 1,00 + 1,00 + 1,00 + 0,20 + + PlayerSelector + + + + 100 + 100 + + 8 + 3 + + 20,71 + 30,00 + + + + 2,0 + + Outline + + TextColor + + + + 20 + + + - \ No newline at end of file + diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml index 0e43d77c..06cbccf2 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml @@ -704,7 +704,7 @@ Bold - 4 + 7 @@ -769,7 +769,7 @@ Bold - 4 + 7 diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml b/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml index ac972646..55ed1267 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml @@ -1,7 +1,7 @@  - 2 + 3 Video @@ -141,6 +141,22 @@ + + + Invisible + + 50 + 520 + 0,00 + 460 + 50 + + + StaticColor + + + + 640 @@ -352,11 +368,38 @@ Outline - TR_SCREENOTHEME_COVERLOADING + TR_SCREENOTHEME_FADEINFO + + + 75 + 525 + + 0,00 + + 32 + + + + StaticColor + + + TextSColor + + Left + + + + Outline + + TR_SCREENOTHEME_COVERLOADING + + + + Button @@ -802,7 +845,7 @@ 2 - + Invisible @@ -865,7 +908,72 @@ Bold + 2 + + + + Invisible + + SelectSlideArrowLeft + + SelectSlideArrowRight + + SelectSlide + + SelectSlideArrowLeft + + SelectSlideArrowRight + + SelectSlide + + 500 + 520 + 0,00 + 700 + 50 + + 505 + 525 + 0,00 + 40 + 40 + + 1170 + 525 + 0,00 + 40 + 40 + + + SelectSlideColor + + + SelectSlideSColor + + + SelectSlideHColor + + + ArrowColor + + + ArrowSColor + + + TextColor + + + TextSColor + + 32,00 + + 616,00 + + Outline + + Bold + 1 - \ No newline at end of file + diff --git a/Output/Themes/Ambient/Screens/ScreenScore.xml b/Output/Themes/Ambient/Screens/ScreenScore.xml index 1673c63e..b026c327 100644 --- a/Output/Themes/Ambient/Screens/ScreenScore.xml +++ b/Output/Themes/Ambient/Screens/ScreenScore.xml @@ -1,7 +1,7 @@  - 1 + 2 Video @@ -378,6 +378,831 @@ 40 + + + PointsBarBG + + 190 + 180 + 0,00 + 160 + 220 + + + 0,00 + 0,00 + 1,00 + 0,75 + + + + + + + PointsBar + + 190 + 180 + 0,00 + 160 + 0 + + + Player1 + + + + + + + + + 190 + 410 + 0,00 + 160 + 160 + + + Visible + + + + + 15 + 40 + + + + + PointsBarBG + + 422 + 180 + 0,00 + 160 + 220 + + + 1,00 + 0,00 + 0,00 + 0,75 + + + + + + + PointsBar + + 422 + 180 + 0,00 + 160 + 0 + + + Player2 + + + + + + + + + 422 + 410 + 0,00 + 160 + 160 + + + Visible + + + + + 15 + 40 + + + + + PointsBarBG + + 654 + 180 + 0,00 + 160 + 220 + + + 0,00 + 1,00 + 0,00 + 0,75 + + + + + + + PointsBar + + 654 + 180 + 0,00 + 160 + 0 + + + Player3 + + + + + + + + + 654 + 410 + 0,00 + 160 + 160 + + + Visible + + + + + 15 + 40 + + + + + PointsBarBG + + 886 + 180 + 0,00 + 160 + 220 + + + 0,50 + 0,00 + 1,00 + 0,75 + + + + + + + PointsBar + + 886 + 180 + 0,00 + 160 + 0 + + + Player4 + + + + + + + + + 886 + 410 + 0,00 + 160 + 160 + + + Visible + + + + + 15 + 40 + + + + + PointsBarBG + + 144 + 180 + 0,00 + 160 + 220 + + + 0,00 + 0,00 + 1,00 + 0,75 + + + + + + + PointsBar + + 144 + 180 + 0,00 + 160 + 0 + + + Player1 + + + + + + + + + 144 + 410 + 0,00 + 160 + 160 + + + Visible + + + + + 15 + 40 + + + + + PointsBarBG + + 352 + 180 + 0,00 + 160 + 220 + + + 1,00 + 0,00 + 0,00 + 0,75 + + + + + + + PointsBar + + 352 + 180 + 0,00 + 160 + 0 + + + Player2 + + + + + + + + + 352 + 410 + 0,00 + 160 + 160 + + + Visible + + + + + 15 + 40 + + + + + PointsBarBG + + 560 + 180 + 0,00 + 160 + 220 + + + 0,00 + 1,00 + 0,00 + 0,75 + + + + + + + PointsBar + + 560 + 180 + 0,00 + 160 + 0 + + + Player3 + + + + + + + + + 560 + 410 + 0,00 + 160 + 160 + + + Visible + + + + + 15 + 40 + + + + + PointsBarBG + + 768 + 180 + 0,00 + 160 + 220 + + + 0,50 + 0,00 + 1,00 + 0,75 + + + + + + + PointsBar + + 768 + 180 + 0,00 + 160 + 0 + + + Player4 + + + + + + + + + 768 + 410 + 0,00 + 160 + 160 + + + Visible + + + + + 15 + 40 + + + + + PointsBarBG + + 976 + 180 + 0,00 + 160 + 220 + + + 1,000 + 0,800 + 0,000 + 0,75 + + + + + + + PointsBar + + 976 + 180 + 0,00 + 160 + 0 + + + Player5 + + + + + + + + + 976 + 410 + 0,00 + 160 + 160 + + + Visible + + + + + 15 + 40 + + + + + PointsBarBG + + 45 + 180 + 0,00 + 160 + 220 + + + 0,00 + 0,00 + 1,00 + 0,75 + + + + + + + PointsBar + + 45 + 180 + 0,00 + 160 + 0 + + + Player1 + + + + + + + + + 45 + 410 + 0,00 + 160 + 160 + + + Visible + + + + + 15 + 40 + + + + + PointsBarBG + + 253 + 180 + 0,00 + 160 + 220 + + + 1,00 + 0,00 + 0,00 + 0,75 + + + + + + + PointsBar + + 253 + 180 + 0,00 + 160 + 0 + + + Player2 + + + + + + + + + 253 + 410 + 0,00 + 160 + 160 + + + Visible + + + + + 15 + 40 + + + + + PointsBarBG + + 461 + 180 + 0,00 + 160 + 220 + + + 0,00 + 1,00 + 0,00 + 0,75 + + + + + + + PointsBar + + 461 + 180 + 0,00 + 160 + 0 + + + Player3 + + + + + + + + + 461 + 410 + 0,00 + 160 + 160 + + + Visible + + + + + 15 + 40 + + + + + PointsBarBG + + 669 + 180 + 0,00 + 160 + 220 + + + 0,50 + 0,00 + 1,00 + 0,75 + + + + + + + PointsBar + + 669 + 180 + 0,00 + 160 + 0 + + + Player4 + + + + + + + + + 669 + 410 + 0,00 + 160 + 160 + + + Visible + + + + + 15 + 40 + + + + + PointsBarBG + + 877 + 180 + 0,00 + 160 + 220 + + + 1,000 + 0,800 + 0,000 + 0,75 + + + + + + + PointsBar + + 877 + 180 + 0,00 + 160 + 0 + + + Player5 + + + + + + + + + 877 + 410 + 0,00 + 160 + 160 + + + Visible + + + + + 15 + 40 + + + + + PointsBarBG + + 1085 + 180 + 0,00 + 160 + 220 + + + 1,00 + 0,00 + 0,50 + 0,75 + + + + + + + PointsBar + + 1085 + 180 + 0,00 + 160 + 0 + + + Player6 + + + + + + + + + 1085 + 410 + 0,00 + 160 + 160 + + + Visible + + + + + 15 + 40 + + 60 @@ -1080,5 +1905,1673 @@ + + + 270 + 630 + + 0,00 + + 44 + + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 270 + 140 + + 0,00 + + 32 + + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 270 + 105 + + 0,00 + + 32 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 270 + 670 + + 0,00 + + 28 + + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 502 + 630 + + 0,00 + + 44 + + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 502 + 140 + + 0,00 + + 32 + + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 502 + 105 + + 0,00 + + 32 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 502 + 670 + + 0,00 + + 28 + + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 734 + 630 + + 0,00 + + 44 + + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 734 + 140 + + 0,00 + + 32 + + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 734 + 105 + + 0,00 + + 32 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 734 + 670 + + 0,00 + + 28 + + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 966 + 630 + + 0,00 + + 44 + + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 966 + 140 + + 0,00 + + 32 + + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 966 + 105 + + 0,00 + + 32 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 966 + 670 + + 0,00 + + 28 + + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 224 + 630 + + 0,00 + + 44 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 224 + 140 + + 0,00 + + 32 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 224 + 105 + + 0,00 + + 32 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 224 + 670 + + 0,00 + + 28 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 432 + 630 + + 0,00 + + 44 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 432 + 140 + + 0,00 + + 32 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 432 + 105 + + 0,00 + + 32 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 432 + 670 + + 0,00 + + 28 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 640 + 630 + + 0,00 + + 44 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 640 + 140 + + 0,00 + + 32 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 640 + 105 + + 0,00 + + 32 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 640 + 670 + + 0,00 + + 28 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 848 + 630 + + 0,00 + + 44 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 848 + 140 + + 0,00 + + 32 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 848 + 105 + + 0,00 + + 32 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 848 + 670 + + 0,00 + + 28 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 1056 + 630 + + 0,00 + + 44 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 1056 + 140 + + 0,00 + + 32 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 1056 + 105 + + 0,00 + + 32 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 1056 + 670 + + 0,00 + + 28 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 125 + 630 + + 0,00 + + 44 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 125 + 140 + + 0,00 + + 32 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 125 + 105 + + 0,00 + + 32 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 125 + 670 + + 0,00 + + 28 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 333 + 630 + + 0,00 + + 44 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 333 + 140 + + 0,00 + + 32 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 333 + 105 + + 0,00 + + 32 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 333 + 670 + + 0,00 + + 28 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 541 + 630 + + 0,00 + + 44 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 541 + 140 + + 0,00 + + 32 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 541 + 105 + + 0,00 + + 32 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 541 + 670 + + 0,00 + + 28 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 749 + 630 + + 0,00 + + 44 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 749 + 140 + + 0,00 + + 32 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 749 + 105 + + 0,00 + + 32 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 749 + 670 + + 0,00 + + 28 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 957 + 630 + + 0,00 + + 44 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 957 + 140 + + 0,00 + + 32 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 957 + 105 + + 0,00 + + 32 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 957 + 670 + + 0,00 + + 28 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 1165 + 630 + + 0,00 + + 44 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 1165 + 140 + + 0,00 + + 32 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 1165 + 105 + + 0,00 + + 32 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + + + + 1165 + 670 + + 0,00 + + 28 + + 160 + + + StaticColor + + + TextSColor + + Center + + + + Outline + + + + + + - \ No newline at end of file + diff --git a/Output/Themes/Ambient/Screens/ScreenSing.xml b/Output/Themes/Ambient/Screens/ScreenSing.xml index 5c85960a..5a9c9359 100644 --- a/Output/Themes/Ambient/Screens/ScreenSing.xml +++ b/Output/Themes/Ambient/Screens/ScreenSing.xml @@ -1,7 +1,7 @@  - 3 + 4 None @@ -49,7 +49,7 @@ Lyrics 40 - 15 + 7 -0,75 1200 93 @@ -65,7 +65,7 @@ Lyrics 40 - 15 + 7 -0,75 1200 93 @@ -183,7 +183,7 @@ LyricHelper 40 - 20 + 12 -1,00 45 45 @@ -202,7 +202,7 @@ LyricHelper 40 - 20 + 12 -1,00 45 45 @@ -222,7 +222,7 @@ 0 0 - -1,10 + -2,10 1280 720 @@ -232,9 +232,408 @@ + + + Invisible + + 40 + 360 + -0,75 + 190 + 190 + + + 1,000 + 1,000 + 1,000 + 0,400 + + + + + + + Invisible + + 40 + 160 + -0,75 + 165 + 165 + + + 1,000 + 1,000 + 1,000 + 0,400 + + + + + + + Invisible + + 40 + 360 + -0,75 + 165 + 165 + + + 1,000 + 1,000 + 1,000 + 0,400 + + + + + + + Invisible + + 40 + 111 + -0,75 + 140 + 140 + + + 1,000 + 1,000 + 1,000 + 0,400 + + + + + + + Invisible + + 40 + 274 + -0,75 + 140 + 140 + + + 1,000 + 1,000 + 1,000 + 0,400 + + + + + + + Invisible + + 40 + 442 + -0,75 + 140 + 140 + + + 1,000 + 1,000 + 1,000 + 0,400 + + + + + + + Invisible + + 40 + 160 + -0,75 + 165 + 165 + + + 1,000 + 1,000 + 1,000 + 0,400 + + + + + + + Invisible + + 40 + 360 + -0,75 + 165 + 165 + + + 1,000 + 1,000 + 1,000 + 0,400 + + + + + + + Invisible + + 1103 + 160 + -0,75 + 165 + 165 + + + 1,000 + 1,000 + 1,000 + 0,400 + + + + + + + Invisible + + 1103 + 360 + -0,75 + 165 + 165 + + + 1,000 + 1,000 + 1,000 + 0,400 + + + + + + + Invisible + + 40 + 111 + -0,75 + 140 + 140 + + + 1,000 + 1,000 + 1,000 + 0,400 + + + + + + + Invisible + + 40 + 274 + -0,75 + 140 + 140 + + + 1,000 + 1,000 + 1,000 + 0,400 + + + + + + + Invisible + + 40 + 442 + -0,75 + 140 + 140 + + + 1,000 + 1,000 + 1,000 + 0,400 + + + + + + + Invisible + + 1103 + 160 + -0,75 + 165 + 165 + + + 1,000 + 1,000 + 1,000 + 0,400 + + + + + + + Invisible + + 1103 + 360 + -0,75 + 165 + 165 + + + 1,000 + 1,000 + 1,000 + 0,400 + + + + + + + Invisible + + 40 + 111 + -0,75 + 140 + 140 + + + 1,000 + 1,000 + 1,000 + 0,400 + + + + + + + Invisible + + 40 + 274 + -0,75 + 140 + 140 + + + 1,000 + 1,000 + 1,000 + 0,400 + + + + + + + Invisible + + 40 + 442 + -0,75 + 140 + 140 + + + 1,000 + 1,000 + 1,000 + 0,400 + + + + + + + Invisible + + 1103 + 111 + -0,75 + 140 + 140 + + + 1,000 + 1,000 + 1,000 + 0,400 + + + + + + + Invisible + + 1103 + 274 + -0,75 + 140 + 140 + + + 1,000 + 1,000 + 1,000 + 0,400 + + + + + + + Invisible + + 1103 + 442 + -0,75 + 140 + 140 + + + 1,000 + 1,000 + 1,000 + 0,400 + + + + - Score + Invisible 1150 350 @@ -250,7 +649,7 @@ - Score + Invisible 1150 150 @@ -266,7 +665,7 @@ - Score + Invisible 1150 350 @@ -282,7 +681,7 @@ - Score + Invisible 1150 10 @@ -298,7 +697,7 @@ - Score + Invisible 1150 210 @@ -314,7 +713,7 @@ - Score + Invisible 1150 410 @@ -328,6 +727,246 @@ + + + Invisible + + 528 + 150 + -0,75 + 100 + 50 + + + StaticColor + + + + + + + Invisible + + 528 + 350 + -0,75 + 100 + 50 + + + StaticColor + + + + + + + Invisible + + 1150 + 150 + -0,75 + 100 + 50 + + + StaticColor + + + + + + + Invisible + + 1150 + 350 + -0,75 + 100 + 50 + + + StaticColor + + + + + + + Invisible + + 528 + 10 + -0,75 + 100 + 50 + + + StaticColor + + + + + + + Invisible + + 528 + 210 + -0,75 + 100 + 50 + + + StaticColor + + + + + + + Invisible + + 528 + 410 + -0,75 + 100 + 50 + + + StaticColor + + + + + + + Invisible + + 1150 + 150 + -0,75 + 100 + 50 + + + StaticColor + + + + + + + Invisible + + 1150 + 350 + -0,75 + 100 + 50 + + + StaticColor + + + + + + + Invisible + + 528 + 10 + -0,75 + 100 + 50 + + + StaticColor + + + + + + + Invisible + + 528 + 210 + -0,75 + 100 + 50 + + + StaticColor + + + + + + + Invisible + + 528 + 410 + -0,75 + 100 + 50 + + + StaticColor + + + + + + + Invisible + + 1150 + 10 + -0,75 + 100 + 50 + + + StaticColor + + + + + + + Invisible + + 1150 + 210 + -0,75 + 100 + 50 + + + StaticColor + + + + + + + Invisible + + 1150 + 410 + -0,75 + 100 + 50 + + + StaticColor + + + + 640 @@ -388,7 +1027,7 @@ 640 170 - -1,11 + -2,11 100 @@ -412,21 +1051,21 @@ - 1200 + 1240 355 -1,00 - 40 + 198 - Player1 + Player1Dim2 TextSColor - Center + Right @@ -439,21 +1078,21 @@ - 1200 + 1240 155 -1,00 - 40 + 173 - Player1 + Player1Dim2 Player1 - Center + Right @@ -466,21 +1105,21 @@ - 1200 + 1240 355 -1,00 - 40 + 173 - Player2 + Player2Dim2 Player2 - Center + Right @@ -493,16 +1132,97 @@ - 1200 - 15 + 1240 + 106 -1,00 - 40 + 148 - Player1 + Player1Dim2 + + + Player1 + + Right + + + + Normal + + + + + + + + + 1240 + 269 + + -1,00 + + 148 + + + + Player2Dim2 + + + Player2 + + Right + + + + Normal + + + + + + + + + 1240 + 437 + + -1,00 + + 148 + + + + Player3Dim2 + + + Player3 + + Right + + + + Normal + + + + + + + + + 324 + 155 + + -1,00 + + 173 + + + + Player1Dim2 Player1 @@ -517,19 +1237,19 @@ - - + + - 1200 - 215 + 324 + 355 -1,00 - 40 + 173 - Player2 + Player2Dim2 Player2 @@ -544,19 +1264,19 @@ - - + + - 1200 - 415 + 967 + 155 -1,00 - 40 + 173 - Player3 + Player3Dim2 Player3 @@ -571,7 +1291,961 @@ - + + + + 967 + 355 + + -1,00 + + 173 + + + + Player4Dim2 + + + Player4 + + Center + + + + Normal + + + + + + + + + 324 + 106 + + -1,00 + + 148 + + + + Player1Dim2 + + + Player1 + + Center + + + + Normal + + + + + + + + + 324 + 269 + + -1,00 + + 148 + + + + Player2Dim2 + + + Player2 + + Center + + + + Normal + + + + + + + + + 324 + 437 + + -1,00 + + 148 + + + + Player3Dim2 + + + Player3 + + Center + + + + Normal + + + + + + + + + 967 + 155 + + -1,00 + + 173 + + + + Player4Dim2 + + + Player4 + + Center + + + + Normal + + + + + + + + + 967 + 355 + + -1,00 + + 173 + + + + Player5Dim2 + + + Player5 + + Center + + + + Normal + + + + + + + + + 324 + 106 + + -1,00 + + 148 + + + + Player1Dim2 + + + Player1 + + Center + + + + Normal + + + + + + + + + 324 + 269 + + -1,00 + + 148 + + + + Player2Dim2 + + + Player2 + + Center + + + + Normal + + + + + + + + + 324 + 437 + + -1,00 + + 148 + + + + Player3Dim2 + + + Player3 + + Center + + + + Normal + + + + + + + + + 967 + 106 + + -1,00 + + 148 + + + + Player4Dim2 + + + Player4 + + Center + + + + Normal + + + + + + + + + 967 + 269 + + -1,00 + + 148 + + + + Player5Dim2 + + + Player5 + + Center + + + + Normal + + + + + + + + + 967 + 437 + + -1,00 + + 148 + + + + Player6Dim2 + + + Player6 + + Center + + + + Normal + + + + + + + + + 110 + 513 + + -1,00 + + 28 + + + + 1,000 + 1,000 + 1,000 + 0,400 + + + TextSColor + + Center + + + + Outline + + + + + + + + + 110 + 288 + + -1,00 + + 28 + + + + 1,000 + 1,000 + 1,000 + 0,400 + + + Player1 + + Center + + + + Outline + + + + + + + + + 110 + 488 + + -1,00 + + 28 + + + + 1,000 + 1,000 + 1,000 + 0,400 + + + Player2 + + Center + + + + Outline + + + + + + + + + 110 + 219 + + -1,00 + + 28 + + + + 1,000 + 1,000 + 1,000 + 0,400 + + + Player1 + + Center + + + + Outline + + + + + + + + + 110 + 382 + + -1,00 + + 28 + + + + 1,000 + 1,000 + 1,000 + 0,400 + + + Player2 + + Center + + + + Outline + + + + + + + + + 110 + 550 + + -1,00 + + 28 + + + + 1,000 + 1,000 + 1,000 + 0,400 + + + Player3 + + Center + + + + Outline + + + + + + + + + 110 + 288 + + -1,00 + + 28 + + + + 1,000 + 1,000 + 1,000 + 0,400 + + + Player1 + + Center + + + + Outline + + + + + + + + + 110 + 488 + + -1,00 + + 28 + + + + 1,000 + 1,000 + 1,000 + 0,400 + + + Player2 + + Center + + + + Outline + + + + + + + + + 1173 + 288 + + -1,00 + + 28 + + + + 1,000 + 1,000 + 1,000 + 0,400 + + + Player3 + + Center + + + + Outline + + + + + + + + + 1173 + 488 + + -1,00 + + 28 + + + + 1,000 + 1,000 + 1,000 + 0,400 + + + Player4 + + Center + + + + Outline + + + + + + + + + 110 + 219 + + -1,00 + + 28 + + + + 1,000 + 1,000 + 1,000 + 0,400 + + + Player1 + + Center + + + + Outline + + + + + + + + + 110 + 382 + + -1,00 + + 28 + + + + 1,000 + 1,000 + 1,000 + 0,400 + + + Player2 + + Center + + + + Outline + + + + + + + + + 110 + 550 + + -1,00 + + 28 + + + + 1,000 + 1,000 + 1,000 + 0,400 + + + Player3 + + Center + + + + Outline + + + + + + + + + 1173 + 288 + + -1,00 + + 28 + + + + 1,000 + 1,000 + 1,000 + 0,400 + + + Player4 + + Center + + + + Outline + + + + + + + + + 1173 + 488 + + -1,00 + + 28 + + + + 1,000 + 1,000 + 1,000 + 0,400 + + + Player5 + + Center + + + + Outline + + + + + + + + + 110 + 219 + + -1,00 + + 28 + + + + 1,000 + 1,000 + 1,000 + 0,400 + + + Player1 + + Center + + + + Outline + + + + + + + + + 110 + 382 + + -1,00 + + 28 + + + + 1,000 + 1,000 + 1,000 + 0,400 + + + Player2 + + Center + + + + Outline + + + + + + + + + 110 + 550 + + -1,00 + + 28 + + + + 1,000 + 1,000 + 1,000 + 0,400 + + + Player3 + + Center + + + + Outline + + + + + + + + + 1173 + 219 + + -1,00 + + 28 + + + + 1,000 + 1,000 + 1,000 + 0,400 + + + Player4 + + Center + + + + Outline + + + + + + + + + 1173 + 382 + + -1,00 + + 28 + + + + 1,000 + 1,000 + 1,000 + 0,400 + + + Player5 + + Center + + + + Outline + + + + + + + + + 1173 + 550 + + -1,00 + + 28 + + + + 1,000 + 1,000 + 1,000 + 0,400 + + + Player6 + + Center + + + + Outline + + + + + + Button @@ -580,7 +2254,7 @@ 670 300 - -1,11 + -2,11 150 50 @@ -635,7 +2309,7 @@ 460 300 - -1,11 + -2,11 150 50 @@ -713,7 +2387,7 @@ 637 - 20 + 12 -1,00 1200 50 @@ -727,7 +2401,7 @@ 637 - 62 + 54 -1,00 1200 45 @@ -741,7 +2415,7 @@ 637 - 20 + 12 -1,00 1200 50 @@ -755,7 +2429,7 @@ 637 - 62 + 54 -1,00 1200 45 @@ -791,35 +2465,110 @@ 35 350 - -0,50 + -1,50 1210 200 35 150 - -0,50 + -1,50 1210 175 35 350 - -0,50 + -1,50 1210 175 35 - 10 - -0,50 + 105 + -1,50 1210 150 35 - 210 - -0,50 + 268 + -1,50 1210 150 35 - 410 - -0,50 + 436 + -1,50 1210 150 + 35 + 150 + -1,50 + 578 + 175 + 35 + 350 + -1,50 + 578 + 175 + 678 + 150 + -1,50 + 578 + 175 + 678 + 350 + -1,50 + 578 + 175 + 35 + 105 + -1,50 + 578 + 150 + 35 + 268 + -1,50 + 578 + 150 + 35 + 436 + -1,50 + 578 + 150 + 678 + 150 + -1,50 + 578 + 175 + 678 + 350 + -1,50 + 578 + 175 + 35 + 105 + -1,50 + 578 + 150 + 35 + 268 + -1,50 + 578 + 150 + 35 + 436 + -1,50 + 578 + 150 + 678 + 105 + -1,50 + 578 + 150 + 678 + 268 + -1,50 + 578 + 150 + 678 + 436 + -1,50 + 578 + 150 - \ No newline at end of file + diff --git a/Output/Themes/Ambient/Skin Blue.xml b/Output/Themes/Ambient/Skin Blue.xml index 705cef3d..cdf16630 100644 --- a/Output/Themes/Ambient/Skin Blue.xml +++ b/Output/Themes/Ambient/Skin Blue.xml @@ -33,9 +33,9 @@ 1,000 - 0,000 - 0,500 - 1,000 + 1,000 + 0,800 + 0,000 1,000 @@ -71,9 +71,9 @@ 0,500 - 0,000 - 0,500 - 1,000 + 1,000 + 0,800 + 0,000 0,500 @@ -82,6 +82,42 @@ 0,500 0,500 + + 0,000 + 0,000 + 1,000 + 0,400 + + + 1,000 + 0,000 + 0,000 + 0,400 + + + 0,000 + 1,000 + 0,000 + 0,400 + + + 0,500 + 0,000 + 1,000 + 0,400 + + + 1,000 + 0,800 + 0,000 + 0,400 + + + 1,000 + 0,000 + 0,500 + 0,400 + 0,000 0,000 @@ -214,13 +250,13 @@ 0,300 1,000 - - 0,800 + + 0,800 0,950 1,000 0,500 - - + + 0,800 0,950 1,000 @@ -264,6 +300,7 @@ DuetIcon.png VideoIcon.png Invisible.png + PlayerSelector.png PreviousIcon.png NextIcon.png PlayIcon.png @@ -276,4 +313,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 6a4b7979..1d3893fe 100644 --- a/Output/Themes/Ambient/Skin Green.xml +++ b/Output/Themes/Ambient/Skin Green.xml @@ -33,9 +33,9 @@ 1,000 - 0,000 - 0,500 - 1,000 + 1,000 + 0,800 + 0,000 1,000 @@ -71,9 +71,9 @@ 0,500 - 0,000 - 0,500 - 1,000 + 1,000 + 0,800 + 0,000 0,500 @@ -82,6 +82,42 @@ 0,500 0,500 + + 0,000 + 0,000 + 1,000 + 0,400 + + + 1,000 + 0,000 + 0,000 + 0,400 + + + 0,000 + 1,000 + 0,000 + 0,400 + + + 0,500 + 0,000 + 1,000 + 0,400 + + + 1,000 + 0,800 + 0,000 + 0,400 + + + 1,000 + 0,000 + 0,500 + 0,400 + 0,000 0,000 @@ -214,13 +250,13 @@ 0,300 1,000 - - 0,800 + + 0,800 0,950 1,000 0,500 - - + + 0,800 0,950 1,000 @@ -264,6 +300,7 @@ DuetIcon.png VideoIcon.png Invisible.png + PlayerSelector.png PreviousIcon.png NextIcon.png PlayIcon.png @@ -276,4 +313,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 a44f8a41..828c675f 100644 --- a/Output/Themes/Ambient/Skin Red.xml +++ b/Output/Themes/Ambient/Skin Red.xml @@ -33,9 +33,9 @@ 1,000 - 0,000 - 0,500 - 1,000 + 1,000 + 0,800 + 0,000 1,000 @@ -71,9 +71,9 @@ 0,500 - 0,000 - 0,500 - 1,000 + 1,000 + 0,800 + 0,000 0,500 @@ -82,6 +82,42 @@ 0,500 0,500 + + 0,000 + 0,000 + 1,000 + 0,400 + + + 1,000 + 0,000 + 0,000 + 0,400 + + + 0,000 + 1,000 + 0,000 + 0,400 + + + 0,500 + 0,000 + 1,000 + 0,400 + + + 1,000 + 0,800 + 0,000 + 0,400 + + + 1,000 + 0,000 + 0,500 + 0,400 + 0,000 0,000 @@ -214,13 +250,13 @@ 0,300 1,000 - - 0,800 + + 0,800 0,950 1,000 0,500 - - + + 0,800 0,950 1,000 @@ -264,6 +300,7 @@ DuetIcon.png VideoIcon.png Invisible.png + PlayerSelector.png PreviousIcon.png NextIcon.png PlayIcon.png @@ -276,4 +313,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 b56f2854..7cbee310 100644 --- a/Output/Themes/Ambient/Skin Yellow.xml +++ b/Output/Themes/Ambient/Skin Yellow.xml @@ -33,9 +33,9 @@ 1,000 - 0,000 - 0,500 - 1,000 + 1,000 + 0,800 + 0,000 1,000 @@ -71,9 +71,9 @@ 0,500 - 0,000 - 0,500 - 1,000 + 1,000 + 0,800 + 0,000 0,500 @@ -82,6 +82,42 @@ 0,500 0,500 + + 0,000 + 0,000 + 1,000 + 0,400 + + + 1,000 + 0,000 + 0,000 + 0,400 + + + 0,000 + 1,000 + 0,000 + 0,400 + + + 0,500 + 0,000 + 1,000 + 0,400 + + + 1,000 + 0,800 + 0,000 + 0,400 + + + 1,000 + 0,000 + 0,500 + 0,400 + 0,000 0,000 @@ -214,13 +250,13 @@ 0,300 1,000 - - 0,800 + + 0,800 0,950 1,000 0,500 - - + + 0,800 0,950 1,000 @@ -264,6 +300,7 @@ DuetIcon.png VideoIcon.png Invisible.png + PlayerSelector.png PreviousIcon.png NextIcon.png PlayIcon.png @@ -276,4 +313,4 @@ [Yellow]IntroMid.mp4 [Yellow]IntroOut.mp4 - \ No newline at end of file + diff --git a/Output/Themes/Changelog/Changelog_ScreenNames.txt b/Output/Themes/Changelog/Changelog_ScreenNames.txt new file mode 100644 index 00000000..47d04016 --- /dev/null +++ b/Output/Themes/Changelog/Changelog_ScreenNames.txt @@ -0,0 +1,22 @@ +SceenNames + +++++++++++ +Version 2: + +Add: + +A new Theme-element for name-selecting. + + (One Static for each player): Static wich is used as drop-area + (One Static for each player): Static wich shows the avatar of selected player + (One Text for each player): Text wich shows name of selected player + + + + +Rename: + to + to + +Remove: +, , , , , diff --git a/Output/Themes/Changelog/Changelog_ScreenOptionsTheme.txt b/Output/Themes/Changelog/Changelog_ScreenOptionsTheme.txt index a2423088..a8c28341 100644 --- a/Output/Themes/Changelog/Changelog_ScreenOptionsTheme.txt +++ b/Output/Themes/Changelog/Changelog_ScreenOptionsTheme.txt @@ -1,5 +1,12 @@ ScreenOptionsTheme +++++++++++ +Version 3: + +Add: + +and some texts and statics for description (Text9 and Static9) +"TR_SCREENOTHEME_FADEINFO" ++++++++++ Version 2: diff --git a/Output/Themes/Changelog/Changelog_ScreenScore.txt b/Output/Themes/Changelog/Changelog_ScreenScore.txt new file mode 100644 index 00000000..d050d838 --- /dev/null +++ b/Output/Themes/Changelog/Changelog_ScreenScore.txt @@ -0,0 +1,7 @@ +ScreenScore + +++++++++++ +Version 2: + +Add: Elements for up to 6 players! (Texts and statics!) +++++++++++ \ No newline at end of file diff --git a/Output/Themes/Changelog/Changelog_ScreenSing.txt b/Output/Themes/Changelog/Changelog_ScreenSing.txt index a1ea71f3..22c5fa99 100644 --- a/Output/Themes/Changelog/Changelog_ScreenSing.txt +++ b/Output/Themes/Changelog/Changelog_ScreenSing.txt @@ -1,5 +1,14 @@ ScreenSing +++++++++++ +Version 4: +Added Elements for 6-player-singing! + +Add: + (One for each player for each player-number> + (One for each player for each player-number> + + ++++++++++ Version 3: diff --git a/Vocaluxe/Base/CConfig.cs b/Vocaluxe/Base/CConfig.cs index 0fb18b31..95cd1dcb 100644 --- a/Vocaluxe/Base/CConfig.cs +++ b/Vocaluxe/Base/CConfig.cs @@ -153,6 +153,21 @@ namespace Vocaluxe.Base TR_CONFIG_ONLY_OWN_MUSIC } + public enum EPlayerInfo + { + TR_CONFIG_PLAYERINFO_BOTH, + TR_CONFIG_PLAYERINFO_NAME, + TR_CONFIG_PLAYERINFO_AVATAR, + TR_CONFIG_PLAYERINFO_OFF + } + + public enum EFadePlayerInfo + { + TR_CONFIG_FADEPLAYERINFO_ALL, + TR_CONFIG_FADEPLAYERINFO_INFO, + TR_CONFIG_FADEPLAYERINFO_OFF + } + public enum ELyricStyle { Fill, @@ -194,6 +209,8 @@ namespace Vocaluxe.Base public static EOffOn DrawNoteLines = EOffOn.TR_CONFIG_ON; public static EOffOn DrawToneHelper = EOffOn.TR_CONFIG_ON; public static ETimerLook TimerLook = ETimerLook.TR_CONFIG_TIMERLOOK_EXPANDED; + public static EPlayerInfo PlayerInfo = EPlayerInfo.TR_CONFIG_PLAYERINFO_BOTH; + public static EFadePlayerInfo FadePlayerInfo = EFadePlayerInfo.TR_CONFIG_FADEPLAYERINFO_OFF; public static ECoverLoading CoverLoading = ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART; public static ELyricStyle LyricStyle = ELyricStyle.Slide; @@ -216,6 +233,7 @@ namespace Vocaluxe.Base public static EOffOn Tabs = EOffOn.TR_CONFIG_OFF; public static string Language = "English"; public static EOffOn LyricsOnTop = EOffOn.TR_CONFIG_OFF; + public static string[] Players = new string[CSettings.MaxNumPlayer]; // Video public static EVideoDecoder VideoDecoder = EVideoDecoder.FFmpeg; @@ -311,6 +329,8 @@ namespace Vocaluxe.Base CHelper.TryGetEnumValueFromXML("//root/Theme/DrawNoteLines", navigator, ref DrawNoteLines); CHelper.TryGetEnumValueFromXML("//root/Theme/DrawToneHelper", navigator, ref DrawToneHelper); CHelper.TryGetEnumValueFromXML("//root/Theme/TimerLook", navigator, ref TimerLook); + CHelper.TryGetEnumValueFromXML("//root/Theme/PlayerInfo", navigator, ref PlayerInfo); + CHelper.TryGetEnumValueFromXML("//root/Theme/FadePlayerInfo", navigator, ref FadePlayerInfo); CHelper.TryGetEnumValueFromXML("//root/Theme/CoverLoading", navigator, ref CoverLoading); CHelper.TryGetEnumValueFromXML("//root/Theme/LyricStyle", navigator, ref LyricStyle); #endregion Theme @@ -382,6 +402,12 @@ namespace Vocaluxe.Base } CLanguage.SetLanguage(Language); + //Read players from config + for (i = 1; i <= CSettings.MaxNumPlayer; i++) + { + CHelper.GetValueFromXML("//root/Game/Players/Player" + i.ToString(), navigator, ref Players[i-1], string.Empty); + } + #endregion Game #region Video @@ -509,6 +535,12 @@ namespace Vocaluxe.Base writer.WriteComment("Look of timer:" + ListStrings(Enum.GetNames(typeof(ETimerLook)))); writer.WriteElementString("TimerLook", Enum.GetName(typeof(ETimerLook), TimerLook)); + writer.WriteComment("Information about players on SingScreen:" + ListStrings(Enum.GetNames(typeof(EPlayerInfo)))); + writer.WriteElementString("PlayerInfo", Enum.GetName(typeof(EPlayerInfo), PlayerInfo)); + + writer.WriteComment("Fade player-information with lyrics and notebars:" + ListStrings(Enum.GetNames(typeof(EFadePlayerInfo)))); + writer.WriteElementString("FadePlayerInfo", Enum.GetName(typeof(EFadePlayerInfo), FadePlayerInfo)); + writer.WriteComment("Cover Loading:" + ListStrings(Enum.GetNames(typeof(ECoverLoading)))); writer.WriteElementString("CoverLoading", Enum.GetName(typeof(ECoverLoading), CoverLoading)); @@ -593,6 +625,14 @@ namespace Vocaluxe.Base writer.WriteComment("Lyrics also on Top of screen: " + ListStrings(Enum.GetNames(typeof(EOffOn)))); writer.WriteElementString("LyricsOnTop", Enum.GetName(typeof(EOffOn), LyricsOnTop)); + writer.WriteComment("Default profile for players 1..." + CSettings.MaxNumPlayer.ToString() + ":"); + writer.WriteStartElement("Players"); + for (int i = 1; i <= CSettings.MaxNumPlayer; i++) + { + writer.WriteElementString("Player" + i.ToString(), Path.GetFileName(Players[i - 1])); + } + writer.WriteEndElement(); + writer.WriteEndElement(); #endregion Game @@ -964,6 +1004,33 @@ namespace Vocaluxe.Base return _Result; } + /// + /// Use saved players from config now for games + /// + public static void UsePlayers() + { + for (int i = 0; i < CProfiles.Profiles.Length; i++) + { + for (int j = 0; j < CSettings.MaxNumPlayer; j++) + { + if (Players[j] != string.Empty) + { + if (Path.GetFileName(CProfiles.Profiles[i].ProfileFile) == Players[j] && CProfiles.Profiles[i].Active == EOffOn.TR_CONFIG_ON) + { + //Update Game-infos with player + CGame.Player[j].Name = CProfiles.Profiles[i].PlayerName; + CGame.Player[j].Difficulty = CProfiles.Profiles[i].Difficulty; + CGame.Player[j].ProfileID = i; + } + } + else + { + CGame.Player[j].ProfileID = -1; + } + } + } + } + } diff --git a/Vocaluxe/Base/CGame.cs b/Vocaluxe/Base/CGame.cs index f19523d3..f0cf4245 100644 --- a/Vocaluxe/Base/CGame.cs +++ b/Vocaluxe/Base/CGame.cs @@ -104,6 +104,8 @@ namespace Vocaluxe.Base _GameMode.Init(); _Player = new SPlayer[CSettings.MaxNumPlayer]; ResetPlayer(); + + CConfig.UsePlayers(); } public static void SetGameMode(EGameMode Mode) diff --git a/Vocaluxe/Base/CSettings.cs b/Vocaluxe/Base/CSettings.cs index 3798081e..2f86ca2a 100644 --- a/Vocaluxe/Base/CSettings.cs +++ b/Vocaluxe/Base/CSettings.cs @@ -47,7 +47,7 @@ namespace Vocaluxe.Base public const int iVersionSub = 0; // patches public const ERevision VersionRevision = ERevision.Alpha; - public const int iBuild = 64; // Increase on every published version! Never Reset! + public const int iBuild = 66; // Increase on every published version! Never Reset! public const int iDatabaseHighscoreVersion = 1; public const int iDatabaseCoverVersion = 1; @@ -103,7 +103,7 @@ namespace Vocaluxe.Base public static int MouseMoveDiffMin = 2; public const float MouseMoveOffTime = 3f; - public const int MaxNumPlayer = 3; + public const int MaxNumPlayer = 6; public const int MaxScore = 10000; public const int LinebonusScore = 1000; public const int MinScoreForDB = 100; diff --git a/Vocaluxe/Base/CVideo.cs b/Vocaluxe/Base/CVideo.cs index 496e76b1..718222b4 100644 --- a/Vocaluxe/Base/CVideo.cs +++ b/Vocaluxe/Base/CVideo.cs @@ -1,5 +1,7 @@ using System; using System.Collections.Generic; +using System.Diagnostics; +using System.Drawing; using System.Text; using Vocaluxe.Lib.Draw; @@ -95,4 +97,100 @@ namespace Vocaluxe.Base #endregion VideoDecoder } + + class VideoPlayer + { + private STexture _VideoTexture; + private int _VideoStream; + private Stopwatch _VideoTimer; + private bool _Finished; + private bool _Loaded; + + public bool IsFinished + { + get { return _Finished || !_Loaded; } + } + + public bool Loop + { + set { CVideo.VdSetLoop(_VideoStream, value); } + } + + public VideoPlayer() + { + _VideoTimer = new Stopwatch(); + _VideoTexture = new STexture(-1); + _Finished = false; + _Loaded = false; + } + + public void Load(string VideoName) + { + _VideoStream = CVideo.VdLoad(CTheme.GetVideoFilePath(VideoName)); + _Loaded = true; + } + + public void Start() + { + _VideoTimer.Reset(); + _Finished = false; + //CVideo.VdSkip(_VideoStream, 0f, 0f); + _VideoTimer.Start(); + } + + public void Pause() + { + _VideoTimer.Stop(); + } + + public void Resume() + { + _VideoTimer.Start(); + } + + public void Draw() + { + if (!_Finished) + { + + float VideoTime = _VideoTimer.ElapsedMilliseconds / 1000f; + _Finished = CVideo.VdFinished(_VideoStream); + + STexture tex = new STexture(-1); + tex.height = 0f; + CVideo.VdGetFrame(_VideoStream, ref tex, VideoTime, ref VideoTime); + + if (tex.height > 0) + { + CDraw.RemoveTexture(ref _VideoTexture); + _VideoTexture = tex; + } + } + RectangleF bounds = new RectangleF(0f, 0f, CSettings.iRenderW, CSettings.iRenderH); + RectangleF rect = new RectangleF(0f, 0f, _VideoTexture.width, _VideoTexture.height); + CHelper.SetRect(bounds, ref rect, rect.Width / rect.Height, EAspect.Crop); + + CDraw.DrawTexture(_VideoTexture, new SRectF(rect.X, rect.Y, rect.Width, rect.Height, CSettings.zFar / 4)); + } + + public void PreLoad() + { + float VideoTime = 0f; + while (_VideoTexture.index == -1 && VideoTime < 1f) + { + float dummy = 0f; + CVideo.VdGetFrame(_VideoStream, ref _VideoTexture, 0, ref dummy); + VideoTime += 0.05f; + } + } + + public void Close() + { + CVideo.VdClose(_VideoStream); + CDraw.RemoveTexture(ref _VideoTexture); + _Loaded = false; + _Finished = false; + _VideoTimer.Reset(); + } + } } diff --git a/Vocaluxe/Lib/Song/CSong.cs b/Vocaluxe/Lib/Song/CSong.cs index dce672c1..03d69a0f 100644 --- a/Vocaluxe/Lib/Song/CSong.cs +++ b/Vocaluxe/Lib/Song/CSong.cs @@ -389,9 +389,9 @@ namespace Vocaluxe.Lib.Song TempC = (char)sr.Read(); } while ((TempC.CompareTo(':') != 0) && (TempC.CompareTo('F') != 0) && (TempC.CompareTo('*') != 0) && (TempC.CompareTo('P') != 0)); - FileLineNo++; while (!sr.EndOfStream && (TempC.CompareTo('E') != 0)) { + FileLineNo++; if (TempC.CompareTo('P') == 0) { char chr = (char)sr.Read(); @@ -466,7 +466,7 @@ namespace Vocaluxe.Lib.Song { c = sr.Read(); TempC = (char)c; - } while ((TempC.CompareTo('E') != 0) && !sr.EndOfStream && (c == 19 || c == 16 || c == 13)); + } while ((TempC.CompareTo('E') != 0) && !sr.EndOfStream && (c == 19 || c == 16 || c == 13 || c==10)); } foreach(CLines lines in this.Notes.Lines) { diff --git a/Vocaluxe/Menu/CGraphics.cs b/Vocaluxe/Menu/CGraphics.cs index 3472f122..ac7fa531 100644 --- a/Vocaluxe/Menu/CGraphics.cs +++ b/Vocaluxe/Menu/CGraphics.cs @@ -449,8 +449,7 @@ namespace Vocaluxe.Menu KeyEvent KeyEvent = new KeyEvent(); MouseEvent MouseEvent = new MouseEvent(); - bool PopupPlayerControlAllowed = _CurrentScreen != EScreens.ScreenOptionsRecord && _CurrentScreen != EScreens.ScreenSing && _CurrentScreen != EScreens.ScreenNames - && _CurrentScreen != EScreens.ScreenSong; + bool PopupPlayerControlAllowed = _CurrentScreen != EScreens.ScreenOptionsRecord && _CurrentScreen != EScreens.ScreenSing && _CurrentScreen != EScreens.ScreenSong; bool Resume = true; while (keys.PollEvent(ref KeyEvent)) diff --git a/Vocaluxe/Menu/CInteraction.cs b/Vocaluxe/Menu/CInteraction.cs index 87cae837..5e21fdd9 100644 --- a/Vocaluxe/Menu/CInteraction.cs +++ b/Vocaluxe/Menu/CInteraction.cs @@ -13,7 +13,8 @@ namespace Vocaluxe.Menu TStatic, TSongMenu, TLyric, - TSingNote + TSingNote, + TNameSelection } class CInteraction diff --git a/Vocaluxe/Menu/CMenu.cs b/Vocaluxe/Menu/CMenu.cs index 78c36a28..eb870b8c 100644 --- a/Vocaluxe/Menu/CMenu.cs +++ b/Vocaluxe/Menu/CMenu.cs @@ -35,6 +35,7 @@ namespace Vocaluxe.Menu private List _SongMenus; private List _Lyrics; private List _SingNotes; + private List _NameSelections; private Hashtable _htBackgrounds; private Hashtable _htStatics; @@ -44,6 +45,7 @@ namespace Vocaluxe.Menu private Hashtable _htLyrics; private Hashtable _htSelectSlides; private Hashtable _htSingNotes; + private Hashtable _htNameSelections; private int _PrevMouseX; @@ -64,6 +66,7 @@ namespace Vocaluxe.Menu protected string[] _ThemeLyrics; protected string[] _ThemeSelectSlides; protected string[] _ThemeSingNotes; + protected string[] _ThemeNameSelections; protected SRectF _ScreenArea; @@ -95,6 +98,7 @@ namespace Vocaluxe.Menu _SongMenus = new List(); _Lyrics = new List(); _SingNotes = new List(); + _NameSelections = new List(); _htBackgrounds = new Hashtable(); _htStatics = new Hashtable(); @@ -104,6 +108,7 @@ namespace Vocaluxe.Menu _htLyrics = new Hashtable(); _htSelectSlides = new Hashtable(); _htSingNotes = new Hashtable(); + _htNameSelections = new Hashtable(); _PrevMouseX = 0; _PrevMouseY = 0; @@ -123,6 +128,7 @@ namespace Vocaluxe.Menu _ThemeLyrics = null; _ThemeSelectSlides = null; _ThemeSingNotes = null; + _ThemeNameSelections = null; } #region ThemeHandler @@ -289,6 +295,22 @@ namespace Vocaluxe.Menu } } } + + if (_ThemeNameSelections != null) + { + for (int i = 0; i < _ThemeNameSelections.Length; i++) + { + CNameSelection nsel = new CNameSelection(); + if (nsel.LoadTheme("//root/" + _ThemeName, _ThemeNameSelections[i], navigator, SkinIndex)) + { + _htNameSelections.Add(_ThemeNameSelections[i], AddNameSelection(nsel)); + } + else + { + CLog.LogError("Can't load NameSelection \"" + _ThemeNameSelections[i] + "\" in screen " + _ThemeName); + } + } + } } else { @@ -358,6 +380,12 @@ namespace Vocaluxe.Menu _SingNotes[i].SaveTheme(writer); } + // NameSelections + for (int i = 0; i < _NameSelections.Count; i++) + { + _NameSelections[i].SaveTheme(writer); + } + writer.WriteEndElement(); // End of File @@ -409,6 +437,11 @@ namespace Vocaluxe.Menu { sn.ReloadTextures(); } + + foreach (CNameSelection ns in _NameSelections) + { + ns.ReloadTextures(); + } } public virtual void UnloadTextures() @@ -452,6 +485,13 @@ namespace Vocaluxe.Menu { sn.UnloadTextures(); } + + foreach (CNameSelection ns in _NameSelections) + { + ns.UnloadTextures(); + } + + } public virtual void ReloadTheme() @@ -502,6 +542,11 @@ namespace Vocaluxe.Menu { return _SingNotes; } + + public List GetNameSelections() + { + return _NameSelections; + } #endregion GetLists #region ElementHandler @@ -569,6 +614,14 @@ namespace Vocaluxe.Menu return _SingNotes.ToArray(); } } + + public CNameSelection[] NameSelections + { + get + { + return _NameSelections.ToArray(); + } + } #endregion Get Arrays #region Hashtables @@ -675,6 +728,19 @@ namespace Vocaluxe.Menu throw; } } + + public int htNameSelections(string key) + { + try + { + return (int)_htNameSelections[key]; + } + catch (Exception) + { + CLog.LogError("Can't find NameSelection Element \"" + key + "\" in Screen " + _ThemeName); + throw; + } + } #endregion Hashtables #endregion ElementHandler @@ -930,6 +996,7 @@ namespace Vocaluxe.Menu _Interactions[i].Type == EType.TButton || _Interactions[i].Type == EType.TSelectSlide || _Interactions[i].Type == EType.TStatic || + _Interactions[i].Type == EType.TNameSelection || _Interactions[i].Type == EType.TText)) { ZSort zs = new ZSort(); @@ -1009,6 +1076,13 @@ namespace Vocaluxe.Menu _AddInteraction(_SingNotes.Count - 1, EType.TSingNote); return _SingNotes.Count - 1; } + + public int AddNameSelection(CNameSelection ns) + { + _NameSelections.Add(ns); + _AddInteraction(_NameSelections.Count - 1, EType.TNameSelection); + return _NameSelections.Count - 1; + } #endregion Elements #region InteractionHandling @@ -1153,6 +1227,10 @@ namespace Vocaluxe.Menu if (CHelper.IsInBounds(_Lyrics[interact.Num].Rect, x, y)) return true; break; + case EType.TNameSelection: + if (CHelper.IsInBounds(_NameSelections[interact.Num].Rect, x, y)) + return true; + break; } return false; } @@ -1173,6 +1251,8 @@ namespace Vocaluxe.Menu return _Texts[interact.Num].Z; case EType.TLyric: return _Lyrics[interact.Num].Rect.Z; + case EType.TNameSelection: + return _NameSelections[interact.Num].Rect.Z; } return CSettings.zFar; } @@ -1198,6 +1278,9 @@ namespace Vocaluxe.Menu case EType.TLyric: return _Lyrics[_Interactions[interaction].Num].Rect.Z; + + case EType.TNameSelection: + return _NameSelections[_Interactions[interaction].Num].Rect.Z; } return CSettings.zFar; @@ -1513,6 +1596,9 @@ namespace Vocaluxe.Menu case EType.TLyric: _Lyrics[_Interactions[_Selection].Num].Selected = true; break; + case EType.TNameSelection: + _NameSelections[_Interactions[_Selection].Num].Selected = true; + break; } } @@ -1538,6 +1624,9 @@ namespace Vocaluxe.Menu case EType.TLyric: _Lyrics[_Interactions[_Selection].Num].Selected = false; break; + case EType.TNameSelection: + _NameSelections[_Interactions[_Selection].Num].Selected = false; + break; } } @@ -1566,6 +1655,9 @@ namespace Vocaluxe.Menu case EType.TLyric: //_Lyrics[_Interactions[selection].Num].Selected = true; break; + case EType.TNameSelection: + //_NameSelections[_Interactions[selection].Num].Selected = true; + break; } } @@ -1594,6 +1686,9 @@ namespace Vocaluxe.Menu case EType.TLyric: //_Lyrics[_Interactions[selection].Num].Selected = false; break; + case EType.TNameSelection: + //_NameSelections[_Interactions[selection].Num].Selected = false; + break; } } @@ -1640,6 +1735,9 @@ namespace Vocaluxe.Menu case EType.TLyric: return _Lyrics[_Interactions[interaction].Num].Visible; + + case EType.TNameSelection: + return _NameSelections[_Interactions[interaction].Num].Visible; } return false; @@ -1667,6 +1765,9 @@ namespace Vocaluxe.Menu case EType.TLyric: return _Lyrics[_Interactions[interaction].Num].Rect; + + case EType.TNameSelection: + return _NameSelections[_Interactions[interaction].Num].Rect; } return Result; @@ -1704,6 +1805,10 @@ namespace Vocaluxe.Menu case EType.TSongMenu: _SongMenus[_Interactions[interaction].Num].Draw(); break; + + case EType.TNameSelection: + _NameSelections[_Interactions[interaction].Num].Draw(); + break; //TODO: //case EType.TLyric: @@ -1744,6 +1849,10 @@ namespace Vocaluxe.Menu case EType.TLyric: _Lyrics[_Interactions[_Selection].Num].MoveElement(stepX, stepY); break; + + case EType.TNameSelection: + _NameSelections[_Interactions[_Selection].Num].MoveElement(stepX, stepY); + break; } } } @@ -1777,6 +1886,10 @@ namespace Vocaluxe.Menu case EType.TLyric: _Lyrics[_Interactions[_Selection].Num].ResizeElement(stepW, stepH); break; + + case EType.TNameSelection: + _NameSelections[_Interactions[_Selection].Num].ResizeElement(stepW, stepH); + break; } } } diff --git a/Vocaluxe/Menu/CNameSelection.cs b/Vocaluxe/Menu/CNameSelection.cs new file mode 100644 index 00000000..b11d65c4 --- /dev/null +++ b/Vocaluxe/Menu/CNameSelection.cs @@ -0,0 +1,539 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Text; +using System.Xml; +using System.Xml.XPath; +using System.Windows.Forms; + +using Vocaluxe.Base; +using Vocaluxe.Lib.Draw; + +namespace Vocaluxe.Menu +{ + struct SThemeNameSelection + { + public string Name; + public string TextureEmptyTileName; + public string ColorEmptyTileName; + public string TextureTileSelectedName; + public float NameSpace; + public float NameHeight; + public string NameFont; + public EStyle NameStyle; + public SColorF NameColor; + public string NameColorName; + } + + class CNameSelection : IMenuElement + { + + class CTile + { + public int PlayerNr; + public CStatic Avatar; + public CText Name; + + public CTile() + { + } + + public CTile(CStatic av, CText tex, int pl) + { + Avatar = av; + Name = tex; + PlayerNr = pl; + } + } + + private SThemeNameSelection _Theme; + private bool _ThemeLoaded; + + public bool Selected = false; + public bool Visible = true; + + public SRectF Rect; + private List _Tiles; + + private STexture _TextureEmptyTile; + private STexture _TextureTileSelected; + + public SColorF ColorEmptyTile; + + private int _NumW; + private int _NumH; + + private float _SpaceW; + private float _SpaceH; + + private int _TileW; + private int _TileH; + + public int _Offset = 0; + private int _actualSelection = -1; + public int Selection = -1; + + int _player = -1; + + private List VisibleProfiles; + + private CStatic PlayerSelector; + + + public CNameSelection() + { + _Theme = new SThemeNameSelection(); + + _Tiles = new List(); + VisibleProfiles = new List(); + } + + public void Init() + { + _Tiles.Clear(); + for (int i = 0; i < _NumH; i++) + { + for (int j = 0; j < _NumW; j++) + { + SRectF rect = new SRectF(Rect.X + j * (_TileW + _SpaceW), Rect.Y + i * (_TileH + _SpaceH), _TileW, _TileH, Rect.Z); + CStatic tileStatic = new CStatic(_TextureEmptyTile, ColorEmptyTile, rect); + CText tileText = new CText(rect.X + rect.W / 2, rect.Y + rect.H + _Theme.NameSpace, rect.Z, _Theme.NameHeight, rect.W, EAlignment.Center, _Theme.NameStyle, _Theme.NameFont, _Theme.NameColor, ""); + _Tiles.Add(new CTile(tileStatic, tileText, -1)); + } + } + + PlayerSelector = new CStatic(); + PlayerSelector.Texture = _TextureTileSelected; + PlayerSelector.Rect = new SRectF(0, 0, (_TileW + 6), (_TileH + 6), (Rect.Z - 0.5f)); + PlayerSelector.Visible = false; + + UpdateVisibleProfiles(); + + UpdateList(0); + } + + public bool LoadTheme(string XmlPath, string ElementName, XPathNavigator navigator, int SkinIndex) + { + string item = XmlPath + "/" + ElementName; + _ThemeLoaded = true; + + _ThemeLoaded &= CHelper.TryGetFloatValueFromXML(item + "/X", navigator, ref Rect.X); + _ThemeLoaded &= CHelper.TryGetFloatValueFromXML(item + "/Y", navigator, ref Rect.Y); + _ThemeLoaded &= CHelper.TryGetFloatValueFromXML(item + "/Z", navigator, ref Rect.Z); + _ThemeLoaded &= CHelper.TryGetFloatValueFromXML(item + "/W", navigator, ref Rect.W); + _ThemeLoaded &= CHelper.TryGetFloatValueFromXML(item + "/H", navigator, ref Rect.H); + + _ThemeLoaded &= CHelper.GetValueFromXML(item + "/SkinEmptyTile", navigator, ref _Theme.TextureEmptyTileName, String.Empty); + + if (CHelper.GetValueFromXML(item + "/ColorEmptyTile", navigator, ref _Theme.ColorEmptyTileName, String.Empty)) + { + _ThemeLoaded &= CTheme.GetColor(_Theme.ColorEmptyTileName, SkinIndex, ref ColorEmptyTile); + } + else + { + _ThemeLoaded &= CHelper.TryGetFloatValueFromXML(item + "/R", navigator, ref ColorEmptyTile.R); + _ThemeLoaded &= CHelper.TryGetFloatValueFromXML(item + "/G", navigator, ref ColorEmptyTile.G); + _ThemeLoaded &= CHelper.TryGetFloatValueFromXML(item + "/B", navigator, ref ColorEmptyTile.B); + _ThemeLoaded &= CHelper.TryGetFloatValueFromXML(item + "/A", navigator, ref ColorEmptyTile.A); + } + + _ThemeLoaded &= CHelper.GetValueFromXML(item + "/SkinTileSelected", navigator, ref _Theme.TextureTileSelectedName, String.Empty); + + _ThemeLoaded &= CHelper.TryGetIntValueFromXML(item + "/Tiles/W", navigator, ref _TileW); + _ThemeLoaded &= CHelper.TryGetIntValueFromXML(item + "/Tiles/H", navigator, ref _TileH); + _ThemeLoaded &= CHelper.TryGetIntValueFromXML(item + "/Tiles/NumW", navigator, ref _NumW); + _ThemeLoaded &= CHelper.TryGetIntValueFromXML(item + "/Tiles/NumH", navigator, ref _NumH); + _ThemeLoaded &= CHelper.TryGetFloatValueFromXML(item + "/Tiles/SpaceW", navigator, ref _SpaceW); + _ThemeLoaded &= CHelper.TryGetFloatValueFromXML(item + "/Tiles/SpaceH", navigator, ref _SpaceH); + _ThemeLoaded &= CHelper.TryGetFloatValueFromXML(item + "/Tiles/Name/Space", navigator, ref _Theme.NameSpace); + _ThemeLoaded &= CHelper.TryGetFloatValueFromXML(item + "/Tiles/Name/H", navigator, ref _Theme.NameHeight); + _ThemeLoaded &= CHelper.GetValueFromXML(item + "/Tiles/Name/Font", navigator, ref _Theme.NameFont, "Normal"); + _ThemeLoaded &= CHelper.TryGetEnumValueFromXML(item + "/Tiles/Name/Style", navigator, ref _Theme.NameStyle); + if (CHelper.GetValueFromXML(item + "/Tiles/Name/Color", navigator, ref _Theme.NameColorName, String.Empty)) + { + _ThemeLoaded &= CTheme.GetColor(_Theme.NameColorName, SkinIndex, ref _Theme.NameColor); + } + else + { + if (CHelper.TryGetFloatValueFromXML(item + "/Tiles/Name/R", navigator, ref _Theme.NameColor.R)) + { + _ThemeLoaded &= CHelper.TryGetFloatValueFromXML(item + "/Tiles/Name/G", navigator, ref _Theme.NameColor.G); + _ThemeLoaded &= CHelper.TryGetFloatValueFromXML(item + "/Tiles/Name/B", navigator, ref _Theme.NameColor.B); + _ThemeLoaded &= CHelper.TryGetFloatValueFromXML(item + "/Tiles/Name/A", navigator, ref _Theme.NameColor.A); + } + } + + + if (_ThemeLoaded) + { + _Theme.Name = ElementName; + LoadTextures(); + } + return _ThemeLoaded; + } + + public bool SaveTheme(XmlWriter writer) + { + if (_ThemeLoaded) + { + writer.WriteStartElement(_Theme.Name); + + writer.WriteComment(", , , , : NameSelection position, width and height"); + writer.WriteElementString("X", Rect.X.ToString("#0")); + writer.WriteElementString("Y", Rect.Y.ToString("#0")); + writer.WriteElementString("Z", Rect.Z.ToString("#0.00")); + writer.WriteElementString("W", Rect.W.ToString("#0")); + writer.WriteElementString("H", Rect.H.ToString("#0")); + + writer.WriteComment(": Texture name"); + writer.WriteElementString("SkinEmptyTile", _Theme.TextureEmptyTileName); + + writer.WriteComment(": Static color from ColorScheme (high priority)"); + writer.WriteComment("or , , , (lower priority)"); + if (_Theme.ColorEmptyTileName != String.Empty) + { + writer.WriteElementString("ColorEmptyTile", _Theme.ColorEmptyTileName); + } + else + { + writer.WriteElementString("R", ColorEmptyTile.R.ToString("#0.00")); + writer.WriteElementString("G", ColorEmptyTile.G.ToString("#0.00")); + writer.WriteElementString("B", ColorEmptyTile.B.ToString("#0.00")); + writer.WriteElementString("A", ColorEmptyTile.A.ToString("#0.00")); + } + + writer.WriteComment(": Texture name"); + writer.WriteElementString("SkinTileSelected", _Theme.TextureTileSelectedName); + + writer.WriteComment(": Options for tiles"); + writer.WriteStartElement("Tiles"); + writer.WriteComment(", : Width and height of tile"); + writer.WriteElementString("W", _TileW.ToString()); + writer.WriteElementString("H", _TileH.ToString()); + writer.WriteComment(", : Number of tiles"); + writer.WriteElementString("NumW", _NumW.ToString()); + writer.WriteElementString("NumH", _NumH.ToString()); + writer.WriteComment(", : Space between tiles"); + writer.WriteElementString("SpaceW", _SpaceW.ToString("#0.00")); + writer.WriteElementString("SpaceH", _SpaceH.ToString("#0.00")); + writer.WriteComment(": Options for player-name"); + writer.WriteStartElement("Name"); + writer.WriteComment(": Space between name and tile"); + writer.WriteElementString("Space", _Theme.NameSpace.ToString("#0.0")); + writer.WriteComment(": Text font name"); + writer.WriteElementString("Font", _Theme.NameFont); + writer.WriteComment(": Text color from ColorScheme (high priority)"); + if (_Theme.NameColorName != String.Empty) + { + writer.WriteElementString("Color", _Theme.NameColorName); + } + else + { + writer.WriteElementString("R", _Theme.NameColor.R.ToString("#0.00")); + writer.WriteElementString("G", _Theme.NameColor.G.ToString("#0.00")); + writer.WriteElementString("B", _Theme.NameColor.B.ToString("#0.00")); + writer.WriteElementString("A", _Theme.NameColor.A.ToString("#0.00")); + } + writer.WriteComment("