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

Merge branch 'Flamefire/develop' into develop

Browse Source 
Conflicts:
	VocaluxeLib/Menu/SongMenu/CSong.cs
This commit is contained in:
Alexander Eckart committed 2013-02-25 22:50:38 +01:00
2 parents ce46c75415 13e856db16
commit c3fcd71589
16 files changed
+358 -767
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VocaluxeLib/Menu/SongMenu/CSong.cs
+14 -10
View File
@@ -31,10 +31,15 @@ namespace Vocaluxe.Menu.SongMenu
public class CCategory
{
public string Name = String.Empty;
private STexture _CoverTextureSmall = new STexture();
private STexture _CoverTextureBig = new STexture();
private STexture _CoverTextureSmall = new STexture(-1);
private STexture _CoverTextureBig = new STexture(-1);
private bool _CoverBigLoaded = false;
public CCategory(string name)
{
Name = name;
}
public STexture CoverTextureSmall
{
get { return _CoverTextureSmall; }
@@ -201,7 +206,8 @@ namespace Vocaluxe.Menu.SongMenu
public List<string> Edition = new List<string>();
public List<string> Genre = new List<string>();
public string Year = "0000";
public string Year = "";
public List<string> Language = new List<string>();
// Notes
@@ -474,7 +480,7 @@ namespace Vocaluxe.Menu.SongMenu
break;
case "YEAR":
int num = 0;
if (Value.Length == 4 && int.TryParse(Value, out num))
if (Value.Length == 4 && int.TryParse(Value, out num) && num != 0)
{
this.Year = Value;
}
@@ -842,11 +848,9 @@ namespace Vocaluxe.Menu.SongMenu
private void CheckFiles()
{
CHelper Helper = new CHelper();
if(this.CoverFileName == String.Empty){
List<string> files = Helper.ListFiles(this.Folder, "*.jpg", false);
files.AddRange(Helper.ListFiles(this.Folder, "*.png", false));
List<string> files = CHelper.ListFiles(this.Folder, "*.jpg", false);
files.AddRange(CHelper.ListFiles(this.Folder, "*.png", false));
foreach(String file in files)
{
if (Regex.IsMatch(file, @".[CO].", RegexOptions.IgnoreCase) && (Regex.IsMatch(file, @"" + Regex.Escape(this.Title), RegexOptions.IgnoreCase) || Regex.IsMatch(file, @"" + Regex.Escape(this.Artist), RegexOptions.IgnoreCase)))
@@ -858,8 +862,8 @@ namespace Vocaluxe.Menu.SongMenu
if (this.BackgroundFileName == String.Empty)
{
List<string> files = Helper.ListFiles(this.Folder, "*.jpg", false);
files.AddRange(Helper.ListFiles(this.Folder, "*.png", false));
List<string> files = CHelper.ListFiles(this.Folder, "*.jpg", false);
files.AddRange(CHelper.ListFiles(this.Folder, "*.png", false));
foreach (String file in files)
{