From c362ce0565cabaa2256eaa75a34f7bc8680d8c96 Mon Sep 17 00:00:00 2001 From: WhiteTreePaladin Date: Tue, 13 Sep 2011 01:28:49 +0000 Subject: [PATCH] Convert spaces to tabs in main menu files This was SVN commit r10267. --- .../data/mods/public/gui/pregame/mainmenu.js | 26 +- .../data/mods/public/gui/pregame/mainmenu.xml | 578 +++++++++--------- 2 files changed, 296 insertions(+), 308 deletions(-) diff --git a/binaries/data/mods/public/gui/pregame/mainmenu.js b/binaries/data/mods/public/gui/pregame/mainmenu.js index fd207e073c..25e1647f48 100644 --- a/binaries/data/mods/public/gui/pregame/mainmenu.js +++ b/binaries/data/mods/public/gui/pregame/mainmenu.js @@ -164,9 +164,6 @@ function openMenu(newSubmenu, position, buttonHeight, numButtons) // Reveal submenu getGUIObjectByName("submenu").hidden = false; - - // prepare to hide the submenu when the user clicks on the background - getGUIObjectByName("submenuScreen").hidden = false; } // Closes the menu and resets position @@ -184,9 +181,6 @@ function closeMenu() // reset main menu panel right border getGUIObjectByName("MainMenuPanelRightBorderTop").size = "100%-2 0 100% 100%"; - - // hide submenu screen - getGUIObjectByName("submenuScreen").hidden = false; } // Sizes right border on main menu panel to match the submenu @@ -200,18 +194,18 @@ function blendSubmenuIntoMain(topPosition, bottomPosition) } // Reveals submenu -function openMainMenuSubWindow (windowName) -{ - guiUnHide("pgSubWindow"); - guiUnHide(windowName); -} +//function openMainMenuSubWindow (windowName) +//{ +// guiUnHide("pgSubWindow"); +// guiUnHide(windowName); +//} // Hides submenu -function closeMainMenuSubWindow (windowName) -{ - guiHide("pgSubWindow"); - guiHide(windowName); -} +//function closeMainMenuSubWindow (windowName) +//{ +// guiHide("pgSubWindow"); +// guiHide(windowName); +//} diff --git a/binaries/data/mods/public/gui/pregame/mainmenu.xml b/binaries/data/mods/public/gui/pregame/mainmenu.xml index 02c80bc820..53fea96a0b 100644 --- a/binaries/data/mods/public/gui/pregame/mainmenu.xml +++ b/binaries/data/mods/public/gui/pregame/mainmenu.xml @@ -8,35 +8,34 @@ - - - - - - - - + onTick(); + + + + @@ -45,6 +44,7 @@ type="text" hidden="true" size="70% 5% 100% 30%" + ghost="true" >tooltipText @@ -130,158 +130,153 @@ Status: $status. - - - + + + + closeMenu(); + + - - - - - + z="50" + > + + + - + - - + + - Learn To Play - - closeMenu(); - - - + Learn To Play + + closeMenu(); + + + - - - Single Player - - closeMenu(); - openMenu("submenuSinglePlayer", (this.parent.size.top+this.size.top), (this.size.bottom-this.size.top), 2); - - + + + Single Player + + closeMenu(); + openMenu("submenuSinglePlayer", (this.parent.size.top+this.size.top), (this.size.bottom-this.size.top), 2); + + - - - Multiplayer - - closeMenu(); - openMenu("submenuMultiplayer", (this.parent.size.top+this.size.top), (this.size.bottom-this.size.top), 2); - - + + + Multiplayer + + closeMenu(); + openMenu("submenuMultiplayer", (this.parent.size.top+this.size.top), (this.size.bottom-this.size.top), 2); + + - - - Tools Options - - closeMenu(); - openMenu("submenuToolsAndOptions", (this.parent.size.top+this.size.top), (this.size.bottom-this.size.top), 2); - - + + + Tools Options + + closeMenu(); + openMenu("submenuToolsAndOptions", (this.parent.size.top+this.size.top), (this.size.bottom-this.size.top), 2); + + - - - History - - closeMenu(); - - - + + + History + + closeMenu(); + + + - - - Exit - - closeMenu(); - - - - + + + Exit + + closeMenu(); + + + + Website @@ -458,8 +453,8 @@ Get involved at: wildfiregames.com/0ad IRC @@ -474,38 +469,37 @@ Get involved at: wildfiregames.com/0ad WILDFIRE GAMES - + - - +