Merge branch 'develop' of git://github.com/Vocaluxe/Vocaluxe into develop

VocaluxeLib/Menu/CBackground.cs

@@ -84,6 +84,8 @@ namespace VocaluxeLib.Menu
             _PartyModeID = partyModeID;
 
             ThemeLoaded = true;
+
+            LoadSkin();
         }
         #endregion Constructors
 
@@ -163,7 +165,7 @@ namespace VocaluxeLib.Menu
                     ok = _DrawVideo();
                 }
             }
-            else if (_Theme.Type == EBackgroundTypes.SlideShow && _Theme.SlideShowTextures.Count > 0)
+            else if (_Theme.Type == EBackgroundTypes.SlideShow && _SlideShowTextures.Count > 0)
                 ok = _DrawSlideShow();
 
             if (!String.IsNullOrEmpty(_Theme.Skin) && (_Theme.Type == EBackgroundTypes.Texture || !ok))

VocaluxeLib/Menu/CMenuPartyNameSelection.cs

@@ -24,6 +24,17 @@ namespace VocaluxeLib.Menu
 {
     public abstract class CMenuPartyNameSelection : CMenuParty
     {
+        private bool _AllPlayerSelected
+        {
+            get
+            {
+                for (int team = 0; team < _NumTeams; team++)
+                    if (_TeamList[team].Count < _NumPlayerTeams[team])
+                        return false;
+                return true;
+            }
+        }
+
         private bool _Teams;
         protected int _NumTeams = -1;
         protected int _NumPlayer = -1;
@@ -99,12 +110,14 @@ namespace VocaluxeLib.Menu
             _LoadProfiles();
             _UpdateButtonVisibility();
             _UpdateButtonState();
+            _UpdateNextButtonVisibility();
         }
 
         public void SetPartyModeProfiles(List<int>[] teamProfiles)
         {
             _TeamList = teamProfiles;
             _UpdateSlides();
+            _UpdateNextButtonVisibility();
         }
 
         public override bool HandleInput(SKeyEvent keyEvent)
@@ -547,6 +560,7 @@ namespace VocaluxeLib.Menu
 
             _UpdateButtonVisibility();
             _UpdateButtonState();
+            _UpdateNextButtonVisibility();
         }
 
         public abstract void Back();
@@ -716,6 +730,7 @@ namespace VocaluxeLib.Menu
             _TeamList[team].Add(profileID);
 
             _UpdatePlayerSlide();
+            _UpdateNextButtonVisibility();
         }
 
         private void _RemoveAllPlayer()
@@ -737,12 +752,16 @@ namespace VocaluxeLib.Menu
                 _TeamList[team].RemoveAt(index);
                 _NameSelections[_NameSelection].RemoveUsedProfile(id);
             }
+
+            _UpdateNextButtonVisibility();
         }
 
         private void _RemovePlayer(int team, int profileID)
         {
             _TeamList[team].Remove(profileID);
             _NameSelections[_NameSelection].RemoveUsedProfile(profileID);
+
+            _UpdateNextButtonVisibility();
         }
 
         private void _SelectRandom()
@@ -757,6 +776,11 @@ namespace VocaluxeLib.Menu
                 }
             }
         }
+
+        private void _UpdateNextButtonVisibility()
+        {
+            _Buttons[_ButtonNext].Visible = _AllPlayerSelected;
+        }
         #endregion
     }
 }

VocaluxeLib/Menu/CText.cs

@@ -261,7 +261,7 @@ namespace VocaluxeLib.Menu
                      float rheight = 0,
                      float rspace = 0) : this(partyModeID)
         {
-            _Theme = new SThemeText {FontFamily = fontFamily, FontStyle = style, FontHeight = h, Text = text};
+            _Theme = new SThemeText { FontFamily = fontFamily, FontStyle = style, FontHeight = h, Text = text, Color = { A = col.A, B = col.B, G = col.G, R = col.R } };
             ThemeLoaded = false;
             _ButtonText = false;
 

VocaluxeLib/Profile/CProfile.cs

@@ -139,7 +139,7 @@ namespace VocaluxeLib.Profile
                 if (filename == "")
                     filename = "1";
 
-                FilePath = Path.Combine(CBase.Settings.GetDataPath(), CBase.Settings.GetFolderProfiles(), CHelper.GetUniqueFileName(FilePath, filename + ".xml", false));
+                FilePath = CHelper.GetUniqueFileName(Path.Combine(CBase.Settings.GetDataPath(), CBase.Settings.GetFolderProfiles()), filename + ".xml");
             }
 
             var xml = new CXmlSerializer();