diff --git a/Output/Languages/English.xml b/Output/Languages/English.xml index 3c758738..b6d55298 100644 --- a/Output/Languages/English.xml +++ b/Output/Languages/English.xml @@ -156,6 +156,8 @@ Stop singing Continue Skip this song + Restart round + Restart game Scores Rating Points diff --git a/Output/Themes/Changelog/Changelog_ScreenSing.txt b/Output/Themes/Changelog/Changelog_ScreenSing.txt index 0a87c825..d86c8747 100644 --- a/Output/Themes/Changelog/Changelog_ScreenSing.txt +++ b/Output/Themes/Changelog/Changelog_ScreenSing.txt @@ -4,7 +4,9 @@ ScreenSing Version 9 Add: - + + + +++++++++ Version 8 diff --git a/Output/Themes/Genius/Screens/ScreenSing.xml b/Output/Themes/Genius/Screens/ScreenSing.xml index 57c09eec..8b6fe781 100644 --- a/Output/Themes/Genius/Screens/ScreenSing.xml +++ b/Output/Themes/Genius/Screens/ScreenSing.xml @@ -1302,8 +1302,8 @@ Button Button - 775 - 450 + 985 + 600 150 50 -2.11 @@ -1337,8 +1337,8 @@ Button Button - 355 - 450 + 145 + 600 150 50 -2.11 @@ -1372,8 +1372,8 @@ Button Button - 565 - 450 + 355 + 600 150 50 -2.11 @@ -1403,6 +1403,76 @@ 10 + + diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs index 6ec8ea18..ba8cb0c4 100644 --- a/Vocaluxe/Screens/CScreenSing.cs +++ b/Vocaluxe/Screens/CScreenSing.cs @@ -78,6 +78,8 @@ namespace Vocaluxe.Screens private const string _ButtonCancel = "ButtonCancel"; private const string _ButtonContinue = "ButtonContinue"; + private const string _ButtonRestartRound = "ButtonRestartRound"; + private const string _ButtonRestartGame = "ButtonRestartGame"; private const string _ButtonSkip = "ButtonSkip"; private const string _LyricMain = "LyricMain"; @@ -170,7 +172,7 @@ namespace Vocaluxe.Screens _CreateProgressBars(); _AssignPlayerElements(); - _ThemeButtons = new string[] { _ButtonCancel, _ButtonContinue, _ButtonSkip }; + _ThemeButtons = new string[] { _ButtonCancel, _ButtonContinue, _ButtonRestartGame, _ButtonRestartRound, _ButtonSkip }; _ThemeLyrics = new string[] { _LyricMain, _LyricSub, _LyricMainDuet, _LyricSubDuet, _LyricMainTop, _LyricSubTop }; _ThemeSingNotes = new string[] { _SingBars }; @@ -260,6 +262,10 @@ namespace Vocaluxe.Screens _SetPause(false); if (_Buttons[_ButtonCancel].Selected) _Stop(); + if (_Buttons[_ButtonRestartGame].Selected) + _RestartGame(); + if (_Buttons[_ButtonRestartRound].Selected) + _RestartRound(); if (_Buttons[_ButtonSkip].Selected) { _NextSong(); @@ -301,10 +307,18 @@ namespace Vocaluxe.Screens { if (_Buttons[_ButtonContinue].Selected) _SetPause(false); - if (_Buttons[_ButtonCancel].Selected) _Stop(); - + if (_Buttons[_ButtonRestartGame].Selected) + { + _RestartGame(); + _SetPause(false); + } + if (_Buttons[_ButtonRestartRound].Selected) + { + _RestartRound(); + _SetPause(false); + } if (_Buttons[_ButtonSkip].Selected) { _NextSong(); @@ -312,7 +326,6 @@ namespace Vocaluxe.Screens } } - return true; } @@ -1004,6 +1017,8 @@ namespace Vocaluxe.Screens _Buttons[_ButtonCancel].Visible = _Pause; _Buttons[_ButtonContinue].Visible = _Pause; _Buttons[_ButtonSkip].Visible = _Pause && CGame.NumRounds > CGame.RoundNr && CGame.NumRounds > 1; + _Buttons[_ButtonRestartGame].Visible = _Pause; + _Buttons[_ButtonRestartRound].Visible = _Pause && CGame.NumRounds > 1; if (_Pause) CSound.Pause(_CurrentStream);