Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a back button in the main options screen. (#751)

Browse Source 
* Add a back button in the main options screen.

* Update ScreenOptions Version to 3.
Add entry in Changelog_ScreenOptions.txt. Cleanup previous changelog entries to align with other screen's changelog.
This commit is contained in:
Florian Schulze authored and GitHub committed 2025-01-15 06:16:54 +01:00
1 parent fd5d6a7982
commit a7cfc4d454
3 files changed
+77 -27
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Themes/Changelog/Changelog_ScreenOptions.txt
+12 -4
View File
@@ -1,14 +1,22 @@
ScreenOptions ScreenOptions
++++++++++ ++++++++++
Version 3:
Version 2: (2025 Jan 13)
(2023 Dec 31)
Add: Add:
<LogoMain> Back Button
++++++++++
Version 2:
(2024 Nov 24) (2024 Nov 24)
Add: Add:
Credits Button Credits Button
++++++++++
Version 1:
(2023 Dec 31)
Add:
<LogoMain>
Output/Themes/Vocaluxe 2024/Screens/ScreenOptions.xml
+54 -19
View File
@@ -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>ScreenOptions</ScreenName> <ScreenName>ScreenOptions</ScreenName>
<ScreenVersion>2</ScreenVersion> <ScreenVersion>3</ScreenVersion>
</Informations> </Informations>
<Backgrounds> <Backgrounds>
<Background Name="Background1"> <Background Name="Background1">
@@ -28,20 +28,55 @@
</Statics> </Statics>
<Texts /> <Texts />
<Buttons> <Buttons>
<Button Name="ButtonOptionsGame"> <Button Name="ButtonOptionsBack">
<Skin>Button</Skin> <Skin>Button</Skin>
<SkinSelected>Button</SkinSelected> <SkinSelected>Button</SkinSelected>
<Rect> <Rect>
<X>82.5</X> <X>82.5</X>
<Y>900</Y> <Y>900</Y>
<W>225</W> <W>200</W>
<H>75</H> <H>75</H>
<Z>0</Z> <Z>0</Z>
</Rect> </Rect>
<Color Name="ButtonColor" /> <Color Name="ButtonColor" />
<SelColor Name="ButtonSelColor" /> <SelColor Name="ButtonSelColor" />
<Text Name="Text"> <Text Name="Text">
<X>112.5</X> <X>100</X>
<Y>18</Y>
<Z>0</Z>
<H>40.5</H>
<MaxW>213</MaxW>
<Color Name="ButtonTextColor" />
<SelColor Name="ButtonTextSelColor" />
<Align>Center</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_BUTTON_BACK</Text>
</Text>
<Reflection>
<Height>39</Height>
<Space>15</Space>
</Reflection>
<SelReflection>
<Height>39</Height>
<Space>15</Space>
</SelReflection>
</Button>
<Button Name="ButtonOptionsGame">
<Skin>Button</Skin>
<SkinSelected>Button</SkinSelected>
<Rect>
<X>342.5</X>
<Y>900</Y>
<W>200</W>
<H>75</H>
<Z>0</Z>
</Rect>
<Color Name="ButtonColor" />
<SelColor Name="ButtonSelColor" />
<Text Name="Text">
<X>100</X>
<Y>18</Y> <Y>18</Y>
<Z>0</Z> <Z>0</Z>
<H>40.5</H> <H>40.5</H>
@@ -67,16 +102,16 @@
<Skin>Button</Skin> <Skin>Button</Skin>
<SkinSelected>Button</SkinSelected> <SkinSelected>Button</SkinSelected>
<Rect> <Rect>
<X>388.5</X> <X>602.5</X>
<Y>900</Y> <Y>900</Y>
<W>225</W> <W>200</W>
<H>75</H> <H>75</H>
<Z>0</Z> <Z>0</Z>
</Rect> </Rect>
<Color Name="ButtonColor" /> <Color Name="ButtonColor" />
<SelColor Name="ButtonSelColor" /> <SelColor Name="ButtonSelColor" />
<Text Name="Text"> <Text Name="Text">
<X>112.5</X> <X>100</X>
<Y>18</Y> <Y>18</Y>
<Z>0</Z> <Z>0</Z>
<H>40.5</H> <H>40.5</H>
@@ -102,16 +137,16 @@
<Skin>Button</Skin> <Skin>Button</Skin>
<SkinSelected>Button</SkinSelected> <SkinSelected>Button</SkinSelected>
<Rect> <Rect>
<X>696</X> <X>862.5</X>
<Y>900</Y> <Y>900</Y>
<W>225</W> <W>200</W>
<H>75</H> <H>75</H>
<Z>0</Z> <Z>0</Z>
</Rect> </Rect>
<Color Name="ButtonColor" /> <Color Name="ButtonColor" />
<SelColor Name="ButtonSelColor" /> <SelColor Name="ButtonSelColor" />
<Text Name="Text"> <Text Name="Text">
<X>112.5</X> <X>100</X>
<Y>18</Y> <Y>18</Y>
<Z>0</Z> <Z>0</Z>
<H>40.5</H> <H>40.5</H>
@@ -137,16 +172,16 @@
<Skin>Button</Skin> <Skin>Button</Skin>
<SkinSelected>Button</SkinSelected> <SkinSelected>Button</SkinSelected>
<Rect> <Rect>
<X>1003.5</X> <X>1122.5</X>
<Y>900</Y> <Y>900</Y>
<W>225</W> <W>200</W>
<H>75</H> <H>75</H>
<Z>0</Z> <Z>0</Z>
</Rect> </Rect>
<Color Name="ButtonColor" /> <Color Name="ButtonColor" />
<SelColor Name="ButtonSelColor" /> <SelColor Name="ButtonSelColor" />
<Text Name="Text"> <Text Name="Text">
<X>112.5</X> <X>100</X>
<Y>18</Y> <Y>18</Y>
<Z>0</Z> <Z>0</Z>
<H>40.5</H> <H>40.5</H>
@@ -172,16 +207,16 @@
<Skin>Button</Skin> <Skin>Button</Skin>
<SkinSelected>Button</SkinSelected> <SkinSelected>Button</SkinSelected>
<Rect> <Rect>
<X>1311</X> <X>1382.5</X>
<Y>900</Y> <Y>900</Y>
<W>225</W> <W>200</W>
<H>75</H> <H>75</H>
<Z>0</Z> <Z>0</Z>
</Rect> </Rect>
<Color Name="ButtonColor" /> <Color Name="ButtonColor" />
<SelColor Name="ButtonSelColor" /> <SelColor Name="ButtonSelColor" />
<Text Name="Text"> <Text Name="Text">
<X>112.5</X> <X>100</X>
<Y>18</Y> <Y>18</Y>
<Z>0</Z> <Z>0</Z>
<H>40.5</H> <H>40.5</H>
@@ -207,16 +242,16 @@
<Skin>Button</Skin> <Skin>Button</Skin>
<SkinSelected>Button</SkinSelected> <SkinSelected>Button</SkinSelected>
<Rect> <Rect>
<X>1617</X> <X>1642.5</X>
<Y>900</Y> <Y>900</Y>
<W>225</W> <W>200</W>
<H>75</H> <H>75</H>
<Z>0</Z> <Z>0</Z>
</Rect> </Rect>
<Color Name="ButtonColor" /> <Color Name="ButtonColor" />
<SelColor Name="ButtonSelColor" /> <SelColor Name="ButtonSelColor" />
<Text Name="Text"> <Text Name="Text">
<X>112.5</X> <X>100</X>
<Y>18</Y> <Y>18</Y>
<Z>0</Z> <Z>0</Z>
<H>40.5</H> <H>40.5</H>
Vocaluxe/Screens/CScreenOptions.cs
+11 -4
View File
@@ -30,19 +30,20 @@ namespace Vocaluxe.Screens
get { return 2; } get { return 2; }
} }
private const string _ButtonOptionsBack = "ButtonOptionsBack";
private const string _ButtonOptionsGame = "ButtonOptionsGame"; private const string _ButtonOptionsGame = "ButtonOptionsGame";
private const string _ButtonOptionsSound = "ButtonOptionsSound"; private const string _ButtonOptionsSound = "ButtonOptionsSound";
private const string _ButtonOptionsRecord = "ButtonOptionsRecord"; private const string _ButtonOptionsRecord = "ButtonOptionsRecord";
private const string _ButtonOptionsVideo = "ButtonOptionsVideo"; private const string _ButtonOptionsVideo = "ButtonOptionsVideo";
private const string _ButtonOptionsLyrics = "ButtonOptionsLyrics"; private const string _ButtonOptionsLyrics = "ButtonOptionsLyrics";
private const string _ButtonOptionsTheme = "ButtonOptionsTheme"; private const string _ButtonOptionsTheme = "ButtonOptionsTheme";
private const string _ButtonOptionsCredits = "ButtonOptionsCredits"; private const string _ButtonOptionsCredits = "ButtonOptionsCredits";
public override void Init() public override void Init()
{ {
base.Init(); base.Init();
_ThemeButtons = new string[] {_ButtonOptionsGame, _ButtonOptionsSound, _ButtonOptionsRecord, _ButtonOptionsVideo, _ButtonOptionsLyrics, _ButtonOptionsTheme}; _ThemeButtons = new string[] {_ButtonOptionsBack, _ButtonOptionsGame, _ButtonOptionsSound, _ButtonOptionsRecord, _ButtonOptionsVideo, _ButtonOptionsLyrics, _ButtonOptionsTheme};
} }
public override bool HandleInput(SKeyEvent keyEvent) public override bool HandleInput(SKeyEvent keyEvent)
@@ -65,6 +66,9 @@ namespace Vocaluxe.Screens
break; break;
case Keys.Enter: case Keys.Enter:
if (_Buttons[_ButtonOptionsBack].Selected)
CGraphics.FadeTo(EScreen.Main);
if (_Buttons[_ButtonOptionsGame].Selected) if (_Buttons[_ButtonOptionsGame].Selected)
CGraphics.FadeTo(EScreen.OptionsGame); CGraphics.FadeTo(EScreen.OptionsGame);
@@ -83,7 +87,7 @@ namespace Vocaluxe.Screens
if (_Buttons[_ButtonOptionsTheme].Selected) if (_Buttons[_ButtonOptionsTheme].Selected)
CGraphics.FadeTo(EScreen.OptionsTheme); CGraphics.FadeTo(EScreen.OptionsTheme);
if (_Buttons[_ButtonOptionsCredits].Selected) if (_Buttons[_ButtonOptionsCredits].Selected)
CGraphics.FadeTo(EScreen.Credits); CGraphics.FadeTo(EScreen.Credits);
break; break;
@@ -98,6 +102,9 @@ namespace Vocaluxe.Screens
if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent)) if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent))
{ {
if (_Buttons[_ButtonOptionsBack].Selected)
CGraphics.FadeTo(EScreen.Main);
if (_Buttons[_ButtonOptionsGame].Selected) if (_Buttons[_ButtonOptionsGame].Selected)
CGraphics.FadeTo(EScreen.OptionsGame); CGraphics.FadeTo(EScreen.OptionsGame);
@@ -116,7 +123,7 @@ namespace Vocaluxe.Screens
if (_Buttons[_ButtonOptionsTheme].Selected) if (_Buttons[_ButtonOptionsTheme].Selected)
CGraphics.FadeTo(EScreen.OptionsTheme); CGraphics.FadeTo(EScreen.OptionsTheme);
if (_Buttons[_ButtonOptionsCredits].Selected) if (_Buttons[_ButtonOptionsCredits].Selected)
CGraphics.FadeTo(EScreen.Credits); CGraphics.FadeTo(EScreen.Credits);
} }