Option to skip Player Selection Screen (#762)

* Add Player Select Option

* Add Player Select Option

* Add Player Select Option

* Add Player Select Option

* Theme System Version 9

* Theme System Version 9

* Theme System Version 9

* Add Player Select Option

* Add Player Select Option

* Theme System Version 9

* Theme System Version 9

* Theme System Version 9

* Add Player Select Option
This commit is contained in:
Edi316 authored and GitHub committed 2025-03-24 20:26:45 +01:00
1 parent 04d6293a6d
commit 480cdd9864
10 files changed
+153 -35

No files matched your search

+2
View File
@@ -148,6 +148,8 @@
<string name="TR_SCREENSONG_BUTTON_STARTMEDLEY">Sing medley-songs</string> <string name="TR_SCREENSONG_BUTTON_STARTMEDLEY">Sing medley-songs</string>
<string name="TR_SCREENSONG_NEWPLAYLIST">New playlist</string> <string name="TR_SCREENSONG_NEWPLAYLIST">New playlist</string>
<string name="TR_SCREENSONG_SONGOPTIONS">Song Options</string> <string name="TR_SCREENSONG_SONGOPTIONS">Song Options</string>
<string name="TR_SCREENSONG_PLAYERSELECT_ON">Show player selection</string>
<string name="TR_SCREENSONG_PLAYERSELECT_OFF">Skip player selection</string>
<string name="TR_SCREENSONG_SEARCH">Search:</string> <string name="TR_SCREENSONG_SEARCH">Search:</string>
<string name="TR_SCREENSONG_NOLANGUAGE">No language</string> <string name="TR_SCREENSONG_NOLANGUAGE">No language</string>
<string name="TR_SCREENSONG_NOYEAR">No Year</string> <string name="TR_SCREENSONG_NOYEAR">No Year</string>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<ThemeSystemVersion>8</ThemeSystemVersion> <ThemeSystemVersion>9</ThemeSystemVersion>
<Info> <Info>
<Name>Default</Name> <Name>Default</Name>
<Author>brunzel</Author> <Author>brunzel</Author>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<ThemeSystemVersion>8</ThemeSystemVersion> <ThemeSystemVersion>9</ThemeSystemVersion>
<Info> <Info>
<Name>Default</Name> <Name>Default</Name>
<Author>brunzel</Author> <Author>brunzel</Author>
@@ -1,13 +1,17 @@
ScreenSong ScreenSong
++++++++++
Version 12:
Add:
<SelectSlideOptionsPlayerSelect>
++++++++++ ++++++++++
Version 11: Version 11:
Add: Add:
<SelectSlideOptionsAudioMode> <SelectSlideOptionsAudioMode>
++++++++++
++++++++++ ++++++++++
Version 10: Version 10:
@@ -1,5 +1,12 @@
Theme System Theme System
++++++++++
Version 9
Changed:
SelectSlide for Option to Skip Player Selection Screen (SelectSlideOptionsPlayerSelect) on song select screen
++++++++++ ++++++++++
Version 8 Version 8
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<root> <root>
<ThemeSystemVersion>8</ThemeSystemVersion> <ThemeSystemVersion>9</ThemeSystemVersion>
<Info> <Info>
<Name>Vocaluxe 2024</Name> <Name>Vocaluxe 2024</Name>
<Author>Vocaluxe</Author> <Author>Vocaluxe</Author>
@@ -2,7 +2,7 @@
<Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Informations> <Informations>
<ScreenName>ScreenSong</ScreenName> <ScreenName>ScreenSong</ScreenName>
<ScreenVersion>11</ScreenVersion> <ScreenVersion>12</ScreenVersion>
</Informations> </Informations>
<Backgrounds> <Backgrounds>
<Background Name="Background1"> <Background Name="Background1">
@@ -253,7 +253,7 @@
<X>330</X> <X>330</X>
<Y>60</Y> <Y>60</Y>
<Z>-2.11</Z> <Z>-2.11</Z>
<H>51</H> <H>45</H>
<MaxW>525</MaxW> <MaxW>525</MaxW>
<Color Name="TextColor" /> <Color Name="TextColor" />
<SelColor Name="TextSelColor" /> <SelColor Name="TextSelColor" />
@@ -486,9 +486,9 @@
<SkinSelected>SongSelectButton</SkinSelected> <SkinSelected>SongSelectButton</SkinSelected>
<Rect> <Rect>
<X>60</X> <X>60</X>
<Y>540</Y> <Y>546</Y>
<W>540</W> <W>540</W>
<H>60</H> <H>53</H>
<Z>-2.11</Z> <Z>-2.11</Z>
</Rect> </Rect>
<Color Name="ButtonColor" /> <Color Name="ButtonColor" />
@@ -513,9 +513,9 @@
<SkinSelected>SongSelectButton</SkinSelected> <SkinSelected>SongSelectButton</SkinSelected>
<Rect> <Rect>
<X>60</X> <X>60</X>
<Y>395</Y> <Y>415</Y>
<W>540</W> <W>540</W>
<H>60</H> <H>53</H>
<Z>-2.11</Z> <Z>-2.11</Z>
</Rect> </Rect>
<Color Name="ButtonColor" /> <Color Name="ButtonColor" />
@@ -540,9 +540,9 @@
<SkinSelected>SongSelectButton</SkinSelected> <SkinSelected>SongSelectButton</SkinSelected>
<Rect> <Rect>
<X>60</X> <X>60</X>
<Y>110</Y> <Y>104</Y>
<W>540</W> <W>540</W>
<H>60</H> <H>57</H>
<Z>-2.11</Z> <Z>-2.11</Z>
</Rect> </Rect>
<Color Name="ButtonColor" /> <Color Name="ButtonColor" />
@@ -818,9 +818,9 @@
<SkinSelected>SongSelectButton</SkinSelected> <SkinSelected>SongSelectButton</SkinSelected>
<Rect> <Rect>
<X>60</X> <X>60</X>
<Y>472.5</Y> <Y>486.5</Y>
<W>540</W> <W>540</W>
<H>60</H> <H>53</H>
<Z>-2.11</Z> <Z>-2.11</Z>
</Rect> </Rect>
<Color Name="ButtonColor" /> <Color Name="ButtonColor" />
@@ -1176,21 +1176,21 @@
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected> <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<Rect> <Rect>
<X>60</X> <X>60</X>
<Y>177.5</Y> <Y>167.5</Y>
<W>540</W> <W>540</W>
<H>60</H> <H>53</H>
<Z>-2.11</Z> <Z>-2.11</Z>
</Rect> </Rect>
<RectArrowLeft> <RectArrowLeft>
<X>67.5</X> <X>67.5</X>
<Y>185</Y> <Y>172.5</Y>
<W>45</W> <W>45</W>
<H>45</H> <H>45</H>
<Z>-2.12</Z> <Z>-2.12</Z>
</RectArrowLeft> </RectArrowLeft>
<RectArrowRight> <RectArrowRight>
<X>547.5</X> <X>547.5</X>
<Y>185</Y> <Y>172.5</Y>
<W>45</W> <W>45</W>
<H>45</H> <H>45</H>
<Z>-2.12</Z> <Z>-2.12</Z>
@@ -1209,6 +1209,48 @@
<TextStyle>Bold</TextStyle> <TextStyle>Bold</TextStyle>
<NumVisible>1</NumVisible> <NumVisible>1</NumVisible>
</SelectSlide> </SelectSlide>
<SelectSlide Name="SelectSlideOptionsPlayerSelect">
<Skin>SongSelectButton</Skin>
<SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
<SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
<SkinSelected>SongSelectButton</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<Rect>
<X>60</X>
<Y>286</Y>
<W>540</W>
<H>53</H>
<Z>-2.11</Z>
</Rect>
<RectArrowLeft>
<X>67.5</X>
<Y>291</Y>
<W>45</W>
<H>45</H>
<Z>-2.12</Z>
</RectArrowLeft>
<RectArrowRight>
<X>547.5</X>
<Y>291</Y>
<W>45</W>
<H>45</H>
<Z>-2.12</Z>
</RectArrowRight>
<Color Name="ButtonColor" />
<SelColor Name="ButtonSelColor" />
<ArrowColor Name="ArrowColor" />
<ArrowSelColor Name="ArrowSelColor" />
<TextColor Name="TextColorAlpha" />
<TextSelColor Name="TextColorAlpha" />
<TextH>37.5</TextH>
<TextRelativeX>175</TextRelativeX>
<TextRelativeY>0</TextRelativeY>
<TextMaxW>420</TextMaxW>
<TextFont>Outline</TextFont>
<TextStyle>Bold</TextStyle>
<NumVisible>1</NumVisible>
</SelectSlide>
<SelectSlide Name="SelectSlideOptionsAudioMode"> <SelectSlide Name="SelectSlideOptionsAudioMode">
<Skin>SongSelectButton</Skin> <Skin>SongSelectButton</Skin>
<SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft> <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
@@ -1218,21 +1260,21 @@
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected> <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<Rect> <Rect>
<X>60</X> <X>60</X>
<Y>245</Y> <Y>227</Y>
<W>540</W> <W>540</W>
<H>60</H> <H>53</H>
<Z>-2.11</Z> <Z>-2.11</Z>
</Rect> </Rect>
<RectArrowLeft> <RectArrowLeft>
<X>67.5</X> <X>67.5</X>
<Y>252.5</Y> <Y>232</Y>
<W>45</W> <W>45</W>
<H>45</H> <H>45</H>
<Z>-2.12</Z> <Z>-2.12</Z>
</RectArrowLeft> </RectArrowLeft>
<RectArrowRight> <RectArrowRight>
<X>547.5</X> <X>547.5</X>
<Y>252.5</Y> <Y>232</Y>
<W>45</W> <W>45</W>
<H>45</H> <H>45</H>
<Z>-2.12</Z> <Z>-2.12</Z>
@@ -1260,21 +1302,21 @@
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected> <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<Rect> <Rect>
<X>60</X> <X>60</X>
<Y>327.5</Y> <Y>355.5</Y>
<W>540</W> <W>540</W>
<H>60</H> <H>53</H>
<Z>-2.11</Z> <Z>-2.11</Z>
</Rect> </Rect>
<RectArrowLeft> <RectArrowLeft>
<X>67.5</X> <X>67.5</X>
<Y>335</Y> <Y>360.5</Y>
<W>45</W> <W>45</W>
<H>45</H> <H>45</H>
<Z>-2.12</Z> <Z>-2.12</Z>
</RectArrowLeft> </RectArrowLeft>
<RectArrowRight> <RectArrowRight>
<X>547.5</X> <X>547.5</X>
<Y>335</Y> <Y>360.5</Y>
<W>45</W> <W>45</W>
<H>45</H> <H>45</H>
<Z>-2.12</Z> <Z>-2.12</Z>
+1 -1
View File
@@ -29,7 +29,7 @@ namespace Vocaluxe.Base.ThemeSystem
abstract class CTheme abstract class CTheme
{ {
// Version number for theme files. Increment it, if you've changed something on the theme files! // Version number for theme files. Increment it, if you've changed something on the theme files!
private const int _ThemeSystemVersion = 8; private const int _ThemeSystemVersion = 9;
protected STheme _Data; protected STheme _Data;
public String Name public String Name
+64 -7
View File
@@ -71,6 +71,7 @@ namespace Vocaluxe.Screens
private const string _ButtonOptionsHighscore = "ButtonOptionsHighscore"; private const string _ButtonOptionsHighscore = "ButtonOptionsHighscore";
private const string _SelectSlideOptionsMode = "SelectSlideOptionsMode"; private const string _SelectSlideOptionsMode = "SelectSlideOptionsMode";
private const string _SelectSlideOptionsPlayerSelect = "SelectSlideOptionsPlayerSelect";
private const string _SelectSlideOptionsAudioMode = "SelectSlideOptionsAudioMode"; private const string _SelectSlideOptionsAudioMode = "SelectSlideOptionsAudioMode";
private const string _SelectSlideOptionsPlaylistAdd = "SelectSlideOptionsPlaylistAdd"; private const string _SelectSlideOptionsPlaylistAdd = "SelectSlideOptionsPlaylistAdd";
private const string _SelectSlideOptionsPlaylistOpen = "SelectSlideOptionsPlaylistOpen"; private const string _SelectSlideOptionsPlaylistOpen = "SelectSlideOptionsPlaylistOpen";
@@ -113,6 +114,13 @@ namespace Vocaluxe.Screens
return _AudioMode; return _AudioMode;
} }
private static EPlayerSelect _PlayerSelect = EPlayerSelect.TR_SCREENSONG_PLAYERSELECT_ON;
public static EPlayerSelect GetPlayerSelect()
{
return _PlayerSelect;
}
private static int _StaticSelectedSongID; private static int _StaticSelectedSongID;
private static void setStaticSelectedSongID(int songID) private static void setStaticSelectedSongID(int songID)
@@ -176,7 +184,7 @@ namespace Vocaluxe.Screens
_ThemeStatics = new string[] {_StaticSearchBar, _StaticOptionsBG, _StaticShortInfoTop}; _ThemeStatics = new string[] {_StaticSearchBar, _StaticOptionsBG, _StaticShortInfoTop};
_ThemeTexts = tlist.ToArray(); _ThemeTexts = tlist.ToArray();
_ThemeButtons = blist.ToArray(); _ThemeButtons = blist.ToArray();
_ThemeSelectSlides = new string[] {_SelectSlideOptionsMode, _SelectSlideOptionsAudioMode, _SelectSlideOptionsPlaylistAdd, _SelectSlideOptionsPlaylistOpen, _SelectSlideOptionsNumMedleySongs}; _ThemeSelectSlides = new string[] {_SelectSlideOptionsMode, _SelectSlideOptionsPlayerSelect, _SelectSlideOptionsAudioMode, _SelectSlideOptionsPlaylistAdd, _SelectSlideOptionsPlaylistOpen, _SelectSlideOptionsNumMedleySongs};
_ThemeSongMenus = new string[] {_SongMenuName}; _ThemeSongMenus = new string[] {_SongMenuName};
_ThemePlaylists = new string[] {_PlaylistName}; _ThemePlaylists = new string[] {_PlaylistName};
@@ -1023,12 +1031,20 @@ namespace Vocaluxe.Screens
gm = CSongs.VisibleSongs[songNr].IsDuet ? EGameMode.TR_GAMEMODE_DUET : EGameMode.TR_GAMEMODE_NORMAL; gm = CSongs.VisibleSongs[songNr].IsDuet ? EGameMode.TR_GAMEMODE_DUET : EGameMode.TR_GAMEMODE_NORMAL;
_AudioMode = (EAudioMode)_SelectSlides[_SelectSlideOptionsAudioMode].Selection; _AudioMode = (EAudioMode)_SelectSlides[_SelectSlideOptionsAudioMode].Selection;
_PlayerSelect = (EPlayerSelect)_SelectSlides[_SelectSlideOptionsPlayerSelect].Selection;
CGame.Reset(); CGame.Reset();
CGame.ClearSongs(); CGame.ClearSongs();
if (CGame.AddVisibleSong(songNr, gm)) if (CGame.AddVisibleSong(songNr, gm))
CGraphics.FadeTo(EScreen.Names); if (_PlayerSelect == EPlayerSelect.TR_SCREENSONG_PLAYERSELECT_OFF)
{
CGraphics.FadeTo(EScreen.Sing);
}
else
{
CGraphics.FadeTo(EScreen.Names);
}
} }
} }
@@ -1042,7 +1058,14 @@ namespace Vocaluxe.Screens
CGame.ClearSongs(); CGame.ClearSongs();
if (CGame.AddVisibleSong(songNr, gm)) if (CGame.AddVisibleSong(songNr, gm))
CGraphics.FadeTo(EScreen.Names); if (_PlayerSelect == EPlayerSelect.TR_SCREENSONG_PLAYERSELECT_OFF)
{
CGraphics.FadeTo(EScreen.Sing);
}
else
{
CGraphics.FadeTo(EScreen.Names);
}
} }
} }
@@ -1059,7 +1082,14 @@ namespace Vocaluxe.Screens
CGame.Reset(); CGame.Reset();
CGame.ClearSongs(); CGame.ClearSongs();
if (CGame.AddVisibleSong(songNr, EGameMode.TR_GAMEMODE_MEDLEY)) if (CGame.AddVisibleSong(songNr, EGameMode.TR_GAMEMODE_MEDLEY))
CGraphics.FadeTo(EScreen.Names); if (_PlayerSelect == EPlayerSelect.TR_SCREENSONG_PLAYERSELECT_OFF)
{
CGraphics.FadeTo(EScreen.Sing);
}
else
{
CGraphics.FadeTo(EScreen.Names);
}
} }
} }
@@ -1086,7 +1116,14 @@ namespace Vocaluxe.Screens
} }
if (CGame.GetNumSongs() > 0) if (CGame.GetNumSongs() > 0)
CGraphics.FadeTo(EScreen.Names); if (_PlayerSelect == EPlayerSelect.TR_SCREENSONG_PLAYERSELECT_OFF)
{
CGraphics.FadeTo(EScreen.Sing);
}
else
{
CGraphics.FadeTo(EScreen.Names);
}
} }
private void _StartRandomVisibleSongs() private void _StartRandomVisibleSongs()
@@ -1110,7 +1147,14 @@ namespace Vocaluxe.Screens
} }
if (CGame.GetNumSongs() > 0) if (CGame.GetNumSongs() > 0)
CGraphics.FadeTo(EScreen.Names); if (_PlayerSelect == EPlayerSelect.TR_SCREENSONG_PLAYERSELECT_OFF)
{
CGraphics.FadeTo(EScreen.Sing);
}
else
{
CGraphics.FadeTo(EScreen.Names);
}
} }
private void _StartRandomMedley(int numSongs, bool allSongs) private void _StartRandomMedley(int numSongs, bool allSongs)
@@ -1146,7 +1190,14 @@ namespace Vocaluxe.Screens
} }
if (CGame.GetNumSongs() > 0) if (CGame.GetNumSongs() > 0)
CGraphics.FadeTo(EScreen.Names); if (_PlayerSelect == EPlayerSelect.TR_SCREENSONG_PLAYERSELECT_OFF)
{
CGraphics.FadeTo(EScreen.Sing);
}
else
{
CGraphics.FadeTo(EScreen.Names);
}
} }
private bool _SelectNextRandom(int teamNr) private bool _SelectNextRandom(int teamNr)
@@ -1341,6 +1392,7 @@ namespace Vocaluxe.Screens
private void _ToggleSongOptions(ESongOptionsView view) private void _ToggleSongOptions(ESongOptionsView view)
{ {
_SelectSlides[_SelectSlideOptionsMode].Visible = false; _SelectSlides[_SelectSlideOptionsMode].Visible = false;
_SelectSlides[_SelectSlideOptionsPlayerSelect].Visible = false;
_SelectSlides[_SelectSlideOptionsAudioMode].Visible = false; _SelectSlides[_SelectSlideOptionsAudioMode].Visible = false;
_SelectSlides[_SelectSlideOptionsPlaylistAdd].Visible = false; _SelectSlides[_SelectSlideOptionsPlaylistAdd].Visible = false;
_SelectSlides[_SelectSlideOptionsPlaylistOpen].Visible = false; _SelectSlides[_SelectSlideOptionsPlaylistOpen].Visible = false;
@@ -1424,6 +1476,11 @@ namespace Vocaluxe.Screens
} }
_SelectSlides[_SelectSlideOptionsAudioMode].Selection = (int)_AudioMode; _SelectSlides[_SelectSlideOptionsAudioMode].Selection = (int)_AudioMode;
_SelectSlides[_SelectSlideOptionsPlayerSelect].AddValue("TR_SCREENSONG_PLAYERSELECT_ON");
_SelectSlides[_SelectSlideOptionsPlayerSelect].AddValue("TR_SCREENSONG_PLAYERSELECT_OFF");
_SelectSlides[_SelectSlideOptionsPlayerSelect].Visible = true;
_SelectSlides[_SelectSlideOptionsPlayerSelect].Selection = (int)_PlayerSelect;
_SelectSlides[_SelectSlideOptionsMode].Visible = true; _SelectSlides[_SelectSlideOptionsMode].Visible = true;
_SelectSlides[_SelectSlideOptionsPlaylistAdd].Visible = true; _SelectSlides[_SelectSlideOptionsPlaylistAdd].Visible = true;
_Buttons[_ButtonOptionsSing].Visible = true; _Buttons[_ButtonOptionsSing].Visible = true;
+6
View File
@@ -371,6 +371,12 @@ namespace VocaluxeLib
TR_AUDIOMODE_KARAOKE TR_AUDIOMODE_KARAOKE
} }
public enum EPlayerSelect
{
TR_SCREENSONG_PLAYERSELECT_ON,
TR_SCREENSONG_PLAYERSELECT_OFF
}
public enum ENoteType public enum ENoteType
{ {
Normal, Normal,