abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Adding a list of currently playing players. Available at Ctrl+P

Browse Source 
The system.cfg change only adds Ctrl+P hotkey.

This was SVN commit r6282.
This commit is contained in:
freenity 2008-07-25 18:17:18 +00:00
parent 728e7550eb
commit 837ef022bd
4 changed files with 127 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
binaries/data/config/system.cfg
View File

@ -181,6 +181,7 @@ hotkey.session.minimap.toggle = "Shift+M" ; Toggle Map Orb.
hotkey.resourcepool.toggle = "Shift+R" ; Toggle Resource Pool.
hotkey.grouppane.toggle = "Shift+G" ; Toggle Group Pane.
hotkey.teamtray.toggle = "Shift+T" ; Toggle Team Tray.
hotkey.session.ShowPlayersList = "Shift+P" ; Toggle Players List
; > SESSION ORIENTATION KEYS
hotkey.session.gui.flip = "Alt+G" ; Toggle GUI to top/bottom/left/right of screen.

78
binaries/data/mods/official/gui/test/4_session.xml
View File

@ -354,7 +354,81 @@
style="globalMessageStyle"
>
</object>
<!-- Players list -->
<object name="PlayersList"
type="text"
hotkey="session.ShowPlayersList"
style="PlayersListStyle"
>
<action on="Press"><![CDATA[
togglePlayersList();
]]></action>
<object name="Player_1"
type="text"
style="PlayerStyle"
size="0% 0% 100% 100%"
>
</object>
<object name="Player_2"
type="text"
style="PlayerStyle"
size="0% 0%+14 100% 100%"
>
</object>
<object name="Player_3"
type="text"
style="PlayerStyle"
size="0% 0%+28 100% 100%"
>
</object>
<object name="Player_4"
type="text"
style="PlayerStyle"
>
</object>
<object name="Player_5"
type="text"
style="PlayerStyle"
>
</object>
<object name="Player_6"
type="text"
style="PlayerStyle"
>
</object>
<object name="Player_7"
type="text"
style="PlayerStyle"
>
</object>
<object name="Player_8"
type="text"
style="PlayerStyle"
>
<action on="Load"><![CDATA[
//Sets correct coordinates for each text object.
for (var i=1; i<=8; i++)
{
addCrds("Player_"+i, 0, 0, 0, i*14, 0, 0, 100, 100);
}
]]></action>
</object>
</object>
<!-- GROUP: STATUS PANE -->
<object name="snStatusPane"
hotkey="session.statuspane.toggle"
@ -546,7 +620,7 @@
// Set width as either icon (odd) or text (even).
if (loop % 2 == 0)
tempWidth = (currCrd.coord[rb].width/max + 7);
tempWidth = (currCrd.coord[rb].width/max + 7);
else
tempWidth = 16;

30
binaries/data/mods/official/gui/test/functions_page_session.js
View File

@ -375,4 +375,34 @@ function confirmLeave()
{
exit();
}
}
// ====================================================================
playersList_init = false;
function togglePlayersList()
{
//Initialization of names and colors.
if (!playersList_init)
{
playersList_init = true;
for (var i=1; i<=8; i++)
{
if (players[i].active)
{
getGUIObjectByName("Player_" + (8-i+1)).caption = players[i].name;
var col_r = parseInt(players[i].getColour().r * 255);
var col_g = parseInt(players[i].getColour().g * 255);
var col_b = parseInt(players[i].getColour().b * 255);
getGUIObjectByName("Player_" + (8-i+1)).textcolor = col_r + " " + col_g + " " + col_b;
}
}
}
var pl = getGUIObjectByName("PlayersList");
pl.hidden = ! pl.hidden;
}

21
binaries/data/mods/official/gui/test/styles.xml
View File

@ -535,6 +535,7 @@
sprite_disabled="snIconArcLeftDisabled"
tooltip_style="snToolTip"
ghost="false"
enabled="true"
/>
<style name="snMiniMapArcUp"
@ -542,7 +543,8 @@
sprite_over="snIconArcUpOver"
sprite_disabled="snIconArcUpDisabled"
tooltip_style="snToolTip"
ghost="false"
ghost="false"
enabled="true"
/>
<style name="snMiniMapButton"
@ -555,6 +557,7 @@
sprite_over="snIconSheetMiniMapButtonOver"
sprite_disabled="snIconSheetMiniMapButtonDisabled"
ghost="false"
enabled="true"
/>
<style name="snGreenBar"
@ -789,5 +792,21 @@ NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET
font="trebuchet14b"
size="19 150 100% 30%"
/>
<style name="PlayersListStyle"
hidden="true"
text_align="right"
text_valign="bottom"
textcolor="white"
ghost="true"
font="trebuchet14"
size="100%-500 100%-320 100% 100%-180"
/>
<style name="PlayerStyle"
ghost="true"
textcolor="white"
text_align="right"
/>
</styles>