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

This commit is contained in:
Stephan Sundermann committed 2013-08-31 13:37:56 +02:00
commit b906f531a5
2 files changed
+5 -1

No files matched your search

+1 -1
View File
@@ -483,7 +483,7 @@ namespace Vocaluxe.Base
command.ExecuteNonQuery(); command.ExecuteNonQuery();
command.CommandText = "CREATE TABLE IF NOT EXISTS Songs ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " + 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.ExecuteNonQuery();
command.CommandText = "CREATE TABLE IF NOT EXISTS Scores ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " + command.CommandText = "CREATE TABLE IF NOT EXISTS Scores ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " +
+4
View File
@@ -1126,6 +1126,7 @@ namespace Vocaluxe.Screens
private void _ToggleSongOptions(ESongOptionsView view) private void _ToggleSongOptions(ESongOptionsView view)
{ {
_SelectSlides[_SelectSlideOptionsMode].Visible = false; _SelectSlides[_SelectSlideOptionsMode].Visible = false;
_SelectSlides[_SelectSlideOptionsPlaylistAdd].Visible = false; _SelectSlides[_SelectSlideOptionsPlaylistAdd].Visible = false;
_SelectSlides[_SelectSlideOptionsPlaylistOpen].Visible = false; _SelectSlides[_SelectSlideOptionsPlaylistOpen].Visible = false;
@@ -1144,6 +1145,8 @@ namespace Vocaluxe.Screens
_Statics[_StaticOptionsBG].Visible = false; _Statics[_StaticOptionsBG].Visible = false;
_Buttons[_ButtonOpenOptions].Visible = true; _Buttons[_ButtonOpenOptions].Visible = true;
if (CSongs.VisibleSongs.Count > 0)
{
_SongOptionsActive = view != ESongOptionsView.None; _SongOptionsActive = view != ESongOptionsView.None;
if (_SongOptionsActive) if (_SongOptionsActive)
@@ -1163,6 +1166,7 @@ namespace Vocaluxe.Screens
_ShowSongOptionsMedley(); _ShowSongOptionsMedley();
} }
} }
}
private void _ShowSongOptionsSong() private void _ShowSongOptionsSong()
{ {