From 21d7d3de60cb2e3f7bbb83e1c87e26fad96429d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Thu, 31 Aug 2017 21:25:42 +0200 Subject: [PATCH 01/10] fixed not working button in song screen --- Vocaluxe/Screens/CScreenSong.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Vocaluxe/Screens/CScreenSong.cs b/Vocaluxe/Screens/CScreenSong.cs index c14037ba..bf279651 100644 --- a/Vocaluxe/Screens/CScreenSong.cs +++ b/Vocaluxe/Screens/CScreenSong.cs @@ -362,7 +362,10 @@ namespace Vocaluxe.Screens { if (CSongs.IsInCategory) _SongMenu.SetSelectedSong(CSongs.GetRandomSong()); - else + } + else if (_Buttons[_ButtonOptionsRandomCategory].Selected) + { + if (!CSongs.IsInCategory) _SongMenu.SetSelectedCategory(CSongs.GetRandomCategory()); } else if (_Buttons[_ButtonOptionsSingAll].Selected) From 1b616398a9e1fb107bdd2ba8ff60d89e27de7f63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Thu, 31 Aug 2017 22:07:26 +0200 Subject: [PATCH 02/10] Fixed crash when choosing sorting:folder and category:yes --- Vocaluxe/Base/CSongCategorizer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vocaluxe/Base/CSongCategorizer.cs b/Vocaluxe/Base/CSongCategorizer.cs index ab7fb777..05a9dba4 100644 --- a/Vocaluxe/Base/CSongCategorizer.cs +++ b/Vocaluxe/Base/CSongCategorizer.cs @@ -126,10 +126,10 @@ namespace Vocaluxe.Base string noCategoryName; switch (CSongs.Sorter.SongSorting) { + case ESongSorting.TR_CONFIG_FOLDER: case ESongSorting.TR_CONFIG_NONE: noCategoryName = CLanguage.Translate("TR_SCREENSONG_ALLSONGS"); break; - case ESongSorting.TR_CONFIG_FOLDER: case ESongSorting.TR_CONFIG_ARTIST: case ESongSorting.TR_CONFIG_ARTIST_LETTER: case ESongSorting.TR_CONFIG_TITLE_LETTER: From 63abc5f7cfa815107861e9480efecbf945995cc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Thu, 31 Aug 2017 22:10:04 +0200 Subject: [PATCH 03/10] Fixed not saving config when jumping directly to songs --- Vocaluxe/Screens/CScreenOptionsGame.cs | 1 + Vocaluxe/Screens/CScreenOptionsLyrics.cs | 1 + Vocaluxe/Screens/CScreenOptionsRecord.cs | 1 + Vocaluxe/Screens/CScreenOptionsSound.cs | 1 + Vocaluxe/Screens/CScreenOptionsTheme.cs | 1 + Vocaluxe/Screens/CScreenOptionsVideo.cs | 1 + Vocaluxe/Screens/CScreenOptionsVideoAdjustments.cs | 1 + 7 files changed, 7 insertions(+) diff --git a/Vocaluxe/Screens/CScreenOptionsGame.cs b/Vocaluxe/Screens/CScreenOptionsGame.cs index 485ce2b0..72a7d4e6 100644 --- a/Vocaluxe/Screens/CScreenOptionsGame.cs +++ b/Vocaluxe/Screens/CScreenOptionsGame.cs @@ -80,6 +80,7 @@ namespace Vocaluxe.Screens case Keys.S: CParty.SetNormalGameMode(); + _SaveConfig(); CGraphics.FadeTo(EScreen.Song); break; diff --git a/Vocaluxe/Screens/CScreenOptionsLyrics.cs b/Vocaluxe/Screens/CScreenOptionsLyrics.cs index da4a608d..49c68929 100644 --- a/Vocaluxe/Screens/CScreenOptionsLyrics.cs +++ b/Vocaluxe/Screens/CScreenOptionsLyrics.cs @@ -67,6 +67,7 @@ namespace Vocaluxe.Screens case Keys.S: CParty.SetNormalGameMode(); + _SaveConfig(); CGraphics.FadeTo(EScreen.Song); break; diff --git a/Vocaluxe/Screens/CScreenOptionsRecord.cs b/Vocaluxe/Screens/CScreenOptionsRecord.cs index da838eda..bac267a9 100644 --- a/Vocaluxe/Screens/CScreenOptionsRecord.cs +++ b/Vocaluxe/Screens/CScreenOptionsRecord.cs @@ -112,6 +112,7 @@ namespace Vocaluxe.Screens case Keys.S: CParty.SetNormalGameMode(); + _SaveMicConfig(); CGraphics.FadeTo(EScreen.Song); break; diff --git a/Vocaluxe/Screens/CScreenOptionsSound.cs b/Vocaluxe/Screens/CScreenOptionsSound.cs index c3d47d1f..cf6afcec 100644 --- a/Vocaluxe/Screens/CScreenOptionsSound.cs +++ b/Vocaluxe/Screens/CScreenOptionsSound.cs @@ -89,6 +89,7 @@ namespace Vocaluxe.Screens case Keys.S: CParty.SetNormalGameMode(); + _SaveConfig(); CGraphics.FadeTo(EScreen.Song); break; diff --git a/Vocaluxe/Screens/CScreenOptionsTheme.cs b/Vocaluxe/Screens/CScreenOptionsTheme.cs index 6723a305..7beb9a15 100644 --- a/Vocaluxe/Screens/CScreenOptionsTheme.cs +++ b/Vocaluxe/Screens/CScreenOptionsTheme.cs @@ -92,6 +92,7 @@ namespace Vocaluxe.Screens case Keys.S: CParty.SetNormalGameMode(); + _SaveConfig(); CGraphics.FadeTo(EScreen.Song); break; diff --git a/Vocaluxe/Screens/CScreenOptionsVideo.cs b/Vocaluxe/Screens/CScreenOptionsVideo.cs index d8ff7710..8c33e722 100644 --- a/Vocaluxe/Screens/CScreenOptionsVideo.cs +++ b/Vocaluxe/Screens/CScreenOptionsVideo.cs @@ -95,6 +95,7 @@ namespace Vocaluxe.Screens case Keys.S: CParty.SetNormalGameMode(); + _SaveConfig(); CGraphics.FadeTo(EScreen.Song); break; diff --git a/Vocaluxe/Screens/CScreenOptionsVideoAdjustments.cs b/Vocaluxe/Screens/CScreenOptionsVideoAdjustments.cs index 0ad53c54..b030b14e 100644 --- a/Vocaluxe/Screens/CScreenOptionsVideoAdjustments.cs +++ b/Vocaluxe/Screens/CScreenOptionsVideoAdjustments.cs @@ -56,6 +56,7 @@ namespace Vocaluxe.Screens case Keys.S: CParty.SetNormalGameMode(); + _SaveConfig(); CGraphics.FadeTo(EScreen.Song); break; From 0981d101a321ecd0a0e76cfebc8dd0e330d870d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Thu, 31 Aug 2017 22:22:21 +0200 Subject: [PATCH 04/10] Fixed pm name selection shows 'team' if it shouldn't --- PartyModes/PartyModeChallenge/CPartyScreenChallengeNames.cs | 1 + .../CPartyScreenChallengeMedleyNames.cs | 1 + VocaluxeLib/Menu/CMenuPartyNameSelection.cs | 4 +--- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PartyModes/PartyModeChallenge/CPartyScreenChallengeNames.cs b/PartyModes/PartyModeChallenge/CPartyScreenChallengeNames.cs index 9b79c0d2..46d354aa 100644 --- a/PartyModes/PartyModeChallenge/CPartyScreenChallengeNames.cs +++ b/PartyModes/PartyModeChallenge/CPartyScreenChallengeNames.cs @@ -37,6 +37,7 @@ namespace VocaluxeLib.PartyModes.Challenge base.Init(); _PartyMode = (CPartyModeChallenge)base._PartyMode; _AllowChangePlayerNum = false; + _Teams = false; } public override void OnShow() diff --git a/PartyModes/PartyModeChallengeMedley/CPartyScreenChallengeMedleyNames.cs b/PartyModes/PartyModeChallengeMedley/CPartyScreenChallengeMedleyNames.cs index 4d92fc7d..a95bfc53 100644 --- a/PartyModes/PartyModeChallengeMedley/CPartyScreenChallengeMedleyNames.cs +++ b/PartyModes/PartyModeChallengeMedley/CPartyScreenChallengeMedleyNames.cs @@ -37,6 +37,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley base.Init(); _PartyMode = (CPartyModeChallengeMedley)base._PartyMode; _AllowChangePlayerNum = false; + _Teams = false; } public override void OnShow() diff --git a/VocaluxeLib/Menu/CMenuPartyNameSelection.cs b/VocaluxeLib/Menu/CMenuPartyNameSelection.cs index 489467bc..cc01f135 100644 --- a/VocaluxeLib/Menu/CMenuPartyNameSelection.cs +++ b/VocaluxeLib/Menu/CMenuPartyNameSelection.cs @@ -37,7 +37,7 @@ namespace VocaluxeLib.Menu } } - private bool _Teams; + protected bool _Teams = true; protected int _NumTeams = -1; protected int _NumPlayer = -1; protected int[] _NumPlayerTeams; @@ -106,8 +106,6 @@ namespace VocaluxeLib.Menu for (int i = 0; i < _TeamList.Length; i++) _TeamList[i] = new List(); - _Teams = _NumTeams > 0; - _UpdateSlides(); _LoadProfiles(); _UpdateButtonVisibility(); From e8f0a9b4c423592e96183613b39f509e595927e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Thu, 31 Aug 2017 22:27:53 +0200 Subject: [PATCH 05/10] Guest3 is now really a guest... --- Output/Profiles/guest3.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Output/Profiles/guest3.xml b/Output/Profiles/guest3.xml index ad3c3eb5..5efb36f6 100644 --- a/Output/Profiles/guest3.xml +++ b/Output/Profiles/guest3.xml @@ -2,7 +2,7 @@ Guest 3 TR_CONFIG_EASY - TR_USERROLE_NORMAL + TR_USERROLE_GUEST TR_CONFIG_ON Avatar_m.png - \ No newline at end of file + From e9e9b6c79096cc00e0f8cdb614489b4251ce7a48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Thu, 31 Aug 2017 22:35:27 +0200 Subject: [PATCH 06/10] Better navigation on taking webcam snapshot --- Output/Profiles/guest3.xml | 2 +- Vocaluxe/Screens/CScreenProfiles.cs | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Output/Profiles/guest3.xml b/Output/Profiles/guest3.xml index 5efb36f6..f8b196f8 100644 --- a/Output/Profiles/guest3.xml +++ b/Output/Profiles/guest3.xml @@ -5,4 +5,4 @@ TR_USERROLE_GUEST TR_CONFIG_ON Avatar_m.png - + \ No newline at end of file diff --git a/Vocaluxe/Screens/CScreenProfiles.cs b/Vocaluxe/Screens/CScreenProfiles.cs index 44196e34..f98a3c2e 100644 --- a/Vocaluxe/Screens/CScreenProfiles.cs +++ b/Vocaluxe/Screens/CScreenProfiles.cs @@ -319,6 +319,8 @@ namespace Vocaluxe.Screens _Buttons[_ButtonDiscardSnapshot].Visible = false; _Buttons[_ButtonTakeSnapshot].Visible = false; _Buttons[_ButtonWebcam].Visible = false; + + _SelectElement(_Buttons[_ButtonSave]); } else { @@ -330,6 +332,8 @@ namespace Vocaluxe.Screens _Buttons[_ButtonDiscardSnapshot].Visible = true; _Buttons[_ButtonTakeSnapshot].Visible = false; _Buttons[_ButtonWebcam].Visible = false; + + _SelectElement(_Buttons[_ButtonSaveSnapshot]); } } @@ -341,6 +345,8 @@ namespace Vocaluxe.Screens _Buttons[_ButtonDiscardSnapshot].Visible = false; _Buttons[_ButtonTakeSnapshot].Visible = false; _Buttons[_ButtonWebcam].Visible = CWebcam.IsDeviceAvailable(); + + _SelectElement(_Buttons[_ButtonWebcam]); } private void _OnSaveSnapshot() @@ -359,6 +365,8 @@ namespace Vocaluxe.Screens int id = CProfiles.NewAvatar(file); CProfiles.SetAvatar(_SelectSlides[_SelectSlideProfiles].SelectedTag, id); _LoadAvatars(false); + + _SelectElement(_Buttons[_ButtonSave]); } private void _OnWebcam() @@ -374,6 +382,8 @@ namespace Vocaluxe.Screens _Buttons[_ButtonDiscardSnapshot].Visible = false; _Buttons[_ButtonTakeSnapshot].Visible = true; _Buttons[_ButtonWebcam].Visible = false; + + _SelectElement(_Buttons[_ButtonTakeSnapshot]); } private void _NewProfile() From 57aa36c24e85bcee089dacb0f416e3449e515bce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Thu, 31 Aug 2017 23:07:25 +0200 Subject: [PATCH 07/10] Fixed some playlist element issues - SongMenu wasn't resizing after playlist closed - Playlist Buttons couldn't be used with keyboard --- Vocaluxe/Screens/CScreenSong.cs | 12 +++++++++++ VocaluxeLib/Menu/CObjectInteractions.cs | 27 +++++++++++++++++++------ 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/Vocaluxe/Screens/CScreenSong.cs b/Vocaluxe/Screens/CScreenSong.cs index bf279651..ad8c73d0 100644 --- a/Vocaluxe/Screens/CScreenSong.cs +++ b/Vocaluxe/Screens/CScreenSong.cs @@ -172,7 +172,12 @@ namespace Vocaluxe.Screens { keyEvent.Handled = _Playlist.HandleInput(keyEvent); if (keyEvent.Handled) + { + //Check if playlist was closed and song menu needed to be resized + if (!_Playlist.Visible) + _SongMenu.SmallView = false; return true; + } if (!keyEvent.KeyPressed && keyEvent.Key == Keys.Escape) { _ClosePlaylist(); @@ -414,7 +419,12 @@ namespace Vocaluxe.Screens _SongMenu.Selected = false; _ToggleSongOptions(ESongOptionsView.None); if (_Playlist.HandleMouse(mouseEvent)) + { + //Check if playlist was closed and song menu needed to be resized + if (!_Playlist.Visible) + _SongMenu.SmallView = false; return true; + } } else if (CHelper.IsInBounds(_SongMenu.Rect, mouseEvent)) { @@ -1264,6 +1274,8 @@ namespace Vocaluxe.Screens { _SongMenu.SmallView = true; _Playlist.Visible = true; + _SelectElement(_Playlist); + _ToggleSongOptions(ESongOptionsView.None); } } diff --git a/VocaluxeLib/Menu/CObjectInteractions.cs b/VocaluxeLib/Menu/CObjectInteractions.cs index e7623787..2d73dd4a 100644 --- a/VocaluxeLib/Menu/CObjectInteractions.cs +++ b/VocaluxeLib/Menu/CObjectInteractions.cs @@ -119,18 +119,24 @@ namespace VocaluxeLib.Menu keyEvent.Handled = PrevValue(); else keyEvent.Handled = _NextElement(keyEvent); - } - if (keyEvent.Key == Keys.Right) + return true; + } + else if (keyEvent.Key == Keys.Right) { if (_IsSelectionValid() && _Elements[_Selection].Type == EType.SelectSlide && keyEvent.Mod != EModifier.Shift) keyEvent.Handled = NextValue(); else keyEvent.Handled = _NextElement(keyEvent); - } - if (keyEvent.Key == Keys.Up || keyEvent.Key == Keys.Down) + return true; + } + else if (keyEvent.Key == Keys.Up || keyEvent.Key == Keys.Down) + { keyEvent.Handled = _NextElement(keyEvent); + + return true; + } } else { @@ -140,16 +146,25 @@ namespace VocaluxeLib.Menu PrevElement(); else NextElement(); + + return true; } if (keyEvent.Key == Keys.Left) + { PrevValue(); - if (keyEvent.Key == Keys.Right) + return true; + } + else if (keyEvent.Key == Keys.Right) + { NextValue(); + + return true; + } } - return true; + return false; } public virtual bool HandleMouse(SMouseEvent mouseEvent) From 1fa744e76321c57bb8d15967b158a1691d38e113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Thu, 31 Aug 2017 23:23:16 +0200 Subject: [PATCH 08/10] Fixed unwanted scrolling in highscore --- Vocaluxe/Screens/CScreenHighscore.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vocaluxe/Screens/CScreenHighscore.cs b/Vocaluxe/Screens/CScreenHighscore.cs index 182e68ed..0e6a746f 100644 --- a/Vocaluxe/Screens/CScreenHighscore.cs +++ b/Vocaluxe/Screens/CScreenHighscore.cs @@ -285,7 +285,7 @@ namespace Vocaluxe.Screens private void _ChangePos(int num) { - if (_Scores[_Round].Count == 0) + if (_Scores[_Round].Count == 0 || _Scores[_Round].Count <= _NumEntrys) _Pos = 0; else { From 6e39633a87803ec5b4ad9eaa16dd148ba558e23f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Thu, 31 Aug 2017 23:25:10 +0200 Subject: [PATCH 09/10] updated gitignore - pngs in profiles folder - .dll.config files - .vs folder (visual studio stuff) --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 9de55a61..c7ac423d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ obj PitchTracker.dll Thumbs.db .transifexrc +.vs tx.exe *.mp4 *.pdb @@ -30,6 +31,7 @@ tx.exe *.user *.VC.db *.VC.opendb +*.dll.config /*.vsp /*.ctl /Output/Config.xml @@ -48,6 +50,7 @@ tx.exe /Output/Songs /Output/Playlists/*.xml /Output/Profiles/*.xml +/Output/Profiles/*.png /Output/PartyModes/*/Code/* /PartyModes/*/*/*.dll /VocaluxeLib/bin From 60a27fbf27b644e37d4b0e64e8bbd1888e07cf5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Thu, 31 Aug 2017 23:37:10 +0200 Subject: [PATCH 10/10] Updated AssemblyInfo.cs to current year --- Vocaluxe/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vocaluxe/Properties/AssemblyInfo.cs b/Vocaluxe/Properties/AssemblyInfo.cs index 348b3386..5ab36484 100644 --- a/Vocaluxe/Properties/AssemblyInfo.cs +++ b/Vocaluxe/Properties/AssemblyInfo.cs @@ -27,7 +27,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Vocaluxe")] -[assembly: AssemblyCopyright("Copyright © 2016")] +[assembly: AssemblyCopyright("Copyright © 2017")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")]