[Orxonox-commit 1897] r6614 - in code/branches/hudelements/data/gui: layouts scripts

[scurcio at orxonox.net]

Author: scurcio
Date: 2010-03-24 09:11:12 +0100 (Wed, 24 Mar 2010)
New Revision: 6614

Modified:
   code/branches/hudelements/data/gui/layouts/InGameMenu.layout
   code/branches/hudelements/data/gui/layouts/InGamePickupHUD.layout
   code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua
Log:
close button pickup

Modified: code/branches/hudelements/data/gui/layouts/InGameMenu.layout
===================================================================
--- code/branches/hudelements/data/gui/layouts/InGameMenu.layout	2010-03-23 20:55:59 UTC (rev 6613)
+++ code/branches/hudelements/data/gui/layouts/InGameMenu.layout	2010-03-24 08:11:12 UTC (rev 6614)
@@ -37,13 +37,5 @@
             <Property Name="Alpha" Value="0.7" />
             <Event Name="Clicked" Function="InGameMenu.button_quit_clicked"/>
         </Window>
-	<Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_Test" >
-		<Property Name="Font" Value="BlueHighway-12" />
-		<Property Name="Text" Value="Test" />
-		<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-		<Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.7625,0},{0.6,0},{0.8125,0}}" />
-		<Property Name="Alpha" Value="0.7" />
-		<Event Name="Clicked" Function="InGameMenu.button_quit_clicked"/>
-        </Window>
     </Window>
 </GUILayout>

Modified: code/branches/hudelements/data/gui/layouts/InGamePickupHUD.layout
===================================================================
--- code/branches/hudelements/data/gui/layouts/InGamePickupHUD.layout	2010-03-23 20:55:59 UTC (rev 6613)
+++ code/branches/hudelements/data/gui/layouts/InGamePickupHUD.layout	2010-03-24 08:11:12 UTC (rev 6614)
@@ -16,8 +16,17 @@
 				<Property Name="Text" Value="Pickup List" />
 				<Property Name="Font" Value="BlueHighway-10" />
 				<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-				<Property Name="UnifiedAreaRect" Value="{{0,5},{0,5},{1,-5},{0,30}}" />
-			</Window>	
+				<Property Name="UnifiedAreaRect" Value="{{0,5},{0,5},{1,-40},{0,30}}" />
+			</Window>
+			<Window Type="TaharezLook/Button" Name="orxonox/InGamePickupHUD_closeButton" >
+			<Property Name="Font" Value="BlueHighway-12" />
+			<Property Name="Text" Value="X" />
+			<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+			<Property Name="UnifiedAreaRect" Value="{{0,85},{0,5},{1,-5},{0,30}}" />
+			<Property Name="Alpha" Value="0.7" />
+			<Event Name="Clicked" Function="InGamePickupHUD.close_button_clicked"/>
+			</Window>
+			
 		</Window>
 		
 	

Modified: code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua
===================================================================
--- code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua	2010-03-23 20:55:59 UTC (rev 6613)
+++ code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua	2010-03-24 08:11:12 UTC (rev 6614)
@@ -25,5 +25,10 @@
     hideGUI("InGameMenu")
 end
 
+function P.close_button_clicked()
+    hideGUI("InGamePickupHUD")
+    openDecisionPopup( "SEMI IS absolutely the BEST")
+end
+
 return P