Remove GUI object setting values z="0", size="0 0 100% 100%", hidden="false" in XML page specifications that are redundant with the default style values.
Remove question by brian in single_details_area.xml from b66d1716e7
which is answered by "because the style set it".
Delete BuildNameText style, because it specifies ghost="true" in both
style and sole object using the style.
Don't touch progressbar and structree styles, because there is more to
clean.
Differential Revision: https://code.wildfiregames.com/D2292
This was SVN commit r22957.
This commit is contained in:
parent
869a9548a9
commit
702cdbf0c7
@ -5,7 +5,7 @@
|
||||
<script directory="gui/common/"/>
|
||||
<script directory="gui/modio/"/>
|
||||
|
||||
<object type="image" sprite="ModernFade" z="0"/>
|
||||
<object type="image" sprite="ModernFade"/>
|
||||
|
||||
<object name="modio" type="image" style="ModernDialog" size="10% 10% 90% 90%">
|
||||
|
||||
@ -89,7 +89,7 @@
|
||||
<!-- Download/Request-in-progress Dialog -->
|
||||
<!-- Captions are supplied in modio.js -->
|
||||
<!-- This must be after the buttons, and with "z" > 20, else it and/or other objects will not be drawn correctly -->
|
||||
<object name="downloadDialog" type="image" sprite="ModernFade" z="30" size="0 0 100% 100%">
|
||||
<object name="downloadDialog" type="image" sprite="ModernFade" z="30">
|
||||
<object type="image" style="ModernDialog" size="50%-210 50%-96 50%+210 50%+96">
|
||||
|
||||
<object name="downloadDialog_title" type="text" style="ModernLabelText" size="50%-128 0%-16 50%+128 16"/>
|
||||
|
@ -6,7 +6,7 @@
|
||||
<script directory="gui/modmod/help/"/>
|
||||
|
||||
<!-- Add a translucent black background to fade out the menu page -->
|
||||
<object type="image" z="0" sprite="ModernFade"/>
|
||||
<object type="image" sprite="ModernFade"/>
|
||||
|
||||
<object type="image" style="ModernDialog" size="50%-466 50%-316 50%+466 50%+316">
|
||||
<object name="title" style="ModernLabelText" type="text" size="50%-128 -18 50%+128 14">
|
||||
|
@ -5,7 +5,7 @@
|
||||
<script directory="gui/common/"/>
|
||||
<script directory="gui/modmod/"/>
|
||||
|
||||
<object type="image" style="ModernWindow" size="0 0 100% 100%">
|
||||
<object type="image" style="ModernWindow">
|
||||
|
||||
<!-- Page Title -->
|
||||
<object style="ModernLabelText" type="text" size="50%-128 4 50%+128 36">
|
||||
|
@ -6,7 +6,7 @@
|
||||
<script directory="gui/msgbox/"/>
|
||||
|
||||
<!-- Fade out the background because it's non-interactable -->
|
||||
<object sprite="ModernFade" type="image" z="0"/>
|
||||
<object sprite="ModernFade" type="image"/>
|
||||
<object name="mbCancelHotkey" hotkey="cancel" />
|
||||
<object name="mbMain"
|
||||
style="ModernDialog"
|
||||
|
@ -4,7 +4,7 @@
|
||||
<script directory="gui/common/"/>
|
||||
<script directory="gui/termsdialog/"/>
|
||||
|
||||
<object type="image" z="0" sprite="ModernFade"/>
|
||||
<object type="image" sprite="ModernFade"/>
|
||||
|
||||
<object type="image" style="ModernDialog" size="50%-360 50%-290 50%+360 50%+290">
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
||||
</object>
|
||||
|
||||
<!-- Add a translucent black background to fade out the menu page -->
|
||||
<object type="image" z="0" sprite="BackgroundTranslucent"/>
|
||||
<object type="image" sprite="BackgroundTranslucent"/>
|
||||
|
||||
<object type="image" style="ModernDialog" size="50%-500 50%-368 50%+500 50%+370">
|
||||
|
||||
|
@ -38,7 +38,6 @@
|
||||
<object name="dataCounter"
|
||||
type="text"
|
||||
ghost="true"
|
||||
hidden="false"
|
||||
z="199"
|
||||
size="100%-90 40 100%-5 40"
|
||||
font="mono-10"
|
||||
|
@ -12,7 +12,7 @@
|
||||
<script directory="gui/credits/"/>
|
||||
|
||||
<!-- Add a translucent black background to fade out the menu page -->
|
||||
<object type="image" z="0" sprite="ModernFade"/>
|
||||
<object type="image" sprite="ModernFade"/>
|
||||
|
||||
<object type="image" style="ModernDialog" size="50%-473 24 50%+473 100%-24">
|
||||
<object style="ModernLabelText" name="dialogTitle" type="text" size="50%-128 -18 50%+128 14">
|
||||
|
@ -6,7 +6,7 @@
|
||||
<script directory="gui/gamesetup/"/>
|
||||
|
||||
<!-- Add a translucent black background to fade out the menu page -->
|
||||
<object type="image" style="ModernWindow" size="0 0 100% 100%">
|
||||
<object type="image" style="ModernWindow">
|
||||
|
||||
<object style="TitleText" type="text" size="50%-128 4 50%+128 36">
|
||||
<translatableAttribute id="caption">Match Setup</translatableAttribute>
|
||||
@ -67,7 +67,7 @@
|
||||
<object size="1 36 100%-1 100%">
|
||||
<repeat count="8">
|
||||
<object name="playerBox[n]" size="0 0 100% 32">
|
||||
<object name="playerColor[n]" type="image" size="0 0 100% 100%"/>
|
||||
<object name="playerColor[n]" type="image"/>
|
||||
<object name="playerName[n]" type="text" style="ModernLabelText" size="0 2 22% 30"/>
|
||||
<object name="playerColorPicker[n]" type="dropdown" style="ModernDropDown" size="22%+5 2 22%+33 30" sprite="" scrollbar="false" button_width="22" font="sans-stroke-14" tooltip_style="onscreenToolTip"/>
|
||||
<object name="playerAssignment[n]" type="dropdown" style="ModernDropDown" size="22%+37 2 50%+35 30" tooltip_style="onscreenToolTip"/>
|
||||
@ -163,7 +163,7 @@
|
||||
|
||||
<!-- Map Description -->
|
||||
<object name="mapInfoDescriptionFrame" type="image" sprite="ModernDarkBoxGold" size="100%-315 550 100%-25 100%-60" z="21">
|
||||
<object name="mapInfoDescription" type="text" style="ModernText" size="0 0 100% 100%"/>
|
||||
<object name="mapInfoDescription" type="text" style="ModernText"/>
|
||||
</object>
|
||||
|
||||
<!-- Chat window -->
|
||||
|
@ -6,7 +6,7 @@
|
||||
<script directory="gui/loadgame/"/>
|
||||
|
||||
<!-- Add a translucent black background to fade out the menu page -->
|
||||
<object type="image" z="0" sprite="BackgroundTranslucent"/>
|
||||
<object type="image" sprite="BackgroundTranslucent"/>
|
||||
|
||||
<object type="image" style="ModernDialog" size="50%-460 50%-325 50%+460 50%+325">
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
>
|
||||
<object name="progressbar_left" size="-8 0 8 100%" type="image" sprite="LoadingProgressBarLeft"/>
|
||||
<object name="progressbar_right" size="8 0 24 100%" type="image" sprite="LoadingProgressBarRight"/>
|
||||
<object name="progressText" size="0 0 100% 100%" type="text" style="LoadingBarText"/>
|
||||
<object name="progressText" type="text" style="LoadingBarText"/>
|
||||
</object>
|
||||
</object>
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
<!-- LOADING SCREEN TIP IMAGE-->
|
||||
<object size="50%-452 50%-196 50%+68 50%+196" type="image" sprite="LoadingTipImage">
|
||||
<object name="tipImage" size="4 4 516 516" type="image">
|
||||
<object name="tipImageCover" size="0 0 100% 100%" type="image" sprite="LoadingTipImageCover"/>
|
||||
<object name="tipImageCover" type="image" sprite="LoadingTipImageCover"/>
|
||||
</object>
|
||||
</object>
|
||||
|
||||
@ -43,7 +43,7 @@
|
||||
|
||||
<!-- LOADING SCREEN QUOTE (needs increased z value to overcome the transparent area of the tip image above it -->
|
||||
<object size="50%-448 50%+230 50%+448 100%-16" z="20">
|
||||
<object name="quoteText" size="0 0 100% 100%" type="text" style="LoadingText"/>
|
||||
<object name="quoteText" type="text" style="LoadingText"/>
|
||||
</object>
|
||||
</object>
|
||||
</objects>
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
<object type="image" sprite="ModernFade" name="fadeImage"/>
|
||||
|
||||
<object type="image" style="ModernWindow" size="0 0 100% 100%" name="lobbyWindow">
|
||||
<object type="image" style="ModernWindow" name="lobbyWindow">
|
||||
|
||||
<object name="lobbyWindowTitle" style="ModernLabelText" type="text" size="50%-128 0%+4 50%+128 36">
|
||||
<translatableAttribute id="caption">Multiplayer Lobby</translatableAttribute>
|
||||
|
@ -16,7 +16,6 @@
|
||||
selected_column_order="1"
|
||||
type="olist"
|
||||
sortable="true"
|
||||
size="0 0 100% 100%"
|
||||
font="sans-bold-stroke-13"
|
||||
>
|
||||
<column id="buddy" width="12"/>
|
||||
@ -44,8 +43,8 @@
|
||||
</object>
|
||||
|
||||
<object name="profilePanel" size="20 100%-310 20% 100%-104">
|
||||
<object name="profileBox" type="image" sprite="ModernDarkBoxGold" size="0 0 100% 100%">
|
||||
<object name="profileArea" size="0 0 100% 100%" hidden="true">
|
||||
<object name="profileBox" type="image" sprite="ModernDarkBoxGold">
|
||||
<object name="profileArea" hidden="true">
|
||||
<object name="usernameText" size="0 0 100% 45" type="text" style="ModernLabelText" font="sans-bold-16" />
|
||||
<object name="roleText" size="0 45 100% 70" type="text" style="ModernLabelText" font="sans-bold-stroke-12" />
|
||||
<object size="0 70 40%+40 90" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
|
||||
@ -98,7 +97,7 @@
|
||||
|
||||
<!-- Right panel: Game details. -->
|
||||
<object name="rightPanel">
|
||||
<object name="gameInfoEmpty" type="image" sprite="ModernDarkBoxGold" hidden="false">
|
||||
<object name="gameInfoEmpty" type="image" sprite="ModernDarkBoxGold">
|
||||
<object name="logo" size="50%-110 40 50%+110 140" type="image" sprite="logo"/>
|
||||
<object name="subjectBox" type="image" sprite="ModernDarkBoxWhite" size="3% 180 97% 99%">
|
||||
<object name="subject" size="5 5 100%-5 100%-5" type="text" style="ModernText" text_align="center"/>
|
||||
@ -121,7 +120,7 @@
|
||||
</object>
|
||||
</object>
|
||||
<object size="50% 195 100%-5 240" type="image" sprite="ModernItemBackShadeRight">
|
||||
<object name="sgMapType" size="0 0 100% 100%" type="text" style="ModernLeftLabelText"/>
|
||||
<object name="sgMapType" type="text" style="ModernLeftLabelText"/>
|
||||
</object>
|
||||
|
||||
<object size="5 239 100%-5 240" type="image" sprite="ModernWhiteLine" z="25"/>
|
||||
@ -133,14 +132,14 @@
|
||||
</object>
|
||||
</object>
|
||||
<object size="50% 240 100%-5 285" type="image" sprite="ModernItemBackShadeRight">
|
||||
<object name="sgMapSize" size="0 0 100% 100%" type="text" style="ModernLeftLabelText"/>
|
||||
<object name="sgMapSize" type="text" style="ModernLeftLabelText"/>
|
||||
</object>
|
||||
|
||||
<object size="5 284 100%-5 285" type="image" sprite="ModernWhiteLine" z="25"/>
|
||||
|
||||
<!-- Map Description -->
|
||||
<object type="image" sprite="ModernDarkBoxWhite" size="3% 290 97% 65%">
|
||||
<object name="sgMapDescription" size="0 0 100% 100%" type="text" style="ModernText" font="sans-12"/>
|
||||
<object name="sgMapDescription" type="text" style="ModernText" font="sans-12"/>
|
||||
</object>
|
||||
|
||||
<object type="image" sprite="ModernDarkBoxWhite" size="3% 65%+5 97% 99%">
|
||||
@ -150,7 +149,7 @@
|
||||
<object name="sgGameStartTime" size="3%+24 6% 97% 3%+35" type="text" style="ModernLabelText"/>
|
||||
|
||||
<!-- Player Names -->
|
||||
<object name="sgPlayersNames" size="0 0 100% 100%" type="text" style="MapPlayerList"/>
|
||||
<object name="sgPlayersNames" type="text" style="MapPlayerList"/>
|
||||
</object>
|
||||
</object>
|
||||
<object name="joinGameButton" type="button" style="ModernButtonRed" size="0 100%-79 100% 100%-54" hidden="true">
|
||||
@ -319,8 +318,8 @@
|
||||
<action on="Press">lookupUserProfile();</action>
|
||||
</object>
|
||||
<object name="profileWindowPanel" size="25 95 100%-25 100%-60">
|
||||
<object name="profileWindowBox" type="image" sprite="ModernDarkBoxGold" size="0 0 100% 100%">
|
||||
<object name="profileWindowArea" size="0 0 100% 100%" hidden="true">
|
||||
<object name="profileWindowBox" type="image" sprite="ModernDarkBoxGold">
|
||||
<object name="profileWindowArea" hidden="true">
|
||||
<object name="profileUsernameText" size="0 0 100% 25" type="text" style="ModernLabelText" font="sans-bold-16" />
|
||||
<object size="0 30 40%+40 50" type="text" style="ModernRightLabelText" font="sans-bold-stroke-13">
|
||||
<translatableAttribute id="caption">Current Rank:</translatableAttribute>
|
||||
@ -347,7 +346,7 @@
|
||||
</object>
|
||||
<object name="profileRatioText" size="40%+45 130 100% 150" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
|
||||
</object>
|
||||
<object name="profileErrorText" size="25% 25% 75% 75%" type="text" style="ModernLabelText" font="sans-bold-stroke-13" hidden="false">
|
||||
<object name="profileErrorText" size="25% 25% 75% 75%" type="text" style="ModernLabelText" font="sans-bold-stroke-13">
|
||||
<translatableAttribute id="caption">Please enter a player name.</translatableAttribute>
|
||||
</object>
|
||||
</object>
|
||||
|
@ -6,7 +6,7 @@
|
||||
<script directory="gui/locale/"/>
|
||||
|
||||
<!-- Add a translucent black background to fade out the menu page -->
|
||||
<object type="image" z="0" sprite="ModernFade"/>
|
||||
<object type="image" sprite="ModernFade"/>
|
||||
|
||||
<object type="image" style="ModernDialog" size="50%-210 50%-100 50%+210 50%+100">
|
||||
<object size="15 0 100%-15 100%">
|
||||
|
@ -6,7 +6,7 @@
|
||||
<script directory="gui/locale_advanced/"/>
|
||||
|
||||
<!-- Add a translucent black background to fade out the menu page -->
|
||||
<object type="image" z="0" sprite="ModernFade"/>
|
||||
<object type="image" sprite="ModernFade"/>
|
||||
<object type="image" style="ModernDialog" size="50%-220 50%-210 50%+220 50%+210">
|
||||
<action on="Tick">onTick();</action>
|
||||
<object size="15 0 100%-15 100%">
|
||||
|
@ -6,7 +6,7 @@
|
||||
<script directory="gui/manual/"/>
|
||||
|
||||
<!-- Add a translucent black background to fade out the menu page -->
|
||||
<object type="image" z="0" sprite="ModernFade"/>
|
||||
<object type="image" sprite="ModernFade"/>
|
||||
|
||||
<object type="image" style="ModernDialog" size="50%-466 50%-316 50%+466 50%+316">
|
||||
<object name="title" style="ModernLabelText" type="text" size="50%-128 -18 50%+128 14">
|
||||
|
@ -6,7 +6,7 @@
|
||||
<script directory="gui/prelobby/entrance/"/>
|
||||
|
||||
<!-- Add a translucent black background to fade out the menu page -->
|
||||
<object type="image" z="0" sprite="ModernFade"/>
|
||||
<object type="image" sprite="ModernFade"/>
|
||||
|
||||
<object name="dialog" type="image" style="ModernDialog" size="50%-230 50%-130 50%+230 50%+130">
|
||||
|
||||
|
@ -12,7 +12,7 @@
|
||||
</object>
|
||||
|
||||
<!-- Add a translucent black background to fade out the menu page -->
|
||||
<object type="image" z="0" sprite="BackgroundTranslucent"/>
|
||||
<object type="image" sprite="BackgroundTranslucent"/>
|
||||
|
||||
<object type="image" style="ModernDialog" size="16 24 100%-16 100%-24">
|
||||
<object style="TitleText" type="text" size="50%-128 -18 50%+128 14">
|
||||
|
@ -3,7 +3,6 @@
|
||||
<styles>
|
||||
<style name="IconFrame"
|
||||
sprite="IconFrame_Gold"
|
||||
size="0 0 100% 100%"
|
||||
ghost="true"
|
||||
/>
|
||||
|
||||
|
@ -6,7 +6,7 @@
|
||||
<script directory="gui/reference/viewer/"/>
|
||||
|
||||
<!-- Add a translucent black background to fade out whatever's behind this -->
|
||||
<object type="image" z="0" sprite="BackgroundTranslucent"/>
|
||||
<object type="image" sprite="BackgroundTranslucent"/>
|
||||
|
||||
<object type="image" sprite="ModernDialog" size="50%-250 50%-300 50%+250 50%+300">
|
||||
<object style="TitleText" type="text" size="50%-128 -18 50%+128 14">
|
||||
|
@ -6,7 +6,7 @@
|
||||
<script directory="gui/replaymenu/" />
|
||||
|
||||
<!-- Everything displayed in the replay menu. -->
|
||||
<object type="image" style="ModernWindow" size="0 0 100% 100%" name="replayWindow">
|
||||
<object type="image" style="ModernWindow" name="replayWindow">
|
||||
|
||||
<!-- Title -->
|
||||
<object style="ModernLabelText" type="text" size="50%-128 4 50%+128 36">
|
||||
@ -125,7 +125,7 @@
|
||||
</object>
|
||||
|
||||
<!-- Placeholder to show if no replay is selected -->
|
||||
<object name="replayInfoEmpty" size="0 120 100% 100%-60" type="image" sprite="ModernDarkBoxGold" hidden="false">
|
||||
<object name="replayInfoEmpty" size="0 120 100% 100%-60" type="image" sprite="ModernDarkBoxGold">
|
||||
<object name="logo" size="50%-110 40 50%+110 140" type="image" sprite="logo"/>
|
||||
<object name="subjectBox" type="image" sprite="ModernDarkBoxWhite" size="3% 180 97% 99%">
|
||||
<object name="subject" size="5 5 100%-5 100%-5" type="text" style="ModernText" text_align="center"/>
|
||||
@ -153,7 +153,7 @@
|
||||
|
||||
<!-- Map Type Label -->
|
||||
<object size="50% 195 100%-5 225" type="image" sprite="ModernItemBackShadeRight">
|
||||
<object name="sgMapType" size="0 0 100% 100%" type="text" style="ModernLeftLabelText"/>
|
||||
<object name="sgMapType" type="text" style="ModernLeftLabelText"/>
|
||||
</object>
|
||||
|
||||
<!-- Separator Line -->
|
||||
@ -168,7 +168,7 @@
|
||||
|
||||
<!-- Map Size Label -->
|
||||
<object size="50% 225 100%-5 255" type="image" sprite="ModernItemBackShadeRight">
|
||||
<object name="sgMapSize" size="0 0 100% 100%" type="text" style="ModernLeftLabelText"/>
|
||||
<object name="sgMapSize" type="text" style="ModernLeftLabelText"/>
|
||||
</object>
|
||||
|
||||
<!-- Separator Line -->
|
||||
@ -183,7 +183,7 @@
|
||||
|
||||
<!-- Victory Condition Label -->
|
||||
<object size="50% 255 100%-5 295" type="image" sprite="ModernItemBackShadeRight">
|
||||
<object name="sgVictory" size="0 0 100% 100%" type="text" style="ModernText" font="sans-bold-stroke-14"/>
|
||||
<object name="sgVictory" type="text" style="ModernText" font="sans-bold-stroke-14"/>
|
||||
</object>
|
||||
|
||||
<!-- Separator Line -->
|
||||
|
@ -58,13 +58,13 @@
|
||||
<object size="430 0 100%-80 100%">
|
||||
<repeat count="8" var="r">
|
||||
<object name="diplomacyPlayer[n]_tribute[r]" size="0 0 20 100%" type="button" style="iconButton" tooltip_style="sessionToolTipBold" hidden="true">
|
||||
<object name="diplomacyPlayer[n]_tribute[r]_image" type="image" size="0 0 100% 100%" ghost="true"/>
|
||||
<object name="diplomacyPlayer[n]_tribute[r]_image" type="image" ghost="true"/>
|
||||
</object>
|
||||
</repeat>
|
||||
</object>
|
||||
|
||||
<object name="diplomacyAttackRequest[n]" size="100%-58 0 100%-38 100%" type="button" style="iconButton" tooltip_style="sessionToolTipBold" hidden="true">
|
||||
<object name="diplomacyAttackRequestImage[n]" type="image" size="0 0 100% 100%" sprite="stretched:session/icons/attack-request.png" ghost="true"/>
|
||||
<object name="diplomacyAttackRequestImage[n]" type="image" sprite="stretched:session/icons/attack-request.png" ghost="true"/>
|
||||
</object>
|
||||
|
||||
<object name="diplomacySpyRequest[n]" size="100%-30 0 100%-10 100%" type="button" style="iconButton" tooltip_style="sessionToolTipBold" hidden="true">
|
||||
@ -78,7 +78,7 @@
|
||||
|
||||
<object size="50%-228 100%-50 50%+100 100%-22">
|
||||
<object name="diplomacyColorsWindowButton" size="0 0 28 28" type="button" style="iconButton" tooltip_style="sessionToolTip">
|
||||
<object name="diplomacyColorsWindowButtonIcon" size="0 0 100% 100%" type="image" sprite="stretched:session/icons/diplomacy.png" ghost="true"/>
|
||||
<object name="diplomacyColorsWindowButtonIcon" type="image" sprite="stretched:session/icons/diplomacy.png" ghost="true"/>
|
||||
<action on="Press">updateDiplomacyColorsButton();</action>
|
||||
</object>
|
||||
<object size="32 0 100% 28" type="text" style="DiplomacyText" text_valign="center">
|
||||
|
@ -2,7 +2,6 @@
|
||||
<object name="menu"
|
||||
style="StonePanelThinBorder"
|
||||
type="image"
|
||||
hidden="false"
|
||||
z="40"
|
||||
>
|
||||
<object size="4 36 100%-4 50%+20">
|
||||
|
@ -36,7 +36,6 @@
|
||||
type="text"
|
||||
style="MapPlayerList"
|
||||
textcolor="white"
|
||||
size="0 0 100% 100%"
|
||||
/>
|
||||
</object>
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<object name="unitFormationPanel" size="24 12 100% 100%">
|
||||
<object size="0 0 100% 100%">
|
||||
<object>
|
||||
<repeat count="16">
|
||||
<object name="unitFormationButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBottomBold" z="100">
|
||||
<object name="unitFormationIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
|
||||
|
@ -1,11 +1,11 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<object name="unitGarrisonPanel" size="24 12 100% 100%">
|
||||
<object size="0 0 100% 100%">
|
||||
<object>
|
||||
<repeat count="12">
|
||||
<object name="unitGarrisonButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBottomBold" z="100">
|
||||
<object name="unitGarrisonSelection[n]" type="image" ghost="true" size="0 0 100% 100%"/>
|
||||
<object name="unitGarrisonSelection[n]" type="image" ghost="true"/>
|
||||
<object name="unitGarrisonIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
|
||||
<object name="unitGarrisonCount[n]" ghost="true" style="groupIconsText" type="text" size="0 0 100% 100%"/>
|
||||
<object name="unitGarrisonCount[n]" ghost="true" style="groupIconsText" type="text"/>
|
||||
</object>
|
||||
</repeat>
|
||||
</object>
|
||||
|
@ -5,12 +5,12 @@
|
||||
<object name="unitSelectionPanel"
|
||||
size="20 12 100%-20 100%"
|
||||
>
|
||||
<object size="0 0 100% 100%">
|
||||
<object>
|
||||
<repeat count="16">
|
||||
<object name="unitSelectionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBold" z="100">
|
||||
<object name="unitSelectionSelection[n]" type="image" ghost="true" size="0 0 100% 100%"/>
|
||||
<object name="unitSelectionSelection[n]" type="image" ghost="true"/>
|
||||
<object name="unitSelectionIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
|
||||
<object name="unitSelectionCount[n]" ghost="true" style="groupIconsText" type="text" size="0 0 100% 100%"/>
|
||||
<object name="unitSelectionCount[n]" ghost="true" style="groupIconsText" type="text"/>
|
||||
<object size="0 100%-3 100% 100%" name="unitSelectionHealth[n]" ghost="true">
|
||||
</object>
|
||||
</object>
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
<!-- Total -->
|
||||
<object size="100%-42 12 100%-8 46" type="image" sprite="groupsIcon">
|
||||
<object size="0 0 100% 100%" type="text" style="largeCenteredOutlinedText" name="numberOfUnits" tooltip_style="sessionToolTipBold"/>
|
||||
<object type="text" style="largeCenteredOutlinedText" name="numberOfUnits" tooltip_style="sessionToolTipBold"/>
|
||||
</object>
|
||||
|
||||
<!-- Stats Bars -->
|
||||
|
@ -112,11 +112,9 @@
|
||||
<!-- Player Name and Civ -->
|
||||
<object size="0 40 100% 100%">
|
||||
<object size="50%-64 50%-64 50%+64 50%+64" name="playerCivIcon" type="image" ghost="true"/>
|
||||
<object size="0 0 100% 100%" name="playerColorBackground" type="image" sprite="playerColorBackground" ghost="true"/>
|
||||
<object size="0 0 100% 100%" type="image" sprite="bottomEdgedPanelShader" ghost="true"/>
|
||||
|
||||
<!-- Why is this being automatically ghosted? In the mean time, set ghost to false -->
|
||||
<object ghost="false" size="0 0 100% 100%-5" name="player" type="text" style="largeCenteredOutlinedText" tooltip_style="sessionToolTip"/>
|
||||
<object name="playerColorBackground" type="image" sprite="playerColorBackground" ghost="true"/>
|
||||
<object type="image" sprite="bottomEdgedPanelShader" ghost="true"/>
|
||||
<object size="0 0 100% 100%-5" name="player" type="text" style="largeCenteredOutlinedText" tooltip_style="sessionToolTip"/>
|
||||
</object>
|
||||
</object>
|
||||
|
||||
|
@ -8,8 +8,8 @@
|
||||
<object size="0 1 100% 100%">
|
||||
<repeat count="2">
|
||||
<object name="unitAllyCommandButton[n]" hidden="true" style="iconButton" type="button" size="0 0 32 32" tooltip_style="sessionToolTipBottomBold">
|
||||
<object name="unitAllyCommandIcon[n]" ghost="true" type="image" size="0 0 100% 100%" style="commandIcon"/>
|
||||
<object name="unitAllyCommandCount[n]" ghost="true" style="groupIconsText" type="text" size="0 0 100% 100%"/>
|
||||
<object name="unitAllyCommandIcon[n]" ghost="true" type="image" style="commandIcon"/>
|
||||
<object name="unitAllyCommandCount[n]" ghost="true" style="groupIconsText" type="text"/>
|
||||
</object>
|
||||
</repeat>
|
||||
</object>
|
||||
|
@ -8,8 +8,8 @@
|
||||
<object size="0 1 100% 100%">
|
||||
<repeat count="6">
|
||||
<object name="unitCommandButton[n]" hidden="true" style="iconButton" type="button" size="0 0 32 32" tooltip_style="sessionToolTipBottomBold">
|
||||
<object name="unitCommandIcon[n]" ghost="true" type="image" size="0 0 100% 100%" style="commandIcon"/>
|
||||
<object name="unitCommandCount[n]" ghost="true" style="groupIconsText" type="text" size="0 0 100% 100%"/>
|
||||
<object name="unitCommandIcon[n]" ghost="true" type="image" style="commandIcon"/>
|
||||
<object name="unitCommandCount[n]" ghost="true" style="groupIconsText" type="text"/>
|
||||
</object>
|
||||
</repeat>
|
||||
</object>
|
||||
|
@ -2,7 +2,7 @@
|
||||
<object name="unitConstructionPanel"
|
||||
size="10 12 100% 100%"
|
||||
>
|
||||
<object size="0 0 100% 100%">
|
||||
<object>
|
||||
<repeat count="24">
|
||||
<object name="unitConstructionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
|
||||
<object name="unitConstructionIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
|
||||
|
@ -2,7 +2,7 @@
|
||||
<object name="unitGatePanel"
|
||||
size="10 12 100% 100%"
|
||||
>
|
||||
<object size="0 0 100% 100%">
|
||||
<object>
|
||||
<repeat count="8">
|
||||
<object name="unitGateButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
|
||||
<object name="unitGateIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
|
||||
|
@ -2,7 +2,7 @@
|
||||
<object name="unitPackPanel"
|
||||
size="10 12 100% 100%"
|
||||
>
|
||||
<object size="0 0 100% 100%">
|
||||
<object>
|
||||
<repeat count="8">
|
||||
<object name="unitPackButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
|
||||
<object name="unitPackIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
|
||||
|
@ -2,7 +2,7 @@
|
||||
<object name="unitResearchPanel"
|
||||
size="10 100%-102 100% 100%"
|
||||
>
|
||||
<object size="0 0 100% 100%">
|
||||
<object>
|
||||
<repeat count="16">
|
||||
<object name="unitResearchButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
|
||||
<object name="unitResearchIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
|
||||
|
@ -2,7 +2,7 @@
|
||||
<object name="unitTrainingPanel"
|
||||
size="10 12 100% 100%"
|
||||
>
|
||||
<object size="0 0 100% 100%">
|
||||
<object>
|
||||
<repeat count="24">
|
||||
<object name="unitTrainingButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
|
||||
<object name="unitTrainingIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
|
||||
|
@ -2,7 +2,7 @@
|
||||
<object name="unitUpgradePanel"
|
||||
size="10 12 100% 100%"
|
||||
>
|
||||
<object size="0 0 100% 100%">
|
||||
<object>
|
||||
<repeat count="8">
|
||||
<object name="unitUpgradeButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
|
||||
<object name="unitUpgradeIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
|
||||
|
@ -49,40 +49,39 @@
|
||||
</object>
|
||||
|
||||
<!-- Network status -->
|
||||
<object name="netStatus" type="text" style="netStatus" z="0" hidden="true">
|
||||
<object name="netStatus" type="text" style="netStatus" hidden="true">
|
||||
<object type="button"
|
||||
name="disconnectedExitButton"
|
||||
style="StoneButton"
|
||||
size="50%-84 50%+128 50%+84 50%+160"
|
||||
tooltip_style="sessionToolTip"
|
||||
z="0"
|
||||
>
|
||||
<translatableAttribute id="caption">Exit</translatableAttribute>
|
||||
<action on="Press">leaveGame();</action>
|
||||
</object>
|
||||
<object name="loadingClientsText" size="50%-300 50%+60 50%+300 50%+110" type="text" style="netStatusPlayersText" hidden="true" z="0"/>
|
||||
<object name="loadingClientsText" size="50%-300 50%+60 50%+300 50%+110" type="text" style="netStatusPlayersText" hidden="true"/>
|
||||
</object>
|
||||
|
||||
<!-- Pause Overlay -->
|
||||
<object type="button" name="pauseOverlay" size="0 0 100% 100%" tooltip_style="sessionToolTip" hidden="true" z="0">
|
||||
<object size="0 0 100% 100%" type="image" sprite="sessionOverlayBackground" ghost="true" z="0"/>
|
||||
<object size="50%-128 40%-20 50%+128 40%+20" type="text" style="PauseText" ghost="true" z="0">
|
||||
<object type="button" name="pauseOverlay" tooltip_style="sessionToolTip" hidden="true">
|
||||
<object type="image" sprite="sessionOverlayBackground" ghost="true"/>
|
||||
<object size="50%-128 40%-20 50%+128 40%+20" type="text" style="PauseText" ghost="true">
|
||||
<translatableAttribute id="caption">Game Paused</translatableAttribute>
|
||||
</object>
|
||||
<object name="resumeMessage" size="50%-128 40%+20 50%+128 40%+40" type="text" style="ResumeMessageText" ghost="true" z="0">
|
||||
<object name="resumeMessage" size="50%-128 40%+20 50%+128 40%+40" type="text" style="ResumeMessageText" ghost="true">
|
||||
<translatableAttribute id="caption">Click to Resume Game</translatableAttribute>
|
||||
</object>
|
||||
<object name="pausedByText" size="30% 40%+50 70% 100%" type="text" style="netStatusPlayersText" ghost="true" hidden="true" z="0"/>
|
||||
<object name="pausedByText" size="30% 40%+50 70% 100%" type="text" style="netStatusPlayersText" ghost="true" hidden="true"/>
|
||||
<action on="Press">togglePause();</action>
|
||||
</object>
|
||||
|
||||
<!-- Notification Area -->
|
||||
<object name="notificationPanel" type="image" size="50%-300 60 50%+300 120" ghost="true">
|
||||
<object name="notificationText" size="0 0 100% 100%" type="text" style="notificationPanel" ghost="true"/>
|
||||
<object name="notificationText" type="text" style="notificationPanel" ghost="true"/>
|
||||
</object>
|
||||
|
||||
<!-- Chat messages -->
|
||||
<object name="chatPanel" size="0 130 100% 100%-240" type="image" ghost="true" z="0" absolute="true">
|
||||
<object name="chatPanel" size="0 130 100% 100%-240" type="image" ghost="true" absolute="true">
|
||||
<object name="chatText" size="3 1 100%-1 100%-1" type="text" style="chatPanelOverlay" ghost="true"/>
|
||||
</object>
|
||||
|
||||
@ -138,7 +137,6 @@
|
||||
type="image"
|
||||
sprite="selectionDetailsPanel"
|
||||
size="50%-114 100%-205 50%+114 100%"
|
||||
hidden="false"
|
||||
>
|
||||
<include directory="gui/session/selection_panels_middle/"/>
|
||||
</object>
|
||||
@ -148,7 +146,6 @@
|
||||
type="image"
|
||||
sprite="unitCommandsPanel"
|
||||
size="50%+110 100%-170 50%+512 100%"
|
||||
hidden="false"
|
||||
z="20"
|
||||
>
|
||||
<include directory="gui/session/selection_panels_right/"/>
|
||||
|
@ -4,7 +4,7 @@
|
||||
size="0% 50%-216 0%+36 50%+144"
|
||||
>
|
||||
<repeat count="10">
|
||||
<object name="unitGroupButton[n]" size="0 0 36 36" type="button" hidden="false" style="iconButton" tooltip_style="sessionToolTipBottomBold">
|
||||
<object name="unitGroupButton[n]" size="0 0 36 36" type="button" style="iconButton" tooltip_style="sessionToolTipBottomBold">
|
||||
<translatableAttribute id="tooltip">Click to select grouped units, double-click to focus the grouped units and right-click to disband the group.</translatableAttribute>
|
||||
<object name="unitGroupIcon[n]" size="3 3 33 33" type="image" sprite="groupsIcon" ghost="true"/>
|
||||
<object name="unitGroupLabel[n]" type="text" style="largeCenteredOutlinedText" ghost="true"/>
|
||||
|
@ -34,14 +34,6 @@
|
||||
text_valign="top"
|
||||
/>
|
||||
|
||||
<style name="BuildNameText"
|
||||
font="sans-stroke-12"
|
||||
textcolor="white"
|
||||
text_align="center"
|
||||
text_valign="bottom"
|
||||
ghost="true"
|
||||
/>
|
||||
|
||||
<style name="leftAlignedText"
|
||||
textcolor="white"
|
||||
text_align="left"
|
||||
|
@ -7,7 +7,7 @@
|
||||
hotkey="session.gui.diplomacy.toggle"
|
||||
>
|
||||
<!-- TODO make the button less ugly -->
|
||||
<object size="0 0 100% 100%" name="diplomacyButtonImage" type="image" sprite="stretched:session/icons/diplomacy.png" ghost="true"/>
|
||||
<object name="diplomacyButtonImage" type="image" sprite="stretched:session/icons/diplomacy.png" ghost="true"/>
|
||||
<action on="Press">
|
||||
toggleDiplomacy();
|
||||
</action>
|
||||
|
@ -6,7 +6,7 @@
|
||||
tooltip_style="sessionToolTip"
|
||||
hotkey="session.gui.barter.toggle"
|
||||
>
|
||||
<object size="0 0 100% 100%" name="tradeButtonImage" type="image" sprite="stretched:session/icons/economics.png" ghost="true"/>
|
||||
<object name="tradeButtonImage" type="image" sprite="stretched:session/icons/economics.png" ghost="true"/>
|
||||
<action on="Press">
|
||||
toggleTrade();
|
||||
</action>
|
||||
|
@ -5,7 +5,7 @@
|
||||
name="civIcon"
|
||||
tooltip_style="sessionToolTipBold"
|
||||
>
|
||||
<object name="civIconOverlay" style="CivIconOverlay" size="0 0 100% 100%" type="button">
|
||||
<object name="civIconOverlay" style="CivIconOverlay" type="button">
|
||||
<action on="Press">openStrucTree(g_CivInfo.page)</action>
|
||||
</object>
|
||||
</object>
|
||||
|
@ -4,7 +4,16 @@
|
||||
<translatableAttribute id="caption">ALPHA XXIV</translatableAttribute>
|
||||
|
||||
<!-- Displays build date and revision number-->
|
||||
<object size="50%-128 0 50%+128 100%-2" name="buildTimeLabel" type="text" style="BuildNameText" ghost="true">
|
||||
<object
|
||||
name="buildTimeLabel"
|
||||
type="text"
|
||||
size="50%-128 0 50%+128 100%-2"
|
||||
ghost="true"
|
||||
font="sans-stroke-12"
|
||||
textcolor="white"
|
||||
text_align="center"
|
||||
text_valign="bottom"
|
||||
>
|
||||
<action on="Load">this.caption = getBuildString()</action>
|
||||
</object>
|
||||
</object>
|
||||
|
@ -6,7 +6,7 @@
|
||||
<script directory="gui/splashscreen/"/>
|
||||
|
||||
<!-- Add a translucent black background to fade out the menu page -->
|
||||
<object type="image" z="0" sprite="ModernFade"/>
|
||||
<object type="image" sprite="ModernFade"/>
|
||||
|
||||
<object type="image" style="ModernDialog" size="50%-274 50%-200 50%+274 50%+200">
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user