Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added scroll-buttons (without function yet).

Browse Source
This commit is contained in:
Florian Kuepper committed 2012-12-23 23:46:33 +01:00
1 parent c9f326fcf4
commit d5fe8274b1
8 files changed
+140 -25
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/PartyModes/Challenge/Screens/PartyScreenChallengeMain.xml
+105 -7
View File
@@ -122,7 +122,7 @@
<TextPosition>
<!--<X>, <Y>: Text position-->
<X>40</X>
<Y>100</Y>
<Y>102</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
@@ -151,7 +151,7 @@
<TextPlayerName>
<!--<X>, <Y>: Text position-->
<X>50</X>
<Y>100</Y>
<Y>102</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
@@ -181,7 +181,7 @@
<TextNumPlayed>
<!--<X>, <Y>: Text position-->
<X>260</X>
<Y>100</Y>
<Y>102</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
@@ -210,7 +210,7 @@
<TextWon>
<!--<X>, <Y>: Text position-->
<X>340</X>
<Y>100</Y>
<Y>102</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
@@ -239,7 +239,7 @@
<TextSingPoints>
<!--<X>, <Y>: Text position-->
<X>490</X>
<Y>100</Y>
<Y>102</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
@@ -268,7 +268,7 @@
<TextGamePoints>
<!--<X>, <Y>: Text position-->
<X>590</X>
<Y>100</Y>
<Y>102</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
@@ -356,7 +356,7 @@
<TextRoundNumber>
<!--<X>, <Y>: Text position-->
<X>660</X>
<Y>100</Y>
<Y>102</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
@@ -726,5 +726,103 @@
<Height>26</Height>
</SReflection>
</ButtonPopupNo>
<ButtonPlayerScrollUp>
<!--<Skin>: Texture name-->
<Skin>ScrollUp</Skin>
<!--<SkinSelected>: Texture name for selected button-->
<SkinSelected>ScrollUp</SkinSelected>
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
<X>281</X>
<Y>94</Y>
<Z>-0,01</Z>
<W>28</W>
<H>15</H>
<!--<Color>: Button color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>ButtonColor</Color>
<!--<SColor>: Selected button color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>ButtonSColor</SColor>
<Text>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>ButtonTextColor</Color>
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Nothing or translation tag-->
<Text />
</Text>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
<!--<SReflection> If exists:-->
<!-- <Space>: Reflection Space of selected button-->
<!-- <Height>: Reflection Height of selected button-->
</ButtonPlayerScrollUp>
<ButtonPlayerScrollDown>
<!--<Skin>: Texture name-->
<Skin>ScrollDown</Skin>
<!--<SkinSelected>: Texture name for selected button-->
<SkinSelected>ScrollDown</SkinSelected>
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
<X>281</X>
<Y>515</Y>
<Z>-0,01</Z>
<W>28</W>
<H>15</H>
<!--<Color>: Button color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>ButtonColor</Color>
<!--<SColor>: Selected button color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>ButtonSColor</SColor>
<Text>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>ButtonTextColor</Color>
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Nothing or translation tag-->
<Text />
</Text>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
<!--<SReflection> If exists:-->
<!-- <Space>: Reflection Space of selected button-->
<!-- <Height>: Reflection Height of selected button-->
</ButtonPlayerScrollDown>
</PartyScreenChallengeMain>
</root>
Output/Themes/Ambient/ScrollDown.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

Output/Themes/Ambient/ScrollUp.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

Output/Themes/Ambient/Skin Blue.xml
+2
View File
@@ -337,6 +337,8 @@
<Plus>Plus.png</Plus>
<Random>Random.png</Random>
<PopupBG>Popup.png</PopupBG>
<ScrollUp>ScrollUp.png</ScrollUp>
<ScrollDown>ScrollDown.png</ScrollDown>
</Skins>
<Videos>
<BG_Video>[Blue]BG_Video.mp4</BG_Video>
Output/Themes/Ambient/Skin Green.xml
+3 -1
View File
@@ -330,7 +330,9 @@
<Minus>Minus.png</Minus>
<Plus>Plus.png</Plus>
<Random>Random.png</Random>
<PopupBG>Popup.png</PopupBG>
<PopupBG>Popup.png</PopupBG>
<ScrollUp>ScrollUp.png</ScrollUp>
<ScrollDown>ScrollDown.png</ScrollDown>
</Skins>
<Videos>
<BG_Video>[Green]BG_Video.mp4</BG_Video>
Output/Themes/Ambient/Skin Red.xml
+2
View File
@@ -331,6 +331,8 @@
<Plus>Plus.png</Plus>
<Random>Random.png</Random>
<PopupBG>Popup.png</PopupBG>
<ScrollUp>ScrollUp.png</ScrollUp>
<ScrollDown>ScrollDown.png</ScrollDown>
</Skins>
<Videos>
<BG_Video>[Red]BG_Video.mp4</BG_Video>
Output/Themes/Ambient/Skin Yellow.xml
+2
View File
@@ -331,6 +331,8 @@
<Plus>Plus.png</Plus>
<Random>Random.png</Random>
<PopupBG>Popup.png</PopupBG>
<ScrollUp>ScrollUp.png</ScrollUp>
<ScrollDown>ScrollDown.png</ScrollDown>
</Skins>
<Videos>
<BG_Video>[Yellow]BG_Video.mp4</BG_Video>
PartyModeChallenge/PartyScreenChallengeMain.cs
+26 -17
View File
@@ -47,6 +47,9 @@ namespace Vocaluxe.PartyModes
const string ButtonExit = "ButtonExit";
const string ButtonPopupYes = "ButtonPopupYes";
const string ButtonPopupNo = "ButtonPopupNo";
const string ButtonPlayerScrollUp = "ButtonPlayerScrollUp";
const string ButtonPlayerScrollDown = "ButtonPlayerScrollDown";
const string StaticPopupBG = "StaticPopupBG";
const string StaticNextPlayer = "StaticNextPlayer";
@@ -55,13 +58,16 @@ namespace Vocaluxe.PartyModes
private DataFromScreen Data;
private DataToScreenMain GameState;
private List<TableRow> Table;
private List<TableRow> PlayerTable;
private List<RoundsTableRow> RoundsTable;
private List<CText> NextPlayerTexts;
private List<CStatic> NextPlayerStatics;
private SRectF RoundsTableScrollArea;
private SRectF PlayerTableScrollArea;
private int RoundsTableOffset = 0;
private int PlayerTableOffset = 0;
public PartyScreenChallengeMain()
{
@@ -75,7 +81,7 @@ namespace Vocaluxe.PartyModes
_ThemeName = "PartyScreenChallengeMain";
_ThemeTexts = new string[] { TextPosition, TextPlayerName, TextNumPlayed, TextWon, TextSingPoints, TextGamePoints, TextNextPlayer, TextPopupReallyExit, TextRoundNumber, TextRoundPlayer, TextRoundScore };
_ThemeButtons = new string[] { ButtonNextRound, ButtonBack, ButtonExit, ButtonPopupYes, ButtonPopupNo };
_ThemeButtons = new string[] { ButtonNextRound, ButtonBack, ButtonExit, ButtonPopupYes, ButtonPopupNo, ButtonPlayerScrollDown, ButtonPlayerScrollUp };
_ThemeStatics = new string[] { StaticPopupBG, StaticNextPlayer };
_ScreenVersion = ScreenVersion;
}
@@ -85,7 +91,7 @@ namespace Vocaluxe.PartyModes
base.LoadTheme(XmlPath);
GameState = new DataToScreenMain();
BuildTable();
BuildPlayerTable();
NextPlayerTexts = new List<CText>();
NextPlayerStatics = new List<CStatic>();
@@ -203,7 +209,7 @@ namespace Vocaluxe.PartyModes
{
base.OnShow();
Updatetable();
UpdatePlayerTable(PlayerTableOffset);
UpdateNextPlayerPositions();
UpdateNextPlayerContents();
if(GameState.CurrentRoundNr == 1 || RoundsTable == null)
@@ -398,6 +404,7 @@ namespace Vocaluxe.PartyModes
{
for(int p = 0; p < RoundsTable[i].TextPlayer.Count; p++)
{
RoundsTable[i].Number.Text = (i + 1 + Offset).ToString();
int pID = GameState.ProfileIDs[GameState.Combs[i + Offset].Player[p]];
RoundsTable[i].TextPlayer[p].Text = profile[pID].PlayerName+"";
if ((GameState.CurrentRoundNr - 1) > i)
@@ -408,12 +415,14 @@ namespace Vocaluxe.PartyModes
}
}
private void BuildTable()
private void BuildPlayerTable()
{
Table = new List<TableRow>();
int NumPlayerVisible = 10;
PlayerTable = new List<TableRow>();
float delta = Texts[htTexts(TextPosition)].Height * 1.2f;
for (int i = 0; i < _PartyMode.GetMaxPlayer(); i++)
for (int i = 0; i < NumPlayerVisible; i++)
{
TableRow row = new TableRow();
@@ -447,19 +456,19 @@ namespace Vocaluxe.PartyModes
AddText(row.SingPoints);
AddText(row.GamePoints);
Table.Add(row);
PlayerTable.Add(row);
}
}
private void Updatetable()
private void UpdatePlayerTable(int Offset)
{
SProfile[] profiles = _Base.Profiles.GetProfiles();
for (int i = 0; i < Table.Count; i++)
for (int i = 0; i < PlayerTable.Count; i++)
{
TableRow row = Table[i];
TableRow row = PlayerTable[i+Offset];
if (i < GameState.ResultTable.Count)
if (i+Offset < GameState.ResultTable.Count)
{
row.Pos.Visible = true;
row.Name.Visible = true;
@@ -468,11 +477,11 @@ namespace Vocaluxe.PartyModes
row.SingPoints.Visible = true;
row.GamePoints.Visible = true;
row.Name.Text = profiles[GameState.ResultTable[i].PlayerID].PlayerName;
row.Rounds.Text = GameState.ResultTable[i].NumRounds.ToString();
row.Won.Text = GameState.ResultTable[i].NumWon.ToString();
row.SingPoints.Text = GameState.ResultTable[i].SumSingPoints.ToString();
row.GamePoints.Text = GameState.ResultTable[i].NumGamePoints.ToString();
row.Name.Text = profiles[GameState.ResultTable[i+Offset].PlayerID].PlayerName;
row.Rounds.Text = GameState.ResultTable[i+Offset].NumRounds.ToString();
row.Won.Text = GameState.ResultTable[i+Offset].NumWon.ToString();
row.SingPoints.Text = GameState.ResultTable[i+Offset].SumSingPoints.ToString();
row.GamePoints.Text = GameState.ResultTable[i+Offset].NumGamePoints.ToString();
}
else
{