Merge remote-tracking branch 'upstream/develop' into medley

Vocaluxe/Base/CSongs.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -612,21 +613,7 @@ namespace Vocaluxe.Base
                     int NotLetterCat = -1;
                     for (int i=0; i < _SongsSortList.Length; i++)
                     {
-                        Char firstLetter = Char.ToUpper(_SongsSortList[i].SortString[0]);
-
-                        //Fix for german Umlaute
-                        switch (firstLetter)
-                        {
-                            case 'Ä':
-                                firstLetter = 'A';
-                                break;
-                            case 'Ö':
-                                firstLetter = 'O';
-                                break;
-                            case 'Ü':
-                                firstLetter = 'U';
-                                break;
-                        }
+                        Char firstLetter = Char.ToUpper(_SongsSortList[i].SortString.Normalize(NormalizationForm.FormD)[0]);
                         
                         if (!Char.IsLetter(firstLetter))
                         {
@@ -684,21 +671,7 @@ namespace Vocaluxe.Base
                     NotLetterCat = -1;
                     for (int i=0; i < _SongsSortList.Length; i++)
                     {
-                        Char firstLetter = Char.ToUpper(_SongsSortList[i].SortString[0]);
-
-                        //Fix for german Umlaute
-                        switch (firstLetter)
-                        {
-                            case 'Ä':
-                                firstLetter = 'A';
-                                break;
-                            case 'Ö':
-                                firstLetter = 'O';
-                                break;
-                            case 'Ü':
-                                firstLetter = 'U';
-                                break;
-                        }
+                        Char firstLetter = Char.ToUpper(_SongsSortList[i].SortString.Normalize(NormalizationForm.FormD)[0]);
                         
                         if (!Char.IsLetter(firstLetter))
                         {

Vocaluxe/Menu/CMenu.cs

@@ -997,7 +997,8 @@ namespace Vocaluxe.Menu
                     _Interactions[i].Type == EType.TSelectSlide ||
                     _Interactions[i].Type == EType.TStatic ||
                     _Interactions[i].Type == EType.TNameSelection ||
-                    _Interactions[i].Type == EType.TText))
+                    _Interactions[i].Type == EType.TText ||
+                    _Interactions[i].Type == EType.TSongMenu))
                 {
                     ZSort zs = new ZSort();
                     zs.ID = i;

Vocaluxe/Menu/SongMenu/CSongMenu.cs

@@ -33,8 +33,8 @@ namespace Vocaluxe.Menu.SongMenu
 
         public bool Visible
         {
-            get { return _SongMenu.IsSelected(); }
-            set { _SongMenu.SetSelected(value); }
+            get { return _SongMenu.IsVisible(); }
+            set { _SongMenu.SetVisible(value); }
         }
 
         public SRectF Rect

Vocaluxe/Menu/SongMenu/CSongMenuFramework.cs

@@ -182,7 +182,7 @@ namespace Vocaluxe.Menu.SongMenu
 
         public SRectF GetRect()
         {
-            return Rect;
+            return _Rect;
         }
 
         public SColorF Color

Vocaluxe/Screens/CScreenSong.cs

@@ -313,7 +313,6 @@ namespace Vocaluxe.Screens
         public override bool Draw()
         {
             base.Draw();
-            SongMenus[htSongMenus(SongMenu)].Draw();
 
             if (_SongOptionsActive)
             {