Merge pull request #126 from flokuep/develop

Some minor fixes.

Output/Languages/Spanish.xml

@@ -210,8 +210,6 @@
   <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Cámaras web</string>
   <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Resolución cámara web</string>
   <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Ajustes de pantalla</string>
-  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Pulsa CTRL + ALT + SHIFT + Flechas para ajustar la pantalla</string>
-  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">CTRL + ALT + SHIFT + 0 para reiniciar</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT">Arriba izquierda</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Abajo derecha</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMLEFT">Abajo izquierda</string>

Output/Languages/Swedish.xml

@@ -93,6 +93,7 @@
   <string name="TR_SCREENMAIN_BUTTON_PARTY">Party</string>
   <string name="TR_SCREENMAIN_BUTTON_OPTIONS">Alternativ</string>
   <string name="TR_SCREENMAIN_BUTTON_PROFILES">Profiler</string>
+  <string name="TR_SCREENMAIN_TEXT_NOPROFILES">Inga profiler funna!</string>
   <string name="TR_SCREENPARTY_TITLE">Party Läge Väljare</string>
   <string name="TR_SCREENPARTY_MODES">Party Läge</string>
   <string name="TR_SCREENPARTY_DESCRIPTION">Beskrivning</string>
@@ -100,6 +101,7 @@
   <string name="TR_SCREENPARTY_VERSION">Version</string>
   <string name="TR_SCREENPARTY_ERROR">kan ej ladda detta party läge</string>
   <string name="TR_SCREENPARTY_ERROR_MICS">Det finns inga mikrofoner konfigurerade!</string>
+  <string name="TR_SCREENPARTY_ERROR_MIC_NUM">%d mikrofoner krävs för denna party-mode!</string>
   <string name="TR_SCREENPARTY_TARGETAUDIENCE">Mål publik</string>
   <string name="TR_SCREENPARTY_NOTEAMS">Inga lag</string>
   <string name="TR_SCREENPARTY_NUMTEAMS">Antal lag</string>
@@ -211,8 +213,8 @@
   <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Webkameror</string>
   <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Webkamera Upplösning</string>
   <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Skärmjusteringar</string>
-  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Tryck CTRL + ALT +SHIFT + Pilar för att justera skärmen</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Tryck CTR + ALT (+ SHIFT) + Pilar"+" för att justera skärmen</string>
-  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">CTRL + ALT + SHIFT + 0 för att återställa</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">CTR + ALT + 0 för att återställa</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT">Överst till vänster</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Överst till höger</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMLEFT">Nederst till vänster</string>

PartyModes/PartyModeChallenge/CPartyModeChallenge.cs

@@ -436,45 +436,43 @@ namespace VocaluxeLib.PartyModes.Challenge
                         GameData.Results[i, j] = 0;
                 }
             }
-            else
+            SPlayer[] results = CBase.Game.GetPlayers();
+            if (results == null)
+                return;
+
+            if (results.Length < GameData.NumPlayerAtOnce)
+                return;
+
+            for (int j = 0; j < GameData.NumPlayerAtOnce; j++)
+                GameData.Results[GameData.CurrentRoundNr - 2, j] = (int)Math.Round(results[j].Points);
+
+            List<SStats> points = _GetPointsForPlayer(results);
+
+            for (int i = 0; i < GameData.NumPlayerAtOnce; i++)
             {
-                SPlayer[] results = CBase.Game.GetPlayers();
+                int index = -1;
-                if (results == null)
+                for (int j = 0; j < GameData.ResultTable.Count; j++)
-                    return;
-
-                if (results.Length < GameData.NumPlayerAtOnce)
-                    return;
-
-                for (int j = 0; j < GameData.NumPlayerAtOnce; j++)
-                    GameData.Results[GameData.CurrentRoundNr - 2, j] = (int)Math.Round(results[j].Points);
-
-                List<SStats> points = _GetPointsForPlayer(results);
-
-                for (int i = 0; i < GameData.NumPlayerAtOnce; i++)
                 {
-                    int index = -1;
+                    if (points[i].ProfileID == GameData.ResultTable[j].PlayerID)
-                    for (int j = 0; j < GameData.ResultTable.Count; j++)
                     {
-                        if (points[i].ProfileID == GameData.ResultTable[j].PlayerID)
+                        index = j;
-                        {
+                        break;
-                            index = j;
-                            break;
-                        }
                     }
-
-                    if (index == -1)
-                        continue;
-                    CResultTableRow row = GameData.ResultTable[index];
-
-                    row.NumPlayed++;
-                    row.NumWon += points[i].Won;
-                    row.NumSingPoints += points[i].SingPoints;
-                    row.NumGamePoints += points[i].GamePoints;
-
-                    GameData.ResultTable[index] = row;
                 }
+
+                if (index == -1)
+                    continue;
+                CResultTableRow row = GameData.ResultTable[index];
+
+                row.NumPlayed++;
+                row.NumWon += points[i].Won;
+                row.NumSingPoints += points[i].SingPoints;
+                row.NumGamePoints += points[i].GamePoints;
+
+                GameData.ResultTable[index] = row;
             }
             
+
             GameData.ResultTable.Sort();
 
             //Update position-number

PartyModes/PartyModeChallengeMedley/CPartyModeChallengeMedley.cs

@@ -196,7 +196,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
                 case EStage.Main:
                     return _Screens["CPartyScreenChallengeMedleyMain"];
                 case EStage.Singing:
-                    return CBase.Graphics.GetScreen(EScreen.Song);
+                    return CBase.Graphics.GetScreen(EScreen.Sing);
                 default:
                     throw new ArgumentException("Invalid stage: " + _Stage);
             }
@@ -508,60 +508,58 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
                         GameData.Results[i, j] = 0;
                 }
             }
-            else
+            
+            CPoints gamePoints = CBase.Game.GetPoints();
+            if (gamePoints == null || gamePoints.NumPlayer < GameData.NumPlayerAtOnce)
+                return;
+
+            SPlayer[] results = gamePoints.GetPlayer(0, GameData.NumPlayerAtOnce);
+            if (results == null)
+                return;
+
+            if (results.Length < GameData.NumPlayerAtOnce)
+                return;
+
+            if (gamePoints.NumRounds == 0)
+                return;
+
+            for (int i = 1; i < gamePoints.NumRounds; i++)
             {
-                CPoints gamePoints = CBase.Game.GetPoints();
+                SPlayer[] temp = gamePoints.GetPlayer(i, GameData.NumPlayerAtOnce);
-                if (gamePoints == null || gamePoints.NumPlayer < GameData.NumPlayerAtOnce)
+                for (int p = 0; p < GameData.NumPlayerAtOnce; p++)
-                    return;
+                    results[p].Points += temp[p].Points;
+            }
 
-                SPlayer[] results = gamePoints.GetPlayer(0, GameData.NumPlayerAtOnce);
+            for (int j = 0; j < GameData.NumPlayerAtOnce; j++)
-                if (results == null)
+            {
-                    return;
+                results[j].Points = results[j].Points / gamePoints.NumRounds;
+                GameData.Results[GameData.CurrentRoundNr - 2, j] = (int)Math.Round(results[j].Points);
+            }
 
-                if (results.Length < GameData.NumPlayerAtOnce)
+            List<SStats> points = _GetPointsForPlayer(results);
-                    return;
 
-                if (gamePoints.NumRounds == 0)
+            for (int i = 0; i < GameData.NumPlayerAtOnce; i++)
-                    return;
+            {
-
+                int index = -1;
-                for (int i = 1; i < gamePoints.NumRounds; i++)
+                for (int j = 0; j < GameData.ResultTable.Count; j++)
                 {
-                    SPlayer[] temp = gamePoints.GetPlayer(i, GameData.NumPlayerAtOnce);
+                    if (points[i].ProfileID == GameData.ResultTable[j].PlayerID)
-                    for (int p = 0; p < GameData.NumPlayerAtOnce; p++)
+                    {
-                        results[p].Points += temp[p].Points;
+                        index = j;
+                        break;
+                    }
                 }
 
-                for (int j = 0; j < GameData.NumPlayerAtOnce; j++)
+                if (index != -1)
                 {
-                    results[j].Points = results[j].Points / gamePoints.NumRounds;
+                    CResultTableRow row = GameData.ResultTable[index];
-                    GameData.Results[GameData.CurrentRoundNr - 2, j] = (int)Math.Round(results[j].Points);
-                }
 
-                List<SStats> points = _GetPointsForPlayer(results);
+                    row.NumPlayed++;
+                    row.NumWon += points[i].Won;
+                    row.NumSingPoints += points[i].SingPoints;
+                    row.NumGamePoints += points[i].GamePoints;
 
-                for (int i = 0; i < GameData.NumPlayerAtOnce; i++)
+                    GameData.ResultTable[index] = row;
-                {
-                    int index = -1;
-                    for (int j = 0; j < GameData.ResultTable.Count; j++)
-                    {
-                        if (points[i].ProfileID == GameData.ResultTable[j].PlayerID)
-                        {
-                            index = j;
-                            break;
-                        }
-                    }
-
-                    if (index != -1)
-                    {
-                        CResultTableRow row = GameData.ResultTable[index];
-
-                        row.NumPlayed++;
-                        row.NumWon += points[i].Won;
-                        row.NumSingPoints += points[i].SingPoints;
-                        row.NumGamePoints += points[i].GamePoints;
-
-                        GameData.ResultTable[index] = row;
-                    }
                 }
             }
 

Vocaluxe/Screens/CScreenSong.cs

@@ -629,10 +629,11 @@ namespace Vocaluxe.Screens
             _SongMenu.OnShow();
 
             if (_Sso.Selection.PartyMode)
+            {
                 _PlaylistActive = false;
-
-            if (_Sso.Selection.PartyMode)
                 _ToggleSongOptions(ESongOptionsView.None);
+                _SelectElement(_Buttons[_ButtonStart]);
+            }
 
             _SongMenu.Selected = !_PlaylistActive;
             _SongMenu.SmallView = _Playlist.Visible;

Vocaluxe/Website/locales/sv.json

@@ -80,7 +80,7 @@
     "keyboardButtonShift": "Shift",
     "keyboardButtonAlt": "Alt",
     "keyboardButtonCtrl": "Control",
-    "keyboardButtonBackspace": "Backspace",
+    "keyboardButtonBackspace": "Backsteg",
-    "keyboardAutoSend": "Auto send keys",
+    "keyboardAutoSend": "Auto skicka knappar",
-    "keyboardButtonSend": "Send"
+    "keyboardButtonSend": "Skicka"
 }

VocaluxeLib/Menu/CPlaylist.cs

@@ -1037,6 +1037,7 @@ namespace VocaluxeLib.Menu
                         Cover = new CStatic(_Theme.StaticCover, _PartyModeID)
                     };
 
+                en.Cover.LoadSkin();
                 en.Cover.Y += Rect.Y + (i * _Theme.EntryHeight);
                 en.Cover.X += Rect.X;             
 
@@ -1045,6 +1046,7 @@ namespace VocaluxeLib.Menu
                 en.Text1.Y += Rect.Y + (i * _Theme.EntryHeight);
 
                 en.SelectSlide = new CSelectSlide(_SelectSlideGameMode);
+                en.SelectSlide.LoadSkin();
                 en.SelectSlide.X += Rect.X;
                 en.SelectSlide.Y += Rect.Y + (i * _Theme.EntryHeight);