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

Merge branch 'release-0.3' of https://github.com/flokuep/Vocaluxe into release-0.3

Browse Source
This commit is contained in:
Stephan Sundermann committed 2013-08-31 13:37:56 +02:00
2 parents eb2dc4b839 eee369b3c7
commit b906f531a5
2 files changed
+37 -33
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Vocaluxe/Base/CDataBase.cs
+1 -1
View File
@@ -483,7 +483,7 @@ namespace Vocaluxe.Base
command.ExecuteNonQuery();
command.CommandText = "CREATE TABLE IF NOT EXISTS Songs ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " +
"Artist TEXT NOT NULL, Title TEXT NOT NULL, NumPlayed INTEGER);";
"Artist TEXT NOT NULL, Title TEXT NOT NULL, NumPlayed INTEGER, DateAdded BIGING);";
command.ExecuteNonQuery();
command.CommandText = "CREATE TABLE IF NOT EXISTS Scores ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " +
Vocaluxe/Screens/CScreenSong.cs
+36 -32
View File
@@ -1126,41 +1126,45 @@ namespace Vocaluxe.Screens
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;
_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;
_SongOptionsActive = view != ESongOptionsView.None;
if (CSongs.VisibleSongs.Count > 0)
{
_SongOptionsActive = view != ESongOptionsView.None;
if (_SongOptionsActive)
{
//Has to be done here otherwhise changed playlist names will not appear until OnShow is called!
_UpdatePlaylistNames();
if (_SongOptionsActive)
{
//Has to be done here otherwhise changed playlist names will not appear until OnShow is called!
_UpdatePlaylistNames();
_Texts[_TextOptionsTitle].Visible = true;
_Buttons[_ButtonOptionsClose].Visible = true;
_Statics[_StaticOptionsBG].Visible = true;
_Buttons[_ButtonOpenOptions].Visible = false;
if (view == ESongOptionsView.Song)
_ShowSongOptionsSong();
else if (view == ESongOptionsView.General)
_ShowSongOptionsGeneral();
else if (view == ESongOptionsView.Medley)
_ShowSongOptionsMedley();
_Texts[_TextOptionsTitle].Visible = true;
_Buttons[_ButtonOptionsClose].Visible = true;
_Statics[_StaticOptionsBG].Visible = true;
_Buttons[_ButtonOpenOptions].Visible = false;
if (view == ESongOptionsView.Song)
_ShowSongOptionsSong();
else if (view == ESongOptionsView.General)
_ShowSongOptionsGeneral();
else if (view == ESongOptionsView.Medley)
_ShowSongOptionsMedley();
}
}
}