[Orxonox-commit 1914] r6631 - in code/branches/hudelements/data/gui: layouts scripts

[sfluecki at orxonox.net]

Author: sfluecki
Date: 2010-03-29 11:28:59 +0200 (Mon, 29 Mar 2010)
New Revision: 6631

Modified:
   code/branches/hudelements/data/gui/layouts/InGamePickupHUD.layout
   code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua
Log:
damit semi alles hat

Modified: code/branches/hudelements/data/gui/layouts/InGamePickupHUD.layout
===================================================================
--- code/branches/hudelements/data/gui/layouts/InGamePickupHUD.layout	2010-03-28 20:47:27 UTC (rev 6630)
+++ code/branches/hudelements/data/gui/layouts/InGamePickupHUD.layout	2010-03-29 09:28:59 UTC (rev 6631)
@@ -29,6 +29,21 @@
 				und relativen Positionsangaben (problematisch bei kleinen auflösungen) -->
 				<Event Name="Clicked" Function="InGamePickupHUD.close_button_clicked"/>
 			</Window>
+			<Window Type="TaharezLook/Listbox" Name="orxonox/InGamePickupHUD_PickupListBox">
+			        <Property Name="Alpha" Value="0.8" />
+				<Property Name="Font" Value="BlueHighway-12" />
+				<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+				<Property Name="UnifiedAreaRect" Value="{{0,5},{0,25},{1,-5},{1,-5}}" />	
+				<!--
+				<Window Type="TaharezLook/ListboxItem" Name="orxonox/InGamePickupHUD_TestPickupOne">
+					<Property Name="Alpha" Value="0.8" />
+					<Property Name="Font" Value="BlueHighway-12" />
+					<Property Name="Text" Value="First Pickup" />
+					<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+					<Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{0,30},{1,0}}" />	
+				</Window>
+				-->
+			</Window>
 			
 		</Window>
 		

Modified: code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua
===================================================================
--- code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua	2010-03-28 20:47:27 UTC (rev 6630)
+++ code/branches/hudelements/data/gui/scripts/InGamePickupHUD.lua	2010-03-29 09:28:59 UTC (rev 6631)
@@ -12,18 +12,14 @@
 P.layoutString = "InGamePickupHUD.layout"
 
 function P:init()
+  -- wie kann man hier dynamisch neue ListBoxItems erstellen? 
+  -- wie können sich diese ListBoxItems selbst aktualisieren? <<Tickable?>>
 end
 
 
 -- events for ingamemenu
 
 
-function P.button_Pickup_clicked(e)
-    orxonox.Game:getInstance():popState()
-    orxonox.Game:getInstance():popState()
-    orxonox.Game:getInstance():requestState("mainmenu")
-    hideGUI("InGameMenu")
-end
 
 function P.close_button_clicked()
     hideGUI("InGamePickupHUD")