Changeset 11435 for code/branches/Dialogue_FS17/data/gui/scripts

Timestamp:

May 26, 2017, 3:40:04 PM (8 years ago)

Author:

rrogge

Message:

Code aufgeraeumt

File:

• code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua (modified) (7 diffs)

code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua

@@ -1 @@
---[[local P = createMenuSheet("Dialogue Window")
 
-function P.onLoad()
-        P.createWindow()
-        P.showing = true    
-end
- function function_name( ... )
-        -- body
- end
-
-
-
-
-function P.createWindow()
-    
-    local question = orxonox.DialogueManager:getInstance():getquestion()
-    local default = (winMgr:createWindow("DefaultWindow"))
-    default:setText(question)
-    default:setProperty("UnifiedMaxSize", "{{1,0},{1,0}}")
-    default:setProperty("UnifiedAreaRect", "{{0,0},{0,0},{1,0},{1,0}}")
-    
-    
-
-
-    
-end
-local numOptions = DialogueManager:getnumOptions()
-    local counter = 1
-    local offset = 0
-    --create and name buttons while there are still options
-    while counter <= numOptions do
-        
-        
-    end]]
 -- Dialogue.lua
 
@@ -51 +18 @@
 
 function P.onLoad()
-
-        orxout("loading")
     P.wrapper = nil
     P.detailsWindows = {}
@@ -60 +25 @@
 
 function P.onShow()
-        orxout("showing")
     orxonox.CommandExecutor:execute("setTimeFactor 0")
     P.createInventory()
@@ -74 +38 @@
 
 function P.update()
-    orxout("UPDATING")
     P.updateInventory()
     if P.showing == false then
@@ -104 +67 @@
     detailsButton = winMgr:createWindow("MenuWidgets/Button", "/DetailsButton")
     local a1 = orxonox.DialogueManager:getInstance():getanswers1()
-    detailsButton:setPosition(CEGUI.UVector2(CEGUI.UDim(0.1, 0),CEGUI.UDim(0.25, 0)))
-    detailsButton:setSize(CEGUI.UVector2(CEGUI.UDim(0, 575), CEGUI.UDim(0, P.textHeight)))
+    detailsButton:setPosition(CEGUI.UVector2(CEGUI.UDim(0.1, 0),CEGUI.UDim(0.25, (P.imageHeight-P.textHeight)/2)))
+    detailsButton:setSize(CEGUI.UVector2(CEGUI.UDim(0.8, 0), CEGUI.UDim(0, P.textHeight)))
     detailsButton:setText(a1)
     orxonox.GUIManager:subscribeEventHelper(detailsButton, "Clicked", P.name ..".a1Button_clicked")
@@ -112 +75 @@
     a2Button = winMgr:createWindow("MenuWidgets/Button", "/a2Button")
     local a2 = orxonox.DialogueManager:getInstance():getanswers2()
-    a2Button:setPosition(CEGUI.UVector2(CEGUI.UDim(0.1, 0),CEGUI.UDim(0.4, 0)))
-    a2Button:setSize(CEGUI.UVector2(CEGUI.UDim(0, 575), CEGUI.UDim(0, P.textHeight)))
+    a2Button:setPosition(CEGUI.UVector2(CEGUI.UDim(0.1, 0),CEGUI.UDim(0.4, (P.imageHeight-P.textHeight)/2)))
+    a2Button:setSize(CEGUI.UVector2(CEGUI.UDim(0.8, 0), CEGUI.UDim(0, P.textHeight)))
     a2Button:setText(a2)
     orxonox.GUIManager:subscribeEventHelper(a2Button, "Clicked", P.name ..".a2Button_clicked")
@@ -147 +110 @@
         end
     end
-    orxonox.DialogueManager:getInstance():clean()
+    
 end