mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-27 21:12:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Converted some more screens over

Browse Source 
This was SVN commit r10072.
This commit is contained in:
WhiteTreePaladin
2011-08-23 03:27:13 +00:00
parent a5a8367ed8
commit dc2b2aeff4
20 changed files with 186 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/art/textures/ui/global/border/border-corner.png
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/textures/ui/global/tile/stone_background_light.png
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/textures/ui/global/titlebar/titlebar_left.png
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/textures/ui/global/titlebar/titlebar_middle.png
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/textures/ui/global/titlebar/titlebar_right.png
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_background_left.png
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_background_middle.png
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_background_right.png
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/gui/common/common_sprites.xml
+21 -14
View File
@@ -34,6 +34,12 @@
/> />
</sprite> </sprite>
<sprite name="BackgroundBlack">
<image backcolor="black"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="BackgroundRed"> <sprite name="BackgroundRed">
<image backcolor="80 0 0 255" <image backcolor="80 0 0 255"
size="0 0 100% 100%" size="0 0 100% 100%"
@@ -140,8 +146,8 @@
/> />
</sprite> </sprite>
<!-- Stone Panel --> <!-- StonePanelThinBorder -->
<sprite name="StonePanel"> <sprite name="StonePanelThinBorder">
<image texture="global/tile/stone_background.png" <image texture="global/tile/stone_background.png"
texture_size="0 0 256 256" texture_size="0 0 256 256"
size="4 4 100%-4 100%-4" size="4 4 100%-4 100%-4"
@@ -185,8 +191,8 @@
/> />
</sprite> </sprite>
<!-- Stone Dialog --> <!-- StonePanel -->
<sprite name="StoneDialog"> <sprite name="StonePanel">
<!-- background --> <!-- background -->
<image texture="global/tile/stone_background.png" <image texture="global/tile/stone_background.png"
texture_size="0 0 256 256" texture_size="0 0 256 256"
@@ -232,17 +238,17 @@
<!-- Stone Dialog Title Bar --> <!-- Stone Dialog Title Bar -->
<sprite name="StoneDialogTitleBar"> <sprite name="StoneDialogTitleBar">
<image texture="session/titlebar/titlebar_left.png" <image texture="global/titlebar/titlebar_left.png"
real_texture_placement="0 0 64 32" real_texture_placement="0 0 64 32"
size="50%-128 0 50%-64 32" size="50%-128 0 50%-64 32"
/> />
<image texture="session/titlebar/titlebar_middle.png" <image texture="global/titlebar/titlebar_middle.png"
real_texture_placement="0 0 64 32" real_texture_placement="0 0 64 32"
size="50%-64 0 50%+64 32" size="50%-64 0 50%+64 32"
/> />
<image texture="session/titlebar/titlebar_right.png" <image texture="global/titlebar/titlebar_right.png"
real_texture_placement="0 0 64 32" real_texture_placement="0 0 64 32"
size="50%+64 0 50%+128 32" size="50%+64 0 50%+128 32"
/> />
</sprite> </sprite>
@@ -321,30 +327,31 @@
size="0 0 100% 100%" size="0 0 100% 100%"
/> />
</sprite> </sprite>
<!--
<sprite name="StoneArrowLeft"> <sprite name="StoneArrowLeft">
<image texture="global/button/arrowbox_lt.dds" <image texture="global/button/arrowbox_lt.png"
size="0 0 100% 100%" size="0 0 100% 100%"
/> />
</sprite> </sprite>
<sprite name="StoneArrowLeftOver"> <sprite name="StoneArrowLeftOver">
<image texture="global/button/arrowbox_lt_over.dds" <image texture="global/button/arrowbox_lt_over.png"
size="0 0 100% 100%" size="0 0 100% 100%"
/> />
</sprite> </sprite>
<sprite name="StoneArrowRight"> <sprite name="StoneArrowRight">
<image texture="global/button/arrowbox_rt.dds" <image texture="global/button/arrowbox_rt.png"
size="0 0 100% 100%" size="0 0 100% 100%"
/> />
</sprite> </sprite>
<sprite name="StoneArrowRightOver"> <sprite name="StoneArrowRightOver">
<image texture="global/button/arrowbox_rt_over.dds" <image texture="global/button/arrowbox_rt_over.png"
size="0 0 100% 100%" size="0 0 100% 100%"
/> />
</sprite> </sprite>
-->
<sprite name="StoneArrowUp"> <sprite name="StoneArrowUp">
<image texture="global/button/arrowbox_up.dds" <image texture="global/button/arrowbox_up.dds"
size="0 0 100% 100%" size="0 0 100% 100%"
binaries/data/mods/public/gui/common/common_styles.xml
+30 -15
View File
@@ -29,6 +29,27 @@
text_valign="center" text_valign="center"
/> />
<style name="LeftTabLabelText"
font="serif-bold-stroke-14"
textcolor="gold"
text_align="left"
text_valign="top"
/>
<style name="RightTabLabelText"
font="serif-bold-stroke-14"
textcolor="gold"
text_align="right"
text_valign="top"
/>
<style name="CenteredTabLabelText"
font="serif-bold-stroke-14"
textcolor="gold"
text_align="center"
text_valign="top"
/>
<style name="SmallLeftLabelText" <style name="SmallLeftLabelText"
font="serif-12" font="serif-12"
textcolor="white" textcolor="white"
@@ -36,7 +57,7 @@
text_valign="top" text_valign="top"
/> />
<style name="logoText" <style name="TitleText"
font="serif-bold-stroke-14" font="serif-bold-stroke-14"
textcolor="white" textcolor="white"
text_align="center" text_align="center"
@@ -64,21 +85,15 @@
========================================== ==========================================
--> -->
<style name="StonePanel" <style name="StonePanelThinBorder"
sprite="StonePanel" sprite="StonePanelThinBorder"
buffer_zone="10" buffer_zone="10"
text_align="left" text_align="left"
text_valign="top" text_valign="top"
/> />
<!-- <style name="StonePanel"
========================================== sprite="StonePanel"
MENU DIALOG STYLES
==========================================
-->
<style name="StoneDialog"
sprite="StoneDialog"
buffer_zone="10" buffer_zone="10"
text_align="left" text_align="left"
text_valign="top" text_valign="top"
@@ -123,8 +138,8 @@
<style name="StoneCrossBox" <style name="StoneCrossBox"
font="serif-14" font="serif-14"
sprite="wheatCheckBoxOpen" sprite="StoneCheckBoxOpen"
sprite2="wheatCheckBoxCross" sprite2="StoneCheckBoxCross"
square_side="16" square_side="16"
textcolor="black" textcolor="black"
/> />
@@ -148,8 +163,8 @@
sprite_pressed="StoneButtonGlow" sprite_pressed="StoneButtonGlow"
button_width="15" button_width="15"
sprite2="wheatArrowDn" sprite2="StoneArrowDn"
sprite2_pressed="wheatArrowDnOver" sprite2_pressed="StoneArrowDnOver"
buffer_zone="10" buffer_zone="10"
dropdown_size="200" dropdown_size="200"
binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+6 -6
View File
@@ -9,9 +9,9 @@
<script file="gui/gamesetup/gamesetup.js"/> <script file="gui/gamesetup/gamesetup.js"/>
<!-- Add a translucent black background to fade out the menu page --> <!-- Add a translucent black background to fade out the menu page -->
<object type="image" z="0" sprite="BackgroundTranslucent"/> <object type="image" z="0" sprite="BackgroundBlack"/>
<object type="image" style="StoneDialog" size="50%-190 50%-80 50%+190 50%+80" name="loadingWindow"> <object type="image" style="StonePanel" size="50%-190 50%-80 50%+190 50%+80" name="loadingWindow">
<object type="text" style="StoneDialogTitleBar" size="50%-128 0%-16 50%+128 16"> <object type="text" style="StoneDialogTitleBar" size="50%-128 0%-16 50%+128 16">
Loading Loading
@@ -23,7 +23,7 @@
</object> </object>
<object type="image" style="StoneDialog" size="50%-400 50%-300 50%+400 50%+300" hidden="true" name="setupWindow"> <object type="image" style="StonePanel" size="0 16 100% 100%" hidden="true" name="setupWindow">
<action on="Tick"> <action on="Tick">
onTick(); onTick();
@@ -79,12 +79,12 @@
</object> </object>
<!-- Player assignments --> <!-- Player assignments -->
<object name="numPlayersBox" size="260 0 100% 30" hidden="true"> <object name="numPlayersBox" size="260 28 100% 30" hidden="true">
<object name="numPlayersSelectionHeading" type="text" text_valign="center" font="serif-bold-16">Number of Players</object> <object name="numPlayersSelectionHeading" type="text" style="LeftLabelText" size="160 0 100% 32">Number of Players</object>
<object name="numPlayersSelection" <object name="numPlayersSelection"
type="dropdown" type="dropdown"
style="StoneDropDown" style="StoneDropDown"
size="150 0 200 30" size="100 0 150 30"
tooltip_style="onscreenToolTip" tooltip_style="onscreenToolTip"
tooltip="Select number of players."> tooltip="Select number of players.">
<action on="SelectionChange">selectNumPlayers(this.list_data[this.selected]);</action> <action on="SelectionChange">selectNumPlayers(this.list_data[this.selected]);</action>
binaries/data/mods/public/gui/loading/sprites.xml
+18 -18
View File
@@ -6,7 +6,7 @@
<sprite name="loadingBackground"> <sprite name="loadingBackground">
<!-- background --> <!-- background -->
<image <image
texture="loading/background-tile.png" texture="global/tile/stone_background_light.png"
texture_size="0 0 512 512" texture_size="0 0 512 512"
size="0 0 100% 100%" size="0 0 100% 100%"
/> />
@@ -19,44 +19,44 @@
<!-- sides --> <!-- sides -->
<image <image
texture="loading/border/border-top.png" texture="global/border/border-top.png"
texture_size="0 0 128 16" texture_size="0 0 128 16"
size="16 0 100%-16 16" size="16 0 100%-16 16"
/> />
<image <image
texture="loading/border/border-right.png" texture="global/border/border-right.png"
texture_size="0 0 16 128" texture_size="0 0 16 128"
size="100%-16 16 100% 100%-16" size="100%-16 16 100% 100%-16"
/> />
<image <image
texture="loading/border/border-bottom.png" texture="global/border/border-bottom.png"
texture_size="0 0 128 16" texture_size="0 0 128 16"
size="16 100%-16 100%-16 100%" size="16 100%-16 100%-16 100%"
/> />
<image <image
texture="loading/border/border-left.png" texture="global/border/border-left.png"
texture_size="0 0 16 128" texture_size="0 0 16 128"
size="0 16 16 100%-16" size="0 16 16 100%-16"
/> />
<!-- corners --> <!-- corners -->
<image <image
texture="loading/border/border-corner.png" texture="global/border/border-corner.png"
texture_size="0 0 16 16" texture_size="0 0 16 16"
size="100%-16 0 100% 16" size="100%-16 0 100% 16"
/> />
<image <image
texture="loading/border/border-corner.png" texture="global/border/border-corner.png"
texture_size="0 0 16 16" texture_size="0 0 16 16"
size="100%-16 100%-16 100% 100%" size="100%-16 100%-16 100% 100%"
/> />
<image <image
texture="loading/border/border-corner.png" texture="global/border/border-corner.png"
texture_size="0 0 16 16" texture_size="0 0 16 16"
size="0 100%-16 16 100%" size="0 100%-16 16 100%"
/> />
<image <image
texture="loading/border/border-corner.png" texture="global/border/border-corner.png"
texture_size="0 0 16 16" texture_size="0 0 16 16"
size="0 0 16 16" size="0 0 16 16"
/> />
@@ -105,44 +105,44 @@
<sprite name="loadingTipImage"> <sprite name="loadingTipImage">
<!-- sides --> <!-- sides -->
<image <image
texture="loading/border/line_horiz.png" texture="global/border/line_horiz.png"
texture_size="0 0 64 4" texture_size="0 0 64 4"
size="4 0 100%-4 4" size="4 0 100%-4 4"
/> />
<image <image
texture="loading/border/line_vert.png" texture="global/border/line_vert.png"
texture_size="0 0 4 64" texture_size="0 0 4 64"
size="100%-4 4 100% 100%-4" size="100%-4 4 100% 100%-4"
/> />
<image <image
texture="loading/border/line_horiz.png" texture="global/border/line_horiz.png"
texture_size="0 0 64 4" texture_size="0 0 64 4"
size="4 100%-4 100%-4 100%" size="4 100%-4 100%-4 100%"
/> />
<image <image
texture="loading/border/line_vert.png" texture="global/border/line_vert.png"
texture_size="0 0 4 64" texture_size="0 0 4 64"
size="0 4 4 100%-4" size="0 4 4 100%-4"
/> />
<!-- corners --> <!-- corners -->
<image <image
texture="loading/border/line_corner_top_right.png" texture="global/border/line_corner_top_right.png"
texture_size="0 0 4 4" texture_size="0 0 4 4"
size="100%-4 0 100% 4" size="100%-4 0 100% 4"
/> />
<image <image
texture="loading/border/line_corner_bottom_right.png" texture="global/border/line_corner_bottom_right.png"
texture_size="0 0 4 4" texture_size="0 0 4 4"
size="100%-4 100%-4 100% 100%" size="100%-4 100%-4 100% 100%"
/> />
<image <image
texture="loading/border/line_corner_bottom_left.png" texture="global/border/line_corner_bottom_left.png"
texture_size="0 0 4 4" texture_size="0 0 4 4"
size="0 100%-4 4 100%" size="0 100%-4 4 100%"
/> />
<image <image
texture="loading/border/line_corner_top_left.png" texture="global/border/line_corner_top_left.png"
texture_size="0 0 4 4" texture_size="0 0 4 4"
size="0 0 4 4" size="0 0 4 4"
/> />
@@ -165,4 +165,4 @@
/> />
</sprite> </sprite>
</sprites> </sprites>
binaries/data/mods/public/gui/page_session.xml
+4
View File
@@ -4,6 +4,10 @@
<include>common/styles.xml</include> <include>common/styles.xml</include>
<include>common/sprite1.xml</include> <include>common/sprite1.xml</include>
<include>common/icon_sprites.xml</include> <include>common/icon_sprites.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>session/sprites.xml</include> <include>session/sprites.xml</include>
<include>session/styles.xml</include> <include>session/styles.xml</include>
<include>session/session.xml</include> <include>session/session.xml</include>
binaries/data/mods/public/gui/page_summary.xml
+6 -2
View File
@@ -3,9 +3,13 @@
<include>common/setup.xml</include> <include>common/setup.xml</include>
<include>common/styles.xml</include> <include>common/styles.xml</include>
<include>common/sprite1.xml</include> <include>common/sprite1.xml</include>
<include>common/icon_sprites.xml</include> <include>common/icon_sprites.xml</include>
<include>common/init.xml</include> <include>common/init.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>summary/summary.xml</include> <include>summary/summary.xml</include>
<include>summary/sprites.xml</include> <include>summary/sprites.xml</include>
<include>common/global.xml</include> <include>common/global.xml</include>
</page> </page>
binaries/data/mods/public/gui/pregame/mainmenu.xml
+2 -2
View File
@@ -72,7 +72,7 @@
--> -->
<object <object
type="image" type="image"
style="StonePanel" style="StonePanelThinBorder"
size="50 0 322 100%" size="50 0 322 100%"
> >
<object type="image" <object type="image"
@@ -270,7 +270,7 @@ Watch for updates or get involved: wildfiregames.com/0ad
<!-- COMPANY NAME --> <!-- COMPANY NAME -->
<object <object
type="text" type="text"
style="logoText" style="TitleText"
size="50%-128 52 50%+128 64" size="50%-128 52 50%+128 64"
>WILDFIRE GAMES</object> >WILDFIRE GAMES</object>
</object> </object>
binaries/data/mods/public/gui/session/menu.js
+1 -1
View File
@@ -9,7 +9,7 @@ function toggleDeveloperOverlay()
function openMenuDialog() function openMenuDialog()
{ {
var menu = getGUIObjectByName("menuDialogPanel"); var menu = getGUIObjectByName("menuDialogPanel");
g_SessionDialog.open("Menu", null, menu, 156, 224, null); g_SessionDialog.open("Menu", null, menu, 204, 224, null);
} }
function openSettingsDialog() function openSettingsDialog()
binaries/data/mods/public/gui/session/session.xml
+29 -29
View File
@@ -193,16 +193,16 @@
</object> </object>
<!-- Chat window --> <!-- Chat window -->
<object name="chatDialogPanel" size="50%-200 50%-46 50%+200 50%+46" type="image" hidden="true" sprite="genericPanel"> <object name="chatDialogPanel" size="50%-200 50%-46 50%+200 50%+46" type="image" hidden="true" style="StonePanelThinBorder">
<object name="chatInput" size="16 12 100%-16 36" type="input" style="chatInput" max_length="80"> <object name="chatInput" size="16 12 100%-16 36" type="input" style="chatInput" max_length="80">
<action on="Press">submitChatInput();</action> <action on="Press">submitChatInput();</action>
</object> </object>
<object size="32 100%-44 144 100%-12" type="button" style="wheatButton"> <object size="32 100%-44 144 100%-12" type="button" style="StoneButton">
Cancel Cancel
<action on="Press">closeChat();</action> <action on="Press">closeChat();</action>
</object> </object>
<object size="100%-144 100%-44 100%-32 100%-12" type="button" style="wheatButton"> <object size="100%-144 100%-44 100%-32 100%-12" type="button" style="StoneButton">
Send Send
<action on="Press">submitChatInput();</action> <action on="Press">submitChatInput();</action>
</object> </object>
@@ -213,25 +213,25 @@
<!-- Session Dialog --> <!-- Session Dialog -->
<!-- ================================ ================================ --> <!-- ================================ ================================ -->
<object name="sessionDialog" <object name="sessionDialog"
sprite="sessionDialog" style="StonePanel"
type="image" type="image"
size="50%-180 50%-200 50%+180 50%+50" size="50%-180 50%-200 50%+180 50%+50"
hidden="true" hidden="true"
z="30" z="30"
> >
<object name="sessionDialogTitleBar" size="50%-100 -16 50%+100 16" type="image" sprite="sessionDialogTitleBar"> <object name="sessionDialogTitleBar" size="50%-96 -16 50%+96 16" type="image" style="StoneDialogTitleBar">
<object name="sessionDialogTitle" size="0 -2 100% 100%" type="text" style="dialogTitleText">Title</object> <object name="sessionDialogTitle" type="text" style="TitleText" size="0 -2 100% 100%">Title</object>
</object> </object>
<object name="sessionDialogMessage" size="20 10 100%-20 100%-48" type="text" style="dialogText"/> <object name="sessionDialogMessage" size="20 10 100%-20 100%-48" type="text" style="dialogText"/>
<object size="0 100%-48 100% 100%"> <object size="0 100%-48 100% 100%">
<object name="sessionDialogConfirm" size="32 100%-64 144 100%-32" type="button" style="wheatButton"> <object name="sessionDialogConfirm" size="32 100%-64 144 100%-32" type="button" style="StoneButton">
OK OK
<action on="Press"></action> <action on="Press"></action>
</object> </object>
<object name="sessionDialogCancel" size="100%-144 100%-64 100%-32 100%-32" type="button" style="wheatButton"> <object name="sessionDialogCancel" size="100%-144 100%-64 100%-32 100%-32" type="button" style="StoneButton">
Cancel Cancel
<action on="Press">g_SessionDialog.close();</action> <action on="Press">g_SessionDialog.close();</action>
</object> </object>
@@ -242,7 +242,7 @@
<!-- Menu --> <!-- Menu -->
<!-- ================================ ================================ --> <!-- ================================ ================================ -->
<object name="menuDialogPanel" <object name="menuDialogPanel"
size="50%-74 50%-180 50%+74 50%+20" size="0 50%-180 100% 50%+20"
type="image" type="image"
hidden="true" hidden="true"
z="30" z="30"
@@ -250,44 +250,44 @@
<!-- Settings button --> <!-- Settings button -->
<object type="button" <object type="button"
name="settingsButton" name="settingsButton"
style="wheatButtonFancy" style="StoneButton"
size="50%-56 0 50%+56 32" size="0 0 100% 32"
tooltip_style="sessionToolTip" tooltip_style="sessionToolTip"
> >
<object size="0 0 100% 100%" type="text" style="centeredText" name="settingsButtonText" ghost="true">Settings</object> Settings
<action on="Press">openSettingsDialog();</action> <action on="Press">openSettingsDialog();</action>
</object> </object>
<!-- Chat button --> <!-- Chat button -->
<object type="button" <object type="button"
name="chatButton" name="chatButton"
style="wheatButtonFancy" style="StoneButton"
size="50%-56 32 50%+56 64" size="0 32 100% 64"
tooltip_style="sessionToolTip" tooltip_style="sessionToolTip"
> >
<object size="0 0 100% 100%" type="text" style="centeredText" name="chatButtonText" ghost="true">Chat</object> Chat
<action on="Press">openChat();</action> <action on="Press">openChat();</action>
</object> </object>
<!-- Pause Button --> <!-- Pause Button -->
<object type="button" <object type="button"
style="wheatButtonFancy" style="StoneButton"
name="pauseButton" name="pauseButton"
size="50%-56 64 50%+56 96" size="0 64 100% 96"
tooltip_style="sessionToolTip" tooltip_style="sessionToolTip"
> >
<object name="pauseButtonText" size="0 0 100% 100%" type="text" ghost="true" style="centeredText">Pause</object> <object name="pauseButtonText" type="text" style="CenteredLabelText" ghost="true">Pause</object>
<action on="Press">togglePause();</action> <action on="Press">togglePause();</action>
</object> </object>
<!-- Exit button --> <!-- Exit button -->
<object type="button" <object type="button"
name="menuExitButton" name="menuExitButton"
style="wheatButtonFancy" style="StoneButton"
size="50%-56 96 50%+56 128" size="0 96 100% 128"
tooltip_style="sessionToolTip" tooltip_style="sessionToolTip"
> >
<object size="0 0 100% 100%" type="text" style="centeredText" name="exitButtonText" ghost="true" font="serif-14">Quit</object> Quit
<action on="Press"> <action on="Press">
openExitGameDialog(); openExitGameDialog();
</action> </action>
@@ -298,7 +298,7 @@
<!-- Settings Window --> <!-- Settings Window -->
<!-- ================================ ================================ --> <!-- ================================ ================================ -->
<object name="settingsDialogPanel" <object name="settingsDialogPanel"
sprite="genericPanel" style="StonePanelThinBorder"
type="image" type="image"
size="80%-180 50%-200 50%+180 50%+50" size="80%-180 50%-200 50%+180 50%+50"
hidden="true" hidden="true"
@@ -469,7 +469,7 @@
<!-- ================================ ================================ --> <!-- ================================ ================================ -->
<!-- Supplemental Details Panel on Left --> <!-- Supplemental Details Panel on Left -->
<!-- ================================ ================================ --> <!-- ================================ ================================ -->
<object size="208 100%-170 50%-110 100%" name="supplementalSelectionDetails" type="image" sprite="bottomLeft" z="30"> <object size="208 100%-170 50%-110 100%" name="supplementalSelectionDetails" type="image" style="StonePanelThinBorder" z="30">
<object name="unitFormationPanel" <object name="unitFormationPanel"
size="24 12 100% 100%" size="24 12 100% 100%"
@@ -498,7 +498,7 @@
<!-- Stance Selection --> <!-- Stance Selection -->
<object name="unitStancePanel" <object name="unitStancePanel"
sprite="bottomMiddle" style="StonePanelThinBorder"
size="0 100%-43 100% 100%" size="0 100%-43 100% 100%"
type="text" type="text"
> >
@@ -517,7 +517,7 @@
<!-- ================================ ================================ --> <!-- ================================ ================================ -->
<object name="selectionDetails" <object name="selectionDetails"
type="image" type="image"
sprite="bottomMiddle" style="StonePanelThinBorder"
size="50%-114 100%-205 50%+114 100%" size="50%-114 100%-205 50%+114 100%"
hidden="false" hidden="false"
> >
@@ -648,7 +648,7 @@
<!-- ================================ ================================ --> <!-- ================================ ================================ -->
<object name="unitCommands" <object name="unitCommands"
type="image" type="image"
sprite="bottomRight" style="StonePanelThinBorder"
size="622 100%-170 100% 100%" size="622 100%-170 100% 100%"
hidden="false" hidden="false"
> >
@@ -668,7 +668,7 @@
</object> </object>
<object name="unitResearchPanel" <object name="unitResearchPanel"
style="goldPanelFrilly" style="StonePanelThinBorder"
size="0 100%-56 100% 100%" size="0 100%-56 100% 100%"
type="text" type="text"
> >
@@ -696,7 +696,7 @@
<object name="unitQueuePanel" <object name="unitQueuePanel"
size="4 -56 100% 0" size="4 -56 100% 0"
type="image" type="image"
sprite="genericPanel" style="StonePanelThinBorder"
> >
<object size="-4 -2 52 54" type="image" sprite="snIconSheetTab" tooltip_style="sessionToolTipBottom" cell_id="3" tooltip="Production queue"> <object size="-4 -2 52 54" type="image" sprite="snIconSheetTab" tooltip_style="sessionToolTipBottom" cell_id="3" tooltip="Production queue">
<object name="queueProgress" ghost="true" style="iconButtonProgress" type="text"/> <object name="queueProgress" ghost="true" style="iconButtonProgress" type="text"/>
@@ -730,7 +730,7 @@
<object name="netStatus" type="text" style="netStatus" z="100" hidden="true"> <object name="netStatus" type="text" style="netStatus" z="100" hidden="true">
<object type="button" <object type="button"
name="disconnectedExitButton" name="disconnectedExitButton"
style="wheatButtonFancy" style="StoneButton"
size="50%-84 50%+128 50%+84 50%+160" size="50%-84 50%+128 50%+84 50%+160"
tooltip_style="sessionToolTip" tooltip_style="sessionToolTip"
hidden="true" hidden="true"
binaries/data/mods/public/gui/session/utility_functions.js
+1 -1
View File
@@ -52,7 +52,7 @@ SessionDialog.prototype.open = function(title, message, referencedPanel, x, y, c
else else
{ {
getGUIObjectByName("sessionDialogConfirm").hidden = true; getGUIObjectByName("sessionDialogConfirm").hidden = true;
getGUIObjectByName("sessionDialogCancel").size = "50%-56 100%-56 50%+56 100%-24"; getGUIObjectByName("sessionDialogCancel").size = "50%-72 100%-56 50%+72 100%-24";
getGUIObjectByName("sessionDialogCancel").caption = "Close"; getGUIObjectByName("sessionDialogCancel").caption = "Close";
} }
binaries/data/mods/public/gui/summary/sprites.xml
+1 -1
View File
@@ -6,6 +6,6 @@
</sprite> </sprite>
<sprite name="bgInfoBox"> <sprite name="bgInfoBox">
<image backcolor="120 70 0 100" size="0 0 100% 100%" /> <image backcolor="80 80 60 120" size="0 0 100% 100%" />
</sprite> </sprite>
</sprites> </sprites>
binaries/data/mods/public/gui/summary/summary.xml
+50 -50
View File
@@ -12,14 +12,14 @@
<object type="image" sprite="bkFillBlack"> <object type="image" sprite="bkFillBlack">
<object type="image" <object type="image"
style="wheatWindow" style="StonePanel"
size="25 35 100%-25 100%-25" size="25 35 100%-25 100%-25"
> >
<object type="button" style="wheatWindowTitleBar"> <object style="StoneDialogTitleBar" type="text" size="50%-128 0%-16 50%+128 16">
Summary Summary
</object> </object>
<object type="image" sprite="bgInfoHeading" size="0 10 100% 40"> <object type="image" sprite="bgInfoHeading" size="16 16 100%-16 46">
<object <object
name="summaryText" name="summaryText"
type="text" type="text"
@@ -40,40 +40,40 @@
</object> </object>
<object name="unitsBuildingsPanelButton" type="button" sprite="bgInfoBox" text_align="center" size="10 75 160 101"> <object name="unitsBuildingsPanelButton" type="button" sprite="bgInfoBox" size="16 75 166 101">
<action on="Press">selectPanel(0);</action> <action on="Press">selectPanel(0);</action>
Units/buildings <object type="text" style="TitleText" ghost="true">Units/buildings</object>
</object> </object>
<object name="conquestPanelButton" type="button" sprite="bgInfoHeading" text_align="center" size="160 75 310 101"> <object name="conquestPanelButton" type="button" sprite="bgInfoHeading" size="172 75 322 101">
<action on="Press">selectPanel(1);</action> <action on="Press">selectPanel(1);</action>
Conquest <object type="text" style="TitleText" ghost="true">Conquest</object>
</object> </object>
<object name="resourcesPanelButton" type="button" sprite="bgInfoHeading" text_align="center" size="310 75 460 101"> <object name="resourcesPanelButton" type="button" sprite="bgInfoHeading" size="328 75 476 101">
<action on="Press">selectPanel(2);</action> <action on="Press">selectPanel(2);</action>
Resources <object type="text" style="TitleText" ghost="true">Resources</object>
</object> </object>
<object name="unitsBuildingsPanel" type="image" sprite="bgInfoBox" size="10 100 100%-10 100%-50"> <object name="unitsBuildingsPanel" type="image" sprite="bgInfoBox" size="10 100 100%-10 100%-50">
<object size="0 0 100% 100%-50"> <object size="0 0 100% 100%-50">
<object name="playerName0Heading" type="text" text_align="left" font="serif-bold-14" > <object name="playerName0Heading" type="text" style="LeftTabLabelText">
Player name Player name
</object> </object>
<object name="unitsTrainedHeading" type="text" text_align="center" font="serif-bold-14" > <object name="unitsTrainedHeading" type="text" style="CenteredTabLabelText">
Units&#10;trained Units&#10;trained
</object> </object>
<object name="unitsLostHeading" type="text" text_align="center" font="serif-bold-14" > <object name="unitsLostHeading" type="text" style="CenteredTabLabelText">
Units&#10;lost Units&#10;lost
</object> </object>
<object name="enemyUnitsKilledHeading" type="text" text_align="center" font="serif-bold-14" > <object name="enemyUnitsKilledHeading" type="text" style="CenteredTabLabelText">
Enemy units&#10;killed Enemy units&#10;killed
</object> </object>
<object name="buildingsConstructedHeading" type="text" text_align="center" font="serif-bold-14" > <object name="buildingsConstructedHeading" type="text" style="CenteredTabLabelText">
Buildings&#10;constructed Buildings&#10;constructed
</object> </object>
<object name="buildingsLostHeading" type="text" text_align="center" font="serif-bold-14" > <object name="buildingsLostHeading" type="text" style="CenteredTabLabelText">
Buildings&#10;lost Buildings&#10;lost
</object> </object>
<object name="enemyBuildingsDestroyedHeading" type="text" text_align="center" font="serif-bold-14" > <object name="enemyBuildingsDestroyedHeading" type="text" style="CenteredTabLabelText">
Enemy&#10;buildings&#10;destroyed Enemy&#10;buildings&#10;destroyed
</object> </object>
@@ -83,14 +83,14 @@
<repeat count="8"> <repeat count="8">
<object type="image" name="playerBox0[n]" size="10 0 10 30" hidden="true"> <object type="image" name="playerBox0[n]" size="10 0 10 30" hidden="true">
<object name="playerColourBox0[n]" type="image" size="10 4 30 24" /> <object name="playerColourBox0[n]" type="image" size="10 4 30 24" />
<object name="playerName0[n]" type="text" text_align="left" size="40 2 208 100%" /> <object name="playerName0[n]" type="text" style="LeftLabelText" size="40 2 208 100%" />
<object name="civIcon0[n]" type="image" size="208 0 240 32"/> <object name="civIcon0[n]" type="image" size="208 0 240 32"/>
<object name="unitsTrained[n]" type="text" text_align="center" /> <object name="unitsTrained[n]" type="text" style="CenteredLabelText"/>
<object name="unitsLost[n]" type="text" text_align="center" /> <object name="unitsLost[n]" type="text" style="CenteredLabelText"/>
<object name="enemyUnitsKilled[n]" type="text" text_align="center" /> <object name="enemyUnitsKilled[n]" type="text" style="CenteredLabelText"/>
<object name="buildingsConstructed[n]" type="text" text_align="center" /> <object name="buildingsConstructed[n]" type="text" style="CenteredLabelText"/>
<object name="buildingsLost[n]" type="text" text_align="center" /> <object name="buildingsLost[n]" type="text" style="CenteredLabelText"/>
<object name="enemyBuildingsDestroyed[n]" type="text" text_align="center" /> <object name="enemyBuildingsDestroyed[n]" type="text" style="CenteredLabelText"/>
</object> </object>
</repeat> </repeat>
</object> </object>
@@ -99,16 +99,16 @@
<object name="conquestPanel" type="image" sprite="bgInfoBox" size="10 100 100%-10 100%-50" hidden="true"> <object name="conquestPanel" type="image" sprite="bgInfoBox" size="10 100 100%-10 100%-50" hidden="true">
<object size="0 0 100% 100%-50"> <object size="0 0 100% 100%-50">
<object name="playerName1Heading" type="text" text_align="left" font="serif-bold-14" > <object name="playerName1Heading" type="text" style="LeftTabLabelText">
Player name Player name
</object> </object>
<object name="civCentresBuiltHeading" type="text" text_align="center" font="serif-bold-14" > <object name="civCentresBuiltHeading" type="text" style="CenteredTabLabelText">
Civ centres&#10;built Civ centres&#10;built
</object> </object>
<object name="enemyCivCentresDestroyedHeading" type="text" text_align="center" font="serif-bold-14" > <object name="enemyCivCentresDestroyedHeading" type="text" style="CenteredTabLabelText">
Enemy&#10;civ centres&#10;destroyed Enemy&#10;civ centres&#10;destroyed
</object> </object>
<object name="mapExplorationHeading" type="text" text_align="center" font="serif-bold-14" > <object name="mapExplorationHeading" type="text" style="CenteredTabLabelText">
Map&#10;exploration Map&#10;exploration
</object> </object>
</object> </object>
@@ -117,11 +117,11 @@
<repeat count="8"> <repeat count="8">
<object type="image" name="playerBox1[n]" size="10 0 10 30" hidden="true"> <object type="image" name="playerBox1[n]" size="10 0 10 30" hidden="true">
<object name="playerColourBox1[n]" type="image" size="10 4 30 24" /> <object name="playerColourBox1[n]" type="image" size="10 4 30 24" />
<object name="playerName1[n]" type="text" text_align="left" size="40 2 208 100%" /> <object name="playerName1[n]" type="text" style="LeftLabelText" size="40 2 208 100%" />
<object name="civIcon1[n]" type="image" size="208 0 240 32"/> <object name="civIcon1[n]" type="image" size="208 0 240 32"/>
<object name="civCentresBuilt[n]" type="text" text_align="center" /> <object name="civCentresBuilt[n]" type="text" style="CenteredLabelText"/>
<object name="enemyCivCentresDestroyed[n]" type="text" text_align="center" /> <object name="enemyCivCentresDestroyed[n]" type="text" style="CenteredLabelText"/>
<object name="mapExploration[n]" type="text" text_align="center" /> <object name="mapExploration[n]" type="text" style="CenteredLabelText"/>
</object> </object>
</repeat> </repeat>
</object> </object>
@@ -130,25 +130,25 @@
<object name="resourcesPanel" type="image" sprite="bgInfoBox" size="10 100 100%-10 100%-50" hidden="true"> <object name="resourcesPanel" type="image" sprite="bgInfoBox" size="10 100 100%-10 100%-50" hidden="true">
<object size="0 0 100% 100%-50"> <object size="0 0 100% 100%-50">
<object name="playerName2Heading" type="text" text_align="left" font="serif-bold-14" > <object name="playerName2Heading" type="text" style="LeftTabLabelText">
Player name Player name
</object> </object>
<object name="foodGatheredHeading" type="text" text_align="center" font="serif-bold-14" > <object name="foodGatheredHeading" type="text" style="CenteredTabLabelText">
Food&#10;gathered Food&#10;gathered
</object> </object>
<object name="vegetarianRatioHeading" type="text" text_align="center" font="serif-bold-14" > <object name="vegetarianRatioHeading" type="text" style="CenteredTabLabelText">
Vegetarian&#10;ratio Vegetarian&#10;ratio
</object> </object>
<object name="woodGatheredHeading" type="text" text_align="center" font="serif-bold-14" > <object name="woodGatheredHeading" type="text" style="CenteredTabLabelText">
Wood&#10;gathered Wood&#10;gathered
</object> </object>
<object name="metalGatheredHeading" type="text" text_align="center" font="serif-bold-14" > <object name="metalGatheredHeading" type="text" style="CenteredTabLabelText">
Metal&#10;gathered Metal&#10;gathered
</object> </object>
<object name="stoneGatheredHeading" type="text" text_align="center" font="serif-bold-14" > <object name="stoneGatheredHeading" type="text" style="CenteredTabLabelText">
Stone&#10;gathered Stone&#10;gathered
</object> </object>
<object name="treasuresCollectedHeading" type="text" text_align="center" font="serif-bold-14" > <object name="treasuresCollectedHeading" type="text" style="CenteredTabLabelText">
Treasures&#10;collected Treasures&#10;collected
</object> </object>
</object> </object>
@@ -157,22 +157,22 @@
<repeat count="8"> <repeat count="8">
<object type="image" name="playerBox2[n]" size="10 0 10 30" hidden="true"> <object type="image" name="playerBox2[n]" size="10 0 10 30" hidden="true">
<object name="playerColourBox2[n]" type="image" size="10 4 30 24" /> <object name="playerColourBox2[n]" type="image" size="10 4 30 24" />
<object name="playerName2[n]" type="text" text_align="left" size="40 2 208 100%" /> <object name="playerName2[n]" type="text" style="LeftLabelText" size="40 2 208 100%" />
<object name="civIcon2[n]" type="image" size="208 0 240 32"/> <object name="civIcon2[n]" type="image" size="208 0 240 32"/>
<object name="foodGathered[n]" type="text" text_align="center" /> <object name="foodGathered[n]" type="text" style="CenteredLabelText"/>
<object name="vegetarianRatio[n]" type="text" text_align="center" /> <object name="vegetarianRatio[n]" type="text" style="CenteredLabelText"/>
<object name="woodGathered[n]" type="text" text_align="center" /> <object name="woodGathered[n]" type="text" style="CenteredLabelText"/>
<object name="metalGathered[n]" type="text" text_align="center" /> <object name="metalGathered[n]" type="text" style="CenteredLabelText"/>
<object name="stoneGathered[n]" type="text" text_align="center" /> <object name="stoneGathered[n]" type="text" style="CenteredLabelText" />
<object name="treasuresCollected[n]" type="text" text_align="center" /> <object name="treasuresCollected[n]" type="text" style="CenteredLabelText"/>
</object> </object>
</repeat> </repeat>
</object> </object>
</object> </object>
<object type="button" style="wheatButton" size="100%-150 100%-40 100% 100%"> <object type="button" style="StoneButton" size="100%-172 100%-48 100%-16 100%-16">
Main menu Main Menu
<action on="Press"><![CDATA[ <action on="Press"><![CDATA[
Engine.SwitchGuiPage("page_pregame.xml"); Engine.SwitchGuiPage("page_pregame.xml");
]]></action> ]]></action>