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

Lots of GUI fixes to issues pointed out by alpha123 on IRC.

Browse Source 
This was SVN commit r15235.
This commit is contained in:
JoshuaJB 2014-05-27 05:34:28 +00:00
parent a75342e2c7
commit e4d3189494
19 changed files with 35 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
binaries/data/mods/public/gui/aiconfig/aiconfig.xml
View File

@ -5,17 +5,17 @@
<script file="gui/aiconfig/aiconfig.js"/>
<!-- Add a translucent black background to fade out the menu page -->
<object type="image" z="10" sprite="ModernFade"/>
<object type="image" sprite="ModernFade"/>
<object type="image" style="ModernDialog" size="50%-200 40%-140 50%+200 40%+180">
<object type="image" style="ModernDialog" size="50%-230 50%-130 50%+230 50%+130">
<object style="TitleText" type="text" size="50%-128 -16 50%+128 16">
<object style="ModernLabelText" type="text" size="50%-128 -18 50%+128 14">
<translatableAttribute id="caption">AI Configuration</translatableAttribute>
</object>
<object size="50%-128 30 50%+128 80">
<object type="text" style="ModernRightLabelText" size="-10 0 90 50%">
<translatableAttribute id="caption">AI Player</translatableAttribute>
<translatableAttribute id="caption">AI Player:</translatableAttribute>
</object>
<object name="aiSelection" type="dropdown" style="ModernDropDown" size="50%-24 0 50%+136 28">
@ -23,21 +23,21 @@
</object>
<object type="text" style="ModernRightLabelText" size="-10 35 90 50%+35">
<translatableAttribute id="caption">AI Difficulty</translatableAttribute>
<translatableAttribute id="caption">AI Difficulty:</translatableAttribute>
</object>
<object name="aiDifficulty" type="dropdown" style="ModernDropDown" size="50%-24 35 50%+136 63">
</object>
</object>
<object name="aiDescription" type="text" style="ModernLabelText" size="8% 50%-54 92% 50%+74" text_align="center"/>
<object name="aiDescription" type="text" style="ModernLabelText" size="8% 50%-54 92% 50%+74"/>
<object type="button" style="StoneButton" size="50%-144 100%-60 50%-16 100%-32">
<object type="button" style="ModernButtonRed" size="18 100%-45 50%-5 100%-17">
<translatableAttribute id="caption">Cancel</translatableAttribute>
<action on="Press">Engine.PopGuiPage();</action>
</object>
<object type="button" style="StoneButton" size="50%+16 100%-60 50%+144 100%-32">
<object type="button" style="ModernButtonRed" size="50%+5 100%-45 100%-18 100%-17">
<translatableAttribute id="caption">OK</translatableAttribute>
<action on="Press">returnAI();</action>
</object>

2
binaries/data/mods/public/gui/civinfo/civinfo.xml
View File

@ -12,7 +12,7 @@
<object type="image" style="ModernDialog" size="50%-500 50%-368 50%+500 50%+370">
<object style="TitleText" type="text" size="50%-128 -16 50%+128 16">
<object style="TitleText" type="text" size="50%-128 -18 50%+128 14">
<translatableAttribute id="caption">Civilizations</translatableAttribute>
</object>

2
binaries/data/mods/public/gui/common/functions_global_object.js
View File

@ -72,7 +72,7 @@ function messageBox (mbWidth, mbHeight, mbMessage, mbTitle, mbMode, mbButtonCapt
function openURL(url)
{
Engine.OpenURL(url);
messageBox(600, 200, sprintf(translate("Opening %(url)s\n in default web browser. Please wait..."), { url: url }), translate("Opening page"), 2);
messageBox(600, 200, sprintf(translate("Opening %(url)s\n in default web browser. Please wait...."), { url: url }), translate("Opening page"), 2);
}
function updateFPS()

2
binaries/data/mods/public/gui/gamesetup/gamesetup.xml
View File

@ -261,7 +261,7 @@
<!-- More Options -->
<object hidden="true" name="moreOptionsFade" type="image" z="60" sprite="ModernFade"/>
<object name="moreOptions" type="image" sprite="ModernDialog" size="50%-200 50%-175 50%+200 50%+180" z="70" hidden="true">
<object style="TitleText" type="text" size="50%-128 0%-16 50%+128 16">
<object style="ModernLabelText" type="text" size="50%-128 -18 50%+128 14">
<translatableAttribute id="caption">More Options</translatableAttribute>
</object>

2
binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml
View File

@ -7,7 +7,7 @@
<script file="gui/gamesetup/gamesetup_mp.js"/>
<!-- Add a translucent black background to fade out the menu page -->
<object type="image" z="0" sprite="bkTranslucent"/>
<object type="image" z="0" sprite="ModernFade"/>
<object type="image" style="ModernDialog" size="50%-190 50%-120 50%+190 50%+120">

4
binaries/data/mods/public/gui/loading/loading.js
View File

@ -48,11 +48,11 @@ function init(data)
{
case "skirmish":
case "scenario":
loadingMapName.caption = sprintf(translate("Loading \"%(map)s\""), {map: mapName});
loadingMapName.caption = sprintf(translate("Loading “%(map)s”"), {map: mapName});
break;
case "random":
loadingMapName.caption = sprintf(translate("Generating \"%(map)s\""), {map: mapName});
loadingMapName.caption = sprintf(translate("Generating “%(map)s”"), {map: mapName});
break;
default:

2
binaries/data/mods/public/gui/lobby/lobby.xml
View File

@ -193,7 +193,7 @@
<!-- Add a translucent black background to fade out the menu page -->
<object hidden="true" name="leaderboardFade" type="image" z="100" sprite="ModernFade"/>
<object hidden="true" name="leaderboard" type="image" style="ModernDialog" size="50%-224 50%-160 50%+224 50%+160" z="101">
<object style="ModernLabelText" type="text" size="50%-128 0%-16 50%+128 16">
<object style="ModernLabelText" type="text" size="50%-128 -18 50%+128 14">
<translatableAttribute id="caption">Leaderboard</translatableAttribute>
</object>
<object name="leaderboardBox"

2
binaries/data/mods/public/gui/lobby/prelobby.xml
View File

@ -14,7 +14,7 @@
onTick();
</action>
<object style="ModernLabelText" type="text" size="50%-128 0%-16 50%+128 16">
<object style="ModernLabelText" type="text" size="50%-128 -18 50%+128 14">
<translatableAttribute id="caption">Multiplayer Lobby</translatableAttribute>
</object>

2
binaries/data/mods/public/gui/locale/locale.xml
View File

@ -10,7 +10,7 @@
<object type="image" style="ModernDialog" size="50%-190 50%-100 50%+190 50%+100">
<object size="15 0 100%-15 100%">
<object style="ModernLabelText" type="text" size="50%-128 0%-16 50%+128 16">
<object style="ModernLabelText" type="text" size="50%-128 -18 50%+128 14">
<translatableAttribute id="caption">Language</translatableAttribute>
</object>
<object type="text" size="5 50 40% 75" style="ModernLabelText" text_align="left">

4
binaries/data/mods/public/gui/locale/locale_advanced.xml
View File

@ -10,7 +10,7 @@
<object type="image" style="ModernDialog" size="50%-220 50%-200 50%+220 50%+200">
<action on="Tick">onTick();</action>
<object size="15 0 100%-15 100%">
<object style="ModernLabelText" type="text" size="50%-150 0%-16 50%+150 16">
<object style="ModernLabelText" type="text" size="50%-150 -18 50%+150 14">
<translatableAttribute id="caption">Language</translatableAttribute>
</object>
<object type="text" size="5 50 50% 75" style="ModernLabelText" text_align="left">
@ -71,7 +71,7 @@
<action on="Press">autoDetectLocale();</action>
</object>
<object name="acceptButton" type="button" style="ModernButtonRed" size="66%+5 100%-60 100% 100%-32">
<object name="acceptButton" type="button" style="ModernButtonRed" size="66%+5 100%-60 100% 100%-32">
<translatableAttribute id="caption">Accept</translatableAttribute>
<action on="Press">applySelectedLocale();</action>
</object>

2
binaries/data/mods/public/gui/manual/manual.xml
View File

@ -8,7 +8,7 @@
<object type="image" z="0" sprite="ModernFade"/>
<object type="image" style="ModernDialog" size="50%-466 50%-316 50%+466 50%+316">
<object name="title" type="text" style="ModernLabelText" size="50%-128 0%-16 50%+128 16">
<object name="title" style="ModernLabelText" type="text" size="50%-128 -18 50%+128 14">
<translatableAttribute id="caption">Information</translatableAttribute>
</object>

2
binaries/data/mods/public/gui/msgbox/msgbox.xml
View File

@ -16,7 +16,7 @@
<object name="mbTitleBar"
style="TitleText"
type="text"
size="50%-128 0%-16 50%+128 16"
size="50%-128 -18 50%+128 14"
/>
<object name="mbText"

18
binaries/data/mods/public/gui/options/options.xml
View File

@ -10,15 +10,15 @@
<script file="gui/options/options.js"/>
<!-- Add a translucent black background to fade out the menu page -->
<object type="image" z="0" style="TranslucentPanel"/>
<object type="image" sprite="ModernFade"/>
<!-- Settings Window -->
<object name="options" type="image" style="ModernDialog" size="50%-466 50%-316 50%+466 50%+316">
<object style="TitleText" type="text" size="50%-128 0%-16 50%+128 16">
<object style="ModernLabelText" type="text" size="50%-128 -16 50%+128 16">
<translatableAttribute id="caption">Game Options</translatableAttribute>
</object>
<object name="GeneralSettings" type="image" sprite="ModernDarkBoxGold" size="16 16 312 100%-16">
<object style="TitleText" type="text" size="0 5 100% 25">
<object style="ModernLabelText" type="text" size="0 5 100% 25">
<translatableAttribute id="caption">General</translatableAttribute>
</object>
<repeat count="23">
@ -29,8 +29,8 @@
</object>
</repeat>
</object>
<object name="GraphicsSettings" type="image" sprite="ModernDarkBoxGold" size="320 16 612 100%-56">
<object style="TitleText" type="text" size="0 5 100% 25">
<object name="GraphicsSettings" type="image" sprite="ModernDarkBoxGold" size="320 16 612 100%-52">
<object style="ModernLabelText" type="text" size="0 5 100% 25">
<translatableAttribute id="caption">Graphics Settings</translatableAttribute>
</object>
<repeat count="21">
@ -42,7 +42,7 @@
</repeat>
</object>
<object name="SoundSettings" type="image" sprite="ModernDarkBoxGold" size="620 16 916 50%-4">
<object style="TitleText" type="text" size="0 5 100% 25">
<object style="ModernLabelText" type="text" size="0 5 100% 25">
<translatableAttribute id="caption">Sound Settings</translatableAttribute>
</object>
<repeat count="10">
@ -54,7 +54,7 @@
</repeat>
</object>
<object name="LobbySettings" type="image" sprite="ModernDarkBoxGold" size="620 50%+4 916 100%-16">
<object style="TitleText" type="text" size="0 5 100% 25">
<object style="ModernLabelText" type="text" size="0 5 100% 25">
<translatableAttribute id="caption">Lobby Settings</translatableAttribute>
</object>
<repeat count="10">
@ -65,11 +65,11 @@
</object>
</repeat>
</object>
<object type="button" style="StoneButton" size="320 100%-48 50%-4 100%-16">
<object type="button" style="ModernButtonRed" size="320 100%-44 50%-4 100%-16">
<translatableAttribute id="caption">Cancel</translatableAttribute>
<action on="Press">closePage();</action>
</object>
<object type="button" style="StoneButton" size="50%+4 100%-48 612 100%-16">
<object type="button" style="ModernButtonRed" size="50%+4 100%-44 612 100%-16">
<translatableAttribute id="caption">Save</translatableAttribute>
<action on="Press">Engine.ConfigDB_WriteFile("user", "config/user.cfg");closePage();</action>
</object>

6
binaries/data/mods/public/gui/page_aiconfig.xml
View File

@ -4,11 +4,5 @@
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>aiconfig/aiconfig.xml</include>
</page>

6
binaries/data/mods/public/gui/page_options.xml
View File

@ -4,12 +4,6 @@
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
<include>common/styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>common/icon_sprites.xml</include>
<include>common/init.xml</include>
<include>common/global.xml</include>

4
binaries/data/mods/public/gui/pregame/mainmenu.js
View File

@ -305,8 +305,8 @@ function getBuildString()
function exitGamePressed()
{
closeMenu();
var btCaptions = [translate("Yes"), translate("No")];
var btCode = [Engine.Exit, null];
var btCaptions = [translate("No"), translate("Yes")];
var btCode = [null, Engine.Exit];
messageBox(400, 200, translate("Are you sure you want to quit 0 A.D.?"), translate("Confirmation"), 0, btCaptions, btCode);
}

2
binaries/data/mods/public/gui/savedgames/load.xml
View File

@ -11,7 +11,7 @@
<object type="image" style="ModernDialog" size="50%-300 50%-200 50%+300 50%+200">
<object type="text" style="TitleText" size="50%-128 0%-16 50%+128 16">
<object type="text" style="TitleText" size="50%-128 -18 50%+128 14">
<translatableAttribute id="caption">Load Game</translatableAttribute>
</object>

2
binaries/data/mods/public/gui/savedgames/save.xml
View File

@ -11,7 +11,7 @@
<object type="image" style="ModernDialog" size="50%-300 50%-200 50%+300 50%+200">
<object type="image" z="0" sprite="ModernFade"/>
<object type="text" style="TitleText" size="50%-128 0%-16 50%+128 16">
<object type="text" style="TitleText" size="50%-128 -18 50%+128 14">
<translatableAttribute id="caption">Save Game</translatableAttribute>
</object>

2
binaries/data/mods/public/gui/splashscreen/splashscreen.xml
View File

@ -8,7 +8,7 @@
<object type="image" z="0" sprite="ModernFade"/>
<object type="image" style="ModernDialog" size="50%-274 50%-200 50%+274 50%+200">
<object type="text" style="TitleText" size="50%-128 0%-16 50%+128 16">
<object type="text" style="TitleText" size="50%-128 -18 50%+128 14">
<translatableAttribute id="caption">Welcome to 0 A.D. !</translatableAttribute>
</object>