Changeset 6545

Timestamp:

Mar 18, 2010, 12:15:34 AM (14 years ago)

Author:

rgrieder

Message:

It seems we don't usually define the fonts used in widgets manually.
So I removed the manual overrides because they were probably not intended. It doesn't make a difference anyway.

Location:

code/branches/gamestate/data/gui/layouts

Files:

• DecisionPopup.layout (modified) (2 diffs)
• InGameMenu.layout (modified) (4 diffs)
• InfoPopup.layout (modified) (1 diff)

code/branches/gamestate/data/gui/layouts/DecisionPopup.layout

@@ -11 +11 @@
             <Property Name="Alpha" Value="0.6" />
             <Window Type="TaharezLook/Button" Name="orxonox/DecisionPopup_button_yes" >
-                <Property Name="Font" Value="BlueHighway-12" />
                 <Property Name="Text" Value="Yes" />
                 <Property Name="Alpha" Value="0.7" />
@@ -20 +19 @@
             </Window>
             <Window Type="TaharezLook/Button" Name="orxonox/DecisionPopup_button_no" >
-                <Property Name="Font" Value="BlueHighway-12" />
                 <Property Name="Text" Value="No" />
                 <Property Name="Alpha" Value="0.8" />

code/branches/gamestate/data/gui/layouts/InGameMenu.layout

@@ -7 +7 @@
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
         <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_ReturnButton" >
-            <Property Name="Font" Value="BlueHighway-12" />
             <Property Name="Text" Value="Return to Game" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -15 +14 @@
         </Window>
         <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_MainMenuButton" >
-            <Property Name="Font" Value="BlueHighway-12" />
             <Property Name="Text" Value="Main Menu" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -23 +21 @@
         </Window>
         <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_SettingsButton" >
-            <Property Name="Font" Value="BlueHighway-12" />
             <Property Name="Text" Value="Settings" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -31 +28 @@
         </Window>
         <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_QuitButton" >
-            <Property Name="Font" Value="BlueHighway-12" />
             <Property Name="Text" Value="Quit" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

code/branches/gamestate/data/gui/layouts/InfoPopup.layout

@@ -11 +11 @@
             <Property Name="Alpha" Value="0.7" />
             <Window Type="TaharezLook/Button" Name="orxonox/InfoPopup_close" >
-                <Property Name="Font" Value="BlueHighway-12" />
                 <Property Name="Text" Value="Close" />
                 <Property Name="Alpha" Value="0.7" />