[Orxonox-commit 6779] r11407 - in code/branches/Dialogue_FS17/data/gui: layouts scripts

[rrogge at orxonox.net]

Author: rrogge
Date: 2017-04-27 16:05:23 +0200 (Thu, 27 Apr 2017)
New Revision: 11407

Modified:
   code/branches/Dialogue_FS17/data/gui/layouts/Dialogue.layout
   code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua
Log:
lua Buttons angefangen

Modified: code/branches/Dialogue_FS17/data/gui/layouts/Dialogue.layout
===================================================================
--- code/branches/Dialogue_FS17/data/gui/layouts/Dialogue.layout	2017-04-27 13:36:57 UTC (rev 11406)
+++ code/branches/Dialogue_FS17/data/gui/layouts/Dialogue.layout	2017-04-27 14:05:23 UTC (rev 11407)
@@ -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="MenuWidgets/StaticText" Name="orxonox/Dialogue/Inventory" >
-            <Property Name="Text" Value="Dialogue" />
             <Property Name="Alpha" Value="0.8" />
             <Property Name="InheritsAlpha" Value="False" />
             <Property Name="HorzFormatting" Value="HorzCentred" />
@@ -13,12 +12,6 @@
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
             <Property Name="VertFormatting" Value="TopAligned" />
             <Property Name="UnifiedAreaRect" Value="{{0.15,0},{0.15,0},{0.85,0},{0.8,0}}" />
-            <Window Type="MenuWidgets/Button" Name="orxonox/PickupInventory/InventoryBackButton" >
-                <Property Name="Text" Value="Back" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.8350,0},{0.6,0},{0.8800,0}}" />
-                <Event Name="Clicked" Function="PickupInventory.InventoryBackButton_clicked"/>
-            </Window>
             <Window Type="MenuWidgets/StaticText" Name="orxonox/Dialogue/Wrapper" >
                 <Property Name="TextColours" Value="FF4444FF" />
                 <Property Name="InheritsAlpha" Value="False" />

Modified: code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua
===================================================================
--- code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua	2017-04-27 13:36:57 UTC (rev 11406)
+++ code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua	2017-04-27 14:05:23 UTC (rev 11407)
@@ -92,6 +92,7 @@
     P.wrapper = winMgr:createWindow("MenuWidgets/ScrollablePane", "orxonox/Dialogue/Inventory/Wrapper")
     P.wrapper:setSize(CEGUI.UVector2(CEGUI.UDim(1,0),CEGUI.UDim(1,0)))
     root:addChildWindow(P.wrapper)
+    root:addChild(answerButton)