From 227a14582ce5cdbf495bfcadd6b294da626a3779 Mon Sep 17 00:00:00 2001 From: Florian Kuepper Date: Sun, 23 Dec 2012 14:38:07 +0100 Subject: [PATCH 1/3] Theme-update to table. --- .../Screens/PartyScreenChallengeMain.xml | 21 ++++++++++--------- .../PartyScreenChallengeMain.cs | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Output/PartyModes/Challenge/Screens/PartyScreenChallengeMain.xml b/Output/PartyModes/Challenge/Screens/PartyScreenChallengeMain.xml index 946b68dc..45263b87 100644 --- a/Output/PartyModes/Challenge/Screens/PartyScreenChallengeMain.xml +++ b/Output/PartyModes/Challenge/Screens/PartyScreenChallengeMain.xml @@ -126,7 +126,7 @@ 0,00 - 37 + 32 @@ -155,8 +155,9 @@ 0,00 - 37 + 32 + 130 StaticColor @@ -179,12 +180,12 @@ - 400 + 320 100 0,00 - 37 + 32 @@ -208,12 +209,12 @@ - 500 + 400 100 0,00 - 37 + 32 @@ -237,12 +238,12 @@ - 750 + 550 100 0,00 - 37 + 32 @@ -266,12 +267,12 @@ - 850 + 650 100 0,00 - 37 + 32 diff --git a/PartyModeChallenge/PartyScreenChallengeMain.cs b/PartyModeChallenge/PartyScreenChallengeMain.cs index fb589fbd..07ad4834 100644 --- a/PartyModeChallenge/PartyScreenChallengeMain.cs +++ b/PartyModeChallenge/PartyScreenChallengeMain.cs @@ -315,7 +315,7 @@ namespace Vocaluxe.PartyModes row.SingPoints.Y += delta * (i + 1); row.GamePoints.Y += delta * (i + 1); - row.Pos.Text = (i + 1).ToString() + ")"; + row.Pos.Text = (i + 1).ToString() + "."; row.Pos.Visible = false; row.Name.Visible = false; From c5e15aa699c59c25bf5d5d0f8cc01961972838ae Mon Sep 17 00:00:00 2001 From: Florian Kuepper Date: Sun, 23 Dec 2012 14:41:39 +0100 Subject: [PATCH 2/3] Theme-update to popup in challenge-main. --- .../Screens/PartyScreenChallengeMain.xml | 8 ++++---- Output/Themes/Ambient/Popup.png | Bin 0 -> 6642 bytes 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 Output/Themes/Ambient/Popup.png diff --git a/Output/PartyModes/Challenge/Screens/PartyScreenChallengeMain.xml b/Output/PartyModes/Challenge/Screens/PartyScreenChallengeMain.xml index 45263b87..e327c9a5 100644 --- a/Output/PartyModes/Challenge/Screens/PartyScreenChallengeMain.xml +++ b/Output/PartyModes/Challenge/Screens/PartyScreenChallengeMain.xml @@ -33,11 +33,11 @@ PopupBG - 449 - 261 + 0 + 0 -1,00 - 382 - 198 + 1280 + 720 StaticColor diff --git a/Output/Themes/Ambient/Popup.png b/Output/Themes/Ambient/Popup.png new file mode 100644 index 0000000000000000000000000000000000000000..808680013a3e88e178f74288756b03fa32a60377 GIT binary patch literal 6642 zcmeHLeM}Q)9Ddt@sQ7_%i{hlX8Qhks_<>dt3fnZm6es%-Tw6LpCayvU6zDh2vN;Vx zx0(1Yb#Vi;0TrBF`M4HGM%_B81nmL+(5-_5k5byw7TVJ8y8Y#nB}?|-a(B7>?!7m; z`@K(|_xF45Idx!v+Tw+)76JekXQc0b3xII^mV9siJUr;crh|Bxm$x@FdU5ynL;7QeW2{Su}Xfat1>-LJmG8@8IVY7Kf) zYStT$g-?gw$i81tz+`3xUcB?>#4=yjfp6p)S*`S|s>Fz>ufMvJ<~Y@xO6_qcWDeMt z6;)mq8e)^(y$=oOtVmUK)9n7j5`(~% z>va^LeskasW8#WVKS+0$aDqa)Z-;w_S&$<1tzvOt>Ldpiv4d>OpthA?$4Ox+5KbWZ z7pMP$10Nb1A!dBadsX}@K8JnT4!gEva>Un>tLVgJ`Nc6kW{X*%Rq1`SRaF@5YPGxI z5~z=F{D2J$(Na#=(a|FI62xcTrMEL6nx%>TA^S3ny`S_M1VL3^Yee@ejup};+5ufk z;vJ$xMHEwA2PCo`>`yD+#Z(6;Eas-$bjU!tg0D})+gQh}v?Y0JEf;p0E~)J|#oS5F zT%+R5HTtLW_HdpJ4!T^Dc7~*|(cbn;6MaL&_$*y2EB=Wop>U#;JMOyrJ^K8~8rV25 zNd-a2+43}u=H1Z|J~KBb_BeCo=t${>W(2biGjnZswf&5Zh(Rzk3hAby^SB*oQE{0A{70yCDS%gIsG;{y%!Fp*HW^?A@WS{eIxXpMkLu>GId zJ{a*f=>E>@pLODbl1ua14uf}DD$#{e{`O^{D}fXxJ$LI9^}u+7*gs=;3t*9GVnggh zR&P#RD|+XHJ#f6%HUBmUDi%@y96c?hcl$7$@Jpsmg6@mYjj-y10Uw7H1xWXv0o`hK!p2_<<^*+U4^TcUIBV@i;izqs zXrVvu!sDK zhtE}Fmu2KfYf00&VIr>C{esmTsQq}7H(_zz*w$w*zY&1elF3s)8=YYxf*uZ#LqL17 z`NgD)$SI}#N1Z5gN?_EEIC_E=?m83M?=+D`?TmWNCFra;hoqE7PC2q0wE2F%*l1y0 z@59SROQVjH)I2ageYZuSm@U~4QbCwB+ZQ+UYl?ba(C^fZE7XB4FN4i;nz$pp8-l3I z$=!QPBR7G4DVm@i|9R;4;PBz;tl0-bX-PNXaN@@gVX2`oe>pKpfIu+ef4Uu{UGXf{ z`7n^H|Fb1rL}%Sz0emq^>R2IPs`7%VAJh?0Ton_ zxI#_2g_6&xG!}DC2i^G?&lZCy&2S5npOiQ%FyOW9fzA@>)%`xSQ&qX%L+fd>46Z`Q z5(kGRt1)v+5w3Tt+iZgqWuk5XW~Oiavcac5N?X`v2$(gaheBySAJU@Za_MB#y7eidFO*{zdQy!0>PYLga)4zYVrgzR-dz&$Or zPxhy~3yp^AGD|>ys#HcnwxUyGM%tD%out{*Oa;910QHHodIL{geJNxwfx^FQG{V^- u>@C9MBfLz!HV_~XAQ0C6fATWtBG=VF-6>TzEeJK+j6M5zH^27&$A18`B_?_R literal 0 HcmV?d00001 From 3992f1911849f94d4887e1201a16bf1779b8f61b Mon Sep 17 00:00:00 2001 From: Florian Kuepper Date: Sun, 23 Dec 2012 14:49:44 +0100 Subject: [PATCH 3/3] Auto-focus to NextRound-Button in challenge-main & fix to avoid crash. --- .../PartyScreenChallengeMain.cs | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/PartyModeChallenge/PartyScreenChallengeMain.cs b/PartyModeChallenge/PartyScreenChallengeMain.cs index 07ad4834..a4fab9f5 100644 --- a/PartyModeChallenge/PartyScreenChallengeMain.cs +++ b/PartyModeChallenge/PartyScreenChallengeMain.cs @@ -205,6 +205,8 @@ namespace Vocaluxe.PartyModes Buttons[htButtons(ButtonExit)].Visible = true; } + SetInteractionToButton(Buttons[htButtons(ButtonNextRound)]); + ShowPopup(false); } @@ -245,7 +247,8 @@ namespace Vocaluxe.PartyModes Buttons[htButtons(ButtonPopupYes)].Visible = ExitPopupVisible; Buttons[htButtons(ButtonPopupNo)].Visible = ExitPopupVisible; - SetInteractionToButton(Buttons[htButtons(ButtonPopupNo)]); + if (ExitPopupVisible) + SetInteractionToButton(Buttons[htButtons(ButtonPopupNo)]); } private void Back() @@ -282,13 +285,24 @@ namespace Vocaluxe.PartyModes private void UpdateNextPlayerContents() { - SProfile[] profiles = _Base.Profiles.GetProfiles(); - for (int i = 0; i < GameState.NumPlayerAtOnce; i++) + if (GameState.CurrentRoundNr <= GameState.Combs.Count) { - int pid = GameState.Combs[GameState.CurrentRoundNr - 1].Player[i]; - NextPlayerStatics[i].Texture = profiles[GameState.ProfileIDs[pid]].Avatar.Texture; - NextPlayerTexts[i].Text = profiles[GameState.ProfileIDs[pid]].PlayerName; - NextPlayerTexts[i].Color = _Base.Theme.GetPlayerColor((i+1)); + SProfile[] profiles = _Base.Profiles.GetProfiles(); + for (int i = 0; i < GameState.NumPlayerAtOnce; i++) + { + int pid = GameState.Combs[GameState.CurrentRoundNr - 1].Player[i]; + NextPlayerStatics[i].Texture = profiles[GameState.ProfileIDs[pid]].Avatar.Texture; + NextPlayerTexts[i].Text = profiles[GameState.ProfileIDs[pid]].PlayerName; + NextPlayerTexts[i].Color = _Base.Theme.GetPlayerColor((i + 1)); + } + } + else + { + for (int i = 0; i < GameState.NumPlayerAtOnce; i++) + { + NextPlayerStatics[i].Visible = false; + NextPlayerTexts[i].Visible = false; + } } }