Merge pull request #126 from flokuep/develop

Some minor fixes.
This commit is contained in:
Stephan Sundermann committed 2014-12-19 18:38:23 +01:00
commit 76859942b8
7 files changed
+15 -16

No files matched your search

-2
View File
@@ -210,8 +210,6 @@
<string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Cámaras web</string> <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Cámaras web</string>
<string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Resolución cámara 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_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_TOPLEFT">Arriba izquierda</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Abajo derecha</string> <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Abajo derecha</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMLEFT">Abajo izquierda</string> <string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMLEFT">Abajo izquierda</string>
+4 -2
View File
@@ -93,6 +93,7 @@
<string name="TR_SCREENMAIN_BUTTON_PARTY">Party</string> <string name="TR_SCREENMAIN_BUTTON_PARTY">Party</string>
<string name="TR_SCREENMAIN_BUTTON_OPTIONS">Alternativ</string> <string name="TR_SCREENMAIN_BUTTON_OPTIONS">Alternativ</string>
<string name="TR_SCREENMAIN_BUTTON_PROFILES">Profiler</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_TITLE">Party Läge Väljare</string>
<string name="TR_SCREENPARTY_MODES">Party Läge</string> <string name="TR_SCREENPARTY_MODES">Party Läge</string>
<string name="TR_SCREENPARTY_DESCRIPTION">Beskrivning</string> <string name="TR_SCREENPARTY_DESCRIPTION">Beskrivning</string>
@@ -100,6 +101,7 @@
<string name="TR_SCREENPARTY_VERSION">Version</string> <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">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_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_TARGETAUDIENCE">Mål publik</string>
<string name="TR_SCREENPARTY_NOTEAMS">Inga lag</string> <string name="TR_SCREENPARTY_NOTEAMS">Inga lag</string>
<string name="TR_SCREENPARTY_NUMTEAMS">Antal 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_WEBCAMDEVICES">Webkameror</string>
<string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Webkamera Upplösning</string> <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Webkamera Upplösning</string>
<string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Skärmjusteringar</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_TOPLEFT">Överst till vänster</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Överst till höger</string> <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Överst till höger</string>
<string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMLEFT">Nederst till vänster</string> <string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMLEFT">Nederst till vänster</string>
@@ -436,8 +436,6 @@ namespace VocaluxeLib.PartyModes.Challenge
GameData.Results[i, j] = 0; GameData.Results[i, j] = 0;
} }
} }
else
{
SPlayer[] results = CBase.Game.GetPlayers(); SPlayer[] results = CBase.Game.GetPlayers();
if (results == null) if (results == null)
return; return;
@@ -473,7 +471,7 @@ namespace VocaluxeLib.PartyModes.Challenge
GameData.ResultTable[index] = row; GameData.ResultTable[index] = row;
} }
}
GameData.ResultTable.Sort(); GameData.ResultTable.Sort();
@@ -196,7 +196,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
case EStage.Main: case EStage.Main:
return _Screens["CPartyScreenChallengeMedleyMain"]; return _Screens["CPartyScreenChallengeMedleyMain"];
case EStage.Singing: case EStage.Singing:
return CBase.Graphics.GetScreen(EScreen.Song); return CBase.Graphics.GetScreen(EScreen.Sing);
default: default:
throw new ArgumentException("Invalid stage: " + _Stage); throw new ArgumentException("Invalid stage: " + _Stage);
} }
@@ -508,8 +508,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
GameData.Results[i, j] = 0; GameData.Results[i, j] = 0;
} }
} }
else
{
CPoints gamePoints = CBase.Game.GetPoints(); CPoints gamePoints = CBase.Game.GetPoints();
if (gamePoints == null || gamePoints.NumPlayer < GameData.NumPlayerAtOnce) if (gamePoints == null || gamePoints.NumPlayer < GameData.NumPlayerAtOnce)
return; return;
@@ -563,7 +562,6 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
GameData.ResultTable[index] = row; GameData.ResultTable[index] = row;
} }
} }
}
GameData.ResultTable.Sort(); GameData.ResultTable.Sort();
+3 -2
View File
@@ -629,10 +629,11 @@ namespace Vocaluxe.Screens
_SongMenu.OnShow(); _SongMenu.OnShow();
if (_Sso.Selection.PartyMode) if (_Sso.Selection.PartyMode)
{
_PlaylistActive = false; _PlaylistActive = false;
if (_Sso.Selection.PartyMode)
_ToggleSongOptions(ESongOptionsView.None); _ToggleSongOptions(ESongOptionsView.None);
_SelectElement(_Buttons[_ButtonStart]);
}
_SongMenu.Selected = !_PlaylistActive; _SongMenu.Selected = !_PlaylistActive;
_SongMenu.SmallView = _Playlist.Visible; _SongMenu.SmallView = _Playlist.Visible;
+3 -3
View File
@@ -80,7 +80,7 @@
"keyboardButtonShift": "Shift", "keyboardButtonShift": "Shift",
"keyboardButtonAlt": "Alt", "keyboardButtonAlt": "Alt",
"keyboardButtonCtrl": "Control", "keyboardButtonCtrl": "Control",
"keyboardButtonBackspace": "Backspace", "keyboardButtonBackspace": "Backsteg",
"keyboardAutoSend": "Auto send keys", "keyboardAutoSend": "Auto skicka knappar",
"keyboardButtonSend": "Send" "keyboardButtonSend": "Skicka"
} }
+2
View File
@@ -1037,6 +1037,7 @@ namespace VocaluxeLib.Menu
Cover = new CStatic(_Theme.StaticCover, _PartyModeID) Cover = new CStatic(_Theme.StaticCover, _PartyModeID)
}; };
en.Cover.LoadSkin();
en.Cover.Y += Rect.Y + (i * _Theme.EntryHeight); en.Cover.Y += Rect.Y + (i * _Theme.EntryHeight);
en.Cover.X += Rect.X; en.Cover.X += Rect.X;
@@ -1045,6 +1046,7 @@ namespace VocaluxeLib.Menu
en.Text1.Y += Rect.Y + (i * _Theme.EntryHeight); en.Text1.Y += Rect.Y + (i * _Theme.EntryHeight);
en.SelectSlide = new CSelectSlide(_SelectSlideGameMode); en.SelectSlide = new CSelectSlide(_SelectSlideGameMode);
en.SelectSlide.LoadSkin();
en.SelectSlide.X += Rect.X; en.SelectSlide.X += Rect.X;
en.SelectSlide.Y += Rect.Y + (i * _Theme.EntryHeight); en.SelectSlide.Y += Rect.Y + (i * _Theme.EntryHeight);