From a7cfc4d454f9e731dedd9dec3898e5b24c247b44 Mon Sep 17 00:00:00 2001
From: Florian Schulze <flori.schulze@yahoo.de>
Date: Wed, 15 Jan 2025 06:16:54 +0100
Subject: [PATCH] Add a back button in the main options screen. (#751)

* 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.
---
 .../Changelog/Changelog_ScreenOptions.txt     | 16 +++-
 .../Vocaluxe 2024/Screens/ScreenOptions.xml   | 73 ++++++++++++++-----
 Vocaluxe/Screens/CScreenOptions.cs            | 21 ++++--
 3 files changed, 80 insertions(+), 30 deletions(-)

diff --git a/Output/Themes/Changelog/Changelog_ScreenOptions.txt b/Output/Themes/Changelog/Changelog_ScreenOptions.txt
index 5b1a3626..fdd4118f 100644
--- a/Output/Themes/Changelog/Changelog_ScreenOptions.txt
+++ b/Output/Themes/Changelog/Changelog_ScreenOptions.txt
@@ -1,14 +1,22 @@
 ScreenOptions
 
 ++++++++++
-
-Version 2:
-(2023 Dec 31)
+Version 3:
+(2025 Jan 13)
 
 Add:
-<LogoMain>
+Back Button
 
+++++++++++
+Version 2:
 (2024 Nov 24)
 
 Add:
 Credits Button
+
+++++++++++
+Version 1:
+(2023 Dec 31)
+
+Add:
+<LogoMain>
\ No newline at end of file
diff --git a/Output/Themes/Vocaluxe 2024/Screens/ScreenOptions.xml b/Output/Themes/Vocaluxe 2024/Screens/ScreenOptions.xml
index 03c90726..0bec2876 100644
--- a/Output/Themes/Vocaluxe 2024/Screens/ScreenOptions.xml	
+++ b/Output/Themes/Vocaluxe 2024/Screens/ScreenOptions.xml	
@@ -2,7 +2,7 @@
 <Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Informations>
     <ScreenName>ScreenOptions</ScreenName>
-    <ScreenVersion>2</ScreenVersion>
+    <ScreenVersion>3</ScreenVersion>
   </Informations>
   <Backgrounds>
     <Background Name="Background1">
@@ -28,20 +28,55 @@
   </Statics>
   <Texts />
   <Buttons>
-    <Button Name="ButtonOptionsGame">
+     <Button Name="ButtonOptionsBack">
       <Skin>Button</Skin>
       <SkinSelected>Button</SkinSelected>
       <Rect>
         <X>82.5</X>
         <Y>900</Y>
-        <W>225</W>
+        <W>200</W>
         <H>75</H>
         <Z>0</Z>
       </Rect>
       <Color Name="ButtonColor" />
       <SelColor Name="ButtonSelColor" />
       <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>
         <Z>0</Z>
         <H>40.5</H>
@@ -67,16 +102,16 @@
       <Skin>Button</Skin>
       <SkinSelected>Button</SkinSelected>
       <Rect>
-        <X>388.5</X>
+        <X>602.5</X>
         <Y>900</Y>
-        <W>225</W>
+        <W>200</W>
         <H>75</H>
         <Z>0</Z>
       </Rect>
       <Color Name="ButtonColor" />
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
-        <X>112.5</X>
+        <X>100</X>
         <Y>18</Y>
         <Z>0</Z>
         <H>40.5</H>
@@ -102,16 +137,16 @@
       <Skin>Button</Skin>
       <SkinSelected>Button</SkinSelected>
       <Rect>
-        <X>696</X>
+        <X>862.5</X>
         <Y>900</Y>
-        <W>225</W>
+        <W>200</W>
         <H>75</H>
         <Z>0</Z>
       </Rect>
       <Color Name="ButtonColor" />
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
-        <X>112.5</X>
+        <X>100</X>
         <Y>18</Y>
         <Z>0</Z>
         <H>40.5</H>
@@ -137,16 +172,16 @@
       <Skin>Button</Skin>
       <SkinSelected>Button</SkinSelected>
       <Rect>
-        <X>1003.5</X>
+        <X>1122.5</X>
         <Y>900</Y>
-        <W>225</W>
+        <W>200</W>
         <H>75</H>
         <Z>0</Z>
       </Rect>
       <Color Name="ButtonColor" />
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
-        <X>112.5</X>
+        <X>100</X>
         <Y>18</Y>
         <Z>0</Z>
         <H>40.5</H>
@@ -172,16 +207,16 @@
       <Skin>Button</Skin>
       <SkinSelected>Button</SkinSelected>
       <Rect>
-        <X>1311</X>
+        <X>1382.5</X>
         <Y>900</Y>
-        <W>225</W>
+        <W>200</W>
         <H>75</H>
         <Z>0</Z>
       </Rect>
       <Color Name="ButtonColor" />
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
-        <X>112.5</X>
+        <X>100</X>
         <Y>18</Y>
         <Z>0</Z>
         <H>40.5</H>
@@ -207,16 +242,16 @@
       <Skin>Button</Skin>
       <SkinSelected>Button</SkinSelected>
       <Rect>
-        <X>1617</X>
+        <X>1642.5</X>
         <Y>900</Y>
-        <W>225</W>
+        <W>200</W>
         <H>75</H>
         <Z>0</Z>
       </Rect>
       <Color Name="ButtonColor" />
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
-        <X>112.5</X>
+        <X>100</X>
         <Y>18</Y>
         <Z>0</Z>
         <H>40.5</H>
diff --git a/Vocaluxe/Screens/CScreenOptions.cs b/Vocaluxe/Screens/CScreenOptions.cs
index 837cd343..e8a12557 100644
--- a/Vocaluxe/Screens/CScreenOptions.cs
+++ b/Vocaluxe/Screens/CScreenOptions.cs
@@ -29,20 +29,21 @@ namespace Vocaluxe.Screens
         {
             get { return 2; }
         }
-
+           
+        private const string _ButtonOptionsBack = "ButtonOptionsBack";  
         private const string _ButtonOptionsGame = "ButtonOptionsGame";
         private const string _ButtonOptionsSound = "ButtonOptionsSound";
         private const string _ButtonOptionsRecord = "ButtonOptionsRecord";
         private const string _ButtonOptionsVideo = "ButtonOptionsVideo";
         private const string _ButtonOptionsLyrics = "ButtonOptionsLyrics";
         private const string _ButtonOptionsTheme = "ButtonOptionsTheme";
-	private const string _ButtonOptionsCredits = "ButtonOptionsCredits";
+        private const string _ButtonOptionsCredits = "ButtonOptionsCredits";
 
         public override void 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)
@@ -65,6 +66,9 @@ namespace Vocaluxe.Screens
                         break;
 
                     case Keys.Enter:
+                        if (_Buttons[_ButtonOptionsBack].Selected)
+                            CGraphics.FadeTo(EScreen.Main);
+
                         if (_Buttons[_ButtonOptionsGame].Selected)
                             CGraphics.FadeTo(EScreen.OptionsGame);
 
@@ -82,8 +86,8 @@ namespace Vocaluxe.Screens
 
                         if (_Buttons[_ButtonOptionsTheme].Selected)
                             CGraphics.FadeTo(EScreen.OptionsTheme);
-						
-			if (_Buttons[_ButtonOptionsCredits].Selected)
+
+                        if (_Buttons[_ButtonOptionsCredits].Selected)
                             CGraphics.FadeTo(EScreen.Credits);
 
                         break;
@@ -98,6 +102,9 @@ namespace Vocaluxe.Screens
 
             if (mouseEvent.LB && _IsMouseOverCurSelection(mouseEvent))
             {
+                if (_Buttons[_ButtonOptionsBack].Selected)
+                    CGraphics.FadeTo(EScreen.Main);
+
                 if (_Buttons[_ButtonOptionsGame].Selected)
                     CGraphics.FadeTo(EScreen.OptionsGame);
 
@@ -115,8 +122,8 @@ namespace Vocaluxe.Screens
 
                 if (_Buttons[_ButtonOptionsTheme].Selected)
                     CGraphics.FadeTo(EScreen.OptionsTheme);
-				
-		if (_Buttons[_ButtonOptionsCredits].Selected)
+
+                if (_Buttons[_ButtonOptionsCredits].Selected)
                     CGraphics.FadeTo(EScreen.Credits);
             }