[Orxonox-commit 1828] r6545 - code/branches/gamestate/data/gui/layouts

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-03-18 00:15:34 +0100 (Thu, 18 Mar 2010)
New Revision: 6545

Modified:
   code/branches/gamestate/data/gui/layouts/DecisionPopup.layout
   code/branches/gamestate/data/gui/layouts/InGameMenu.layout
   code/branches/gamestate/data/gui/layouts/InfoPopup.layout
Log:
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.

Modified: code/branches/gamestate/data/gui/layouts/DecisionPopup.layout
===================================================================
--- code/branches/gamestate/data/gui/layouts/DecisionPopup.layout	2010-03-17 23:13:57 UTC (rev 6544)
+++ code/branches/gamestate/data/gui/layouts/DecisionPopup.layout	2010-03-17 23:15:34 UTC (rev 6545)
@@ -10,7 +10,6 @@
             <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
             <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" />
                 <Property Name="InheritsAlpha" Value="False" />
@@ -19,7 +18,6 @@
                 <Event Name="Clicked" Function="DecisionPopup.button_yes"/>
             </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" />
                 <Property Name="InheritsAlpha" Value="False" />

Modified: code/branches/gamestate/data/gui/layouts/InGameMenu.layout
===================================================================
--- code/branches/gamestate/data/gui/layouts/InGameMenu.layout	2010-03-17 23:13:57 UTC (rev 6544)
+++ code/branches/gamestate/data/gui/layouts/InGameMenu.layout	2010-03-17 23:15:34 UTC (rev 6545)
@@ -6,7 +6,6 @@
         <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
         <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}}" />
             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.3625,0},{0.6,0},{0.4125,0}}" />
@@ -14,7 +13,6 @@
             <Event Name="Clicked" Function="InGameMenu.button_return_clicked"/>
         </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}}" />
             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.4625,0},{0.6,0},{0.5125,0}}" />
@@ -22,7 +20,6 @@
             <Event Name="Clicked" Function="InGameMenu.button_mainmenu_clicked"/>
         </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}}" />
             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5625,0},{0.6,0},{0.6125,0}}" />
@@ -30,7 +27,6 @@
             <Event Name="Clicked" Function="InGameMenu.button_settings_clicked"/>
         </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}}" />
             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />

Modified: code/branches/gamestate/data/gui/layouts/InfoPopup.layout
===================================================================
--- code/branches/gamestate/data/gui/layouts/InfoPopup.layout	2010-03-17 23:13:57 UTC (rev 6544)
+++ code/branches/gamestate/data/gui/layouts/InfoPopup.layout	2010-03-17 23:15:34 UTC (rev 6545)
@@ -10,7 +10,6 @@
             <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
             <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" />
                 <Property Name="InheritsAlpha" Value="False" />