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

Reorder dialog buttons for consistency

Browse Source 
This was SVN commit r10279.
This commit is contained in:
WhiteTreePaladin 2011-09-14 00:43:19 +00:00
parent d4ffe7c887
commit aba6a7f118
4 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,15 +30,13 @@
</object>
<object type="button" style="StoneButton" size="50%-144 100%-60 50%-16 100%-32">
Cancel
<action on="Press">Engine.PopGuiPage();</action>
</object>
<object type="button" style="StoneButton" size="50%+16 100%-60 50%+144 100%-32">
OK
<action on="Press">returnAI();</action>
</object>
<object type="button" style="StoneButton" size="50%+16 100%-60 50%+144 100%-32">
Cancel
<action on="Press">Engine.PopGuiPage();</action>
</object>
</object>
</objects>

1
binaries/data/mods/public/gui/common/music.js
View File

@ -8,6 +8,7 @@ function initMusic()
// Might need to use pregame for that sort of setup and move all the
// menu stuff to a main_menu page
if (!global.music)
global.music = new Music();
}

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

@ -43,7 +43,7 @@
127.0.0.1
</object>3 100%-33 103 100%-3
<object type="button" size="50%+16 100%-60 50%+144 100%-32" style="StoneButton">
<object type="button" size="50%-144 100%-60 50%-16 100%-32" style="StoneButton">
Continue
<action on="Press"><![CDATA[
if (startJoin(
@ -84,7 +84,7 @@
</object>
</object>
<object type="button" size="50%+16 100%-60 50%+144 100%-32" style="StoneButton">
<object type="button" size="50%-144 100%-60 50%-16 100%-32" style="StoneButton">
Continue
<action on="Press"><![CDATA[
if (startHost(
@ -97,7 +97,7 @@
</object>
</object>
<object type="button" style="StoneButton" size="50%-144 100%-60 50%-16 100%-32">
<object type="button" style="StoneButton" size="50%+16 100%-60 50%+144 100%-32">
Cancel
<action on="Press"><![CDATA[cancelSetup();]]></action>
</object>

12
binaries/data/mods/public/gui/session/session.xml
View File

@ -179,20 +179,20 @@
</object>
<!-- 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%-180 50%-58 50%+180 50%+46" type="image" hidden="true" sprite="genericPanel">
<object name="chatInput" size="16 12 100%-16 36" type="input" style="StoneInput" max_length="80">
<action on="Press">submitChatInput();</action>
</object>
<object size="32 100%-40 144 100%-12" type="button" style="StoneButton">
Cancel
<action on="Press">closeChat();</action>
</object>
<object size="100%-144 100%-40 100%-32 100%-12" type="button" style="StoneButton">
<object size="50%-144 100%-50 50%-16 100%-22" type="button" style="StoneButton">
Send
<action on="Press">submitChatInput();</action>
</object>
<object size="50%+16 100%-50 50%+144 100%-22" type="button" style="StoneButton">
Cancel
<action on="Press">closeChat();</action>
</object>
</object>
<!-- ================================ ================================ -->