Changeset 10111 for ps

Timestamp:

08/27/11 21:23:32 (13 years ago)

Author:

brian

Message:

Updated panel style and made main menu "x" exit game without confirmation

Location:

ps/trunk/binaries/data/mods/public/gui

Files:

• civinfo/civinfo.xml (modified) (2 diffs)
• common/common_sprites.xml (modified) (1 diff)
• gamesetup/gamesetup.xml (modified) (5 diffs)
• pregame/mainmenu.xml (modified) (4 diffs)

ps/trunk/binaries/data/mods/public/gui/civinfo/civinfo.xml

@@ -83 +83 @@
         
         <!-- Civ history display -->
-        <object size="25 65% 100%-25 100%-50">
+        <object size="25 65% 100%-25 100%-56">
             <object type="image" sprite="bgInfoHeading" size="0 0 100% 35">
                 <object
@@ -112 +112 @@
             type="button"
             style="StoneButton"
-            size="100%-150 100%-48 100%-24 100%-16"
+            size="100%-148 100%-52 100%-20 100%-20"
         >Close
             <action on="Press"><![CDATA[

ps/trunk/binaries/data/mods/public/gui/common/common_sprites.xml

@@ -308 +308 @@
             size="4 4 100%-4 100%-4" 
         />
-        <!-- shading -->
+                
+                <!-- thin sides -->
+        <image  texture="global/border/line_horiz.png"
+            texture_size="0 0 64 4"
+            size="20 16 100%-20 20"
+        />
+        <image  texture="global/border/line_vert.png"
+            texture_size="0 0 4 64"
+            size="100%-20 20 100%-16 100%-20"
+        />
+        <image  texture="global/border/line_horiz.png"
+            texture_size="0 0 64 4"
+            size="20 100%-20 100%-20 100%-16"
+        />
+        <image  texture="global/border/line_vert.png"
+            texture_size="0 0 4 64"
+            size="16 20 20 100%-20"
+        />
+                
+        <!-- thin corners -->
+        <image
+            texture="global/border/line_corner_top_right.png"
+            texture_size="0 0 4 4"
+            size="100%-20 16 100%-16 20"
+        />
+        <image  texture="global/border/line_corner_bottom_right.png"
+            texture_size="0 0 4 4"
+            size="100%-20 100%-20 100%-16 100%-16"
+        />
+        <image  texture="global/border/line_corner_bottom_left.png"
+            texture_size="0 0 4 4"
+            size="16 100%-20 20 100%-16"
+        />
+        <image  texture="global/border/line_corner_top_left.png"
+            texture_size="0 0 4 4"
+            size="16 16 20 20"
+        />
+                
+                <!-- shading -->
         <image
             texture="global/shading/gradient_wide.png"

ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.xml

@@ -35 +35 @@
 
         <!-- Map selection -->
-        <object size="16 64 250 100%-16">
+        <object size="20 64 250 100%-20">
             <object name="mapTypeHeading" type="text" style="LeftLabelText" size="0 0 100% 30">Match Type:</object>
             <object name="mapTypeSelection"
@@ -85 +85 @@
         </object>
 
-        <object size="260 64 100%-16 100%-260" type="image" sprite="BackgroundIndentFillDark">
+        <object size="260 64 100%-20 100%-260" type="image" sprite="BackgroundIndentFillDark">
             <object size="0 6 100% 30">
                 <object name="playerNameHeading" type="text" style="CenteredLabelText" size="100 0 250 100%">Player Name</object>
@@ -141 +141 @@
         
         <!-- Chat window -->
-        <object name="chatPanel" size="260 100%-190 100%-16 100%-45" type="image" sprite="BackgroundIndentFillDark">
+        <object name="chatPanel" size="260 100%-190 100%-20 100%-58" type="image" sprite="BackgroundIndentFillDark">
     
             <object name="chatText" size="3 1 100%-1 100%-25" type="text" style="chatPanel"/>
@@ -171 +171 @@
             type="button"
             style="StoneButton"
-            size="100%-300 100%-48 100%-160 100%-16"
+            size="100%-304 100%-52 100%-164 100%-20"
             tooltip_style="onscreenToolTip"
             tooltip="Click this button to return to the main menu."
@@ -185 +185 @@
             type="button"
             style="StoneButton"
-            size="100%-156 100%-48 100%-16 100%-16"
+            size="100%-160 100%-52 100%-20 100%-20"
             tooltip_style="onscreenToolTip"
             tooltip="Click this button to start a new game with the current settings."

ps/trunk/binaries/data/mods/public/gui/pregame/mainmenu.xml

@@ -61 +61 @@
                 >
                         <action on="Press"><![CDATA[
-                                var btCaptions = ["Yes", "No"];
-                                var btCode = [exit, null];
-                                messageBox (400, 200, "Are you sure you want to quit [icon=iconProduct] A.D.?", "Confirmation", 0, btCaptions, btCode);
+                                // Exit without confirmation
+                                exit();
                         ]]></action>
         </object>
-
 
         <!--
@@ -148 +146 @@
             </object>
         </object>
- 
-
              
 
@@ -264 +260 @@
                                                 var btCaptions = ["Yes", "No"];
                                                 var btCode = [exit, null];
-                                                messageBox (400, 200, "Are you sure you want to quit 0 A.D.?", "Confirmation", 0, btCaptions, btCode);
+                                                messageBox(400, 200, "Are you sure you want to quit 0 A.D.?", "Confirmation", 0, btCaptions, btCode);
                                         ]]></action>
                                 </object>
@@ -355 +351 @@
                         
                 </object>
-                
-