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

Various GUI fixes and cleanup.

Browse Source 
This was SVN commit r15070.
This commit is contained in:
JoshuaJB
2014-04-30 04:38:53 +00:00
parent dfacf5358c
commit 748ebdfdb0
29 changed files with 104 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/art/textures/ui/global/modern/tick-disabled.png
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/gui/common/modern/setup.xml
+1 -1
View File
@@ -5,7 +5,7 @@
==========================================
- SCROLLBARS -
==========================================
<scrollbar name="ModernScrollBar"
<scrollbar name="ModernScrollBar"
width = "15"
minimum_bar_size = "15"
maximum_bar_size = "15"
binaries/data/mods/public/gui/common/modern/sprites.xml
+20 -7
View File
@@ -415,6 +415,24 @@
</sprite>
<!--
==========================================
- Basic. -
==========================================
-->
<sprite name="logo">
<image texture="pregame/shell/logo/0ad_logo.png"
real_texture_placement="0 0 256 128"
size="0 -5% 100% 105%"
/>
</sprite>
<sprite name="BlackBorderOnGray">
<image backcolor="darkgray"
size="0 0 100% 100%"
border="true"
bordercolor="black"
/>
</sprite>
<!--
==========================================
- Misc. -
==========================================
-->
@@ -445,7 +463,8 @@
/>
</sprite>
<sprite name="ModernTickDisabled">
<image texture="global/modern/tick-disabled.png"
<effect grayscale=""/>
<image texture="global/modern/tick-on.png"
real_texture_placement="0 0 27 27"
size="0 0 22 22"
/>
@@ -465,10 +484,4 @@
texture_size="0 0 24 24"
/>
</sprite>
<sprite name="logo">
<image texture="pregame/shell/logo/0ad_logo.png"
real_texture_placement="0 0 256 128"
size="0 -5% 100% 105%"
/>
</sprite>
</sprites>
binaries/data/mods/public/gui/common/modern/styles.xml
+1 -1
View File
@@ -64,7 +64,7 @@
buffer_zone="8"
dropdown_size="224"
sprite_list="bkDarkGrayBorderBlack"
sprite_list="BlackBorderOnGray"
sprite_selectarea="ModernDarkBoxWhite"
textcolor_selected="white"
binaries/data/mods/public/gui/lobby/prelobby.js
+17
View File
@@ -253,4 +253,21 @@ function switchPage(page)
break;
}
}
function openTermsOfService()
{
g_TermsOfServiceRead = true;
Engine.PushGuiPage("page_manual.xml", {
"page":"lobby/Terms_of_Service",
"title":translate("Terms of Service"),
})
}
function openTermsOfUse()
{
g_TermsOfUseRead = true;
Engine.PushGuiPage("page_manual.xml", {
"page":"lobby/Terms_of_Use",
"title":translate("Terms of Use"),
})
}
binaries/data/mods/public/gui/lobby/prelobby.xml
+2 -14
View File
@@ -14,12 +14,6 @@
onTick();
</action>
<object name="pageConnecting" hidden="true">
<object name="connectionStatus" type="text" text_align="center" size="0 100 100% 120">
<translatableAttribute id="caption">[Connection status]</translatableAttribute>
</object>
</object>
<object style="ModernLabelText" type="text" size="50%-128 0%-16 50%+128 16">
<translatableAttribute id="caption">Multiplayer Lobby</translatableAttribute>
</object>
@@ -82,18 +76,12 @@
<object type="button" size="50 160 100%-50 188" style="ModernButtonRed">
<translatableAttribute id="caption">Terms of Service</translatableAttribute>
<action on="Press">
g_TermsOfServiceRead = true;
Engine.PushGuiPage("page_manual.xml", {"page":"lobby/Terms_of_Service", "title":"Terms of Service"})
</action>
<action on="Press">openTermsOfService();</action>
</object>
<object type="button" size="50 200 100%-50 228" style="ModernButtonRed">
<translatableAttribute id="caption">Terms of Use</translatableAttribute>
<action on="Press">
g_TermsOfUseRead = true;
Engine.PushGuiPage("page_manual.xml", {"page":"lobby/Terms_of_Use", "title":"Terms of Use"})
</action>
<action on="Press">openTermsOfUse();</action>
</object>
<object name="registerAgreeTermsLabel" type="text" size="50 240 285 270" style="ModernLabelText">
binaries/data/mods/public/gui/locale/locale.xml
+7 -7
View File
@@ -6,14 +6,14 @@
<script file="gui/locale/locale.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%-100 50%+190 50%+100">
<object size="15 0 100%-15 100%">
<object style="TitleText" type="text" size="50%-128 0%-16 50%+128 16">
<object style="ModernLabelText" type="text" size="50%-128 0%-16 50%+128 16">
<translatableAttribute id="caption">Language</translatableAttribute>
</object>
<object type="text" size="5 50 40% 75" style="ModernLeftLabelText">
<object type="text" size="5 50 40% 75" style="ModernLabelText" text_align="left">
<translatableAttribute id="caption">Language:</translatableAttribute>
</object>
<object name="languageList"
@@ -22,7 +22,7 @@
size="40%+10 50 100% 75">
<action on="SelectionChange">languageSelectionChanged();</action>
</object>
<object type="text" size="5 80 40% 105" style="ModernLeftLabelText">
<object type="text" size="5 80 40% 105" style="ModernLabelText" text_align="left">
<translatableAttribute id="caption" comment="A locale is a set of
parameters that defines the user’s language, country and any
special variant preferences that the user wants to see in
@@ -32,17 +32,17 @@
</object>
<object name="localeText" type="text" size="40%+10 80 100% 105" textcolor="white" />
<object type="button" size="0 100%-60 33% 100%-32" style="StoneButton">
<object type="button" size="0 100%-60 33% 100%-32" style="ModernButtonRed">
<translatableAttribute id="caption">Accept</translatableAttribute>
<action on="Press">applySelectedLocale();</action>
</object>
<object type="button" size="33%+5 100%-60 66% 100%-32" style="StoneButton">
<object type="button" size="33%+5 100%-60 66% 100%-32" style="ModernButtonRed">
<translatableAttribute id="caption">Advanced</translatableAttribute>
<action on="Press">openAdvancedMenu();</action>
</object>
<object type="button" style="StoneButton" size="66%+5 100%-60 100% 100%-32">
<object type="button" style="ModernButtonRed" size="66%+5 100%-60 100% 100%-32">
<translatableAttribute id="caption">Cancel</translatableAttribute>
<action on="Press">cancelSetup();</action>
</object>
binaries/data/mods/public/gui/locale/locale_advanced.xml
+11 -11
View File
@@ -6,14 +6,14 @@
<script file="gui/locale/locale_advanced.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%-220 50%-200 50%+220 50%+200">
<action on="Tick">onTick();</action>
<object size="15 0 100%-15 100%">
<object style="TitleText" type="text" size="50%-150 0%-16 50%+150 16">
<object style="ModernLabelText" type="text" size="50%-150 0%-16 50%+150 16">
<translatableAttribute id="caption">Language</translatableAttribute>
</object>
<object type="text" size="5 50 50% 75" style="ModernLeftLabelText">
<object type="text" size="5 50 50% 75" style="ModernLabelText" text_align="left">
<translatableAttribute id="caption">Language:</translatableAttribute>
</object>
<object name="languageList"
@@ -21,7 +21,7 @@
style="ModernDropDown"
size="50%+10 50 100% 75">
</object>
<object type="text" size="5 80 50% 105" style="ModernLeftLabelText">
<object type="text" size="5 80 50% 105" style="ModernLabelText" text_align="left">
<translatableAttribute id="caption">Country:</translatableAttribute>
</object>
<object name="countryList"
@@ -30,7 +30,7 @@
size="50%+10 80 100% 105">
</object>
<object type="text" size="5 110 50% 135" style="ModernLeftLabelText">
<object type="text" size="5 110 50% 135" style="ModernLabelText" text_align="left">
<translatableAttribute id="caption">Script:</translatableAttribute>
</object>
<object name="scriptInput" size="50%+10 110 100% 135" type="input" style="ModernInput">
@@ -44,34 +44,34 @@
<translatableAttribute id="tooltip">Not implemented yet.</translatableAttribute>
</object>
<object type="text" size="5 170 50% 195" style="ModernLeftLabelText">
<object type="text" size="5 170 50% 195" style="ModernLabelText" text_align="left">
<translatableAttribute id="caption">Keywords (unused):</translatableAttribute>
</object>
<object name="keywordsInput" size="50%+10 170 100% 195" type="input" style="ModernInput">
<translatableAttribute id="tooltip">Not implemented yet.</translatableAttribute>
</object>
<object type="text" size="5 230 50% 255" style="ModernLeftLabelText">
<object type="text" size="5 230 50% 255" style="ModernLabelText" text_align="left">
<translatableAttribute id="caption">Resulting locale:</translatableAttribute>
</object>
<object name="resultingLocale" type="text" size="50%+10 230 100% 255" textcolor="white" />
<object type="text" size="5 260 50% 285" style="ModernLeftLabelText">
<object type="text" size="5 260 50% 285" style="ModernLabelText" text_align="left">
<translatableAttribute id="caption">Dictionary files used:</translatableAttribute>
</object>
<object name="dictionaryFile" type="text" size="50%+10 260 100% 345" textcolor="white" />
<object type="button" size="0 100%-60 33% 100%-32" style="StoneButton">
<object type="button" size="0 100%-60 33% 100%-32" style="ModernButtonRed">
<translatableAttribute id="caption">Accept</translatableAttribute>
<action on="Press">applySelectedLocale();</action>
</object>
<object type="button" size="33%+5 100%-60 66% 100%-32" style="StoneButton">
<object type="button" size="33%+5 100%-60 66% 100%-32" style="ModernButtonRed">
<translatableAttribute id="caption">Auto detect</translatableAttribute>
<action on="Press">autoDetectLocale();</action>
</object>
<object type="button" style="StoneButton" size="66%+5 100%-60 100% 100%-32">
<object type="button" style="ModernButtonRed" size="66%+5 100%-60 100% 100%-32">
<translatableAttribute id="caption">Cancel</translatableAttribute>
<action on="Press">cancelSetup();</action>
</object>
binaries/data/mods/public/gui/manual/manual.xml
+4 -4
View File
@@ -5,10 +5,10 @@
<script file="gui/manual/manual.js"/>
<!-- Add a translucent black background to fade out the menu page -->
<object type="image" z="0" style="TranslucentPanel"/>
<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="TitleText" size="50%-128 0%-16 50%+128 16">
<object name="title" type="text" style="ModernLabelText" size="50%-128 0%-16 50%+128 16">
<translatableAttribute id="caption">Information</translatableAttribute>
</object>
@@ -16,10 +16,10 @@
<object name="mainText" type="text" style="textPanel"/>
</object>
<object name="url" type="button" style="StoneButton" size="100%-308 100%-52 100%-168 100%-24" hidden="true">
<object name="url" type="button" style="ModernButtonRed" size="100%-308 100%-52 100%-168 100%-24" hidden="true">
<translatableAttribute id="caption">View Online</translatableAttribute>
</object>
<object type="button" style="StoneButton" tooltip_style="snToolTip" size="100%-164 100%-52 100%-24 100%-24">
<object type="button" style="ModernButtonRed" tooltip_style="snToolTip" size="100%-164 100%-52 100%-24 100%-24">
<translatableAttribute id="caption">Close</translatableAttribute>
<action on="Press"><![CDATA[closeManual();]]></action>
</object>
binaries/data/mods/public/gui/page_aiconfig.xml
+1 -1
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/setup.xml</include>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
binaries/data/mods/public/gui/page_civinfo.xml
+1 -1
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/setup.xml</include>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
binaries/data/mods/public/gui/page_gamesetup.xml
+1 -1
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/setup.xml</include>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
binaries/data/mods/public/gui/page_gamesetup_mp.xml
+1 -1
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/setup.xml</include>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
binaries/data/mods/public/gui/page_loadgame.xml
+1 -1
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/setup.xml</include>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
binaries/data/mods/public/gui/page_loading.xml
+1 -1
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/setup.xml</include>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
binaries/data/mods/public/gui/page_lobby.xml
+1 -1
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/setup.xml</include>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/global.xml</include>
binaries/data/mods/public/gui/page_locale.xml
+5 -11
View File
@@ -1,16 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/styles.xml</include>
<include>common/sprite1.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>locale/locale.xml</include>
<include>common/modern/setup.xml</include>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/global.xml</include>
<include>locale/locale.xml</include>
</page>
binaries/data/mods/public/gui/page_locale_advanced.xml
+5 -11
View File
@@ -1,16 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/styles.xml</include>
<include>common/sprite1.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>locale/locale_advanced.xml</include>
<include>common/modern/setup.xml</include>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/global.xml</include>
<include>locale/locale_advanced.xml</include>
</page>
binaries/data/mods/public/gui/page_manual.xml
+2 -6
View File
@@ -1,14 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/setup.xml</include>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.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/global.xml</include>
<include>manual/styles.xml</include>
<include>manual/manual.xml</include>
binaries/data/mods/public/gui/page_msgbox.xml
+1 -1
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/setup.xml</include>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
binaries/data/mods/public/gui/page_options.xml
+1 -1
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/setup.xml</include>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
binaries/data/mods/public/gui/page_pregame.xml
+1 -1
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/setup.xml</include>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
binaries/data/mods/public/gui/page_prelobby.xml
+1 -1
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/setup.xml</include>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/global.xml</include>
binaries/data/mods/public/gui/page_savegame.xml
+1 -1
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/setup.xml</include>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
binaries/data/mods/public/gui/page_session.xml
+1 -1
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/setup.xml</include>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
binaries/data/mods/public/gui/page_splashscreen.xml
+1 -1
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/setup.xml</include>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
binaries/data/mods/public/gui/page_summary.xml
+1 -1
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<page>
<include>common/modern/setup.xml</include>
<include>common/modern/styles.xml</include>
<include>common/modern/sprites.xml</include>
<include>common/modern/setup.xml</include>
<include>common/setup.xml</include>
<include>common/sprite1.xml</include>
binaries/data/mods/public/gui/pregame/mainmenu.js
+11 -41
View File
@@ -205,14 +205,6 @@ function EnableUserReport(Enabled)
* MENU FUNCTIONS
*/
// Temporarily adding this here
//const BUTTON_SOUND = "audio/interface/ui/ui_button_longclick.ogg";
//function playButtonSound()
//{
// var buttonSound = new Sound(BUTTON_SOUND);
// buttonSound.play();
//}
// Slide menu
function updateMenuPosition(dt)
{
@@ -291,39 +283,6 @@ function getBuildString()
* FUNCTIONS BELOW DO NOT WORK YET
*/
//// Switch to a given options tab window.
//function openOptionsTab(tabName)
//{
// // Hide the other tabs.
// for (var i = 1; i <= 3; i++)
// {
// switch (i)
// {
// case 1:
// var tmpName = "pgOptionsAudio";
// break;
// case 2:
// var tmpName = "pgOptionsVideo";
// break;
// case 3:
// var tmpName = "pgOptionsGame";
// break;
// default:
// break;
// }
//
// if (tmpName != tabName)
// {
// Engine.GetGUIObjectByName (tmpName + "Window").hidden = true;
// Engine.GetGUIObjectByName (tmpName + "Button").enabled = true;
// }
// }
//
// // Make given tab visible.
// Engine.GetGUIObjectByName (tabName + "Window").hidden = false;
// Engine.GetGUIObjectByName (tabName + "Button").enabled = false;
//}
//
//// Move the credits up the screen.
//function updateCredits()
//{
@@ -365,3 +324,14 @@ function getLobbyDisabledByBuild()
{
return translate("Launch the multiplayer lobby. [DISABLED BY BUILD]");
}
function getTechnicalDetails()
{
return translate("Technical Details");
}
function getManual()
{
return translate("Manual");
}
binaries/data/mods/public/gui/pregame/mainmenu.xml
+3 -3
View File
@@ -106,7 +106,7 @@
</object>
<object type="button" style="StoneButton" size="100%-146 100%-36 100%-8 100%-8">
<translatableAttribute id="caption">Technical details</translatableAttribute>
<action on="Press">Engine.PushGuiPage("page_manual.xml", {"page":"manual/userreport", "title":translate("Technical Details")});</action>
<action on="Press">Engine.PushGuiPage("page_manual.xml", {"page":"manual/userreport", "title":getTechnicalDetails()});</action>
</object>
</object>
@@ -137,7 +137,7 @@
</object>
<object type="button" style="StoneButton" size="100%-146 100%-36 100%-8 100%-8">
<translatableAttribute id="caption">Technical details</translatableAttribute>
<action on="Press">Engine.PushGuiPage("page_manual.xml", {"page":"manual/userreport", "title":translate("Technical Details")});</action>
<action on="Press">Engine.PushGuiPage("page_manual.xml", {"page":"manual/userreport", "title":getTechnicalDetails()});</action>
</object>
</object>
@@ -398,7 +398,7 @@
<action on="Press">
closeMenu();
<![CDATA[
Engine.PushGuiPage("page_manual.xml", { "page":"manual/intro", "title":translate("Manual"), "url":"http://trac.wildfiregames.com/wiki/0adManual"});
Engine.PushGuiPage("page_manual.xml", {"page":"manual/intro", "title":getManual(), "url":"http://trac.wildfiregames.com/wiki/0adManual"});
]]>
</action>
</object>