Fix weird formatting in CScreenSong.cs (no code changes)
This commit is contained in:
1 parent
6945ac1e07
commit
c2462d723a
2 files changed
+33
-37
No files matched your search
+1
-4
@@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio Express 2012 for Windows Desktop
|
# Visual Studio 2012
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vocaluxe", "Vocaluxe\Vocaluxe.csproj", "{2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vocaluxe", "Vocaluxe\Vocaluxe.csproj", "{2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}"
|
||||||
ProjectSection(ProjectDependencies) = postProject
|
ProjectSection(ProjectDependencies) = postProject
|
||||||
{6F3E1874-F28A-40E9-AFBD-31934D593678} = {6F3E1874-F28A-40E9-AFBD-31934D593678}
|
{6F3E1874-F28A-40E9-AFBD-31934D593678} = {6F3E1874-F28A-40E9-AFBD-31934D593678}
|
||||||
@@ -154,7 +154,4 @@ Global
|
|||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(Performance) = preSolution
|
|
||||||
HasPerformanceSessions = true
|
|
||||||
EndGlobalSection
|
|
||||||
EndGlobal
|
EndGlobal
|
||||||
@@ -105,7 +105,7 @@ namespace Vocaluxe.Screens
|
|||||||
_ButtonsJoker.Clear();
|
_ButtonsJoker.Clear();
|
||||||
for (int i = 0; i < CSettings.MaxNumPlayer; i++)
|
for (int i = 0; i < CSettings.MaxNumPlayer; i++)
|
||||||
_ButtonsJoker.Add("ButtonJoker" + (i + 1));
|
_ButtonsJoker.Add("ButtonJoker" + (i + 1));
|
||||||
List<string> blist = new List<string>();
|
var blist = new List<string>();
|
||||||
blist.AddRange(_ButtonsJoker);
|
blist.AddRange(_ButtonsJoker);
|
||||||
blist.Add(_ButtonOptionsClose);
|
blist.Add(_ButtonOptionsClose);
|
||||||
blist.Add(_ButtonOptionsPlaylist);
|
blist.Add(_ButtonOptionsPlaylist);
|
||||||
@@ -123,7 +123,7 @@ namespace Vocaluxe.Screens
|
|||||||
_TextsPlayer.Clear();
|
_TextsPlayer.Clear();
|
||||||
for (int i = 0; i < CSettings.MaxNumPlayer; i++)
|
for (int i = 0; i < CSettings.MaxNumPlayer; i++)
|
||||||
_TextsPlayer.Add("TextPlayer" + (i + 1));
|
_TextsPlayer.Add("TextPlayer" + (i + 1));
|
||||||
List<string> tlist = new List<string>();
|
var tlist = new List<string>();
|
||||||
tlist.AddRange(_TextsPlayer);
|
tlist.AddRange(_TextsPlayer);
|
||||||
tlist.Add(_TextCategory);
|
tlist.Add(_TextCategory);
|
||||||
tlist.Add(_TextSelection);
|
tlist.Add(_TextSelection);
|
||||||
@@ -172,7 +172,7 @@ namespace Vocaluxe.Screens
|
|||||||
{
|
{
|
||||||
if (_SearchActive)
|
if (_SearchActive)
|
||||||
_ApplyNewSearchFilter(_SearchText + keyEvent.Unicode);
|
_ApplyNewSearchFilter(_SearchText + keyEvent.Unicode);
|
||||||
else if(!_Sso.Selection.PartyMode)
|
else if (!_Sso.Selection.PartyMode)
|
||||||
{
|
{
|
||||||
_JumpTo(keyEvent.Unicode);
|
_JumpTo(keyEvent.Unicode);
|
||||||
return true;
|
return true;
|
||||||
@@ -862,7 +862,7 @@ namespace Vocaluxe.Screens
|
|||||||
CGame.Reset();
|
CGame.Reset();
|
||||||
CGame.ClearSongs();
|
CGame.ClearSongs();
|
||||||
|
|
||||||
List<int> ids = new List<int>();
|
var ids = new List<int>();
|
||||||
for (int i = 0; i < CSongs.AllSongs.Count; i++)
|
for (int i = 0; i < CSongs.AllSongs.Count; i++)
|
||||||
ids.Add(i);
|
ids.Add(i);
|
||||||
|
|
||||||
@@ -870,7 +870,7 @@ namespace Vocaluxe.Screens
|
|||||||
{
|
{
|
||||||
int songNr = ids[CGame.Rand.Next(ids.Count)];
|
int songNr = ids[CGame.Rand.Next(ids.Count)];
|
||||||
|
|
||||||
EGameMode gm = EGameMode.TR_GAMEMODE_NORMAL;
|
var gm = EGameMode.TR_GAMEMODE_NORMAL;
|
||||||
if (CSongs.AllSongs[songNr].IsDuet)
|
if (CSongs.AllSongs[songNr].IsDuet)
|
||||||
gm = EGameMode.TR_GAMEMODE_DUET;
|
gm = EGameMode.TR_GAMEMODE_DUET;
|
||||||
|
|
||||||
@@ -894,7 +894,7 @@ namespace Vocaluxe.Screens
|
|||||||
{
|
{
|
||||||
int songNr = ids[CGame.Rand.Next(ids.Count)];
|
int songNr = ids[CGame.Rand.Next(ids.Count)];
|
||||||
|
|
||||||
EGameMode gm = EGameMode.TR_GAMEMODE_NORMAL;
|
var gm = EGameMode.TR_GAMEMODE_NORMAL;
|
||||||
if (CSongs.AllSongs[songNr].IsDuet)
|
if (CSongs.AllSongs[songNr].IsDuet)
|
||||||
gm = EGameMode.TR_GAMEMODE_DUET;
|
gm = EGameMode.TR_GAMEMODE_DUET;
|
||||||
|
|
||||||
@@ -1009,10 +1009,10 @@ namespace Vocaluxe.Screens
|
|||||||
int curSelected = _SongMenus[_SongMenu].GetActualSelection();
|
int curSelected = _SongMenus[_SongMenu].GetActualSelection();
|
||||||
bool firstLevel = CConfig.Tabs == EOffOn.TR_CONFIG_OFF && CSongs.IsInCategory;
|
bool firstLevel = CConfig.Tabs == EOffOn.TR_CONFIG_OFF && CSongs.IsInCategory;
|
||||||
bool secondSort = CConfig.Tabs == EOffOn.TR_CONFIG_ON &&
|
bool secondSort = CConfig.Tabs == EOffOn.TR_CONFIG_ON &&
|
||||||
(CConfig.SongSorting == ESongSorting.TR_CONFIG_ARTIST ||
|
(CConfig.SongSorting == ESongSorting.TR_CONFIG_ARTIST ||
|
||||||
CConfig.SongSorting == ESongSorting.TR_CONFIG_ARTIST_LETTER ||
|
CConfig.SongSorting == ESongSorting.TR_CONFIG_ARTIST_LETTER ||
|
||||||
CConfig.SongSorting == ESongSorting.TR_CONFIG_FOLDER ||
|
CConfig.SongSorting == ESongSorting.TR_CONFIG_FOLDER ||
|
||||||
CConfig.SongSorting == ESongSorting.TR_CONFIG_TITLE_LETTER);
|
CConfig.SongSorting == ESongSorting.TR_CONFIG_TITLE_LETTER);
|
||||||
if (firstLevel && !secondSort)
|
if (firstLevel && !secondSort)
|
||||||
{
|
{
|
||||||
//TODO: What's to do with multiple tags?
|
//TODO: What's to do with multiple tags?
|
||||||
@@ -1029,7 +1029,7 @@ namespace Vocaluxe.Screens
|
|||||||
visibleID = _FindIndex(songs, start, element => element.Artist.StartsWith(letter.ToString(), StringComparison.OrdinalIgnoreCase));
|
visibleID = _FindIndex(songs, start, element => element.Artist.StartsWith(letter.ToString(), StringComparison.OrdinalIgnoreCase));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
//TODO: Does this make sense? Maybe we should deactivate this for years? You could only jump between 1 and 2
|
//TODO: Does this make sense? Maybe we should deactivate this for years? You could only jump between 1 and 2
|
||||||
case ESongSorting.TR_CONFIG_YEAR:
|
case ESongSorting.TR_CONFIG_YEAR:
|
||||||
case ESongSorting.TR_CONFIG_DECADE:
|
case ESongSorting.TR_CONFIG_DECADE:
|
||||||
if (curSelected >= 0 && curSelected < ct - 1 && songs[curSelected].Year.StartsWith(letter.ToString(), StringComparison.OrdinalIgnoreCase))
|
if (curSelected >= 0 && curSelected < ct - 1 && songs[curSelected].Year.StartsWith(letter.ToString(), StringComparison.OrdinalIgnoreCase))
|
||||||
@@ -1076,7 +1076,7 @@ namespace Vocaluxe.Screens
|
|||||||
if (visibleID > -1)
|
if (visibleID > -1)
|
||||||
_SongMenus[_SongMenu].SetSelectedSong(visibleID);
|
_SongMenus[_SongMenu].SetSelectedSong(visibleID);
|
||||||
}
|
}
|
||||||
else if(!CSongs.IsInCategory)
|
else if (!CSongs.IsInCategory)
|
||||||
{
|
{
|
||||||
ReadOnlyCollection<CCategory> categories = CSongs.Categories;
|
ReadOnlyCollection<CCategory> categories = CSongs.Categories;
|
||||||
int ct = categories.Count;
|
int ct = categories.Count;
|
||||||
@@ -1126,27 +1126,26 @@ namespace Vocaluxe.Screens
|
|||||||
|
|
||||||
private void _ToggleSongOptions(ESongOptionsView view)
|
private void _ToggleSongOptions(ESongOptionsView view)
|
||||||
{
|
{
|
||||||
|
_SelectSlides[_SelectSlideOptionsMode].Visible = false;
|
||||||
|
_SelectSlides[_SelectSlideOptionsPlaylistAdd].Visible = false;
|
||||||
|
_SelectSlides[_SelectSlideOptionsPlaylistOpen].Visible = false;
|
||||||
|
_SelectSlides[_SelectSlideOptionsNumMedleySongs].Visible = false;
|
||||||
|
_Buttons[_ButtonOptionsClose].Visible = false;
|
||||||
|
_Buttons[_ButtonOptionsSing].Visible = false;
|
||||||
|
_Buttons[_ButtonOptionsPlaylist].Visible = false;
|
||||||
|
_Buttons[_ButtonOptionsRandom].Visible = false;
|
||||||
|
_Buttons[_ButtonOptionsRandomCategory].Visible = false;
|
||||||
|
_Buttons[_ButtonOptionsSingAll].Visible = false;
|
||||||
|
_Buttons[_ButtonOptionsSingAllVisible].Visible = false;
|
||||||
|
_Buttons[_ButtonOptionsOpenSelectedItem].Visible = false;
|
||||||
|
_Buttons[_ButtonOptionsRandomMedley].Visible = false;
|
||||||
|
_Buttons[_ButtonOptionsStartMedley].Visible = false;
|
||||||
|
_Texts[_TextOptionsTitle].Visible = false;
|
||||||
|
_Statics[_StaticOptionsBG].Visible = false;
|
||||||
|
_Buttons[_ButtonOpenOptions].Visible = true;
|
||||||
|
|
||||||
_SelectSlides[_SelectSlideOptionsMode].Visible = false;
|
if (CSongs.VisibleSongs.Count > 0)
|
||||||
_SelectSlides[_SelectSlideOptionsPlaylistAdd].Visible = false;
|
{
|
||||||
_SelectSlides[_SelectSlideOptionsPlaylistOpen].Visible = false;
|
|
||||||
_SelectSlides[_SelectSlideOptionsNumMedleySongs].Visible = false;
|
|
||||||
_Buttons[_ButtonOptionsClose].Visible = false;
|
|
||||||
_Buttons[_ButtonOptionsSing].Visible = false;
|
|
||||||
_Buttons[_ButtonOptionsPlaylist].Visible = false;
|
|
||||||
_Buttons[_ButtonOptionsRandom].Visible = false;
|
|
||||||
_Buttons[_ButtonOptionsRandomCategory].Visible = false;
|
|
||||||
_Buttons[_ButtonOptionsSingAll].Visible = false;
|
|
||||||
_Buttons[_ButtonOptionsSingAllVisible].Visible = false;
|
|
||||||
_Buttons[_ButtonOptionsOpenSelectedItem].Visible = false;
|
|
||||||
_Buttons[_ButtonOptionsRandomMedley].Visible = false;
|
|
||||||
_Buttons[_ButtonOptionsStartMedley].Visible = false;
|
|
||||||
_Texts[_TextOptionsTitle].Visible = false;
|
|
||||||
_Statics[_StaticOptionsBG].Visible = false;
|
|
||||||
_Buttons[_ButtonOpenOptions].Visible = true;
|
|
||||||
|
|
||||||
if (CSongs.VisibleSongs.Count > 0)
|
|
||||||
{
|
|
||||||
_SongOptionsActive = view != ESongOptionsView.None;
|
_SongOptionsActive = view != ESongOptionsView.None;
|
||||||
|
|
||||||
if (_SongOptionsActive)
|
if (_SongOptionsActive)
|
||||||
@@ -1170,7 +1169,7 @@ namespace Vocaluxe.Screens
|
|||||||
|
|
||||||
private void _ShowSongOptionsSong()
|
private void _ShowSongOptionsSong()
|
||||||
{
|
{
|
||||||
EGameMode lastMode = EGameMode.TR_GAMEMODE_NORMAL;
|
var lastMode = EGameMode.TR_GAMEMODE_NORMAL;
|
||||||
if (_AvailableGameModes.Count > 0)
|
if (_AvailableGameModes.Count > 0)
|
||||||
lastMode = _AvailableGameModes[_SelectSlides[_SelectSlideOptionsMode].Selection];
|
lastMode = _AvailableGameModes[_SelectSlides[_SelectSlideOptionsMode].Selection];
|
||||||
_AvailableGameModes.Clear();
|
_AvailableGameModes.Clear();
|
||||||
|
|||||||
Reference in new issue
Block a user