- Timestamp:
- 08/27/11 20:34:54 (13 years ago)
- Location:
- ps/trunk/binaries/data/mods/public/gui
- Files:
-
- 4 added
- 16 edited
-
civinfo/civinfo.xml (modified) (2 diffs)
-
common/common_sprites.xml (modified) (1 diff)
-
common/common_styles.xml (modified) (3 diffs)
-
gamesetup/gamesetup.xml (modified) (1 diff)
-
gamesetup/gamesetup_mp.js (modified) (1 diff)
-
gamesetup/gamesetup_mp.xml (modified) (5 diffs)
-
loading/loading.xml (modified) (1 diff)
-
manual/manual.xml (modified) (2 diffs)
-
manual/styles.xml (modified) (1 diff)
-
msgbox/msgbox.xml (modified) (4 diffs)
-
options (added)
-
options/options.js (added)
-
options/options.xml (added)
-
page_gamesetup_mp.xml (modified) (1 diff)
-
page_manual.xml (modified) (1 diff)
-
page_msgbox.xml (modified) (1 diff)
-
page_options.xml (added)
-
pregame/mainmenu.js (modified) (1 diff)
-
pregame/mainmenu.xml (modified) (11 diffs)
-
session/session.xml (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
ps/trunk/binaries/data/mods/public/gui/civinfo/civinfo.xml
r10103 r10108 15 15 <object style="StoneDialogTitleBar" type="text" size="50%-128 -16 50%+128 16">Civilizations</object> 16 16 17 <object type="button" style="wheatExit" tooltip_style="snToolTip">18 <action on="Press"><![CDATA[19 Engine.PopGuiPage();20 ]]></action>21 </object>22 23 17 <!-- Civ selection --> 24 18 <object size="25 10 100% 30"> … … 52 46 </object> 53 47 54 <object type="image" s prite="TranslucentPanel" size="0 40 33%-5 100%">48 <object type="image" style="TranslucentPanelThinBorder" size="0 40 33%-5 100%"> 55 49 <object 56 50 name="civBonuses" -
ps/trunk/binaries/data/mods/public/gui/common/common_sprites.xml
r10103 r10108 121 121 122 122 <!-- TranslucentPanel --> 123 <sprite name="TranslucentPanel ">123 <sprite name="TranslucentPanelThinBorder"> 124 124 <image backcolor="0 0 0 85" 125 125 size="0 0 100% 100%" -
ps/trunk/binaries/data/mods/public/gui/common/common_styles.xml
r10103 r10108 99 99 /> 100 100 101 102 103 101 104 <!-- 102 105 ========================================== … … 105 108 --> 106 109 107 <style name="TranslucentPanel" 108 sprite="TranslucentPanel" 109 buffer_zone="10" 110 font="serif-bold-stroke-14" 111 textcolor="white" 112 text_align="left" 113 text_valign="top" 114 /> 110 115 111 116 112 <!-- … … 119 115 ========================================== 120 116 --> 117 118 <style name="TranslucentPanel" 119 sprite="BackgroundTranslucent" 120 buffer_zone="10" 121 font="serif-bold-stroke-14" 122 textcolor="white" 123 text_align="left" 124 text_valign="top" 125 /> 126 127 <style name="TranslucentPanelThinBorder" 128 sprite="TranslucentPanelThinBorder" 129 buffer_zone="10" 130 font="serif-bold-stroke-14" 131 textcolor="white" 132 text_align="left" 133 text_valign="top" 134 /> 121 135 122 136 <style name="MainMenuPanel" -
ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
r10085 r10108 32 32 <object style="StoneDialogTitleBar" type="text" size="50%-128 0%-16 50%+128 16"> 33 33 Match Setup 34 </object>35 36 <object type="button" style="StoneExit" tooltip_style="snToolTip" size="100%-16 0 100% 16">37 <action on="Press"><![CDATA[38 cancelSetup();39 Engine.PopGuiPage();40 ]]></action>41 34 </object> 42 35 -
ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.js
r7946 r10108 2 2 var g_GameType; // "server" or "client" 3 3 4 function init( )4 function init(multiplayerGameType) 5 5 { 6 switch (multiplayerGameType) 7 { 8 case "join": 9 getGUIObjectByName("pageJoin").hidden = false; 10 getGUIObjectByName("pageHost").hidden = true; 11 break; 12 case "host": 13 getGUIObjectByName("pageJoin").hidden = true; 14 getGUIObjectByName("pageHost").hidden = false; 15 break; 16 default: 17 error("Unrecognised multiplayer game type : " + multiplayerGameType); 18 break; 19 } 6 20 } 7 21 -
ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml
r9013 r10108 10 10 <object type="image" z="0" sprite="bkTranslucent"/> 11 11 12 <object type="image" style=" wheatWindow" size="50%-190 50%-120 50%+190 50%+120">12 <object type="image" style="StonePanelLight" size="50%-190 50%-120 50%+190 50%+120"> 13 13 14 14 <action on="Tick"> … … 16 16 </action> 17 17 18 <object type="text" style="wheatWindowTitleBar">18 <object style="StoneDialogTitleBar" type="text" size="50%-128 0%-16 50%+128 16"> 19 19 Multiplayer 20 20 </object> 21 22 <object type="button" style="wheatExit" tooltip_style="snToolTip"> 23 <action on="Press"><![CDATA[ 24 cancelSetup(); 25 ]]></action> 26 </object> 27 28 <object name="pageSelectMode"> 29 30 <object type="text" size="0 50%-60 100% 50%"> 31 Please select whether you want to join a game or host your own game. 21 22 <object name="pageJoin" size="0 32 100% 100%" hidden="true"> 23 24 <object type="text" style="CenteredLabelText" size="0 0 400 30"> 25 Joining an existing game. 32 26 </object> 33 27 34 <object type="text" size="0 50%+22 200 50%+50" style="wheatTextHeadBlack">35 Game Mode:28 <object type="text" size="0 40 200 70" style="RightLabelText"> 29 Player name: 36 30 </object> 37 31 38 <object type="button" style="wheatButton" size="130 50%+20 230 50%+50"> 39 Join Game 40 <action on="Press"><![CDATA[ 41 switchSetupPage("pageSelectMode", "pageJoin"); 32 <object name="joinPlayerName" type="input" size="210 40 100%-32 64" style="StoneInput"> 33 <action on="Load"><![CDATA[ 34 this.caption = Engine.GetDefaultPlayerName(); 42 35 ]]></action> 43 36 </object> 44 37 45 <object type="button" style="wheatButton" size="250 50%+20 350 50%+50"> 46 Host Game 38 <object type="text" size="0 80 200 110" style="RightLabelText"> 39 Server Hostname or IP: 40 </object> 41 42 <object name="joinIP" type="input" size="210 80 100%-32 104" style="StoneInput"> 43 127.0.0.1 44 </object>3 100%-33 103 100%-3 45 46 <object type="button" size="50%+16 100%-64 50%+144 100%-32" style="StoneButton"> 47 Continue 47 48 <action on="Press"><![CDATA[ 48 switchSetupPage("pageSelectMode", "pageHost"); 49 if (startJoin( 50 getGUIObjectByName("joinPlayerName").caption, 51 getGUIObjectByName("joinIP").caption)) 52 { 53 switchSetupPage("pageJoin", "pageConnecting"); 54 } 49 55 ]]></action> 50 56 </object> 51 52 57 </object> 53 58 54 <object name="pageHost" hidden="true">59 <object name="pageHost" size="0 32 100% 100%" hidden="true"> 55 60 56 <object type="text" s ize="0 0 400 30">57 Set ting up your server.61 <object type="text" style="CenteredLabelText" size="0 0 400 30"> 62 Set up your server to host. 58 63 </object> 59 64 60 <object type="text" size="0 40 200 70" style=" wheatTextHeadBlack">65 <object type="text" size="0 40 200 70" style="RightLabelText"> 61 66 Player name: 62 67 </object> 63 68 64 <object name="hostPlayerName" type="input" size="2 20 40 370 60" style="wheatInput">69 <object name="hostPlayerName" type="input" size="210 40 100%-32 64" style="StoneInput"> 65 70 <action on="Load"><![CDATA[ 66 71 this.caption = Engine.GetDefaultPlayerName(); … … 69 74 70 75 <object hidden="true"> <!-- TODO: restore this when the server name is actually used --> 71 <object type="text" size="0 80 200 110" style=" wheatTextHeadBlack">76 <object type="text" size="0 80 200 110" style="RightLabelText"> 72 77 Server name: 73 78 </object> 74 79 75 <object name="hostServerName" type="input" size="2 20 80 370 100" style="wheatInput">80 <object name="hostServerName" type="input" size="210 80 100%-32 104" style="StoneInput"> 76 81 <action on="Load"><![CDATA[ 77 82 this.caption = Engine.GetDefaultPlayerName() + "'s game"; … … 80 85 </object> 81 86 82 <object type="button" size=" 3 100%-33 103 100%-3" style="wheatButton">87 <object type="button" size="50%+16 100%-64 50%+144 100%-32" style="StoneButton"> 83 88 Continue 84 89 <action on="Press"><![CDATA[ … … 91 96 ]]></action> 92 97 </object> 93 94 <object type="button" style="wheatButton" size="50%-50 100%-33 50%+50 100%-3">95 Back96 <action on="Press"><![CDATA[97 switchSetupPage("pageHost", "pageSelectMode");98 ]]></action>99 </object>100 101 98 </object> 102 99 103 <object type="button" style="wheatButton" size="100%-103 100%-33 100%-3 100%-3">100 <object type="button" style="StoneButton" size="50%-144 100%-64 50%-16 100%-32"> 104 101 Cancel 105 102 <action on="Press"><![CDATA[cancelSetup();]]></action> 106 103 </object> 107 104 108 <object name="pageJoin" hidden="true">109 110 <object type="text" size="0 0 400 30">111 Joining an existing game.112 </object>113 114 <object type="text" size="0 40 200 70" style="wheatTextHeadBlack">115 Player name:116 </object>117 118 <object name="joinPlayerName" type="input" size="220 40 370 60" style="wheatInput">119 <action on="Load"><![CDATA[120 this.caption = Engine.GetDefaultPlayerName();121 ]]></action>122 </object>123 124 <object type="text" size="0 80 200 110" style="wheatTextHeadBlack">125 Server Hostname or IP:126 </object>127 128 <object name="joinIP" type="input" size="220 80 370 100" style="wheatInput">129 127.0.0.1130 </object>131 132 <object type="button" size="3 100%-33 103 100%-3" style="wheatButton">133 Continue134 <action on="Press"><![CDATA[135 if (startJoin(136 getGUIObjectByName("joinPlayerName").caption,137 getGUIObjectByName("joinIP").caption))138 {139 switchSetupPage("pageJoin", "pageConnecting");140 }141 ]]></action>142 </object>143 144 <object type="button" size="50%-50 100%-33 50%+50 100%-3" style="wheatButton">145 Back146 <action on="Press"><![CDATA[147 switchSetupPage("pageJoin", "pageSelectMode");148 ]]></action>149 </object>150 </object>151 152 105 <object name="pageConnecting" hidden="true"> 153 <object name="connectionStatus" type="text" text_align="center" size="0 100 100% 120">106 <object name="connectionStatus" type="text" style="CenteredLabelText" size="0 100 100% 120"> 154 107 [Connection status] 155 108 </object> -
ps/trunk/binaries/data/mods/public/gui/loading/loading.xml
r10085 r10108 12 12 13 13 <!-- LOADING SCREEN BACKGROUND --> 14 <object type="image" s prite="StonePanelLight"/>14 <object type="image" style="StonePanelLight"/> 15 15 16 16 <object size="50%-400 30 50%+400 150"> -
ps/trunk/binaries/data/mods/public/gui/manual/manual.xml
r9049 r10108 6 6 7 7 <!-- Add a translucent black background to fade out the menu page --> 8 <object type="image" z="0" s prite="bkTranslucent"/>8 <object type="image" z="0" style="TranslucentPanel"/> 9 9 10 <object type="image" style=" wheatWindow" size="150 100 100%-150 100%-100">10 <object type="image" style="StonePanelLight" size="150 100 100%-150 100%-100"> 11 11 12 <object type="button" style="wheatExit" tooltip_style="snToolTip"> 13 <action on="Press"><![CDATA[ 14 Engine.PopGuiPage(); 15 ]]></action> 16 </object> 17 18 <object type="image" sprite="wheatIndentFillVeryLight" size="0 0 100% 100%-45"> 19 <object name="mainText" type="text" style="textPanel"/> 20 </object> 21 22 <object type="button" style="wheatButton" size="100%-275 100%-33 100%-113 100%-3"> 12 <object type="image" style="TranslucentPanelThinBorder" size="16 16 100%-16 100%-48"> 13 <object type="image" style="TranslucentPanel" size="16 4 100%-4 100%-4"> 14 <object name="mainText" type="text" style="textPanel"/> 15 </object> 16 </object> 17 <object type="button" style="StoneButton" size="100%-320 100%-48 100%-160 100%-16"> 23 18 Online Manual 24 19 <action on="Press"><![CDATA[ … … 28 23 ]]></action> 29 24 </object> 30 <object type="button" style=" wheatButton" tooltip_style="snToolTip" size="100%-103 100%-33 100%-3 100%-3">25 <object type="button" style="StoneButton" tooltip_style="snToolTip" size="100%-144 100%-48 100%-16 100%-16"> 31 26 Close 32 27 <action on="Press"><![CDATA[Engine.PopGuiPage();]]></action> -
ps/trunk/binaries/data/mods/public/gui/manual/styles.xml
r7714 r10108 5 5 <style name="textPanel" 6 6 buffer_zone="8" 7 font="serif- 13"7 font="serif-bold-16" 8 8 scrollbar="true" 9 9 scrollbar_style="wheatScrollBar" 10 textcolor=" black"11 textcolor_selected=" white"10 textcolor="white" 11 textcolor_selected="black" 12 12 text_align="left" 13 13 text_valign="center" -
ps/trunk/binaries/data/mods/public/gui/msgbox/msgbox.xml
r7653 r10108 72 72 { 73 73 case 1: 74 mbButton1Obj.size = " 30% 100%-80 70% 100%-50";74 mbButton1Obj.size = "50%-64 100%-64 50%+64 100%-32"; 75 75 break; 76 76 case 2: 77 mbButton1Obj.size = " 10% 100%-80 45% 100%-50";78 mbButton2Obj.size = "5 5% 100%-80 90% 100%-50";77 mbButton1Obj.size = "50%-144 100%-64 50%-16 100%-32"; 78 mbButton2Obj.size = "50%+16 100%-64 50%+144 100%-32"; 79 79 break; 80 80 case 3: … … 88 88 <object> 89 89 <object name="mbMain" 90 style=" wheatWindow"90 style="StonePanelLight" 91 91 type="image" 92 92 > 93 93 94 94 <object name="mbTitleBar" 95 style=" wheatWindowTitleBar"95 style="StoneDialogTitleBar" 96 96 type="text" 97 size="50%-128 0%-16 50%+128 16" 97 98 /> 98 99 99 100 <object name="mbText" 100 101 type="text" 101 font="serif-16"102 style="CenteredLabelText" 102 103 size="30 30 100%-30 100%-100" 103 104 /> 104 105 105 106 <object name="mbButton1" 106 style=" wheatButtonFancy"107 style="StoneButton" 107 108 type="button" 108 109 hidden="true" … … 110 111 /> 111 112 <object name="mbButton2" 112 style=" wheatButtonFancy"113 style="StoneButton" 113 114 type="button" 114 115 hidden="true" … … 116 117 /> 117 118 <object name="mbButton3" 118 style=" wheatButtonFancy"119 style="StoneButton" 119 120 type="button" 120 121 hidden="true" -
ps/trunk/binaries/data/mods/public/gui/page_gamesetup_mp.xml
r7653 r10108 4 4 <include>common/styles.xml</include> 5 5 <include>common/sprite1.xml</include> 6 7 <include>common/common_sprites.xml</include> 8 <include>common/common_styles.xml</include> 9 6 10 <include>gamesetup/setup.xml</include> 7 11 <include>gamesetup/sprites.xml</include> -
ps/trunk/binaries/data/mods/public/gui/page_manual.xml
r7714 r10108 4 4 <include>common/styles.xml</include> 5 5 <include>common/sprite1.xml</include> 6 7 <include>common/common_sprites.xml</include> 8 <include>common/common_styles.xml</include> 9 6 10 <include>manual/styles.xml</include> 7 11 <include>manual/manual.xml</include> -
ps/trunk/binaries/data/mods/public/gui/page_msgbox.xml
r7653 r10108 4 4 <include>common/styles.xml</include> 5 5 <include>common/sprite1.xml</include> 6 7 <include>common/common_sprites.xml</include> 8 <include>common/common_styles.xml</include> 9 6 10 <include>msgbox/msgbox.xml</include> 7 11 </page> -
ps/trunk/binaries/data/mods/public/gui/pregame/mainmenu.js
r10107 r10108 1 1 var userReportEnabledText; // contains the original version with "$status" placeholder 2 var currentSubmenu; // contains placeholder submenu2 var currentSubmenu; // contains placeholder submenu 3 3 4 4 function init() -
ps/trunk/binaries/data/mods/public/gui/pregame/mainmenu.xml
r10107 r10108 206 206 Single Player 207 207 <action on="Press"><![CDATA[ 208 updateSubmenu("submenuSinglePlayer", (this.parent.size.top+this.size.top), (this.size.bottom-this.size.top), 3);208 updateSubmenu("submenuSinglePlayer", (this.parent.size.top+this.size.top), (this.size.bottom-this.size.top), 2); 209 209 ]]></action> 210 210 </object> … … 260 260 tooltip="Exit Game" 261 261 > 262 Quit262 Exit 263 263 <action on="Press"><![CDATA[ 264 264 var btCaptions = ["Yes", "No"]; 265 265 var btCode = [exit, null]; 266 messageBox (400, 200, "Are you sure you want to quit [icon=iconProduct]A.D.?", "Confirmation", 0, btCaptions, btCode);266 messageBox (400, 200, "Are you sure you want to quit 0 A.D.?", "Confirmation", 0, btCaptions, btCode); 267 267 ]]></action> 268 268 </object> … … 270 270 271 271 <!-- PRE-RELEASE INFO --> 272 <object size="8 100%-340 100%-8 100%-100" 272 <object size="8 100%-340 100%-8 100%-100" 273 273 type="image" 274 style="TranslucentPanel "274 style="TranslucentPanelThinBorder" 275 275 > 276 276 … … 279 279 style="fancyTextHeadWhite" 280 280 type="text" 281 sprite="bkTranslucent"282 281 textcolor="white" 283 282 size="8 8 100%-8 100%-36" … … 366 365 --> 367 366 368 <object 369 name="submenuScreen" 367 <object name="submenuScreen" 370 368 type="image" 371 369 hidden="true" … … 377 375 378 376 <!-- submenu --> 379 <object 380 name="submenu" 377 <object name="submenu" 381 378 type="image" 382 379 style="MainMenuPanel" … … 385 382 <!-- submenuSinglePlayer --> 386 383 <object name="submenuSinglePlayer" 387 type="image"388 size="4 4 100%-4 100%-4"389 tooltip_style="pgToolTip"390 tooltip="The 0 A.D. Game Manual"391 hidden="true"384 type="image" 385 size="4 4 100%-4 100%-4" 386 tooltip_style="pgToolTip" 387 tooltip="The 0 A.D. Game Manual" 388 hidden="true" 392 389 > 393 390 <object name="subMenuSinglePlayerButton" 394 type="button"395 style="StoneButtonFancy"396 size="0 0 100% 32"397 tooltip_style="pgToolTip"398 tooltip="Click here to start a new single player game. (A very basic computer opponent is available for testing purposes.)"391 type="button" 392 style="StoneButtonFancy" 393 size="0 0 100% 32" 394 tooltip_style="pgToolTip" 395 tooltip="Click here to start a new single player game. (A very basic computer opponent is available for testing purposes.)" 399 396 > 400 Single PlayerMatches397 Matches 401 398 <action on="Press"><![CDATA[ 399 // Hide submenu 400 this.parent.parent.hidden = true; 402 401 // Open Session Setup window. 403 402 Engine.PushGuiPage("page_gamesetup.xml", { type: "offline" }); … … 406 405 407 406 <object name="subMenuCampaignButton" 408 type="button"409 style="StoneButtonFancy"410 size="0 32 100% 64"411 tooltip_style="pgToolTip"412 tooltip="Want to play a campaign? Unfortunately you'll have to wait as they're not yet implemented."413 enabled="false"407 type="button" 408 style="StoneButtonFancy" 409 size="0 32 100% 64" 410 tooltip_style="pgToolTip" 411 tooltip="Want to play a campaign? Unfortunately you'll have to wait as they're not yet implemented." 412 enabled="false" 414 413 > 415 HistoricalCampaigns414 Campaigns 416 415 <action on="Press"><![CDATA[ 417 openMainMenuSubWindow ("pgCampaigns"); 416 // Hide submenu 417 this.parent.parent.hidden = true; 418 // Open Campaigns window. 419 // NOT IMPLEMENTED YET 418 420 ]]></action> 419 421 </object> … … 428 430 hidden="true" 429 431 > 430 <object name="subMenuMultiplayerJoin GameButton"431 type="button"432 style="StoneButtonFancy"433 size="0 0 100% 32"434 tooltip_style="pgToolTip"435 tooltip="Tired of playing with yourself? Fight against one or more human players in amultiplayer game."432 <object name="subMenuMultiplayerJoinButton" 433 type="button" 434 style="StoneButtonFancy" 435 size="0 0 100% 32" 436 tooltip_style="pgToolTip" 437 tooltip="Joining an existing multiplayer game." 436 438 > 437 Multiplayer439 Join Game 438 440 <action on="Press"><![CDATA[ 439 // Open Multiplayer connection window. 440 Engine.PushGuiPage("page_gamesetup_mp.xml"); 441 // Hide submenu 442 this.parent.parent.hidden = true; 443 // Open Multiplayer connection window with join option. 444 Engine.PushGuiPage("page_gamesetup_mp.xml", "join"); 441 445 ]]></action> 442 446 </object> 447 448 <object name="subMenuMultiplayerHostButton" 449 type="button" 450 style="StoneButtonFancy" 451 size="0 32 100% 64" 452 tooltip_style="pgToolTip" 453 tooltip="Host a multiplayer game." 454 > 455 Host Game 456 <action on="Press"><![CDATA[ 457 // Hide submenu 458 this.parent.parent.hidden = true; 459 // Open Multiplayer connection window with host option. 460 Engine.PushGuiPage("page_gamesetup_mp.xml", "host"); 461 ]]></action> 462 </object> 463 443 464 </object> 444 465 445 466 <!-- submenuToolsAndOptions --> 446 467 <object name="submenuToolsAndOptions" 447 type="image"448 size="4 4 100%-4 100%-4"449 tooltip_style="pgToolTip"450 tooltip="The 0 A.D. Game Manual"468 type="image" 469 size="4 4 100%-4 100%-4" 470 tooltip_style="pgToolTip" 471 tooltip="The 0 A.D. Game Manual" 451 472 hidden="true" 452 473 > … … 461 482 Options 462 483 <action on="Press"><![CDATA[ 484 // Hide submenu 485 this.parent.parent.hidden = true; 463 486 // Open Options window. 464 openMainMenuSubWindow ("pgOptions");487 Engine.PushGuiPage("page_options.xml"); 465 488 ]]></action> 466 489 </object> … … 475 498 Scenario Editor 476 499 <action on="Press"><