Redesign option screens (#931)

* Redesign and improve option screens

- Open the options directly from the main menu with the focus on the navigation, all option screens share a navigation with all categories, song folders and credits
- Navigation and settings use rounded backgrounds like the party mode selection, the current category and setting are highlighted with the selection color of the skin
- Categories can be clicked or switched with Tab, Escape moves the focus to the navigation and leaves the options from there, choosing a category moves the focus to its first setting
- Place the action buttons (delay test, adjust screen, server address, add folder) and the webcam preview inside the settings background
- Center the restart and microphone warnings below the settings background
- Move song folder management to its own screen with a list of all folders, add and remove buttons, a scrollbar and a restart warning
- Add the tile caption option to the game options (only selectable when the song menu is set to tiles)
- Remove the old options selection screen (ScreenOptions)
- Fix configured song folders being ignored when the first entry of the config is empty
- Show the folder dialog in front of the game window
- Fix background music source being overwritten by the karaoke effect setting
- Keep the webcam configuration when no webcam is connected
- Warn when several players are assigned to the same record channel
- Show a warning when no microphone is found
- Remove cover sizes 32 and 64 and keep unknown cover sizes until changed
- Play warning sounds again each time an option screen is shown
- Ignore key pressed events in graphics and server options
- Keep the background music volume in sync in the sound options

* Fix SonarCloud issues

---------

Co-authored-by: Florian Ostertag <flokuep@users.noreply.github.com>
This commit is contained in:
McSchneidarandFlorian Ostertag authored and GitHub committed 2026-10-21 09:12:04 +02:00
1 parent 522003a25f
commit 6601f41aac
59 files changed
+6694 -1850

No files matched your search

@@ -2,7 +2,7 @@
<Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Informations>
<ScreenName>ScreenOptionsSercer</ScreenName>
<ScreenVersion>1</ScreenVersion>
<ScreenVersion>2</ScreenVersion>
</Informations>
<Backgrounds>
<Background Name="Background1">
@@ -29,13 +29,277 @@
<Skin>Warning</Skin>
<Color Name="StaticWarningColor" />
<Rect>
<X>390</X>
<X>585</X>
<Y>900</Y>
<W>1140</W>
<H>75</H>
<Z>-1</Z>
</Rect>
</Static>
<Static Name="StaticNavPanel">
<Skin>OptionsNavBackground</Skin>
<Color Name="StaticColorAlpha" />
<Rect>
<X>45</X>
<Y>150</Y>
<W>375</W>
<H>735</H>
<Z>0.3</Z>
</Rect>
</Static>
<Static Name="StaticNavGame">
<Skin>ButtonTile</Skin>
<Color Name="Invisible" />
<Rect>
<X>60</X>
<Y>162</Y>
<W>345</W>
<H>62</H>
<Z>0.2</Z>
</Rect>
</Static>
<Static Name="StaticNavIconGame">
<Skin>OptionsIconGame</Skin>
<Color Name="ButtonTextColor" />
<Rect>
<X>75</X>
<Y>171</Y>
<W>44</W>
<H>44</H>
<Z>0.1</Z>
</Rect>
</Static>
<Static Name="StaticNavSound">
<Skin>ButtonTile</Skin>
<Color Name="Invisible" />
<Rect>
<X>60</X>
<Y>233.5</Y>
<W>345</W>
<H>62</H>
<Z>0.2</Z>
</Rect>
</Static>
<Static Name="StaticNavIconSound">
<Skin>OptionsIconSound</Skin>
<Color Name="ButtonTextColor" />
<Rect>
<X>75</X>
<Y>242.5</Y>
<W>44</W>
<H>44</H>
<Z>0.1</Z>
</Rect>
</Static>
<Static Name="StaticNavRecord">
<Skin>ButtonTile</Skin>
<Color Name="Invisible" />
<Rect>
<X>60</X>
<Y>305</Y>
<W>345</W>
<H>62</H>
<Z>0.2</Z>
</Rect>
</Static>
<Static Name="StaticNavIconRecord">
<Skin>SingIcon</Skin>
<Color Name="ButtonTextColor" />
<Rect>
<X>75</X>
<Y>314</Y>
<W>44</W>
<H>44</H>
<Z>0.1</Z>
</Rect>
</Static>
<Static Name="StaticNavVideo">
<Skin>ButtonTile</Skin>
<Color Name="Invisible" />
<Rect>
<X>60</X>
<Y>376.5</Y>
<W>345</W>
<H>62</H>
<Z>0.2</Z>
</Rect>
</Static>
<Static Name="StaticNavIconVideo">
<Skin>VideoIcon</Skin>
<Color Name="ButtonTextColor" />
<Rect>
<X>75</X>
<Y>385.5</Y>
<W>44</W>
<H>44</H>
<Z>0.1</Z>
</Rect>
</Static>
<Static Name="StaticNavLyrics">
<Skin>ButtonTile</Skin>
<Color Name="Invisible" />
<Rect>
<X>60</X>
<Y>448</Y>
<W>345</W>
<H>62</H>
<Z>0.2</Z>
</Rect>
</Static>
<Static Name="StaticNavIconLyrics">
<Skin>OptionsIconLyrics</Skin>
<Color Name="ButtonTextColor" />
<Rect>
<X>75</X>
<Y>457</Y>
<W>44</W>
<H>44</H>
<Z>0.1</Z>
</Rect>
</Static>
<Static Name="StaticNavTheme">
<Skin>ButtonTile</Skin>
<Color Name="Invisible" />
<Rect>
<X>60</X>
<Y>519.5</Y>
<W>345</W>
<H>62</H>
<Z>0.2</Z>
</Rect>
</Static>
<Static Name="StaticNavIconTheme">
<Skin>OptionsIconTheme</Skin>
<Color Name="ButtonTextColor" />
<Rect>
<X>75</X>
<Y>528.5</Y>
<W>44</W>
<H>44</H>
<Z>0.1</Z>
</Rect>
</Static>
<Static Name="StaticNavGraphics">
<Skin>ButtonTile</Skin>
<Color Name="Invisible" />
<Rect>
<X>60</X>
<Y>591</Y>
<W>345</W>
<H>62</H>
<Z>0.2</Z>
</Rect>
</Static>
<Static Name="StaticNavIconGraphics">
<Skin>OptionsIconGraphics</Skin>
<Color Name="ButtonTextColor" />
<Rect>
<X>75</X>
<Y>600</Y>
<W>44</W>
<H>44</H>
<Z>0.1</Z>
</Rect>
</Static>
<Static Name="StaticNavServer">
<Skin>ButtonTile</Skin>
<Color Name="Invisible" />
<Rect>
<X>60</X>
<Y>662.5</Y>
<W>345</W>
<H>62</H>
<Z>0.2</Z>
</Rect>
</Static>
<Static Name="StaticNavIconServer">
<Skin>OptionsIconServer</Skin>
<Color Name="ButtonTextColor" />
<Rect>
<X>75</X>
<Y>671.5</Y>
<W>44</W>
<H>44</H>
<Z>0.1</Z>
</Rect>
</Static>
<Static Name="StaticNavSongFolders">
<Skin>ButtonTile</Skin>
<Color Name="Invisible" />
<Rect>
<X>60</X>
<Y>734</Y>
<W>345</W>
<H>62</H>
<Z>0.2</Z>
</Rect>
</Static>
<Static Name="StaticNavIconSongFolders">
<Skin>OptionsIconSongFolders</Skin>
<Color Name="ButtonTextColor" />
<Rect>
<X>75</X>
<Y>743</Y>
<W>44</W>
<H>44</H>
<Z>0.1</Z>
</Rect>
</Static>
<Static Name="StaticNavCredits">
<Skin>ButtonTile</Skin>
<Color Name="Invisible" />
<Rect>
<X>60</X>
<Y>805.5</Y>
<W>345</W>
<H>62</H>
<Z>0.2</Z>
</Rect>
</Static>
<Static Name="StaticNavIconCredits">
<Skin>Star</Skin>
<Color Name="ButtonTextColor" />
<Rect>
<X>75</X>
<Y>814.5</Y>
<W>44</W>
<H>44</H>
<Z>0.1</Z>
</Rect>
</Static>
<Static Name="StaticNavSelected">
<Skin>OptionsNavSelected</Skin>
<Color Name="ButtonSelColor" />
<Rect>
<X>0</X>
<Y>0</Y>
<W>345</W>
<H>62</H>
<Z>0.15</Z>
</Rect>
</Static>
<Static Name="StaticNavIconSelected">
<Skin />
<Color Name="ButtonTextSelColor" />
<Rect>
<X>0</X>
<Y>0</Y>
<W>44</W>
<H>44</H>
<Z>0.1</Z>
</Rect>
</Static>
<Static Name="StaticOptionsPanel">
<Skin>CoverTextBackground</Skin>
<Color Name="StaticColorAlpha" />
<Rect>
<X>435</X>
<Y>150</Y>
<W>1440</W>
<H>735</H>
<Z>0.3</Z>
</Rect>
</Static>
</Statics>
<Texts>
<Text Name="TextTitle">
@@ -53,11 +317,11 @@
<Text>TR_SCREENOSERVER_OPTIONS</Text>
</Text>
<Text Name="TextServerActive">
<X>112.5</X>
<Y>160.5</Y>
<X>465</X>
<Y>181.75</Y>
<Z>0</Z>
<H>40.5</H>
<MaxW>0</MaxW>
<MaxW>480</MaxW>
<Color Name="TextColor" />
<SelColor Name="TextSelColor" />
<Align>Left</Align>
@@ -67,11 +331,11 @@
<Text>TR_SCREENOSERVER_ACTIVE</Text>
</Text>
<Text Name="TextServerEncryption">
<X>112.5</X>
<Y>250.5</Y>
<X>465</X>
<Y>261.75</Y>
<Z>0</Z>
<H>40.5</H>
<MaxW>0</MaxW>
<MaxW>480</MaxW>
<Color Name="TextColor" />
<SelColor Name="TextSelColor" />
<Align>Left</Align>
@@ -81,7 +345,7 @@
<Text>TR_SCREENOSERVER_ENCRYPTION</Text>
</Text>
<Text Name="TextWarningRestart">
<X>960</X>
<X>1155</X>
<Y>920</Y>
<Z>-1.1</Z>
<H>37.5</H>
@@ -94,6 +358,160 @@
<Font>Outline</Font>
<Text>TR_SCREENO_WARNINGRESTART</Text>
</Text>
<Text Name="TextNavGame">
<X>135</X>
<Y>173</Y>
<Z>0</Z>
<H>40.5</H>
<MaxW>255</MaxW>
<Color Name="ButtonTextColor" />
<SelColor Name="ButtonTextSelColor" />
<Align>Left</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENO_BUTTON_GAME</Text>
</Text>
<Text Name="TextNavSound">
<X>135</X>
<Y>244.5</Y>
<Z>0</Z>
<H>40.5</H>
<MaxW>255</MaxW>
<Color Name="ButtonTextColor" />
<SelColor Name="ButtonTextSelColor" />
<Align>Left</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENO_BUTTON_SOUND</Text>
</Text>
<Text Name="TextNavRecord">
<X>135</X>
<Y>316</Y>
<Z>0</Z>
<H>40.5</H>
<MaxW>255</MaxW>
<Color Name="ButtonTextColor" />
<SelColor Name="ButtonTextSelColor" />
<Align>Left</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENO_BUTTON_RECORD</Text>
</Text>
<Text Name="TextNavVideo">
<X>135</X>
<Y>387.5</Y>
<Z>0</Z>
<H>40.5</H>
<MaxW>255</MaxW>
<Color Name="ButtonTextColor" />
<SelColor Name="ButtonTextSelColor" />
<Align>Left</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENO_BUTTON_VIDEO</Text>
</Text>
<Text Name="TextNavLyrics">
<X>135</X>
<Y>459</Y>
<Z>0</Z>
<H>40.5</H>
<MaxW>255</MaxW>
<Color Name="ButtonTextColor" />
<SelColor Name="ButtonTextSelColor" />
<Align>Left</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENO_BUTTON_LYRICS</Text>
</Text>
<Text Name="TextNavTheme">
<X>135</X>
<Y>530.5</Y>
<Z>0</Z>
<H>40.5</H>
<MaxW>255</MaxW>
<Color Name="ButtonTextColor" />
<SelColor Name="ButtonTextSelColor" />
<Align>Left</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENO_BUTTON_THEME</Text>
</Text>
<Text Name="TextNavGraphics">
<X>135</X>
<Y>602</Y>
<Z>0</Z>
<H>40.5</H>
<MaxW>255</MaxW>
<Color Name="ButtonTextColor" />
<SelColor Name="ButtonTextSelColor" />
<Align>Left</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENO_BUTTON_GRAPHICS</Text>
</Text>
<Text Name="TextNavServer">
<X>135</X>
<Y>673.5</Y>
<Z>0</Z>
<H>40.5</H>
<MaxW>255</MaxW>
<Color Name="ButtonTextColor" />
<SelColor Name="ButtonTextSelColor" />
<Align>Left</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENO_BUTTON_SERVER</Text>
</Text>
<Text Name="TextNavSongFolders">
<X>135</X>
<Y>745</Y>
<Z>0</Z>
<H>40.5</H>
<MaxW>255</MaxW>
<Color Name="ButtonTextColor" />
<SelColor Name="ButtonTextSelColor" />
<Align>Left</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENO_BUTTON_SONGFOLDER</Text>
</Text>
<Text Name="TextNavCredits">
<X>135</X>
<Y>816.5</Y>
<Z>0</Z>
<H>40.5</H>
<MaxW>255</MaxW>
<Color Name="ButtonTextColor" />
<SelColor Name="ButtonTextSelColor" />
<Align>Left</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENO_BUTTON_CREDITS</Text>
</Text>
<Text Name="TextNavSelected">
<X>0</X>
<Y>0</Y>
<Z>0</Z>
<H>40.5</H>
<MaxW>255</MaxW>
<Color Name="ButtonTextSelColor" />
<SelColor Name="ButtonTextSelColor" />
<Align>Left</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text />
</Text>
</Texts>
<Buttons>
<Button Name="ButtonExit">
@@ -135,8 +553,8 @@
<Skin>Button</Skin>
<SkinSelected>Button</SkinSelected>
<Rect>
<X>1612.5</X>
<Y>900</Y>
<X>1625</X>
<Y>790</Y>
<W>225</W>
<H>75</H>
<Z>0</Z>
@@ -157,14 +575,6 @@
<Font>Outline</Font>
<Text>TR_SCREENOSERVER_BUTTON_SERVER</Text>
</Text>
<Reflection>
<Height>39</Height>
<Space>15</Space>
</Reflection>
<SelReflection>
<Height>39</Height>
<Space>15</Space>
</SelReflection>
</Button>
</Buttons>
<SongMenus />
@@ -174,28 +584,28 @@
<Skin />
<SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
<SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
<SkinSelected>SelectSlide</SkinSelected>
<SkinSelected>OptionsSlideSelected</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<Rect>
<X>750</X>
<Y>150</Y>
<W>1072.5</W>
<H>75</H>
<X>965</X>
<Y>172</Y>
<W>890</W>
<H>60</H>
<Z>0</Z>
</Rect>
<RectArrowLeft>
<X>757.5</X>
<Y>157.5</Y>
<W>60</W>
<H>60</H>
<X>971</X>
<Y>178</Y>
<W>48</W>
<H>48</H>
<Z>0</Z>
</RectArrowLeft>
<RectArrowRight>
<X>1755</X>
<Y>157.5</Y>
<W>60</W>
<H>60</H>
<X>1801</X>
<Y>178</Y>
<W>48</W>
<H>48</H>
<Z>0</Z>
</RectArrowRight>
<Color Name="SelectSlideColor" />
@@ -204,10 +614,10 @@
<ArrowSelColor Name="ArrowSelColor" />
<TextColor Name="TextColorAlpha" />
<TextSelColor Name="TextSelColor" />
<TextH>40.5</TextH>
<TextRelativeX>75</TextRelativeX>
<TextH>36</TextH>
<TextRelativeX>60</TextRelativeX>
<TextRelativeY>0</TextRelativeY>
<TextMaxW>300</TextMaxW>
<TextMaxW>246.67</TextMaxW>
<TextFont>Outline</TextFont>
<TextStyle>Bold</TextStyle>
<NumVisible>3</NumVisible>
@@ -216,28 +626,28 @@
<Skin />
<SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
<SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
<SkinSelected>SelectSlide</SkinSelected>
<SkinSelected>OptionsSlideSelected</SkinSelected>
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<Rect>
<X>750</X>
<Y>240</Y>
<W>1072.5</W>
<H>75</H>
<X>965</X>
<Y>252</Y>
<W>890</W>
<H>60</H>
<Z>0</Z>
</Rect>
<RectArrowLeft>
<X>757.5</X>
<Y>247.5</Y>
<W>60</W>
<H>60</H>
<X>971</X>
<Y>258</Y>
<W>48</W>
<H>48</H>
<Z>0</Z>
</RectArrowLeft>
<RectArrowRight>
<X>1755</X>
<Y>247.5</Y>
<W>60</W>
<H>60</H>
<X>1801</X>
<Y>258</Y>
<W>48</W>
<H>48</H>
<Z>0</Z>
</RectArrowRight>
<Color Name="SelectSlideColor" />
@@ -246,10 +656,10 @@
<ArrowSelColor Name="ArrowSelColor" />
<TextColor Name="TextColorAlpha" />
<TextSelColor Name="TextSelColor" />
<TextH>40.5</TextH>
<TextRelativeX>75</TextRelativeX>
<TextH>36</TextH>
<TextRelativeX>60</TextRelativeX>
<TextRelativeY>0</TextRelativeY>
<TextMaxW>300</TextMaxW>
<TextMaxW>246.67</TextMaxW>
<TextFont>Outline</TextFont>
<TextStyle>Bold</TextStyle>
<NumVisible>3</NumVisible>