Changeset 11652 for code/branches

Timestamp:

Dec 11, 2017, 2:33:45 PM (7 years ago)

Author:

kuchlert

Message:

altes Dialogue entfernt

Location:

code/branches/Dialog_HS17

Files:

• data/gui/layouts/Dialog.layout (modified) (1 diff)
• data/gui/layouts/Dialogue.layout (deleted)
• data/gui/scripts/Dialog.lua (modified) (4 diffs)
• data/gui/scripts/Dialogue.lua (deleted)
• data/levels/DialogShowcase.oxw (added)
• data/levels/DialogueShowcase.oxw (deleted)
• data/levels/DialogueShowcase2.oxw (deleted)
• data/overlays/HUDTemplates3.oxo (modified) (1 diff)
• src/modules/CMakeLists.txt (modified) (1 diff)
• src/modules/dialogue (deleted)

code/branches/Dialog_HS17/data/gui/layouts/Dialog.layout

@@ -22 +22 @@
                 <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.05,0},{0.25,0},{0.15,0}}" />
             </Window>
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/Dialog/Question" >
-                <Property Name="Alpha" Value="0.8" />
+
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/QuestionWrapper" >
                 <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="HorzFormatting" Value="LeftAligned" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="VertFormatting" Value="CentreAligned" />
-                <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.05,0},{0.95,0},{0.15,0}}" />
+                <Property Name="HorzFormatting" Value="HorzCentred" />
+                <Property Name="VertFormatting" Value="TopAligned" />
+                <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.05,0},{0.95,0},{0.45,0}}" />
+                <Window Type="MenuWidgets/ScrollablePane" Name="orxonox/QuestionPane" >
+                        <Property Name="ContentArea" Value="l:0 t:0 r:0 b:0" />
+                        <Property Name="HorzStepSize" Value="0.005" />
+                        <Property Name="VertStepSize" Value="0.005" />
+                        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+                        <Property Name="HorzOverlapSize" Value="0.01" />
+                        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{0.997,0},{0.997,0}}" />
+                        <Property Name="VertOverlapSize" Value="0.01" />
+                        <Property Name="HorzScrollPosition" Value="0" />
+                        <Property Name="VertScrollPosition" Value="0" />
+                        <Window Type="MenuWidgets/StaticText" Name="orxonox/Dialog/Question" >
+                            <Property Name="Alpha" Value="0.8" />
+                            <Property Name="InheritsAlpha" Value="False" />
+                            <Property Name="HorzFormatting" Value="WordWrapLeftAligned" />
+                            <Property Name="VertFormatting" Value="CentreAligned" />
+                            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+                            <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
+                        </Window>
+                </Window>
             </Window>
 
             <Window Type="MenuWidgets/Listbox" Name="orxonox/AnsListbox" >
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.225,0},{0.95,0},{0.85,0}}" />
+                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.5,0},{0.95,0},{0.85,0}}" />
                 <Event Name="ItemSelectionChanged" Function="Dialog.answer_changed" />
             </Window>

code/branches/Dialog_HS17/data/gui/scripts/Dialog.lua

@@ -1 @@
--- Dialogue.lua
+-- Dialog.lua
 
 local P = createMenuSheet("Dialog")
@@ -7 +7 @@
 P.showing = false
 P.choice = 0
+P.scrollbarWidth = 12
 
 function P.onLoad() --wird ausgefuert wenn Fenster geladen
@@ -35 +36 @@
     personfield:setText(person)
 
-    local questionfiled = winMgr:getWindow("orxonox/Dialog/Question")
+    local questionfield = winMgr:getWindow("orxonox/Dialog/Question")
     local question = manager:getQuestion()
-    questionfiled:setText(question)
+    questionfield:setText(question)
 
     local listboxwindow = winMgr:getWindow("orxonox/AnsListbox")
@@ -60 +61 @@
     manager:update(P.choice)
 
-    local questionfiled = winMgr:getWindow("orxonox/Dialog/Question")
+    local questionfield = winMgr:getWindow("orxonox/Dialog/Question")
     local question = manager:getQuestion()
-    questionfiled:setText(question)
+    questionfield:setText(question)
 
     local listboxwindow = winMgr:getWindow("orxonox/AnsListbox")

code/branches/Dialog_HS17/data/overlays/HUDTemplates3.oxo

@@ -215 +215 @@
 
     <GUIOverlay
-      name = "Dialogue"
-      guiname = "Dialogue"
-      visible = "false"
-    />
-
-    <GUIOverlay
       name = "Dialog"
       guiname = "Dialog"

code/branches/Dialog_HS17/src/modules/CMakeLists.txt

@@ -26 +26 @@
 ################ Sub Directories ################
 
-ADD_SUBDIRECTORY(dialogue)
 ADD_SUBDIRECTORY(dialog)
 ADD_SUBDIRECTORY(designtools)