gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Switch more buttons, see 911be4e860

Browse Source 
This was SVN commit r15096.
This commit is contained in:
sanderd17
2014-05-03 08:45:19 +00:00
parent f066549523
commit 4e0a588456
7 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml
+3 -3
View File
@@ -45,7 +45,7 @@
</action>
</object>3 100%-33 103 100%-3
<object hotkey="confirm" type="button" size="50%-144 100%-60 50%-16 100%-32" style="StoneButton">
<object hotkey="confirm" type="button" size="50%+16 100%-60 50%+144 100%-32" style="StoneButton">
<translatableAttribute id="caption">Continue</translatableAttribute>
<action on="Press">
var joinPlayerName = Engine.GetGUIObjectByName("joinPlayerName").caption;
@@ -91,7 +91,7 @@
</object>
</object>
<object type="button" size="50%-144 100%-60 50%-16 100%-32" style="StoneButton">
<object type="button" size="50%+16 100%-60 50%+144 100%-32" style="StoneButton">
<translatableAttribute id="caption">Continue</translatableAttribute>
<action on="Press">
var hostPlayerName = Engine.GetGUIObjectByName("hostPlayerName").caption;
@@ -105,7 +105,7 @@
<object name="hostFeedback" type="text" style="ModernLabelText" size="32 150 100%-32 180" textcolor="red" />
<object type="button" style="StoneButton" size="50%+16 100%-60 50%+144 100%-32">
<object type="button" style="StoneButton" size="50%-144 100%-60 50%-16 100%-32">
<translatableAttribute id="caption">Cancel</translatableAttribute>
<action on="Press">cancelSetup();</action>
</object>
binaries/data/mods/public/gui/locale/locale.xml
+4 -4
View File
@@ -33,8 +33,8 @@
<object name="localeText" type="text" size="40%+10 80 100% 105" textcolor="white" />
<object type="button" size="0 100%-60 33% 100%-32" style="ModernButtonRed">
<translatableAttribute id="caption">Accept</translatableAttribute>
<action on="Press">applySelectedLocale();</action>
<translatableAttribute id="caption">Cancel</translatableAttribute>
<action on="Press">cancelSetup();</action>
</object>
<object type="button" size="33%+5 100%-60 66% 100%-32" style="ModernButtonRed">
@@ -43,8 +43,8 @@
</object>
<object type="button" style="ModernButtonRed" size="66%+5 100%-60 100% 100%-32">
<translatableAttribute id="caption">Cancel</translatableAttribute>
<action on="Press">cancelSetup();</action>
<translatableAttribute id="caption">Accept</translatableAttribute>
<action on="Press">applySelectedLocale();</action>
</object>
</object>
</object>
binaries/data/mods/public/gui/locale/locale_advanced.xml
+4 -4
View File
@@ -62,8 +62,8 @@
<object name="dictionaryFile" type="text" size="50%+10 260 100% 345" textcolor="white" />
<object name="acceptButton" type="button" size="0 100%-60 33% 100%-32" style="ModernButtonRed">
<translatableAttribute id="caption">Accept</translatableAttribute>
<action on="Press">applySelectedLocale();</action>
<translatableAttribute id="caption">Cancel</translatableAttribute>
<action on="Press">cancelSetup();</action>
</object>
<object type="button" size="33%+5 100%-60 66% 100%-32" style="ModernButtonRed">
@@ -72,8 +72,8 @@
</object>
<object type="button" style="ModernButtonRed" size="66%+5 100%-60 100% 100%-32">
<translatableAttribute id="caption">Cancel</translatableAttribute>
<action on="Press">cancelSetup();</action>
<translatableAttribute id="caption">Accept</translatableAttribute>
<action on="Press">applySelectedLocale();</action>
</object>
</object>
</object>
binaries/data/mods/public/gui/pregame/mainmenu.js
+2 -2
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);
}
binaries/data/mods/public/gui/savedgames/load.xml
+4 -4
View File
@@ -22,8 +22,8 @@
</object>
<object name="loadGameButton" type="button" size="0%+25 100%-60 33%+10 100%-32" style="StoneButton">
<translatableAttribute id="caption">Load</translatableAttribute>
<action on="Press">loadGame();</action>
<translatableAttribute id="caption">Cancel</translatableAttribute>
<action on="Press">Engine.PopGuiPage();</action>
</object>
<object name="deleteGameButton" type="button" size="33%+20 100%-60 66%-15 100%-32" style="StoneButton">
@@ -32,8 +32,8 @@
</object>
<object type="button" style="StoneButton" size="66%-5 100%-60 100%-25 100%-32">
<translatableAttribute id="caption">Cancel</translatableAttribute>
<action on="Press">Engine.PopGuiPage();</action>
<translatableAttribute id="caption">Load</translatableAttribute>
<action on="Press">loadGame();</action>
</object>
</object>
binaries/data/mods/public/gui/savedgames/save.xml
+4 -4
View File
@@ -34,8 +34,8 @@
</object>
<object name="saveButton" type="button" size="0%+25 100%-60 33%+10 100%-32" style="StoneButton">
<translatableAttribute id="caption">Save</translatableAttribute>
<action on="Press">saveGame();</action>
<translatableAttribute id="caption">Cancel</translatableAttribute>
<action on="Press">closeSave(true);</action>
</object>
<object name="deleteGameButton" type="button" size="33%+20 100%-60 66%-15 100%-32" style="StoneButton">
@@ -44,8 +44,8 @@
</object>
<object type="button" style="StoneButton" size="66%-5 100%-60 100%-25 100%-32">
<translatableAttribute id="caption">Cancel</translatableAttribute>
<action on="Press">closeSave(true);</action>
<translatableAttribute id="caption">Save</translatableAttribute>
<action on="Press">saveGame();</action>
</object>
</object>
binaries/data/mods/public/gui/session/session.xml
+4 -4
View File
@@ -399,13 +399,13 @@
</object>
<object size="16 100%-40 30%+16 100%-12" type="button" style="StoneButton">
<translatableAttribute id="caption">Send</translatableAttribute>
<action on="Press">submitChatInput();</action>
<translatableAttribute id="caption">Cancel</translatableAttribute>
<action on="Press">closeChat();</action>
</object>
<object size="30%+24 100%-40 60%+24 100%-12" type="button" style="StoneButton">
<translatableAttribute id="caption">Cancel</translatableAttribute>
<action on="Press">closeChat();</action>
<translatableAttribute id="caption">Send</translatableAttribute>
<action on="Press">submitChatInput();</action>
</object>
<object name="toggleTeamChat" size="60%+32 100%-34 60%+48 100%-6" type="checkbox" style="ModernTickBox"/>
<object size="60%+48 100%-40 100% 100%-12" type="text" style="ModernLeftLabelText">