Changeset 10075 for ps

Timestamp:

08/23/11 05:51:04 (13 years ago)

Author:

brian

Message:

Clean up some styles

Location:

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

Files:

• common/common_sprites.xml (modified) (2 diffs)
• common/common_styles.xml (modified) (2 diffs)
• gamesetup/gamesetup.xml (modified) (2 diffs)
• pregame/mainmenu.xml (modified) (10 diffs)
• session/session.xml (modified) (4 diffs)

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

@@ -271 +271 @@
             size="0 0 100% 100%" 
         />
+        </sprite>
+
+    <sprite name="StoneButtonGlow">
+        <effect add_color="60 42 42 0" />
+        <image  texture="global/button/button_stone_selected.png"
+            real_texture_placement="0 0 256 32"
+            size="0 0 100% 100%" 
+        />
+        </sprite>
+
+    <sprite name="StoneButtonFancyOver">
+        <image  texture="global/button/button_stone_selected.png"
+            real_texture_placement="0 0 256 32"
+            size="0 0 100% 100%" 
+        />
         <image  texture="global/button/button_stone_selected_left_trim.png"
             real_texture_placement="0 0 32 32"
@@ -281 +296 @@
         </sprite>
 
-    <sprite name="StoneButtonGlow">
+    <sprite name="StoneButtonFancyGlow">
         <effect add_color="60 42 42 0" />
         <image  texture="global/button/button_stone_selected.png"

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

@@ -114 +114 @@
     ==========================================
     -->
+
+    <style  name="StoneButtonFancy"
+        sprite="StoneButton"
+        sprite_disabled="StoneButtonDisabled"
+        sprite_over="StoneButtonFancyOver"
+        sprite_pressed="StoneButtonFancyGlow"
+        font="serif-bold-stroke-14"
+        textcolor="gold"
+        text_align="center"
+        text_valign="center"
+    />
 
     <style  name="StoneButton"
@@ -120 +131 @@
         sprite_over="StoneButtonOver"
         sprite_pressed="StoneButtonGlow"
-        font="serif-bold-stroke-14"
-        textcolor="gold"
-        text_align="center"
-        text_valign="center"
-    />
-
-    <style  name="StoneButtonPlain"
-        sprite="StoneButton"
-        sprite_disabled="StoneButtonDisabled"
-        sprite_over="StoneButton"
-        sprite_pressed="StoneButton"
         font="serif-bold-stroke-14"
         textcolor="gold"

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

@@ -116 +116 @@
                         <object name="playerName[n]" type="text" style="RightLabelText" size="0 0 100 100%"/>
                         <object name="playerAssignment[n]" type="dropdown" style="StoneDropDown" size="100 2 250 100%-2" tooltip_style="onscreenToolTip" tooltip="Select player"/>
-                        <object name="playerConfig[n]" type="button" style="StoneButtonPlain" size="251 6 264 24"
+                        <object name="playerConfig[n]" type="button" style="StoneButton" size="251 6 264 24"
                             tooltip_style="onscreenToolTip"
                             tooltip="Configure AI settings"
@@ -156 +156 @@
             </object>
     
-            <object size="100%-65 100%-23 100% 100%-3" type="button" style="StoneButtonPlain">
+            <object size="100%-65 100%-23 100% 100%-3" type="button" style="StoneButton">
                 Send
                 <action on="Press">submitChatInput();</action>

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

@@ -94 +94 @@
                 <object name="menuLearnToPlayButton"
                                       type="button"
-                                      style="StoneButton"
+                                      style="StoneButtonFancy"
                                       size="4 4 100%-4 36"
                                       tooltip_style="pgToolTip"
@@ -106 +106 @@
                             
                                <object name="menuSinglePlayerButton"
-                                       style="StoneButton"
+                                       style="StoneButtonFancy"
                                        type="button"
                                        size="4 36 100%-4 68"
@@ -120 +120 @@
                                
                                 <object name="menuMultiPlayerButton"
-                                        style="StoneButton"
+                                        style="StoneButtonFancy"
                                         type="button"
                                         size="4 68 100%-4 100"
@@ -134 +134 @@
 
                                 <object name="menuEditorButton"
-                                        style="StoneButton"
+                                        style="StoneButtonFancy"
                                         type="button"
                                         size="4 100 100%-4 132"
@@ -150 +150 @@
                                 
                                 <object name="menuOptionsButton"
-                                        style="StoneButton"
+                                        style="StoneButtonFancy"
                                         type="button"
                                         size="4 132 100%-4 164"
@@ -167 +167 @@
                                 <object name="menuExitButton"
                                         type="button"
-                                        style="StoneButton"
+                                        style="StoneButtonFancy"
                                         size="4 164 100%-4 196"
                                         tooltip_style="pgToolTip"
@@ -181 +181 @@
 
 <!--                        <object name="menuCampaignsButton"
-                                       style="StoneButton"
+                                       style="StoneButtonFancy"
                                        type="button"
                                        size="4 36 100%-4 68"
@@ -195 +195 @@
 -->
 <!--                        <object name="menuHistoryButton"
-                                style="StoneButton"
+                                style="StoneButtonFancy"
                                 type="button"
                                 size="4 36 100%-4 68"
@@ -232 +232 @@
                 <!-- CONTACT METHODS -->
                     <object type="button"
-                        style="StoneButton"
+                        style="StoneButtonFancy"
                         size="4 100%-36 50%-2 100%-4"
                     >
@@ -244 +244 @@
 
                         <object type="button"
-                                style="StoneButton"
+                                style="StoneButtonFancy"
                                 size="50%+2 100%-36 100%-4 100%-4"
                         >

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

@@ -251 +251 @@
             <object type="button"
                 name="settingsButton"
-                style="StoneButton"
+                style="StoneButtonFancy"
                 size="0 0 100% 32"
                 tooltip_style="sessionToolTip"
@@ -262 +262 @@
                 <object type="button"
                     name="chatButton"
-                    style="StoneButton"
+                    style="StoneButtonFancy"
                     size="0 32 100% 64"
                     tooltip_style="sessionToolTip"
@@ -272 +272 @@
                 <!-- Pause Button -->
                 <object type="button"
-                    style="StoneButton"
                     name="pauseButton"
+                    style="StoneButtonFancy"
                     size="0 64 100% 96"
                     tooltip_style="sessionToolTip"
@@ -284 +284 @@
                 <object type="button"
                     name="menuExitButton"
-                    style="StoneButton"
+                    style="StoneButtonFancy"
                     size="0 96 100% 128"
                     tooltip_style="sessionToolTip"